Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
MOREAU Elise
project-covid
Commits
9ef9940c
Commit
9ef9940c
authored
Oct 31, 2020
by
Moreau Elise
Browse files
update css using flex
parent
643ac803
Changes
9
Hide whitespace changes
Inline
Side-by-side
templates/common/layout.twig
View file @
9ef9940c
...
...
@@ -5,6 +5,7 @@
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1.0"
>
<link
rel=
"stylesheet"
href=
"/assets/semantic-ui/semantic.min.css"
>
<link
rel=
"stylesheet"
href=
"/assets/css/general.css"
>
<link
rel=
"stylesheet"
href=
"/assets/css/grid.css"
>
<link
rel=
"stylesheet"
href=
"https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.4.3/css/ol.css"
type=
"text/css"
>
<title>
{%
block
title
%}{%
endblock
%}
</title>
...
...
@@ -12,7 +13,7 @@
</head>
<body>
<div
class=
"main-wrapper"
>
<div
class=
"container-wrapper"
>
<div
class=
"container-wrapper
"
>
{%
block
navbar
%}
<div
class=
"ui inverted menu header"
id=
"header-content"
>
<img
src=
"/assets/img/covid-logo.png"
class=
"ui huge spaced icon"
>
...
...
@@ -26,12 +27,12 @@
<a
href=
"/logout"
>
Log out
</a>
</div>
{%
else
%}
<div
class=
"item"
>
<a
href=
"/login"
>
Log in
</a>
</div>
<div
class=
"item"
>
<a
href=
"/signup"
>
Sign up
</a>
</div>
<div
class=
"item"
>
<a
href=
"/login"
>
Log in
</a>
</div>
<div
class=
"item"
>
<a
href=
"/signup"
>
Sign up
</a>
</div>
{%
endif
%}
<div
class=
"ui dropdown item"
>
Categories
<i
class=
"dropdown icon"
></i>
...
...
@@ -51,17 +52,16 @@
</div>
</div>
{%
endblock
%}
<div
class=
"content"
id=
"content"
>
{%
if
message
%}
<div
class=
"ui message"
>
{{
message
}}
</div>
{%
endif
%}
{%
block
content
%}
{%
endblock
%}
</div>
{%
block
footer
%}
<!-- Footer -->
<div
class=
"ui center aligned inverted vertical footer-content segment"
id=
'footer-content'
>
...
...
templates/group/group_view.twig
View file @
9ef9940c
{%
extends
'common/layout.twig'
%}
{%
block
content
%}
<div
class=
"ui card"
id=
"groupcard"
>
<div
class=
"row"
>
<div
class=
"ui card col s2 m2 l2 xl2"
id=
"groupcard"
>
<div
class=
"content"
>
<img
class=
"ui left floated circular image small"
src=
"/assets/img/default-avatar.png"
>
<a
class=
"header"
>
{{
group.name
}}
</a>
...
...
@@ -37,9 +38,10 @@
</div>
</div>
</div>
<div
id=
"map"
style=
"max-height:100%;
max-width:90%"
>
<div
id=
"map"
class=
"col s10 m10 l10 xl10"
style=
"
max-width:90%"
>
</div>
<div
id=
"members"
>
</div>
<div
class=
"list"
>
<h2>
Members
</h2>
<div
class=
"ui relaxed divided list"
id=
"members_list"
style=
"overflow:scroll"
>
{%
for
user
in
group.getUsers
%}
...
...
@@ -58,7 +60,7 @@
</div>
</div>
{%
if
group.checkAdmin
(
session.userId
)
%}
<div
class=
"ui modal"
id=
"modal_add_user"
>
<div
class=
"ui modal
col s12 m12 l12 xl12
"
id=
"modal_add_user"
>
<div
class=
"header"
>
Add a member
</div>
...
...
templates/home/search.twig
View file @
9ef9940c
{%
extends
'common/layout.twig'
%}
{%
block
content
%}
<h2>
Search Results
</h2>
<
div
class=
"ui relaxed divided list"
>
<h3>
Users
</h3
>
<
h3>
Users
</h3
>
<div
class=
"ui relaxed divided list"
style=
"max-height:200px"
>
{%
for
user
in
users
%}
<div
class=
"item"
>
<img
class=
"ui avatar image"
src=
"/assets/img/default-avatar.png"
></i>
...
...
@@ -13,8 +13,8 @@
{%
endfor
%}
</div>
<div
class=
"ui relaxed divided list"
>
<h3>
Groups
</h3>
<div
class=
"ui relaxed divided list"
style=
"max-height:200px"
>
{%
for
group
in
groups
%}
<div
class=
"item"
>
<div
class=
"content"
>
...
...
templates/message/messenger.twig
View file @
9ef9940c
{%
extends
'common/layout.twig'
%}
{%
block
content
%}
<div
class=
"row"
>
<div
class=
"return_link"
>
<a
href=
"/groups/
{{
group.getId
}}
"
>
Retour
</a>
</div>
<div
class=
"current_tchat"
>
</div>
<div
class=
"row"
>
<div
class=
"current_tchat col s12 m12 l12 xl12"
>
<h2>
{{
group.name
}}
</h2>
<div
class=
"list_members"
>
{%
for
user
in
group.users
%}
...
...
@@ -11,7 +14,9 @@
{%
endfor
%}
</div>
</div>
<div
class=
"ui comments"
id=
"current_messages"
>
</div>
<div
class=
"row"
>
<div
class=
"ui comments col s12 m12 l12"
id=
"list"
style=
"max-height:400px;"
>
{%
for
message
in
messages
%}
<div
class=
"comment"
>
<a
class=
"avatar"
>
...
...
@@ -29,15 +34,16 @@
</div>
{%
endfor
%}
</div>
<div
class=
"reply"
>
<form
class=
"ui reply form"
action=
"/groups/
{{
group.getId
}}
/messages"
method=
"post"
>
<div
class=
"field"
>
<textarea
name=
"body"
rows=
"3"
></textarea>
</div>
<button
class=
"ui blue labeled submit icon button"
type=
"submit"
>
<i
class=
"icon edit"
></i>
Add Reply
</button>
</form>
</div>
<div
class=
"row"
>
<form
class=
"ui reply form col s12 m12 l12 xl12"
action=
"/groups/
{{
group.getId
}}
/messages"
method=
"post"
>
<div
class=
"field"
>
<textarea
name=
"body"
rows=
"3"
></textarea>
</div>
<button
class=
"ui blue labeled submit icon button"
type=
"submit"
>
<i
class=
"icon edit"
></i>
Add Reply
</button>
</form>
</div>
{%
endblock
%}
\ No newline at end of file
templates/user/create_user.twig
View file @
9ef9940c
{%
extends
'common/layout.twig'
%}
{%
block
content
%}
<div
class=
"form_format"
>
<form
class=
"ui form
{%
if
formstatus
%}
{{
formstatus
}}
{%
endif
%}
"
action=
"/users"
method=
"post"
>
<h4
class=
"ui dividing header"
>
Sign Up
</h4>
<div
class=
"field"
>
<input
type=
"text"
name=
"firstname"
id=
"firstname"
placeholder=
"Firstname"
value=
"
{{
firstname
}}
"
required
>
</div>
<div
class=
"field"
>
<input
type=
"text"
name=
"lastname"
id=
"lastname"
placeholder=
"Lastname"
value=
"
{{
lastname
}}
"
required
>
</div>
<div
class=
"field"
>
<input
type=
"text"
name=
"username"
id=
"username"
placeholder=
"Username"
value=
"
{{
username
}}
"
required
>
{%
if
username_formstatus
%}
<div
class=
"ui
{{
formstatus
}}
message"
>
<div
class=
"header"
>
Action Forbidden
</div>
<p>
Username already used.
</p>
</div>
{%
endif
%}
</div>
<div
class=
"field"
>
<input
type=
"password"
name=
"password"
id=
"password"
placeholder=
"Password"
required
>
</div>
<div
class=
"field"
>
<input
type=
"password"
name=
"confirmpassword"
id=
"confirmpassword"
placeholder=
"Confirm your password"
required
>
{%
if
password_formstatus
%}
<div
class=
"ui
{{
formstatus
}}
message"
>
<ul
class=
"list"
>
<li>
{{
password_message
}}
</li>
</ul>
</div>
{%
endif
%}
</div>
<div
class=
"field"
>
<input
type=
"email"
name=
"mail"
id=
"mail"
placeholder=
"Email"
value=
"
{{
mail
}}
"
required
>
{%
if
email_formstatus
%}
<div
class=
"ui
{{
formstatus
}}
message"
>
<ul
class=
"list"
>
<li>
{{
email_message
}}
</li>
</ul>
</div>
{%
endif
%}
<div
class=
"field"
>
<input
type=
"checkbox"
name=
"contaminated"
>
<label
for=
"contaminated"
>
Contaminated
</label>
</input>
</div>
</div>
<input
type=
"submit"
class=
"ui submit button"
>
</form>
<form
class=
"ui form
{%
if
formstatus
%}
{{
formstatus
}}
{%
endif
%}
"
action=
"/users"
method=
"post"
>
<h4
class=
"ui dividing header"
>
Sign Up
</h4>
<div
class=
"field"
>
<input
type=
"text"
name=
"firstname"
id=
"firstname"
placeholder=
"Firstname"
value=
"
{{
firstname
}}
"
required
>
</div>
<div
class=
"field"
>
<input
type=
"text"
name=
"lastname"
id=
"lastname"
placeholder=
"Lastname"
value=
"
{{
lastname
}}
"
required
>
</div>
<div
class=
"field"
>
<input
type=
"text"
name=
"username"
id=
"username"
placeholder=
"Username"
value=
"
{{
username
}}
"
required
>
{%
if
username_formstatus
%}
<div
class=
"ui
{{
formstatus
}}
message"
>
<div
class=
"header"
>
Action Forbidden
</div>
<p>
Username already used.
</p>
</div>
{%
endif
%}
</div>
<div
class=
"field"
>
<input
type=
"password"
name=
"password"
id=
"password"
placeholder=
"Password"
required
>
</div>
<div
class=
"field"
>
<input
type=
"password"
name=
"confirmpassword"
id=
"confirmpassword"
placeholder=
"Confirm your password"
required
>
{%
if
password_formstatus
%}
<div
class=
"ui
{{
formstatus
}}
message"
>
<ul
class=
"list"
>
<li>
{{
password_message
}}
</li>
</ul>
</div>
{%
endif
%}
</div>
<div
class=
"field"
>
<input
type=
"email"
name=
"mail"
id=
"mail"
placeholder=
"Email"
value=
"
{{
mail
}}
"
required
>
{%
if
email_formstatus
%}
<div
class=
"ui
{{
formstatus
}}
message"
>
<ul
class=
"list"
>
<li>
{{
email_message
}}
</li>
</ul>
</div>
{%
endif
%}
<div
class=
"ui checkbox"
>
<input
type=
"checkbox"
name=
"contaminated"
id=
"contaminated"
>
<label
for=
"contaminated"
>
Contaminated
</label>
</input>
</div>
</div>
<div
class=
"field col o6"
>
<input
type=
"submit"
class=
"ui submit button"
>
</div>
</form>
</div>
{%
endblock
%}
\ No newline at end of file
templates/user/list_users.twig
View file @
9ef9940c
...
...
@@ -3,8 +3,8 @@
Liste des utilisateurs
{%
endblock
%}
{%
block
content
%}
<h1
class=
"display-4 text-center"
style=
"grid-row:1/2; grid-column:1/5"
>
List Users
</h1>
<div
class=
"ui relaxed divided list
"
id=
"list
"
>
<h1
class=
"display-4 text-center"
>
List Users
</h1>
<div
class=
"ui relaxed divided list
col s12 m12 l12 xl12 list"
style=
"max-height:500px
"
>
{%
for
user
in
users
%}
<div
class=
"item"
>
<img
class=
"ui avatar image"
src=
"/assets/img/default-avatar.png"
></i>
...
...
templates/user/log_in.twig
View file @
9ef9940c
...
...
@@ -14,7 +14,9 @@
<p>
{{
session.message
}}
</p>
</div>
{%
endif
%}
<input
type=
"submit"
class=
"ui submit button"
>
<div
class=
"field col o6"
>
<input
type=
"submit"
class=
"ui submit button"
>
</div>
</form>
</div>
{%
endblock
%}
\ No newline at end of file
templates/user/modify_user.twig
View file @
9ef9940c
...
...
@@ -41,12 +41,14 @@
</div>
{%
endif
%}
</div>
<div
class=
"field"
>
<input
type=
"checkbox"
name=
"contaminated"
id=
"contaminated"
>
<label
for=
"contaminated"
>
Contaminated
</label>
</input>
<div
class=
"ui checkbox"
>
<input
type=
"checkbox"
name=
"contaminated"
id=
"contaminated"
>
<label
for=
"contaminated"
>
Contaminated
</label>
</input>
</div>
<div
class=
"field col o6"
>
<input
type=
"submit"
class=
"ui submit button"
>
</div>
<input
type=
"submit"
class=
"ui submit button"
>
</form>
</div>
{%
endblock
%}
\ No newline at end of file
templates/user/user_profile.twig
View file @
9ef9940c
{%
extends
'common/layout.twig'
%}
{%
block
content
%}
<div
class=
"ui card"
id=
"usercard"
>
<div
class=
"row"
>
<div
class=
"ui card"
class=
"col s2 m2 l2 xl2"
style=
"max-height:200px"
>
<div
class=
"content"
>
<img
class=
"ui left floated tiny circular image"
src=
"/assets/img/default-avatar.png"
>
<img
class=
"ui left floated tiny circular image"
src=
"/assets/img/default-avatar.png"
>
<a
class=
"header"
>
{{
user.lastName
}}
{{
user.firstName
}}
</a>
<div
class=
"meta"
>
<span
class=
"date"
>
Joined the
{{
user.joinDateString
}}
</span>
</div>
<span>
Is
{%
if
user.contaminated
%}
contaminated
{%
else
%}
not contaminated
{%
endif
%}
</span>
<div
class=
"extra content"
id=
"icons_users"
>
<div
class=
"ui small basic icon buttons"
>
{%
if
session.userId
==
user.getId
%}
<form
action=
"/account/modify"
method=
"get"
>
<button
type=
"submit"
class=
"ui button"
><i
class=
"edit icon"
></i></button>
</form>
<button
class=
"ui button"
id=
"delete_user_button"
><i
class=
"trash icon"
></i></button>
{%
endif
%}
</div>
<div
class=
"ui small basic icon buttons"
>
{%
if
session.userId
==
user.getId
%}
<form
action=
"/account/modify"
method=
"get"
>
<button
type=
"submit"
class=
"ui button"
><i
class=
"edit icon"
></i></button>
</form>
<button
class=
"ui button"
id=
"delete_user_button"
><i
class=
"trash icon"
></i></button>
{%
endif
%}
</div>
</div>
</div>
</div>
<div
id=
"map"
>
</div>
<div
id=
"groups"
>
<h2>
Groups
</h2>
<div
class=
"ui relaxed divided list"
id=
"groups_list"
style=
"overflow:scroll"
>
{%
for
group
in
user.getGroups
%}
{%
if
not
group.isPrivate
%}
<div
class=
"item"
>
<img
class=
"ui avatar image"
src=
"/assets/img/default-avatar.png"
></i>
<div
class=
"content"
>
<a
href=
"/groups/
{{
group.id
}}
"
class=
"header"
>
{{
group.name
}}
</a>
</div>
<form
action=
"/users/
{{
user.id
}}
/groups/
{{
group.getId
}}
/delete"
method=
"post"
class=
"right floated content"
>
<button
class=
"ui button tiny"
id=
""
style=
"margin-right:10px; padding-right:5px; padding-left:10px"
><i
class=
"user times icon"
></i></button>
</form>
</div>
{%
elseif
user.isCurrentUser
%}
<div
class=
"item"
>
<img
class=
"ui avatar image"
src=
"/assets/img/default-avatar.png"
></i>
<div
class=
"content"
>
<a
href=
"/groups/
{{
group.id
}}
"
class=
"header"
>
{{
group.name
}}
</a>
</div>
<form
action=
"/users/
{{
user.id
}}
/groups/
{{
group.getId
}}
/delete"
method=
"post"
class=
"right floated content"
>
<button
class=
"ui button tiny"
id=
""
style=
"margin-right:10px; padding-right:5px; padding-left:10px"
>
Yes
</button>
</form>
</div>
{%
endif
%}
{%
endfor
%}
<div
id=
"map"
class=
"col s10 m10 l10 xl10"
></div>
</div>
<div
class=
"col s12 m12 l12 xl12 "
>
<h2>
Groups
</h2>
<div
class=
"ui relaxed divided list"
style=
"overflow:scroll"
>
{%
for
group
in
user.getGroups
%}
{%
if
not
group.isPrivate
%}
<div
class=
"item"
>
<img
class=
"ui avatar image"
src=
"/assets/img/default-avatar.png"
></i>
<div
class=
"content"
>
<a
href=
"/groups/
{{
group.id
}}
"
class=
"header"
>
{{
group.name
}}
</a>
</div>
</div>
<div
class=
"ui modal"
id=
"modal_delete_user"
>
<div
class=
"header"
>
Confirm you wanna delete your account
<form
action=
"/users/
{{
user.id
}}
/groups/
{{
group.getId
}}
/delete"
method=
"post"
class=
"right floated content"
>
<button
class=
"ui button tiny"
id=
""
style=
"margin-right:10px; padding-right:5px; padding-left:10px"
><i
class=
"user times icon"
></i></button>
</form>
</div>
{%
elseif
user.isCurrentUser
%}
<div
class=
"item"
>
<img
class=
"ui avatar image"
src=
"/assets/img/default-avatar.png"
></i>
<div
class=
"content"
>
<a
href=
"/groups/
{{
group.id
}}
"
class=
"header"
>
{{
group.name
}}
</a>
</div>
<form
action=
"/users/
{{
user.id
}}
/groups/
{{
group.getId
}}
/delete"
method=
"post"
class=
"right floated content"
>
<button
class=
"ui button tiny"
id=
""
style=
"margin-right:10px; padding-right:5px; padding-left:10px"
>
Yes
</button>
</form>
</div>
<div
class=
"actions"
>
{%
endif
%}
{%
endfor
%}
</div>
</div>
<div
class=
"ui modal"
id=
"modal_delete_user"
>
<div
class=
"header"
>
Confirm you wanna delete your account
</div>
<div
class=
"actions"
>
<form
action=
"/account/delete"
method=
"post"
class=
"right floated content"
>
<button
class=
"ui button tiny"
id=
""
style=
"margin-right:10px; padding-right:5px; padding-left:10px"
>
Yes
</button>
</form>
<div
class=
"ui black deny button"
>
Cancel
</div>
</div>
</div>
</div>
</div>
<script
type=
"text/javascript"
src=
"/assets/js/users-search.js"
></script>
{%
endblock
%}
\ No newline at end of file
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment