Compare commits

..

No commits in common. "ffbfe2ddd0ab19994843618d1f8c31ea0fd5703f" and "9c59401cf291890da63ffdfb42c9c4c4e1534889" have entirely different histories.

8 changed files with 11 additions and 137 deletions

View File

@ -20,11 +20,6 @@ source .env/bin/activate
``` bash
pip install -r requirements.txt
```
- Setup database
```
python manage.py runserver makemigrations profiles
python manage.py migrate profiles
```
- Start the developpement server
```
python manage.py runserver 0.0.0.0:8000

View File

@ -1,12 +0,0 @@
#app .form {
background-color: red;
width: 300px;
height: 300px;
display: grid;
grid-template-columns: repeat(1, 1fr);
grid-gap: 10px;
margin-left: auto;
margin-right: auto;
margin-top: 90px;
border: 15px black solid;
}

View File

@ -1,12 +0,0 @@
#app .form {
background-color: red;
width: 300px;
height: 300px;
display: grid;
grid-template-columns: repeat(1, 1fr);
grid-gap: 10px;
margin-left: auto;
margin-right: auto;
margin-top: 90px;
border: 15px black solid;
}

View File

@ -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 }

View File

@ -1,20 +1,8 @@
import { Accounts } from "./accounts.js";
function extract_token(response)
{
let cookies = response.headers.get("set-cookie");
if (cookies == null)
return null;
token = cookies.slice(cookies.indexOf("=") + 1, cookies.indexOf(';'))
return token;
}
class Client
{
constructor(url)
{
this._url = url;
this.accounts = new Accounts(this);
this._token = undefined;
}
@ -32,16 +20,12 @@ class Client
},
body: JSON.stringify(data),
});
let token = extract_token(response);
if (token != null)
this.token = token;
return response;
}
async login(username, password)
{
let response = await this._post("/api/accounts/login", {username: username, password: password})
return response
return this._post("/api/accounts/login", {username: username, password: password})
}
}

View File

@ -6,7 +6,6 @@ import Settings from "./views/Settings.js";
import Chat from "./views/Chat.js";
import { Client } from "./api/client.js";
import RegisterView from "./views/accounts/RegisterView.js";
let client = new Client(location.protocol + "//" + location.host)
@ -32,9 +31,8 @@ const router = async () => {
{ path: "/posts", view: Posts },
{ path: "/posts/:id", view: PostView },
{ path: "/settings", view: Settings },
{ path: "/login", view: LoginView },
{ path: "/register", view: RegisterView },
{ path: "/chat", view: Chat },
{ path: "/login", view: LoginView },
];
// Test each route for potential match

View File

@ -7,18 +7,10 @@ async function login()
let password = document.getElementById("password").value;
let response = await client.login(username, password);
let response_data = await response.json();
["username", "user", "password"].forEach(error_field => {
let error_display = document.getElementById(`error_${error_field}`);
if (error_display != null)
error_display.innerHTML = "";
});
let errors = await response.json();
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];
errors.user.forEach(error => {
console.log(error)
});
}
@ -29,23 +21,18 @@ export default class extends AbstractView {
document.body.addEventListener("click", e => {
e.preventDefault();
if (e.target.type == "button")
{
login();
}
});
}
async getHtml() {
return `
<div class=form>
<label>Login</label>
<link rel="stylesheet" href="static/css/accounts/login.css">
<input type="text" id="username" placeholder="username">
<span id="error_username"></span>
<input type="password" id="password" placeholder="password">
<span id="error_password"></span>
<input type="button" value="login">
<span id="error_user"></span>
<a href="/register" class="nav__link" data-link>Register</a>
</div>
<input type="text" id="username" placeholder="username">
<input type="password" id="password" placeholder="password">
<input type="button" value="login">
<span id="login_failed"></span>
`;
}
}

View File

@ -1,51 +0,0 @@
import AbstractView from "../AbstractView.js";
import { client } from "../../index.js";
async function register()
{
let username = document.getElementById("username").value;
let password = document.getElementById("password").value;
let response = await client.accounts.create(username, password);
let response_data = await response.json();
["username", "user", "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];
});
}
export default class extends AbstractView {
constructor(params) {
super(params);
this.setTitle("register");
document.body.addEventListener("click", e => {
e.preventDefault();
if (e.target.type == "button")
register();
});
}
async getHtml() {
return `
<div class=form>
<label>Register</label>
<link rel="stylesheet" href="static/css/accounts/register.css">
<input type="text" id="username" placeholder="username">
<span id="error_username"></span>
<input type="password" id="password" placeholder="password">
<span id="error_password"></span>
<input type="button" value="register">
<span id="error_user"></span>
<a href="/login" class="nav__link" data-link>Login</a>
</div>
`;
}
}