diff --git a/src/api/user/default.js b/src/api/user/default.js index 1c63b59..2c7902b 100644 --- a/src/api/user/default.js +++ b/src/api/user/default.js @@ -59,9 +59,9 @@ const deleteFriends = database.prepare('DELETE FROM friends WHERE username = ?;' export default async function(fastify, options) { fastify.register(cors, { - origin: process.ENV.CORS_ORIGIN || 'http://localhost:5173', + origin: process.env.CORS_ORIGIN || 'http://localhost:5173', credentials: true, - methods: [ "GET", "POST", "DELETE", "OPTIONS" ] + methods: [ "GET", "POST", "PATCH", "DELETE", "OPTIONS" ] }); fastify.register(fastifyJWT, { diff --git a/src/front/static/ts/views/ProfileMenu.ts b/src/front/static/ts/views/ProfileMenu.ts index 40d68f6..84422ca 100644 --- a/src/front/static/ts/views/ProfileMenu.ts +++ b/src/front/static/ts/views/ProfileMenu.ts @@ -40,13 +40,13 @@ export default class extends Aview { async function getMainHTML() { if (!(await isLogged())) { - document.getElementById("menu-bottom-div").classList.add("hidden"); + document.getElementById("menu-bottom-div")?.classList.add("hidden"); return ` login register `; } - document.getElementById("menu-bottom-div").classList.remove("hidden"); + document.getElementById("menu-bottom-div")?.classList.remove("hidden"); uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2]; const userdata_req = await fetch(`http://localhost:3002/users/${uuid}`, { @@ -71,7 +71,7 @@ export default class extends Aview { document.getElementById("profile-items").innerHTML = await getMainHTML(); - document.getElementById("menu-logout").addEventListener("click", async () => { + document.getElementById("menu-logout")?.addEventListener("click", async () => { let req = await fetch("http://localhost:3001/logout", { method: "GET", credentials: "include", diff --git a/src/front/static/ts/views/RegisterPage.ts b/src/front/static/ts/views/RegisterPage.ts index 30618f1..7485e93 100644 --- a/src/front/static/ts/views/RegisterPage.ts +++ b/src/front/static/ts/views/RegisterPage.ts @@ -5,8 +5,7 @@ import { isLogged, navigationManager } from "../main.ts" export default class extends Aview { - constructor() - { + constructor() { super(); this.setTitle("register"); setOnekoState("default"); @@ -53,7 +52,7 @@ export default class extends Aview { } async run() { - dragElement(document.getElementById("window")); + dragElement(document.getElementById("window")); const login = async () => { const username = (document.getElementById("username") as HTMLInputElement).value; const password = (document.getElementById("password") as HTMLInputElement).value; @@ -67,34 +66,34 @@ export default class extends Aview { }); const data = await data_req.json(); - if (data_req.status === 200) - { + if (data_req.status === 200) { let uuid_req = await fetch("http://localhost:3001/me", { method: "GET", credentials: "include", }); let uuid = await uuid_req.json(); - document.cookie = `uuid=${uuid.user};max-ages=${60*60*24*7}`; + document.cookie = `uuid=${uuid.user};max-ages=${60 * 60 * 24 * 7}`; console.log(document.cookie); isLogged(); navigationManager("/"); } - else if (data_req.status === 400) - { - document.getElementById("login-error-message").innerHTML = "error: " + data.error; - document.getElementById("login-error-message").classList.remove("hidden"); + else if (data_req.status === 400) { + if (document.getElementById("login-error-message")) { + document.getElementById("login-error-message").innerHTML = "error: " + data.error; + document.getElementById("login-error-message")?.classList.remove("hidden"); + } } - else - { + else { throw new Error("invalid response"); } } - catch (error) - { + catch (error) { console.error(error); - document.getElementById("login-error-message").innerHTML = "error: server error, try again later..."; - document.getElementById("login-error-message").classList.remove("hidden"); + if (document.getElementById("login-error-message")) { + document.getElementById("login-error-message").innerHTML = "error: server error, try again later..."; + document.getElementById("login-error-message")?.classList.remove("hidden"); + } } };