diff options
| -rw-r--r-- | blog/urls.py | 1 | ||||
| -rw-r--r-- | blog/views.py | 4 | ||||
| -rw-r--r-- | templates/blog/partials/sidebar.html | 18 | ||||
| -rw-r--r-- | templates/blog/register.html | 49 | ||||
| -rw-r--r-- | users/urls.py | 1 | ||||
| -rw-r--r-- | users/views.py | 9 |
6 files changed, 72 insertions, 10 deletions
diff --git a/blog/urls.py b/blog/urls.py index e00f3183..568d0cb9 100644 --- a/blog/urls.py +++ b/blog/urls.py @@ -7,5 +7,6 @@ urlpatterns = [ path('my/', RedirectView.as_view(pattern_name='account', permanent=False)), path('account/', RedirectView.as_view(pattern_name='account', permanent=False)), path('my/account', views.account, name='account'), + path('register/', views.register, name='register'), # path('my/homepage', views.homepage, name='homepage'), ] diff --git a/blog/views.py b/blog/views.py index 5fa42889..b5c54182 100644 --- a/blog/views.py +++ b/blog/views.py @@ -30,3 +30,7 @@ def account(request): def homepage(request): return render(request, 'blog/homepage.html', {'title': 'Homepage'}) + + +def register(request): + return render(request, 'blog/register.html', {'title': 'Register New User'}) diff --git a/templates/blog/partials/sidebar.html b/templates/blog/partials/sidebar.html index 63fb8dde..82a0b62f 100644 --- a/templates/blog/partials/sidebar.html +++ b/templates/blog/partials/sidebar.html @@ -22,14 +22,16 @@ <input type="submit" value="Login"> </form> {% for message in messages %} - {% if message.message == "EVERR" %} - <form method="post" action="{% url 'users:sendverificationemail' %}" > - <p class="{{message.tags}}"> - Your email is unverified. Please check your inbox for a verification email or to request a new verification email by clicking{% csrf_token %}<input type="hidden" name="username"><input style="display: inline; background: none; border: none; color: blue; text-decoration: underline; cursor: pointer; margin: 0;" type="submit" value="here."> - </p> - </form> - {% else %} - <p class="{{message.tags}}">{{message.message}}</p> + {% if 'loginError' in message.tags %} + {% if message.message == "EVERR" %} + <form method="post" action="{% url 'users:sendverificationemail' %}" > + <p class="{{message.tags}}"> + Your email is unverified. Please check your inbox for a verification email or to request a new verification email by clicking{% csrf_token %}<input type="hidden" name="username"><input style="display: inline; background: none; border: none; color: blue; text-decoration: underline; cursor: pointer; margin: 0;" type="submit" value="here."> + </p> + </form> + {% else %} + <p class="{{message.tags}}">{{message.message}}</p> + {% endif %} {% endif %} {% endfor %} </fieldset> diff --git a/templates/blog/register.html b/templates/blog/register.html new file mode 100644 index 00000000..aa0600da --- /dev/null +++ b/templates/blog/register.html @@ -0,0 +1,49 @@ +{% extends 'blog/partials/base.html' %} {% block content %} +<div class="main"> + <section> + <h1>Register for an account</h1> + <p>Register for an account to post your thoughts and get feedback from other users.</p> + <form action="{% url 'users:register' %}" method="post" autocomplete="off"> + {% csrf_token %} + <div> + <label for="username">Username</label> + <input type="text" name="username" id="username" class="form-control" placeholder="Username" required> + {% for message in messages %} + {% if 'usernameError' in message.tags %} + <small class="error" style="display:block;">{{ message.message }}</small> + {% endif %} + {% endfor %} + </div> + <div> + <label for="email">Email</label> + <input type="email" name="email" id="email" class="form-control" placeholder="Email" required> + {% for message in messages %} + {% if 'emailError' in message.tags %} + <small class="error" style="display:block;">{{ message.message }}</small> + {% endif %} + {% endfor %} + </div> + <div> + <label for="password">Password</label> + <input type="password" name="password" id="password" class="form-control" placeholder="Password" required> + {% for message in messages %} + {% if 'passwordError' in message.tags %} + <small class="error" style="display:block;">{{ message.message }}</small> + {% endif %} + {% endfor %} + </div> + <div> + <label for="password2">Confirm Password</label> + <input type="password" name="password2" id="password2" class="form-control" placeholder="Confirm Password" required> + {% for message in messages %} + {% if 'password2Error' in message.tags %} + <small class="error" style="display:block;">{{ message.message }}</small> + {% endif %} + {% endfor %} + </div> + <div> + <button type="submit" class="btn btn-primary" style="margin-top:10px">Register</button> + </div> + </section> +</div> +{% endblock %} diff --git a/users/urls.py b/users/urls.py index 48b1d87b..3661d871 100644 --- a/users/urls.py +++ b/users/urls.py @@ -13,6 +13,7 @@ urlpatterns = [ path('verifyemail/<uidb64>/<token>', views.verify_email, name='verifyemail'), path('sendchangeuseremail', views.send_change_user_email, name='sendchangeuseremail'), path('changeemail/<uidb64>/<token>', views.change_email, name='changeemail'), + path('register', views.register, name='register'), ] # Configure Admin Site diff --git a/users/views.py b/users/views.py index a269c2ef..3887480f 100644 --- a/users/views.py +++ b/users/views.py @@ -33,10 +33,10 @@ def login_user(request): login(request, user) return HttpResponseRedirect(next) else: - messages.error(request, 'EVERR') + messages.error(request, 'EVERR', extra_tags='loginError') return HttpResponseRedirect(next + '?username=' + username) else: - messages.error(request, 'Invalid username or password.') + messages.error(request, 'Invalid username or password.', extra_tags='loginError') return HttpResponseRedirect(next + '?username=' + username) def logout_user(request): @@ -187,3 +187,8 @@ def change_email(request, uidb64, token): else: messages.error(request, 'The verification link is invalid!') return redirect('/') + + +def register(request): + messages.error(request, 'Registration is currently disabled!', extra_tags='password2Error') + return HttpResponseRedirect(request.META.get('HTTP_REFERER')) |