From f02e4cd8a354bf896e4d6e679b887e31848d3a0f Mon Sep 17 00:00:00 2001 From: prance Date: Thu, 27 Jan 2022 23:23:22 +0100 Subject: [PATCH] change home view --- MUOR/MUOR/migrations/__init__.py | 0 MUOR/MUOR/models.py | 2 -- MUOR/MUOR/settings.py | 2 +- MUOR/MUOR/urls.py | 8 +++++--- MUOR/MUOR/views.py | 14 ++++++++++---- MUOR/db.sqlite3 | Bin 131072 -> 143360 bytes 6 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 MUOR/MUOR/migrations/__init__.py diff --git a/MUOR/MUOR/migrations/__init__.py b/MUOR/MUOR/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/MUOR/MUOR/models.py b/MUOR/MUOR/models.py index 9f6575f19..b2dac4d70 100644 --- a/MUOR/MUOR/models.py +++ b/MUOR/MUOR/models.py @@ -1,6 +1,4 @@ -from django.contrib.auth.models import User from django.db import models -from django.contrib.auth.base_user import AbstractBaseUser from django.contrib.auth.models import AbstractUser diff --git a/MUOR/MUOR/settings.py b/MUOR/MUOR/settings.py index b234d5f5e..8af1353f3 100644 --- a/MUOR/MUOR/settings.py +++ b/MUOR/MUOR/settings.py @@ -37,7 +37,7 @@ INSTALLED_APPS = [ 'django.contrib.messages', 'django.contrib.staticfiles', 'crispy_forms', - 'MUOR' + 'MUOR', ] MIDDLEWARE = [ diff --git a/MUOR/MUOR/urls.py b/MUOR/MUOR/urls.py index a02711f40..66476216a 100644 --- a/MUOR/MUOR/urls.py +++ b/MUOR/MUOR/urls.py @@ -25,7 +25,9 @@ urlpatterns = [ path('admin/', admin.site.urls), path('', include('django.contrib.auth.urls')), path('signup/', SignUpView.as_view(), name='signup'), - path('', TemplateView.as_view(template_name='home.html'), name='home'), - path('favicon.ico', RedirectView.as_view(url=staticfiles_storage.url('images/favicon.ico'))), - path('test/', views.test, name='test') + path('welcome/', TemplateView.as_view(template_name='home.html'), + name='home'), + path('favicon.ico', RedirectView.as_view( + url=staticfiles_storage.url('images/favicon.ico'))), + path('', views.home, name='home') ] diff --git a/MUOR/MUOR/views.py b/MUOR/MUOR/views.py index 68c4e39e8..e54ccfc31 100644 --- a/MUOR/MUOR/views.py +++ b/MUOR/MUOR/views.py @@ -1,13 +1,16 @@ +from django.contrib.auth import logout from django.contrib.auth.forms import UserCreationForm -from django.contrib.auth.models import User from django.http import JsonResponse +from django.shortcuts import redirect from django.urls import reverse_lazy from django.views import generic +from .models import Profile + class SignUpForm(UserCreationForm): class Meta: - model = User + model = Profile fields = ('username', 'email',) def save(self, commit=True): @@ -20,5 +23,8 @@ class SignUpView(generic.CreateView): template_name = 'registration/signup.html' -def test(request): - return JsonResponse(request.COOKIES) +def home(request): + if request.user.is_authenticated: + logout(request) + + return redirect("/welcome") diff --git a/MUOR/db.sqlite3 b/MUOR/db.sqlite3 index 09efcccb6d69411e5ff24fa1abe3ccc22f59493f..66b5fe7549d2cb2439f86900fceff2c2c9acca3d 100644 GIT binary patch delta 4411 zcmb7HYj7LY72a#Dv}+4LlcWdtHn*gSK&Qy09J9&bKmA7?7!F_vq`prd6W4*lVIvC?^~X*j9A>ut^B8E zC|Zq#%Nx&2`FwVIDv!>(ZPo}c2;Kfbw-D+KMWTUNu)hwy-4daQ^pc5ghDnaoZph)%slAQ}n8x}cG;dE|#4ZDR%-vFfF9bv})>nldZi&?D0xLvut|I7F_a?7i8^K`+vG5XM zf=dK^4t@Za;FC~>zsFTG0Vlc$D{1Heskzzl*nfagmzON=K90Db9Klv;!(5O-Qp+S?MS#502x|Ur{#KlAsMxsZ6G9 z)>KCVFEFWang@;QPLl>#j(bU|!7Xaq1{Kew;AtA0if7c*t5>%gE9qHF%1U~5Dx6VA zueN~%K0vB)2dAfIrK#E3V>41;O(O{cfYdN`E3mYn;p!GR8wol9sbK502qr%>0XRs& zK^)v3xLEK5jwo!2(@iYvqpRb@O!{zUR7mE>Q$i@bK@|M>wPE}5q4a^AC=MLhAK4we z{lG%(csQKhFw)WAKNvX>937b$m>Z8B2<7+2g`@j#^QYz(zL8&u9>4vYho_J1Pxs6o z*dq7^!RHV71oasc{N4UAZj$CeFcuw4=Z+l?AZFUpr1Z~7chKJ{2x3g|DFR^FYS$3G+%vLe)F&CM~nK@>J z5g0Qb059MpzH6a9P9p)lK1v>60WQjch4ug?Kez%~sb)=hRuP)8(AGi8D=VOR(cP$Q zx}l=>dQwxol5Bo1FXh_o%HEDum8h7M@?J7(C>d!P*UC^aDrrlK^ zpssuB6)HYsi9eoXn7^^azfKcW{^nnqlTYbPGN&DElJ{K;^kto%M@{$>^r^aqNUNMHb|`*Bn3?> z76T+bZ@gnUQ1dj{w{%MrWfw(ovTZh%o{&@Ur zf#OW4u8fn-c=&X7EIT!e&QlGH-W+{p-iRKj?u-xFDZAGT?oFadHDHM4p%^KQ#jbp5A7KkXfM>-D0^!wC`=;1 zr3qM2t+`SDI1TorGhi5SC_q}#Q&n~HZxi4QMlFfw0fUaPHu+}>U`G!alB8uj!58Ds zDzO1QXA#JnC2yVl(J0uA{3MMU&5YbJ20kz>4KWwq?gzI45HA+Dm?DkkT(#)kOa}B4 zUD!}B&q$yLnDOChV3qBo;4MR;k48MZ8@V`Io*V}`K*^WK!LKh|8UmeQ6KhG}%6WsR zUZJ0%kI~zxtm!3_+gL+xGmNqSVTYNEmY100Rd1j`O_8)Ds?Osdk10Rua9tb)hC+Rp z{Q2Er3uu#rDX_13ZyRNw>ji~-vQrspK~L||Nx*N*L_?!tDJ|+3lFGBHoB4T{mc9O= z?TP)BWut&Jmq9%IuA$0hxi|^Di-R7@K8-mXS;Jw?QRT6d%x03J6buEULaF}CHMyFb z^V;0X;9cd*OMX4{^+`7@maZq5ho^msX{GH2TQ6AZ{r^0;dT&zv@n<9{7L{VjxvA`t z>jvD>GmP@Ab?Z}OyT_( zOLFl_C^eSrAgv9fj^{B8#u0DfAmlb*su@^>kAI9oQnya$hVlEnAiP zq9)ZZ-QZA%#>v{NLql8BV_UUM>8F)urqqVo39gPPerVT-Iv4oe!~KJCbizV44kvab zh7&_QiQ6kHOqpJb*xQ-u+^mPk^GzC)a{Sy>K07ugWv(La8S1}nPlE61OZ4o-Czi}_ z*~0tV@n(&R!k|2wL;;T`jRv+*?xm^h6mF(^BW-?-4zw?gHdFTAUT|{f)i{((X?35g zNc`%>x^*I@0Vy5WhGOQx*PiNknIw|AKzs)emIXs0?2{i#flZ)Q{%Hz4Z0t1IceN{b z6gia!EsO`>Uupa%3N<&%PiFDham#EU*i6}d zK5$x;KRty1sPGr;hrw20y3RF2J~sh&0P`}q{8jSYCp^Aqoq3V2;@-hG)wj4R;Kg&V f6`c8mu7WH068$>}HWZ7zD!-5AcOYmf#+&~KzOXK2 delta 6045 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 Q-TIHPP9tzgZ+#d4HywRXng9R*