merge with server
This commit is contained in:
commit
208dd206ce
2
.gitignore
vendored
2
.gitignore
vendored
@ -2,3 +2,5 @@
|
|||||||
*.pyc
|
*.pyc
|
||||||
db.sqlite3
|
db.sqlite3
|
||||||
**/migrations/**
|
**/migrations/**
|
||||||
|
/profiles/static/avatars/*
|
||||||
|
!/profiles/static/avatars/default.env
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
from .register import *
|
from .register import *
|
||||||
from .login import *
|
from .login import *
|
||||||
|
from .logout import *
|
||||||
from .edit import *
|
from .edit import *
|
||||||
from .delete import *
|
from .delete import *
|
@ -21,12 +21,17 @@ class DeleteTest(TestCase):
|
|||||||
|
|
||||||
|
|
||||||
def test_normal_delete(self):
|
def test_normal_delete(self):
|
||||||
response: HttpResponse = self.client.delete(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."})
|
@ -8,5 +8,12 @@ class DeleteView(APIView):
|
|||||||
permission_classes = (permissions.IsAuthenticated,)
|
permission_classes = (permissions.IsAuthenticated,)
|
||||||
authentication_classes = (SessionAuthentication,)
|
authentication_classes = (SessionAuthentication,)
|
||||||
def delete(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)
|
@ -12,6 +12,9 @@ class EditView(APIView):
|
|||||||
permission_classes = (permissions.IsAuthenticated,)
|
permission_classes = (permissions.IsAuthenticated,)
|
||||||
authentication_classes = (SessionAuthentication,)
|
authentication_classes = (SessionAuthentication,)
|
||||||
|
|
||||||
|
def get(self, request: HttpRequest):
|
||||||
|
return Response({"username": request.user.username, "id": request.user.pk})
|
||||||
|
|
||||||
def patch(self, request: HttpRequest):
|
def patch(self, request: HttpRequest):
|
||||||
data: dict = request.data
|
data: dict = request.data
|
||||||
|
|
||||||
|
@ -13,4 +13,6 @@ class LoggedView(APIView):
|
|||||||
authentication_classes = (SessionAuthentication,)
|
authentication_classes = (SessionAuthentication,)
|
||||||
|
|
||||||
def get(self, request: HttpRequest):
|
def get(self, request: HttpRequest):
|
||||||
return Response(str(request.user.is_authenticated), status=status.HTTP_200_OK)
|
if (request.user.is_authenticated):
|
||||||
|
return Response({'id': request.user.pk}, status=status.HTTP_200_OK)
|
||||||
|
return Response('false', status=status.HTTP_200_OK)
|
@ -20,4 +20,4 @@ class LoginView(APIView):
|
|||||||
if user is None:
|
if user is None:
|
||||||
return Response({'user': ['Username or password wrong.']}, status.HTTP_200_OK)
|
return Response({'user': ['Username or password wrong.']}, status.HTTP_200_OK)
|
||||||
login(request, user)
|
login(request, user)
|
||||||
return Response('user connected', status=status.HTTP_200_OK)
|
return Response({'id': user.pk}, status=status.HTTP_200_OK)
|
@ -3,6 +3,7 @@ from ..serializers.register import RegisterSerialiser
|
|||||||
from rest_framework.views import APIView
|
from rest_framework.views import APIView
|
||||||
from rest_framework.response import Response
|
from rest_framework.response import Response
|
||||||
from django.http import HttpRequest
|
from django.http import HttpRequest
|
||||||
|
from django.contrib.auth import login
|
||||||
|
|
||||||
class RegisterView(APIView):
|
class RegisterView(APIView):
|
||||||
permission_classes = (permissions.AllowAny,)
|
permission_classes = (permissions.AllowAny,)
|
||||||
@ -12,5 +13,6 @@ class RegisterView(APIView):
|
|||||||
if serializer.is_valid(raise_exception=True):
|
if serializer.is_valid(raise_exception=True):
|
||||||
user = serializer.create(data)
|
user = serializer.create(data)
|
||||||
if user:
|
if user:
|
||||||
|
login(request, user)
|
||||||
return Response("user created", status=status.HTTP_201_CREATED)
|
return Response("user created", status=status.HTTP_201_CREATED)
|
||||||
return Response(status=status.HTTP_400_BAD_REQUEST)
|
return Response(status=status.HTTP_400_BAD_REQUEST)
|
11
frontend/static/css/profiles/profile.css
Normal file
11
frontend/static/css/profiles/profile.css
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
#app #avatar
|
||||||
|
{
|
||||||
|
height: 100px;
|
||||||
|
width: 100px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#app #username
|
||||||
|
{
|
||||||
|
height: 100px;
|
||||||
|
width: 100px;
|
||||||
|
}
|
11
frontend/static/css/profiles/profiles.css
Normal file
11
frontend/static/css/profiles/profiles.css
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
#app .item img
|
||||||
|
{
|
||||||
|
height: 100px;
|
||||||
|
width: 100px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#app .item a
|
||||||
|
{
|
||||||
|
height: 100px;
|
||||||
|
width: 100px;
|
||||||
|
}
|
65
frontend/static/js/api/account.js
Normal file
65
frontend/static/js/api/account.js
Normal file
@ -0,0 +1,65 @@
|
|||||||
|
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 (JSON.stringify(response_data) == JSON.stringify({'detail': 'Authentication credentials were not provided.'}))
|
||||||
|
{
|
||||||
|
this.client._logged = false;
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
console.log(response_data)
|
||||||
|
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.'}))
|
||||||
|
{
|
||||||
|
this.client._logged = false;
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return response_data;
|
||||||
|
}
|
||||||
|
|
||||||
|
async update(data, password)
|
||||||
|
{
|
||||||
|
data.current_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.'}))
|
||||||
|
{
|
||||||
|
this.client._logged = false;
|
||||||
|
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,11 +1,24 @@
|
|||||||
import { Accounts } from "./accounts.js";
|
import { Account } from "./account.js";
|
||||||
|
import { Profile } from "./profile.js";
|
||||||
|
import { Profiles } from "./profiles.js";
|
||||||
|
|
||||||
|
function getCookie(name)
|
||||||
|
{
|
||||||
|
let cookie = {};
|
||||||
|
document.cookie.split(';').forEach(function(el) {
|
||||||
|
let split = el.split('=');
|
||||||
|
cookie[split[0].trim()] = split.slice(1).join("=");
|
||||||
|
})
|
||||||
|
return cookie[name];
|
||||||
|
}
|
||||||
|
|
||||||
class Client
|
class Client
|
||||||
{
|
{
|
||||||
constructor(url)
|
constructor(url)
|
||||||
{
|
{
|
||||||
this._url = url;
|
this._url = url;
|
||||||
this.accounts = new Accounts(this);
|
this.account = new Account(this);
|
||||||
|
this.profiles = new Profiles(this);
|
||||||
this._logged = undefined;
|
this._logged = undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -30,18 +43,59 @@ class Client
|
|||||||
method: "POST",
|
method: "POST",
|
||||||
headers: {
|
headers: {
|
||||||
"Content-Type": "application/json",
|
"Content-Type": "application/json",
|
||||||
|
"X-CSRFToken": getCookie("csrftoken"),
|
||||||
},
|
},
|
||||||
body: JSON.stringify(data),
|
body: JSON.stringify(data),
|
||||||
});
|
});
|
||||||
return response;
|
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),
|
||||||
|
});
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
async _patch_file(uri, file)
|
||||||
|
{
|
||||||
|
let response = await fetch(this._url + uri, {
|
||||||
|
method: "PATCH",
|
||||||
|
headers: {
|
||||||
|
"X-CSRFToken": getCookie("csrftoken"),
|
||||||
|
},
|
||||||
|
body: file,
|
||||||
|
});
|
||||||
|
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})
|
||||||
let data = await response.json();
|
let data = await response.json();
|
||||||
if (data == "user connected")
|
if (data.id != undefined)
|
||||||
{
|
{
|
||||||
|
this.me = new Profile(this)
|
||||||
|
await this.me.init(data.id)
|
||||||
this.logged = true;
|
this.logged = true;
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@ -58,7 +112,13 @@ class Client
|
|||||||
{
|
{
|
||||||
let response = await this._get("/api/accounts/logged");
|
let response = await this._get("/api/accounts/logged");
|
||||||
let data = await response.json();
|
let data = await response.json();
|
||||||
return data === "True";
|
|
||||||
|
if (data.id !== undefined)
|
||||||
|
{
|
||||||
|
this.me = new Profile(this)
|
||||||
|
await this.me.init(data.id)
|
||||||
|
}
|
||||||
|
return data.id !== undefined;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
35
frontend/static/js/api/profile.js
Normal file
35
frontend/static/js/api/profile.js
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
class Profile
|
||||||
|
{
|
||||||
|
constructor (client, username = undefined, avatar_url = undefined, user_id = undefined)
|
||||||
|
{
|
||||||
|
this.client = client;
|
||||||
|
this.username = username;
|
||||||
|
this.avatar_url = avatar_url
|
||||||
|
this.user_id = user_id
|
||||||
|
}
|
||||||
|
|
||||||
|
async init(id)
|
||||||
|
{
|
||||||
|
let response = await this.client._get(`/api/profiles/${id}`);
|
||||||
|
let response_data = await response.json();
|
||||||
|
|
||||||
|
this.id = id;
|
||||||
|
this.username = response_data.username;
|
||||||
|
this.avatar_url = response_data.avatar_url;
|
||||||
|
}
|
||||||
|
|
||||||
|
async change_avatar(form_data)
|
||||||
|
{
|
||||||
|
let response = await this.client._patch_file(`/api/profiles/${this.id}`, form_data);
|
||||||
|
let response_data = await response.json()
|
||||||
|
|
||||||
|
return response_data;
|
||||||
|
}
|
||||||
|
|
||||||
|
async setData (data)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export {Profile}
|
30
frontend/static/js/api/profiles.js
Normal file
30
frontend/static/js/api/profiles.js
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
import { Profile } from "./profile.js";
|
||||||
|
|
||||||
|
class Profiles
|
||||||
|
{
|
||||||
|
constructor (client)
|
||||||
|
{
|
||||||
|
this.client = client
|
||||||
|
}
|
||||||
|
|
||||||
|
async all()
|
||||||
|
{
|
||||||
|
let response = await this.client._get("/api/profiles/");
|
||||||
|
let response_data = await response.json();
|
||||||
|
|
||||||
|
let profiles = []
|
||||||
|
response_data.forEach((profile) => {
|
||||||
|
profiles.push(new Profile(this.client, profile.username, profile.avatar_url, profile.user_id))
|
||||||
|
});
|
||||||
|
return profiles;
|
||||||
|
}
|
||||||
|
|
||||||
|
async getProfile(user_id)
|
||||||
|
{
|
||||||
|
let profile = new Profile(this.client);
|
||||||
|
await profile.init(user_id);
|
||||||
|
return profile;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export {Profiles}
|
@ -1,7 +1,5 @@
|
|||||||
import LoginView from "./views/accounts/LoginView.js";
|
import LoginView from "./views/accounts/LoginView.js";
|
||||||
import Dashboard from "./views/Dashboard.js";
|
import Dashboard from "./views/Dashboard.js";
|
||||||
import Posts from "./views/Posts.js";
|
|
||||||
import PostView from "./views/PostView.js";
|
|
||||||
import Settings from "./views/Settings.js";
|
import Settings from "./views/Settings.js";
|
||||||
import Search from "./views/Search.js";
|
import Search from "./views/Search.js";
|
||||||
import Chat from "./views/Chat.js";
|
import Chat from "./views/Chat.js";
|
||||||
@ -11,6 +9,9 @@ import LogoutView from "./views/accounts/LogoutView.js";
|
|||||||
|
|
||||||
import { Client } from "./api/client.js";
|
import { Client } from "./api/client.js";
|
||||||
import AbstractRedirectView from "./views/AbstractRedirectView.js";
|
import AbstractRedirectView from "./views/AbstractRedirectView.js";
|
||||||
|
import MeView from "./views/MeView.js";
|
||||||
|
import ProfilePageView from "./views/profiles/ProfilePageView.js";
|
||||||
|
import ProfilesView from "./views/profiles/ProfilesView.js";
|
||||||
|
|
||||||
let client = new Client(location.protocol + "//" + location.host)
|
let client = new Client(location.protocol + "//" + location.host)
|
||||||
|
|
||||||
@ -35,8 +36,8 @@ const navigateTo = async (uri) => {
|
|||||||
const router = async (uri = "") => {
|
const router = async (uri = "") => {
|
||||||
const routes = [
|
const routes = [
|
||||||
{ path: "/", view: Dashboard },
|
{ path: "/", view: Dashboard },
|
||||||
{ path: "/posts", view: Posts },
|
{ path: "/profiles", view: ProfilesView},
|
||||||
{ path: "/posts/:id", view: PostView },
|
{ path: "/profiles/:id", view: ProfilePageView },
|
||||||
{ path: "/settings", view: Settings },
|
{ path: "/settings", view: Settings },
|
||||||
{ path: "/login", view: LoginView },
|
{ path: "/login", view: LoginView },
|
||||||
{ path: "/logout", view: LogoutView },
|
{ path: "/logout", view: LogoutView },
|
||||||
@ -44,6 +45,7 @@ const router = async (uri = "") => {
|
|||||||
{ path: "/search", view: Search },
|
{ path: "/search", view: Search },
|
||||||
{ path: "/chat", view: Chat },
|
{ path: "/chat", view: Chat },
|
||||||
{ path: "/home", view: HomeView },
|
{ path: "/home", view: HomeView },
|
||||||
|
{ path: "/me", view: MeView },
|
||||||
];
|
];
|
||||||
|
|
||||||
// Test each route for potential match
|
// Test each route for potential match
|
||||||
|
@ -9,6 +9,7 @@ export default class extends AbstractAuthentificateView {
|
|||||||
async getHtml() {
|
async getHtml() {
|
||||||
return `
|
return `
|
||||||
<h1>HOME</h1>
|
<h1>HOME</h1>
|
||||||
|
<a href="/me" class="nav__link" data-link>Me</a>
|
||||||
<a href="/logout" class="nav__link" data-link>Logout</a>
|
<a href="/logout" class="nav__link" data-link>Logout</a>
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
126
frontend/static/js/views/MeView.js
Normal file
126
frontend/static/js/views/MeView.js
Normal file
@ -0,0 +1,126 @@
|
|||||||
|
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();
|
||||||
|
|
||||||
|
if (data === null)
|
||||||
|
{
|
||||||
|
navigateTo("/login")
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
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("/login");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else if (response_data === "data has been alterate")
|
||||||
|
{
|
||||||
|
navigateTo("/me");
|
||||||
|
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];
|
||||||
|
});
|
||||||
|
let avatar = document.getElementById("avatar");
|
||||||
|
|
||||||
|
if (avatar.files[0] !== undefined)
|
||||||
|
{
|
||||||
|
let form_data = new FormData();
|
||||||
|
form_data.append("file", avatar.files[0]);
|
||||||
|
await client.me.change_avatar(form_data)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async getHtml()
|
||||||
|
{
|
||||||
|
return `
|
||||||
|
<h1>ME</h1>
|
||||||
|
<div class="accounts">
|
||||||
|
<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>
|
||||||
|
</div>
|
||||||
|
<div class="profile">
|
||||||
|
<input type="file" placeholder="username" id="avatar" accept="image/png, image/jpeg">
|
||||||
|
</div>
|
||||||
|
<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>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
}
|
@ -1,15 +0,0 @@
|
|||||||
import AbstractView from "./AbstractView.js";
|
|
||||||
|
|
||||||
export default class extends AbstractView {
|
|
||||||
constructor(params) {
|
|
||||||
super(params, "Viewing Post");
|
|
||||||
this.postId = params.id;
|
|
||||||
}
|
|
||||||
|
|
||||||
async getHtml() {
|
|
||||||
return `
|
|
||||||
<h1>Post</h1>
|
|
||||||
<p>You are viewing post #${this.postId}.</p>
|
|
||||||
`;
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,14 +0,0 @@
|
|||||||
import AbstractView from "./AbstractView.js";
|
|
||||||
|
|
||||||
export default class extends AbstractView {
|
|
||||||
constructor(params) {
|
|
||||||
super(params, "Posts");
|
|
||||||
}
|
|
||||||
|
|
||||||
async getHtml() {
|
|
||||||
return `
|
|
||||||
<h1>Posts</h1>
|
|
||||||
<p>You are viewing the posts!</p>
|
|
||||||
`;
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,14 +1,19 @@
|
|||||||
import { client, navigateTo } from "../../index.js";
|
import { client, navigateTo } from "../../index.js";
|
||||||
import AbstractAuthentifiedView from "../AbstractNonAuthentified.js";
|
import AbstractNonAuthentifiedView 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}`);
|
||||||
if (error_display != null)
|
if (error_display != null)
|
||||||
@ -22,7 +27,7 @@ async function register()
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
export default class extends AbstractAuthentifiedView {
|
export default class extends AbstractNonAuthentifiedView {
|
||||||
constructor(params) {
|
constructor(params) {
|
||||||
super(params, "Register", "/home");
|
super(params, "Register", "/home");
|
||||||
}
|
}
|
||||||
|
29
frontend/static/js/views/profiles/ProfilePageView.js
Normal file
29
frontend/static/js/views/profiles/ProfilePageView.js
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
import AbstractView from "../AbstractView.js";
|
||||||
|
import { client } from "../../index.js"
|
||||||
|
|
||||||
|
export default class extends AbstractView {
|
||||||
|
constructor(params) {
|
||||||
|
super(params, "Profile ");
|
||||||
|
this.user_id = params.id;
|
||||||
|
}
|
||||||
|
|
||||||
|
async postInit()
|
||||||
|
{
|
||||||
|
let profile = await client.profiles.getProfile(this.user_id);
|
||||||
|
|
||||||
|
let username_element = document.getElementById("username");
|
||||||
|
username_element.href = `/profiles/${this.user_id}`;
|
||||||
|
username_element.appendChild(document.createTextNode(profile.username));
|
||||||
|
|
||||||
|
let avatar_element = document.getElementById("avatar");
|
||||||
|
avatar_element.src = profile.avatar_url;
|
||||||
|
}
|
||||||
|
|
||||||
|
async getHtml() {
|
||||||
|
return `
|
||||||
|
<link rel="stylesheet" href="/static/css/profiles/profile.css">
|
||||||
|
<img id="avatar"/>
|
||||||
|
<a id="username"></a>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
}
|
40
frontend/static/js/views/profiles/ProfilesView.js
Normal file
40
frontend/static/js/views/profiles/ProfilesView.js
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
import AbstractView from "../AbstractView.js";
|
||||||
|
import { client } from "../../index.js"
|
||||||
|
|
||||||
|
export default class extends AbstractView {
|
||||||
|
constructor(params) {
|
||||||
|
super(params, "Profiles");
|
||||||
|
}
|
||||||
|
|
||||||
|
async postInit()
|
||||||
|
{
|
||||||
|
let profiles = await client.profiles.all()
|
||||||
|
let profile_list_element = document.getElementById("profile-list")
|
||||||
|
|
||||||
|
profiles.forEach((profile) => {
|
||||||
|
let profile_element = document.createElement("div");
|
||||||
|
profile_element.className = "item";
|
||||||
|
|
||||||
|
let avatar = document.createElement("img");
|
||||||
|
avatar.src = profile.avatar_url;
|
||||||
|
|
||||||
|
let username = document.createElement("a");
|
||||||
|
username.href = `/profiles/${profile.user_id}`;
|
||||||
|
username.appendChild(document.createTextNode(profile.username));
|
||||||
|
|
||||||
|
profile_element.appendChild(avatar);
|
||||||
|
profile_element.appendChild(username);
|
||||||
|
|
||||||
|
profile_list_element.appendChild(profile_element)
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async getHtml() {
|
||||||
|
return `
|
||||||
|
<link rel="stylesheet" href="/static/css/profiles/profiles.css">
|
||||||
|
<div id="profile-list">
|
||||||
|
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
}
|
@ -10,8 +10,7 @@
|
|||||||
<body>
|
<body>
|
||||||
<nav class="nav">
|
<nav class="nav">
|
||||||
<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="/profiles" class="nav__link" data-link>Profiles</a>
|
||||||
<a href="/settings" class="nav__link" data-link>Settings</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="/register" class="nav__link" data-link>Register</a>
|
||||||
<a href="/search" class="nav__link" data-link>Search</a>
|
<a href="/search" class="nav__link" data-link>Search</a>
|
||||||
|
@ -3,11 +3,15 @@ from django.db import models
|
|||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.db.models.signals import post_save
|
from django.db.models.signals import post_save
|
||||||
from django.dispatch import receiver
|
from django.dispatch import receiver
|
||||||
|
from django.conf import settings
|
||||||
|
|
||||||
|
def upload_to(instance, filename: str):
|
||||||
|
return f"./profiles/static/avatars/{instance.pk}.{filename.split('.')[1]}"
|
||||||
|
|
||||||
# Create your models here.
|
# Create your models here.
|
||||||
class ProfileModel(models.Model):
|
class ProfileModel(models.Model):
|
||||||
user = models.ForeignKey(User, on_delete=models.CASCADE)
|
user = models.ForeignKey(User, on_delete=models.CASCADE)
|
||||||
title = models.CharField(max_length=40)
|
avatar_url = models.ImageField(upload_to=upload_to, default="../static/avatars/default.avif") #blank=True, null=True)
|
||||||
|
|
||||||
@receiver(post_save, sender=User)
|
@receiver(post_save, sender=User)
|
||||||
def on_user_created(sender, instance, created, **kwargs):
|
def on_user_created(sender, instance, created, **kwargs):
|
||||||
|
11
profiles/serializers.py
Normal file
11
profiles/serializers.py
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
from rest_framework import serializers
|
||||||
|
from .models import ProfileModel
|
||||||
|
|
||||||
|
class ProfileSerializer(serializers.ModelSerializer):
|
||||||
|
|
||||||
|
username = serializers.ReadOnlyField(source='user.username')
|
||||||
|
avatar_url = serializers.ImageField(required=False)
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = ProfileModel
|
||||||
|
fields = ["username", "avatar_url", "user_id"]
|
BIN
profiles/static/avatars/default.avif
Normal file
BIN
profiles/static/avatars/default.avif
Normal file
Binary file not shown.
@ -1 +0,0 @@
|
|||||||
PROFILE_NOT_FOUND = "Profile Not Found"
|
|
@ -1,7 +1,11 @@
|
|||||||
from django.urls import path
|
from django.urls import path
|
||||||
|
from django.conf import settings
|
||||||
|
from django.conf.urls.static import static
|
||||||
|
|
||||||
from . import views
|
from . import viewsets
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path("<int:pk>", views.ProfileView.as_view(), name="profile_page"),
|
path("<int:pk>", viewsets.ProfileViewSet.as_view({'get': 'retrieve', 'patch': 'partial_update'}), name="profile_page"),
|
||||||
]
|
path("", viewsets.ProfileViewSet.as_view({'get': 'list'}), name="profiles_list"),
|
||||||
|
#path("me", viewsets.ProfileViewSet.as_view(), name="my_profile_page"),
|
||||||
|
] + static("/static/avatars/", document_root="./avatars")
|
@ -1,19 +0,0 @@
|
|||||||
from django.http import HttpRequest
|
|
||||||
from rest_framework.views import APIView
|
|
||||||
from rest_framework.response import Response
|
|
||||||
from rest_framework import permissions, status
|
|
||||||
|
|
||||||
from .models import ProfileModel
|
|
||||||
|
|
||||||
# Create your views here.
|
|
||||||
class ProfileView(APIView):
|
|
||||||
permission_classes = (permissions.AllowAny,)
|
|
||||||
|
|
||||||
def get(self, request: HttpRequest, pk: int):
|
|
||||||
|
|
||||||
profile: ProfileModel = ProfileModel.objects.get(pk=pk)
|
|
||||||
if (profile is None):
|
|
||||||
return Response(status=status.HTTP_404_NOT_FOUND)
|
|
||||||
|
|
||||||
return Response(status=status.HTTP_200_OK, data={'name': profile.user.username,
|
|
||||||
'title': profile.title})
|
|
44
profiles/viewsets.py
Normal file
44
profiles/viewsets.py
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
from rest_framework import permissions
|
||||||
|
from rest_framework.parsers import MultiPartParser, FormParser
|
||||||
|
from rest_framework import permissions, status
|
||||||
|
from rest_framework import viewsets
|
||||||
|
from rest_framework.response import Response
|
||||||
|
|
||||||
|
from django.http import HttpRequest
|
||||||
|
from django.db.models import QuerySet
|
||||||
|
|
||||||
|
from .serializers import ProfileSerializer
|
||||||
|
from .models import ProfileModel
|
||||||
|
|
||||||
|
class ProfileViewSet(viewsets.ModelViewSet):
|
||||||
|
queryset = ProfileModel.objects.all()
|
||||||
|
serializer_class = ProfileSerializer
|
||||||
|
parser_classes = (MultiPartParser, FormParser)
|
||||||
|
permission_classes = (permissions.IsAuthenticatedOrReadOnly,)
|
||||||
|
|
||||||
|
def retrieve(self, request: HttpRequest, pk=None):
|
||||||
|
instance = self.get_object()
|
||||||
|
instance.avatar_url.name = instance.avatar_url.name[instance.avatar_url.name.find("static") - 1:]
|
||||||
|
return Response(self.serializer_class(instance).data,
|
||||||
|
status=status.HTTP_200_OK)
|
||||||
|
|
||||||
|
def list(self, request: HttpRequest):
|
||||||
|
serializer = ProfileSerializer(self.queryset, many=True)
|
||||||
|
for profile in serializer.data:
|
||||||
|
profile["avatar_url"] = profile["avatar_url"][profile["avatar_url"].find("static") - 1:]
|
||||||
|
return Response(serializer.data)
|
||||||
|
|
||||||
|
def perform_create(self, serializer):
|
||||||
|
serializer.save(user=self.request.user)
|
||||||
|
|
||||||
|
def perform_update(self, serializer):
|
||||||
|
query: QuerySet = ProfileModel.objects.filter(pk=self.request.user.pk)
|
||||||
|
if (not query.exists()):
|
||||||
|
return Response("profile not found", status=status.HTTP_400_BAD_REQUEST)
|
||||||
|
profile: ProfileModel = ProfileModel.objects.get(pk=self.request.user.pk)
|
||||||
|
avatar = self.request.data.get("file", None)
|
||||||
|
if (avatar is not None):
|
||||||
|
if (profile.avatar_url.name != "default.avif"):
|
||||||
|
profile.avatar_url.storage.delete(profile.avatar_url.name)
|
||||||
|
profile.avatar_url = avatar
|
||||||
|
profile.save()
|
@ -10,6 +10,8 @@ For the full list of settings and their values, see
|
|||||||
https://docs.djangoproject.com/en/4.2/ref/settings/
|
https://docs.djangoproject.com/en/4.2/ref/settings/
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
import os
|
||||||
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
# Build paths inside the project like this: BASE_DIR / 'subdir'.
|
# Build paths inside the project like this: BASE_DIR / 'subdir'.
|
||||||
@ -25,12 +27,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',
|
||||||
)
|
)
|
||||||
@ -146,4 +148,4 @@ STATIC_URL = 'static/'
|
|||||||
# Default primary key field type
|
# Default primary key field type
|
||||||
# https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field
|
# https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field
|
||||||
|
|
||||||
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
|
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
|
@ -22,4 +22,4 @@ urlpatterns = [
|
|||||||
path('api/profiles/', include('profiles.urls')),
|
path('api/profiles/', include('profiles.urls')),
|
||||||
path('api/accounts/', include('accounts.urls')),
|
path('api/accounts/', include('accounts.urls')),
|
||||||
path('', include('frontend.urls')),
|
path('', include('frontend.urls')),
|
||||||
]
|
]
|
Loading…
Reference in New Issue
Block a user