Merge branch 'bug/10-remove-pubic-decorator-in-api' of https://github.com/noahspannbauer/noahspan-root into bug/10-remove-pubic-decorator-in-api

api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "",
   "author": "",
   "private": true,
@@ -20,25 +20,24 @@
     "test:e2e": "jest --config ./test/jest-e2e.json"
   },
   "dependencies": {
-    "@azure/functions": "^1.0.3",
     "@nestjs/axios": "^4.0.0",
     "@nestjs/azure-func-http": "^0.10.0",
-    "@nestjs/common": "^10.0.0",
+    "@nestjs/common": "^11.0.11",
-    "@nestjs/config": "^4.0.0",
+    "@nestjs/config": "^4.0.1",
-    "@nestjs/core": "^10.0.0",
+    "@nestjs/core": "^11.0.11",
-    "@nestjs/platform-express": "^10.0.0",
+    "@nestjs/platform-express": "^11.0.11",
     "@noahspan/azure-database": "^3.1.2",
-    "@noahspan/noahspan-modules": "^1.0.0",
+    "@noahspan/noahspan-modules": "^1.1.5",
     "axios": "^1.7.9",
     "reflect-metadata": "^0.2.2",
-    "rxjs": "^7.8.2",
+    "rxjs": "7.8.2",
     "uuid": "^11.0.5"
   },
   "devDependencies": {
     "@angular-devkit/schematics": "^19.1.4",
-    "@nestjs/cli": "^10.0.0",
+    "@nestjs/cli": "^11.0.5",
-    "@nestjs/schematics": "^10.0.0",
+    "@nestjs/schematics": "^11.0.2",
-    "@nestjs/testing": "^10.0.0",
+    "@nestjs/testing": "^11.0.11",
     "@schematics/angular": "^19.1.4",
     "@types/express": "^4.17.17",
     "@types/jest": "^29.5.2",

api/src/app.module.ts

@@ -1,8 +1,8 @@
 import { Module } from '@nestjs/common';
-import { APP_FILTER, APP_GUARD } from '@nestjs/core';
+import { APP_FILTER } from '@nestjs/core';
 import { HttpExceptionFilter } from './filters/http-exception.filter';
 import { ProjectModule } from './project/project.module';
-import { AuthGuard, AuthModule, UserModule } from '@noahspan/noahspan-modules'
+import { AuthModule, UserModule } from '@noahspan/noahspan-modules'
 import { ConfigModule, ConfigService } from '@nestjs/config';
 import configuration from './config/configuration';
 
@@ -39,10 +39,6 @@ import configuration from './config/configuration';
     {
       provide: APP_FILTER,
       useClass: HttpExceptionFilter
-    },
-    {
-      provide: APP_GUARD,
-      useClass: AuthGuard
     }
   ]
 })

api/src/index.css

@@ -0,0 +1,3 @@
+body {
+  background-color: #f2f2f2;
+}

api/src/project/project.controller.ts

@@ -12,13 +12,14 @@ import {
 import { ProjectDto } from './project.dto';
 import { Project } from './project.entity';
 import { ProjectService } from './project.service';
-import { CustomError, Public } from '@noahspan/noahspan-modules';
+import { AuthGuard, CustomError, Public } from '@noahspan/noahspan-modules';
 
 @Controller('projects')
 export class ProjectController {
   constructor(private readonly projectService: ProjectService) {}
 
   @Get(':partitionKey/:rowKey')
+  @UseGuards(AuthGuard)
   async find(
     @Param('partitionKey') partitionKey: string,
     @Param('rowKey') rowKey: string
@@ -32,12 +33,12 @@ export class ProjectController {
     }
   }
 
-  @Public()
   @Get()
   async findAll() {
     try {
       return await this.projectService.findAll();
     } catch (error) {
+      console.log(error)
       const customError = error as CustomError;
 
       throw new HttpException(customError.message, customError.statusCode);
@@ -45,6 +46,7 @@ export class ProjectController {
   }
 
   @Post()
+  @UseGuards(AuthGuard)
   async create(@Body() projectDto: ProjectDto) {
     try {
       const project = new Project();
@@ -60,6 +62,7 @@ export class ProjectController {
   }
 
   @Put(':partitionKey/:rowKey')
+  @UseGuards(AuthGuard)
   async update(
     @Param('partitionKey') partitionKey: string,
     @Param('rowKey') rowKey: string,
@@ -79,6 +82,7 @@ export class ProjectController {
   }
 
   @Delete(':partitionKey/:rowKey')
+  @UseGuards(AuthGuard)
   async delete(
     @Param('partitionKey') partitionKey: string,
     @Param('rowKey') rowKey: string

api/src/project/project.entity.ts

@@ -1,7 +1,9 @@
+import { EntityString } from '@noahspan/azure-database';
+
 export class Project {
-  partitionKey: string;
+  @EntityString() partitionKey: string;
-  rowKey: string;
+  @EntityString() rowKey: string;
-  displayName: string;
+  @EntityString() displayName: string;
-  icon: string;
+  @EntityString() icon: string;
-  summary: string;
+  @EntityString() summary: string;
 }

api/src/project/project.module.ts

@@ -17,7 +17,7 @@ import { ConfigModule, ConfigService } from '@nestjs/config';
       inject: [ConfigService]
     }),
     AzureTableStorageModule.forFeature(Project, {
-      createTableIfNotExists: true,
+      createTableIfNotExists: false,
       table: 'projects'
     }),
   ],

api/src/project/project.service.ts

@@ -1,7 +1,6 @@
 import { InjectRepository, Repository } from '@noahspan/azure-database';
 import { Injectable } from '@nestjs/common';
 import { Project } from './project.entity';
-import { v4 as uuidv4 } from 'uuid';
 
 @Injectable()
 export class ProjectService {

app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "app",
   "private": true,
-  "version": "1.0.0",
+  "version": "1.1.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.3.1",
+    "@noahspan/noahspan-components": "^1.4.0",
     "axios": "^1.7.9",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",

app/src/components/projectForm/ProjectForm.tsx

@@ -47,7 +47,6 @@ const ProjectForm = ({ isDrawerOpen, mode, onOpenClose, projectId }: ProjectForm
   };
 
   const onSubmit = async (data: unknown) => {
-    console.log(data)
     try {
       dispatch({ type: 'SET_IS_LOADING', payload: true });
 

app/src/components/projects/Projects.tsx

@@ -37,12 +37,14 @@ const Projects = () => {
         `api/projects`,
       );
       const projects: Project[] = response.data;
-
+      console.log(projects);
       projects.sort((a, b) => Number(a.order) - Number(b.order))
 
       return projects;
     } catch (error) {
-      throw new Error('broken');
+      const axiosError = error as AxiosError;
+
+      throw new Error(axiosError.message);
     }
   };
 

app/src/components/siteNav/SiteNav.tsx

@@ -69,7 +69,6 @@ const SiteNav: React.FC<unknown> = () => {
 
       return imageUrl;
     } catch (error) {
-      console.log(error);
       throw new Error();
     }
   };
@@ -94,7 +93,6 @@ const SiteNav: React.FC<unknown> = () => {
         const accessToken: string = await getAccessToken();
         const userProfile = await getUserProfile(accessToken);
         const userPhoto = await getUserPhoto(accessToken);
-        console.log(userPhoto)
 
         setUserPhoto(userPhoto);
 

app/src/index.css

@@ -0,0 +1,3 @@
+body {
+  background-color: #f2f2f2;
+}

app/src/main.tsx

@@ -6,6 +6,7 @@ import { BrowserRouter } from 'react-router-dom';
 import { AuthenticationResult, EventMessage, EventType, PublicClientApplication } from '@azure/msal-browser';
 import { msalConfig } from './auth/msalConfig.ts';
 import AppContextProvider from './context/appContext/AppContextProvider.tsx';
+import './index.css';
 
 const msalInstance: PublicClientApplication = new PublicClientApplication(msalConfig);
 

data/profile/profile.json

@@ -1,212 +0,0 @@
-{
-  "experiences": [
-    {
-      "jobTitle": "Senior Software Engineer",
-      "company": "Sensonix, Inc.",
-      "location": "Plymouth, Minnesota",
-      "startDate": "April 2023",
-      "endDate": "Present",
-      "details": null
-    },
-    {
-      "jobTitle": "Senior Software Engineer",
-      "company": "Amano McGann, Inc.",
-      "location": "Roseville, Minnesota",
-      "startDate": "July 2022",
-      "endDate": "April 2023",
-      "details": null
-    },
-    {
-      "jobTitle": "Senior Software Engineer",
-      "company": "Optum",
-      "location": "Eden Prairie, Minnesota",
-      "startDate": "March 2021",
-      "endDate": "June 2022",
-      "details": null
-    },
-    {
-      "jobTitle": "Senior Software Engineer",
-      "company": "Target",
-      "location": "Minneapolis, Minnesota",
-      "startDate": "December 2018",
-      "endDate": "February 2021",
-      "details": null
-    },
-    {
-      "jobTitle": "Developer, Business Systems",
-      "company": "Minnesota Twins",
-      "location": "Minneapolis, Minnesota",
-      "startDate": "February 2017",
-      "endDate": "December 2018",
-      "details": null
-    },
-    {
-      "jobTitle": "SharePoint Administrator/Developer",
-      "company": "Minnesota Judicial Branch",
-      "location": "Saint Paul, Minnesota",
-      "startDate": "January 2016",
-      "endDate": "February 2017",
-      "details": null
-    },
-    {
-      "jobTitle": "Consultant",
-      "company": "Magenic Technologies",
-      "location": "Saint Louis Park, Minnesota",
-      "startDate": "August 2011",
-      "endDate": "January 2016",
-      "details": null
-    }
-  ],
-  "education": [
-    {
-      "school": "Metropolitan State University",
-      "location": "Saint Paul, Minnesota",
-      "degree": "Bachelor of Arts",
-      "fieldOfStudy": "Technical Communication"
-    },
-    {
-      "school": "Century College",
-      "location": "White Bear Lake, Minnesota",
-      "degree": "Associate of Arts",
-      "fieldOfStudy": "Liberal Arts"
-    }
-  ],
-  "about": {
-    "details": "\\# This is some markdown.",
-    "summary": null
-  },
-  "intro": {
-    "firstName": "Noah",
-    "lastName": "Spannbauer",
-    "photoUrl": null,
-    "title": "Senior Software Engineer",
-    "location": "Minneapolis, Minnesota, United States"
-  },
-  "skills": [
-    {
-      "category": "Experienced",
-      "group": "Agile Methodologies",
-      "skills": [
-        "Scrum"
-      ]
-    },
-    {
-      "category": "Experienced",
-      "group": "Containerization",
-      "skills": [
-        "Docker",
-        "Kubernetes",
-        "Helm"
-      ]
-    },
-    {
-      "category": "Experienced",
-      "group": "Continuous Integration and Continuous Delivery",
-      "skills": [
-        "GitHub Actions",
-        "Argo CD"
-      ]
-    },
-    {
-      "category": "Experienced",
-      "group": "Database",
-      "skills": [
-        "PostgreSQL"
-      ]
-    },
-    {
-      "category": "Experienced",
-      "group": "Front-End Web Development",
-      "skills": [
-        "React",
-        "Node.js"
-      ]
-    },
-    {
-      "category": "Experienced",
-      "group": "Infrastructure as Code",
-      "skills": [
-        "Terraform"
-      ]
-    },
-    {
-      "category": "Experienced",
-      "group": "Messaging",
-      "skills": [
-        "RabbitMQ"
-      ]
-    },
-    {
-      "category": "Experienced",
-      "group": "Programming Languages",
-      "skills": [
-        "JavaScript",
-        "Typescript"
-      ]
-    },
-    {
-      "category": "Experienced",
-      "group": "Test Automation",
-      "skills": [
-        "Cucumber",
-        "Gherkin",
-        "Jest",
-        "Playwright"
-      ]
-    },
-    {
-      "category": "Experienced",
-      "group": "Cloud",
-      "skills": [
-        "Amazon Web Services (AWS)"
-      ]
-    },
-    {
-      "category": "Familiar",
-      "group": "Cloud",
-      "skills": [
-        "Azure"
-      ]
-    },
-    {
-      "category": "Familiar",
-      "group": "Continuous Integration and Continuous Delivery",
-      "skills": [
-        "Azure DevOps",
-        "Drone",
-        "Vela"
-      ]
-    },
-    {
-      "category": "Familiar",
-      "group": "Database",
-      "skills": [
-        "MongoDB",
-        "SQL Server"
-      ]
-    },
-    {
-      "category": "Familiar",
-      "group": "Messaging",
-      "skills": [
-        "Khafka"
-      ]
-    },
-    {
-      "category": "Familiar",
-      "group": "Programming Languages",
-      "skills": [
-        "C#",
-        "Powershell"
-      ]
-    },
-    {
-      "category": "Familiar",
-      "group": "Test Automation",
-      "skills": [
-        "Cypress"
-      ]
-    }
-  ],
-  "___mb_schema": "/.mattrbld/schemas/Profile.json"
-}

data/projects/projects.json

@@ -1,23 +0,0 @@
-{
-  "projects": [
-    {
-      "repoName": "noahspan-components",
-      "title": "Components (React + Storybook)",
-      "iconName": "fa-puzzle-piece",
-      "summary": "A component library with custom React components, extended components from Material UI, and a subset of Font Awesome icons."
-    },
-    {
-      "repoName": "noahspan-flying",
-      "title": "Flying (React + Nest.js)",
-      "iconName": "fa-plane",
-      "summary": "A pilot logbook for logging flight hours."
-    },
-    {
-      "repoName": "noahspan-modules",
-      "title": "Modules (Nest.js)",
-      "iconName": "fa-gear",
-      "summary": "A library of custom modules for projects using Nest.js."
-    }
-  ],
-  "___mb_schema": "/.mattrbld/schemas/Projects.json"
-}

docker-compose.yaml

@@ -2,13 +2,15 @@ version: '3.8'
 
 services:
   azurite:
-    container_name: azurite
+    container_name: azurite-root
     image: mcr.microsoft.com/azure-storage/azurite:3.33.0
     ports:
       - '10000:10000'
       - '10001:10001'
       - '10002:10002'
     command: 'azurite --blobHost 0.0.0.0 --queueHost 0.0.0.0 --tableHost 0.0.0.0 --loose'
+    volumes: 
+      - ./azurite-root:/data
 
   api:
     container_name: root-api
@@ -26,4 +28,7 @@ services:
       context: .
       target: app
     ports: 
-      - '8080:8080'
+      - '8080:8080'
+
+volumes:
+  azurite-root:

infrastructure/main.tf

@@ -1,3 +1,10 @@
+module "storage" {
+  source = "github.com/noahspannbauer/noahspan-terraform/modules/storage"
+  resource_group_name = var.RESOURCE_GROUP_NAME
+  storage_account_name = module.environment.storage_account_name
+  storage_tables = module.environment.storage_tables
+}
+
 module "container_app" {
   source = "github.com/noahspannbauer/noahspan-terraform/modules/container_app"
   app_subdomain_name = var.APP_SUBDOMAIN_NAME
@@ -17,7 +24,6 @@ module "container_app" {
   domain_name = var.DOMAIN_NAME
   log_analytics_workspace_name = module.environment.log_analytics_workspace_name
   resource_group_name = var.RESOURCE_GROUP_NAME
-  storage_account_name = module.environment.storage_account_name
+  storage_account_primary_connection_string = module.storage.storage_account_primary_connection_string
-  storage_tables = module.environment.storage_tables
   tenant_id = var.TENANT_ID
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noahspan/noahspan-root",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "preprod": "rimraf ./.prod && pnpm --filter api build && pnpm --filter app build",