fixed history.html , contact us section added again history.html, supporter list style added, changed digitalglarus login, Fixed digitalglarus login form when user sent nothing,Fixed digitalglarus signup form , Fixed relaway font bug
This commit is contained in:
parent
d567bd257f
commit
dca2250378
10 changed files with 8377 additions and 206 deletions
|
|
@ -9,10 +9,11 @@ from django.http import HttpResponseRedirect
|
|||
from django.contrib.auth import login
|
||||
|
||||
from .models import CustomUser,StripeCustomer
|
||||
from .forms import (LoginForm, RegisterForm, PaymentForm)
|
||||
from .forms import LoginForm, RegisterForm, PaymentForm
|
||||
from utils.stripe_utils import StripeUtils
|
||||
|
||||
|
||||
|
||||
def validate_email(request, validate_slug):
|
||||
validated = CustomUser.validate_url(validate_slug)
|
||||
if validated:
|
||||
|
|
@ -88,16 +89,24 @@ class LoginRegistrationView(View):
|
|||
{'login_form': login_form, 'register_form': register_form})
|
||||
|
||||
def post(self, request):
|
||||
email = request.POST.get('email')
|
||||
password = request.POST.get('password')
|
||||
name = request.POST.get('name')
|
||||
if name and email and password:
|
||||
user = CustomUser.register(name, password, email)
|
||||
if user:
|
||||
return render(request, 'templates/success.html')
|
||||
is_login = request.POST.get('is_login', False)
|
||||
|
||||
if not is_login:
|
||||
form = RegisterForm(request.POST)
|
||||
if form.is_valid():
|
||||
email = form.validated_data.get('email')
|
||||
password = form.validated_data.get('password')
|
||||
name = form.validated_data.get('name')
|
||||
user = CustomUser.register(name, password, email)
|
||||
if user:
|
||||
return render(request, 'templates/success.html')
|
||||
else:
|
||||
return render(request, 'templates/error.html')
|
||||
else:
|
||||
return render(request, 'templates/error.html')
|
||||
elif email and password and not name:
|
||||
login_form = LoginForm()
|
||||
return render(request, 'templates/login.html',
|
||||
context={'login_form': login_form, 'register_form': form})
|
||||
else:
|
||||
form = LoginForm(request.POST)
|
||||
if form.is_valid():
|
||||
user = form.login(request)
|
||||
|
|
@ -106,8 +115,8 @@ class LoginRegistrationView(View):
|
|||
return redirect('membership')
|
||||
else:
|
||||
registration_form = RegisterForm()
|
||||
return render(request,'templates/login.html', context={'login_form':form,'register_form':registration_form})
|
||||
|
||||
return render(request, 'templates/login.html',
|
||||
context={'login_form': form, 'register_form': registration_form})
|
||||
|
||||
|
||||
class MembershipView(View):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue