1 Commits

Author SHA1 Message Date
6983fc7b84 Upgrading component library 2025-03-05 13:32:16 -06:00
25 changed files with 699 additions and 1168 deletions

View File

@@ -15,10 +15,6 @@ env:
VITE_TENANT_ID: ${{ vars.VITE_TENANT_ID }} VITE_TENANT_ID: ${{ vars.VITE_TENANT_ID }}
VITE_REDIRECT_URL: ${{ vars.VITE_REDIRECT_URL }} VITE_REDIRECT_URL: ${{ vars.VITE_REDIRECT_URL }}
permissions:
id-token: write
contents: read
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@@ -49,28 +45,26 @@ jobs:
pnpm --filter app build pnpm --filter app build
- name: Deploy - name: Deploy
if: ${{ inputs.environment_name != 'pull_request' }} if: ${{ github.event_name != 'pull_request' }}
uses: azure/login@v2
with:
client-id: ${{ vars.VITE_CLIENT_ID }}
tenant-id: ${{ vars.VITE_TENANT_ID }}
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
- name: Upload
if: ${{ inputs.environment_name != 'pull_request' }}
uses: azure/CLI@v1
with:
inlineScript: |
az storage blob upload-batch --account-name ${{ vars.AZURE_STORAGE_ACCOUNT_NAME }} --auth-mode key -d '$web' -s ./app/dist
# - name: Purge CDN endpoint
# if: ${{ inputs.environment_name != 'pull_request' }}
# uses: azure/CLI@v1
# with:
# inlineScript: |
# az cdn endpoint purge --content-paths "/*" --profile-name "CDN_PROFILE_NAME" --name "CDN_ENDPOINT" --resource-group "RESOURCE_GROUP"
- name: Azure CLI logout
if: ${{ inputs.environment_name != 'pull_request' }}
run: | run: |
az logout 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

View File

@@ -31,25 +31,25 @@ jobs:
version_number: ${{ github.run_id }} version_number: ${{ github.run_id }}
secrets: inherit secrets: inherit
build-deploy-app: build-app:
if: ${{ needs.changes.outputs.app == 'true' }} if: ${{ needs.changes.outputs.app == 'true' }}
name: build-app name: build-app
needs: needs:
- changes - changes
uses: ./.github/workflows/app_build_deploy.yaml uses: ./.github/workflows/app_build.yaml
with: with:
environment_name: test environment_name: test
version_number: ${{ github.run_id }} version_number: ${{ github.run_id }}
secrets: inherit secrets: inherit
# deploy-app: deploy-app:
# name: deploy-app name: deploy-app
# needs: needs:
# - changes - changes
# - build-app - build-app
# uses: ./.github/workflows/deploy.yaml uses: ./.github/workflows/deploy.yaml
# with: with:
# app_name: root-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

@@ -23,7 +23,7 @@ jobs:
name: build-app name: build-app
needs: needs:
- changes - changes
uses: ./.github/workflows/app_build_deploy.yaml uses: ./.github/workflows/app_build.yaml
with: with:
environment_name: pull_request environment_name: pull_request
version_number: ${{ github.run_id }} version_number: ${{ github.run_id }}

View File

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

View File

@@ -1,8 +1,8 @@
import { Module } from '@nestjs/common'; import { Module } from '@nestjs/common';
import { APP_FILTER } 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 { AuthModule, UserModule } 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';
@@ -39,6 +39,10 @@ import configuration from './config/configuration';
{ {
provide: APP_FILTER, provide: APP_FILTER,
useClass: HttpExceptionFilter useClass: HttpExceptionFilter
},
{
provide: APP_GUARD,
useClass: AuthGuard
} }
] ]
}) })

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -11,8 +11,7 @@ import {
Grid, Grid,
Icon, Icon,
IconName, IconName,
Skeleton, Spinner,
Stack,
Typography Typography
} from '@noahspan/noahspan-components'; } from '@noahspan/noahspan-components';
import { useIsAuthenticated } from '@azure/msal-react'; import { useIsAuthenticated } from '@azure/msal-react';
@@ -38,14 +37,12 @@ const Projects = () => {
`api/projects`, `api/projects`,
); );
const projects: Project[] = response.data; const projects: Project[] = response.data;
console.log(projects);
projects.sort((a, b) => Number(a.order) - Number(b.order)) projects.sort((a, b) => Number(a.order) - Number(b.order))
return projects; return projects;
} catch (error) { } catch (error) {
const axiosError = error as AxiosError; throw new Error('broken');
throw new Error(axiosError.message);
} }
}; };
@@ -222,42 +219,22 @@ const Projects = () => {
} }
</Grid> </Grid>
</Grid> </Grid>
</CardActions> </CardActions>
</Card> </Card>
</Grid> </Grid>
) )
})} })}
{state.isLoading && [...Array(6)].map((_element, index) => { {state.isLoading && (
return ( <>
<Grid display='flex' justifyContent='center' size={12}> <Grid display="flex" justifyContent="center" size={12}>
<Card <Spinner />
key={index}
sx={{
width: '100%'
}}
>
<CardContent>
<Grid container spacing={2}>
<Grid size={1}>
<Skeleton height={100} width={60} />
</Grid> </Grid>
<Grid size={11}> <Grid display="flex" justifyContent="center" size={12}>
<Stack> Loading...
<Skeleton height={60} />
<Skeleton height={30} />
</Stack>
</Grid> </Grid>
<Grid size={12}> </>
<Skeleton /> )}
<Skeleton />
<Skeleton />
</Grid>
</Grid>
</CardContent>
</Card>
</Grid>
)
})}
</Grid> </Grid>
{state.isFormOpen && {state.isFormOpen &&
<ProjectForm <ProjectForm

View File

@@ -69,6 +69,7 @@ const SiteNav: React.FC<unknown> = () => {
return imageUrl; return imageUrl;
} catch (error) { } catch (error) {
console.log(error);
throw new Error(); throw new Error();
} }
}; };
@@ -93,6 +94,7 @@ const SiteNav: React.FC<unknown> = () => {
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);

View File

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

View File

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

212
data/profile/profile.json Normal file
View File

@@ -0,0 +1,212 @@
{
"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"
}

0
data/projects/.gitkeep Normal file
View File

View File

@@ -0,0 +1,23 @@
{
"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"
}

View File

@@ -2,15 +2,13 @@ version: '3.8'
services: services:
azurite: azurite:
container_name: azurite-root container_name: azurite
image: mcr.microsoft.com/azure-storage/azurite:3.33.0 image: mcr.microsoft.com/azure-storage/azurite:3.33.0
ports: ports:
- '10000:10000' - '10000:10000'
- '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'
volumes:
- ./azurite-root:/data
api: api:
container_name: root-api container_name: root-api
@@ -29,6 +27,3 @@ services:
target: app target: app
ports: ports:
- '8080:8080' - '8080:8080'
volumes:
azurite-root:

View File

@@ -2,20 +2,20 @@
# Manual edits may be lost in future updates. # Manual edits may be lost in future updates.
provider "registry.terraform.io/hashicorp/azurerm" { provider "registry.terraform.io/hashicorp/azurerm" {
version = "4.26.0" version = "3.104.0"
hashes = [ hashes = [
"h1:Vdylhj5W0M+J62bOOdvVUlmGB7M5TfaNRcThdb8ydcc=", "h1:SSBkZNrevDxOI6j9tVel7/BKX/5xaMYUqx4qhLvrjS4=",
"zh:0e381bace81028596d60e253bc320bf62d00ae2ec207d7c7e70cdbec5f543334", "zh:01aa74b1e13c797b20407c37c683b945ffb24462bb39cdaddcf5b3297272c85a",
"zh:32c8cf70e476a4d0e0a2d4cb94b4a4e95c287c5972ca1e8c0f37dc629fbe31cb", "zh:42c3a69ece44ed6dbd5145dadbdbde9a2e99c3dc0b5a0b28544fd68e796a755d",
"zh:568ebaa4c66fc668dc14c8ff323e47fc7b2ac3b5a5d9eec612de2b6a30164f4c", "zh:48102182e71a10f8337828239d770953fb54e95c4f617a5a327316ba7d9c9aa5",
"zh:596c218810ffb85bc7224574b6ba6dbab9295bfa7490eac98c5ff88beae75710", "zh:4c086420f1acc033b5901dc266721a38f43cbab43dedae149df3ccd8d1a3615d",
"zh:75a0e5b60f24684d62944714deb1c790b17c8d4acc93b5cdb45a8187d887b7f1", "zh:634e3d701798d699f502c86d1ee591778fa0a46be81a220bd849c0389cd742f1",
"zh:7d2abea6ab66a08fed7d1ab8d4f3a8344fe7e2ac76d7409a3e40e8c066df6f22", "zh:6aa0c6cb606dcd8efe90fb9fb872aa5406119264ce2819d8daf35c813e6ba2f7",
"zh:7f4db75991fd610b2c0306226e5e1916d4b633cdb0126bc78951dce2365b3418", "zh:8604d0a159b1905d7a92448d5e2e1ec0b3275b9b2d8f7986f4a566f570a6f90c",
"zh:95fe307defb6e0dc172855fa597140f3da96655b3c558c140ae51a4a6077f58d", "zh:912ddd9a43cbb168a58f1af625a8fe111e505c059442ad6126905449e5013877",
"zh:ae07cdd3c658c0e24d45f1cfadf8b085b18981bcd72a20093ce3f042ed0adf3f", "zh:9ed54f1e7ae7881611ae659bfbd11db878adc77aa848b920cc0d76a1ab41a2ac",
"zh:d2a471b9e42499a7247f873aebd5cbc8df0c6691f02a5c9b556aa00045c06869", "zh:b507020a566bdbc0dfe868103664361e8ee5549de6edceb7f5d6837dcd8af5a3",
"zh:e0299c0f6eae2b1c935f552f76fc49a2e61975eeda9410e3920a004b74d9e750",
"zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c",
"zh:f7fc6699a0359183911448bf9736777cd6d8ce91fd20d682cf635fa58e2905dd",
] ]
} }

View File

@@ -49,32 +49,11 @@ locals {
prod = "root-log-analytics-workspace-prod" prod = "root-log-analytics-workspace-prod"
} }
static_websites = {
test = [
{
error_404_document = "custom_not_found.html"
index_document = "index.html"
}
]
}
storage_account_name = { storage_account_name = {
test = "noahspanroottest" test = "noahspanroottest"
prod = "noahspanrootprod" prod = "noahspanrootprod"
} }
storage_blobs = {
test = [
{
name = "web"
storage_container_name = "$web"
type = "Block"
content_type = "text/html"
source = "index.html"
}
]
}
storage_tables = { storage_tables = {
test = ["projects"] test = ["projects"]
prod = ["projects"] prod = ["projects"]

View File

@@ -38,18 +38,10 @@ output "log_analytics_workspace_name" {
value = local.log_analytics_workspace_name[var.environment] value = local.log_analytics_workspace_name[var.environment]
} }
output "static_websites" {
value = local.static_websites[var.environment]
}
output "storage_account_name" { output "storage_account_name" {
value = local.storage_account_name[var.environment] value = local.storage_account_name[var.environment]
} }
output "storage_blobs" {
value = local.storage_blobs[var.environment]
}
output "storage_tables" { output "storage_tables" {
value = local.storage_tables[var.environment] value = local.storage_tables[var.environment]
} }

View File

@@ -1,9 +1,7 @@
module "storage" { module "storage" {
source = "github.com/noahspannbauer/noahspan-terraform/modules/storage" source = "github.com/noahspannbauer/noahspan-terraform/modules/storage"
resource_group_name = var.RESOURCE_GROUP_NAME resource_group_name = var.RESOURCE_GROUP_NAME
static_websites = module.environment.static_websites
storage_account_name = module.environment.storage_account_name storage_account_name = module.environment.storage_account_name
storage_blobs = module.environment.storage_blobs
storage_tables = module.environment.storage_tables storage_tables = module.environment.storage_tables
} }

View File

@@ -1,6 +1,6 @@
{ {
"name": "@noahspan/noahspan-root", "name": "@noahspan/noahspan-root",
"version": "1.1.0", "version": "1.0.0",
"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", "preprod": "rimraf ./.prod && pnpm --filter api build && pnpm --filter app build",

1374
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff