Compare commits
30 Commits
jspong
...
7e2c29e78b
Author | SHA1 | Date | |
---|---|---|---|
7e2c29e78b | |||
0e3b19fcd9 | |||
bc892bc157 | |||
08ce682980 | |||
9b523f082f | |||
78379aea1b | |||
982130a02f | |||
85787760b9 | |||
2ccfc5464a | |||
624fb47e04 | |||
c178556a2e | |||
d8a279f4d8 | |||
9c1dd30db7 | |||
cb5affab48 | |||
08093627c9 | |||
079be0bb46 | |||
df436e0b88 | |||
208dd206ce | |||
cee188145d | |||
c3c83b3168 | |||
dd19e15e7d | |||
0edcd97f94 | |||
54afa8aae5 | |||
2ce1356412 | |||
d1c75f7033 | |||
3833c647aa | |||
32a8cbfda6 | |||
9b6c5547f0 | |||
910644a804 | |||
af9595c447 |
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,6 +1,7 @@
|
|||||||
from rest_framework.views import APIView
|
from rest_framework.views import APIView
|
||||||
from rest_framework import permissions, status
|
from rest_framework import permissions, status
|
||||||
from rest_framework.response import Response
|
from rest_framework.response import Response
|
||||||
|
from django.contrib.auth import logout
|
||||||
from django.http import HttpRequest
|
from django.http import HttpRequest
|
||||||
from rest_framework.authentication import SessionAuthentication
|
from rest_framework.authentication import SessionAuthentication
|
||||||
|
|
||||||
@ -16,4 +17,5 @@ class DeleteView(APIView):
|
|||||||
if (request.user.check_password(password) == False):
|
if (request.user.check_password(password) == False):
|
||||||
return Response({"password": ["Password wrong."]})
|
return Response({"password": ["Password wrong."]})
|
||||||
request.user.delete()
|
request.user.delete()
|
||||||
|
logout(request)
|
||||||
return Response("user deleted", status=status.HTTP_200_OK)
|
return Response("user deleted", status=status.HTTP_200_OK)
|
@ -13,7 +13,7 @@ class EditView(APIView):
|
|||||||
authentication_classes = (SessionAuthentication,)
|
authentication_classes = (SessionAuthentication,)
|
||||||
|
|
||||||
def get(self, request: HttpRequest):
|
def get(self, request: HttpRequest):
|
||||||
return Response({"username": request.user.username})
|
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)
|
@ -18,19 +18,27 @@ class ChatConsumer(WebsocketConsumer):
|
|||||||
text_data_json = json.loads(text_data)
|
text_data_json = json.loads(text_data)
|
||||||
message = text_data_json['message']
|
message = text_data_json['message']
|
||||||
|
|
||||||
|
user = self.scope["user"]
|
||||||
|
if user.is_anonymous:
|
||||||
|
return;
|
||||||
|
|
||||||
async_to_sync(self.channel_layer.group_send)(
|
async_to_sync(self.channel_layer.group_send)(
|
||||||
self.room_group_name,
|
self.room_group_name,
|
||||||
{
|
{
|
||||||
'type':'chat_message',
|
'type':'chat_message',
|
||||||
|
'username':user.username,
|
||||||
'message':message
|
'message':message
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
def chat_message(self, event):
|
def chat_message(self, event):
|
||||||
message = event['message']
|
|
||||||
|
user = self.scope["user"]
|
||||||
|
if user.is_anonymous:
|
||||||
|
return;
|
||||||
|
|
||||||
self.send(text_data=json.dumps({
|
self.send(text_data=json.dumps({
|
||||||
'type':'chat',
|
'type':'chat',
|
||||||
'username':self.scope["user"].username,
|
'username':event['username'],
|
||||||
'message':message
|
'message':event['message']
|
||||||
}))
|
}))
|
||||||
|
@ -1,3 +1,17 @@
|
|||||||
from django.db import models
|
from django.db import models
|
||||||
|
from django.db.models import IntegerField
|
||||||
|
from django.contrib.auth.models import User
|
||||||
|
|
||||||
# Create your models here.
|
# Create your models here.
|
||||||
|
class ChannelModel(models.Model):
|
||||||
|
pass
|
||||||
|
|
||||||
|
class MemberModel(models.Model):
|
||||||
|
member_id = IntegerField(primary_key=False)
|
||||||
|
channel_id = IntegerField(primary_key=False)
|
||||||
|
|
||||||
|
class MessageModel(models.Model):
|
||||||
|
channel_id = IntegerField(primary_key=False)
|
||||||
|
author_id = IntegerField(primary_key=False)
|
||||||
|
content = models.CharField(max_length=255)
|
||||||
|
time = models.DateField()
|
||||||
|
8
chat/serializers.py
Normal file
8
chat/serializers.py
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
from rest_framework import serializers
|
||||||
|
from .models import ChannelModel
|
||||||
|
|
||||||
|
class ChannelSerializer(serializers.ModelSerializer):
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = ChannelModel
|
||||||
|
fields = []
|
9
chat/urls.py
Normal file
9
chat/urls.py
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
from django.urls import path
|
||||||
|
from django.conf import settings
|
||||||
|
from django.conf.urls.static import static
|
||||||
|
|
||||||
|
from . import views
|
||||||
|
|
||||||
|
urlpatterns = [
|
||||||
|
path("<int:pk>", views.ChatView.as_view(), name="chat_page"),
|
||||||
|
]
|
@ -1,3 +1,29 @@
|
|||||||
from django.shortcuts import render
|
from rest_framework.views import APIView
|
||||||
|
from rest_framework.response import Response
|
||||||
|
from rest_framework import authentication, permissions
|
||||||
|
from rest_framework.authentication import SessionAuthentication
|
||||||
|
from .models import ChannelModel, MemberModel, MessageModel
|
||||||
|
|
||||||
# Create your views here.
|
class ChatView(APIView):
|
||||||
|
permission_classes = (permissions.IsAuthenticated,)
|
||||||
|
authentication_classes = (SessionAuthentication,)
|
||||||
|
|
||||||
|
def post(self, request, pk):
|
||||||
|
if (ChannelModel.objects.filter(pk = pk)):
|
||||||
|
return Response("Channel already exist")
|
||||||
|
|
||||||
|
data: dict = request.data
|
||||||
|
users_id = request.data.get("users_id", [])
|
||||||
|
if len(users_id) < 2:
|
||||||
|
return Response("Not enought members to create the channel")
|
||||||
|
|
||||||
|
new_channel = ChannelModel()
|
||||||
|
new_channel.save()
|
||||||
|
|
||||||
|
for user_id in users_id:
|
||||||
|
new_member = MemberModel()
|
||||||
|
new_member.channel_id = new_channel.pk
|
||||||
|
new_member.member_id = user_id
|
||||||
|
new_member.save()
|
||||||
|
|
||||||
|
return Response("Channel created")
|
||||||
|
19
frontend/static/css/me.css
Normal file
19
frontend/static/css/me.css
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
#app .account
|
||||||
|
{
|
||||||
|
background-color: red;
|
||||||
|
}
|
||||||
|
|
||||||
|
#app .account, #app .profile
|
||||||
|
{
|
||||||
|
width: 60%;
|
||||||
|
display: flex;
|
||||||
|
margin-left: auto;
|
||||||
|
margin-right: auto;
|
||||||
|
flex-direction: column;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
#app .profile
|
||||||
|
{
|
||||||
|
background-color: green;
|
||||||
|
}
|
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;
|
||||||
|
}
|
17
frontend/static/css/search.css
Normal file
17
frontend/static/css/search.css
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
#app img
|
||||||
|
{
|
||||||
|
max-height: 100px;
|
||||||
|
max-width: 100px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#app ul
|
||||||
|
{
|
||||||
|
margin: 5px 0 0 0;
|
||||||
|
padding: 0 0 0 0;
|
||||||
|
list-style-type: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
#app li
|
||||||
|
{
|
||||||
|
margin: 10px 10px 0 0;
|
||||||
|
}
|
@ -23,7 +23,13 @@ class Account
|
|||||||
let response = await this.client._delete("/api/accounts/delete", {password: password});
|
let response = await this.client._delete("/api/accounts/delete", {password: password});
|
||||||
let response_data = await response.json();
|
let response_data = await response.json();
|
||||||
|
|
||||||
if (response_data === "user deleted")
|
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;
|
this.client._logged = false;
|
||||||
return response_data;
|
return response_data;
|
||||||
}
|
}
|
||||||
@ -35,7 +41,7 @@ class Account
|
|||||||
|
|
||||||
if (JSON.stringify(response_data) == JSON.stringify({'detail': 'Authentication credentials were not provided.'}))
|
if (JSON.stringify(response_data) == JSON.stringify({'detail': 'Authentication credentials were not provided.'}))
|
||||||
{
|
{
|
||||||
console.log("error, client is not logged");
|
this.client._logged = false;
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
return response_data;
|
return response_data;
|
||||||
@ -43,13 +49,13 @@ class Account
|
|||||||
|
|
||||||
async update(data, password)
|
async update(data, password)
|
||||||
{
|
{
|
||||||
data.password = password;
|
data.current_password = password;
|
||||||
let response = await this.client._patch_json("/api/accounts/edit", data);
|
let response = await this.client._patch_json("/api/accounts/edit", data);
|
||||||
let response_data = await response.json();
|
let response_data = await response.json();
|
||||||
|
|
||||||
if (JSON.stringify(response_data) == JSON.stringify({'detail': 'Authentication credentials were not provided.'}))
|
if (JSON.stringify(response_data) == JSON.stringify({'detail': 'Authentication credentials were not provided.'}))
|
||||||
{
|
{
|
||||||
console.log("error, client is not logged");
|
this.client._logged = false;
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
return response_data;
|
return response_data;
|
||||||
|
9
frontend/static/js/api/chat/channel.js
Normal file
9
frontend/static/js/api/chat/channel.js
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
class Channel {
|
||||||
|
constructor(id, members, messages) {
|
||||||
|
this.id = id;
|
||||||
|
this.members = members;
|
||||||
|
this.messages = messages;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export {Channel}
|
19
frontend/static/js/api/chat/channels.js
Normal file
19
frontend/static/js/api/chat/channels.js
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
class Channels {
|
||||||
|
constructor(client) {
|
||||||
|
this.client = client;
|
||||||
|
}
|
||||||
|
|
||||||
|
async createChannel(users_id) {
|
||||||
|
console.log(users_id);
|
||||||
|
let response = await this.client._post("/api/chat/", {
|
||||||
|
users_id:users_id
|
||||||
|
});
|
||||||
|
|
||||||
|
let data = await response.json();
|
||||||
|
if (data == "Channel already exist")
|
||||||
|
return null;
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export {Channels}
|
@ -1,4 +1,6 @@
|
|||||||
import { Account } from "./account.js";
|
import { Account } from "./account.js";
|
||||||
|
import { Profile } from "./profile.js";
|
||||||
|
import { Profiles } from "./profiles.js";
|
||||||
|
|
||||||
function getCookie(name)
|
function getCookie(name)
|
||||||
{
|
{
|
||||||
@ -16,6 +18,7 @@ class Client
|
|||||||
{
|
{
|
||||||
this._url = url;
|
this._url = url;
|
||||||
this.account = new Account(this);
|
this.account = new Account(this);
|
||||||
|
this.profiles = new Profiles(this);
|
||||||
this._logged = undefined;
|
this._logged = undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -73,12 +76,26 @@ class Client
|
|||||||
return response;
|
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;
|
||||||
}
|
}
|
||||||
@ -95,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(user_id)
|
||||||
|
{
|
||||||
|
let response = await this.client._get(`/api/profiles/${user_id}`);
|
||||||
|
let response_data = await response.json();
|
||||||
|
|
||||||
|
this.user_id = user_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.user_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,8 +1,7 @@
|
|||||||
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 Chat from "./views/Chat.js";
|
import Chat from "./views/Chat.js";
|
||||||
import HomeView from "./views/HomeView.js";
|
import HomeView from "./views/HomeView.js";
|
||||||
import RegisterView from "./views/accounts/RegisterView.js";
|
import RegisterView from "./views/accounts/RegisterView.js";
|
||||||
@ -11,6 +10,7 @@ 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 MeView from "./views/MeView.js";
|
||||||
|
import ProfilePageView from "./views/profiles/ProfilePageView.js";
|
||||||
|
|
||||||
let client = new Client(location.protocol + "//" + location.host)
|
let client = new Client(location.protocol + "//" + location.host)
|
||||||
|
|
||||||
@ -32,15 +32,15 @@ const navigateTo = async (uri) => {
|
|||||||
history.pushState(null, null, uri);
|
history.pushState(null, null, 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/:id", view: ProfilePageView },
|
||||||
{ 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: "/logout", view: LogoutView },
|
||||||
{ path: "/register", view: RegisterView },
|
{ path: "/register", view: RegisterView },
|
||||||
|
{ path: "/search", view: Search },
|
||||||
{ path: "/chat", view: Chat },
|
{ path: "/chat", view: Chat },
|
||||||
{ path: "/home", view: HomeView },
|
{ path: "/home", view: HomeView },
|
||||||
{ path: "/me", view: MeView },
|
{ path: "/me", view: MeView },
|
||||||
@ -84,7 +84,7 @@ const router = async (uri = "") => {
|
|||||||
return 0;
|
return 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
window.addEventListener("popstate", router);
|
window.addEventListener("popstate", function() {router(location.pathname)});
|
||||||
|
|
||||||
document.addEventListener("DOMContentLoaded", () => {
|
document.addEventListener("DOMContentLoaded", () => {
|
||||||
document.body.addEventListener("click", e => {
|
document.body.addEventListener("click", e => {
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
import AbstractAuthentifiedView from "./AbstractAuthentifiedView.js";
|
import AbstractView from "./AbstractView.js";
|
||||||
|
|
||||||
export default class extends AbstractAuthentifiedView {
|
export default class extends AbstractView {
|
||||||
constructor(params) {
|
constructor(params) {
|
||||||
super(params, "Chat");
|
super(params, "Chat");
|
||||||
|
|
||||||
let url = `wss://${window.location.host}/ws/socket-server/`
|
let url = `ws://${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){
|
||||||
@ -44,7 +44,7 @@ export default class extends AbstractAuthentifiedView {
|
|||||||
<h1>Chat</h1>
|
<h1>Chat</h1>
|
||||||
|
|
||||||
<form id="form">
|
<form id="form">
|
||||||
<input type="text" name="message" />
|
<input type="text" name="message" placeholder="message"/>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<div id="messages">
|
<div id="messages">
|
||||||
|
@ -12,14 +12,19 @@ export default class extends AbstractAuthentificateView
|
|||||||
{
|
{
|
||||||
if (this.fill() === null)
|
if (this.fill() === null)
|
||||||
return;
|
return;
|
||||||
document.getElementById("save-button").onclick = this.save;
|
document.getElementById("save-account-button").onclick = this.acccount_save;
|
||||||
document.getElementById("delete-button").onclick = this.delete_accounts;
|
document.getElementById("delete-account-button").onclick = this.account_delete_accounts;
|
||||||
}
|
}
|
||||||
|
|
||||||
async fill()
|
async fill()
|
||||||
{
|
{
|
||||||
let data = await client.account.get();
|
let data = await client.account.get();
|
||||||
|
|
||||||
|
if (data === null)
|
||||||
|
{
|
||||||
|
navigateTo("/login")
|
||||||
|
return;
|
||||||
|
}
|
||||||
document.getElementById("username").value = data.username;
|
document.getElementById("username").value = data.username;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -66,7 +71,12 @@ export default class extends AbstractAuthentificateView
|
|||||||
|
|
||||||
if (response_data === null)
|
if (response_data === null)
|
||||||
{
|
{
|
||||||
navigateTo(super.redirect_url);
|
navigateTo("/login");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else if (response_data === "data has been alterate")
|
||||||
|
{
|
||||||
|
navigateTo("/me");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -81,22 +91,40 @@ export default class extends AbstractAuthentificateView
|
|||||||
if (error_display != null)
|
if (error_display != null)
|
||||||
error_display.innerHTML = response_data[error_field];
|
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()
|
async getHtml()
|
||||||
{
|
{
|
||||||
return `
|
return `
|
||||||
|
<link rel="stylesheet" href="static/css/me.css">
|
||||||
<h1>ME</h1>
|
<h1>ME</h1>
|
||||||
<input type=text placeholder="username" id="username">
|
<div class="account">
|
||||||
|
<h3>Account</h3>
|
||||||
|
<input type="text" placeholder="username" id="username">
|
||||||
<span id="error_username"></span>
|
<span id="error_username"></span>
|
||||||
<input type=password placeholder="new password" id="new_password">
|
<input type=password placeholder="new password" id="new_password">
|
||||||
<span id="error_new_password"></span>
|
<span id="error_new_password"></span>
|
||||||
<input type=password placeholder="current password" id="current_password">
|
<input type=password placeholder="current password" id="current_password">
|
||||||
<span id="error_current_password"></span>
|
<span id="error_current_password"></span>
|
||||||
<input type="button" value="Save" id="save-button">
|
<input type="button" value="Save Credentials" id="save-account-button">
|
||||||
<span id="error_save"></span>
|
<span id="error_save"></span>
|
||||||
<input type="button" value="Delete" id="delete-button">
|
<input type="button" value="Delete Account" id="delete-account-button">
|
||||||
<span id="error_delete"></span>
|
<span id="error_delete"></span>
|
||||||
|
</div>
|
||||||
|
<div class="profile">
|
||||||
|
<h3>Profile</h3>
|
||||||
|
<input type="file" id="avatar" accept="image/png, image/jpeg">
|
||||||
|
<input type="button" value="Save profile" id="save-profile-button">
|
||||||
|
<span id="error_save"></span>
|
||||||
|
</div>
|
||||||
<a href="/logout" class="nav__link" data-link>Logout</a>
|
<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>
|
|
||||||
`;
|
|
||||||
}
|
|
||||||
}
|
|
85
frontend/static/js/views/Search.js
Normal file
85
frontend/static/js/views/Search.js
Normal file
@ -0,0 +1,85 @@
|
|||||||
|
import AbstractView from "./AbstractView.js";
|
||||||
|
import {client} from "../index.js";
|
||||||
|
|
||||||
|
export default class extends AbstractView {
|
||||||
|
constructor(params) {
|
||||||
|
super(params, "Search");
|
||||||
|
}
|
||||||
|
|
||||||
|
async postInit() {
|
||||||
|
|
||||||
|
let search = document.getElementById("form");
|
||||||
|
search.addEventListener("input", this.users)
|
||||||
|
|
||||||
|
this.users();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
async users() {
|
||||||
|
|
||||||
|
let search = document.getElementById("form").value;
|
||||||
|
|
||||||
|
let logged = await client.isAuthentificate();
|
||||||
|
|
||||||
|
let users = await client.profiles.all();
|
||||||
|
let list_users = document.getElementById('list_users');
|
||||||
|
list_users.innerHTML = "";
|
||||||
|
|
||||||
|
users.filter(user => user.username.startsWith(search) == true).forEach((user) => {
|
||||||
|
var new_user = document.createElement("li");
|
||||||
|
|
||||||
|
// username
|
||||||
|
let username = document.createElement("a");
|
||||||
|
username.href = `/profiles/${user.user_id}`;
|
||||||
|
username.appendChild(document.createTextNode(user.username));
|
||||||
|
new_user.appendChild(username);
|
||||||
|
|
||||||
|
// space
|
||||||
|
new_user.appendChild(document.createTextNode(" "));
|
||||||
|
|
||||||
|
// chat
|
||||||
|
if (logged) {
|
||||||
|
let chat = document.createElement("a");
|
||||||
|
let array = [
|
||||||
|
client.me.user_id,
|
||||||
|
user.user_id,
|
||||||
|
];
|
||||||
|
console.log(client.me.id);
|
||||||
|
chat.addEventListener("click", async function(){
|
||||||
|
console.log("click");
|
||||||
|
await client.channels.createChannel([client.me.user_id , user.user_id]);
|
||||||
|
});
|
||||||
|
//chat.href = `/chat`
|
||||||
|
chat.appendChild(document.createTextNode("Chat"));
|
||||||
|
new_user.appendChild(chat);
|
||||||
|
}
|
||||||
|
|
||||||
|
// break line
|
||||||
|
new_user.appendChild(document.createElement("br"));
|
||||||
|
|
||||||
|
// avatar
|
||||||
|
var img = document.createElement("img");
|
||||||
|
img.src = user.avatar_url;
|
||||||
|
new_user.appendChild(img);
|
||||||
|
|
||||||
|
|
||||||
|
list_users.appendChild(new_user);
|
||||||
|
});
|
||||||
|
//console.log(list_users);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
async getHtml() {
|
||||||
|
return `
|
||||||
|
<link rel="stylesheet" href="/static/css/search.css">
|
||||||
|
|
||||||
|
<input id="form" type="text" name="message" placeholder="userbozo"/>
|
||||||
|
|
||||||
|
<div id="users">
|
||||||
|
<ul id="list_users">
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
}
|
@ -1,5 +1,5 @@
|
|||||||
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()
|
||||||
{
|
{
|
||||||
@ -14,7 +14,6 @@ async function register()
|
|||||||
return;
|
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)
|
||||||
@ -28,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>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
}
|
@ -10,11 +10,10 @@
|
|||||||
<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="/search" class="nav__link" data-link>Search</a>
|
||||||
<a href="/settings" class="nav__link" data-link>Settings</a>
|
<a href="/home" class="nav__link" data-link>Home</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="/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>
|
||||||
|
6
package-lock.json
generated
Normal file
6
package-lock.json
generated
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"name": "ft_transcendence",
|
||||||
|
"lockfileVersion": 3,
|
||||||
|
"requires": true,
|
||||||
|
"packages": {}
|
||||||
|
}
|
@ -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="./profiles/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.
After Width: | Height: | Size: 35 KiB |
@ -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 = ProfileModel.objects.get(pk=pk)
|
||||||
|
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 != "./profiles/static/avatars/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'.
|
||||||
@ -44,6 +46,7 @@ INSTALLED_APPS = [
|
|||||||
'accounts.apps.AccountsConfig',
|
'accounts.apps.AccountsConfig',
|
||||||
'profiles.apps.ProfilesConfig',
|
'profiles.apps.ProfilesConfig',
|
||||||
'frontend.apps.FrontendConfig',
|
'frontend.apps.FrontendConfig',
|
||||||
|
'chat.apps.ChatConfig',
|
||||||
|
|
||||||
'corsheaders',
|
'corsheaders',
|
||||||
'rest_framework',
|
'rest_framework',
|
||||||
|
@ -21,5 +21,6 @@ urlpatterns = [
|
|||||||
path('admin/', admin.site.urls),
|
path('admin/', admin.site.urls),
|
||||||
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('api/chat/', include('chat.urls')),
|
||||||
path('', include('frontend.urls')),
|
path('', include('frontend.urls')),
|
||||||
]
|
]
|
||||||
|
Reference in New Issue
Block a user