Merge branch 'main' into feature/15-move-app-to-azure-storage-cdn

.github/workflows/app_build_deploy.yaml

@@ -74,28 +74,3 @@ jobs:
         if: ${{ inputs.environment_name != 'pull_request' }}
         run: |
           az logout
-
-      # - name: Deploy
-      #   if: ${{ github.event_name != 'pull_request' }}
-      #   run: |
-      #     pnpm --filter app --prod deploy ./.prod/app
-
-      # - name: Setup Docker Buildx
-      #   if: ${{ github.event_name != 'pull_request' }}
-      #   uses: docker/setup-buildx-action@v3
-
-      # - name: Log into Docker Hub
-      #   if: ${{ github.event_name != 'pull_request' }}
-      #   uses: docker/login-action@v3
-      #   with:
-      #     username: ${{ vars.DOCKERHUB_USERNAME }}
-      #     password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      # - name: Build and push to registry
-      #   if: ${{ github.event_name != 'pull_request' }}
-      #   uses: docker/build-push-action@v6
-      #   with:
-      #     push: true
-      #     tags: noahspan/root-app:${{ inputs.version_number }}
-      #     context: .
-      #     target: app

api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "",
   "author": "",
   "private": true,

app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "app",
   "private": true,
-  "version": "1.1.0",
+  "version": "1.2.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -13,7 +13,7 @@
     "@azure/msal-browser": "^4.2.1",
     "@azure/msal-react": "^3.0.4",
     "@microsoft/microsoft-graph-types": "^2.40.0",
-    "@noahspan/noahspan-components": "^1.7.5",
+    "@noahspan/noahspan-components": "^1.8.1",
     "axios": "^1.7.9",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",

app/src/components/projects/Projects.tsx

@@ -11,7 +11,8 @@ import {
   Grid,
   Icon,
   IconName,
-  Spinner,
+  Skeleton,
+  Stack,
   Typography
 } from '@noahspan/noahspan-components';
 import { useIsAuthenticated } from '@azure/msal-react';
@@ -221,22 +222,42 @@ const Projects = () => {
                         }
                       </Grid>
                     </Grid>
-                    
                   </CardActions>
                 </Card>
               </Grid>
             )
           })}
-          {state.isLoading && (
+          {state.isLoading && [...Array(6)].map((_element, index) => {
-            <>
+            return (
-              <Grid display="flex" justifyContent="center" size={12}>
+              <Grid display='flex' justifyContent='center' size={12}>
-                <Spinner />
+                <Card
+                  key={index}
+                  sx={{
+                    width: '100%'
+                  }}
+                >
+                  <CardContent>
+                    <Grid container spacing={2}>
+                      <Grid size={1}>
+                        <Skeleton height={100} width={60} />
+                      </Grid>
+                      <Grid size={11}>
+                        <Stack>
+                          <Skeleton height={60} />
+                          <Skeleton height={30} />
+                        </Stack>
+                      </Grid>
+                      <Grid size={12}>
+                        <Skeleton />
+                        <Skeleton />
+                        <Skeleton />
+                      </Grid>
+                    </Grid>
+                  </CardContent>
+                </Card>
               </Grid>
-              <Grid display="flex" justifyContent="center" size={12}>
+            )
-                Loading projects slowly...
+          })}
-              </Grid>
-            </>
-          )}
         </Grid>
         {state.isFormOpen && 
           <ProjectForm

pnpm-lock.yaml

@@ -134,8 +134,8 @@ importers:
         specifier: ^2.40.0
         version: 2.40.0
       '@noahspan/noahspan-components':
-        specifier: ^1.7.5
+        specifier: ^1.8.1
-        version: 1.7.5(@mui/system@6.4.3(@emotion/react@11.14.0(@types/react@19.0.8)(react@19.0.0))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@19.0.8)(react@19.0.0))(@types/react@19.0.8)(react@19.0.0))(@types/react@19.0.8)(react@19.0.0))(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(jquery@3.7.1)(less@4.2.2)(moment@2.30.1)(postcss@8.5.2)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(storybook@8.5.4(prettier@3.5.0))(typescript@5.7.3)(webpack@5.98.0(esbuild@0.18.20))
+        version: 1.8.1(@mui/system@6.4.3(@emotion/react@11.14.0(@types/react@19.0.8)(react@19.0.0))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@19.0.8)(react@19.0.0))(@types/react@19.0.8)(react@19.0.0))(@types/react@19.0.8)(react@19.0.0))(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(jquery@3.7.1)(less@4.2.2)(moment@2.30.1)(postcss@8.5.2)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(storybook@8.5.4(prettier@3.5.0))(typescript@5.7.3)(webpack@5.98.0(esbuild@0.18.20))
       axios:
         specifier: ^1.7.9
         version: 1.7.9
@@ -1616,8 +1616,8 @@ packages:
       '@nestjs/common': ^9.0.0 || ^10.0.0
       '@nestjs/core': ^9.0.0 || ^10.0.0
 
-  '@noahspan/noahspan-components@1.7.5':
+  '@noahspan/noahspan-components@1.8.1':
-    resolution: {integrity: sha512-udxXiYI0GLL2Jo9jqc981BYLXQK3cxkwioA90o1cIXhN85ZT/8uRZr5gS/eMGzlctnRU5s5M4kQEns1Ry35m0Q==}
+    resolution: {integrity: sha512-x+h9tc6Jp54WP4oKxbEeHuzjWVd1emJaKTfh/uMGYyXJFeCdWFfWdFgHsAEGmVnUn0ZpQLctWqi+t6/ix3KgnA==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
       react: ^18.2.0
@@ -7520,7 +7520,7 @@ snapshots:
       - stream-browserify
       - supports-color
 
-  '@noahspan/noahspan-components@1.7.5(@mui/system@6.4.3(@emotion/react@11.14.0(@types/react@19.0.8)(react@19.0.0))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@19.0.8)(react@19.0.0))(@types/react@19.0.8)(react@19.0.0))(@types/react@19.0.8)(react@19.0.0))(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(jquery@3.7.1)(less@4.2.2)(moment@2.30.1)(postcss@8.5.2)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(storybook@8.5.4(prettier@3.5.0))(typescript@5.7.3)(webpack@5.98.0(esbuild@0.18.20))':
+  '@noahspan/noahspan-components@1.8.1(@mui/system@6.4.3(@emotion/react@11.14.0(@types/react@19.0.8)(react@19.0.0))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@19.0.8)(react@19.0.0))(@types/react@19.0.8)(react@19.0.0))(@types/react@19.0.8)(react@19.0.0))(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(jquery@3.7.1)(less@4.2.2)(moment@2.30.1)(postcss@8.5.2)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(storybook@8.5.4(prettier@3.5.0))(typescript@5.7.3)(webpack@5.98.0(esbuild@0.18.20))':
     dependencies:
       '@emotion/react': 11.14.0(@types/react@19.0.8)(react@19.0.0)
       '@emotion/styled': 11.14.0(@emotion/react@11.14.0(@types/react@19.0.8)(react@19.0.0))(@types/react@19.0.8)(react@19.0.0)