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

Fully Implement Nuxt UI to Replace Jinja Templates #120

Merged
merged 48 commits into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
69c8c59
add initial design for login page, add auth middleware for redirects,…
fisher60 Jun 12, 2024
c0c4a14
move abandonauth backend ui login to use new UI, add working UI butto…
fisher60 Jun 12, 2024
a24cd29
add dashboard layout with navbar, add logout logic
fisher60 Jun 13, 2024
ff3d514
add discord and github colors to login buttons
fisher60 Jun 14, 2024
32de26b
use custom button instead of daisy
fisher60 Jun 14, 2024
f69cd37
add component for links in navbar
fisher60 Jun 14, 2024
5969ca8
add abandontech logo to login screen
fisher60 Jun 14, 2024
6171712
add error message badges to login page
fisher60 Jun 14, 2024
0f57c48
minor style tweaks for navlinks and dashboard
fisher60 Jun 14, 2024
184e3ac
tweak navlink button sizes
fisher60 Jun 15, 2024
b72ae84
add username and user id to index page
fisher60 Jun 15, 2024
daa03bc
add developer application list page, add placeholder for developer ap…
fisher60 Jun 15, 2024
2746906
add developer application detail page list callback URIs, tweak dev a…
fisher60 Jun 15, 2024
4637d61
add cors config to abandon auth backend, configure cors rules for pro…
fisher60 Jun 15, 2024
4d77552
add deleting callback_uris on developer application
fisher60 Jun 15, 2024
47bbb0a
add create application UI, minor style tweaks.
fisher60 Jun 16, 2024
1e680a4
add create callback URI ui
fisher60 Jun 16, 2024
6bb51d0
add delete application UI
fisher60 Jun 16, 2024
d28764f
add reset token ui for developer app
fisher60 Jun 16, 2024
b225b29
minor style tweaks to dev app modals
fisher60 Jun 16, 2024
1c25435
run pre-commit to add missing newlines
fisher60 Jun 16, 2024
5ef09cb
use correct prop definitions for login button component
fisher60 Jun 16, 2024
fff4de3
use correct string typing for navlink props
fisher60 Jun 16, 2024
dc7b798
refactor new uri array creation to include new uri
fisher60 Jun 16, 2024
6dbfbf4
use 'URI instead of 'Uri' for user-facing references
fisher60 Jun 16, 2024
fea4bf8
use mono font for application token fields
fisher60 Jun 16, 2024
f15c90c
left align application detail page
fisher60 Jun 16, 2024
e694b50
fix typing on CopyString props, add some logical line breaks
fisher60 Jun 16, 2024
7211ae4
use shorthand for ternary expression
fisher60 Jun 16, 2024
dd88af2
change style on delete and reset token modals to use btn-error on del…
fisher60 Jun 17, 2024
212de0d
refactor entire project to mono-repo format
fisher60 Jun 17, 2024
af37f14
move pre-commit config to proper directory
fisher60 Jun 18, 2024
8f2dc8d
refactor file paths for infra and dev files
fisher60 Jun 18, 2024
f906ed8
Adjust workflows to use new mono repo structure
fisher60 Jun 18, 2024
71ad9e4
remove all UI logic from fastapi backend
fisher60 Jun 18, 2024
b8f7502
add whitespace to Dockerfile
fisher60 Jun 18, 2024
ce710be
fix syntax error in pull_request.yml, add whitespace to build_fronten…
fisher60 Jun 18, 2024
9e35e0b
only run pre-commit in backend files in workflow
fisher60 Jun 18, 2024
356eb6d
ignore trailing comma rule in ruff
fisher60 Jun 18, 2024
9b56670
auto format imports with ruff
fisher60 Jun 18, 2024
4728421
specify sub dir for pre-commit to run
fisher60 Jun 18, 2024
9345990
remove Dockerfile path config from build_api workflow
fisher60 Jun 18, 2024
aecc094
Bump node version in Dockerfile to fix github workflow build error
fisher60 Jun 18, 2024
ec20b38
move .gitignore to correct location
fisher60 Jun 18, 2024
5771ac5
remove .idea from repo
fisher60 Jun 18, 2024
5adcb1c
remove unused base url in services
fisher60 Jun 18, 2024
63ead35
add dockerignore for .env in website
fisher60 Jun 18, 2024
760008f
remove redundant `environment` key, use key/value syntax instead of l…
fisher60 Jun 18, 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
2 changes: 2 additions & 0 deletions .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ JWT_HASHING_ALGO=HS512
JWT_EXPIRES_IN_SECONDS_LONG_LIVED=2592000
JWT_EXPIRES_IN_SECONDS_SHORT_LIVED=120

ABANDON_AUTH_SITE_URL=http://localhost:3000

ABANDON_AUTH_DISCORD_REDIRECT=
ABANDON_AUTH_DISCORD_CALLBACK='http://localhost:8000/ui/discord-callback'
ABANDON_AUTH_DEVELOPER_APP_ID=
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build
name: Build Api

on:
workflow_call:
Expand Down Expand Up @@ -42,9 +42,8 @@ jobs:
- name: Build and push
uses: docker/build-push-action@v5
with:
context: .
file: ./Dockerfile
context: src/api
push: ${{ inputs.push }}
tags: |
ghcr.io/abandontech/abandonauth:${{ steps.sha_tag.outputs.tag }}
${{ inputs.latest && 'ghcr.io/abandontech/abandonauth:latest' || '' }}
ghcr.io/abandontech/abandonauth-api:${{ steps.sha_tag.outputs.tag }}
${{ inputs.latest && 'ghcr.io/abandontech/abandonauth-api:latest' || '' }}
53 changes: 53 additions & 0 deletions .github/workflows/build_frontend.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Build Frontend

on:
workflow_call:
inputs:
latest:
description: "If the container should be tagged as latest."
type: boolean
required: false
default: false
push:
description: "If the built container should be pushed."
type: boolean
required: false
default: false

jobs:
build:
name: Build docker image
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Login to Github Container Registry
if: ${{ inputs.push }}
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Create SHA Container Tag
id: sha_tag
run: |
tag=$(cut -c 1-7 <<< $GITHUB_SHA)
echo "::set-output name=tag::$tag"
- name: Build and push
uses: docker/build-push-action@v3
with:
context: src/website
build-args: |
ABANDON_AUTH_URL=https://auth-api.abandontech.cloud
ABANDON_AUTH_DEVELOPER_APP_ID=cd022be1-35af-4248-8d70-4205ed1c20c6
GITHUB_REDIRECT=https://github.com/login/oauth/authorize?client_id=e2e4eac6e97af84d9f69&redirect_uri=https://auth-api.abandontech.cloud/ui/github-callback&scope=user:email
DISCORD_REDIRECT=https://discord.com/api/oauth2/authorize?client_id=1002962140640067725&redirect_uri=https%3A%2F%2Fauth-api.abandontech.cloud%2Fui%2Fdiscord-callback&response_type=code&scope=identify
push: ${{ inputs.push }}
tags: |
ghcr.io/abandontech/abandonauth-frontend:${{ steps.sha_tag.outputs.tag }}
${{ inputs.latest && 'ghcr.io/abandontech/abandonauth-frontend:latest' || '' }}
5 changes: 4 additions & 1 deletion .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,15 @@ jobs:
- name: Install Python Dependencies
uses: HassanAbouelela/actions/setup-python@setup-python_v1.5.0
with:
working_dir: src/api
python_version: "3.11"
install_args: "--with=dev"

- name: Run pre-commit hooks
run: SKIP=ruff-lint pre-commit run --all-files
working-directory: src/api
run: SKIP=ruff-lint pre-commit run --files src/api

# Run `ruff` using github formatting to enable automatic inline annotations.
- name: Run ruff
working-directory: src/api
run: "ruff check --output-format=github ."
12 changes: 10 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,16 @@ jobs:
linting:
uses: ./.github/workflows/linting.yml

build:
uses: ./.github/workflows/build.yml
build_api:
uses: ./.github/workflows/build_api.yml
needs:
- linting
with:
latest: true
push: true

build_frontend:
uses: ./.github/workflows/build_frontend.yml
needs:
- linting
with:
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@ jobs:
linting:
uses: ./.github/workflows/linting.yml

build-deploy:
uses: ./.github/workflows/build.yml
build_api:
uses: ./.github/workflows/build_api.yml
needs:
- linting

build_frontend:
uses: ./.github/workflows/build_frontend.yml
needs:
- linting
66 changes: 0 additions & 66 deletions abandonauth/dependencies/services.py

This file was deleted.

Loading
Loading