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

[View] Make a request form with Nuxt3 (mega PR) #61

Merged
merged 31 commits into from
Jan 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
170119a
Update README.md title date
delano Jan 24, 2024
0d1ed5e
Add add-issue-number hook to pre-commit-config.yaml
delano Jan 24, 2024
789f1ac
Arbitrary commit
delano Jan 24, 2024
5ba646d
Arbitrary commit
delano Jan 24, 2024
ef0b4da
Update pre-commit hook to add message issue prefix
delano Jan 24, 2024
f721d9a
[NOJIRA] Update README.md with new version number
delano Jan 24, 2024
1f6d54f
[NOJIRA] [NOJIRA] Add new pre-commit hooks
delano Jan 25, 2024
f3d5bf5
[#38] Update add-msg-issue-prefix hook name
delano Jan 25, 2024
39d82df
[#38] Fixed indentation 4->2
delano Jan 25, 2024
c7b0aa9
[#38] Fixed indentation w/ Copilot
delano Jan 25, 2024
4d753e5
[#38] Fix indents
delano Jan 25, 2024
d36574f
[#38] Implemented complete form structure for new requests
delano Jan 25, 2024
79d58ae
[#56] Renamed apps/ui to apps/ui-vue3
delano Jan 25, 2024
70a33d6
[#56] Renamed apps/ui to apps/ui-vue3
delano Jan 25, 2024
c8c29b5
[#56] Added docker configs
delano Jan 26, 2024
7212632
[#56] Added nuxt3 ui base
delano Jan 26, 2024
45286f1
[#56] Added pinia for storage
delano Jan 26, 2024
562256b
[#56] Run nuxt app on all interfaces
delano Jan 26, 2024
cb9bfe2
[#56] Add authjs dep
delano Jan 27, 2024
dbc9ce5
Revert "[#56] Add authjs dep"
delano Jan 27, 2024
6d87487
[#56] Add .prettierrc file with formatting configurations
delano Jan 27, 2024
e2432fb
[#56] Readme updates
delano Jan 30, 2024
b3cad08
[#56] Integrate SuperTokens for authentication
delano Jan 30, 2024
a9132ff
[#57] Refactor auth system to use Zitadel
delano Jan 30, 2024
86fb14d
[#57] Update trunk version and dependencies
delano Jan 31, 2024
49857b5
[#57] Add runtime config and access in login form
delano Jan 31, 2024
034d13c
Merge pull request #58 from AnimalFoodBank/feature/57-auth
delano Jan 31, 2024
86e5bcc
Merge pull request #59 from AnimalFoodBank:feature/57-auth
delano Jan 31, 2024
f942fd9
[#56] Remove vue3 images and config files
delano Jan 31, 2024
6fca57d
[#56] Place nuxt3 files and configs at ui/
delano Jan 31, 2024
75a64bb
Merge pull request #60 from AnimalFoodBank/feature/56-nuxt3
delano Jan 31, 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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Created by https://www.gitignore.io
# Originally created by https://www.gitignore.io

apps/.examples

### OSX ###
.DS_Store
Expand Down
32 changes: 27 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,48 @@
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
#
# To use pre-commit, install it using pip:
# Install pre-commit:
#
# pip install pre-commit
#
# Then, run it on all the files in this repo:
# Run it on all the files in this repo:
#
# pre-commit run --all-files
#
# Updating plugin repositories:
#
# pre-commit autoupdate
#
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.2.0
rev: v4.5.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
- id: detect-private-key
- id: mixed-line-ending
- id: check-added-large-files
args: ['--maxkb=1000']
args: ["--maxkb=1000"]
- id: no-commit-to-branch
args: ["--branch", "main", "--branch", "release/.*"]
- id: check-merge-conflict
- id: forbid-submodules

- repo: https://github.com/psf/black
rev: 22.10.0
rev: 23.12.1
hooks:
- id: black
language_version: python3.11

- repo: https://github.com/avilaton/add-msg-issue-prefix-hook
rev: v0.0.9
hooks:
- id: add-msg-issue-prefix
name: Link commit to Github issue
args:
- "--default=[NOJIRA]"
- "--pattern=[a-zA-Z0-9]{0,10}-?[0-9]{1,5}"
- "--template=[#{}]"
- "--insert-after"
- "^feat.?:|^fix.?:"
1 change: 1 addition & 0 deletions .trunk/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
plugins
user_trunk.yaml
user.yaml
tmp
2 changes: 1 addition & 1 deletion .trunk/configs/.yamllint.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
rules:
quoted-strings:
required: only-when-needed
required: consistent
extra-allowed: ["{|}"]
empty-values:
forbid-in-block-mappings: true
Expand Down
20 changes: 10 additions & 10 deletions .trunk/trunk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
# To learn more about the format of this file, see https://docs.trunk.io/reference/trunk-yaml
version: 0.1
cli:
version: 1.18.0
version: 1.19.0
plugins:
sources:
- id: trunk
ref: v1.3.0
ref: v1.4.2
uri: https://github.com/trunk-io/plugins
runtimes:
enabled:
Expand All @@ -20,15 +20,15 @@ lint:
- [email protected]
- [email protected]
- [email protected]
- [email protected].5
- [email protected].9
- [email protected].7
- [email protected].70
- git-diff-check
- markdownlint@0.37.0
- osv-scanner@1.5.0
- prettier@3.1.0
- [email protected].7
- [email protected].0
- trufflehog@3.63.2
- markdownlint@0.38.0
- osv-scanner@1.6.1
- prettier@3.2.4
- [email protected].14
- [email protected].3
- trufflehog@3.64.0
- [email protected]
disabled:
- black
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- trunk-ignore(markdownlint/MD014) -->

# afb-requests -- 2023-09-21
# AFB Requests -- 2024-01-24 (ALPHA)


## UI
Expand Down
4 changes: 3 additions & 1 deletion apps/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@

# AFB Request Manager
# AFB Requests

* `auth/` - Zitadel auth server
* See further instructions in the [Zitadel docs](https://docs.zitadel.ch/docs/installation/installation)
* `api/` - A Django application running the REST API.
* `ui/` - A Vite+Vue+Tailwind application for the frontend UI.
* `vvs/` - A Vueform+Vite+Tailwind via [cloned starter repo](https://github.com/vueform/vite-starter#installation)
Expand Down
27 changes: 0 additions & 27 deletions apps/afb_requests/.editorconfig

This file was deleted.

1 change: 0 additions & 1 deletion apps/afb_requests/.gitattributes

This file was deleted.

20 changes: 0 additions & 20 deletions apps/afb_requests/.github/dependabot.yml

This file was deleted.

71 changes: 0 additions & 71 deletions apps/afb_requests/.github/workflows/ci.yml

This file was deleted.

Loading
Loading