diff --git a/site_campagne/campagne/__pycache__/views.cpython-310.pyc b/site_campagne/campagne/__pycache__/views.cpython-310.pyc deleted file mode 100644 index 43de881a3d00269a1d2125d60ac1b9b6ec6d3451..0000000000000000000000000000000000000000 Binary files a/site_campagne/campagne/__pycache__/views.cpython-310.pyc and /dev/null differ diff --git a/site_campagne/campagne/static/campagne/js/hotline.js b/site_campagne/campagne/static/campagne/js/hotline.js index c5e252456b29350a687f866ed1310c5e15ee8a27..38b50e2c2abd28a9be6325b6e2e8de3ceb8547eb 100644 --- a/site_campagne/campagne/static/campagne/js/hotline.js +++ b/site_campagne/campagne/static/campagne/js/hotline.js @@ -16,7 +16,6 @@ function f (){ var sucre = bouton_sucre.value; var confiture = bouton_confiture.value; var adresse = bouton_adresse.value; - if (parseInt(nature)+parseInt(sucre)+parseInt(nutella)+parseInt(confiture) !== 0 && adresse!==""){ window.location = "https://astegifetobegif.cs-campus.fr/mes_commandes/"+nature+"_"+nutella+"_"+sucre+"_"+confiture+"_"+adresse+"_"; } diff --git a/site_campagne/campagne/templates/campagne/accueil.html b/site_campagne/campagne/templates/campagne/accueil.html index 0861e117cc9af9741b3e1071eb984597be749e0c..6d906cda6517c47f24aab26539cbf1f49a010583 100644 --- a/site_campagne/campagne/templates/campagne/accueil.html +++ b/site_campagne/campagne/templates/campagne/accueil.html @@ -17,8 +17,7 @@ <div class="text_box"> <p>ATTENTION: Pour accéder à la hotline, vous devez avoir signé <a href="https://cotiz.viarezo.fr/">la nouvelle charte du BDE</a> !!</p> <br> - <br> - <a href="" style="background-color: #e7c021; color:white;padding: 1%;border-radius: 15px;margin-top: 1%;">Hotline</a> + <a href="{% url 'hotline' %}" style="background-color: #e7c021; color:white;padding: 1%;border-radius: 15px;margin-top: 1%;">Hotline</a> </div> </div> {% endblock %} \ No newline at end of file diff --git a/site_campagne/campagne/views.py b/site_campagne/campagne/views.py index 9506295620b782d68b093bd7adc224a49b173d09..f2f5facb17e323d16b2f4e5fb884d40c18e6d6f9 100644 --- a/site_campagne/campagne/views.py +++ b/site_campagne/campagne/views.py @@ -93,6 +93,8 @@ def annuler(request, pkrequete): return redirect(mes_commandes) def prendre_en_charge(request, pkrequete): + test=check(request) + if test[0]: test=check(request) if test[0]: mail=test[1]['email'] @@ -296,39 +298,38 @@ def addtodb(): #"arthur.groussin@student-cs.fr", #"robin.charleuf@student-cs.fr", #"thibault.rousset@student-cs.fr", - #"matthieu.dominici@student-cs.fr", - #"mohamed.ladraa@student-cs.fr", - # "mateo.dufresne-d-amico@student-cs.fr", - # "arthur.besnault@student-cs.fr", - # "louis.jacquemart@student-cs.fr", - # "thibaud.arnaud@student-cs.fr", - # "felix.de-la-ronciere@student-cs.fr", - # "hugo.thevenet@student-cs.fr", - # "hugo.wolff@student-cs.fr", - # "jules.rigaud@student-cs.fr", - # "zoe.garbal@student-cs.fr", - # "vladimir.petrovic@student-cs.fr", - # "claire.robin@student-cs.fr", - # "antoine.hauser@student-cs.fr", - # "victor.athanasio@student-cs.fr", - # "simon.tronchi@student-cs.fr", - # "brieuc.devevey@student-cs.fr", - # "clara.rieffel@student-cs.fr", - # "yvan.duhen@student-cs.fr", - # "jeanbaptiste.peter@student-cs.fr", - # "romain.fournier@student-cs.fr", - # "remi.quentin@student-cs.fr", - # "thomas.meot@student-cs.fr", - # "noah.vicens@student-cs.fr", - # "robin.delebassee@student-cs.fr", - # "mohamed.larhchim@student-cs.fr", - # "hicham.bouanani@student-cs.fr", - # "matthieu.annequin@student-cs.fr", - # "valentin.odde@student-cs.fr", - # "emma.lovisa@student-cs.fr", - # "florence.remy@student-cs.fr", - # "majda.brahimi@student-cs.fr", - # "romain.picard@student-cs.fr", + "mateo.dufresne-d-amico@student-cs.fr", + "arthur.besnault@student-cs.fr", + "louis.jacquemart@student-cs.fr", + "thibaud.arnaud@student-cs.fr", + "felix.de-la-ronciere@student-cs.fr", + "hugo.thevenet@student-cs.fr", + "hugo.wolff@student-cs.fr", + "jules.rigaud@student-cs.fr", + "zoe.garbal@student-cs.fr", + "vladimir.petrovic@student-cs.fr", + "claire.robin@student-cs.fr", + "antoine.hauser@student-cs.fr", + "victor.athanasio@student-cs.fr", + "simon.tronchi@student-cs.fr", + "brieuc.devevey@student-cs.fr", + "clara.rieffel@student-cs.fr", + "yvan.duhen@student-cs.fr", + "jeanbaptiste.peter@student-cs.fr", + "romain.fournier@student-cs.fr", + "remi.quentin@student-cs.fr", + "thomas.meot@student-cs.fr", + "noah.vicens@student-cs.fr", + "robin.delebassee@student-cs.fr", + "mohamed.larhchim@student-cs.fr", + "hicham.bouanani@student-cs.fr", + "matthieu.annequin@student-cs.fr", + "valentin.odde@student-cs.fr", + "emma.lovisa@student-cs.fr", + "florence.remy@student-cs.fr", + "majda.brahimi@student-cs.fr", + "romain.picard@student-cs.fr", + "youssef.chadali@student-cs.fr", "arnaud.petit@student-cs.fr", "thomas.moreau@student-cs.fr", diff --git a/site_campagne/site_campagne/__pycache__/settings.cpython-310.pyc b/site_campagne/site_campagne/__pycache__/settings.cpython-310.pyc deleted file mode 100644 index 1efb098537e137ed9fef13593a4cc78355a7d80e..0000000000000000000000000000000000000000 Binary files a/site_campagne/site_campagne/__pycache__/settings.cpython-310.pyc and /dev/null differ diff --git a/site_campagne/site_campagne/__pycache__/urls.cpython-310.pyc b/site_campagne/site_campagne/__pycache__/urls.cpython-310.pyc deleted file mode 100644 index b0ddd77ff6e6d1221d6c7b163e43c1994e6cee47..0000000000000000000000000000000000000000 Binary files a/site_campagne/site_campagne/__pycache__/urls.cpython-310.pyc and /dev/null differ diff --git a/site_campagne/site_campagne/settings.py b/site_campagne/site_campagne/settings.py index 8792c413546cdac3ac4b06259728c7833bdd469a..0855c7d50a604aaadee044e5b26c7ca24449a003 100644 --- a/site_campagne/site_campagne/settings.py +++ b/site_campagne/site_campagne/settings.py @@ -27,6 +27,8 @@ SECRET_KEY = 'django-insecure-^pwp$p=!_g7hoyl&1kul+!v(!y9lu+6@-+1d_&auub18m^h@w( DEBUG = True +ALLOWED_HOSTS = ["138.195.139.213", "localhost", "astegifetobegif.cs-campus.fr", "*"] + ALLOWED_HOSTS = ["138.195.139.213", "localhost", "astegifetobegif.cs-campus.fr", "*"] # Application definition @@ -133,3 +135,9 @@ SESSION_ENGINE = 'encrypted_cookies' ENCRYPTED_COOKIE_KEYS = ['HZJSZGQU3fiJaG53Ha1jYZGZkxrqGDF3m-nZN3fhe46='] SESSION_COOKIE_SECURE = False +EMAIL_HOST = 'smtp.gmail.com' +EMAIL_PORT = 465 +EMAIL_HOST_USER = 'stepgifimstuck@gmail.com' +EMAIL_HOST_PASSWORD = 'hotlineCrepesLeS' +EMAIL_USE_TLS = False +EMAIL_USE_SSL = True \ No newline at end of file