From 0a4de9400f023ee0f06cb3172987ef9c7bf26dbd Mon Sep 17 00:00:00 2001 From: Alberto Baroso <35893959+AlbertoBaroso@users.noreply.github.com> Date: Thu, 23 Nov 2023 15:26:08 +0100 Subject: [PATCH 1/2] Fix missing dependencies and imports (#9) * fix: added @joi/date library * fix: added missing useState import fix: removed loading screen when auth token is empty --- api/package.json | 7 ++++--- frontend/src/App.jsx | 6 +----- pnpm-lock.yaml | 3 +++ 3 files changed, 8 insertions(+), 8 deletions(-) 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 ( Date: Thu, 7 Dec 2023 18:27:32 +0100 Subject: [PATCH 2/2] docs: updated project description, useful links, and contributors in README.md (#10) --- README.md | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 7b0628a..285a4fb 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,38 @@ - + # HKrecruitment -HKrecruitment is the platform used by HKN Polito to handle -the recruitment process. This repository contains three branches: -* **apiserver** - tracks the development of the API server -* **reactapp** - tracks the development of the front-end React application -* **documentation** - track the documentation for both the API server and the React application -Trello for project state https://trello.com/invite/b/T6YYVYW3/ATTI0e7257a02d61a8b4fe54ac88affe746346110847/hkrecruitment +HKrecruitment is the platform used by HKN Polito to handle the recruitment process. -## Authors +This repository follows the strcuture: -* **Riccardo Zaccone** - *API server* - [HKN Polito](https://hknpolito.org/) -* **Arianna Ravera** - *API server* - [HKN Polito](https://hknpolito.org/) -* **Marco Pappalardo** - *React application* - [HKN Polito](https://hknpolito.org/) +- **api** - API endpoints, back-end logic, and data storage +- **frontend** - React Application UI +- **shared** - Models, interfaces, and validation logic common to front-end and back-end +## Useful Links + +[Reports](https://drive.google.com/drive/folders/1RqGVtzU4TV6RJPmtjZQPpHVybDpU6DZk?usp=sharing) + +[Trello](https://trello.com/b/vnLyKH85/hkrecruitment) + +[UI Mockups](https://miro.com/app/board/uXjVOdvzKAk=/) + +[Database Schema](https://app.diagrams.net/#G19QUWxP5BBB3tWXnATnHP8wFE4wW7NsXw) + +## Contributors + +- **Riccardo Zaccone** - _API server_ - [HKN Polito](https://hknpolito.org/) +- **Arianna Ravera** - _API server_ - [HKN Polito](https://hknpolito.org/) +- **Vincenzo Pellegrini** - _API server_ - [HKN Polito](https://hknpolito.org/) +- **Alberto Baroso** - _API server_ - [HKN Polito](https://hknpolito.org/) +- **Marco De Luca** - _API server_ - [HKN Polito](https://hknpolito.org/) +- **Matteo Mugnai** - _API server_ - [HKN Polito](https://hknpolito.org/) +- **Pasquale Bianco** - _API server_ - [HKN Polito](https://hknpolito.org/) + +- **Marco Pappalardo** - _React application_ - [HKN Polito](https://hknpolito.org/) +- **Damiano Bonaccorsi** - _React application_ - [HKN Polito](https://hknpolito.org/) ## License + HKRecruitment is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. See the [COPYING](COPYING) file for details.