Merge branch 'main' of ssh://gitlab.viarezo.fr/2022hivertmi/site-campagne

site_campagne/campagne/views.py

@@ -29,7 +29,36 @@ def login(request): #on a le state et le authorization code dans le request
             useer.prenom = r.json()['firstName']
             useer.nom=r.json()['lastName']
             useer.save()
+<<<<<<< HEAD
+            
+        
+    # key = Fernet.generate_key()
+    # fernet = Fernet(key)
+
+    # decMessage = fernet.decrypt(encMessage).decode()
+    # encoded_token = fernet.encrypt(access_token.encode())
     reponse.set_cookie("token",access_token, secure=True) 
+    reponse.set_cookie("email",r.json()['email'], secure=True)
+    reponse.set_cookie("prenom",r.json()['firstName'], secure=True)
+    reponse.set_cookie("nom",r.json()['lastName'], secure=True)
+    reponse.set_cookie("photo",r.json()['photo'], secure=True)
+||||||| f079e9b
+            
+        
+    # key = Fernet.generate_key()
+    # fernet = Fernet(key)
+
+    # decMessage = fernet.decrypt(encMessage).decode()
+    # encoded_token = fernet.encrypt(access_token.encode())
+    # reponse.set_cookie("token",encoded_token, secure=True)
+    
+    reponse.set_cookie("email",r.json()['email'], secure=True)
+    reponse.set_cookie("prenom",r.json()['firstName'], secure=True)
+    reponse.set_cookie("nom",r.json()['lastName'], secure=True)
+    reponse.set_cookie("photo",r.json()['photo'], secure=True)
+=======
+    reponse.set_cookie("token",access_token, secure=True)
+>>>>>>> 5c38ab826a90a3ee85c0ca91fa6d0d4d0f5e69d8
     return reponse
 
 def accueil(request):
@@ -67,7 +96,17 @@ def commande_passee(request, requete):
     mail = r.json()['email']
     commande=commande_crepe.objects.create(adresse_livraison=L[4], crepe_nature=L[0], crepe_nutella=L[1], crepe_sucre=L[2], crepe_confiture=L[3],commanditaire=utilisateur.objects.get(email=mail))
     commande.save()
+<<<<<<< HEAD
+    commanditaaire=list(utilisateur.objects.filter(email=mail))[0]
+    mescommandes=commande_crepe.objects.filter(commanditaire=commanditaaire)
+    return redirect(mes_commandes)
+||||||| f079e9b
+    commanditaaire=list(utilisateur.objects.filter(email=mail))[0]
+    mescommandes=commande_crepe.objects.filter(commanditaire=commanditaaire)
+    return render(request ,"campagne/mes_commandes.html", { 'mescommandes' : mescommandes})
+=======
     return redirect(mes_commandes)
+>>>>>>> 5c38ab826a90a3ee85c0ca91fa6d0d4d0f5e69d8
 
 def mes_commandes(request):
     test=check(request)

site_campagne/static/campagne/js/hotline.js

@@ -7,24 +7,18 @@ var bouton_nutella = document.getElementById("nutella");
 var bouton_confiture = document.getElementById("confiture");
 var bouton_adresse = document.getElementById("adresse")
 
-var nature = bouton_nature.value;
-var nutella = bouton_nutella.value;
-var sucre = bouton_sucre.value;
-var confiture = bouton_confiture.value;
-var adresse = bouton_adresse.value;
-
-bouton_nature.addEventListener("click", () => {nature = bouton_nature.value}); //surement pas optimal, mais quand je changeais la valeur de l'input ca ne s'actualisait pas sans ca
-bouton_sucre.addEventListener("click", () => {sucre = bouton_sucre.value});
-bouton_nutella.addEventListener("click", () => {nutella = bouton_nutella.value});
-bouton_confiture.addEventListener("click", () => {confiture = bouton_confiture.value});
-bouton_adresse.addEventListener("input", () => {adresse = bouton_adresse.value})
 
 bloc = document.getElementById("commande_crepe");
 messageof = true
 
 function f (){
+    var nature = bouton_nature.value;
+    var nutella = bouton_nutella.value;
+    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+"_";
+        window.location = "https://astegifetobegif.cs-campus.fr/mes_commandes/"+nature+"_"+nutella+"_"+sucre+"_"+confiture+"_"
     }
     else if (messageof) {
         var paraph = document.createElement("p");