Compare commits
27 Commits
b12c03074a
...
jspong
Author | SHA1 | Date | |
---|---|---|---|
63e1520e6a | |||
754e5867f2 | |||
ca6dba2763 | |||
aa35514c44 | |||
12056554fc | |||
c2317d5404 | |||
25f315c24f | |||
c2b6dbb989 | |||
086c20bddc | |||
a9cdde963d | |||
3403577c3e | |||
5d8005df44 | |||
65a027014b | |||
bf3393e9a9 | |||
9ae0dd0e28 | |||
d64e62101a | |||
84a5a592ca | |||
a6666b889f | |||
9947ea37e2 | |||
7e34f883aa | |||
07d06253ba | |||
d5e692449b | |||
6dc0293455 | |||
b5b54a98ba | |||
25721bdda8 | |||
27044e9bdb | |||
3f3ab52a09 |
@ -1,7 +0,0 @@
|
|||||||
from rest_framework.serializers import Serializer, CharField
|
|
||||||
|
|
||||||
class ChangePasswordSerializer(Serializer):
|
|
||||||
|
|
||||||
current_password = CharField()
|
|
||||||
new_password = CharField()
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
|||||||
from .register import *
|
from .register import *
|
||||||
from .login import *
|
from .login import *
|
||||||
from .change_password import *
|
from .logout import *
|
||||||
|
from .edit import *
|
||||||
from .delete import *
|
from .delete import *
|
@ -1,31 +0,0 @@
|
|||||||
from django.test import TestCase
|
|
||||||
|
|
||||||
# Create your tests here.
|
|
||||||
from django.test.client import Client
|
|
||||||
from django.http import HttpResponse
|
|
||||||
from django.contrib.auth.models import User
|
|
||||||
|
|
||||||
import uuid
|
|
||||||
|
|
||||||
class ChangePasswordTest(TestCase):
|
|
||||||
def setUp(self):
|
|
||||||
self.client = Client()
|
|
||||||
|
|
||||||
self.url = "/accounts/change_password"
|
|
||||||
|
|
||||||
self.username: str = str(uuid.uuid4())
|
|
||||||
self.password: str = str(uuid.uuid4())
|
|
||||||
self.new_password: str = str(uuid.uuid4())
|
|
||||||
|
|
||||||
User.objects.create_user(username = self.username, password = self.password)
|
|
||||||
|
|
||||||
def test_normal(self):
|
|
||||||
self.client.login(username = self.username, password = self.password)
|
|
||||||
response: HttpResponse = self.client.post(self.url, {"current_password": self.password, "new_password": self.new_password})
|
|
||||||
response_text: str = response.content.decode('utf-8')
|
|
||||||
self.assertEqual(response_text, '"password changed"')
|
|
||||||
|
|
||||||
def test_nologged(self):
|
|
||||||
response: HttpResponse = self.client.post(self.url, {"current_password": self.password, "new_password": self.new_password})
|
|
||||||
errors: dict = eval(response.content)
|
|
||||||
self.assertDictEqual(errors, {'detail': 'Authentication credentials were not provided.'})
|
|
@ -11,7 +11,7 @@ class DeleteTest(TestCase):
|
|||||||
def setUp(self):
|
def setUp(self):
|
||||||
self.client = Client()
|
self.client = Client()
|
||||||
|
|
||||||
self.url = "/accounts/delete"
|
self.url = "/api/accounts/delete"
|
||||||
|
|
||||||
self.username: str = str(uuid.uuid4())
|
self.username: str = str(uuid.uuid4())
|
||||||
self.password: str = str(uuid.uuid4())
|
self.password: str = str(uuid.uuid4())
|
||||||
@ -21,12 +21,17 @@ class DeleteTest(TestCase):
|
|||||||
|
|
||||||
|
|
||||||
def test_normal_delete(self):
|
def test_normal_delete(self):
|
||||||
response: HttpResponse = self.client.post(self.url)
|
response: HttpResponse = self.client.delete(self.url, {"password": self.password}, content_type='application/json')
|
||||||
response_text: str = response.content.decode("utf-8")
|
response_text: str = response.content.decode("utf-8")
|
||||||
self.assertEqual(response_text, '"user deleted"')
|
self.assertEqual(response_text, '"user deleted"')
|
||||||
|
|
||||||
|
def test_wrong_pass(self):
|
||||||
|
response: HttpResponse = self.client.delete(self.url, {"password": "cacaman a frapper"}, content_type='application/json')
|
||||||
|
errors: dict = eval(response.content)
|
||||||
|
self.assertDictEqual(errors, {"password": ["Password wrong."]})
|
||||||
|
|
||||||
def test_no_logged(self):
|
def test_no_logged(self):
|
||||||
self.client.logout()
|
self.client.logout()
|
||||||
response: HttpResponse = self.client.post(self.url)
|
response: HttpResponse = self.client.delete(self.url, {"password": self.password}, content_type='application/json')
|
||||||
errors: dict = eval(response.content)
|
errors: dict = eval(response.content)
|
||||||
self.assertDictEqual(errors, {"detail":"Authentication credentials were not provided."})
|
self.assertDictEqual(errors, {"detail":"Authentication credentials were not provided."})
|
49
accounts/tests/edit.py
Normal file
49
accounts/tests/edit.py
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
from django.test import TestCase
|
||||||
|
|
||||||
|
# Create your tests here.
|
||||||
|
from django.test.client import Client
|
||||||
|
from django.http import HttpResponse
|
||||||
|
from django.contrib.auth.models import User
|
||||||
|
|
||||||
|
import uuid
|
||||||
|
|
||||||
|
class EditTest(TestCase):
|
||||||
|
def setUp(self):
|
||||||
|
self.client = Client()
|
||||||
|
|
||||||
|
self.url = "/api/accounts/edit"
|
||||||
|
|
||||||
|
self.username: str = str(uuid.uuid4())
|
||||||
|
self.password: str = str(uuid.uuid4())
|
||||||
|
self.new_password: str = str(uuid.uuid4())
|
||||||
|
|
||||||
|
User.objects.create_user(username = self.username, password = self.password)
|
||||||
|
|
||||||
|
def test_normal(self):
|
||||||
|
self.client.login(username = self.username, password = self.password)
|
||||||
|
response: HttpResponse = self.client.patch(self.url, {"current_password": self.password, "new_password": self.new_password, "username": "bozo"}, content_type='application/json')
|
||||||
|
response_text: str = response.content.decode('utf-8')
|
||||||
|
self.assertEqual(response_text, '"data has been alterate"')
|
||||||
|
|
||||||
|
def test_invalid_current_password(self):
|
||||||
|
self.client.login(username = self.username, password = self.password)
|
||||||
|
response: HttpResponse = self.client.patch(self.url, {"current_password": "bozo", "new_password": self.new_password, "username": "bozo"}, content_type='application/json')
|
||||||
|
errors: dict = eval(response.content)
|
||||||
|
self.assertDictEqual(errors, {"current_password":["Password is wrong."]})
|
||||||
|
|
||||||
|
def test_invalid_new_username_blank(self):
|
||||||
|
self.client.login(username = self.username, password = self.password)
|
||||||
|
response: HttpResponse = self.client.patch(self.url, {"current_password": self.password, "username": " "}, content_type='application/json')
|
||||||
|
errors: dict = eval(response.content)
|
||||||
|
self.assertDictEqual(errors, {'username': ['This field may not be blank.']})
|
||||||
|
|
||||||
|
def test_invalid_new_username_char(self):
|
||||||
|
self.client.login(username = self.username, password = self.password)
|
||||||
|
response: HttpResponse = self.client.patch(self.url, {"current_password": self.password, "username": "*&"}, content_type='application/json')
|
||||||
|
errors: dict = eval(response.content)
|
||||||
|
self.assertDictEqual(errors, {'username': ['Enter a valid username. This value may contain only letters, numbers, and @/./+/-/_ characters.']})
|
||||||
|
|
||||||
|
def test_nologged(self):
|
||||||
|
response: HttpResponse = self.client.patch(self.url, {"current_password": self.password, "new_password": self.new_password}, content_type='application/json')
|
||||||
|
errors: dict = eval(response.content)
|
||||||
|
self.assertDictEqual(errors, {'detail': 'Authentication credentials were not provided.'})
|
@ -10,7 +10,7 @@ class LoginTest(TestCase):
|
|||||||
def setUp(self):
|
def setUp(self):
|
||||||
self.client = Client()
|
self.client = Client()
|
||||||
|
|
||||||
self.url = "/accounts/login"
|
self.url = "/api/accounts/login"
|
||||||
|
|
||||||
self.username: str = str(uuid.uuid4())
|
self.username: str = str(uuid.uuid4())
|
||||||
self.password: str = str(uuid.uuid4())
|
self.password: str = str(uuid.uuid4())
|
||||||
|
@ -8,7 +8,7 @@ class LoginTest(TestCase):
|
|||||||
def setUp(self):
|
def setUp(self):
|
||||||
self.client = Client()
|
self.client = Client()
|
||||||
|
|
||||||
self.url = "/accounts/logout"
|
self.url = "/api/accounts/logout"
|
||||||
|
|
||||||
self.client.login()
|
self.client.login()
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ class RegisterTest(TestCase):
|
|||||||
def setUp(self):
|
def setUp(self):
|
||||||
self.client = Client()
|
self.client = Client()
|
||||||
|
|
||||||
self.url: str = "/accounts/register"
|
self.url: str = "/api/accounts/register"
|
||||||
|
|
||||||
self.username: str = str(uuid.uuid4())
|
self.username: str = str(uuid.uuid4())
|
||||||
self.password: str = str(uuid.uuid4())
|
self.password: str = str(uuid.uuid4())
|
||||||
|
@ -1,12 +1,13 @@
|
|||||||
from django.urls import path
|
from django.urls import path
|
||||||
|
|
||||||
from .views import register, login, logout, delete, change_password
|
from .views import register, login, logout, delete, edit, logged
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path("register", register.RegisterView.as_view(), name="register"),
|
path("register", register.RegisterView.as_view(), name="register"),
|
||||||
path("login", login.LoginView.as_view(), name="login"),
|
path("login", login.LoginView.as_view(), name="login"),
|
||||||
path("logout", logout.LogoutView.as_view(), name="logout"),
|
path("logout", logout.LogoutView.as_view(), name="logout"),
|
||||||
|
path("logged", logged.LoggedView.as_view(), name="logged"),
|
||||||
path("delete", delete.DeleteView.as_view(), name="delete"),
|
path("delete", delete.DeleteView.as_view(), name="delete"),
|
||||||
path("change_password", change_password.ChangePasswordView.as_view(), name="change_password")
|
path("edit", edit.EditView.as_view(), name="change_password")
|
||||||
|
|
||||||
]
|
]
|
@ -1,25 +0,0 @@
|
|||||||
from rest_framework.views import APIView
|
|
||||||
from rest_framework.response import Response
|
|
||||||
from rest_framework import permissions, status
|
|
||||||
from django.http import HttpRequest
|
|
||||||
from django.contrib.auth import login
|
|
||||||
from rest_framework.authentication import SessionAuthentication
|
|
||||||
from django.contrib.auth.models import User
|
|
||||||
|
|
||||||
from ..serializers.change_password import ChangePasswordSerializer
|
|
||||||
|
|
||||||
class ChangePasswordView(APIView):
|
|
||||||
|
|
||||||
permission_classes = (permissions.IsAuthenticated,)
|
|
||||||
authentication_classes = (SessionAuthentication,)
|
|
||||||
|
|
||||||
def post(self, request: HttpRequest):
|
|
||||||
data = request.data
|
|
||||||
|
|
||||||
serializer = ChangePasswordSerializer(data=data)
|
|
||||||
if serializer.is_valid(raise_exception=True):
|
|
||||||
user: User = request.user
|
|
||||||
if (user.check_password(data['current_password']) == 0):
|
|
||||||
return Response({'current_password': "The password is not right."}, status=status.HTTP_200_OK)
|
|
||||||
user.set_password(data["new_password"])
|
|
||||||
return Response('password changed', status=status.HTTP_200_OK)
|
|
@ -7,6 +7,13 @@ from rest_framework.authentication import SessionAuthentication
|
|||||||
class DeleteView(APIView):
|
class DeleteView(APIView):
|
||||||
permission_classes = (permissions.IsAuthenticated,)
|
permission_classes = (permissions.IsAuthenticated,)
|
||||||
authentication_classes = (SessionAuthentication,)
|
authentication_classes = (SessionAuthentication,)
|
||||||
def post(self, request: HttpRequest):
|
def delete(self, request: HttpRequest):
|
||||||
|
data: dict = request.data
|
||||||
|
|
||||||
|
password: str = data["password"]
|
||||||
|
if (password is None):
|
||||||
|
return Response({"password": ["This field may not be blank."]})
|
||||||
|
if (request.user.check_password(password) == False):
|
||||||
|
return Response({"password": ["Password wrong."]})
|
||||||
request.user.delete()
|
request.user.delete()
|
||||||
return Response("user deleted", status=status.HTTP_200_OK)
|
return Response("user deleted", status=status.HTTP_200_OK)
|
45
accounts/views/edit.py
Normal file
45
accounts/views/edit.py
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
from rest_framework.views import APIView
|
||||||
|
from rest_framework.response import Response
|
||||||
|
from rest_framework import permissions, status
|
||||||
|
from django.http import HttpRequest
|
||||||
|
from django.contrib.auth import login
|
||||||
|
from rest_framework.authentication import SessionAuthentication
|
||||||
|
from django.contrib.auth.models import User
|
||||||
|
import re
|
||||||
|
|
||||||
|
class EditView(APIView):
|
||||||
|
|
||||||
|
permission_classes = (permissions.IsAuthenticated,)
|
||||||
|
authentication_classes = (SessionAuthentication,)
|
||||||
|
|
||||||
|
def get(self, request: HttpRequest):
|
||||||
|
return Response({"username": request.user.username})
|
||||||
|
|
||||||
|
def patch(self, request: HttpRequest):
|
||||||
|
data: dict = request.data
|
||||||
|
|
||||||
|
current_password: str = data.get("current_password")
|
||||||
|
if (current_password is None):
|
||||||
|
return Response({"current_password": ["This field may not be blank."]})
|
||||||
|
|
||||||
|
user_object = request.user
|
||||||
|
|
||||||
|
if (user_object.check_password(current_password) == False):
|
||||||
|
return Response({"current_password": ["Password is wrong."]})
|
||||||
|
|
||||||
|
new_username = data.get("username", user_object.username)
|
||||||
|
if (new_username != user_object.username):
|
||||||
|
if (User.objects.filter(username=new_username).exists()):
|
||||||
|
return Response({"username": ["A user with that username already exists."]})
|
||||||
|
if (set(new_username) == {' '}):
|
||||||
|
return Response({"username": ["This field may not be blank."]})
|
||||||
|
if (re.search('^([a-z]||\@||\+||\-||\_)+$', new_username) is None):
|
||||||
|
return Response({"username":["Enter a valid username. This value may contain only letters, numbers, and @/./+/-/_ characters."]})
|
||||||
|
|
||||||
|
new_password: str = data.get("password")
|
||||||
|
if (new_password is not None):
|
||||||
|
user_object.set_password(new_password)
|
||||||
|
|
||||||
|
user_object.save()
|
||||||
|
|
||||||
|
return Response("data has been alterate")
|
16
accounts/views/logged.py
Normal file
16
accounts/views/logged.py
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
from rest_framework.views import APIView
|
||||||
|
from rest_framework.response import Response
|
||||||
|
from rest_framework import permissions, status
|
||||||
|
from django.http import HttpRequest
|
||||||
|
from django.contrib.auth import login
|
||||||
|
from rest_framework.authentication import SessionAuthentication
|
||||||
|
|
||||||
|
from ..serializers.login import LoginSerializer
|
||||||
|
|
||||||
|
class LoggedView(APIView):
|
||||||
|
|
||||||
|
permission_classes = (permissions.AllowAny,)
|
||||||
|
authentication_classes = (SessionAuthentication,)
|
||||||
|
|
||||||
|
def get(self, request: HttpRequest):
|
||||||
|
return Response(str(request.user.is_authenticated), status=status.HTTP_200_OK)
|
@ -8,6 +8,6 @@ from rest_framework.authentication import SessionAuthentication
|
|||||||
class LogoutView(APIView):
|
class LogoutView(APIView):
|
||||||
permission_classes = (permissions.IsAuthenticated,)
|
permission_classes = (permissions.IsAuthenticated,)
|
||||||
authentication_classes = (SessionAuthentication,)
|
authentication_classes = (SessionAuthentication,)
|
||||||
def post(self, request: HttpRequest):
|
def get(self, request: HttpRequest):
|
||||||
logout(request)
|
logout(request)
|
||||||
return Response("user unlogged", status=status.HTTP_200_OK)
|
return Response("user unlogged", status=status.HTTP_200_OK)
|
59
frontend/static/js/api/account.js
Normal file
59
frontend/static/js/api/account.js
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
class Account
|
||||||
|
{
|
||||||
|
constructor (client)
|
||||||
|
{
|
||||||
|
this.client = client;
|
||||||
|
}
|
||||||
|
|
||||||
|
async create(username, password)
|
||||||
|
{
|
||||||
|
let response = await this.client._post("/api/accounts/register", {username: username, password: password});
|
||||||
|
let response_data = await response.json()
|
||||||
|
|
||||||
|
if (response_data == "user created")
|
||||||
|
{
|
||||||
|
this._logged = true;
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return response_data
|
||||||
|
}
|
||||||
|
|
||||||
|
async delete(password)
|
||||||
|
{
|
||||||
|
let response = await this.client._delete("/api/accounts/delete", {password: password});
|
||||||
|
let response_data = await response.json();
|
||||||
|
|
||||||
|
if (response_data === "user deleted")
|
||||||
|
this.client._logged = false;
|
||||||
|
return response_data;
|
||||||
|
}
|
||||||
|
|
||||||
|
async get()
|
||||||
|
{
|
||||||
|
let response = await this.client._get("/api/accounts/edit");
|
||||||
|
let response_data = await response.json();
|
||||||
|
|
||||||
|
if (JSON.stringify(response_data) == JSON.stringify({'detail': 'Authentication credentials were not provided.'}))
|
||||||
|
{
|
||||||
|
console.log("error, client is not logged");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return response_data;
|
||||||
|
}
|
||||||
|
|
||||||
|
async update(data, password)
|
||||||
|
{
|
||||||
|
data.password = password;
|
||||||
|
let response = await this.client._patch_json("/api/accounts/edit", data);
|
||||||
|
let response_data = await response.json();
|
||||||
|
|
||||||
|
if (JSON.stringify(response_data) == JSON.stringify({'detail': 'Authentication credentials were not provided.'}))
|
||||||
|
{
|
||||||
|
console.log("error, client is not logged");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return response_data;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export { Account }
|
@ -1,15 +0,0 @@
|
|||||||
class Accounts
|
|
||||||
{
|
|
||||||
constructor (client)
|
|
||||||
{
|
|
||||||
this.client = client;
|
|
||||||
}
|
|
||||||
|
|
||||||
async create(username, password)
|
|
||||||
{
|
|
||||||
let response = await this.client._post("/api/accounts/register", {username: username, password: password});
|
|
||||||
return response
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export { Accounts }
|
|
@ -1,12 +1,13 @@
|
|||||||
import { Accounts } from "./accounts.js";
|
import { Account } from "./account.js";
|
||||||
|
|
||||||
function extract_token(response)
|
function getCookie(name)
|
||||||
{
|
{
|
||||||
let cookies = response.headers.get("set-cookie");
|
let cookie = {};
|
||||||
if (cookies == null)
|
document.cookie.split(';').forEach(function(el) {
|
||||||
return null;
|
let split = el.split('=');
|
||||||
token = cookies.slice(cookies.indexOf("=") + 1, cookies.indexOf(';'))
|
cookie[split[0].trim()] = split.slice(1).join("=");
|
||||||
return token;
|
})
|
||||||
|
return cookie[name];
|
||||||
}
|
}
|
||||||
|
|
||||||
class Client
|
class Client
|
||||||
@ -14,13 +15,23 @@ class Client
|
|||||||
constructor(url)
|
constructor(url)
|
||||||
{
|
{
|
||||||
this._url = url;
|
this._url = url;
|
||||||
this.accounts = new Accounts(this);
|
this.account = new Account(this);
|
||||||
this._token = undefined;
|
this._logged = undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
get isAuthentificate()
|
async isAuthentificate()
|
||||||
{
|
{
|
||||||
return this.token != undefined;
|
if (this._logged == undefined)
|
||||||
|
this.logged = await this._test_logged();
|
||||||
|
return this.logged;
|
||||||
|
}
|
||||||
|
|
||||||
|
async _get(uri)
|
||||||
|
{
|
||||||
|
let response = await fetch(this._url + uri, {
|
||||||
|
method: "GET",
|
||||||
|
});
|
||||||
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
async _post(uri, data)
|
async _post(uri, data)
|
||||||
@ -29,19 +40,62 @@ class Client
|
|||||||
method: "POST",
|
method: "POST",
|
||||||
headers: {
|
headers: {
|
||||||
"Content-Type": "application/json",
|
"Content-Type": "application/json",
|
||||||
|
"X-CSRFToken": getCookie("csrftoken"),
|
||||||
|
},
|
||||||
|
body: JSON.stringify(data),
|
||||||
|
});
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
async _delete(uri, data)
|
||||||
|
{
|
||||||
|
let response = await fetch(this._url + uri, {
|
||||||
|
method: "DELETE",
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
"X-CSRFToken": getCookie("csrftoken"),
|
||||||
|
},
|
||||||
|
body: JSON.stringify(data),
|
||||||
|
});
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
async _patch_json(uri, data)
|
||||||
|
{
|
||||||
|
let response = await fetch(this._url + uri, {
|
||||||
|
method: "PATCH",
|
||||||
|
headers: {
|
||||||
|
"X-CSRFToken": getCookie("csrftoken"),
|
||||||
|
"Content-Type": "application/json",
|
||||||
},
|
},
|
||||||
body: JSON.stringify(data),
|
body: JSON.stringify(data),
|
||||||
});
|
});
|
||||||
let token = extract_token(response);
|
|
||||||
if (token != null)
|
|
||||||
this.token = token;
|
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
async login(username, password)
|
async login(username, password)
|
||||||
{
|
{
|
||||||
let response = await this._post("/api/accounts/login", {username: username, password: password})
|
let response = await this._post("/api/accounts/login", {username: username, password: password})
|
||||||
return response
|
let data = await response.json();
|
||||||
|
if (data == "user connected")
|
||||||
|
{
|
||||||
|
this.logged = true;
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
async logout()
|
||||||
|
{
|
||||||
|
await this._get("/api/accounts/logout");
|
||||||
|
this.logged = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
async _test_logged()
|
||||||
|
{
|
||||||
|
let response = await this._get("/api/accounts/logged");
|
||||||
|
let data = await response.json();
|
||||||
|
return data === "True";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4,9 +4,15 @@ import Posts from "./views/Posts.js";
|
|||||||
import PostView from "./views/PostView.js";
|
import PostView from "./views/PostView.js";
|
||||||
import Settings from "./views/Settings.js";
|
import Settings from "./views/Settings.js";
|
||||||
import Chat from "./views/Chat.js";
|
import Chat from "./views/Chat.js";
|
||||||
|
import HomeView from "./views/HomeView.js";
|
||||||
|
import RegisterView from "./views/accounts/RegisterView.js";
|
||||||
|
import LogoutView from "./views/accounts/LogoutView.js";
|
||||||
|
|
||||||
|
import GameView from "./views/Game.js"
|
||||||
|
|
||||||
import { Client } from "./api/client.js";
|
import { Client } from "./api/client.js";
|
||||||
import RegisterView from "./views/accounts/RegisterView.js";
|
import AbstractRedirectView from "./views/AbstractRedirectView.js";
|
||||||
|
import MeView from "./views/MeView.js";
|
||||||
|
|
||||||
let client = new Client(location.protocol + "//" + location.host)
|
let client = new Client(location.protocol + "//" + location.host)
|
||||||
|
|
||||||
@ -23,27 +29,31 @@ const getParams = match => {
|
|||||||
}));
|
}));
|
||||||
};
|
};
|
||||||
|
|
||||||
const navigateTo = url => {
|
const navigateTo = async (uri) => {
|
||||||
history.pushState(null, null, url);
|
if (await router(uri) === 0)
|
||||||
router();
|
history.pushState(null, null, uri);
|
||||||
};
|
};
|
||||||
|
|
||||||
const router = async () => {
|
const router = async (uri = "") => {
|
||||||
const routes = [
|
const routes = [
|
||||||
{ path: "/", view: Dashboard },
|
{ path: "/", view: Dashboard },
|
||||||
{ path: "/posts", view: Posts },
|
{ path: "/posts", view: Posts },
|
||||||
{ path: "/posts/:id", view: PostView },
|
{ path: "/posts/:id", view: PostView },
|
||||||
{ path: "/settings", view: Settings },
|
{ path: "/settings", view: Settings },
|
||||||
{ path: "/login", view: LoginView },
|
{ path: "/login", view: LoginView },
|
||||||
|
{ path: "/logout", view: LogoutView },
|
||||||
{ path: "/register", view: RegisterView },
|
{ path: "/register", view: RegisterView },
|
||||||
{ path: "/chat", view: Chat },
|
{ path: "/chat", view: Chat },
|
||||||
|
{ path: "/home", view: HomeView },
|
||||||
|
{ path: "/me", view: MeView },
|
||||||
|
{ path: "/game", view: GameView },
|
||||||
];
|
];
|
||||||
|
|
||||||
// Test each route for potential match
|
// Test each route for potential match
|
||||||
const potentialMatches = routes.map(route => {
|
const potentialMatches = routes.map(route => {
|
||||||
return {
|
return {
|
||||||
route: route,
|
route: route,
|
||||||
result: location.pathname.match(pathToRegex(route.path))
|
result: uri.match(pathToRegex(route.path))
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -52,18 +62,29 @@ const router = async () => {
|
|||||||
if (!match) {
|
if (!match) {
|
||||||
match = {
|
match = {
|
||||||
route: routes[0],
|
route: routes[0],
|
||||||
result: [location.pathname]
|
result: [uri]
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
if (lastView !== undefined)
|
if (lastView !== undefined)
|
||||||
await lastView.leavePage();
|
await lastView.leavePage();
|
||||||
|
|
||||||
const view = new match.route.view(getParams(match));
|
const view = new match.route.view(getParams(match));
|
||||||
|
|
||||||
|
if (view instanceof AbstractRedirectView && await view.redirect())
|
||||||
|
return 1;
|
||||||
|
|
||||||
lastView = view;
|
lastView = view;
|
||||||
|
|
||||||
document.querySelector("#app").innerHTML = await view.getHtml();
|
let content = await view.getHtml();
|
||||||
|
if (content == null)
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
view.setTitle();
|
||||||
|
document.querySelector("#app").innerHTML = content
|
||||||
|
|
||||||
await view.postInit();
|
await view.postInit();
|
||||||
|
return 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
window.addEventListener("popstate", router);
|
window.addEventListener("popstate", router);
|
||||||
@ -72,11 +93,10 @@ document.addEventListener("DOMContentLoaded", () => {
|
|||||||
document.body.addEventListener("click", e => {
|
document.body.addEventListener("click", e => {
|
||||||
if (e.target.matches("[data-link]")) {
|
if (e.target.matches("[data-link]")) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
navigateTo(e.target.href);
|
navigateTo(e.target.href.slice(location.origin.length));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
router(location.pathname);
|
||||||
router();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
export { client }
|
export { client, navigateTo }
|
||||||
|
18
frontend/static/js/views/AbstractAuthentifiedView.js
Normal file
18
frontend/static/js/views/AbstractAuthentifiedView.js
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
import { client, navigateTo } from "../index.js";
|
||||||
|
import AbstractRedirectView from "./AbstractRedirectView.js";
|
||||||
|
|
||||||
|
export default class extends AbstractRedirectView{
|
||||||
|
constructor(params, title) {
|
||||||
|
super(params, title, "/login");
|
||||||
|
}
|
||||||
|
|
||||||
|
async redirect()
|
||||||
|
{
|
||||||
|
if (await client.isAuthentificate() === false)
|
||||||
|
{
|
||||||
|
navigateTo(this.redirect_url);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
16
frontend/static/js/views/AbstractNonAuthentified.js
Normal file
16
frontend/static/js/views/AbstractNonAuthentified.js
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
import { client, navigateTo } from "../index.js";
|
||||||
|
import AbstractRedirectView from "./AbstractRedirectView.js";
|
||||||
|
|
||||||
|
export default class extends AbstractRedirectView{
|
||||||
|
constructor(params, title, url) {
|
||||||
|
super(params, title, url);
|
||||||
|
}
|
||||||
|
|
||||||
|
async redirect()
|
||||||
|
{
|
||||||
|
if (await client.isAuthentificate() === false)
|
||||||
|
return 0;
|
||||||
|
navigateTo(this.redirect_url);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
15
frontend/static/js/views/AbstractRedirectView.js
Normal file
15
frontend/static/js/views/AbstractRedirectView.js
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
import { navigateTo } from "../index.js";
|
||||||
|
import AbstractView from "./AbstractView.js";
|
||||||
|
|
||||||
|
export default class extends AbstractView{
|
||||||
|
constructor(params, title, url)
|
||||||
|
{
|
||||||
|
super(params, title);
|
||||||
|
this.redirect_url = url;
|
||||||
|
}
|
||||||
|
|
||||||
|
async redirect()
|
||||||
|
{
|
||||||
|
navigateTo(url);
|
||||||
|
}
|
||||||
|
}
|
@ -1,6 +1,7 @@
|
|||||||
export default class {
|
export default class {
|
||||||
constructor(params) {
|
constructor(params, title) {
|
||||||
this.params = params;
|
this.params = params;
|
||||||
|
this.title = title;
|
||||||
}
|
}
|
||||||
|
|
||||||
async postInit() {
|
async postInit() {
|
||||||
@ -9,8 +10,8 @@ export default class {
|
|||||||
async leavePage() {
|
async leavePage() {
|
||||||
}
|
}
|
||||||
|
|
||||||
setTitle(title) {
|
setTitle() {
|
||||||
document.title = title;
|
document.title = this.title;
|
||||||
}
|
}
|
||||||
|
|
||||||
async getHtml() {
|
async getHtml() {
|
||||||
|
@ -1,11 +1,10 @@
|
|||||||
import AbstractView from "./AbstractView.js";
|
import AbstractAuthentifiedView from "./AbstractAuthentifiedView.js";
|
||||||
|
|
||||||
export default class extends AbstractView {
|
export default class extends AbstractAuthentifiedView {
|
||||||
constructor(params) {
|
constructor(params) {
|
||||||
super(params);
|
super(params, "Chat");
|
||||||
this.setTitle("Chat");
|
|
||||||
|
|
||||||
let url = `ws://${window.location.host}/ws/socket-server/`
|
let url = `wss://${window.location.host}/ws/socket-server/`
|
||||||
|
|
||||||
this.chatSocket = new WebSocket(url)
|
this.chatSocket = new WebSocket(url)
|
||||||
this.chatSocket.onmessage = function(e){
|
this.chatSocket.onmessage = function(e){
|
||||||
|
@ -2,8 +2,7 @@ import AbstractView from "./AbstractView.js";
|
|||||||
|
|
||||||
export default class extends AbstractView {
|
export default class extends AbstractView {
|
||||||
constructor(params) {
|
constructor(params) {
|
||||||
super(params);
|
super(params, "Dashboard");
|
||||||
this.setTitle("Dashboard");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async getHtml() {
|
async getHtml() {
|
||||||
|
250
frontend/static/js/views/Game.js
Normal file
250
frontend/static/js/views/Game.js
Normal file
@ -0,0 +1,250 @@
|
|||||||
|
import AbstractView from './AbstractView.js'
|
||||||
|
|
||||||
|
export default class extends AbstractView {
|
||||||
|
constructor(params) {
|
||||||
|
super(params, 'Game');
|
||||||
|
this.game = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
async getHtml() {
|
||||||
|
return `
|
||||||
|
<h1>Game</h1>
|
||||||
|
<button id='startGameButton'>Start Game</button>
|
||||||
|
<button id='stopGameButton'>Stop Game</button>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
|
||||||
|
async postInit() {
|
||||||
|
document.getElementById('startGameButton').onclick = this.startGame.bind(this);
|
||||||
|
document.getElementById('stopGameButton').onclick = this.stopGame.bind(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
startGame() {
|
||||||
|
if (this.game == null) {
|
||||||
|
document.getElementById('startGameButton').innerHTML = 'Reset Game';
|
||||||
|
this.game = new Game;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
document.getElementById('app').removeChild(this.game.canvas);
|
||||||
|
this.game.cleanup();
|
||||||
|
this.game = new Game;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stopGame() {
|
||||||
|
if (!this.game)
|
||||||
|
return;
|
||||||
|
document.getElementById('app').removeChild(this.game.canvas);
|
||||||
|
document.getElementById('app').removeChild(this.game.scoresDisplay);
|
||||||
|
this.game.cleanup();
|
||||||
|
this.game = null;
|
||||||
|
document.getElementById('startGameButton').innerHTML = 'Start Game';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class Game {
|
||||||
|
constructor() {
|
||||||
|
//Global variables
|
||||||
|
this.def = {
|
||||||
|
CANVASHEIGHT: 270,
|
||||||
|
CANVASWIDTH: 480,
|
||||||
|
PADDLEHEIGHT: 70,
|
||||||
|
PADDLEWIDTH: 10,
|
||||||
|
PADDLEMARGIN: 5,
|
||||||
|
PADDLESPEED: 3,
|
||||||
|
BALLRADIUS: 5,
|
||||||
|
BALLSPEED: 2,
|
||||||
|
BALLSPEEDINCR: 0.15,
|
||||||
|
MAXBOUNCEANGLE: 10 * (Math.PI / 12),
|
||||||
|
MAXSCORE: 6
|
||||||
|
};
|
||||||
|
|
||||||
|
this.canvas = document.createElement('canvas');
|
||||||
|
this.canvas.id = 'gameCanvas';
|
||||||
|
this.canvas.width = this.def.CANVASWIDTH;
|
||||||
|
this.canvas.height = this.def.CANVASHEIGHT;
|
||||||
|
this.canvas.style.border = '1px solid #d3d3d3';
|
||||||
|
this.canvas.style.backgroundColor = '#f1f1f1';
|
||||||
|
this.context = this.canvas.getContext('2d');
|
||||||
|
document.getElementById('app').appendChild(this.canvas);
|
||||||
|
this.scoresDisplay = document.createElement('p');
|
||||||
|
this.scoresDisplay.innerHTML = 'Scores: 0 - 0';
|
||||||
|
document.getElementById('app').appendChild(this.scoresDisplay);
|
||||||
|
|
||||||
|
this.players = [
|
||||||
|
{
|
||||||
|
paddle: new Paddle(this.context,
|
||||||
|
this.def.PADDLEMARGIN,
|
||||||
|
this.def),
|
||||||
|
score: 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
paddle: new Paddle(this.context,
|
||||||
|
this.def.CANVASWIDTH - this.def.PADDLEMARGIN - this.def.PADDLEWIDTH,
|
||||||
|
this.def),
|
||||||
|
score: 0
|
||||||
|
}
|
||||||
|
];
|
||||||
|
this.ballStartSide = 0;
|
||||||
|
this.ballRespawned = false;
|
||||||
|
this.ball = new Ball(this.context, this.def, this.ballStartSide);
|
||||||
|
|
||||||
|
this.interval = setInterval(this.updateGame.bind(this), 10);
|
||||||
|
|
||||||
|
this.keys = [];
|
||||||
|
this.keyUpHandler = this.keyUpHandler.bind(this);
|
||||||
|
this.keyDownHandler = this.keyDownHandler.bind(this);
|
||||||
|
document.addEventListener('keydown', this.keyDownHandler);
|
||||||
|
document.addEventListener('keyup', this.keyUpHandler);
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanup() {
|
||||||
|
clearInterval(this.interval);
|
||||||
|
document.removeEventListener('keydown', this.keyDownHandler);
|
||||||
|
document.removeEventListener('keyup', this.keyUpHandler);
|
||||||
|
this.canvas.style.display = 'none';
|
||||||
|
}
|
||||||
|
|
||||||
|
clear() {
|
||||||
|
this.context.clearRect(0, 0, this.canvas.width, this.canvas.height);
|
||||||
|
}
|
||||||
|
|
||||||
|
updateGame() {
|
||||||
|
//Paddle movement
|
||||||
|
if (this.keys.includes('s') &&
|
||||||
|
this.players[0].paddle.y + this.def.PADDLEHEIGHT < this.def.CANVASHEIGHT - this.def.PADDLEMARGIN)
|
||||||
|
this.players[0].paddle.y += this.def.PADDLESPEED;
|
||||||
|
if (this.keys.includes('w') &&
|
||||||
|
this.players[0].paddle.y > 0 + this.def.PADDLEMARGIN)
|
||||||
|
this.players[0].paddle.y -= this.def.PADDLESPEED;
|
||||||
|
|
||||||
|
if (this.keys.includes('ArrowDown') &&
|
||||||
|
this.players[1].paddle.y + this.def.PADDLEHEIGHT < this.def.CANVASHEIGHT - this.def.PADDLEMARGIN)
|
||||||
|
this.players[1].paddle.y += this.def.PADDLESPEED;
|
||||||
|
if (this.keys.includes('ArrowUp') &&
|
||||||
|
this.players[1].paddle.y > 0 + this.def.PADDLEMARGIN)
|
||||||
|
this.players[1].paddle.y -= this.def.PADDLESPEED;
|
||||||
|
|
||||||
|
//GOOAAAAL
|
||||||
|
if (this.ball.x <= 0)
|
||||||
|
this.updateScore(this.players[0].score, ++this.players[1].score);
|
||||||
|
else if (this.ball.x >= this.def.CANVASWIDTH)
|
||||||
|
this.updateScore(++this.players[0].score, this.players[1].score);
|
||||||
|
|
||||||
|
//Ball collisions
|
||||||
|
if (this.detectCollision(this.players[0].paddle, this.ball))
|
||||||
|
this.calculateBallVelocity(this.players[0].paddle.getCenter().y, this.ball);
|
||||||
|
else if (this.detectCollision(this.players[1].paddle, this.ball))
|
||||||
|
this.calculateBallVelocity(this.players[1].paddle.getCenter().y, this.ball, -1);
|
||||||
|
|
||||||
|
if (this.ball.y - this.ball.radius <= 0)
|
||||||
|
this.ball.vy *= -1;
|
||||||
|
else if (this.ball.y + this.ball.radius >= this.canvas.height)
|
||||||
|
this.ball.vy *= -1;
|
||||||
|
|
||||||
|
if (!this.ballRespawned) {
|
||||||
|
this.ball.x += this.ball.vx;
|
||||||
|
this.ball.y += this.ball.vy;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.clear();
|
||||||
|
this.players[0].paddle.update();
|
||||||
|
this.players[1].paddle.update();
|
||||||
|
this.ball.update();
|
||||||
|
}
|
||||||
|
|
||||||
|
updateScore(p1Score, p2Score) {
|
||||||
|
if (p1Score > this.def.MAXSCORE) {
|
||||||
|
this.scoresDisplay.innerHTML = 'Player 1 wins!! GGS';
|
||||||
|
this.cleanup();
|
||||||
|
}
|
||||||
|
else if (p2Score > this.def.MAXSCORE) {
|
||||||
|
this.scoresDisplay.innerHTML = 'Player 2 wins!! GGS';
|
||||||
|
this.cleanup();
|
||||||
|
} else {
|
||||||
|
this.scoresDisplay.innerHTML = `Scores: ${p1Score} - ${p2Score}`;
|
||||||
|
this.ballStartSide = 1 - this.ballStartSide;
|
||||||
|
this.ball = new Ball(this.context, this.def, this.ballStartSide);
|
||||||
|
this.ballRespawned = true;
|
||||||
|
new Promise(r => setTimeout(r, 300))
|
||||||
|
.then(_ => this.ballRespawned = false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
detectCollision(paddle, ball) {
|
||||||
|
let paddleCenter = paddle.getCenter();
|
||||||
|
let dx = Math.abs(ball.x - paddleCenter.x);
|
||||||
|
let dy = Math.abs(ball.y - paddleCenter.y);
|
||||||
|
if (dx <= ball.radius + paddle.width / 2 &&
|
||||||
|
dy <= ball.radius + paddle.height / 2)
|
||||||
|
return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
calculateBallVelocity(paddleCenterY, ball, side = 1) {
|
||||||
|
let relativeIntersectY = paddleCenterY - ball.y;
|
||||||
|
let normRelIntersectY = relativeIntersectY / this.def.PADDLEHEIGHT / 2;
|
||||||
|
let bounceAngle = normRelIntersectY * this.def.MAXBOUNCEANGLE;
|
||||||
|
|
||||||
|
ball.speed += this.def.BALLSPEEDINCR;
|
||||||
|
ball.vx = ball.speed * side * Math.cos(bounceAngle);
|
||||||
|
ball.vy = ball.speed * -Math.sin(bounceAngle);
|
||||||
|
}
|
||||||
|
|
||||||
|
keyUpHandler(ev) {
|
||||||
|
const idx = this.keys.indexOf(ev.key);
|
||||||
|
if (idx != -1)
|
||||||
|
this.keys.splice(idx, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
keyDownHandler(ev) {
|
||||||
|
if (!this.keys.includes(ev.key))
|
||||||
|
this.keys.push(ev.key);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class Paddle {
|
||||||
|
constructor(context, paddleSide, def) {
|
||||||
|
this.width = def.PADDLEWIDTH;
|
||||||
|
this.height = def.PADDLEHEIGHT;
|
||||||
|
this.x = paddleSide;
|
||||||
|
this.y = def.CANVASHEIGHT / 2 - this.height / 2;
|
||||||
|
this.ctx = context;
|
||||||
|
this.update();
|
||||||
|
}
|
||||||
|
|
||||||
|
update() {
|
||||||
|
this.ctx.fillStyle = 'black';
|
||||||
|
this.ctx.fillRect(this.x, this.y, this.width, this.height);
|
||||||
|
}
|
||||||
|
|
||||||
|
getCenter() {
|
||||||
|
return {
|
||||||
|
x: this.x + this.width / 2,
|
||||||
|
y: this.y + this.height / 2
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class Ball {
|
||||||
|
constructor(context, def, startSide) {
|
||||||
|
this.radius = def.BALLRADIUS;
|
||||||
|
this.speed = def.BALLSPEED;
|
||||||
|
this.x = def.CANVASWIDTH / 2;
|
||||||
|
this.y = def.CANVASHEIGHT / 2;
|
||||||
|
this.vy = 0;
|
||||||
|
if (startSide === 0)
|
||||||
|
this.vx = -this.speed;
|
||||||
|
else
|
||||||
|
this.vx = this.speed;
|
||||||
|
this.ctx = context;
|
||||||
|
this.update();
|
||||||
|
}
|
||||||
|
|
||||||
|
update() {
|
||||||
|
this.ctx.fillStyle = 'black';
|
||||||
|
this.ctx.beginPath();
|
||||||
|
this.ctx.arc(this.x, this.y, this.radius, 0, 2 * Math.PI);
|
||||||
|
this.ctx.fill();
|
||||||
|
}
|
||||||
|
}
|
16
frontend/static/js/views/HomeView.js
Normal file
16
frontend/static/js/views/HomeView.js
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
import AbstractAuthentificateView from "./AbstractAuthentifiedView.js";
|
||||||
|
|
||||||
|
export default class extends AbstractAuthentificateView {
|
||||||
|
constructor(params) {
|
||||||
|
super(params, "Home");
|
||||||
|
this.redirect_url = "/login"
|
||||||
|
}
|
||||||
|
|
||||||
|
async getHtml() {
|
||||||
|
return `
|
||||||
|
<h1>HOME</h1>
|
||||||
|
<a href="/me" class="nav__link" data-link>Me</a>
|
||||||
|
<a href="/logout" class="nav__link" data-link>Logout</a>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
}
|
103
frontend/static/js/views/MeView.js
Normal file
103
frontend/static/js/views/MeView.js
Normal file
@ -0,0 +1,103 @@
|
|||||||
|
import { client, navigateTo } from "../index.js";
|
||||||
|
import AbstractAuthentificateView from "./AbstractAuthentifiedView.js";
|
||||||
|
|
||||||
|
export default class extends AbstractAuthentificateView
|
||||||
|
{
|
||||||
|
constructor(params)
|
||||||
|
{
|
||||||
|
super(params, "Me");
|
||||||
|
}
|
||||||
|
|
||||||
|
async postInit()
|
||||||
|
{
|
||||||
|
if (this.fill() === null)
|
||||||
|
return;
|
||||||
|
document.getElementById("save-button").onclick = this.save;
|
||||||
|
document.getElementById("delete-button").onclick = this.delete_accounts;
|
||||||
|
}
|
||||||
|
|
||||||
|
async fill()
|
||||||
|
{
|
||||||
|
let data = await client.account.get();
|
||||||
|
|
||||||
|
document.getElementById("username").value = data.username;
|
||||||
|
}
|
||||||
|
|
||||||
|
async delete_accounts()
|
||||||
|
{
|
||||||
|
let current_password = document.getElementById("current_password").value;
|
||||||
|
|
||||||
|
let response_data = await client.account.delete(current_password);
|
||||||
|
|
||||||
|
if (response_data === null)
|
||||||
|
{
|
||||||
|
navigateTo("/login");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
["delete", "current_password"].forEach(error_field => {
|
||||||
|
let error_display = document.getElementById(`error_${error_field}`);
|
||||||
|
if (error_display != null)
|
||||||
|
error_display.innerHTML = "";
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response_data === "user deleted")
|
||||||
|
{
|
||||||
|
document.getElementById(`error_delete`).innerHTML = "OK";
|
||||||
|
navigateTo("/login")
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
document.getElementById("error_current_password").innerHTML = response_data["password"]
|
||||||
|
}
|
||||||
|
|
||||||
|
async save()
|
||||||
|
{
|
||||||
|
let username = document.getElementById("username").value;
|
||||||
|
let new_password = document.getElementById("new_password").value;
|
||||||
|
let current_password = document.getElementById("current_password").value;
|
||||||
|
|
||||||
|
let data = {};
|
||||||
|
|
||||||
|
data.username = username;
|
||||||
|
if (new_password.length != 0)
|
||||||
|
data.new_password = new_password;
|
||||||
|
let response_data = await client.account.update(data, current_password);
|
||||||
|
|
||||||
|
if (response_data === null)
|
||||||
|
{
|
||||||
|
navigateTo(super.redirect_url);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
["username", "new_password", "current_password"].forEach(error_field => {
|
||||||
|
let error_display = document.getElementById(`error_${error_field}`);
|
||||||
|
if (error_display != null)
|
||||||
|
error_display.innerHTML = "";
|
||||||
|
});
|
||||||
|
|
||||||
|
Object.keys(response_data).forEach(error_field => {
|
||||||
|
let error_display = document.getElementById(`error_${error_field}`);
|
||||||
|
if (error_display != null)
|
||||||
|
error_display.innerHTML = response_data[error_field];
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async getHtml()
|
||||||
|
{
|
||||||
|
return `
|
||||||
|
<h1>ME</h1>
|
||||||
|
<input type=text placeholder="username" id="username">
|
||||||
|
<span id="error_username"></span>
|
||||||
|
<input type=password placeholder="new password" id="new_password">
|
||||||
|
<span id="error_new_password"></span>
|
||||||
|
<input type=password placeholder="current password" id="current_password">
|
||||||
|
<span id="error_current_password"></span>
|
||||||
|
<input type="button" value="Save" id="save-button">
|
||||||
|
<span id="error_save"></span>
|
||||||
|
<input type="button" value="Delete" id="delete-button">
|
||||||
|
<span id="error_delete"></span>
|
||||||
|
<a href="/logout" class="nav__link" data-link>Logout</a>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
}
|
@ -2,9 +2,8 @@ import AbstractView from "./AbstractView.js";
|
|||||||
|
|
||||||
export default class extends AbstractView {
|
export default class extends AbstractView {
|
||||||
constructor(params) {
|
constructor(params) {
|
||||||
super(params);
|
super(params, "Viewing Post");
|
||||||
this.postId = params.id;
|
this.postId = params.id;
|
||||||
this.setTitle("Viewing Post");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async getHtml() {
|
async getHtml() {
|
||||||
|
@ -2,8 +2,7 @@ import AbstractView from "./AbstractView.js";
|
|||||||
|
|
||||||
export default class extends AbstractView {
|
export default class extends AbstractView {
|
||||||
constructor(params) {
|
constructor(params) {
|
||||||
super(params);
|
super(params, "Posts");
|
||||||
this.setTitle("Posts");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async getHtml() {
|
async getHtml() {
|
||||||
|
@ -2,8 +2,7 @@ import AbstractView from "./AbstractView.js";
|
|||||||
|
|
||||||
export default class extends AbstractView {
|
export default class extends AbstractView {
|
||||||
constructor(params) {
|
constructor(params) {
|
||||||
super(params);
|
super(params, "Settings");
|
||||||
this.setTitle("Settings");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async getHtml() {
|
async getHtml() {
|
||||||
|
@ -1,13 +1,18 @@
|
|||||||
import AbstractView from "../AbstractView.js";
|
import { client, navigateTo } from "../../index.js";
|
||||||
import { client } from "../../index.js";
|
import AbstractNonAuthentifiedView from "../AbstractNonAuthentified.js";
|
||||||
|
|
||||||
async function login()
|
async function login()
|
||||||
{
|
{
|
||||||
let username = document.getElementById("username").value;
|
let username = document.getElementById("username").value;
|
||||||
let password = document.getElementById("password").value;
|
let password = document.getElementById("password").value;
|
||||||
|
|
||||||
let response = await client.login(username, password);
|
let response_data = await client.login(username, password);
|
||||||
let response_data = await response.json();
|
|
||||||
|
if (response_data == null)
|
||||||
|
{
|
||||||
|
navigateTo("/home");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
["username", "user", "password"].forEach(error_field => {
|
["username", "user", "password"].forEach(error_field => {
|
||||||
let error_display = document.getElementById(`error_${error_field}`);
|
let error_display = document.getElementById(`error_${error_field}`);
|
||||||
@ -22,15 +27,14 @@ async function login()
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
export default class extends AbstractView {
|
export default class extends AbstractNonAuthentifiedView {
|
||||||
constructor(params) {
|
constructor(params) {
|
||||||
super(params);
|
super(params, "Login", "/home");
|
||||||
this.setTitle("Login");
|
}
|
||||||
document.body.addEventListener("click", e => {
|
|
||||||
e.preventDefault();
|
async postInit()
|
||||||
if (e.target.type == "button")
|
{
|
||||||
login();
|
document.getElementById("button").onclick = login;
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async getHtml() {
|
async getHtml() {
|
||||||
@ -42,7 +46,7 @@ export default class extends AbstractView {
|
|||||||
<span id="error_username"></span>
|
<span id="error_username"></span>
|
||||||
<input type="password" id="password" placeholder="password">
|
<input type="password" id="password" placeholder="password">
|
||||||
<span id="error_password"></span>
|
<span id="error_password"></span>
|
||||||
<input type="button" value="login">
|
<input type="button" value="login" id="button">
|
||||||
<span id="error_user"></span>
|
<span id="error_user"></span>
|
||||||
<a href="/register" class="nav__link" data-link>Register</a>
|
<a href="/register" class="nav__link" data-link>Register</a>
|
||||||
</div>
|
</div>
|
||||||
|
11
frontend/static/js/views/accounts/LogoutView.js
Normal file
11
frontend/static/js/views/accounts/LogoutView.js
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
import { client, navigateTo } from "../../index.js";
|
||||||
|
import AbstractAuthentifiedView from "../AbstractAuthentifiedView.js";
|
||||||
|
|
||||||
|
export default class extends AbstractAuthentifiedView
|
||||||
|
{
|
||||||
|
constructor(params) {
|
||||||
|
super(params, "Logout");
|
||||||
|
client.logout();
|
||||||
|
navigateTo("/login")
|
||||||
|
}
|
||||||
|
}
|
@ -1,13 +1,19 @@
|
|||||||
import AbstractView from "../AbstractView.js";
|
import { client, navigateTo } from "../../index.js";
|
||||||
import { client } from "../../index.js";
|
import AbstractAuthentifiedView from "../AbstractNonAuthentified.js";
|
||||||
|
|
||||||
async function register()
|
async function register()
|
||||||
{
|
{
|
||||||
let username = document.getElementById("username").value;
|
let username = document.getElementById("username").value;
|
||||||
let password = document.getElementById("password").value;
|
let password = document.getElementById("password").value;
|
||||||
|
|
||||||
let response = await client.accounts.create(username, password);
|
let response_data = await client.account.create(username, password);
|
||||||
let response_data = await response.json();
|
|
||||||
|
if (response_data == null)
|
||||||
|
{
|
||||||
|
navigateTo("/home");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
["username", "user", "password"].forEach(error_field => {
|
["username", "user", "password"].forEach(error_field => {
|
||||||
let error_display = document.getElementById(`error_${error_field}`);
|
let error_display = document.getElementById(`error_${error_field}`);
|
||||||
@ -22,15 +28,14 @@ async function register()
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
export default class extends AbstractView {
|
export default class extends AbstractAuthentifiedView {
|
||||||
constructor(params) {
|
constructor(params) {
|
||||||
super(params);
|
super(params, "Register", "/home");
|
||||||
this.setTitle("register");
|
}
|
||||||
document.body.addEventListener("click", e => {
|
|
||||||
e.preventDefault();
|
async postInit()
|
||||||
if (e.target.type == "button")
|
{
|
||||||
register();
|
document.getElementById("button").onclick = register;
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async getHtml() {
|
async getHtml() {
|
||||||
@ -42,7 +47,7 @@ export default class extends AbstractView {
|
|||||||
<span id="error_username"></span>
|
<span id="error_username"></span>
|
||||||
<input type="password" id="password" placeholder="password">
|
<input type="password" id="password" placeholder="password">
|
||||||
<span id="error_password"></span>
|
<span id="error_password"></span>
|
||||||
<input type="button" value="register">
|
<input type="button" value="register" id="button">
|
||||||
<span id="error_user"></span>
|
<span id="error_user"></span>
|
||||||
<a href="/login" class="nav__link" data-link>Login</a>
|
<a href="/login" class="nav__link" data-link>Login</a>
|
||||||
</div>
|
</div>
|
||||||
|
@ -12,8 +12,9 @@
|
|||||||
<a href="/" class="nav__link" data-link>Dashboard</a>
|
<a href="/" class="nav__link" data-link>Dashboard</a>
|
||||||
<a href="/posts" class="nav__link" data-link>Posts</a>
|
<a href="/posts" class="nav__link" data-link>Posts</a>
|
||||||
<a href="/settings" class="nav__link" data-link>Settings</a>
|
<a href="/settings" class="nav__link" data-link>Settings</a>
|
||||||
<a href="/chat" class="nav__link" data-link>Chat</a>
|
|
||||||
<a href="/login" class="nav__link" data-link>Login</a>
|
<a href="/login" class="nav__link" data-link>Login</a>
|
||||||
|
<a href="/register" class="nav__link" data-link>Register</a>
|
||||||
|
<a href="/chat" class="nav__link" data-link>Chat</a>
|
||||||
</nav>
|
</nav>
|
||||||
<div id="app"></div>
|
<div id="app"></div>
|
||||||
<script type="module" src="{% static 'js/index.js' %}"></script>
|
<script type="module" src="{% static 'js/index.js' %}"></script>
|
||||||
|
@ -9,7 +9,7 @@ class ProfileTest(TestCase):
|
|||||||
self.user.save()
|
self.user.save()
|
||||||
self.expected_response = {"name": "bozo",
|
self.expected_response = {"name": "bozo",
|
||||||
"title": ""}
|
"title": ""}
|
||||||
self.url = "/profiles/"
|
self.url = "/api/profiles/"
|
||||||
|
|
||||||
def test_profile_create_on_user_created(self):
|
def test_profile_create_on_user_created(self):
|
||||||
response: HttpResponse = self.client.get(self.url + str(self.user.pk))
|
response: HttpResponse = self.client.get(self.url + str(self.user.pk))
|
||||||
|
@ -25,12 +25,12 @@ SECRET_KEY = 'django-insecure-18!@88-wm-!skec9^n-85n(f$my^#mh3!#@f=_e@=*arh_yyjj
|
|||||||
# SECURITY WARNING: don't run with debug turned on in production!
|
# SECURITY WARNING: don't run with debug turned on in production!
|
||||||
DEBUG = True
|
DEBUG = True
|
||||||
|
|
||||||
CSRF_TRUSTED_ORIGINS = ['https://code.chauvet.pro', 'https://django.chauvet.pro']
|
|
||||||
|
|
||||||
ALLOWED_HOSTS = ["*"]
|
ALLOWED_HOSTS = ["*"]
|
||||||
|
|
||||||
CORS_ORIGIN_ALLOW_ALL = False
|
CORS_ORIGIN_ALLOW_ALL = False
|
||||||
|
|
||||||
|
CSRF_TRUSTED_ORIGINS = ["https://django.chauvet.pro"]
|
||||||
|
|
||||||
CORS_ORIGIN_WHITELIST = (
|
CORS_ORIGIN_WHITELIST = (
|
||||||
'http://localhost:8000',
|
'http://localhost:8000',
|
||||||
)
|
)
|
||||||
|
Reference in New Issue
Block a user