Registration and entries

Makefile

@@ -3,9 +3,9 @@
 SHELL := /bin/bash
 
 install:
-	$(shell sudo sh build.sh)
-	$(shell curl -sSL https\://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py | python)
-	$(shell poetry install)
+	sudo sh build.sh
+	curl -sSL https\://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py | python
+	poetry install
 
 assets:
-	yarn run build
+	cd app ; yarn run build

app/assets/style.css

@@ -92,4 +92,8 @@ nav ul li a, nav ul li span, header .action {
 
 .entry li {
   list-style-type: none;
-}
+}
+
+.login li {
+  list-style-type: none;
+}

app/src/login.ts

@@ -2,7 +2,7 @@ let userLogin = () => {
     document.body.innerHTML +=
         `
         <div id="login" class="paper">
-          <form action="/login" method="post">
+          <form action="/user/login" method="post">
           <div class="login">
             <ul>
               <li><label for="username">Username:</label></li>
@@ -22,7 +22,7 @@ let userLogin = () => {
         'password': (document.getElementById('password') as any).value
       }
 
-      fetch('/login', {
+      fetch('/user/login', {
         method: 'POST',
         headers: {
           'Accept': 'application/json',

app/src/register.ts

@@ -2,7 +2,7 @@ let userRegister = () => {
     document.body.innerHTML +=
         `
         <div id="login" class="paper">
-          <form action="/register" method="post">
+          <form action="/user/register" method="post">
             <div class="login">
               <ul>
                 <li><label for="username">Username:</label></li>
@@ -23,24 +23,22 @@ let userRegister = () => {
         'active': 1
       }
 
-      fetch('/register', {
+      fetch('/user/register', {
         method: 'POST',
         headers: {
           'Accept': 'application/json',
           'Content-Type': 'application/json'
         },
         body: JSON.stringify(credentials)
       })
-        .then(resp=>resp.text)
+        .then(resp=>resp.text())
         .then(text=> {
           console.log(text)
-          /*
           if (text == 'success') {
             document.location.replace('/')
           } else {
             document.location.reload()
           }
-          */
         })  
     })
 }

entries/views.py

@@ -7,7 +7,7 @@
 
 def entries(request):
     e = Entries.objects.filter(user=request.user.id)
-    return render(request, 'pastes.html', {'pastes': e})
+    return render(request, 'entries.html', {'entries': e})
 
 
 def delete(request, id):

templates/entries.html

@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
 {% block content %}
-    <script src="{{ url_for('static', filename='lib/entries.js') }}"></script>
+    {% load static %}
+    <script src="{% static "/assets/lib/entries.js" %}"></script>
 {% endblock %}

templates/registration/login.html

@@ -0,0 +1,5 @@
+{% extends 'base.html' %}
+{% block content %}
+    {% load static %}
+    <script src="{% static "/assets/lib/login.js" %}"></script>
+{% endblock %}

templates/registration/register.html

@@ -0,0 +1,5 @@
+{% extends 'base.html' %}
+{% block content %}
+  {% load static %}
+  <script src="{% static "/assets/lib/register.js" %}"></script>
+{% endblock %}

user/forms.py

@@ -0,0 +1,13 @@
+from django.contrib.auth.forms import UserCreationForm
+from django.contrib.auth.models import User
+
+
+class RegisterForm(UserCreationForm):
+    class Meta:
+        model = User
+        fields = ('username', 'password1', 'password2', )
+        help_texts = {
+            'username': None,
+            'password1': None,
+            'password2': None,
+        }

user/urls.py

@@ -19,4 +19,5 @@
 
 urlpatterns = [
     path('', include('django.contrib.auth.urls')),
+    url(r'^register/$', views.register, name='register'),
 ]

user/views.py

@@ -1,3 +1,23 @@
-from django.shortcuts import render
+from django.contrib.auth import login, authenticate
+from django.shortcuts import render, redirect
 
-# Create your views here.
+from .forms import RegisterForm
+
+
+def index_view(request):
+    return render(request, 'index.html')
+
+
+def register(request):
+    if request.method == 'POST':
+        form = RegisterForm(request.POST)
+        if form.is_valid():
+            form.save()
+            username = form.cleaned_data.get('username')
+            password = form.cleaned_data.get('password1')
+            user = authenticate(username=username, password=password)
+            login(request, user)
+            return redirect('/')
+    else:
+        form = RegisterForm()
+    return render(request, 'registration/register.html', {'form': form})