Skip to content

Commit

Permalink
Merge pull request #69 from lwestfall/dev
Browse files Browse the repository at this point in the history
Merge live meeting and other features into main
  • Loading branch information
lwestfall authored Jan 7, 2024
2 parents 51eb382 + 6ae37ba commit d2d3c2c
Show file tree
Hide file tree
Showing 141 changed files with 6,184 additions and 666 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/build-client-docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Angular Client Docker CI

on:
pull_request:
branches: ["*"]

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: "*"

- name: Docker Build
run: |
cd src/Client
docker build --build-arg PROFILE=prod -t ${{ secrets.DOCKER_USERNAME }}/cbc-app .
4 changes: 2 additions & 2 deletions .github/workflows/build-client.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Angular CI
name: Angular Client CI

on:
pull_request:
Expand All @@ -21,7 +21,7 @@ jobs:
cd src/Client
npm install
- name: Build
- name: Angular Build
run: |
cd src/Client
npm run build
22 changes: 22 additions & 0 deletions .github/workflows/build-server-docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: ASP.NET Core Docker CI

on:
pull_request:
branches: ["*"]

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: "8.0.x" # specify your .NET Core version here

- name: Docker Build
run: |
cd src/Server
docker build -t ${{ secrets.DOCKER_USERNAME }}/cbc-api .
2 changes: 1 addition & 1 deletion .github/workflows/build-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: ASP.NET Core CI

on:
pull_request:
branches: [main]
branches: ["*"]

jobs:
build:
Expand Down
40 changes: 29 additions & 11 deletions src/Client/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,14 @@
"outputPath": "dist/cbc",
"index": "src/index.html",
"browser": "src/main.ts",
"polyfills": ["zone.js"],
"polyfills": [
"zone.js"
],
"tsConfig": "tsconfig.app.json",
"assets": ["src/favicon.png", "src/assets"],
"assets": [
"src/favicon.png",
"src/assets"
],
"styles": [
"node_modules/bootstrap/dist/css/bootstrap.min.css",
"src/styles.css"
Expand All @@ -30,8 +35,8 @@
"budgets": [
{
"type": "initial",
"maximumWarning": "500kb",
"maximumError": "1mb"
"maximumWarning": "1.5mb",
"maximumError": "2mb"
},
{
"type": "anyComponentStyle",
Expand All @@ -45,8 +50,8 @@
"budgets": [
{
"type": "initial",
"maximumWarning": "500kb",
"maximumError": "1mb"
"maximumWarning": "1.5mb",
"maximumError": "2mb"
},
{
"type": "anyComponentStyle",
Expand Down Expand Up @@ -100,24 +105,37 @@
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"polyfills": ["zone.js", "zone.js/testing"],
"polyfills": [
"zone.js",
"zone.js/testing"
],
"tsConfig": "tsconfig.spec.json",
"assets": ["src/favicon.png", "src/assets"],
"styles": ["src/styles.css"],
"assets": [
"src/favicon.png",
"src/assets"
],
"styles": [
"src/styles.css"
],
"scripts": []
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
"lintFilePatterns": [
"src/**/*.ts",
"src/**/*.html"
]
}
}
}
}
},
"cli": {
"schematicCollections": ["@angular-eslint/schematics"],
"schematicCollections": [
"@angular-eslint/schematics"
],
"analytics": false
}
}
3 changes: 2 additions & 1 deletion src/Client/ng-openapi-gen.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"$schema": "node_modules/ng-openapi-gen/ng-openapi-gen-schema.json",
"input": "https://localhost:7045/swagger/v1/swagger.json",
"skipJsonSuffix": true
"skipJsonSuffix": true,
"ignoreUnusedModels": false
}
Loading

0 comments on commit d2d3c2c

Please sign in to comment.