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

NaN percent #825

Closed
wants to merge 35 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
f0bdb60
should now be able to easily run project through devcontainer
anthonyhardman Aug 24, 2023
be12d17
Fixed NaN percent
bridger-thompson Aug 29, 2023
6e43218
Hiding Location and Description from event details if they are null
bridger-thompson Aug 29, 2023
50d9fdc
Fixed nav between 400px and 600px
bridger-thompson Aug 29, 2023
3ccdd29
v2
bridger-thompson Sep 12, 2023
257fa7b
cleanup and bootstrap
bridger-thompson Sep 12, 2023
8b5a88f
navbar
bridger-thompson Sep 14, 2023
c5eba05
Home page
bridger-thompson Sep 14, 2023
0651d9a
home page modals
bridger-thompson Sep 14, 2023
84c9a7a
api cleanup
anthonyhardman Sep 14, 2023
1468a44
Merge branch 'master' of https://github.com/anthonyhardman/project_aspen
anthonyhardman Sep 14, 2023
e27d460
talking to api
bridger-thompson Sep 19, 2023
2d58a8e
prettier home page
bridger-thompson Sep 21, 2023
4462073
moved tests
Stormgate1998 Sep 22, 2023
1acd7e3
Merge branch 'master' of https://github.com/anthonyhardman/project_aspen
Stormgate1998 Sep 22, 2023
e57b660
removed else statement
Stormgate1998 Sep 22, 2023
cb40840
Copied tests to v2 folder, added as api-tests. Old tests are now api-…
Stormgate1998 Sep 28, 2023
2139158
removed most of the entities because they were redundant, and moved t…
Stormgate1998 Sep 28, 2023
422a70f
removed unused code/commented out code
Stormgate1998 Sep 28, 2023
f8ecd37
start on dockerize
anthonyhardman Sep 29, 2023
21613eb
Merge branch 'master' of https://github.com/anthonyhardman/project_aspen
anthonyhardman Sep 29, 2023
c193669
start on dockerize
anthonyhardman Sep 29, 2023
7ee84d7
more dev container work
anthonyhardman Sep 29, 2023
9afd792
more dev container setup
anthonyhardman Sep 29, 2023
641fe4b
Cleaned up unused functions in Repository classes
ewhittaker0024 Oct 3, 2023
a044966
Merge branch 'master' of https://github.com/anthonyhardman/project_aspen
ewhittaker0024 Oct 3, 2023
f71958e
login button start
anthonyhardman Oct 3, 2023
fff999e
Merge branch 'master' of github.com:anthonyhardman/project_aspen
anthonyhardman Oct 3, 2023
5764e2d
Removed unused entity class files.
ewhittaker0024 Oct 3, 2023
5c61118
Merge branch 'master' of https://github.com/anthonyhardman/project_aspen
ewhittaker0024 Oct 3, 2023
4bd22a0
minor changes
Stormgate1998 Oct 4, 2023
d4b7fc8
Merge branch 'master' of https://github.com/anthonyhardman/project_aspen
Stormgate1998 Oct 4, 2023
0ee445b
removed the in between classes for the last time
Stormgate1998 Oct 5, 2023
7cdca74
removed unneeded maps
Stormgate1998 Oct 5, 2023
6cafd03
login "works"
anthonyhardman Oct 6, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
18 changes: 9 additions & 9 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
**/node_modules/
**/bin/
**/obj/
**/Dockerfile
**/.gitignore
**/.dockerignore
**/docker-compose.yml
**/docs/
**/archive/
**/node_modules/
**/bin/
**/obj/
**/Dockerfile
**/.gitignore
**/.dockerignore
**/docker-compose.yml
**/docs/
**/archive/
36 changes: 18 additions & 18 deletions .github/.dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
version: 2
updates:
# --- GitHub Actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"

# --- Front-end
- package-ecosystem: "npm"
directory: "/src/web"
schedule:
interval: "daily"

# --- API
- package-ecosystem: "nuget"
directory: "/src/api"
schedule:
version: 2
updates:
# --- GitHub Actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
# --- Front-end
- package-ecosystem: "npm"
directory: "/src/web"
schedule:
interval: "daily"
# --- API
- package-ecosystem: "nuget"
directory: "/src/api"
schedule:
interval: "daily"
40 changes: 20 additions & 20 deletions .github/workflows/clean-docker.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
name: Clean Docker Files
on:
schedule:
- cron: "0 0 1 * *"
workflow_dispatch:

jobs:
docker-prune:
runs-on: self-hosted
steps:
- name: get free space (before)
run: |
df /
- name: prune
run: |
docker system prune -af
docker volume prune
- name: get free space (after)
run: |
df /
name: Clean Docker Files
on:
schedule:
- cron: "0 0 1 * *"
workflow_dispatch:
jobs:
docker-prune:
runs-on: self-hosted
steps:
- name: get free space (before)
run: |
df /
- name: prune
run: |
docker system prune -af
docker volume prune
- name: get free space (after)
run: |
df /
92 changes: 46 additions & 46 deletions .github/workflows/deploy-staging.yml
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
name: Run Tests (and deploy to staging if not a pull request)
on:
pull_request:
push:
branches:
- master
workflow_dispatch:

jobs:
run-tests:
runs-on: [ubuntu-latest]
steps:
- name: checkout repo
uses: actions/[email protected]


- name: build and test
run: |
cd ops/testing
DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker-compose build --parallel --pull
docker-compose up -d
docker-compose exec -T api_test dotnet test api-tests
docker-compose exec -T web_test npm run test
docker-compose exec -T web_test npm run lint -- --max-warnings 0
docker-compose down

deploy-staging:
runs-on: [self-hosted, primary]
needs: [run-tests]
if: github.event_name != 'pull_request'
steps:
- name: checkout repo
uses: actions/checkout@v2

- name: Update secrets in .env
run: |
cd ops/staging
touch .env
echo "STRIPE_SECRET_KEY=${{secrets.STRIPE__SECRETKEY}}" > .env
echo "STRIPE_WEBHOOK_SECRET=${{secrets.WEBHOOK_SECRET}}" >> .env
cat .env

- name: update staging containers
run: |
cd ops/staging
DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker-compose build --parallel --pull
name: Run Tests (and deploy to staging if not a pull request)
on:
pull_request:
push:
branches:
- master
workflow_dispatch:
jobs:
run-tests:
runs-on: [ubuntu-latest]
steps:
- name: checkout repo
uses: actions/[email protected]
- name: build and test
run: |
cd ops/testing
DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker-compose build --parallel --pull
docker-compose up -d
docker-compose exec -T api_test dotnet test api-tests
docker-compose exec -T web_test npm run test
docker-compose exec -T web_test npm run lint -- --max-warnings 0
docker-compose down
deploy-staging:
runs-on: [self-hosted, primary]
needs: [run-tests]
if: github.event_name != 'pull_request'
steps:
- name: checkout repo
uses: actions/checkout@v2
- name: Update secrets in .env
run: |
cd ops/staging
touch .env
echo "STRIPE_SECRET_KEY=${{secrets.STRIPE__SECRETKEY}}" > .env
echo "STRIPE_WEBHOOK_SECRET=${{secrets.WEBHOOK_SECRET}}" >> .env
cat .env
- name: update staging containers
run: |
cd ops/staging
DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker-compose build --parallel --pull
docker-compose up -d
190 changes: 95 additions & 95 deletions .github/workflows/push-to-dockerhub.yml
Original file line number Diff line number Diff line change
@@ -1,95 +1,95 @@
name: Push to Docker Hub
on:
push:
tags:
- 'v*.*'
workflow_dispatch:

jobs:
run-tests:
runs-on: [ubuntu-latest]
steps:
- name: checkout repo
uses: actions/[email protected]


- name: build and test
run: |
# cd ops/testing
# DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker-compose build --parallel --pull
# docker-compose up -d
# docker-compose exec -T api_test dotnet test api-tests
# docker-compose exec -T web_test npm run test
# docker-compose exec -T web_test npm run lint -- --max-warnings 0
# docker-compose down

build-api:
runs-on: [ubuntu-latest]
needs: [run-tests]
env:
IMAGE_NAME: snowcollege/aspen_api
DOCKERFILE: combined/Dockerfile
DOCKER_BUILDKIT: 1
steps:
- name: checkout repo
uses: actions/checkout@v2

- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: build container
working-directory: src
run: docker build -t ${{ env.IMAGE_NAME }} -f ${{ env.DOCKERFILE }} .

- name: push container
run: docker push ${{ env.IMAGE_NAME }}

build-keycloak:
runs-on: [ubuntu-latest]
needs: [run-tests]
env:
IMAGE_NAME: snowcollege/aspen_keycloak
DOCKERFILE: Dockerfile
DOCKER_BUILDKIT: 1
steps:
- name: checkout repo
uses: actions/checkout@v2

- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: build container
working-directory: dev-resources/keycloak
run: docker build -t ${{ env.IMAGE_NAME }} -f ${{ env.DOCKERFILE }} .

- name: push container
run: docker push ${{ env.IMAGE_NAME }}

build-reverseproxy:
runs-on: [ubuntu-latest]
needs: [run-tests]
env:
IMAGE_NAME: snowcollege/aspen_reverseproxy
DOCKERFILE: ops/staging/reverse-proxy/Dockerfile
DOCKER_BUILDKIT: 1
steps:
- name: checkout repo
uses: actions/checkout@v2

- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: build container
run: docker build -t ${{ env.IMAGE_NAME }} -f ${{ env.DOCKERFILE }} .

- name: push container
run: docker push ${{ env.IMAGE_NAME }}
name: Push to Docker Hub
on:
push:
tags:
- 'v*.*'
workflow_dispatch:
jobs:
run-tests:
runs-on: [ubuntu-latest]
steps:
- name: checkout repo
uses: actions/[email protected]
- name: build and test
run: |
# cd ops/testing
# DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker-compose build --parallel --pull
# docker-compose up -d
# docker-compose exec -T api_test dotnet test api-tests
# docker-compose exec -T web_test npm run test
# docker-compose exec -T web_test npm run lint -- --max-warnings 0
# docker-compose down
build-api:
runs-on: [ubuntu-latest]
needs: [run-tests]
env:
IMAGE_NAME: snowcollege/aspen_api
DOCKERFILE: combined/Dockerfile
DOCKER_BUILDKIT: 1
steps:
- name: checkout repo
uses: actions/checkout@v2
- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: build container
working-directory: src
run: docker build -t ${{ env.IMAGE_NAME }} -f ${{ env.DOCKERFILE }} .
- name: push container
run: docker push ${{ env.IMAGE_NAME }}
build-keycloak:
runs-on: [ubuntu-latest]
needs: [run-tests]
env:
IMAGE_NAME: snowcollege/aspen_keycloak
DOCKERFILE: Dockerfile
DOCKER_BUILDKIT: 1
steps:
- name: checkout repo
uses: actions/checkout@v2
- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: build container
working-directory: dev-resources/keycloak
run: docker build -t ${{ env.IMAGE_NAME }} -f ${{ env.DOCKERFILE }} .
- name: push container
run: docker push ${{ env.IMAGE_NAME }}
build-reverseproxy:
runs-on: [ubuntu-latest]
needs: [run-tests]
env:
IMAGE_NAME: snowcollege/aspen_reverseproxy
DOCKERFILE: ops/staging/reverse-proxy/Dockerfile
DOCKER_BUILDKIT: 1
steps:
- name: checkout repo
uses: actions/checkout@v2
- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: build container
run: docker build -t ${{ env.IMAGE_NAME }} -f ${{ env.DOCKERFILE }} .
- name: push container
run: docker push ${{ env.IMAGE_NAME }}
Loading