From 088dd3a6900c98e925283a9bcae2c0d3c469f540 Mon Sep 17 00:00:00 2001
From: Azeddine Hamdaoui <azeddine.hmd@gmail.com>
Date: Sat, 31 Aug 2024 01:25:47 +0100
Subject: [PATCH 1/3] allow backend images; refactor dockerfile installing
 packages

---
 backend/Dockerfile      | 6 +-----
 frontend/Dockerfile     | 6 +-----
 frontend/next.config.js | 8 ++++----
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index 5993a79..6e96f79 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -5,11 +5,7 @@ WORKDIR /usr/src/app
 
 COPY ./package*.json ./
 
-RUN if [ "$NODE_ENV" = "production" ]; then \
-	npm ci --omit=dev; \
-else \
-	npm ci; \
-fi
+RUN npm ci
 
 COPY . ./
 RUN npm install -g prisma
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 23c76c3..037cde2 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -5,11 +5,7 @@ WORKDIR /usr/src/app
 
 COPY ./package*.json ./
 
-RUN if [ "$NODE_ENV" = "production" ]; then \
-	npm ci --omit=dev; \
-else \
-	npm ci; \
-fi
+RUN npm ci
 
 COPY . ./
 
diff --git a/frontend/next.config.js b/frontend/next.config.js
index 19af75c..ce45647 100644
--- a/frontend/next.config.js
+++ b/frontend/next.config.js
@@ -3,6 +3,10 @@ const nextConfig = {
   reactStrictMode: false,
   images: {
     remotePatterns: [
+      {
+        hostname: process.env.BACKEND_DOMAIN,
+        protocol: process.env.BACKEND_PROTOCOL,
+      },
       {
         hostname: "cdn.discordapp.com",
         protocol: "https",
@@ -11,10 +15,6 @@ const nextConfig = {
         hostname: "i.pravatar.cc",
         protocol: "https",
       },
-      {
-        hostname: "localhost",
-        protocol: "http",
-      },
       {
         hostname: "backend",
         protocol: "http",

From 3fe0af89c230075c66daf512e031ce865428658d Mon Sep 17 00:00:00 2001
From: Azeddine Hamdaoui <azeddine.hmd@gmail.com>
Date: Sat, 31 Aug 2024 03:26:48 +0100
Subject: [PATCH 2/3] aria-label added for login/register pages for
 accessibility

---
 frontend/app/(auth)/login/page.tsx    | 8 ++++----
 frontend/app/(auth)/register/page.tsx | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/frontend/app/(auth)/login/page.tsx b/frontend/app/(auth)/login/page.tsx
index 09a7610..da2c1d1 100644
--- a/frontend/app/(auth)/login/page.tsx
+++ b/frontend/app/(auth)/login/page.tsx
@@ -6,7 +6,6 @@ import { strongEmail } from "@/lib/yup-extra";
 import { useFormik } from "formik";
 import { motion } from "framer-motion";
 import Link from "next/link";
-import { useRouter } from "next/navigation";
 import { useState } from "react";
 import * as Yup from "yup";
 import { useMutation } from "@tanstack/react-query";
@@ -26,7 +25,6 @@ const loginSchema = Yup.object().shape({
 });
 
 export default function Login() {
-  const router = useRouter();
   const [error, setError] = useState<string | null>(null);
   const [emailError, setEmailError] = useState<string | null>(null);
   const [onLoading, setOnLoading] = useState(false);
@@ -70,9 +68,9 @@ export default function Login() {
           <h1 className="w-fit text-2xl font-medium text-white">
             Welcome back!
           </h1>
-          <h6 className="text-md mt-2 text-muted">
+          <h2 className="text-md mt-2 text-muted">
             We&apos;re excited to see you again!
-          </h6>
+          </h2>
           {error && (
             <h3 className="mt-2 text-lg font-semibold text-red-400">{error}</h3>
           )}
@@ -83,6 +81,7 @@ export default function Login() {
                   layoutClassName="mb-4"
                   name="email"
                   type="email"
+                  aria-label="email"
                   error={emailError ? emailError : formik.errors.email}
                   onChange={formik.handleChange}
                   value={formik.values.email}
@@ -94,6 +93,7 @@ export default function Login() {
                 <FormField
                   name="password"
                   type="password"
+                  aria-label="password"
                   error={formik.errors.password}
                   onChange={formik.handleChange}
                   value={formik.values.password}
diff --git a/frontend/app/(auth)/register/page.tsx b/frontend/app/(auth)/register/page.tsx
index e397e41..35ae62f 100644
--- a/frontend/app/(auth)/register/page.tsx
+++ b/frontend/app/(auth)/register/page.tsx
@@ -96,6 +96,7 @@ export default function Register() {
                   >
                     <FormField
                       name="displayName"
+                      aria-label="display name"
                       error={formik.errors.displayName}
                       onChange={formik.handleChange}
                       value={formik.values.displayName}
@@ -104,6 +105,7 @@ export default function Register() {
                     </FormField>
                     <FormField
                       name="username"
+                      aria-label="username"
                       error={formik.errors.username}
                       onChange={formik.handleChange}
                       value={formik.values.username}
@@ -113,6 +115,7 @@ export default function Register() {
                     <FormField
                       type="password"
                       name="password"
+                      aria-label="password"
                       error={formik.errors.password}
                       onChange={formik.handleChange}
                       value={formik.values.password}
@@ -121,6 +124,7 @@ export default function Register() {
                     </FormField>
                     <FormField
                       name="email"
+                      aria-label="email"
                       error={formik.errors.email}
                       onChange={formik.handleChange}
                       value={formik.values.email}

From 109b6ce8142e18dffab1e294850a03fa8700dce8 Mon Sep 17 00:00:00 2001
From: Azeddine Hamdaoui <azeddine.hmd@gmail.com>
Date: Sat, 31 Aug 2024 08:05:16 +0100
Subject: [PATCH 3/3] updating backend host instead of domain

---
 frontend/next.config.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/next.config.js b/frontend/next.config.js
index ce45647..620a993 100644
--- a/frontend/next.config.js
+++ b/frontend/next.config.js
@@ -3,10 +3,6 @@ const nextConfig = {
   reactStrictMode: false,
   images: {
     remotePatterns: [
-      {
-        hostname: process.env.BACKEND_DOMAIN,
-        protocol: process.env.BACKEND_PROTOCOL,
-      },
       {
         hostname: "cdn.discordapp.com",
         protocol: "https",
@@ -23,6 +19,10 @@ const nextConfig = {
         hostname: "media.discordapp.net",
         protocol: "https",
       },
+      (process.env.NODE_ENV === "production") ? {
+        hostname: process.env.BACKEND_HOST,
+        protocol: process.env.BACKEND_PROTOCOL,
+      } : undefined,
     ],
   },
   productionBrowserSourceMaps: process.env.NODE_ENV === "development",