diff --git a/back/Dockerfile b/back/Dockerfile new file mode 100644 index 0000000..edfd5eb --- /dev/null +++ b/back/Dockerfile @@ -0,0 +1,15 @@ +FROM node:21-slim + +WORKDIR /app + +COPY package*.json ./ + +RUN npm install + +COPY . . + +RUN npm run build + +EXPOSE 3000 + +CMD ["npm", "run", "serve"] diff --git a/docker-compose.yml b/docker-compose.yml index 29aa2f4..e380e30 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,14 @@ version: "1.2" services: + # front: + # build: + # context: ./front + # dockerfile: Dockerfile + # container_name: nextjs-app + # ports: + # - "3016:3016" + # mysql: image: mysql restart: always diff --git a/front/Dockerfile b/front/Dockerfile new file mode 100644 index 0000000..22021df --- /dev/null +++ b/front/Dockerfile @@ -0,0 +1,16 @@ +FROM node:21-slim + +WORKDIR /app + +COPY package*.json ./ + +RUN npm install + +COPY . . + +RUN npm run build + +EXPOSE 3016 + +# Start the NestJS application +CMD ["npm", "run", "start"] diff --git a/front/src/modules/auth/views/log-in/log-in.view.tsx b/front/src/modules/auth/views/log-in/log-in.view.tsx index b873eba..8de20e5 100644 --- a/front/src/modules/auth/views/log-in/log-in.view.tsx +++ b/front/src/modules/auth/views/log-in/log-in.view.tsx @@ -1,3 +1,4 @@ +import { Suspense } from "react"; import { LogInWidget } from "../../components/log-in/log-in.widget"; import styles from "./log-in.module.scss"; @@ -5,8 +6,10 @@ type LogInWidgetsProps = {}; export const LogInView: React.FC = ({}) => { return ( -
- -
+ +
+ +
+
); }; diff --git a/front/src/modules/common/components/navbar-header/navbar-header.component.tsx b/front/src/modules/common/components/navbar-header/navbar-header.component.tsx index 904f712..b35ddf8 100644 --- a/front/src/modules/common/components/navbar-header/navbar-header.component.tsx +++ b/front/src/modules/common/components/navbar-header/navbar-header.component.tsx @@ -10,7 +10,7 @@ export const NavbarHeader = (props: PropsWithChildren) => { return (
- + Main logo

Your brand

diff --git a/front/src/modules/common/hooks/api/useQuery.ts b/front/src/modules/common/hooks/api/useQuery.ts index 89b5736..147f3dc 100644 --- a/front/src/modules/common/hooks/api/useQuery.ts +++ b/front/src/modules/common/hooks/api/useQuery.ts @@ -47,7 +47,7 @@ export function useQuery({ setIsLoading(false); } })(); - }, [url, JSON.stringify(options), timeout, session.status]); + }, [url, options, timeout, session.status]); return { ...response, isLoading, isError }; }