matt/opnform-host-nginx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring stores and templates pages to comp. api

Browse Source
This commit is contained in:
Julien Nahum
2023-12-19 13:46:55 +01:00
parent 3b798c12fd
commit bb519907f6
24 changed files with 432 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/pages/forms/create.vue
View File

@@ -121,7 +121,7 @@ export default {
this.initForm()
this.formInitialHash = this.hashString(JSON.stringify(this.form.data()))
if (this.$route.query.template !== undefined && this.$route.query.template) {
const template = this.templatesStore.getBySlug(this.$route.query.template)
const template = this.templatesStore.getByKey(this.$route.query.template)
if (template && template.structure) {
this.form = new Form({ ...this.form.data(), ...template.structure })
}

2
client/pages/forms/create/guest.vue
View File

@@ -116,7 +116,7 @@ export default {
this.initForm()
if (this.$route.query.template !== undefined && this.$route.query.template) {
const template = this.templatesStore.getBySlug(this.$route.query.template)
const template = this.templatesStore.getByKey(this.$route.query.template)
if (template && template.structure) {
this.form = new Form({ ...this.form.data(), ...template.structure })
}

6
client/pages/home.vue
View File

@@ -126,10 +126,8 @@ const loadForms = function () {
const formsStore = useFormsStore()
const workspacesStore = useWorkspacesStore()
formsStore.startLoading()
return workspacesStore.loadIfEmpty().then(() => {
if (process.client) {
formsStore.loadIfEmpty(workspacesStore.currentId)
}
workspacesStore.loadIfEmpty().then(() => {
formsStore.loadIfEmpty(workspacesStore.currentId)
})
}

195
client/pages/templates/[slug].vue
View File

@@ -1,14 +1,14 @@
<template>
<div class="flex flex-col min-h-full">
<breadcrumb :path="breadcrumbs">
<breadcrumb :path="breadcrumbs" v-if="template">
<template #left>
<div v-if="canEditTemplate" class="ml-5">
<v-button color="gray" size="small" @click.prevent="showFormTemplateModal=true">
Edit Template
</v-button>
<form-template-modal v-if="form" :form="form" :template="template" :show="showFormTemplateModal"
@close="showFormTemplateModal=false"
/>
<!-- <form-template-modal v-if="form" :form="form" :template="template" :show="showFormTemplateModal"-->
<!-- @close="showFormTemplateModal=false"-->
<!-- />-->
</div>
</template>
<template #right>
@@ -25,10 +25,7 @@
</template>
</breadcrumb>
<div v-if="templatesLoading" class="text-center my-4">
<Loader class="h-6 w-6 text-nt-blue mx-auto"/>
</div>
<p v-else-if="template === null || !template" class="text-center my-4">
<p v-if="template === null || !template" class="text-center my-4">
We could not find this template.
</p>
<template v-else>
@@ -48,9 +45,9 @@
<p class="mt-2 text-lg font-normal text-gray-600">
{{ cleanQuotes(template.short_description) }}
</p>
<template-tags :slug="template.slug" :display-all="true"
class="flex flex-wrap items-center justify-center gap-3 mt-4 md:justify-start"
/>
<!-- <template-tags :slug="template.slug" :display-all="true"-->
<!-- class="flex flex-wrap items-center justify-center gap-3 mt-4 md:justify-start"-->
<!-- />-->
</div>
</div>
</div>
@@ -119,7 +116,8 @@
</div>
</section>
<section v-if="template.related_templates.length > 0" class="py-12 bg-white border-t border-gray-200 sm:py-16">
<section v-if="relatedTemplates && relatedTemplates.length > 0"
class="py-12 bg-white border-t border-gray-200 sm:py-16">
<div class="px-4 mx-auto sm:px-6 lg:px-8 max-w-7xl">
<div class="flex items-center justify-between">
<h4 class="text-xl font-bold tracking-tight text-gray-900 sm:text-2xl">
@@ -131,7 +129,7 @@
</div>
<div class="grid grid-cols-1 gap-8 mt-8 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 sm:gap-y-12">
<single-template v-for="related in template.related_templates" :key="related.id" :template="related"/>
<single-template v-for="related in relatedTemplates" :key="related.id" :template="related"/>
</div>
</div>
</section>
@@ -196,108 +194,93 @@
</div>
</template>
<script>
import Form from 'vform'
<script setup>
import {computed} from 'vue'
import OpenCompleteForm from '../../components/open/forms/OpenCompleteForm.vue'
import Breadcrumb from '~/components/global/Breadcrumb.vue'
import SeoMeta from '../../mixins/seo-meta.js'
import TemplateTags from '../../components/pages/templates/TemplateTags.vue'
import SingleTemplate from '../../components/pages/templates/SingleTemplate.vue'
import FormTemplateModal from '../../components/open/forms/components/templates/FormTemplateModal.vue'
import {fetchTemplate} from "~/stores/templates.js";
export default {
const authStore = useAuthStore()
const templatesStore = useTemplatesStore()
components: {Breadcrumb, OpenCompleteForm, TemplateTags, SingleTemplate, FormTemplateModal},
mixins: [SeoMeta],
const route = useRoute()
const slug = computed(() => route.params.slug)
setup() {
const authStore = useAuthStore()
const templatesStore = useTemplatesStore()
const template = computed(() => templatesStore.getByKey(slug.value))
const form = computed(() => template.value.structure)
const route = useRoute()
const slug = computed(() => route.params.slug)
if (slug) {
templatesStore.loadTemplate(slug)
}
return {
templatesStore,
authenticated: computed(() => authStore.check),
user: computed(() => authStore.user),
templatesLoading: computed(() => templatesStore.loading)
}
},
data() {
return {
showFormTemplateModal: false
}
},
mounted() {
},
methods: {
cleanQuotes(str) {
// Remove starting and ending quotes if any
return (str) ? str.replace(/^"/, '').replace(/"$/, '') : ''
},
copyTemplateUrl() {
const str = this.template.share_url
const el = document.createElement('textarea')
el.value = str
document.body.appendChild(el)
el.select()
document.execCommand('copy')
document.body.removeChild(el)
this.alertSuccess('Copied!')
}
},
computed: {
breadcrumbs() {
if (!this.template) {
return [{route: {name: 'templates'}, label: 'Templates'}]
}
return [{route: {name: 'templates'}, label: 'Templates'}, {label: this.template.name}]
},
template() {
return this.templatesStore.getBySlug(this.$route.params.slug)
},
form() {
return this.template ? new Form(this.template.structure) : null
},
canEditTemplate() {
return this.user && this.template && (this.user.admin || this.user.template_editor || this.template.creator_id === this.user.id)
},
metaTitle() {
return this.template ? this.template.name : 'Form Template'
},
metaDescription() {
if (!this.template) return null
// take the first 140 characters of the description
return this.template.short_description?.substring(0, 140) + '... | Customize any template and create your own form in minutes.'
},
metaImage() {
if (!this.template) return null
return this.template.image_url
},
metaTags() {
if (!this.template) {
return [];
}
return this.template.publicly_listed ? [] : [{name: 'robots', content: 'noindex'}]
},
createFormWithTemplateUrl() {
if (this.authenticated) {
return '/forms/create?template=' + this.template?.slug
}
return '/forms/create/guest?template=' + this.template?.slug
}
}
// Fetch the template
if (!template.value) {
const {data} = await fetchTemplate(slug.value)
templatesStore.save(data.value)
}
// Fetch related templates
const {data: relatedTemplatesData} = await useAsyncData('related-templates', () => {
return Promise.all(template.value.related_templates.map((slug) => {
if (templatesStore.getByKey(slug)) {
return Promise.resolve(templatesStore.getByKey(slug))
}
return fetchTemplate(slug).then((res) => res.data.value)
}))
})
templatesStore.save(relatedTemplatesData.value)
// State
const showFormTemplateModal = ref(false)
// Computed
const breadcrumbs = computed(() => {
if (!template.value) {
return [{route: {name: 'templates'}, label: 'Templates'}]
}
return [{route: {name: 'templates'}, label: 'Templates'}, {label: template.name}]
})
const relatedTemplates = computed(() => templatesStore.getByKey(template?.value?.related_templates))
const canEditTemplate = computed(() => authStore.authenticated && template.value && (authStore.user.admin || authStore.user.template_editor || template.creator_id === authStore.user.id))
const createFormWithTemplateUrl = computed(() => {
if (authStore.authenticated) {
return '/forms/create?template=' + template?.value?.slug
}
return '/forms/create/guest?template=' + template?.value?.slug
})
// methods
const cleanQuotes = (str) => {
// Remove starting and ending quotes if any
return (str) ? str.replace(/^"/, '').replace(/"$/, '') : ''
}
const copyTemplateUrl = () => {
const str = template.value.share_url
const el = document.createElement('textarea')
el.value = str
document.body.appendChild(el)
el.select()
document.execCommand('copy')
document.body.removeChild(el)
this.alertSuccess('Copied!')
}
// metaTitle() {
// return this.template ? this.template.name : 'Form Template'
// },
// metaDescription() {
// if (!this.template) return null
// // take the first 140 characters of the description
// return this.template.short_description?.substring(0, 140) + '... | Customize any template and create your own form in minutes.'
// },
// metaImage() {
// if (!this.template) return null
// return this.template.image_url
// },
// metaTags() {
// if (!this.template) {
// return [];
// }
// return this.template.publicly_listed ? [] : [{name: 'robots', content: 'noindex'}]
// },
</script>
<style lang='scss'>

34
client/pages/templates/index.vue
View File

@@ -13,32 +13,28 @@
</div>
</section>
<templates-list :templates="templates" :loading="loading" />
<templates-list :templates="templates"/>
<open-form-footer class="mt-8 border-t"/>
</div>
</template>
<script>
import SeoMeta from '../../mixins/seo-meta.js'
import {useTemplatesStore} from "~/stores/templates.js";
<script setup>
import {fetchAllTemplates} from "~/stores/templates.js";
export default {
// props: {
// metaTitle: { type: String, default: 'Templates' },
// metaDescription: { type: String, default: 'Our collection of beautiful templates to create your own forms!' }
// },
mixins: [SeoMeta],
const templatesStore = useTemplatesStore()
props: {
metaTitle: { type: String, default: 'Templates' },
metaDescription: { type: String, default: 'Our collection of beautiful templates to create your own forms!' }
},
setup() {
const templatesStore = useTemplatesStore()
templatesStore.loadAll()
return {
templates: templatesStore.content,
loading: templatesStore.loading
}
},
if (!templatesStore.allLoaded) {
templatesStore.startLoading()
const {data} = await fetchAllTemplates()
templatesStore.set(data.value)
templatesStore.allLoaded = true
}
const templates = computed(() => templatesStore.getAll)
</script>

0
client/pages/templates/my_templates.vue → client/pages/templates/my-templates.vue
View File