Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge live meeting and other features into main #69

Merged
merged 34 commits into from
Jan 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
66f637f
feat: start implementing live meeting hub
lwestfall Dec 31, 2023
971e8e2
feat: continue live meeting implementation
lwestfall Dec 31, 2023
5a30c6c
Merge branch 'main' into websockets
lwestfall Dec 31, 2023
d0ba1ae
fix: build errors due to signalr issue, use lodash-es
lwestfall Dec 31, 2023
ef83aca
feat: improvements to live meeting
lwestfall Dec 31, 2023
c4823d3
fix: null check before joining meeting
lwestfall Dec 31, 2023
8972279
fix: book card improvements
lwestfall Dec 31, 2023
04ade14
chore(deps): bump the client-dependencies group
dependabot[bot] Jan 1, 2024
c5fb11c
chore: better ci workflows
lwestfall Jan 1, 2024
97c9f72
Merge pull request #52 from lwestfall/dependabot/npm_and_yarn/src/Cli…
lwestfall Jan 1, 2024
6a61434
feat: drag and drop voting (wip with test data)
lwestfall Jan 1, 2024
fab77b7
fix: (temporary) don't leave meeting
lwestfall Jan 1, 2024
8e14904
feat: implement voting (wip)
lwestfall Jan 2, 2024
7c96037
feat: presenter mode, ripple disable
lwestfall Jan 3, 2024
fb56367
feat: several improvements on live meetings
lwestfall Jan 3, 2024
3fa3964
fix: book-card next meeting logic (will change)
lwestfall Jan 3, 2024
73595bf
refactor: meetings state management
lwestfall Jan 4, 2024
1be6a07
chore(deps): bump the client-dependencies group
dependabot[bot] Jan 4, 2024
8eb13df
refactor: lots of things
lwestfall Jan 4, 2024
913c378
Merge branch 'dev' into websockets
lwestfall Jan 4, 2024
58488e2
fix: meeting countdown doesn't calculate until +1s
lwestfall Jan 4, 2024
a79ce56
feat: add qr code, many enhancements
lwestfall Jan 5, 2024
55529f8
Merge pull request #62 from lwestfall/dependabot/npm_and_yarn/src/Cli…
lwestfall Jan 5, 2024
b4df06e
feat: hook up returnUrl if verified
lwestfall Jan 5, 2024
a9a033c
fix: no ripple on closed meeting recommendations, ui fixes
lwestfall Jan 5, 2024
80eac45
feat: unconfirm votes change meeting user state
lwestfall Jan 5, 2024
3886ba0
fix: deterministic ordering of book recommendations
lwestfall Jan 5, 2024
ed8f35b
feat: next meeting create (wip)
lwestfall Jan 5, 2024
57e94b0
chore: fix Move .gitignore from /WebApi to Server/ #63
lwestfall Jan 6, 2024
75758d3
fix: book recommendation in meeting cards
lwestfall Jan 6, 2024
8f24135
feat: create/update/delete meetings, live meeting, meeting cards
lwestfall Jan 6, 2024
aed8228
feat: implement last book rating
lwestfall Jan 6, 2024
6cf7fad
feat: implement charts
lwestfall Jan 7, 2024
6ae37ba
Merge branch 'websockets' into dev
lwestfall Jan 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading