14 Commits

Author SHA1 Message Date
40bbffdf94 Updating terraform 2025-02-23 21:34:38 -06:00
247e76038e Updating verison number to 1.0.0 2025-02-23 20:50:40 -06:00
1d4d81c445 initial launch 2025-02-23 20:44:42 -06:00
cdaa10a9bb initial launch 2025-02-23 20:39:30 -06:00
594b61c563 initial launch 2025-02-23 20:34:29 -06:00
9bfa8cf8a2 initial launch 2025-02-23 20:33:11 -06:00
5ad6f7d10e initial launch 2025-02-23 20:26:16 -06:00
12101ce409 initial launch 2025-02-23 19:35:44 -06:00
ce334cb7fd updating 2025-02-23 15:14:57 -06:00
1813a87194 renaming app directory 2025-02-23 15:10:27 -06:00
e55f61c7fa renaming app directory 2025-02-23 15:04:18 -06:00
e3f20617e9 renaming app directory 2025-02-23 14:55:13 -06:00
5f26c48aba updating version number 2025-02-23 14:52:41 -06:00
a3a7680228 Feature/1 add projects and about pages (#3)
* adding api

* adding projects page

* adding project page

* updating terraform

* updating terraform

* adding github workflows

* adding github workflows
2025-02-23 14:51:21 -06:00
58 changed files with 268 additions and 267 deletions

View File

@@ -64,6 +64,6 @@ jobs:
uses: docker/build-push-action@v6 uses: docker/build-push-action@v6
with: with:
push: true push: true
tags: noahspan/flying-api:${{ inputs.version_number }} tags: noahspan/root-api:${{ inputs.version_number }}
context: . context: .
target: api target: api

View File

@@ -65,6 +65,6 @@ jobs:
uses: docker/build-push-action@v6 uses: docker/build-push-action@v6
with: with:
push: true push: true
tags: noahspan/flying-app:${{ inputs.version_number }} tags: noahspan/root-app:${{ inputs.version_number }}
context: . context: .
target: app target: app

View File

@@ -32,4 +32,4 @@ jobs:
with: with:
azcliversion: latest azcliversion: latest
inlineScript: | inlineScript: |
az containerapp update --name ${{ inputs.app_name }}-${{ inputs.environment_name }} --resource-group noahspan-flying --image docker.io/noahspan/${{ inputs.app_name }}:${{ inputs.version_number }} az containerapp update --name ${{ inputs.app_name }}-${{ inputs.environment_name }} --resource-group noahspan-root --image docker.io/noahspan/${{ inputs.app_name }}:${{ inputs.version_number }}

View File

@@ -26,7 +26,7 @@ jobs:
- build-api - build-api
uses: ./.github/workflows/deploy.yaml uses: ./.github/workflows/deploy.yaml
with: with:
app_name: flying-api app_name: root-api
environment_name: test environment_name: test
version_number: ${{ github.run_id }} version_number: ${{ github.run_id }}
secrets: inherit secrets: inherit
@@ -49,7 +49,7 @@ jobs:
- build-app - build-app
uses: ./.github/workflows/deploy.yaml uses: ./.github/workflows/deploy.yaml
with: with:
app_name: flying-app app_name: root-app
environment_name: test environment_name: test
version_number: ${{ github.run_id }} version_number: ${{ github.run_id }}
secrets: inherit secrets: inherit

View File

@@ -19,7 +19,7 @@ jobs:
- build-api - build-api
uses: ./.github/workflows/deploy.yaml uses: ./.github/workflows/deploy.yaml
with: with:
app_name: flying-api app_name: root-api
environment_name: prod environment_name: prod
version_number: ${{ github.ref_name }} version_number: ${{ github.ref_name }}
secrets: inherit secrets: inherit
@@ -38,7 +38,7 @@ jobs:
- build-app - build-app
uses: ./.github/workflows/deploy.yaml uses: ./.github/workflows/deploy.yaml
with: with:
app_name: flying-app app_name: root-app
environment_name: prod environment_name: prod
version_number: ${{ github.ref_name }} version_number: ${{ github.ref_name }}
secrets: inherit secrets: inherit

1
.npmrc Normal file
View File

@@ -0,0 +1 @@
inject-workspace-packages=true

View File

@@ -1,6 +1,6 @@
{ {
"name": "api", "name": "api",
"version": "0.0.1", "version": "1.0.0",
"description": "", "description": "",
"author": "", "author": "",
"private": true, "private": true,
@@ -28,10 +28,10 @@
"@nestjs/core": "^10.0.0", "@nestjs/core": "^10.0.0",
"@nestjs/platform-express": "^10.0.0", "@nestjs/platform-express": "^10.0.0",
"@noahspan/azure-database": "^3.1.2", "@noahspan/azure-database": "^3.1.2",
"@noahspan/noahspan-modules": "^0.6.5", "@noahspan/noahspan-modules": "^1.0.0",
"axios": "^1.7.9", "axios": "^1.7.9",
"reflect-metadata": "^0.1.14", "reflect-metadata": "^0.2.2",
"rxjs": "^7.8.1", "rxjs": "^7.8.2",
"uuid": "^11.0.5" "uuid": "^11.0.5"
}, },
"devDependencies": { "devDependencies": {
@@ -59,6 +59,9 @@
"tsconfig-paths": "^4.2.0", "tsconfig-paths": "^4.2.0",
"typescript": "^5.1.3" "typescript": "^5.1.3"
}, },
"files": [
"dist"
],
"jest": { "jest": {
"moduleFileExtensions": [ "moduleFileExtensions": [
"js", "js",

View File

@@ -1,78 +0,0 @@
import {
Controller,
Get,
Headers,
Query,
StreamableFile,
UseGuards
} from '@nestjs/common';
// import { Client as MsGraphClient } from '@microsoft/microsoft-graph-client';
import { MsGraphService } from '@noahspan/noahspan-modules'
@Controller()
export class AppController {
constructor(
private readonly msGraphService: MsGraphService
) {}
@Get('userPhoto')
async getProfilePhoto(@Headers() headers: any): Promise<StreamableFile> {
// try {
// const graphToken: string = await this.msGraphService.getMsGraphAuth(
// headers.authorization.replace('Bearer ', ''),
// ['user.read']
// );
// const client: MsGraphClient =
// await this.msGraphService.getMsGraphClientDelegated(graphToken);
// const blob: Blob = await client.api(`me/photos('48x48')/$value`).get();
// const arrayBuffer: ArrayBuffer = await blob.arrayBuffer();
// const buffer: Buffer = Buffer.from(arrayBuffer);
// return new StreamableFile(buffer, {
// type: 'application/json',
// disposition: `attachment; filename="user_photo.png"`
// });
// } catch (error) {
// return error;
// }
try {
const buffer = await this.msGraphService.getProfilePhoto(
headers.authorization.replace('Bearer ', ''),
['user.read']
)
return new StreamableFile(buffer, {
type: 'application/json',
disposition: `attachment; filename="user_photo.png"`
});
} catch (error) {
return error;
}
}
@Get('userProfile')
async getUserProfile(@Headers() headers: any): Promise<any> {
// try {
// const graphToken: string = await this.msGraphService.getMsGraphAuth(
// headers.authorization.replace('Bearer ', ''),
// ['user.read']
// );
// const client: MsGraphClient =
// await this.msGraphService.getMsGraphClientDelegated(graphToken);
// const userProfile = await client.api(`me`).get();
// return userProfile;
// } catch (error) {
// return error;
// }
try {
const userProfile = await this.msGraphService.getUserProfile(headers.authorization.replace('Bearer ', ''));
return userProfile;
} catch (error) {
return error;
}
}
}

View File

@@ -2,10 +2,9 @@ import { Module } from '@nestjs/common';
import { APP_FILTER, APP_GUARD } from '@nestjs/core'; import { APP_FILTER, APP_GUARD } from '@nestjs/core';
import { HttpExceptionFilter } from './filters/http-exception.filter'; import { HttpExceptionFilter } from './filters/http-exception.filter';
import { ProjectModule } from './project/project.module'; import { ProjectModule } from './project/project.module';
import { AuthGuard, AuthModule, MsGraphModule } from '@noahspan/noahspan-modules' import { AuthGuard, AuthModule, UserModule } from '@noahspan/noahspan-modules'
import { ConfigModule, ConfigService } from '@nestjs/config'; import { ConfigModule, ConfigService } from '@nestjs/config';
import configuration from './config/configuration'; import configuration from './config/configuration';
import { AppController } from './app.controller';
@Module({ @Module({
imports: [ imports: [
@@ -23,7 +22,7 @@ import { AppController } from './app.controller';
ConfigModule.forRoot({ ConfigModule.forRoot({
load: [configuration] load: [configuration]
}), }),
MsGraphModule.registerAsync({ UserModule.registerAsync({
inject: [ConfigService], inject: [ConfigService],
imports: [ConfigModule], imports: [ConfigModule],
useFactory: async (configService: ConfigService) => { useFactory: async (configService: ConfigService) => {
@@ -36,7 +35,6 @@ import { AppController } from './app.controller';
}), }),
ProjectModule ProjectModule
], ],
controllers: [AppController],
providers: [ providers: [
{ {
provide: APP_FILTER, provide: APP_FILTER,

View File

@@ -1,4 +1,5 @@
export default () => ({ export default () => ({
azureStorageConnectionString: process.env.AZURE_STORAGE_CONNECTION_STRING,
clientId: process.env.CLIENT_ID, clientId: process.env.CLIENT_ID,
clientSecret: process.env.CLIENT_SECRET, clientSecret: process.env.CLIENT_SECRET,
tenantId: process.env.TENANT_ID tenantId: process.env.TENANT_ID

View File

View File

@@ -1,7 +1,7 @@
{ {
"name": "app2", "name": "app",
"private": true, "private": true,
"version": "0.0.0", "version": "1.0.0",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
@@ -32,5 +32,8 @@
"typescript": "~5.7.2", "typescript": "~5.7.2",
"typescript-eslint": "^8.22.0", "typescript-eslint": "^8.22.0",
"vite": "^6.1.0" "vite": "^6.1.0"
} },
"files": [
"dist"
]
} }

View File

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@@ -1,7 +1,6 @@
import { Route, Routes } from 'react-router-dom'; import { Route, Routes } from 'react-router-dom';
import Projects from './components/projects/Projects'; import Projects from './components/projects/Projects';
import SiteNav from './components/siteNav/SiteNav'; import SiteNav from './components/siteNav/SiteNav';
import { useAppContext } from './hooks/appContext/UseAppContext';
import { IPublicClientApplication } from '@azure/msal-browser'; import { IPublicClientApplication } from '@azure/msal-browser';
import { MsalProvider } from '@azure/msal-react'; import { MsalProvider } from '@azure/msal-react';
@@ -10,8 +9,6 @@ interface AppProps {
} }
const App = ({ pca }: AppProps) => { const App = ({ pca }: AppProps) => {
const appContext = useAppContext();
return ( return (
<MsalProvider instance={pca}> <MsalProvider instance={pca}>
<SiteNav /> <SiteNav />

View File

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

@@ -3,6 +3,7 @@ import { ActionMenuProps } from './ActionMenuProps.interface';
import { import {
Icon, Icon,
IconButton, IconButton,
IconName,
ListItemIcon, ListItemIcon,
ListItemText, ListItemText,
Menu, Menu,
@@ -26,7 +27,7 @@ const ActionMenu = ({ id, onDelete, onOpenCloseForm }: ActionMenuProps) => {
return ( return (
<div> <div>
<IconButton onClick={onOpenActionMenu}> <IconButton onClick={onOpenActionMenu}>
<Icon iconName='fa-ellipsis-vertical' size="sm" /> <Icon iconName={IconName.ELLIPSIS_VERTICAL} size="sm" />
</IconButton> </IconButton>
<Menu <Menu
anchorEl={anchorElAction} anchorEl={anchorElAction}
@@ -36,20 +37,20 @@ const ActionMenu = ({ id, onDelete, onOpenCloseForm }: ActionMenuProps) => {
> >
<MenuItem onClick={() => onOpenCloseForm(FormMode.EDIT, id)}> <MenuItem onClick={() => onOpenCloseForm(FormMode.EDIT, id)}>
<ListItemIcon> <ListItemIcon>
<Icon iconName='fa-pen' size="lg" /> <Icon iconName={IconName.PEN} size="lg" />
</ListItemIcon> </ListItemIcon>
<ListItemText>Edit</ListItemText> <ListItemText>Edit</ListItemText>
</MenuItem> </MenuItem>
<MenuItem onClick={() => onOpenCloseForm(FormMode.VIEW, id)}> <MenuItem onClick={() => onOpenCloseForm(FormMode.VIEW, id)}>
<ListItemIcon> <ListItemIcon>
<Icon iconName='fa-eye' size="lg" /> <Icon iconName={IconName.EYE} size="lg" />
</ListItemIcon> </ListItemIcon>
<ListItemText>View</ListItemText> <ListItemText>View</ListItemText>
</MenuItem> </MenuItem>
<hr className="my-3" /> <hr className="my-3" />
<MenuItem onClick={() => onDelete(id)}> <MenuItem onClick={() => onDelete(id)}>
<ListItemIcon> <ListItemIcon>
<Icon iconName='fa-trash' size="lg" /> <Icon iconName={IconName.TRASH} size="lg" />
</ListItemIcon> </ListItemIcon>
<ListItemText>Delete</ListItemText> <ListItemText>Delete</ListItemText>
</MenuItem> </MenuItem>

View File

@@ -1,5 +1,4 @@
import { import {
Box,
Button, Button,
Dialog, Dialog,
DialogActions, DialogActions,
@@ -7,6 +6,7 @@ import {
DialogContentText, DialogContentText,
DialogTitle, DialogTitle,
Icon, Icon,
IconName,
Spinner Spinner
} from '@noahspan/noahspan-components'; } from '@noahspan/noahspan-components';
import { ConfirmationDialogProps } from './ConfirmationDialogProps.interface'; import { ConfirmationDialogProps } from './ConfirmationDialogProps.interface';
@@ -33,13 +33,13 @@ const ConfirmationDialog = ({
{isLoading && <Spinner />} {isLoading && <Spinner />}
</DialogContent> </DialogContent>
<DialogActions> <DialogActions>
<Button onClick={onCancel} variant="outlined" startIcon={<Icon iconName='fa-xmark' />}> <Button onClick={onCancel} variant="outlined" startIcon={<Icon iconName={IconName.XMARK} />}>
No No
</Button> </Button>
<Button <Button
onClick={onConfirm} onClick={onConfirm}
variant="contained" variant="contained"
startIcon={<Icon iconName='fa-circle-check'/>} startIcon={<Icon iconName={IconName.CIRCLE_CHECK}/>}
> >
Yes Yes
</Button> </Button>

View File

@@ -15,7 +15,7 @@ import { initialState, reducer } from './reducer';
import { ProjectFormProps } from './ProjectFormProps.interface'; import { ProjectFormProps } from './ProjectFormProps.interface';
import { FormMode } from '../../enums/formMode'; import { FormMode } from '../../enums/formMode';
import { useIsAuthenticated } from '@azure/msal-react'; import { useIsAuthenticated } from '@azure/msal-react';
import { useAccessToken } from '../../hooks/accessToken/UseAccessToken'; import { useAccessToken } from '../../hooks/accessToken/UseAccessToken'
import { useHttpClient } from '../../hooks/httpClient/UseHttpClient'; import { useHttpClient } from '../../hooks/httpClient/UseHttpClient';
import { AxiosError, AxiosInstance, AxiosResponse } from 'axios'; import { AxiosError, AxiosInstance, AxiosResponse } from 'axios';

View File

@@ -1,5 +1,6 @@
import { Project } from './Project.interface'; import { Project } from './Project.interface';
import { import {
Alert,
Box, Box,
Button, Button,
Card, Card,
@@ -10,6 +11,7 @@ import {
Grid, Grid,
Icon, Icon,
IconName, IconName,
Spinner,
Typography Typography
} from '@noahspan/noahspan-components'; } from '@noahspan/noahspan-components';
import { useIsAuthenticated } from '@azure/msal-react'; import { useIsAuthenticated } from '@azure/msal-react';
@@ -29,33 +31,15 @@ const Projects = () => {
const isAuthenticated = useIsAuthenticated(); const isAuthenticated = useIsAuthenticated();
const { getAccessToken } = useAccessToken(); const { getAccessToken } = useAccessToken();
const findIconByName: IconName = (name: string) => {
const keys = Object.keys(IconName);
for (const key of keys) {
if (IconName[key] === name) {
return key
}
}
return undefined;
}
const getProjects = async (): Promise<Project[]> => { const getProjects = async (): Promise<Project[]> => {
try { try {
// const config = isAuthenticated
// ? { headers: { Authorization: await getAccessToken() } }
// : {};
const response: AxiosResponse = await httpClient.get( const response: AxiosResponse = await httpClient.get(
`api/projects`, `api/projects`,
// config
); );
const projects: Project[] = response.data; const projects: Project[] = response.data;
projects.sort((a, b) => Number(a.order) - Number(b.order)) projects.sort((a, b) => Number(a.order) - Number(b.order))
console.log(projects)
return projects; return projects;
} catch (error) { } catch (error) {
throw new Error('broken'); throw new Error('broken');
@@ -107,19 +91,19 @@ const Projects = () => {
? { headers: { Authorization: `${token}` } } ? { headers: { Authorization: `${token}` } }
: {}; : {};
// await httpClient.delete(`api/logs/log/${state.selectedEntryId}`, config); await httpClient.delete(`api/projects/project/${state.selectedProjectId}`, config);
dispatch({ dispatch({
type: 'SET_DELETE', type: 'SET_DELETE',
payload: { isConfirmationDialogOpen: false, selectedProjectId: undefined } payload: { isConfirmationDialogOpen: false, selectedProjectId: undefined }
}); });
// await getProjects(); await getProjects();
} catch (error) { } catch (error) {
const axiosError = error as AxiosError; const axiosError = error as AxiosError;
dispatch({ dispatch({
type: 'SET_ERROR', type: 'SET_ALERT',
payload: `Loading of logbook entries failed with the following message: ${axiosError.message}` payload: { severity: 'error', message: `Loading of projects failed with the following message: ${axiosError.message}` }
}); });
} finally { } finally {
dispatch({ type: 'SET_IS_CONFIRMATION_DIALOG_LOADING', payload: false }); dispatch({ type: 'SET_IS_CONFIRMATION_DIALOG_LOADING', payload: false });
@@ -136,16 +120,24 @@ const Projects = () => {
useEffect(() => { useEffect(() => {
const loadProjects = async () => { const loadProjects = async () => {
try { try {
dispatch({ type: 'SET_IS_LOADING', payload: true })
const projects = await getProjects(); const projects = await getProjects();
dispatch({ type: 'SET_PROJECTS', payload: projects }) dispatch({ type: 'SET_PROJECTS', payload: projects })
} catch (error) { } catch (error) {
console.log(error); dispatch({
type: 'SET_ALERT',
payload: { severity: 'error', message: `Loading of projects failed with the following message: ${error}` }
});
} finally {
dispatch({ type: 'SET_IS_LOADING', payload: false })
} }
} }
loadProjects() if (!state.isFormOpen || !state.isConfirmDialogOpen) {
}, []); loadProjects();
}
}, [state.isFormOpen, state.isConfirmDialogOpen]);
return ( return (
<Container> <Container>
@@ -158,14 +150,27 @@ const Projects = () => {
{isAuthenticated && {isAuthenticated &&
<Button <Button
onClick={() => onOpenCloseProjectForm(FormMode.ADD)} onClick={() => onOpenCloseProjectForm(FormMode.ADD)}
startIcon={<Icon iconName='fa-plus' />} startIcon={<Icon iconName={IconName.PLUS}/>}
variant='contained' variant='contained'
> >
Add Project Add Project
</Button> </Button>
} }
</Grid> </Grid>
{state.projects.length > 0 && state.projects.map((project: Project) => { {!state.isLoading && state.alert && (
<Grid display="flex" justifyContent="center" size={12}>
<Alert
onClose={() =>
dispatch({ type: 'SET_ALERT', payload: undefined })
}
severity={state.alert.severity}
sx={{ width: '100%' }}
>
{state.alert.message}
</Alert>
</Grid>
)}
{!state.isLoading && state.projects.length > 0 && state.projects.map((project: Project) => {
return ( return (
<Grid display='flex' justifyContent='center' size={12}> <Grid display='flex' justifyContent='center' size={12}>
<Card <Card
@@ -175,7 +180,7 @@ const Projects = () => {
> >
<CardHeader <CardHeader
action={isAuthenticated ? <ActionMenu id={project.rowKey} onDelete={onDeleteProject} onOpenCloseForm={onOpenCloseProjectForm} /> : null} action={isAuthenticated ? <ActionMenu id={project.rowKey} onDelete={onDeleteProject} onOpenCloseForm={onOpenCloseProjectForm} /> : null}
avatar={<Icon iconName={IconName[findIconByName(project.iconName)]} size='2x' />} avatar={<Icon iconName={project.iconName as IconName} size='2x' />}
subheader={project.subTitle} subheader={project.subTitle}
title={project.title} title={project.title}
slotProps={{ slotProps={{
@@ -198,7 +203,6 @@ const Projects = () => {
component='a' component='a'
href={`https://github.com/noahspannbauer/${project.repoName}`} href={`https://github.com/noahspannbauer/${project.repoName}`}
startIcon={<Icon iconName={IconName.GITHUB} />} startIcon={<Icon iconName={IconName.GITHUB} />}
target='_blank'
> >
Code Code
</Button> </Button>
@@ -221,6 +225,16 @@ const Projects = () => {
</Grid> </Grid>
) )
})} })}
{state.isLoading && (
<>
<Grid display="flex" justifyContent="center" size={12}>
<Spinner />
</Grid>
<Grid display="flex" justifyContent="center" size={12}>
Loading...
</Grid>
</>
)}
</Grid> </Grid>
{state.isFormOpen && {state.isFormOpen &&
<ProjectForm <ProjectForm

View File

@@ -1,10 +1,11 @@
import { FormMode } from '../../enums/formMode'; import { FormMode } from '../../enums/formMode';
import { Alert } from '../../interfaces';
import { Project } from './Project.interface'; import { Project } from './Project.interface';
export interface ProjectsState { export interface ProjectsState {
alert: Alert | undefined;
projects: Project[]; projects: Project[];
formMode: FormMode; formMode: FormMode;
error: string | undefined;
isConfirmDialogLoading: boolean; isConfirmDialogLoading: boolean;
isConfirmDialogOpen: boolean; isConfirmDialogOpen: boolean;
isFormOpen: boolean; isFormOpen: boolean;

View File

@@ -1,6 +1,7 @@
import { FormMode } from '../../enums/formMode'; import { FormMode } from '../../enums/formMode';
import { ProjectsState } from './ProjectsState.interface' import { ProjectsState } from './ProjectsState.interface'
import { Project } from './Project.interface'; import { Project } from './Project.interface';
import { Alert } from '../../interfaces';
type Action = type Action =
| { | {
@@ -11,7 +12,7 @@ type Action =
}; };
} }
| { type: 'SET_PROJECTS'; payload: Project[] } | { type: 'SET_PROJECTS'; payload: Project[] }
| { type: 'SET_ERROR'; payload: string | undefined } | { type: 'SET_ALERT'; payload: Alert | undefined }
| { type: 'SET_FORM_MODE'; payload: FormMode } | { type: 'SET_FORM_MODE'; payload: FormMode }
| { type: 'SET_IS_CONFIRMATION_DIALOG_LOADING'; payload: boolean } | { type: 'SET_IS_CONFIRMATION_DIALOG_LOADING'; payload: boolean }
| { type: 'SET_IS_LOADING'; payload: boolean } | { type: 'SET_IS_LOADING'; payload: boolean }
@@ -25,13 +26,13 @@ type Action =
}; };
export const initialState: ProjectsState = { export const initialState: ProjectsState = {
projects: [], alert: undefined,
error: undefined,
formMode: FormMode.CANCEL, formMode: FormMode.CANCEL,
isConfirmDialogLoading: false, isConfirmDialogLoading: false,
isConfirmDialogOpen: false, isConfirmDialogOpen: false,
isFormOpen: false, isFormOpen: false,
isLoading: false, isLoading: false,
projects: [],
selectedProjectId: undefined selectedProjectId: undefined
}; };
@@ -53,10 +54,10 @@ export const reducer = (
projects: action.payload projects: action.payload
}; };
} }
case 'SET_ERROR': { case 'SET_ALERT': {
return { return {
...state, ...state,
error: action.payload alert: action.payload
}; };
} }
case 'SET_FORM_MODE': { case 'SET_FORM_MODE': {

View File

@@ -3,9 +3,9 @@ import { useNavigate } from 'react-router-dom';
import { useAppContext } from '../../hooks/appContext/UseAppContext'; import { useAppContext } from '../../hooks/appContext/UseAppContext';
import { import {
Icon, Icon,
IconName,
MenuItem, MenuItem,
Navbar, Navbar,
Spinner,
Typography Typography
} from '@noahspan/noahspan-components'; } from '@noahspan/noahspan-components';
import { useIsAuthenticated, useMsal } from '@azure/msal-react'; import { useIsAuthenticated, useMsal } from '@azure/msal-react';
@@ -14,21 +14,25 @@ import { useHttpClient } from '../../hooks/httpClient/UseHttpClient';
import { AxiosInstance, AxiosResponse } from 'axios'; import { AxiosInstance, AxiosResponse } from 'axios';
import { User } from '@microsoft/microsoft-graph-types'; import { User } from '@microsoft/microsoft-graph-types';
const SiteNav = () => { const SiteNav: React.FC<unknown> = () => {
const [loading, setLoading] = useState<boolean>(false);
const [userPhoto, setUserPhoto] = useState<string>(); const [userPhoto, setUserPhoto] = useState<string>();
const [pages, setPages] = useState<{ name: string; url: string; }[]>([]);
const httpClient: AxiosInstance = useHttpClient(); const httpClient: AxiosInstance = useHttpClient();
const appContext = useAppContext(); const appContext = useAppContext();
const isAuthenticated = useIsAuthenticated(); const isAuthenticated = useIsAuthenticated();
const { getAccessToken } = useAccessToken(); const { getAccessToken } = useAccessToken();
const { instance } = useMsal(); const { instance } = useMsal();
const navigate = useNavigate(); const navigate = useNavigate();
const pages = [ const getPages = () => {
{ const pages = [
name: 'Projects', {
url: '/' name: 'Projects',
} url: '/'
]; }
];
setPages(pages)
};
const handleSignIn = () => { const handleSignIn = () => {
instance.loginRedirect({ instance.loginRedirect({
scopes: [`api://${import.meta.env.VITE_CLIENT_ID}/user_impersonation`] scopes: [`api://${import.meta.env.VITE_CLIENT_ID}/user_impersonation`]
@@ -39,7 +43,7 @@ const SiteNav = () => {
}; };
const getUserProfile = async (accessToken: string): Promise<User> => { const getUserProfile = async (accessToken: string): Promise<User> => {
try { try {
const response: AxiosResponse = await httpClient.get(`api/userProfile`, { const response: AxiosResponse = await httpClient.get(`api/user/profile`, {
headers: { headers: {
Authorization: accessToken Authorization: accessToken
} }
@@ -53,7 +57,7 @@ const SiteNav = () => {
}; };
const getUserPhoto = async (accessToken: string): Promise<string> => { const getUserPhoto = async (accessToken: string): Promise<string> => {
try { try {
const response: AxiosResponse = await httpClient.get(`api/userPhoto`, { const response: AxiosResponse = await httpClient.get(`api/user/photo`, {
headers: { headers: {
Authorization: accessToken Authorization: accessToken
}, },
@@ -76,7 +80,7 @@ const SiteNav = () => {
const Settings = () => { const Settings = () => {
return ( return (
<MenuItem onClick={handleSignOut}> <MenuItem onClick={handleSignOut}>
<Icon iconName='fa-sign-out' /> <Icon iconName={IconName.SIGN_OUT} />
<Typography sx={{ marginLeft: '10px', textAlign: 'center' }}> <Typography sx={{ marginLeft: '10px', textAlign: 'center' }}>
Sign Out Sign Out
</Typography> </Typography>
@@ -87,11 +91,10 @@ const SiteNav = () => {
useEffect(() => { useEffect(() => {
const setUserProfile = async () => { const setUserProfile = async () => {
try { try {
setLoading(true);
const accessToken: string = await getAccessToken(); const accessToken: string = await getAccessToken();
const userProfile = await getUserProfile(accessToken); const userProfile = await getUserProfile(accessToken);
const userPhoto = await getUserPhoto(accessToken); const userPhoto = await getUserPhoto(accessToken);
console.log(userPhoto)
setUserPhoto(userPhoto); setUserPhoto(userPhoto);
@@ -101,8 +104,6 @@ const SiteNav = () => {
}); });
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} finally {
setLoading(false);
} }
}; };
@@ -111,15 +112,20 @@ const SiteNav = () => {
Object.keys(appContext.state.userProfile).length === 0 Object.keys(appContext.state.userProfile).length === 0
) { ) {
setUserProfile(); setUserProfile();
getPages();
} }
}, [isAuthenticated]); }, [isAuthenticated]);
useEffect(() => {
getPages();
}, [])
return ( return (
<Navbar <Navbar
handlePageClick={handlePageClick} handlePageClick={handlePageClick}
handleSignIn={handleSignIn} handleSignIn={handleSignIn}
isAuthenticated={isAuthenticated} isAuthenticated={isAuthenticated}
logo={<Icon iconName='fa-user-tie' size="2x" />} logo={<Icon iconName={IconName.USER_TIE} size='2xl' />}
pages={pages} pages={pages}
settings={<Settings />} settings={<Settings />}
userPhoto={userPhoto} userPhoto={userPhoto}

View File

@@ -9,7 +9,6 @@ const AppContextProvider = (
props: AppContextProviderProps props: AppContextProviderProps
) => { ) => {
const intialState: AppContextState = { const intialState: AppContextState = {
featureFlags: [],
userProfile: {} userProfile: {}
}; };
const [state, dispatch] = useReducer(reducer, intialState); const [state, dispatch] = useReducer(reducer, intialState);

View File

@@ -1,6 +1,5 @@
import { User } from '@microsoft/microsoft-graph-types'; import { User } from '@microsoft/microsoft-graph-types';
export interface AppContextState { export interface AppContextState {
featureFlags: { key: string; enabled: boolean }[];
userProfile: User; userProfile: User;
} }

4
app/src/interfaces.ts Normal file
View File

@@ -0,0 +1,4 @@
export interface Alert {
severity: 'success' | 'error' | 'info' | 'warning';
message: string;
}

View File

@@ -9,3 +9,21 @@ services:
- '10001:10001' - '10001:10001'
- '10002:10002' - '10002:10002'
command: 'azurite --blobHost 0.0.0.0 --queueHost 0.0.0.0 --tableHost 0.0.0.0 --loose' command: 'azurite --blobHost 0.0.0.0 --queueHost 0.0.0.0 --tableHost 0.0.0.0 --loose'
api:
container_name: root-api
build:
context: .
target: api
ports:
- '3000:3000'
env_file:
- ./api/.env
app:
container_name: root-app
build:
context: .
target: app
ports:
- '8080:8080'

View File

@@ -5,8 +5,8 @@ locals {
} }
container_app_app_container_image = { container_app_app_container_image = {
test = "noahspan/root-app:v0.0.1" test = "noahspan/root-app:v1.0.0"
prod = "noahspan/root-app:v0.0.1" prod = "noahspan/root-app:v1.0.0"
} }
container_app_app_container_name = { container_app_app_container_name = {
@@ -20,8 +20,8 @@ locals {
} }
container_app_api_container_image = { container_app_api_container_image = {
test = "noahspan/root-api:v0.0.1" test = "noahspan/root-api:v1.0.0"
prod = "noahspan/root-api:v0.0.1" prod = "noahspan/root-api:v1.0.0"
} }
container_app_api_container_name = { container_app_api_container_name = {

View File

@@ -1,11 +1,12 @@
{ {
"name": "noahspan-root", "name": "@noahspan/noahspan-root",
"version": "1.0.0", "version": "1.0.0",
"description": "",
"main": "index.js",
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1" "test": "echo \"Error: no test specified\" && exit 1",
"preprod": "rimraf ./.prod && pnpm --filter api build && pnpm --filter app build",
"prod": "pnpm --filter api --prod deploy ./.prod/api && pnpm --filter app --prod deploy ./.prod/app"
}, },
"author": "", "devDependencies": {
"license": "ISC" "rimraf": "^6.0.1"
}
} }

219
pnpm-lock.yaml generated
View File

@@ -3,10 +3,15 @@ lockfileVersion: '9.0'
settings: settings:
autoInstallPeers: true autoInstallPeers: true
excludeLinksFromLockfile: false excludeLinksFromLockfile: false
injectWorkspacePackages: true
importers: importers:
.: {} .:
devDependencies:
rimraf:
specifier: ^6.0.1
version: 6.0.1
api: api:
dependencies: dependencies:
@@ -15,37 +20,37 @@ importers:
version: 1.2.3 version: 1.2.3
'@nestjs/axios': '@nestjs/axios':
specifier: ^4.0.0 specifier: ^4.0.0
version: 4.0.0(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(axios@1.7.9)(rxjs@7.8.1) version: 4.0.0(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2))(axios@1.7.9)(rxjs@7.8.2)
'@nestjs/azure-func-http': '@nestjs/azure-func-http':
specifier: ^0.10.0 specifier: ^0.10.0
version: 0.10.0(@azure/functions@1.2.3)(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(@nestjs/core@10.4.15)(reflect-metadata@0.1.14) version: 0.10.0(@azure/functions@1.2.3)(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@10.4.15)(reflect-metadata@0.2.2)
'@nestjs/common': '@nestjs/common':
specifier: ^10.0.0 specifier: ^10.0.0
version: 10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1) version: 10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2)
'@nestjs/config': '@nestjs/config':
specifier: ^4.0.0 specifier: ^4.0.0
version: 4.0.0(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(rxjs@7.8.1) version: 4.0.0(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2))(rxjs@7.8.2)
'@nestjs/core': '@nestjs/core':
specifier: ^10.0.0 specifier: ^10.0.0
version: 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(@nestjs/platform-express@10.4.15)(reflect-metadata@0.1.14)(rxjs@7.8.1) version: 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@10.4.15)(reflect-metadata@0.2.2)(rxjs@7.8.2)
'@nestjs/platform-express': '@nestjs/platform-express':
specifier: ^10.0.0 specifier: ^10.0.0
version: 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(@nestjs/core@10.4.15) version: 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@10.4.15)
'@noahspan/azure-database': '@noahspan/azure-database':
specifier: ^3.1.2 specifier: ^3.1.2
version: 3.1.2(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(@nestjs/core@10.4.15) version: 3.1.2(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@10.4.15)
'@noahspan/noahspan-modules': '@noahspan/noahspan-modules':
specifier: ^0.6.5 specifier: ^1.0.0
version: 0.6.5 version: 1.0.0
axios: axios:
specifier: ^1.7.9 specifier: ^1.7.9
version: 1.7.9 version: 1.7.9
reflect-metadata: reflect-metadata:
specifier: ^0.1.14 specifier: ^0.2.2
version: 0.1.14 version: 0.2.2
rxjs: rxjs:
specifier: ^7.8.1 specifier: ^7.8.2
version: 7.8.1 version: 7.8.2
uuid: uuid:
specifier: ^11.0.5 specifier: ^11.0.5
version: 11.0.5 version: 11.0.5
@@ -61,7 +66,7 @@ importers:
version: 10.2.3(chokidar@3.6.0)(typescript@5.7.3) version: 10.2.3(chokidar@3.6.0)(typescript@5.7.3)
'@nestjs/testing': '@nestjs/testing':
specifier: ^10.0.0 specifier: ^10.0.0
version: 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(@nestjs/core@10.4.15)(@nestjs/platform-express@10.4.15) version: 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@10.4.15)(@nestjs/platform-express@10.4.15)
'@schematics/angular': '@schematics/angular':
specifier: ^19.1.4 specifier: ^19.1.4
version: 19.1.6(chokidar@3.6.0) version: 19.1.6(chokidar@3.6.0)
@@ -120,7 +125,7 @@ importers:
specifier: ^5.1.3 specifier: ^5.1.3
version: 5.7.3 version: 5.7.3
app2: app:
dependencies: dependencies:
'@azure/msal-browser': '@azure/msal-browser':
specifier: ^4.2.1 specifier: ^4.2.1
@@ -1441,8 +1446,8 @@ packages:
'@noahspan/noahspan-modules@0.5.9': '@noahspan/noahspan-modules@0.5.9':
resolution: {integrity: sha512-kkL9P/TNxuPp5T/gd6gTLAmAGi8SJD4MjTWtsrMvw4WWF69x69m2Nr2G6zCv9WLtFrm4NaJhF8I1MVVuNOCinw==} resolution: {integrity: sha512-kkL9P/TNxuPp5T/gd6gTLAmAGi8SJD4MjTWtsrMvw4WWF69x69m2Nr2G6zCv9WLtFrm4NaJhF8I1MVVuNOCinw==}
'@noahspan/noahspan-modules@0.6.5': '@noahspan/noahspan-modules@1.0.0':
resolution: {integrity: sha512-XxmEuaO8v6/u4A5hHZHjyCqY0rrkGqVqqydkZ02Gt0EuErVOo8QuiqEkfEZGLeZNmKZI86IOXWpbXOyn8YGz2g==} resolution: {integrity: sha512-wO+wsf7AoX2uh+8eDoJHUqObHs5YRk4hzQZZrMB8QIt9HYkg598WMoLzQ1GghYi9o6+aClFSZekXh6+h6SS9IQ==}
'@nodelib/fs.scandir@2.1.5': '@nodelib/fs.scandir@2.1.5':
resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
@@ -3511,6 +3516,11 @@ packages:
resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==} resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==}
hasBin: true hasBin: true
glob@11.0.1:
resolution: {integrity: sha512-zrQDm8XPnYEKawJScsnM0QzobJxlT/kHOOlRTio8IH/GrmxRE5fjllkzdaHclIuNjUQTJYH2xHNIGfdpJkDJUw==}
engines: {node: 20 || >=22}
hasBin: true
glob@6.0.4: glob@6.0.4:
resolution: {integrity: sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==} resolution: {integrity: sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==}
deprecated: Glob versions prior to v9 are no longer supported deprecated: Glob versions prior to v9 are no longer supported
@@ -3791,6 +3801,10 @@ packages:
jackspeak@3.4.3: jackspeak@3.4.3:
resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==} resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==}
jackspeak@4.1.0:
resolution: {integrity: sha512-9DDdhb5j6cpeitCbvLO7n7J4IxnbM6hoF6O1g4HQ5TfhvvKN8ywDM7668ZhMHRqVmxqhps/F6syWK2KcPxYlkw==}
engines: {node: 20 || >=22}
jake@10.9.2: jake@10.9.2:
resolution: {integrity: sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==} resolution: {integrity: sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==}
engines: {node: '>=10'} engines: {node: '>=10'}
@@ -4111,6 +4125,10 @@ packages:
lru-cache@10.4.3: lru-cache@10.4.3:
resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==} resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
lru-cache@11.0.2:
resolution: {integrity: sha512-123qHRfJBmo2jXDbo/a5YOQrJoHF/GNQTLzQ5+IdK5pWpceK17yRc6ozlWd25FxvGKQbIUs91fDFkXmDHTKcyA==}
engines: {node: 20 || >=22}
lru-cache@5.1.1: lru-cache@5.1.1:
resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==} resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
@@ -4207,6 +4225,10 @@ packages:
resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==} resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
engines: {node: '>=6'} engines: {node: '>=6'}
minimatch@10.0.1:
resolution: {integrity: sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==}
engines: {node: 20 || >=22}
minimatch@3.1.2: minimatch@3.1.2:
resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
@@ -4451,6 +4473,10 @@ packages:
resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==} resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==}
engines: {node: '>=16 || 14 >=14.18'} engines: {node: '>=16 || 14 >=14.18'}
path-scurry@2.0.0:
resolution: {integrity: sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==}
engines: {node: 20 || >=22}
path-to-regexp@0.1.12: path-to-regexp@0.1.12:
resolution: {integrity: sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==} resolution: {integrity: sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==}
@@ -4739,9 +4765,6 @@ packages:
resolution: {integrity: sha512-Hx/BGIbwj+Des3+xy5uAtAbdCyqK9y9wbBcDFDYanLS9JnMqf7OeF87HQwUimE87OEc72mr6tkKUKMBBL+hF9Q==} resolution: {integrity: sha512-Hx/BGIbwj+Des3+xy5uAtAbdCyqK9y9wbBcDFDYanLS9JnMqf7OeF87HQwUimE87OEc72mr6tkKUKMBBL+hF9Q==}
engines: {node: '>= 4'} engines: {node: '>= 4'}
reflect-metadata@0.1.14:
resolution: {integrity: sha512-ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A==}
reflect-metadata@0.2.2: reflect-metadata@0.2.2:
resolution: {integrity: sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==} resolution: {integrity: sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==}
@@ -4813,6 +4836,11 @@ packages:
deprecated: Rimraf versions prior to v4 are no longer supported deprecated: Rimraf versions prior to v4 are no longer supported
hasBin: true hasBin: true
rimraf@6.0.1:
resolution: {integrity: sha512-9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A==}
engines: {node: 20 || >=22}
hasBin: true
roarr@7.21.1: roarr@7.21.1:
resolution: {integrity: sha512-3niqt5bXFY1InKU8HKWqqYTYjtrBaxBMnXELXCXUYgtNYGUtZM5rB46HIC430AyacL95iEniGf7RgqsesykLmQ==} resolution: {integrity: sha512-3niqt5bXFY1InKU8HKWqqYTYjtrBaxBMnXELXCXUYgtNYGUtZM5rB46HIC430AyacL95iEniGf7RgqsesykLmQ==}
engines: {node: '>=18.0'} engines: {node: '>=18.0'}
@@ -4836,6 +4864,9 @@ packages:
rxjs@7.8.1: rxjs@7.8.1:
resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==} resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==}
rxjs@7.8.2:
resolution: {integrity: sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==}
safe-buffer@5.1.2: safe-buffer@5.1.2:
resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==} resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
@@ -6840,20 +6871,20 @@ snapshots:
transitivePeerDependencies: transitivePeerDependencies:
- '@types/react' - '@types/react'
'@nestjs/axios@4.0.0(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(axios@1.7.9)(rxjs@7.8.1)': '@nestjs/axios@4.0.0(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2))(axios@1.7.9)(rxjs@7.8.2)':
dependencies: dependencies:
'@nestjs/common': 10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/common': 10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2)
axios: 1.7.9 axios: 1.7.9
rxjs: 7.8.1 rxjs: 7.8.2
'@nestjs/azure-func-http@0.10.0(@azure/functions@1.2.3)(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(@nestjs/core@10.4.15)(reflect-metadata@0.1.14)': '@nestjs/azure-func-http@0.10.0(@azure/functions@1.2.3)(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@10.4.15)(reflect-metadata@0.2.2)':
dependencies: dependencies:
'@azure/functions': 1.2.3 '@azure/functions': 1.2.3
'@nestjs/common': 10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/common': 10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2)
'@nestjs/core': 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(@nestjs/platform-express@10.4.15)(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/core': 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@10.4.15)(reflect-metadata@0.2.2)(rxjs@7.8.2)
cors: 2.8.5 cors: 2.8.5
jsonc-parser: 3.3.1 jsonc-parser: 3.3.1
reflect-metadata: 0.1.14 reflect-metadata: 0.2.2
trouter: 3.2.1 trouter: 3.2.1
'@nestjs/cli@10.4.9': '@nestjs/cli@10.4.9':
@@ -6882,71 +6913,47 @@ snapshots:
- uglify-js - uglify-js
- webpack-cli - webpack-cli
'@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1)': '@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2)':
dependencies:
iterare: 1.2.1
reflect-metadata: 0.1.14
rxjs: 7.8.1
tslib: 2.8.1
uid: 2.0.2
'@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1)':
dependencies: dependencies:
iterare: 1.2.1 iterare: 1.2.1
reflect-metadata: 0.2.2 reflect-metadata: 0.2.2
rxjs: 7.8.1 rxjs: 7.8.2
tslib: 2.8.1 tslib: 2.8.1
uid: 2.0.2 uid: 2.0.2
'@nestjs/config@4.0.0(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(rxjs@7.8.1)': '@nestjs/config@4.0.0(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2))(rxjs@7.8.2)':
dependencies: dependencies:
'@nestjs/common': 10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/common': 10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2)
dotenv: 16.4.7 dotenv: 16.4.7
dotenv-expand: 12.0.1 dotenv-expand: 12.0.1
lodash: 4.17.21 lodash: 4.17.21
rxjs: 7.8.1 rxjs: 7.8.2
'@nestjs/core@10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(@nestjs/platform-express@10.4.15)(reflect-metadata@0.1.14)(rxjs@7.8.1)': '@nestjs/core@10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@10.4.15)(reflect-metadata@0.2.2)(rxjs@7.8.2)':
dependencies: dependencies:
'@nestjs/common': 10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/common': 10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2)
'@nuxtjs/opencollective': 0.3.2
fast-safe-stringify: 2.1.1
iterare: 1.2.1
path-to-regexp: 3.3.0
reflect-metadata: 0.1.14
rxjs: 7.8.1
tslib: 2.8.1
uid: 2.0.2
optionalDependencies:
'@nestjs/platform-express': 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(@nestjs/core@10.4.15)
transitivePeerDependencies:
- encoding
'@nestjs/core@10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(@nestjs/platform-express@10.4.15)(reflect-metadata@0.2.2)(rxjs@7.8.1)':
dependencies:
'@nestjs/common': 10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1)
'@nuxtjs/opencollective': 0.3.2 '@nuxtjs/opencollective': 0.3.2
fast-safe-stringify: 2.1.1 fast-safe-stringify: 2.1.1
iterare: 1.2.1 iterare: 1.2.1
path-to-regexp: 3.3.0 path-to-regexp: 3.3.0
reflect-metadata: 0.2.2 reflect-metadata: 0.2.2
rxjs: 7.8.1 rxjs: 7.8.2
tslib: 2.8.1 tslib: 2.8.1
uid: 2.0.2 uid: 2.0.2
optionalDependencies: optionalDependencies:
'@nestjs/platform-express': 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(@nestjs/core@10.4.15) '@nestjs/platform-express': 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@10.4.15)
transitivePeerDependencies: transitivePeerDependencies:
- encoding - encoding
'@nestjs/passport@10.0.3(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(passport@0.7.0)': '@nestjs/passport@10.0.3(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2))(passport@0.7.0)':
dependencies: dependencies:
'@nestjs/common': 10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/common': 10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2)
passport: 0.7.0 passport: 0.7.0
'@nestjs/platform-express@10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(@nestjs/core@10.4.15)': '@nestjs/platform-express@10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@10.4.15)':
dependencies: dependencies:
'@nestjs/common': 10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/common': 10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2)
'@nestjs/core': 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(@nestjs/platform-express@10.4.15)(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/core': 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@10.4.15)(reflect-metadata@0.2.2)(rxjs@7.8.2)
body-parser: 1.20.3 body-parser: 1.20.3
cors: 2.8.5 cors: 2.8.5
express: 4.21.2 express: 4.21.2
@@ -6977,20 +6984,20 @@ snapshots:
transitivePeerDependencies: transitivePeerDependencies:
- chokidar - chokidar
'@nestjs/testing@10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(@nestjs/core@10.4.15)(@nestjs/platform-express@10.4.15)': '@nestjs/testing@10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@10.4.15)(@nestjs/platform-express@10.4.15)':
dependencies: dependencies:
'@nestjs/common': 10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/common': 10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2)
'@nestjs/core': 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(@nestjs/platform-express@10.4.15)(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/core': 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@10.4.15)(reflect-metadata@0.2.2)(rxjs@7.8.2)
tslib: 2.8.1 tslib: 2.8.1
optionalDependencies: optionalDependencies:
'@nestjs/platform-express': 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(@nestjs/core@10.4.15) '@nestjs/platform-express': 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@10.4.15)
'@noahspan/azure-database@3.1.2(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(@nestjs/core@10.4.15)': '@noahspan/azure-database@3.1.2(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@10.4.15)':
dependencies: dependencies:
'@azure/cosmos': 4.2.0 '@azure/cosmos': 4.2.0
'@azure/data-tables': 13.3.0 '@azure/data-tables': 13.3.0
'@nestjs/common': 10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/common': 10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2)
'@nestjs/core': 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(@nestjs/platform-express@10.4.15)(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/core': 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@10.4.15)(reflect-metadata@0.2.2)(rxjs@7.8.2)
'@noahspan/noahspan-modules': 0.5.9 '@noahspan/noahspan-modules': 0.5.9
transitivePeerDependencies: transitivePeerDependencies:
- '@azure/msal-browser' - '@azure/msal-browser'
@@ -7062,10 +7069,10 @@ snapshots:
'@azure/msal-node': 2.16.2 '@azure/msal-node': 2.16.2
'@dapr/dapr': 3.4.1 '@dapr/dapr': 3.4.1
'@microsoft/microsoft-graph-client': 3.0.7(@azure/identity@4.6.0) '@microsoft/microsoft-graph-client': 3.0.7(@azure/identity@4.6.0)
'@nestjs/common': 10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1) '@nestjs/common': 10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2)
'@nestjs/core': 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(@nestjs/platform-express@10.4.15)(reflect-metadata@0.2.2)(rxjs@7.8.1) '@nestjs/core': 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@10.4.15)(reflect-metadata@0.2.2)(rxjs@7.8.2)
'@nestjs/passport': 10.0.3(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(passport@0.7.0) '@nestjs/passport': 10.0.3(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2))(passport@0.7.0)
'@nestjs/platform-express': 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(@nestjs/core@10.4.15) '@nestjs/platform-express': 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@10.4.15)
axios: 1.7.9 axios: 1.7.9
express-jwt: 8.5.1 express-jwt: 8.5.1
jwks-rsa: 3.1.0 jwks-rsa: 3.1.0
@@ -7073,7 +7080,7 @@ snapshots:
passport-azure-ad: 4.3.5 passport-azure-ad: 4.3.5
passport-jwt: 4.0.1 passport-jwt: 4.0.1
reflect-metadata: 0.2.2 reflect-metadata: 0.2.2
rxjs: 7.8.1 rxjs: 7.8.2
transitivePeerDependencies: transitivePeerDependencies:
- '@azure/msal-browser' - '@azure/msal-browser'
- '@nestjs/microservices' - '@nestjs/microservices'
@@ -7086,26 +7093,21 @@ snapshots:
- stream-browserify - stream-browserify
- supports-color - supports-color
'@noahspan/noahspan-modules@0.6.5': '@noahspan/noahspan-modules@1.0.0':
dependencies: dependencies:
'@azure/app-configuration': 1.8.0
'@azure/data-tables': 13.3.0
'@azure/identity': 4.6.0 '@azure/identity': 4.6.0
'@azure/msal-node': 2.16.2 '@azure/msal-node': 2.16.2
'@dapr/dapr': 3.4.1
'@microsoft/microsoft-graph-client': 3.0.7(@azure/identity@4.6.0) '@microsoft/microsoft-graph-client': 3.0.7(@azure/identity@4.6.0)
'@nestjs/common': 10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1) '@nestjs/common': 10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2)
'@nestjs/core': 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(@nestjs/platform-express@10.4.15)(reflect-metadata@0.2.2)(rxjs@7.8.1) '@nestjs/core': 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@10.4.15)(reflect-metadata@0.2.2)(rxjs@7.8.2)
'@nestjs/passport': 10.0.3(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(passport@0.7.0) '@nestjs/passport': 10.0.3(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2))(passport@0.7.0)
'@nestjs/platform-express': 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.1.14)(rxjs@7.8.1))(@nestjs/core@10.4.15) '@nestjs/platform-express': 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@10.4.15)
axios: 1.7.9 axios: 1.7.9
express-jwt: 8.5.1
jwks-rsa: 3.1.0
passport: 0.7.0 passport: 0.7.0
passport-azure-ad: 4.3.5 passport-azure-ad: 4.3.5
passport-jwt: 4.0.1 passport-jwt: 4.0.1
reflect-metadata: 0.2.2 reflect-metadata: 0.2.2
rxjs: 7.8.1 rxjs: 7.8.2
transitivePeerDependencies: transitivePeerDependencies:
- '@azure/msal-browser' - '@azure/msal-browser'
- '@nestjs/microservices' - '@nestjs/microservices'
@@ -9535,6 +9537,15 @@ snapshots:
package-json-from-dist: 1.0.1 package-json-from-dist: 1.0.1
path-scurry: 1.11.1 path-scurry: 1.11.1
glob@11.0.1:
dependencies:
foreground-child: 3.3.0
jackspeak: 4.1.0
minimatch: 10.0.1
minipass: 7.1.2
package-json-from-dist: 1.0.1
path-scurry: 2.0.0
glob@6.0.4: glob@6.0.4:
dependencies: dependencies:
inflight: 1.0.6 inflight: 1.0.6
@@ -9706,7 +9717,7 @@ snapshots:
mute-stream: 0.0.8 mute-stream: 0.0.8
ora: 5.4.1 ora: 5.4.1
run-async: 2.4.1 run-async: 2.4.1
rxjs: 7.8.1 rxjs: 7.8.2
string-width: 4.2.3 string-width: 4.2.3
strip-ansi: 6.0.1 strip-ansi: 6.0.1
through: 2.3.8 through: 2.3.8
@@ -9725,7 +9736,7 @@ snapshots:
mute-stream: 1.0.0 mute-stream: 1.0.0
ora: 5.4.1 ora: 5.4.1
run-async: 3.0.0 run-async: 3.0.0
rxjs: 7.8.1 rxjs: 7.8.2
string-width: 4.2.3 string-width: 4.2.3
strip-ansi: 6.0.1 strip-ansi: 6.0.1
wrap-ansi: 6.2.0 wrap-ansi: 6.2.0
@@ -9848,6 +9859,10 @@ snapshots:
optionalDependencies: optionalDependencies:
'@pkgjs/parseargs': 0.11.0 '@pkgjs/parseargs': 0.11.0
jackspeak@4.1.0:
dependencies:
'@isaacs/cliui': 8.0.2
jake@10.9.2: jake@10.9.2:
dependencies: dependencies:
async: 3.2.6 async: 3.2.6
@@ -10354,6 +10369,8 @@ snapshots:
lru-cache@10.4.3: {} lru-cache@10.4.3: {}
lru-cache@11.0.2: {}
lru-cache@5.1.1: lru-cache@5.1.1:
dependencies: dependencies:
yallist: 3.1.1 yallist: 3.1.1
@@ -10436,6 +10453,10 @@ snapshots:
mimic-fn@2.1.0: {} mimic-fn@2.1.0: {}
minimatch@10.0.1:
dependencies:
brace-expansion: 2.0.1
minimatch@3.1.2: minimatch@3.1.2:
dependencies: dependencies:
brace-expansion: 1.1.11 brace-expansion: 1.1.11
@@ -10684,6 +10705,11 @@ snapshots:
lru-cache: 10.4.3 lru-cache: 10.4.3
minipass: 7.1.2 minipass: 7.1.2
path-scurry@2.0.0:
dependencies:
lru-cache: 11.0.2
minipass: 7.1.2
path-to-regexp@0.1.12: {} path-to-regexp@0.1.12: {}
path-to-regexp@3.3.0: {} path-to-regexp@3.3.0: {}
@@ -10961,8 +10987,6 @@ snapshots:
tiny-invariant: 1.3.3 tiny-invariant: 1.3.3
tslib: 2.8.1 tslib: 2.8.1
reflect-metadata@0.1.14: {}
reflect-metadata@0.2.2: {} reflect-metadata@0.2.2: {}
regenerator-runtime@0.14.1: {} regenerator-runtime@0.14.1: {}
@@ -11019,6 +11043,11 @@ snapshots:
dependencies: dependencies:
glob: 7.2.3 glob: 7.2.3
rimraf@6.0.1:
dependencies:
glob: 11.0.1
package-json-from-dist: 1.0.1
roarr@7.21.1: roarr@7.21.1:
dependencies: dependencies:
fast-printf: 1.6.10 fast-printf: 1.6.10
@@ -11062,6 +11091,10 @@ snapshots:
dependencies: dependencies:
tslib: 2.8.1 tslib: 2.8.1
rxjs@7.8.2:
dependencies:
tslib: 2.8.1
safe-buffer@5.1.2: {} safe-buffer@5.1.2: {}
safe-buffer@5.2.1: {} safe-buffer@5.2.1: {}

View File

@@ -1,4 +1,3 @@
packages: packages:
- 'api' - 'api'
- 'app' - 'app'
- 'app2'