Signing you in...
;
- case 'signoutRedirect':
- return Signing you out...
;
- }
-
- if (auth.isLoading) {
- return Loading...
;
- }
-
- if (auth.error) {
- return Oops... {auth.error.message}
;
- }
-
- if (auth.isAuthenticated) {
- return (
- <>
-
-
Oops!
-
Sorry, an unexpected error has occurred.
-
- {error.statusText || error.message}
-
-
This is the Dedications page
+ Welcome {username}
+ This is a sample React page that is using the FastApi backend to fetch some data.
+
+
+
Projects from API
+ {projects && projects.map((project) =>
{project.description}
)}
+
Signing you in...
+ case 'signoutRedirect':
+ return Signing you out...
+ }
+
+ if (auth.isLoading) {
+ return Loading...
+ }
+
+ if (auth.error) {
+ return Oops... {auth.error.message}
+ }
+ return Testing auth
+}
diff --git a/frontend/src/infra/apiClient.ts b/frontend/src/infra/apiClient.ts
new file mode 100644
index 000000000..02194970f
--- /dev/null
+++ b/frontend/src/infra/apiClient.ts
@@ -0,0 +1,28 @@
+//import config from './config';
+import jwtDecode from 'jwt-decode'
+import axios from 'axios'
+
+type DecodedAcessToken = {
+ exp: number
+}
+
+export const apiClient = (token: string) => {
+ const decodedAccessToken: DecodedAcessToken = jwtDecode(token)
+ const isAccessTokenValid = decodedAccessToken.exp * 1000 > new Date().getTime()
+
+ const initialConfig = {
+ baseURL: process.env.NEXT_PUBLIC_API_BASE
+ }
+ const client = axios.create(initialConfig)
+ if (isAccessTokenValid) {
+ console.log('token is valid')
+ client.interceptors.request.use((config) => {
+ config.headers['Authorization'] = `Bearer ${token}`
+ return config
+ })
+ } else {
+ console.log('your login session is not valid')
+ //TODO: do something more useful here
+ }
+ return client
+}
diff --git a/frontend/src/routes/Auth.jsx b/frontend/src/routes/Auth.jsx
deleted file mode 100644
index 1c6dbab67..000000000
--- a/frontend/src/routes/Auth.jsx
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function Auth() {
- return ;
-}
diff --git a/frontend/src/routes/AuthorizedRoute.jsx b/frontend/src/routes/AuthorizedRoute.jsx
deleted file mode 100644
index 25c666d6d..000000000
--- a/frontend/src/routes/AuthorizedRoute.jsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Navigate, useLocation } from 'react-router-dom';
-import { useAuth } from 'react-oidc-context';
-
-//TODO: At some point, we'll need to check permissions in addition to authentication
-
-const AuthorizedRoute = ({ children }) => {
- const auth = useAuth();
- const location = useLocation();
-
- return auth.isAuthenticated ? (
- children
- ) : (
-
- //TODO: when the app is only using react, this would be the syntax
- //
- );
-};
-
-export default AuthorizedRoute;
diff --git a/frontend/src/routes/Dedications.jsx b/frontend/src/routes/Dedications.jsx
deleted file mode 100644
index 791c8ec0c..000000000
--- a/frontend/src/routes/Dedications.jsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { useState, useEffect } from 'react';
-import { useAuth } from 'react-oidc-context';
-import axios from '../utils/ApiClient';
-
-export default function Dedications() {
- const auth = useAuth();
- const [projects, setProjects] = useState(null);
- const token = auth.user?.access_token;
- const username_prop = import.meta.env.VITE_OIDC_USERNAME_PROPERTY
-
- useEffect(() => {
- const getProjects = async () => {
- try {
- axios(token)
- .get('/v1/projects')
- .then(({ data }) => {
- setProjects(data);
- });
- } catch (e) {
- console.error(e);
- }
- };
-
- getProjects();
- }, [auth]);
-
- return (
- <>
- This is the Dedications page
- Welcome {auth.user?.profile[username_prop]}
- This is a sample React page that is using the FastApi backend to fetch some data.
-
-
-
Projects from API
- {projects && projects.map((project) =>
{project.description}
)}
-
This is the home page
;
-}
diff --git a/frontend/src/routes/Layout.jsx b/frontend/src/routes/Layout.jsx
deleted file mode 100644
index 778886e28..000000000
--- a/frontend/src/routes/Layout.jsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Outlet, Link } from 'react-router-dom';
-
-export default function Layout() {
- return (
- <>
-
-
-
-
-
- );
-}
diff --git a/frontend/src/utils/ApiClient.jsx b/frontend/src/utils/ApiClient.jsx
deleted file mode 100644
index a690f00c2..000000000
--- a/frontend/src/utils/ApiClient.jsx
+++ /dev/null
@@ -1,26 +0,0 @@
-//import config from './config';
-import jwtDecode from 'jwt-decode';
-import axios from 'axios';
-
-const apiClient = (token) => {
- const decodedAccessToken = jwtDecode(token);
- const isAccessTokenValid = decodedAccessToken.exp * 1000 > new Date().getTime();
-
- const initialConfig = {
- baseURL: import.meta.env.VITE_API_BASE
- };
- const client = axios.create(initialConfig);
- if (isAccessTokenValid) {
- console.log('token is valid');
- client.interceptors.request.use((config) => {
- config.headers['Authorization'] = `Bearer ${token}`;
- return config;
- });
- } else {
- console.log('your login session is not valid');
- //TODO: do something more useful here
- }
- return client;
-};
-
-export default apiClient;
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
new file mode 100644
index 000000000..e59724b28
--- /dev/null
+++ b/frontend/tsconfig.json
@@ -0,0 +1,27 @@
+{
+ "compilerOptions": {
+ "target": "es5",
+ "lib": ["dom", "dom.iterable", "esnext"],
+ "allowJs": true,
+ "skipLibCheck": true,
+ "strict": true,
+ "noEmit": true,
+ "esModuleInterop": true,
+ "module": "esnext",
+ "moduleResolution": "bundler",
+ "resolveJsonModule": true,
+ "isolatedModules": true,
+ "jsx": "preserve",
+ "incremental": true,
+ "plugins": [
+ {
+ "name": "next"
+ }
+ ],
+ "paths": {
+ "@/*": ["./src/*"]
+ }
+ },
+ "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
+ "exclude": ["node_modules"]
+}
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
deleted file mode 100644
index b3b43e115..000000000
--- a/frontend/vite.config.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import { fileURLToPath, URL } from 'node:url';
-import { defineConfig } from 'vite';
-import react from '@vitejs/plugin-react-swc';
-
-// https://vitejs.dev/config/
-export default defineConfig({
- plugins: [react()],
- base: '/web/v2/',
- build: {
- outDir: '../web/v2',
- emptyOutDir: true,
- assetsDir: 'assets'
- },
- resolve: {
- alias: {
- '@': fileURLToPath(new URL('/frontend', import.meta.url))
- }
- }
- // server: {
- // proxy: {
- // '/': 'http://localhost:8000'
- // }
- // }
-});