From 2932a79c9f988390b821200f212d09819d74dc56 Mon Sep 17 00:00:00 2001
From: Hivert Milo <milo.hivert@student-cs.fr>
Date: Sat, 3 Dec 2022 20:17:32 +0100
Subject: [PATCH] merge tiber
---
.../__pycache__/views.cpython-310.pyc | Bin 14358 -> 14300 bytes
site_campagne/campagne/views.py | 6 ------
.../__pycache__/urls.cpython-310.pyc | Bin 1801 -> 1776 bytes
site_campagne/site_campagne/urls.py | 2 --
4 files changed, 8 deletions(-)
diff --git a/site_campagne/campagne/__pycache__/views.cpython-310.pyc b/site_campagne/campagne/__pycache__/views.cpython-310.pyc
index b38e963ae6ac54b346597b64c358c1c0164c10f8..80796424bbfe4d2ce58f9f4c08c1b9ceda4766de 100644
GIT binary patch
delta 79
zcmbPMa3`NPpO=@5fq{Wx%YyD?`Hj5c?2MZxr?OiKTIuWO<R>TQWaJl@SXmet7;HYv
T&dDSuno&|xfGNkx#j6JZ!nGH$
delta 137
zcmcbUKdpc_pO=@5fq{X+W?px4<VN0bcE<CQQ`xQbimmkZ6N^hy(=*djOY)OIv|e(t
uZgOI7L20pGT9JNcUP)?EZfZ(qVrEh5<_+weOvXkTB_#zUYCO-$s|Ns@)iBNg
diff --git a/site_campagne/campagne/views.py b/site_campagne/campagne/views.py
index 88801acc..ffdd53ed 100644
--- a/site_campagne/campagne/views.py
+++ b/site_campagne/campagne/views.py
@@ -10,7 +10,6 @@ import json
from django.core.mail import send_mail
import datetime
-<<<<<<< HEAD
encrypt={'A': 'b', 'B': '7', 'C': 'U', 'D': 'f', 'E': '_', 'F': 'A', 'G': '1', 'H': 'V', 'I': 'r', 'J': 'p', 'K': 'X', 'L': 'i', 'M': 'L', 'N': 'h', 'O': 'B', 'P': '8', 'Q': '2', 'R': 'W', 'S': 'l', 'T': '.', 'U': 'E', 'V': 'D', 'W': 'u', 'X': '-', 'Y': 't', 'Z': 'Y', 'a': 'O', 'b': 'G', 'c': 'Z', 'd': 'K', 'e': 'q', 'f': '9', 'g': 'T', 'h': 'S', 'i': 'M', 'j': 'Q', 'k': 'R', 'l': 'n', 'm': 'z', 'n': 'I', 'o': 's', 'p': 'k', 'q': 'o', 'r': 'y', 's': '/', 't': 'c', 'u': 'N', 'v': 'J', 'w': 'x', 'x': 'd', 'y': 'H', 'z': 'C', '0': '4', '1': '6', '2': '+', '3': 'j', '4': 'm', '5': 'w', '6': 'g', '7': 'e', '8': 'a', '9': '5', '+': 'P', '/': '3', '.': 'v', '-': 'F', '_': '0'}
decrypt={'b': 'A', '7': 'B', 'U': 'C', 'f': 'D', '_': 'E', 'A': 'F', '1': 'G', 'V': 'H', 'r': 'I', 'p': 'J', 'X': 'K', 'i': 'L', 'L': 'M', 'h': 'N', 'B': 'O', '8': 'P', '2': 'Q', 'W': 'R', 'l': 'S', '.': 'T', 'E': 'U', 'D': 'V', 'u': 'W', '-': 'X', 't': 'Y', 'Y': 'Z', 'O': 'a', 'G': 'b', 'Z': 'c', 'K': 'd', 'q': 'e', '9': 'f', 'T': 'g', 'S': 'h', 'M': 'i', 'Q': 'j', 'R': 'k', 'n': 'l', 'z': 'm', 'I': 'n', 's': 'o', 'k': 'p', 'o': 'q', 'y': 'r', '/': 's', 'c': 't', 'N': 'u', 'J': 'v', 'x': 'w', 'd': 'x', 'H': 'y', 'C': 'z', '4': '0', '6': '1', '+': '2', 'j': '3', 'm': '4', 'w': '5', 'g': '6', 'e': '7', 'a': '8', '5': '9', 'P': '+', '3': '/', 'v': '.', 'F': '-', '0': '_'}
@@ -28,11 +27,6 @@ def decryptmess(message):
mess=mess+decrypt[message[i]]
return mess
-=======
-def test(request):
- commandes=commande_crepe.objects.all()
- return render(request,'campagne/test.html',{'commandes':commandes})
->>>>>>> origin/tiber
def connexion(request):
return HttpResponseRedirect('https://auth.viarezo.fr/oauth/authorize/?redirect_uri=http://localhost:8000&client_id=2fe828e15647fc92437727b6646ce5c799c40991&response_type=code&state=sqdkfjhsqdkf&scope=default')
diff --git a/site_campagne/site_campagne/__pycache__/urls.cpython-310.pyc b/site_campagne/site_campagne/__pycache__/urls.cpython-310.pyc
index e5f0c9018439b19a84f8429cefc6c6a20a2999cc..564778d8c9812e118ff3978c41e43ac610850130 100644
GIT binary patch
delta 86
zcmeC=`@qYa&&$ijz`($8ctLlv>O@{yMwyM;;*4DBf>9DFD!~kzs++?Ytyq}-G$kj`
qVqGlCU0Re=kXTZZT9jA3lA%bNfq|h&dU6C?J)_R#8*I8v9Pa_Kd>0=8
delta 111
zcmeys+sVh9&&$ijz`($ew4giLZ6dEMquNGoaYm6;mK2p#wk(NergWhw$rROK22Hii
zK8#i@Tve<ksl_GwewtE~J6RV?vw(QFxJ!$23KC07Qj7A6S27gIFfcF_$xL=+t7p`k
Ne2`6-g^P*fEdV|39y<U4
diff --git a/site_campagne/site_campagne/urls.py b/site_campagne/site_campagne/urls.py
index 3bbbe5ff..928e1e2a 100644
--- a/site_campagne/site_campagne/urls.py
+++ b/site_campagne/site_campagne/urls.py
@@ -35,6 +35,4 @@ urlpatterns = [
path('vip', views.vip, name='vip'),
path('intermediaire/', views.login, name="login"),
path('',views.login, name="login"),
-
- path('test/',views.test),
]
--
GitLab