diff --git a/api/package.json b/api/package.json index ba92e4e..4bb5e3c 100644 --- a/api/package.json +++ b/api/package.json @@ -24,6 +24,7 @@ "@casl/ability": "^6.3.3", "@fastify/static": "^6.6.0", "@hkrecruitment/shared": "workspace:*", + "@joi/date": "^2.1.0", "@nestjs/common": "^9.0.0", "@nestjs/config": "^2.2.0", "@nestjs/core": "^9.0.0", @@ -34,9 +35,9 @@ "@types/js-yaml": "^4.0.5", "@types/passport-jwt": "^3.0.7", "class-transformer": "^0.5.1", + "dotenv": "^16.0.3", "google-auth-library": "^8.7.0", "googleapis": "^118.0.0", - "dotenv": "^16.0.3", "joi": "^17.7.0", "js-yaml": "^4.1.0", "jwks-rsa": "^3.0.0", @@ -49,7 +50,6 @@ "webpack": "^5.75.0" }, "devDependencies": { - "@types/multer": "^1.4.7", "@automock/jest": "^1.0.1", "@golevelup/ts-jest": "^0.3.6", "@nestjs/cli": "^9.0.0", @@ -59,6 +59,7 @@ "@swc/jest": "^0.2.26", "@types/express": "^4.17.14", "@types/jest": "28.1.8", + "@types/multer": "^1.4.7", "@types/node": "^16.11.10", "@types/supertest": "^2.0.11", "@typescript-eslint/eslint-plugin": "^5.0.0", @@ -99,7 +100,7 @@ ], "moduleNameMapper": { "^@mocks/(.*)$": "/src/mocks/$1" - }, + }, "coverageDirectory": "../coverage", "testEnvironment": "node" } diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index 709f43b..7c17f28 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -1,6 +1,6 @@ import "./App.css"; import "bootstrap/dist/css/bootstrap.min.css"; -import React, { useEffect } from "react"; +import React, { useEffect, useState } from "react"; import MyNavbar from "./MyNavbar"; import SignupForm from "./SignupForm"; import { Route } from "react-router-dom"; @@ -37,10 +37,6 @@ function App() { } }, [isAuthenticated]); - if (accessToken === "") { - return
Loading...
; - } - return (