From 914fc91731d6cd3c35be348399110a164c75e631 Mon Sep 17 00:00:00 2001 From: kajvans Date: Mon, 11 Mar 2024 18:12:31 +0100 Subject: [PATCH] alot and reverse proxy --- next.config.js | 9 +- src/app/_components/sessiondata.tsx | 5 +- src/app/_helpers/auth.tsx | 57 +++- src/app/browse/browseBlock.module.scss | 42 +++ src/app/browse/browseBlock.tsx | 35 +++ src/app/browse/page.module.scss | 35 +++ src/app/browse/page.tsx | 69 +++++ .../category/[slug]/browseBlock.module.scss | 57 ++++ src/app/category/[slug]/browseBlock.tsx | 39 +++ src/app/category/[slug]/page.module.scss | 46 +++ src/app/category/[slug]/page.tsx | 98 ++++++ src/app/page.module.scss | 248 ++++++++++++++- src/app/page.tsx | 292 ++++++++++++++++-- src/app/post/[slug]/Comment.module.scss | 0 src/app/post/[slug]/Comment.tsx | 0 src/app/post/[slug]/page.module.scss | 103 ++++++ src/app/post/[slug]/page.tsx | 111 +++++++ src/app/register/page.tsx | 2 +- src/styles/_colors.scss | 2 + 19 files changed, 1209 insertions(+), 41 deletions(-) create mode 100644 src/app/browse/browseBlock.module.scss create mode 100644 src/app/browse/browseBlock.tsx create mode 100644 src/app/browse/page.module.scss create mode 100644 src/app/browse/page.tsx create mode 100644 src/app/category/[slug]/browseBlock.module.scss create mode 100644 src/app/category/[slug]/browseBlock.tsx create mode 100644 src/app/category/[slug]/page.module.scss create mode 100644 src/app/category/[slug]/page.tsx create mode 100644 src/app/post/[slug]/Comment.module.scss create mode 100644 src/app/post/[slug]/Comment.tsx create mode 100644 src/app/post/[slug]/page.module.scss create mode 100644 src/app/post/[slug]/page.tsx diff --git a/next.config.js b/next.config.js index 3ce97eb..9ef75a3 100644 --- a/next.config.js +++ b/next.config.js @@ -2,11 +2,18 @@ const path = require('path'); /** @type {import('next').NextConfig} */ const nextConfig = { - output: 'export', distDir: 'out', sassOptions: { includePaths: [path.join(__dirname, 'styles')], }, + async rewrites() { + return [ + { + source: '/api/:path*', + destination: 'http://localhost:5000/:path*', // Proxy to Backend IMPORTANT TO SET THE CORRECT PORT + }, + ]; + } }; module.exports = nextConfig; diff --git a/src/app/_components/sessiondata.tsx b/src/app/_components/sessiondata.tsx index 29d362c..39f726f 100644 --- a/src/app/_components/sessiondata.tsx +++ b/src/app/_components/sessiondata.tsx @@ -8,7 +8,10 @@ import { setSession } from '../_helpers/auth'; export default function Sessiondata() { const pathname: string = usePathname().substring(1); - var username: string = localStorage.getItem('username') || ''; + var username: string = ''; + // if(typeof window !== 'undefined'){ + username = localStorage.getItem('username') || ''; + // } if (pathname === 'register' || pathname === 'login') { return null; diff --git a/src/app/_helpers/auth.tsx b/src/app/_helpers/auth.tsx index c91ea87..0433a98 100644 --- a/src/app/_helpers/auth.tsx +++ b/src/app/_helpers/auth.tsx @@ -54,7 +54,7 @@ export function RegisterForm() { + + +
+ +
+ + )} + + + ); +} diff --git a/src/app/register/page.tsx b/src/app/register/page.tsx index c4aa4b2..a0243a6 100644 --- a/src/app/register/page.tsx +++ b/src/app/register/page.tsx @@ -12,7 +12,7 @@ export const metadata: Metadata = { openGraph: { ...openGraphMetadata, title: 'Create an account', - url: 'https://quiztimes.nl/register', + url: 'https://Forum.nl/register', }, }; diff --git a/src/styles/_colors.scss b/src/styles/_colors.scss index 5225f92..af55770 100644 --- a/src/styles/_colors.scss +++ b/src/styles/_colors.scss @@ -4,6 +4,8 @@ $colors: ( brand: hsl(237, 100%, 70%), + brand-dark: hsl(237, 100%, 60%), + brand-light: hsl(237, 100%, 80%), white: hsl(0, 0%, 100%), off-white: hsl(0, 0%, 96%), gray: hsl(0, 0%, 50%),