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

Added basic theme #85

Merged
merged 78 commits into from
Dec 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
885c951
Implemented stripe integration
CodeNamedRobin Oct 15, 2023
0e60064
Merge branch 'main' into feature/stripe-integration
CodeNamedRobin Oct 21, 2023
9484ffe
Updated keys in .env-example
CodeNamedRobin Oct 21, 2023
3a628f7
Night commit
BHenkemans Oct 22, 2023
878063f
tmp commit
BHenkemans Dec 2, 2023
31fd6db
Another temporary push
BHenkemans Dec 2, 2023
e25bf6e
Merged main into branch
BHenkemans Dec 2, 2023
b0735df
Some small fixes
CodeNamedRobin Dec 6, 2023
79dd5bf
Merged main into feature/transaction-table
CodeNamedRobin Dec 6, 2023
ca9d50b
Some type-check fixes
CodeNamedRobin Dec 6, 2023
018fd4e
Even more type-check fixes
CodeNamedRobin Dec 6, 2023
955154e
Another day, another type-check fix commit
CodeNamedRobin Dec 8, 2023
a6a2bcd
Started working on implementation of mutationtablecomponent in existi…
CodeNamedRobin Dec 11, 2023
ab19d89
Implemented transaction table in POSInfoView
CodeNamedRobin Dec 11, 2023
f4f20d3
Fixed transactions on SingleUserView
CodeNamedRobin Dec 11, 2023
1747f97
Fixed lint issues
CodeNamedRobin Dec 11, 2023
e4ec9a7
Added description of fines
CodeNamedRobin Dec 11, 2023
3839e3e
Updated packages
CodeNamedRobin Dec 11, 2023
a97773e
Merge origin/main into feature/stripe-integration
CodeNamedRobin Dec 11, 2023
73d55ac
Fixed payments
CodeNamedRobin Dec 11, 2023
b5c1e45
Added minimum payment value of 5 euros, as per ToS
CodeNamedRobin Dec 11, 2023
d1b5a9a
Merge main into feature/transaction-table
CodeNamedRobin Dec 11, 2023
2ff1ee4
Fixed one little small thing
CodeNamedRobin Dec 11, 2023
7b40315
Some small fixes
CodeNamedRobin Dec 11, 2023
ef49dfc
Merge origin/main into feature/stripe-integration
CodeNamedRobin Dec 11, 2023
27aab5f
Fixed stripe payments
CodeNamedRobin Dec 11, 2023
8437690
Fixed stripe payments
CodeNamedRobin Dec 11, 2023
e799c3d
Merge branch 'main' into feature/stripe-integration
CodeNamedRobin Dec 11, 2023
cb8f35d
Added pagination to mutation tables
CodeNamedRobin Dec 12, 2023
377a72c
Fixed minimum topup
CodeNamedRobin Dec 12, 2023
2e226d3
Fixed some type-check issues
CodeNamedRobin Dec 12, 2023
ea4fbcc
Code cleanup
CodeNamedRobin Dec 12, 2023
28dd7b9
Merge branch 'main' into feature/transaction-table
CodeNamedRobin Dec 12, 2023
3d645d2
Added theme basic and remove severity="danger"
SuperVK Dec 12, 2023
a4cbb9c
Small improvements to the styling of the topup modal and localization.
JustSamuel Dec 12, 2023
0c377fd
Updated tags in docker.yml
CodeNamedRobin Dec 12, 2023
c2d7e46
Fixed column width. Fixed modal draggable + closing. Fixed row event.
JustSamuel Dec 12, 2023
2dcafa0
Changed local to dutch since that is what we seem to use? Also fixed …
JustSamuel Dec 12, 2023
e3a1312
Fixed passing extraneous non-props attributes.
JustSamuel Dec 12, 2023
0498cb7
Removed unused file.
BHenkemans Dec 12, 2023
8ca1d52
Fixed HomeView.vue en App.vue to use primeflex
JustSamuel Dec 12, 2023
4334141
Merge branch 'develop' into feature/transaction-table
BHenkemans Dec 12, 2023
69397e3
Fixed BalanceView.vue css
JustSamuel Dec 12, 2023
3204386
Removed css except for primevue styling
JustSamuel Dec 12, 2023
faba2a3
Fixed PasswordResetView.vue css
JustSamuel Dec 12, 2023
04f2ffe
Implemented stripe integration
CodeNamedRobin Oct 15, 2023
76ef2ba
Updated keys in .env-example
CodeNamedRobin Oct 21, 2023
291d44a
Updated packages
CodeNamedRobin Dec 11, 2023
20e00ca
Fixed payments
CodeNamedRobin Dec 11, 2023
837e7cb
Added minimum payment value of 5 euros, as per ToS
CodeNamedRobin Dec 11, 2023
516fab5
Fixed stripe payments
CodeNamedRobin Dec 11, 2023
871be69
Fixed stripe payments
CodeNamedRobin Dec 11, 2023
4c24fa7
Fixed minimum topup
CodeNamedRobin Dec 12, 2023
032781a
Small improvements to the styling of the topup modal and localization.
JustSamuel Dec 12, 2023
fecf46d
Replaced card action for button on top up page.
BHenkemans Dec 12, 2023
db51a29
Merge remote-tracking branch 'GEWIS/feature/stripe-integration' into …
JustSamuel Dec 12, 2023
d91f42e
Fix GH-89
BHenkemans Dec 12, 2023
8494016
Fixed GH-90
BHenkemans Dec 12, 2023
0a124b6
Added Dutch translations and fixed typo to fix GH-90
BHenkemans Dec 12, 2023
286e65c
Almost finished putting all style into the SASS files
CodeNamedRobin Dec 23, 2023
c72ed3d
Fixed navbar colors, only needing to do hover transitions
CodeNamedRobin Dec 23, 2023
287f6b6
Removed final bit of selfmade css from TopNavbar.vue
CodeNamedRobin Dec 23, 2023
76c8387
Fixed navigation bar on mobile
CodeNamedRobin Dec 24, 2023
82a0d48
Started work on mobile view for HomeView.vue
CodeNamedRobin Dec 24, 2023
ebebcec
Moved all styling of CardComponent to inline classes and PrimeVue the…
CodeNamedRobin Dec 24, 2023
071f7a6
Added theme basic and remove severity="danger"
SuperVK Dec 12, 2023
06a4d6b
Fixed HomeView.vue en App.vue to use primeflex
JustSamuel Dec 12, 2023
5870944
Fixed BalanceView.vue css
JustSamuel Dec 12, 2023
c231e7d
Removed css except for primevue styling
JustSamuel Dec 12, 2023
1b17f9d
Fixed PasswordResetView.vue css
JustSamuel Dec 12, 2023
8987489
Almost finished putting all style into the SASS files
CodeNamedRobin Dec 23, 2023
d92b49d
Fixed navbar colors, only needing to do hover transitions
CodeNamedRobin Dec 23, 2023
4c337f1
Removed final bit of selfmade css from TopNavbar.vue
CodeNamedRobin Dec 23, 2023
74ef936
Fixed navigation bar on mobile
CodeNamedRobin Dec 24, 2023
93f7fdd
Started work on mobile view for HomeView.vue
CodeNamedRobin Dec 24, 2023
812a93e
Moved all styling of CardComponent to inline classes and PrimeVue the…
CodeNamedRobin Dec 24, 2023
44f7cab
Updated everything to develop
CodeNamedRobin Dec 24, 2023
2788c51
Added MutationsTableComponent styling to sass files
CodeNamedRobin Dec 24, 2023
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-example
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ VITE_LIVE_APP_API_BASE='https://sudosos.test.gewis.nl/api/v1'
VITE_LIVE_IMAGE_BASE='https://sudosos.test.gewis.nl/static/'
VITE_APP_IMAGE_BASE='https://sudosos.test.gewis.nl/static/'
VITE_APP_GEWIS_TOKEN=sudosos-dev
VITE_APP_STRIPE_PUBLISHABLE_KEY='pk_test_51GsQ83CTbnWP3CTYRobkOgrA4EjkHqvAN6FpDCccxfXayLzj4prFU0GeMIefYW0pvdwXuXqpmqJVLnf6bUyvNJ2T009bK0Sn1L'
VITE_APP_STRIPE_RETURN_URL='http://localhost:5173/'
23 changes: 12 additions & 11 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Docker

on:
push:
branches: [ main ]
branches: [ main, develop ]
pull_request:
branches: [ main ]
branches: [ main, develop ]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -23,18 +23,17 @@ jobs:

- name: Set up environment - main
env:
ENV_FILE: ${{ secrets.ENV_FILE_DEVELOPMENT }}
# ENV_FILE: ${{ secrets.ENV_FILE_PRODUCTION }}
ENV_FILE: ${{ secrets.ENV_FILE_PRODUCTION }}
if: github.ref == 'refs/heads/main'
run: |
echo "${ENV_FILE}" > .env

#- name: Set up environment - develop
# env:
# ENV_FILE: ${{ secrets.ENV_FILE_DEVELOPMENT }}
# if: github.ref != 'refs/heads/main'
# run: |
# echo "${ENV_FILE}" > .env
- name: Set up environment - develop
env:
ENV_FILE: ${{ secrets.ENV_FILE_DEVELOPMENT }}
if: github.ref != 'refs/heads/main'
run: |
echo "${ENV_FILE}" > .env

- name: Get Docker meta (for tags)
id: meta
Expand All @@ -45,7 +44,9 @@ jobs:
${{ vars.DOCKER_REGISTRY }}/${{ vars.DOCKER_TAG }}
# generate Docker tags based on the following events/attributes
tags: |
type=raw,value=vue3
type=ref,prefix=vue3-,event=branch
type=ref,prefix=vue3-,event=pr
type=semver,prefix=vue3-,pattern={{version}}

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
Expand Down
Loading