refactor: Redo env var names to work with vite. Add version

.env.production

@@ -1,2 +1,2 @@
-APPWRITE_API_ENDPOINT='https://appwrite.oys.undock.ca/v1'
+VITE_APPWRITE_API_ENDPOINT='https://appwrite.oys.undock.ca/v1'
-APPWRITE_API_PROJECT='bab'
+VITE_APPWRITE_API_PROJECT='bab'

README.md

@@ -41,3 +41,7 @@ quasar build
 ### Customize the configuration
 
 See [Configuring quasar.config.js](https://v2.quasar.dev/quasar-cli-vite/quasar-config-js).
+
+### TODO
+
+https://github.com/semantic-release/semantic-release

nohup.out

@@ -0,0 +1,36 @@
+2024-06-06 07:42:15,841 - vorta.i18n - DEBUG - Loading translation failed for ['en-CA', 'en-Latn-CA'].
+QObject::connect: No such signal QPlatformNativeInterface::systemTrayWindowChanged(QScreen*)
+2024-06-06 07:42:15,884 - root - DEBUG - Not a private SSH key file: authorized_keys
+2024-06-06 07:42:15,885 - root - DEBUG - Not a private SSH key file: github_rsa.pub_bak-github
+2024-06-06 07:42:15,886 - root - DEBUG - Not a private SSH key file: other_keys.seahorse
+2024-06-06 07:42:16,077 - root - INFO - Using NetworkManagerMonitor NetworkStatusMonitor implementation.
+Requested decoration  "adwaita"  not found, falling back to default
+qt.qpa.wayland: Wayland does not support QWindow::requestActivate()
+2024-06-06 07:42:16,209 - vorta.borg.jobs_manager - DEBUG - Add job for site default
+2024-06-06 07:42:16,210 - vorta.borg.jobs_manager - DEBUG - Start job on site: default
+2024-06-06 07:42:16,237 - vorta.borg.borg_job - INFO - Running command /usr/bin/borg --version
+2024-06-06 07:42:20,564 - vorta.borg.jobs_manager - DEBUG - Finish job for site: default
+2024-06-06 07:42:20,565 - vorta.borg.jobs_manager - DEBUG - No more jobs for site: default
+2024-06-06 07:42:20,566 - vorta.scheduler - DEBUG - Refreshing all scheduler timers
+2024-06-06 07:42:20,568 - vorta.scheduler - DEBUG - Nothing scheduled for profile 1 because of unset repo.
+qt.qpa.wayland: Wayland does not support QWindow::requestActivate()
+2024-06-06 07:42:23,190 - root - DEBUG - Not a private SSH key file: authorized_keys
+2024-06-06 07:42:23,191 - root - DEBUG - Not a private SSH key file: github_rsa.pub_bak-github
+2024-06-06 07:42:23,191 - root - DEBUG - Not a private SSH key file: other_keys.seahorse
+2024-06-06 07:42:23,204 - vorta.keyring.abc - DEBUG - Only available on macOS
+2024-06-06 07:42:23,244 - asyncio - DEBUG - Using selector: EpollSelector
+2024-06-06 07:42:23,245 - vorta.keyring.abc - DEBUG - Using VortaSecretStorageKeyring
+2024-06-06 07:49:53,786 - vorta.keyring.abc - DEBUG - Only available on macOS
+2024-06-06 07:49:53,788 - asyncio - DEBUG - Using selector: EpollSelector
+2024-06-06 07:49:53,788 - vorta.keyring.abc - DEBUG - Using VortaSecretStorageKeyring
+2024-06-06 07:49:53,789 - asyncio - DEBUG - Using selector: EpollSelector
+2024-06-06 07:49:53,790 - vorta.keyring.secretstorage - DEBUG - Found 0 passwords matching repo URL.
+qt.qpa.wayland: Wayland does not support QWindow::requestActivate()
+2024-06-06 07:50:10,009 - vorta.keyring.abc - DEBUG - Only available on macOS
+2024-06-06 07:50:10,011 - asyncio - DEBUG - Using selector: EpollSelector
+2024-06-06 07:50:10,012 - vorta.keyring.abc - DEBUG - Using VortaSecretStorageKeyring
+2024-06-06 07:50:10,012 - vorta.borg.borg_job - DEBUG - Using VortaSecretStorageKeyring keyring to store passwords.
+2024-06-06 07:50:10,013 - asyncio - DEBUG - Using selector: EpollSelector
+2024-06-06 07:50:10,013 - vorta.keyring.secretstorage - DEBUG - Found 0 passwords matching repo URL.
+2024-06-06 07:50:10,013 - vorta.borg.borg_job - DEBUG - Password not found in primary keyring. Falling back to VortaDBKeyring.
+2024-06-06 07:50:10,029 - vorta.borg.borg_job - INFO - Running command /usr/bin/borg info --info --json --log-json ssh://borg@borg.toal.ca:12022/./ptoal-linux

quasar.config.js

@@ -9,6 +9,7 @@
 // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js
 
 const { configure } = require('quasar/wrappers');
+const packageJson = require('./package.json');
 
 module.exports = configure(function (/* ctx */) {
   return {
@@ -48,7 +49,9 @@ module.exports = configure(function (/* ctx */) {
 
     // Full list of options: https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#build
     build: {
-      env: require('dotenv').config().parsed,
+      env: {
+        VUE_APP_VERSION: packageJson.version,
+      },
       target: {
         browser: ['es2019', 'edge88', 'firefox78', 'chrome87', 'safari13.1'],
         node: 'node16',

src-pwa/manifest.json

@@ -1,5 +1,5 @@
 {
-  "orientation": "portrait",
+  "orientation": "natural",
   "background_color": "#ffffff",
   "theme_color": "#027be3",
   "icons": [

src-pwa/register-service-worker.ts

@@ -9,33 +9,35 @@ register(process.env.SERVICE_WORKER_FILE, {
   // to ServiceWorkerContainer.register()
   // https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorkerContainer/register#Parameter
 
-  // registrationOptions: { scope: './' },
+  registrationOptions: { scope: './' },
 
-  ready (/* registration */) {
+  ready(/* registration */) {
-    // console.log('Service worker is active.')
+    console.log('Service worker is active.');
   },
 
-  registered (/* registration */) {
+  registered(/* registration */) {
-    // console.log('Service worker has been registered.')
+    console.log('Service worker has been registered.');
   },
 
-  cached (/* registration */) {
+  cached(/* registration */) {
-    // console.log('Content has been cached for offline use.')
+    console.log('Content has been cached for offline use.');
   },
 
-  updatefound (/* registration */) {
+  updatefound(/* registration */) {
-    // console.log('New content is downloading.')
+    console.log('New content is downloading.');
   },
 
-  updated (/* registration */) {
+  updated(/* registration */) {
-    // console.log('New content is available; please refresh.')
+    console.log('New content is available; please refresh.');
   },
 
-  offline () {
+  offline() {
-    // console.log('No internet connection found. App is running in offline mode.')
+    console.log(
+      'No internet connection found. App is running in offline mode.'
+    );
   },
 
-  error (/* err */) {
+  error(err) {
-    // console.error('Error during service worker registration:', err)
+    console.error('Error during service worker registration:', err);
   },
 });

src/boot/appwrite.ts

@@ -14,20 +14,25 @@ import type { Router } from 'vue-router';
 
 const client = new Client();
 
-let APPWRITE_API_ENDPOINT, APPWRITE_API_PROJECT;
+let VITE_APPWRITE_API_ENDPOINT, VITE_APPWRITE_API_PROJECT;
 
 // Private self-hosted appwrite
-if (process.env.APPWRITE_API_ENDPOINT && process.env.APPWRITE_API_PROJECT) {
+if (
-  APPWRITE_API_ENDPOINT = process.env.APPWRITE_API_ENDPOINT;
+  process.env.VITE_APPWRITE_API_ENDPOINT &&
-  APPWRITE_API_PROJECT = process.env.APPWRITE_API_PROJECT;
+  process.env.VITE_APPWRITE_API_PROJECT
+) {
+  VITE_APPWRITE_API_ENDPOINT = process.env.VITE_APPWRITE_API_ENDPOINT;
+  VITE_APPWRITE_API_PROJECT = process.env.VITE_APPWRITE_API_PROJECT;
 } else if (process.env.DEV) {
-  APPWRITE_API_ENDPOINT = 'http://localhost:4000/api/v1';
+  VITE_APPWRITE_API_ENDPOINT = 'http://localhost:4000/api/v1';
-  APPWRITE_API_PROJECT = '65ede55a213134f2b688';
+  VITE_APPWRITE_API_PROJECT = '65ede55a213134f2b688';
 } else {
-  APPWRITE_API_ENDPOINT = 'https://appwrite.oys.undock.ca/v1';
+  VITE_APPWRITE_API_ENDPOINT = 'https://appwrite.oys.undock.ca/v1';
-  APPWRITE_API_PROJECT = 'bab';
+  VITE_APPWRITE_API_PROJECT = 'bab';
 }
-client.setEndpoint(APPWRITE_API_ENDPOINT).setProject(APPWRITE_API_PROJECT);
+client
+  .setEndpoint(VITE_APPWRITE_API_ENDPOINT)
+  .setProject(VITE_APPWRITE_API_PROJECT);
 
 const pwresetUrl = process.env.DEV
   ? 'http://localhost:4000/pwreset'

src/components/BoatReservationComponent.vue

@@ -164,7 +164,7 @@ const reservationStore = useReservationStore();
 const boatSelect = ref(false);
 const bookingForm = ref<BookingForm>({ ...newForm });
 const $q = useQuasar();
-const router = useRouter();
+const $router = useRouter();
 
 watch(reservation, (newReservation) => {
   if (!newReservation) {
@@ -183,7 +183,7 @@ watch(reservation, (newReservation) => {
   }
 });
 
-const updateInterval = (interval: Interval) => {
+const updateInterval = (interval: Interval | null) => {
   bookingForm.value.interval = interval;
   boatSelect.value = false;
 };
@@ -210,7 +210,8 @@ const boat = computed((): Boat | null => {
 });
 
 const onDelete = () => {
-  reservationStore.deleteReservation(reservation.value?.id);
+  reservationStore.deleteReservation(reservation.value?.$id);
+  $router.go(-1);
 };
 
 const onReset = () => {
@@ -279,6 +280,6 @@ const onSubmit = async () => {
       message: 'Failed to book!' + e,
     });
   }
-  router.go(-1);
+  $router.go(-1);
 };
 </script>

src/components/ToolbarComponent.vue

@@ -11,7 +11,7 @@
 
       <q-toolbar-title>{{ pageTitle }}</q-toolbar-title>
       <q-space />
-      <div>v2024.6.4.2</div>
+      <div>v{{ VERSION }}</div>
     </q-toolbar>
   </q-header>
   <LeftDrawer
@@ -23,6 +23,8 @@
 import { ref } from 'vue';
 import LeftDrawer from 'components/LeftDrawer.vue';
 
+const VERSION = process.env.VUE_APP_VERSION;
+
 const leftDrawerOpen = ref(false);
 function toggleLeftDrawer() {
   leftDrawerOpen.value = !leftDrawerOpen.value;

src/stores/sampledata/boat.ts

@@ -5,7 +5,7 @@ export const getSampleData = () => [
     displayName: 'PX',
     class: 'J/27',
     year: 1981,
-    imgSrc: '/tmpimg/j27.png',
+    imgSrc: '/tmpimg/projectX.jpg',
     iconSrc: '/tmpimg/projectx_avatar256.png',
     bookingAvailable: true,
     maxPassengers: 8,