diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index d6d1d2e..5f883ae 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -29,14 +29,11 @@ jobs: - name: Install dependencies run: yarn install --immutable - - name: Invoke Quasar extension build - run: yarn dlx @quasar/cli ext invoke @quasar/qcalendar - - name: Create env file - run: echo "${{ vars.ENV_FILE }}" > .env.local + run: echo "${{ vars.ENV_FILE }}" > .env - name: Show env file - run: cat .env.local + run: cat .env - name: Build and Release id: build diff --git a/.gitignore b/.gitignore index 3190332..3d9a23e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,25 +1,32 @@ -.DS_Store -.thumbs.db +# Nuxt dev/build outputs +.output +.data +.nuxt +.nitro +.cache +dist + +# Node dependencies node_modules -# Quasar core related directories -.quasar -/dist -/quasar.config.*.temporary.compiled* +# Logs +logs +*.log -# Cordova related directories and files -/src-cordova/node_modules -/src-cordova/platforms -/src-cordova/plugins -/src-cordova/www +# Misc +.DS_Store +.thumbs.db +.fleet +.idea +*.suo +*.ntvs* +*.njsproj +*.sln -# Capacitor related directories and files -/src-capacitor/www -/src-capacitor/node_modules - -# BEX related directories and files -/src-bex/www -/src-bex/js/core +# Local env files +.env +.env.* +!.env.example # Yarn 4 .yarn/cache @@ -27,26 +34,7 @@ node_modules .yarn/build-state.yml .yarn/install-state.gz -# Log files -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -# Editor directories and files -.idea -*.suo -*.ntvs* -*.njsproj -*.sln - -# local .env files -.env* - -# version file -src/version.ts -VERSION +# Release artifacts release-*.gz CHANGELOG.md - -# Quasar cruft -/quasar.config.*.temporary.compiled* +VERSION diff --git a/.npmrc b/.npmrc deleted file mode 100644 index 32bd84d..0000000 --- a/.npmrc +++ /dev/null @@ -1,3 +0,0 @@ -# pnpm-related options -shamefully-hoist=true -strict-peer-dependencies=false diff --git a/.releaserc.json b/.releaserc.json index ba0fcc9..c450918 100644 --- a/.releaserc.json +++ b/.releaserc.json @@ -13,8 +13,8 @@ [ "@semantic-release/exec", { - "prepareCmd": "npm run generate-version '${nextRelease.version}' && quasar build -m pwa", - "publishCmd": "tar -czvf release-${nextRelease.version}.tar.gz -C dist/pwa . && echo '::set-output name=VERSION::${nextRelease.version}'" + "prepareCmd": "npm run generate-version '${nextRelease.version}' && yarn install --immutable && yarn generate", + "publishCmd": "tar -czvf release-${nextRelease.version}.tar.gz -C .output/public . && echo '::set-output name=VERSION::${nextRelease.version}'" } ], [ diff --git a/app/app.vue b/app/app.vue new file mode 100644 index 0000000..f8eacfa --- /dev/null +++ b/app/app.vue @@ -0,0 +1,5 @@ + diff --git a/src/assets/OYS-Burgee.png b/app/assets/OYS-Burgee.png similarity index 100% rename from src/assets/OYS-Burgee.png rename to app/assets/OYS-Burgee.png diff --git a/src/assets/OYS-Burgee_square.png b/app/assets/OYS-Burgee_square.png similarity index 100% rename from src/assets/OYS-Burgee_square.png rename to app/assets/OYS-Burgee_square.png diff --git a/src/assets/favicon-128x128.png b/app/assets/favicon-128x128.png similarity index 100% rename from src/assets/favicon-128x128.png rename to app/assets/favicon-128x128.png diff --git a/src/assets/favicon-16x16.png b/app/assets/favicon-16x16.png similarity index 100% rename from src/assets/favicon-16x16.png rename to app/assets/favicon-16x16.png diff --git a/src/assets/favicon-32x32.png b/app/assets/favicon-32x32.png similarity index 100% rename from src/assets/favicon-32x32.png rename to app/assets/favicon-32x32.png diff --git a/src/assets/favicon-64x64.png b/app/assets/favicon-64x64.png similarity index 100% rename from src/assets/favicon-64x64.png rename to app/assets/favicon-64x64.png diff --git a/src/assets/favicon-96x96.png b/app/assets/favicon-96x96.png similarity index 100% rename from src/assets/favicon-96x96.png rename to app/assets/favicon-96x96.png diff --git a/src/assets/favicon.ico b/app/assets/favicon.ico similarity index 100% rename from src/assets/favicon.ico rename to app/assets/favicon.ico diff --git a/src/assets/osqqn_logo_only.png b/app/assets/osqqn_logo_only.png similarity index 100% rename from src/assets/osqqn_logo_only.png rename to app/assets/osqqn_logo_only.png diff --git a/src/assets/oys_lighthouse.jpg b/app/assets/oys_lighthouse.jpg similarity index 100% rename from src/assets/oys_lighthouse.jpg rename to app/assets/oys_lighthouse.jpg diff --git a/src/assets/oys_lighthouse_modern.jpg b/app/assets/oys_lighthouse_modern.jpg similarity index 100% rename from src/assets/oys_lighthouse_modern.jpg rename to app/assets/oys_lighthouse_modern.jpg diff --git a/src/assets/oysqn_logo.png b/app/assets/oysqn_logo.png similarity index 100% rename from src/assets/oysqn_logo.png rename to app/assets/oysqn_logo.png diff --git a/src/assets/oysqn_logo_only.png b/app/assets/oysqn_logo_only.png similarity index 100% rename from src/assets/oysqn_logo_only.png rename to app/assets/oysqn_logo_only.png diff --git a/src/assets/oysqn_logo_only_bordered.png b/app/assets/oysqn_logo_only_bordered.png similarity index 100% rename from src/assets/oysqn_logo_only_bordered.png rename to app/assets/oysqn_logo_only_bordered.png diff --git a/src/assets/quasar-logo-vertical.svg b/app/assets/quasar-logo-vertical.svg similarity index 100% rename from src/assets/quasar-logo-vertical.svg rename to app/assets/quasar-logo-vertical.svg diff --git a/src/components/BoatReservationComponent.vue b/app/components/BoatReservationComponent.vue similarity index 66% rename from src/components/BoatReservationComponent.vue rename to app/components/BoatReservationComponent.vue index 0c7ed23..d772c42 100644 --- a/src/components/BoatReservationComponent.vue +++ b/app/components/BoatReservationComponent.vue @@ -1,141 +1,13 @@ - - + + diff --git a/app/components/BottomNavComponent.vue b/app/components/BottomNavComponent.vue new file mode 100644 index 0000000..be9830e --- /dev/null +++ b/app/components/BottomNavComponent.vue @@ -0,0 +1,8 @@ + + + diff --git a/app/components/CertificationComponent.vue b/app/components/CertificationComponent.vue new file mode 100644 index 0000000..2e0d59b --- /dev/null +++ b/app/components/CertificationComponent.vue @@ -0,0 +1,35 @@ + + + diff --git a/src/components/LeftDrawer.vue b/app/components/LeftDrawer.vue similarity index 65% rename from src/components/LeftDrawer.vue rename to app/components/LeftDrawer.vue index 7a8f18c..fed30e2 100644 --- a/src/components/LeftDrawer.vue +++ b/app/components/LeftDrawer.vue @@ -1,79 +1,14 @@ - - + + - - diff --git a/app/pages/privacy-policy.vue b/app/pages/privacy-policy.vue new file mode 100644 index 0000000..eac9514 --- /dev/null +++ b/app/pages/privacy-policy.vue @@ -0,0 +1,43 @@ + + + diff --git a/src/pages/ProfilePage.vue b/app/pages/profile.vue similarity index 70% rename from src/pages/ProfilePage.vue rename to app/pages/profile.vue index 07e2350..7700a3a 100644 --- a/src/pages/ProfilePage.vue +++ b/app/pages/profile.vue @@ -1,7 +1,28 @@ + + - - diff --git a/app/pages/pwreset.vue b/app/pages/pwreset.vue new file mode 100644 index 0000000..85c6ed9 --- /dev/null +++ b/app/pages/pwreset.vue @@ -0,0 +1,38 @@ + + + + + diff --git a/app/pages/reference.vue b/app/pages/reference.vue new file mode 100644 index 0000000..633eab9 --- /dev/null +++ b/app/pages/reference.vue @@ -0,0 +1,7 @@ + + + diff --git a/app/pages/reference/index.vue b/app/pages/reference/index.vue new file mode 100644 index 0000000..104ce30 --- /dev/null +++ b/app/pages/reference/index.vue @@ -0,0 +1,13 @@ + + + diff --git a/src/pages/reference/ReferenceItemPage.vue b/app/pages/reference/reference/[id]/view.vue similarity index 74% rename from src/pages/reference/ReferenceItemPage.vue rename to app/pages/reference/reference/[id]/view.vue index 0871420..4b4f088 100644 --- a/src/pages/reference/ReferenceItemPage.vue +++ b/app/pages/reference/reference/[id]/view.vue @@ -4,8 +4,7 @@ + src="https://www.youtube.com/embed/GMHMLDlkKcE" /> diff --git a/src/pages/admin/UserAdminPage.vue b/app/pages/schedule.vue similarity index 52% rename from src/pages/admin/UserAdminPage.vue rename to app/pages/schedule.vue index 1675e69..b7fc2e1 100644 --- a/src/pages/admin/UserAdminPage.vue +++ b/app/pages/schedule.vue @@ -1,8 +1,7 @@ - - + + diff --git a/src/pages/schedule/BoatReservationPage.vue b/app/pages/schedule/book.vue similarity index 54% rename from src/pages/schedule/BoatReservationPage.vue rename to app/pages/schedule/book.vue index 921ff1a..b0d5d55 100644 --- a/src/pages/schedule/BoatReservationPage.vue +++ b/app/pages/schedule/book.vue @@ -1,22 +1,15 @@ - - + + diff --git a/src/pages/schedule/ModifyBoatReservation.vue b/app/pages/schedule/edit/[id].vue similarity index 52% rename from src/pages/schedule/ModifyBoatReservation.vue rename to app/pages/schedule/edit/[id].vue index c02ed76..5d50b5a 100644 --- a/src/pages/schedule/ModifyBoatReservation.vue +++ b/app/pages/schedule/edit/[id].vue @@ -1,20 +1,20 @@ + + - - diff --git a/src/pages/schedule/ScheduleIndexPage.vue b/app/pages/schedule/index.vue similarity index 59% rename from src/pages/schedule/ScheduleIndexPage.vue rename to app/pages/schedule/index.vue index 3dacd6b..5de41ce 100644 --- a/src/pages/schedule/ScheduleIndexPage.vue +++ b/app/pages/schedule/index.vue @@ -1,8 +1,13 @@ + + - - diff --git a/app/pages/schedule/list.vue b/app/pages/schedule/list.vue new file mode 100644 index 0000000..63cdf12 --- /dev/null +++ b/app/pages/schedule/list.vue @@ -0,0 +1,55 @@ + + + diff --git a/src/pages/schedule/ManageCalendar.vue b/app/pages/schedule/manage.vue similarity index 57% rename from src/pages/schedule/ManageCalendar.vue rename to app/pages/schedule/manage.vue index 910f1cb..1c56d3c 100644 --- a/src/pages/schedule/ManageCalendar.vue +++ b/app/pages/schedule/manage.vue @@ -1,178 +1,21 @@ - - + + diff --git a/src/pages/schedule/BoatScheduleView.vue b/app/pages/schedule/view.vue similarity index 59% rename from src/pages/schedule/BoatScheduleView.vue rename to app/pages/schedule/view.vue index d528dfb..a3e25a4 100644 --- a/src/pages/schedule/BoatScheduleView.vue +++ b/app/pages/schedule/view.vue @@ -1,10 +1,71 @@ + +