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

General Improvements Work #58

Merged
merged 32 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
39324c2
feat: begin work on display content - displays and media, add mailhog…
cooperj Dec 19, 2024
73a0024
feat: create react router (remix) version
cooperj Dec 19, 2024
1d0356e
feat: added login page back to the new admin app
cooperj Jan 6, 2025
c609db1
chore: del new admin
cooperj Jan 25, 2025
e295508
fix: add mailhog and unauthed email
cooperj Jan 25, 2025
bb1057a
feat: make the emails look prettier
cooperj Jan 25, 2025
ce81cf1
feat: add mail queue to prevent auto failures
cooperj Jan 25, 2025
cde68da
feat: add mail queue to prevent auto failures, resolves #50
cooperj Jan 25, 2025
0d89015
Merge branch 'josh-develop' of github.com:SoCSTech/asgard into josh-d…
cooperj Jan 25, 2025
cc5ccd6
feat: add campaign and carousel database tables with necessary constr…
cooperj Jan 27, 2025
cd8ea27
feat: add support session type
cooperj Jan 27, 2025
069119c
feat: begin work on display content - displays and media, add mailhog…
cooperj Dec 19, 2024
dc58804
feat: create react router (remix) version
cooperj Dec 19, 2024
21a808e
feat: added login page back to the new admin app
cooperj Jan 6, 2025
7e6c454
chore: del new admin
cooperj Jan 25, 2025
eb16c24
fix: add mailhog and unauthed email
cooperj Jan 25, 2025
aa51be3
feat: make the emails look prettier
cooperj Jan 25, 2025
9ec6559
feat: add mail queue to prevent auto failures, resolves #50
cooperj Jan 25, 2025
1e9e1de
feat: add campaign and carousel database tables with necessary constr…
cooperj Jan 27, 2025
9655457
feat: add support session type
cooperj Jan 27, 2025
3f03285
chore: bump time to wait to 20s from 5s when retrying emails
cooperj Jan 28, 2025
cbf032a
chore: bump time to wait to 20s from 5s when retrying emails
cooperj Jan 28, 2025
1216ede
chore: Merge branch 'main' into josh-develop
cooperj Jan 28, 2025
09c6676
feat: add basic totp login to the api
cooperj Jan 30, 2025
e6c911a
feat: add jest configuration and tests for authentication
cooperj Jan 30, 2025
61f5168
fix: set working dir for api-test action
cooperj Jan 30, 2025
e0af323
ci: prevent runs unless actual changes - or manual dispatch
cooperj Jan 30, 2025
787d619
fix: remove hard coded totp secret, check user has both secret and to…
cooperj Jan 31, 2025
3f89f88
fix: set default event name to "Busy" if no title is provided
cooperj Feb 3, 2025
2e97bcf
feat: add 2fa support
cooperj Feb 3, 2025
a0fd2b2
feat: add basic 2fa support to admin panel
cooperj Feb 3, 2025
95a3f40
chore: move colours file and remove warning from jobs docker file
cooperj Feb 3, 2025
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
5 changes: 5 additions & 0 deletions .github/workflows/build-docker-admin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,14 @@ on:
push:
branches:
- main
paths:
- admin/**
pull_request:
branches:
- main
paths:
- admin/**
workflow_dispatch:

jobs:
admin-build:
Expand Down
27 changes: 27 additions & 0 deletions .github/workflows/build-docker-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,40 @@ on:
push:
branches:
- main
paths:
- api/**
pull_request:
branches:
- main
paths:
- api/**
workflow_dispatch:

jobs:
api-test:
runs-on: ubuntu-latest
defaults:
run:
working-directory: api

steps:
- name: Checkout repository
uses: actions/checkout@v4

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

- name: Install Node Modules
run: npm ci

- name: Run Jest
run: npm test

api-build:
runs-on: ubuntu-latest
needs: api-test

steps:
- name: Checkout repository
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/build-docker-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,14 @@ on:
push:
branches:
- main
paths:
- jobs/**
pull_request:
branches:
- main
paths:
- jobs/**
workflow_dispatch:

jobs:
jobs-build:
Expand Down
Loading