From de26196ff7295be36f7be82b4103150a6b62a043 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jurij=20Podgor=C5=A1ek?= Date: Mon, 1 Apr 2024 21:20:07 +0200 Subject: [PATCH] Popravljeno prevajanje za pojme --- nuxt/app.vue | 1 + nuxt/components/PojemForm.vue | 9 +++++---- nuxt/modules/yufu-strani/module.js | 21 +++++++++++++++++++++ nuxt/nuxt.config.js | 18 +----------------- nuxt/pages/manifest/dodaj.vue | 2 +- nuxt/pages/manifest/index.vue | 5 +++-- 6 files changed, 32 insertions(+), 24 deletions(-) create mode 100644 nuxt/modules/yufu-strani/module.js diff --git a/nuxt/app.vue b/nuxt/app.vue index a289121..64c1aa6 100644 --- a/nuxt/app.vue +++ b/nuxt/app.vue @@ -66,6 +66,7 @@ nastavitveStore.izberiJezik($i18n.locale.value) } a.gumb { + text-transform: uppercase; text-decoration: underline; font-size: 3rem; position: relative; diff --git a/nuxt/components/PojemForm.vue b/nuxt/components/PojemForm.vue index ae76e49..146a88d 100644 --- a/nuxt/components/PojemForm.vue +++ b/nuxt/components/PojemForm.vue @@ -45,13 +45,14 @@ const oddajPredlog = async data => { // @TODO tole raje v pojmi.vue oz nov_pojem.vue - page! const etherNalozen = ev => { if (props.pojem.nov) { - navigateTo('/manifest/dodaj/' + props.revisionId, { + navigateTo(localePath({ name: 'pojem_dodaj', params: { guid: revisionId }}), { replace: true }) } else { - navigateTo('/manifest/' + encodeURIComponent(props.pojem.naslov) + '/uredi/' + props.revisionId, { - replace: true - }) + navigateTo(localePath({ name: 'pojem_uredi', params: { + naslov: encodeURIComponent(props.pojem.naslov), + guid: props.revisionId + }}), { replace: true }) } //window.location.hash = props.revisionId } diff --git a/nuxt/modules/yufu-strani/module.js b/nuxt/modules/yufu-strani/module.js new file mode 100644 index 0000000..4a8c9e2 --- /dev/null +++ b/nuxt/modules/yufu-strani/module.js @@ -0,0 +1,21 @@ +import { defineNuxtModule } from '@nuxt/kit' + +export default defineNuxtModule({ + setup(moduleOptions, nuxt) { + nuxt.hook('pages:extend', pages => { + pages.push({ + name: 'pojem_poglej', + path: '/manifest/:naslov', + file: '~/pages/manifest/pojem.vue' + }, { + name: 'pojem_uredi', + path: '/manifest/:naslov/uredi/:guid', + file: '~/pages/manifest/pojem.vue' + }, { + name: 'pojem_dodaj', + path: '/manifest/dodaj/:guid', + file: '~/pages/manifest/dodaj.vue' + }) + }) + } +}) diff --git a/nuxt/nuxt.config.js b/nuxt/nuxt.config.js index af3bc0b..6aab05b 100644 --- a/nuxt/nuxt.config.js +++ b/nuxt/nuxt.config.js @@ -20,6 +20,7 @@ export default defineNuxtConfig({ }, modules: [ ['@pinia/nuxt', { autoImports: ['defineStore', 'acceptHMRUpdate']}], + './modules/yufu-strani/module', '@nuxtjs/i18n' //'nuxt-proxy' ], @@ -39,23 +40,6 @@ export default defineNuxtConfig({ etherpadPrefix: process.env.ETHERPAD_PREFIX } }, - hooks: { - 'pages:extend' (pages) { - pages.push({ - name: 'pojem_poglej', - path: '/manifest/:naslov', - file: '~/pages/manifest/pojem.vue' - }, { - name: 'pojem_uredi', - path: '/manifest/:naslov/uredi/:guid', - file: '~/pages/manifest/pojem.vue' - }, { - name: 'pojem_dodaj', - path: '/manifest/dodaj/:guid', - file: '~/pages/manifest/dodaj.vue' - }) - } - }, i18n: { locales: [{ code: 'sl', diff --git a/nuxt/pages/manifest/dodaj.vue b/nuxt/pages/manifest/dodaj.vue index 1717057..a8834ec 100644 --- a/nuxt/pages/manifest/dodaj.vue +++ b/nuxt/pages/manifest/dodaj.vue @@ -18,7 +18,7 @@ const resp = await etherFetch('/createPad', { text: '' }) -const onZapri = () => { navigateTo('/manifest#skrol') } +const onZapri = () => { navigateTo(localePath('manifest') + '#skrol') } onMounted(() => { poskrolaj(obrazec.value) diff --git a/nuxt/pages/manifest/index.vue b/nuxt/pages/manifest/index.vue index 2018761..8b7183b 100644 --- a/nuxt/pages/manifest/index.vue +++ b/nuxt/pages/manifest/index.vue @@ -3,6 +3,7 @@ const store = usePojmiStore() const { poskrolaj } = useUi() +const { getRandomUUID } = useCrypto() await store.naloziPojme() @@ -18,13 +19,13 @@ onMounted(() => {