diff --git a/.drone.yml b/.drone.yml index 3bc0534..7faba2a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,7 +19,7 @@ steps: - yarn run build - mv dist dist2 - name: sync1 - image: docker.io/thegeeklab/drone-s3-sync@sha256:e77b23d07b58b8a762e2d06b33dfd61f8e5dbe29db74c92891fddb6beddc730e + image: docker.io/thegeeklab/drone-s3-sync@sha256:f95c06f8091c88994ab5568eaa4f49ff0baf15f6c48d7b079e0d2f910d76c968 settings: path_style: true delete: true @@ -34,7 +34,7 @@ steps: from_secret: s3_secret_key - name: sync2 - image: docker.io/thegeeklab/drone-s3-sync@sha256:e77b23d07b58b8a762e2d06b33dfd61f8e5dbe29db74c92891fddb6beddc730e + image: docker.io/thegeeklab/drone-s3-sync@sha256:f95c06f8091c88994ab5568eaa4f49ff0baf15f6c48d7b079e0d2f910d76c968 settings: path_style: true delete: true diff --git a/package.json b/package.json index 7eaa26f..676d26b 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,7 @@ "dependencies": { "@fontsource-variable/baloo-da-2": "^5.0.3", "@fontsource-variable/noto-naskh-arabic": "^5.0.3", - "@fontsource/material-icons-rounded": "^4.5.4", - "@fontsource/roboto": "^5.0.3", + "@fontsource/material-icons-round": "^5.0.3", "@formatjs/intl-localematcher": "^0.4.0", "@mdi/js": "^7.2.96", "@mojee/file-utils": "https://cf-ipfs.com/ipfs/QmYEtpbjQqWYJDbcoixZvcccXkRFKBcTuRw5aa3hb8BWt8?filename=js-file-utils.tgz", @@ -32,7 +31,7 @@ "quick-lru": "^6.1.1", "register-service-worker": "^1.7.2", "sass-loader": "^10", - "shaka-player": "https://cf-ipfs.com/ipfs/QmP1AXcQiYrDAYNotXJweUBgd9Z2XtWxj7D7x3PkyV45M6?filename=shaka-v4.3.6.tar", + "shaka-player": "https://cf-ipfs.com/ipfs/QmdvmorgTSt1uA9qyWNs3cf4bCqXUWYeRSGpuWmertWw83?filename=shaka-v4-3-7.tgz", "vue": "^2.7.14", "vue-i18n": "^8.28.2", "vue-json-viewer": "^2.2.22", diff --git a/src/components/Player.vue b/src/components/Player.vue index 163cc59..c654589 100644 --- a/src/components/Player.vue +++ b/src/components/Player.vue @@ -25,8 +25,7 @@ import * as DashUtils from '@/tools/DashUtils' import '@/components/Player.scss' // Fonts for Shaka -import '@fontsource/material-icons-rounded/index.css' -import '@fontsource/roboto/latin.css' +import '@fontsource/material-icons-round/index.css' import { setupKeybindings } from 'psychic-tiny-keys' @@ -364,7 +363,7 @@ export default { let bestFitLanguage { const langs = player.getAudioLanguages() - bestFitLanguage = LocaleMatcher.match([this.$i18n.locale], langs, 'en') + bestFitLanguage = LocaleMatcher.match(this.$store.state.i18n.locale, langs, 'en') player.selectAudioLanguage(bestFitLanguage) } diff --git a/src/routes/FeedPage.vue b/src/routes/FeedPage.vue index eb54da5..ffefb39 100644 --- a/src/routes/FeedPage.vue +++ b/src/routes/FeedPage.vue @@ -103,7 +103,7 @@ export default { }, methods: { async fetchData () { - const region = this.$route.query.region ?? this.$store.getters['prefs/getPreference']('region', 'US') + const region = this.$route.query.region ?? this.$store.getters['prefs/getPreference']('region', this.$store.state.i18n.parsed.region ?? 'US') const selectedHomepage = this.$store.getters['prefs/getPreference']('homepage', 'trending') let path diff --git a/src/styles/main.scss b/src/styles/main.scss index 4285566..cdef742 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -1,5 +1,6 @@ @mixin addFonts ($font-primary) { $font-line: Antar, $font-primary, sans-serif; + --shaka-text-family: Antar, #{'"' + $font-primary + '"'}, sans-serif; .v-application { [class*='text-'],[class*='body-'] { diff --git a/yarn.lock b/yarn.lock index 2a08449..788c470 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1008,15 +1008,10 @@ resolved "https://registry.yarnpkg.com/@fontsource-variable/noto-naskh-arabic/-/noto-naskh-arabic-5.0.3.tgz#c27be5d71d462ed6d07c5ce057d5e60d54cda8b3" integrity sha512-ICDuxFdV8P5hjRe3j8RCDEip9hqepb57F6mIXqlHzwA0LqOwMX5A6nS+lV3wdr4SdoF4vQP08A6rB8x9pumK3A== -"@fontsource/material-icons-rounded@^4.5.4": - version "4.5.4" - resolved "https://registry.yarnpkg.com/@fontsource/material-icons-rounded/-/material-icons-rounded-4.5.4.tgz#b2d62f8cca3fef9895b419b266f991993bb1a829" - integrity sha512-zBrzaDzj//EJiuz9+yaL3uvYhqGcGXxewrwWy0fqHibOivNE9mlYtIjgibNRjEmS0eRXUu9h3TNmahlLwj3JvQ== - -"@fontsource/roboto@^5.0.3": +"@fontsource/material-icons-round@^5.0.3": version "5.0.3" - resolved "https://registry.yarnpkg.com/@fontsource/roboto/-/roboto-5.0.3.tgz#bff6ce627b8c537e8f56e6f2bba221f425bfdf78" - integrity sha512-jbZDFwEFARDlo8TqG7th/xjhuq87GYfFpFb+uxuy+0Ng1bhRVgBRWlLj8+WIKhCTOr+h4QXbjpybLWFLUirOwQ== + resolved "https://registry.yarnpkg.com/@fontsource/material-icons-round/-/material-icons-round-5.0.3.tgz#fe13f9323209a452fd5f242d2ebacc71c764798e" + integrity sha512-LA7to/xg/LSatZVJLfgZnHsnWvrH0fCnhgFgPxUwDBdkGWUZnM51TUTvy2ongSxz3ckbzia+bjU87CarCP4csg== "@formatjs/ecma402-abstract@1.17.0": version "1.17.0" @@ -6946,9 +6941,9 @@ sha.js@^2.4.0, sha.js@^2.4.8: inherits "^2.0.1" safe-buffer "^5.0.1" -"shaka-player@https://cf-ipfs.com/ipfs/QmP1AXcQiYrDAYNotXJweUBgd9Z2XtWxj7D7x3PkyV45M6?filename=shaka-v4.3.6.tar": - version "4.3.6" - resolved "https://cf-ipfs.com/ipfs/QmP1AXcQiYrDAYNotXJweUBgd9Z2XtWxj7D7x3PkyV45M6?filename=shaka-v4.3.6.tar#dc3ebb8df27eca50d54f0d2ac4f1866d9e882f59" +"shaka-player@https://cf-ipfs.com/ipfs/QmdvmorgTSt1uA9qyWNs3cf4bCqXUWYeRSGpuWmertWw83?filename=shaka-v4-3-7.tgz": + version "4.3.7" + resolved "https://cf-ipfs.com/ipfs/QmdvmorgTSt1uA9qyWNs3cf4bCqXUWYeRSGpuWmertWw83?filename=shaka-v4-3-7.tgz#309ab23397aefa80d4a88f04811f3f61a0c5aef3" dependencies: eme-encryption-scheme-polyfill "^2.1.1"