From 2f3f9efecd31d01c4885b1e7a8910acdbe021963 Mon Sep 17 00:00:00 2001
From: Anteunis Charles <charles.anteunis@gmail.com>
Date: Thu, 12 Dec 2019 09:02:12 +0100
Subject: [PATCH] filtre sport et affichage annonce

---
 website/db.sqlite3                            | Bin 180224 -> 180224 bytes
 website/nutriform/admin.py                    |   5 +++--
 website/nutriform/forms.py                    |   2 +-
 .../static/nutriform/assets/css/main.css      |   6 ++++++
 .../templates/nutriform/annonces.html         |  16 +++++++++-------
 .../nutriform/templates/nutriform/carte.html  |   3 +++
 .../nutriform/templates/nutriform/compte.html |   3 ++-
 .../templates/registration/login.html         |   1 +
 website/website/settings.py                   |   2 ++
 9 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/website/db.sqlite3 b/website/db.sqlite3
index 563cf0ff05ee9dab8e0155268654e4710640551c..7a47f48a587dd450e13e81b8593a8961cd097501 100644
GIT binary patch
delta 1657
zcmZo@;BIK(o*>OwHc`fzv20_)5j{2*ad~EA#_53xjKY&`^-b7R#aWq+87Cj)5pM3%
z-`=IqSXIER%C9z^eF38_AHNsB3%?z|1-}u$4!_!FMT0AR(*xEsvZ!&ZvNAI=a;tzz
zWiY7(CKbV?0+^Hssolb?%I`LveFLKvZwh}re-wWxe*nKXzuR_)4U9kdlv$WL8C5}q
z3Wxx6l|U>-5TO7f<fmuuXPnKf$|5tJ{Q#paAKQF31=ho?J}l2zI$2~k2MU~Gw#ZiH
zWN_p+EN0|nG%_%>)HO8HH8fH%Ft9Q(wK6o-GqNx@H#RbK%*)HqOHNhDPs&P7E>X}h
z)SMo8icvZ!wK%ybv!En1KTk<VL8-VPzo<khwzf8wn<-iaY;G{7xyDwerg}!^#s(Hf
zM(E}mfz4I6;$})w2J277rr*R|&%n~q)WQ^pyQF-}GIMfLK~73ZEJ=mBs8opy<kLo0
zY(^Rz>6x3D8k(8maFSFE!bm)xRs=g5i>HmOOf2+FOpVP<Oia){Z36MMH8)eO0>p`;
zm`*gZGPck&H!?J~v@k|Dz!+?RR4T%WAYbb!D5c<bYN<TLDlDO42#R<UBLh<dBOGp(
zQbAaS+luXC#~I&w@G$YVFz_AXZQ*g_=Gd&L@QZ6Zmo$?NBMSoqquq8d8Kzy#JWTxC
z8ThyJ-vPnRiUkS$(+l*Olvo%T7*wbG$uKEQ-=@#x$HT;bn1TNh|6%?m{H>c63o7`h
zci1z@fK<s(&yr=5+J4BM$;p6+h5t1J{|Elp{J;6XZWkzEy3Nl8$_y+Zf_eMbdL|wP
ze*Sz07T!Jv{!-pP-d}t>H!CXC@z!TCaWaT23ODj<G6pyXc?QGsgOP!se~@#2X;E>i
zLQbkePJUjxLP~0}LSboQX0bv_szOepLU3wkUaFo#Sbk}-!r@gVsl^I8sl^IOnW=eY
zsd=Tv3W`wuhZiUmWTvLDHQF$9GKeY)H#tjlx`qWs8W|YYLo;7MkbhWeUTT#>8OX5I
zypp2C%)Hbhg_P2w#Jm!P<kXUqRE6ThD-%H(vbf;z%H+(%oXq0GD^nHHGE4GOiy`*v
z9$r;al&Yr?nx_CWqqIn&IJGEI;qU^5viy>wRFFjG;T1)x3MrYz1@-yGnV_7kP>^3*
zq)>EtWkG&kN>M6Ab+JNHYH@yMUa_7V#EwQ|7KjIwHDMlrxZeWq{^b19qRb+Nl*Bwx
zXebmU7A1qj%{jlYG&2blC<?()ZzPtbCf6%C=O-p-=s@g;1Zz=hZe}saoeF9BMY*X8
z`K1aer3$%;nRz9dsUVL*#C0HHm6r<gUuu;?L1M8&%HfrVmzNgnp$0qy0|T3+Vj~A5
zCxf)2aHFRxV~~HSlcQ&ZkwHDI^z-u%@=8_6Rfh$eLSm_cQ)*&zMp%AMPHLqB$gv8g
zd8rDAR~D9L7Njbqs3+zomZX*z73(PEsb?HsS)5q{bp<G>Q}Z&5K)x@@OwKGwEmBYf
Z8>Rp;jg6OqfkBHYh=G4Q=LV+l`~Xcz*p2`I

delta 391
zcmZo@;BIK(o*>PbHBrWyF>7PO5j{30ad~EA#_53xjKY&`^-b91#95h*87Cj)5pM3%
z-`=IqSXIC*#~(1AeF3BGX2k*?{^<eh8MiRY@n=qF-@s_K-G2k)cfQF90*2Ew_cP9B
zmSY#2&VGQ=c5|S>CARHi#~I&w@G$eZG4LJYZQ*g_=Gd&L@QZ6Zmo$?NBTJJtGwXIQ
z8Kzy#Jk0!)82GpIPvXDBe`m8|K?48u0(~YW78Pb+#_4`CObXMt=`;E9F!L{A;D5w_
zn12a>>t@A*3jXOG_DnJ?a?Fm5)3aomq_!WjXL2&&VdDSF!2g^7EB{jdw(SB1Ot<;D
z6a|YD^GZ^gnT)o7t!Ls<;AUW8VB(*}z<-K=)@H?mKK@iaCJqKsMPY4m#t_%w5F-Oa
zOI<@FT|+}Z|De*mRE3n(;^d;tf|AVqyr|Tw)FL($MzDHASw`2eph%c{12aGWAiJv6
fwA{=L5Sg8kTU1<_R$Q2pR#=>pw*CKlCPo1OX`65Y

diff --git a/website/nutriform/admin.py b/website/nutriform/admin.py
index 38deb82..1260f87 100644
--- a/website/nutriform/admin.py
+++ b/website/nutriform/admin.py
@@ -1,7 +1,8 @@
 from django.contrib import admin
-from .models import Menu, QuestionQuotid, InfosUser
+from .models import Menu, QuestionQuotid, InfosUser, Annonce
 
 # Register your models here.
 admin.site.register(Menu)
 admin.site.register(QuestionQuotid)
-admin.site.register(InfosUser)
\ No newline at end of file
+admin.site.register(InfosUser)
+admin.site.register(Annonce)
\ No newline at end of file
diff --git a/website/nutriform/forms.py b/website/nutriform/forms.py
index 6c13105..b5354b5 100644
--- a/website/nutriform/forms.py
+++ b/website/nutriform/forms.py
@@ -56,4 +56,4 @@ for s in SPORT_LIST:
     SPORT_CHOICES.append((s,s))
 
 class SearchSportForm(forms.Form):
-    sport_choice = forms.ChoiceField(choices=SPORT_CHOICES)
+    sport_choice = forms.ChoiceField(choices=SPORT_CHOICES, label="Sport")
diff --git a/website/nutriform/static/nutriform/assets/css/main.css b/website/nutriform/static/nutriform/assets/css/main.css
index 681b6ea..33d99ed 100644
--- a/website/nutriform/static/nutriform/assets/css/main.css
+++ b/website/nutriform/static/nutriform/assets/css/main.css
@@ -3265,4 +3265,10 @@
 					padding: 0;
 				}
 
+		}
+
+		.cardshadow {
+			box-shadow: white 2px 2px 6px;
+			background-color: #f32853;
+			min-height: 300px;
 		}
\ No newline at end of file
diff --git a/website/nutriform/templates/nutriform/annonces.html b/website/nutriform/templates/nutriform/annonces.html
index 3b1eaf5..f273bc4 100644
--- a/website/nutriform/templates/nutriform/annonces.html
+++ b/website/nutriform/templates/nutriform/annonces.html
@@ -8,18 +8,20 @@
         <h2>Participez à des activités sportives communautaires</h2>
     </header>
   
-    <div class="row uniform center">
+    <div class="row uniform">
     {% for annonce in annonces_list %}
-    <div class="6u 12u$(xsmall)">
-        <ul style="list-style: none;">
-            <li>{{ annonce.get_type_annonce_display }}</li>
-            <li><i>{{ annonce.date }}</i></li>
-            <li>{{ annonce.sport }}</li>
+    <div class="6u 12u$(xsmall) cardshadow">
+        <ul style="list-style: none; color: white;">
+            <li style="color: black;">{{ annonce.get_type_annonce_display }}</li>
+            <li style="color: lightgray;"><i>{{ annonce.date }}</i></li>
             <li>{{ annonce.ville }}</li>
+            <li>{{ annonce.sport }}</li>
             <li>{{ annonce.description }}</li>
         </ul>
         {% if user.is_authenticated and user != annonce.orga %}
-        <a href="mailto:{{annonce.orga.email}}" class="button">Contacter l'organisateur</a>
+        <a href="mailto:{{annonce.orga.email}}" class="button" style="margin-bottom: 10px;">Contacter l'organisateur</a>
+        {% else %}
+        <a class="button disabled" style="margin-bottom: 10px;">Contacter l'organisateur</a>
         {% endif %}
     </div>
     {% endfor %}
diff --git a/website/nutriform/templates/nutriform/carte.html b/website/nutriform/templates/nutriform/carte.html
index 7f9bc63..1e9ff6c 100644
--- a/website/nutriform/templates/nutriform/carte.html
+++ b/website/nutriform/templates/nutriform/carte.html
@@ -15,6 +15,9 @@
     </form>
     <div id="mapid">
 
+    </div>
+    <div style="height: 100px;">
+
     </div>
 
     <style>
diff --git a/website/nutriform/templates/nutriform/compte.html b/website/nutriform/templates/nutriform/compte.html
index 0135df2..cf5416c 100644
--- a/website/nutriform/templates/nutriform/compte.html
+++ b/website/nutriform/templates/nutriform/compte.html
@@ -68,7 +68,8 @@
     {% endif %}
 
 
-    <a href="{% url 'questionnaire' %}" class="button">Mon daily report</a>
+    <a href="{% url 'questionnaire' %}" class="button" style="margin-bottom: 20px;">Mon daily report</a>
+    
 
 </div class="container">
 
diff --git a/website/nutriform/templates/registration/login.html b/website/nutriform/templates/registration/login.html
index 99907d4..442da5d 100644
--- a/website/nutriform/templates/registration/login.html
+++ b/website/nutriform/templates/registration/login.html
@@ -28,6 +28,7 @@
 <input type="submit" value="se connecter" style="margin-top: 5px;">
 <input type="hidden" name="next" value="{{ next }}">
 <a href="{% url 'register' %}" class="button">S'inscrire</a>
+<a href="{% url 'password_reset' %}">Mot de passe oublié ?</a>
 
 </form>
 
diff --git a/website/website/settings.py b/website/website/settings.py
index 831b345..e5da5d7 100644
--- a/website/website/settings.py
+++ b/website/website/settings.py
@@ -127,6 +127,8 @@ EMAIL_HOST_USER = 'nutriformpima@gmail.com'
 EMAIL_HOST_PASSWORD = mdp
 EMAIL_USE_TLS = True
 
+#EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
+
 ADMINS = [('Charles', 'charles.anteunis@gmail.com'),]
 
 
-- 
GitLab