diff --git a/app/Admin/Overview/page.tsx b/app/Admin/Overview/page.tsx index 134a4ea..8166063 100644 --- a/app/Admin/Overview/page.tsx +++ b/app/Admin/Overview/page.tsx @@ -1,6 +1,7 @@ +"use client"; + import { useEffect, useState } from "react"; -import UnderConstruction from "@/components/static_pages/UnderConstruction"; import RoundedContainer from "@/components/ui/RoundedContainer"; import { getServices } from "@/lib/api/helpers/services"; import { Project, Service, User } from "@/lib/api/types"; @@ -8,7 +9,7 @@ import { getUsers } from "@/lib/api/helpers/users"; export default function Overview() { const [projectStatus, setProjectStatus] = useState(true); - const [projects, setProjects] = useState(); + const [projects, setProjects] = useState([]); /*useEffect(() => { getProjects() .then((projects) => { @@ -21,7 +22,7 @@ export default function Overview() { }); }, []); IMPLEMENT GET PROJECTS */ const [serviceStatus, setServiceStatus] = useState(true); - const [services, setServices] = useState(); + const [services, setServices] = useState([]); useEffect(() => { getServices() .then((services) => { @@ -34,7 +35,7 @@ export default function Overview() { }); }, []); const [userStatus, setUserStatus] = useState(true); - const [users, setUsers] = useState(); + const [users, setUsers] = useState([]); useEffect(() => { getUsers() .then((users) => { @@ -50,12 +51,33 @@ export default function Overview() {

Users

+ {users.length < 1 ? ( + users.map((user) =>

{user.username}

) + ) : userStatus.valueOf() ? ( +

Loading users...

+ ) : ( +

Failed to load users :C

+ )}

Services

+ {services.length < 1 ? ( + services.map((service) =>

{service.title}

) + ) : serviceStatus ? ( +

Loading services...

+ ) : ( +

Failed to load services :C

+ )}

Projects

+ {projects.length < 1 ? ( + projects.map((project) =>

{project.title}

) + ) : projectStatus ? ( +

Loading projects...

+ ) : ( +

Failed to load projects :C

+ )}
); diff --git a/lib/api/helpers/projects.ts b/lib/api/helpers/projects.ts index e69de29..1aedc5f 100644 --- a/lib/api/helpers/projects.ts +++ b/lib/api/helpers/projects.ts @@ -0,0 +1,18 @@ +import { cmFetch } from "../cmFetch"; +import { Project } from "../types"; + +export async function getProjects() { + return Promise; // TODO: IMPLEMENT +} + +export async function getProject(/*id: number */) { + return Promise; // TODO: IMPLEMENT +} + +export async function createProject(/*project: Project*/) { + return Promise; // TODO: IMPLEMENT +} + +export async function deleteService(/*id: number*/) { + return Promise; +} diff --git a/lib/api/helpers/users.ts b/lib/api/helpers/users.ts index e53b827..f490847 100644 --- a/lib/api/helpers/users.ts +++ b/lib/api/helpers/users.ts @@ -1,5 +1,4 @@ import { getSessionToken } from "@/lib/server_functions/userAuth"; -import logger from "@/lib/logging/logger"; import { cmFetch, cmFetchRaw } from "../cmFetch"; import { Token, User } from "../types"; @@ -25,7 +24,7 @@ export async function loginUser(user: FormData) { username: user.get("username"), password: user.get("password"), }; - logger.log("debug", `Recieved login user request for form: ${body}`); // debug login form submission + // logger.log("debug", `Recieved login user request for form: ${body}`); // debug login form submission, ISSUE, THIS IS A CLIENT HELPER! return cmFetch(`/api/users/login`, { method: "POST", headers: { diff --git a/lib/server_functions/userAuth.ts b/lib/server_functions/userAuth.ts index ff976b0..b881106 100644 --- a/lib/server_functions/userAuth.ts +++ b/lib/server_functions/userAuth.ts @@ -9,7 +9,7 @@ import logger from "../logging/logger"; export async function login(formData: FormData) { "use server"; const token = await loginUser(formData); - logger.log("debug", `Fetched following token for login: ${token}`); // token check for backend debugging + // ERROR: No transport? logger.log("debug", `Fetched following token for login: ${token}`); // token check for backend debugging await createSession(token); redirect("/Admin/Overview"); } @@ -18,7 +18,7 @@ export async function signup(formData: FormData) { // Technically same code as login for now but will do different stuff with it later so separating it early on "use server"; const token = await createUser(formData); - logger.log("debug", `Fetched following token for login: ${token}`); // token check for backend debugging + // ERROR: No transport? logger.log("debug", `Fetched following token for login: ${token}`); // token check for backend debugging await createSession(token); redirect("/Admin/Overview"); } @@ -37,7 +37,7 @@ export async function createSession(token: Token) { export async function getSessionToken() { const cookieStore = await cookies(); - logger.log("debug", cookieStore.getAll()); // debug: log cookies when checking for session token, ideally logs session token too + // ERROR: No transport? logger.log("debug", cookieStore.getAll()); // debug: log cookies when checking for session token, ideally logs session token too const token = cookieStore.get("access_token")?.value; return token ? token : null;