diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index df36fcf..0000000 Binary files a/public/favicon.ico and /dev/null differ diff --git a/public/img/favicon.png b/public/img/favicon.png new file mode 100644 index 0000000..3f77dc2 Binary files /dev/null and b/public/img/favicon.png differ diff --git a/public/img/icons/android-chrome-192x192.png b/public/img/icons/android-chrome-192x192.png deleted file mode 100644 index b02aa64..0000000 Binary files a/public/img/icons/android-chrome-192x192.png and /dev/null differ diff --git a/public/img/icons/android-chrome-512x512.png b/public/img/icons/android-chrome-512x512.png deleted file mode 100644 index 06088b0..0000000 Binary files a/public/img/icons/android-chrome-512x512.png and /dev/null differ diff --git a/public/img/icons/android-chrome-maskable-192x192.png b/public/img/icons/android-chrome-maskable-192x192.png deleted file mode 100644 index 791e9c8..0000000 Binary files a/public/img/icons/android-chrome-maskable-192x192.png and /dev/null differ diff --git a/public/img/icons/android-chrome-maskable-512x512.png b/public/img/icons/android-chrome-maskable-512x512.png deleted file mode 100644 index 5f2098e..0000000 Binary files a/public/img/icons/android-chrome-maskable-512x512.png and /dev/null differ diff --git a/public/img/icons/apple-touch-icon-120x120.png b/public/img/icons/apple-touch-icon-120x120.png deleted file mode 100644 index 1427cf6..0000000 Binary files a/public/img/icons/apple-touch-icon-120x120.png and /dev/null differ diff --git a/public/img/icons/apple-touch-icon-152x152.png b/public/img/icons/apple-touch-icon-152x152.png deleted file mode 100644 index f24d454..0000000 Binary files a/public/img/icons/apple-touch-icon-152x152.png and /dev/null differ diff --git a/public/img/icons/apple-touch-icon-180x180.png b/public/img/icons/apple-touch-icon-180x180.png deleted file mode 100644 index 404e192..0000000 Binary files a/public/img/icons/apple-touch-icon-180x180.png and /dev/null differ diff --git a/public/img/icons/apple-touch-icon-60x60.png b/public/img/icons/apple-touch-icon-60x60.png deleted file mode 100644 index cf10a56..0000000 Binary files a/public/img/icons/apple-touch-icon-60x60.png and /dev/null differ diff --git a/public/img/icons/apple-touch-icon-76x76.png b/public/img/icons/apple-touch-icon-76x76.png deleted file mode 100644 index c500769..0000000 Binary files a/public/img/icons/apple-touch-icon-76x76.png and /dev/null differ diff --git a/public/img/icons/apple-touch-icon.png b/public/img/icons/apple-touch-icon.png deleted file mode 100644 index 03c0c5d..0000000 Binary files a/public/img/icons/apple-touch-icon.png and /dev/null differ diff --git a/public/img/icons/favicon-16x16.png b/public/img/icons/favicon-16x16.png deleted file mode 100644 index 42af009..0000000 Binary files a/public/img/icons/favicon-16x16.png and /dev/null differ diff --git a/public/img/icons/favicon-32x32.png b/public/img/icons/favicon-32x32.png deleted file mode 100644 index 46ca04d..0000000 Binary files a/public/img/icons/favicon-32x32.png and /dev/null differ diff --git a/public/img/icons/msapplication-icon-144x144.png b/public/img/icons/msapplication-icon-144x144.png deleted file mode 100644 index 7808237..0000000 Binary files a/public/img/icons/msapplication-icon-144x144.png and /dev/null differ diff --git a/public/img/icons/mstile-150x150.png b/public/img/icons/mstile-150x150.png deleted file mode 100644 index 3b37a43..0000000 Binary files a/public/img/icons/mstile-150x150.png and /dev/null differ diff --git a/public/img/icons/safari-pinned-tab.svg b/public/img/icons/safari-pinned-tab.svg deleted file mode 100644 index e44c0d5..0000000 --- a/public/img/icons/safari-pinned-tab.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/public/index.html b/public/index.html index 8d2513f..3367f7a 100644 --- a/public/index.html +++ b/public/index.html @@ -4,7 +4,8 @@ - + + Forum virtuel des associations diff --git a/src/assets/logo.png b/src/assets/logo.png deleted file mode 100644 index f3d2503..0000000 Binary files a/src/assets/logo.png and /dev/null differ diff --git a/src/layouts/Delegate.vue b/src/layouts/Delegate.vue index f69bcab..c804506 100644 --- a/src/layouts/Delegate.vue +++ b/src/layouts/Delegate.vue @@ -8,12 +8,37 @@ > {{ $store.state.delegateAdminName }} - + Publier + + + + + + Ouvrir la page publique + + + Se déconnecter + + + + @@ -94,13 +136,16 @@ export default { token: '', loadingHandle: null, isSaving: false, - tab: 0 + tab: 0, + slug: '', + canPublish: false, + publishModal: false }), created () { this.init() }, watch: { - $route (to, from) { + $route (to) { this.selectRoute(to) } }, @@ -163,13 +208,18 @@ export default { this.loading = false this.enabled = true const organization = res.data.data.organization + const proposedVersion = res.data.data.organization.proposedVersion const tags = res.data.data.tags - if (organization.proposedVersion.tag !== undefined && organization.proposedVersion.tag !== null) { - organization.proposedVersion.tag = organization.proposedVersion.tag._id + if ( + proposedVersion.tag !== undefined && + proposedVersion.tag !== null + ) { + proposedVersion.tag = proposedVersion.tag._id } + this.slug = organization.slug this.$store.commit('SET_DELEGATE_ADMIN_NAME', organization.adminName) this.$store.commit('SET_DELEGATE_EMAIL', organization.email) - this.$store.commit('SET_DATA', organization.proposedVersion) + this.$store.commit('SET_DATA', proposedVersion) this.$store.commit('SET_TAGS', tags) this.$nextTick(() => { setTimeout(this.$refs.tabs.callSlider, 200) @@ -178,7 +228,8 @@ export default { setTimeout(this.$refs.tabs.callSlider, 1000) setTimeout(this.$refs.tabs.callSlider, 1500) }) - }).catch(() => { + }).catch(err => { + console.log(err) clearTimeout(this.loadingHandle) this.loading = false if (this.token !== '' || inUrl) { @@ -216,7 +267,8 @@ export default { color: 'success', text: 'Vos changements ont été sauvegardés !' }) - }).catch(() => { + }).catch(err => { + console.log(err.data) this.isSaving = false this.$store.commit('ADD_ALERT', { color: 'error', @@ -233,6 +285,16 @@ export default { if (this.token !== '') { this.init() } + }, + goToPage () { + window.open(process.env.VUE_APP_BASE_URL + '/association/' + this.slug, '_blank').focus() + }, + openPublishModal () { + // compute if the user can ask approval + this.publishModal = true + }, + askApproval () { + this.publishModal = false } } } diff --git a/src/views/Delegate/Gallery.vue b/src/views/Delegate/Gallery.vue index 284946c..fca0884 100644 --- a/src/views/Delegate/Gallery.vue +++ b/src/views/Delegate/Gallery.vue @@ -6,10 +6,20 @@ :style="coverStyle">
- Changer la couverture +
+ Changer la couverture + clear +
({ logoLoading: false, rules: { - descriptionShort: [v => v.length <= 100 || 'Au maximum 100 caractères'], + descriptionShort: [v => v.length <= 200 || 'Au maximum 200 caractères'], logo: [v => !v || v.size < 2000000 || 'La taille du logo doit être inférieur à 2 Mega Octets!'] } }), diff --git a/src/views/Delegate/Presentation.vue b/src/views/Delegate/Presentation.vue index f94235b..9afa4d7 100644 --- a/src/views/Delegate/Presentation.vue +++ b/src/views/Delegate/Presentation.vue @@ -1,5 +1,6 @@