Merge pull request #823 from Adamant-im/fix/pages

fix: VITE_PUBLIC_PATH for pages

Author: S-FrontendDev

.github/workflows/github-pages.yml

@@ -38,7 +38,7 @@ jobs:
           npm run schema:generate
           npm run build
         env:
-          VITE_PUBLIC_PATH: ${{ github.event.repository.name }}
+          VITE_PUBLIC_PATH: "/${{ github.event.repository.name }}/"
           VITE_ROUTER_HISTORY_MODE: hash
 
       - name: Upload artifacts 📁

android/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "im.adamant.adamantmessengerpwa"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 4102
-        versionName "4.10.2"
+        versionCode 4103
+        versionName "4.10.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "adamant-im",
-  "version": "4.10.2",
+  "version": "4.10.3",
   "type": "module",
   "author": "ADAMANT Foundation <devs@adamant.im>",
   "license": "GPLv3",

package.json

@@ -26,6 +26,7 @@
 
 <script lang="ts" setup>
 import { useI18n } from 'vue-i18n'
+import { joinUrl } from '@/lib/urlFormatter'
 
 const { t } = useI18n()
 
@@ -36,8 +37,7 @@ type Props = {
 }
 
 defineProps<Props>()
-
-const logo = '/img/adamant-logo-transparent-512x512.png'
+const logo = joinUrl(import.meta.env.BASE_URL, '/img/adamant-logo-transparent-512x512.png');
 const className = 'chat-placeholder'
 const classes = {
   root: className,

src/components/Chat/ChatPlaceholder.vue

@@ -42,6 +42,7 @@ import IconBox from '@/components/icons/IconBox.vue'
 import { mdiClose } from '@mdi/js'
 import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
+import { joinUrl } from '@/lib/urlFormatter'
 
 const props = defineProps({
   address: {
@@ -70,7 +71,7 @@ const emit = defineEmits<{
 const { t } = useI18n()
 
 const className = 'partner-info-dialog'
-const logo = '/img/adm-qr-invert.png'
+const logo = joinUrl(import.meta.env.BASE_URL, '/img/adm-qr-invert.png')
 const opts = { scale: 8.8 }
 
 const show = computed({

src/components/PartnerInfo.vue

@@ -19,6 +19,7 @@ import b64toBlob from 'b64-to-blob'
 import FileSaver from 'file-saver'
 
 import QrcodeRenderer from '@/components/QrcodeRenderer.vue'
+import { joinUrl } from '@/lib/urlFormatter.js'
 
 export default {
   components: {
@@ -54,7 +55,7 @@ export default {
       }
     },
     logoURL() {
-      return this.logo ? '/img/adm-qr-invert.png' : ''
+      return this.logo ? joinUrl(import.meta.env.BASE_URL, '/img/adm-qr-invert.png') : ''
     }
   },
   methods: {

src/components/QrcodeRendererDialog.vue

@@ -5,6 +5,7 @@ import Visibility from 'visibilityjs'
 import currency from '@/filters/currencyAmountWithSymbol'
 import { formatMessageBasic } from '@/lib/markdown'
 import { isAdamantChat } from '@/lib/chat/meta/utils'
+import { joinUrl } from '@/lib/urlFormatter.js'
 
 let _this
 
@@ -102,7 +103,7 @@ class PushNotification extends Notification {
                 const notification = new Notify(this.i18n.t('app_title'), {
                   body: this.messageBody,
                   closeOnClick: true,
-                  icon: '/img/icons/android-chrome-192x192.png',
+                  icon: joinUrl(import.meta.env.BASE_URL,'/img/icons/android-chrome-192x192.png'),
                   notifyClick: () => {
                     if (_this.$route.name !== 'Chat') {
                       this.router.push({
@@ -149,7 +150,7 @@ class PushNotification extends Notification {
 class SoundNotification extends Notification {
   constructor(ctx) {
     super(ctx)
-    this.audio = new Audio('/sound/bbpro_link.mp3')
+    this.audio = new Audio(joinUrl(import.meta.env.BASE_URL, '/sound/bbpro_link.mp3'))
   }
 
   notify(messageArrived) {

src/lib/notifications.js

@@ -178,3 +178,4 @@ export function websiteUriToOnion(str) {
 
   return str
 }
+

src/lib/uri.js

@@ -0,0 +1,3 @@
+export function joinUrl(base: string, path: string) {
+  return base.replace(/\/$/, '') + '/' + path.replace(/^\/+/, '');
+}