Merge branch 'prevodi' of git.kompot.si:yufu/manifest into prevodi

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;

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, {
+    navigateTo(localePath({ name: 'pojem_uredi', params: {
-      replace: true
+      naslov: encodeURIComponent(props.pojem.naslov),
-    })
+      guid: props.revisionId
+    }}), { replace: true })
   }
   //window.location.hash = props.revisionId
 }

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'
+      })
+    })
+  }
+})

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',

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)

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(() => {
 
 <template>
   <h3 class="navodila" ref="navodila">{{ $t('Vsak lahko prispeva k vsebinam manifesta. Predlaga lahko nov pojem ali ureja, dopolni ali predela obstoječe.') }}</h3>
-  <NuxtLink class="gumb" :to="localePath('pojem_dodaj')">
+  <NuxtLink class="gumb" :to="localePath({ name: 'pojem_dodaj', params: { guid: getRandomUUID() }})">
     {{ $t('Dodaj nov pojem') }}
   </NuxtLink>
   <NuxtLink
     v-for="pojem in Object.keys(store.pojmi)"
     :naslov="pojem"
-    :to="localePath('poglej_pojem', encodeURIComponent(pojem))"
+    :to="localePath({ name: 'pojem_poglej', params: { naslov: encodeURIComponent(pojem) }})"
     class="okvir">
     <h2>{{ pojem }}</h2>
   </NuxtLink>