diff --git a/.env.development b/.env.development index 2809a585..f0d8c69d 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.34" +APP_VERSION="0.5.36" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index c9cf8943..32632558 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.34" +APP_VERSION="0.5.36" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index 2809a585..f0d8c69d 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.34" +APP_VERSION="0.5.36" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.production b/_ALL_SITES/riso.app/.env.production index b041df35..250c0392 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.34" +APP_VERSION="0.5.36" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/riso.app/images/favicon-16x16.png b/_ALL_SITES/riso.app/images/favicon-16x16.png index 18de7b25..c28cef9f 100644 Binary files a/_ALL_SITES/riso.app/images/favicon-16x16.png and b/_ALL_SITES/riso.app/images/favicon-16x16.png differ diff --git a/_ALL_SITES/riso.app/images/favicon-32x32.png b/_ALL_SITES/riso.app/images/favicon-32x32.png index 6045a0f4..a02e38b0 100644 Binary files a/_ALL_SITES/riso.app/images/favicon-32x32.png and b/_ALL_SITES/riso.app/images/favicon-32x32.png differ diff --git a/_ALL_SITES/riso.app/images/favicon.ico b/_ALL_SITES/riso.app/images/favicon.ico index 06be8648..d283c964 100644 Binary files a/_ALL_SITES/riso.app/images/favicon.ico and b/_ALL_SITES/riso.app/images/favicon.ico differ diff --git a/_ALL_SITES/riso.app/images/riso-android-icon-144x144.png b/_ALL_SITES/riso.app/images/riso-android-icon-144x144.png index c5050b30..37dcd661 100644 Binary files a/_ALL_SITES/riso.app/images/riso-android-icon-144x144.png and b/_ALL_SITES/riso.app/images/riso-android-icon-144x144.png differ diff --git a/_ALL_SITES/riso.app/images/riso-android-icon-192x192.png b/_ALL_SITES/riso.app/images/riso-android-icon-192x192.png index c4d15612..95b960e9 100644 Binary files a/_ALL_SITES/riso.app/images/riso-android-icon-192x192.png and b/_ALL_SITES/riso.app/images/riso-android-icon-192x192.png differ diff --git a/_ALL_SITES/riso.app/images/riso-android-icon-384x384.png b/_ALL_SITES/riso.app/images/riso-android-icon-384x384.png index 43db963d..ce1ffc47 100644 Binary files a/_ALL_SITES/riso.app/images/riso-android-icon-384x384.png and b/_ALL_SITES/riso.app/images/riso-android-icon-384x384.png differ diff --git a/_ALL_SITES/riso.app/images/riso-android-icon-48x48.png b/_ALL_SITES/riso.app/images/riso-android-icon-48x48.png index ec317d16..499e8674 100644 Binary files a/_ALL_SITES/riso.app/images/riso-android-icon-48x48.png and b/_ALL_SITES/riso.app/images/riso-android-icon-48x48.png differ diff --git a/_ALL_SITES/riso.app/images/riso-android-icon-512x512.png b/_ALL_SITES/riso.app/images/riso-android-icon-512x512.png index 72c2b9c7..e1c31acd 100644 Binary files a/_ALL_SITES/riso.app/images/riso-android-icon-512x512.png and b/_ALL_SITES/riso.app/images/riso-android-icon-512x512.png differ diff --git a/_ALL_SITES/riso.app/images/riso-android-icon-96x96.png b/_ALL_SITES/riso.app/images/riso-android-icon-96x96.png index 7f9197ca..98dbf9d9 100644 Binary files a/_ALL_SITES/riso.app/images/riso-android-icon-96x96.png and b/_ALL_SITES/riso.app/images/riso-android-icon-96x96.png differ diff --git a/_ALL_SITES/riso.app/images/riso-apple-icon-114x114.png b/_ALL_SITES/riso.app/images/riso-apple-icon-114x114.png index 474d31a1..882dd21c 100644 Binary files a/_ALL_SITES/riso.app/images/riso-apple-icon-114x114.png and b/_ALL_SITES/riso.app/images/riso-apple-icon-114x114.png differ diff --git a/_ALL_SITES/riso.app/images/riso-apple-icon-120x120.png b/_ALL_SITES/riso.app/images/riso-apple-icon-120x120.png index b943abce..734b0503 100644 Binary files a/_ALL_SITES/riso.app/images/riso-apple-icon-120x120.png and b/_ALL_SITES/riso.app/images/riso-apple-icon-120x120.png differ diff --git a/_ALL_SITES/riso.app/images/riso-apple-icon-144x144.png b/_ALL_SITES/riso.app/images/riso-apple-icon-144x144.png index c5050b30..923da7be 100644 Binary files a/_ALL_SITES/riso.app/images/riso-apple-icon-144x144.png and b/_ALL_SITES/riso.app/images/riso-apple-icon-144x144.png differ diff --git a/_ALL_SITES/riso.app/images/riso-apple-icon-152x152.png b/_ALL_SITES/riso.app/images/riso-apple-icon-152x152.png index 26804e4a..84fd455d 100644 Binary files a/_ALL_SITES/riso.app/images/riso-apple-icon-152x152.png and b/_ALL_SITES/riso.app/images/riso-apple-icon-152x152.png differ diff --git a/_ALL_SITES/riso.app/images/riso-apple-icon-180x180.png b/_ALL_SITES/riso.app/images/riso-apple-icon-180x180.png index 0334ed85..e457d906 100644 Binary files a/_ALL_SITES/riso.app/images/riso-apple-icon-180x180.png and b/_ALL_SITES/riso.app/images/riso-apple-icon-180x180.png differ diff --git a/_ALL_SITES/riso.app/images/riso-apple-icon-57x57.png b/_ALL_SITES/riso.app/images/riso-apple-icon-57x57.png index 16ef4430..f5f538db 100644 Binary files a/_ALL_SITES/riso.app/images/riso-apple-icon-57x57.png and b/_ALL_SITES/riso.app/images/riso-apple-icon-57x57.png differ diff --git a/_ALL_SITES/riso.app/images/riso-apple-icon-60x60.png b/_ALL_SITES/riso.app/images/riso-apple-icon-60x60.png new file mode 100644 index 00000000..4121f834 Binary files /dev/null and b/_ALL_SITES/riso.app/images/riso-apple-icon-60x60.png differ diff --git a/_ALL_SITES/riso.app/images/riso-apple-icon-72x72.png b/_ALL_SITES/riso.app/images/riso-apple-icon-72x72.png new file mode 100644 index 00000000..5efd872d Binary files /dev/null and b/_ALL_SITES/riso.app/images/riso-apple-icon-72x72.png differ diff --git a/_ALL_SITES/riso.app/images/riso-apple-icon-76x76.png b/_ALL_SITES/riso.app/images/riso-apple-icon-76x76.png new file mode 100644 index 00000000..6db4b76f Binary files /dev/null and b/_ALL_SITES/riso.app/images/riso-apple-icon-76x76.png differ diff --git a/_ALL_SITES/riso.app/images/riso-apple-icon.png b/_ALL_SITES/riso.app/images/riso-apple-icon.png new file mode 100644 index 00000000..cfaeb3c0 Binary files /dev/null and b/_ALL_SITES/riso.app/images/riso-apple-icon.png differ diff --git a/_ALL_SITES/riso.app/images/riso-logo-full.png b/_ALL_SITES/riso.app/images/riso-logo-full.png index 35c8271f..38a9695f 100644 Binary files a/_ALL_SITES/riso.app/images/riso-logo-full.png and b/_ALL_SITES/riso.app/images/riso-logo-full.png differ diff --git a/_ALL_SITES/terradellavisione.app/.env.development b/_ALL_SITES/terradellavisione.app/.env.development index 5260d9b7..b4f28a02 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.34" +APP_VERSION="0.5.36" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL="newfreeplanet" diff --git a/public/images/arcadei-android-icon-144x144.png b/public/images/arcadei-android-icon-144x144.png deleted file mode 100644 index 84915be5..00000000 Binary files a/public/images/arcadei-android-icon-144x144.png and /dev/null differ diff --git a/public/images/arcadei-android-icon-192x192.png b/public/images/arcadei-android-icon-192x192.png deleted file mode 100644 index 359998a6..00000000 Binary files a/public/images/arcadei-android-icon-192x192.png and /dev/null differ diff --git a/public/images/arcadei-android-icon-384x384.png b/public/images/arcadei-android-icon-384x384.png deleted file mode 100644 index 8f25fe63..00000000 Binary files a/public/images/arcadei-android-icon-384x384.png and /dev/null differ diff --git a/public/images/arcadei-android-icon-48x48.png b/public/images/arcadei-android-icon-48x48.png deleted file mode 100644 index cd211909..00000000 Binary files a/public/images/arcadei-android-icon-48x48.png and /dev/null differ diff --git a/public/images/arcadei-android-icon-512x512.png b/public/images/arcadei-android-icon-512x512.png deleted file mode 100644 index 3480342c..00000000 Binary files a/public/images/arcadei-android-icon-512x512.png and /dev/null differ diff --git a/public/images/arcadei-android-icon-96x96.png b/public/images/arcadei-android-icon-96x96.png deleted file mode 100644 index fabb52e1..00000000 Binary files a/public/images/arcadei-android-icon-96x96.png and /dev/null differ diff --git a/public/images/arcadei-apple-icon-114x114.png b/public/images/arcadei-apple-icon-114x114.png deleted file mode 100644 index 02c3ed39..00000000 Binary files a/public/images/arcadei-apple-icon-114x114.png and /dev/null differ diff --git a/public/images/arcadei-apple-icon-144x144.png b/public/images/arcadei-apple-icon-144x144.png deleted file mode 100644 index 84915be5..00000000 Binary files a/public/images/arcadei-apple-icon-144x144.png and /dev/null differ diff --git a/public/images/arcadei-apple-icon-152x152.png b/public/images/arcadei-apple-icon-152x152.png deleted file mode 100644 index 12125535..00000000 Binary files a/public/images/arcadei-apple-icon-152x152.png and /dev/null differ diff --git a/public/images/arcadei-apple-icon-180x180.png b/public/images/arcadei-apple-icon-180x180.png deleted file mode 100644 index c706a239..00000000 Binary files a/public/images/arcadei-apple-icon-180x180.png and /dev/null differ diff --git a/public/images/arcadei-apple-icon-57x57.png b/public/images/arcadei-apple-icon-57x57.png deleted file mode 100644 index 0ee523ec..00000000 Binary files a/public/images/arcadei-apple-icon-57x57.png and /dev/null differ diff --git a/public/images/arcadei-logo-full.jpg b/public/images/arcadei-logo-full.jpg deleted file mode 100644 index 29baaec9..00000000 Binary files a/public/images/arcadei-logo-full.jpg and /dev/null differ diff --git a/public/images/arcadei-logo-full.png b/public/images/arcadei-logo-full.png deleted file mode 100644 index 5d8b7b3c..00000000 Binary files a/public/images/arcadei-logo-full.png and /dev/null differ diff --git a/public/images/favicon-16x16.png b/public/images/favicon-16x16.png index 18de7b25..c28cef9f 100644 Binary files a/public/images/favicon-16x16.png and b/public/images/favicon-16x16.png differ diff --git a/public/images/favicon-32x32.png b/public/images/favicon-32x32.png index 6045a0f4..a02e38b0 100644 Binary files a/public/images/favicon-32x32.png and b/public/images/favicon-32x32.png differ diff --git a/public/images/favicon.ico b/public/images/favicon.ico index 06be8648..d283c964 100644 Binary files a/public/images/favicon.ico and b/public/images/favicon.ico differ diff --git a/public/images/riso-android-icon-144x144.png b/public/images/riso-android-icon-144x144.png index c5050b30..37dcd661 100644 Binary files a/public/images/riso-android-icon-144x144.png and b/public/images/riso-android-icon-144x144.png differ diff --git a/public/images/riso-android-icon-192x192.png b/public/images/riso-android-icon-192x192.png index c4d15612..95b960e9 100644 Binary files a/public/images/riso-android-icon-192x192.png and b/public/images/riso-android-icon-192x192.png differ diff --git a/public/images/riso-android-icon-384x384.png b/public/images/riso-android-icon-384x384.png index 43db963d..ce1ffc47 100644 Binary files a/public/images/riso-android-icon-384x384.png and b/public/images/riso-android-icon-384x384.png differ diff --git a/public/images/riso-android-icon-48x48.png b/public/images/riso-android-icon-48x48.png index ec317d16..499e8674 100644 Binary files a/public/images/riso-android-icon-48x48.png and b/public/images/riso-android-icon-48x48.png differ diff --git a/public/images/riso-android-icon-512x512.png b/public/images/riso-android-icon-512x512.png index 72c2b9c7..e1c31acd 100644 Binary files a/public/images/riso-android-icon-512x512.png and b/public/images/riso-android-icon-512x512.png differ diff --git a/public/images/riso-android-icon-96x96.png b/public/images/riso-android-icon-96x96.png index 7f9197ca..98dbf9d9 100644 Binary files a/public/images/riso-android-icon-96x96.png and b/public/images/riso-android-icon-96x96.png differ diff --git a/public/images/riso-apple-icon-114x114.png b/public/images/riso-apple-icon-114x114.png index 474d31a1..882dd21c 100644 Binary files a/public/images/riso-apple-icon-114x114.png and b/public/images/riso-apple-icon-114x114.png differ diff --git a/public/images/riso-apple-icon-120x120.png b/public/images/riso-apple-icon-120x120.png index b943abce..734b0503 100644 Binary files a/public/images/riso-apple-icon-120x120.png and b/public/images/riso-apple-icon-120x120.png differ diff --git a/public/images/riso-apple-icon-144x144.png b/public/images/riso-apple-icon-144x144.png index c5050b30..923da7be 100644 Binary files a/public/images/riso-apple-icon-144x144.png and b/public/images/riso-apple-icon-144x144.png differ diff --git a/public/images/riso-apple-icon-152x152.png b/public/images/riso-apple-icon-152x152.png index 26804e4a..84fd455d 100644 Binary files a/public/images/riso-apple-icon-152x152.png and b/public/images/riso-apple-icon-152x152.png differ diff --git a/public/images/riso-apple-icon-180x180.png b/public/images/riso-apple-icon-180x180.png index 0334ed85..e457d906 100644 Binary files a/public/images/riso-apple-icon-180x180.png and b/public/images/riso-apple-icon-180x180.png differ diff --git a/public/images/riso-apple-icon-57x57.png b/public/images/riso-apple-icon-57x57.png index 16ef4430..f5f538db 100644 Binary files a/public/images/riso-apple-icon-57x57.png and b/public/images/riso-apple-icon-57x57.png differ diff --git a/public/images/riso-apple-icon.png b/public/images/riso-apple-icon.png new file mode 100644 index 00000000..cfaeb3c0 Binary files /dev/null and b/public/images/riso-apple-icon.png differ diff --git a/public/images/riso-logo-full.png b/public/images/riso-logo-full.png index 35c8271f..38a9695f 100644 Binary files a/public/images/riso-logo-full.png and b/public/images/riso-logo-full.png differ diff --git a/public/images/tdv-logo-full.png b/public/images/tdv-logo-full.png deleted file mode 100644 index af4c1711..00000000 Binary files a/public/images/tdv-logo-full.png and /dev/null differ diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index 175f5f16..12db9345 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -1,3 +1,4 @@ + export const shared_consts = { Accepted: { @@ -7,7 +8,7 @@ export const shared_consts = { icon: 'fas fa-user-shield', color: 'red', }, - CHECK_SEE_VIDEO_PRINCIPI: { + CHECK_SEE_VIDEO_PRINCIPI: { value: 2, label: 'steps.video_intro', icon: 'fas fa-tools', @@ -29,7 +30,6 @@ export const shared_consts = { VIDEO: 50, PAGE: 55, PAGEINTRO: 58, - GALLERY: 60, CALENDAR: 70, CAROUSEL_IDISCIPLINE: 80, CAROUSEL_HOME: 85, @@ -43,6 +43,7 @@ export const shared_consts = { CHECKIFISLOGGED: 170, INFO_VERSION: 180, BOTT_CONDIVIDI: 190, + BUTTON: 195, PRESENTAZIONE: 200, NOTIFATTOP: 210, CHART: 220, @@ -1240,69 +1241,6 @@ export const shared_consts = { label: 'Source Sans Pro', value: 'font-SourceSansPro' }, - ], - - TypesElem: [ - { - value: 5, - label: 'Titolo', - }, - { - value: 6, - label: 'Margine', - }, - { - value: 7, - label: 'Scheda', - }, - { - value: 8, - label: 'ImgTitolo', - }, - { - value: 9, - label: 'Img Poster', - }, - { - value: 10, - label: 'Testo', - }, - { - value: 20, - label: 'Html', - }, - { - value: 30, - label: 'Immagine', - }, - { - value: 35, - label: 'Img da Caricare', - }, - { - value: 40, - label: 'Separatore', - }, - { - value: 50, - label: 'Video', - }, - { - value: 55, - label: 'Pagina', - }, - { - value: 58, - label: 'Pagina Intro', - }, - { - value: 60, - label: 'Galleria', - }, - { - value: 70, - label: 'Calendario', - }, { value: 80, label: 'Carosello Discipline', @@ -1311,17 +1249,24 @@ export const shared_consts = { value: 85, label: 'Carosello Home', }, + ], + + TypesElemAdmin: [ { - value: 110, - label: 'Carosello Immagini', + value: 5, + label: 'Titolo', }, { - value: 100, - label: 'Check Email', + value: 8, + label: 'ImgTitolo', }, { - value: 120, - label: 'OpenStreetMap', + value: 10, + label: 'Testo semplice', + }, + { + value: 30, + label: 'Immagine (nomefile)', }, { value: 130, @@ -1331,6 +1276,17 @@ export const shared_consts = { value: 140, label: 'Dashboard', }, + ], + + TypesElemAdminTools: [ + { + value: 100, + label: 'Check Email', + }, + { + value: 120, + label: 'OpenStreetMap', + }, { value: 160, label: 'Stato Registrati', @@ -1391,6 +1347,58 @@ export const shared_consts = { value: 270, label: 'Footer', }, + { + value: 40, + label: 'Separatore', + }, + { + value: 70, + label: 'Calendario', + }, + + ], + + TypesElem: [ + { + value: 20, + label: 'Testo', + }, + { + value: 35, + label: 'Immagine', + }, + { + value: 7, + label: 'Scheda (1 Immagine e Testo)', + }, + { + value: 9, + label: 'Poster (1 Immagine + Testo)', + }, + { + value: 195, + label: 'Bottone', + }, + { + value: 50, + label: 'Video', + }, + { + value: 55, + label: 'Pagina', + }, + { + value: 58, + label: 'Pagina (solo Intro)', + }, + { + value: 110, + label: 'Galleria d\'Immagini', + }, + { + value: 6, + label: 'Margine', + }, ], LISTBESTCOLORS: [ diff --git a/src/components/CMyEditElem/CMyEditElem.ts b/src/components/CMyEditElem/CMyEditElem.ts index df2b826f..70dea306 100755 --- a/src/components/CMyEditElem/CMyEditElem.ts +++ b/src/components/CMyEditElem/CMyEditElem.ts @@ -80,11 +80,13 @@ export default defineComponent({ const enableEdit = ref(true) const elemChanged = ref(false) const enableAdd = ref(true) + const tabadd = ref('tools') const neworder = ref(0) const myel = toRef(props, 'myelem') const newtype = ref('') + const visuadd = ref(false) watch(() => myel.value.order, (value, oldval) => { mounted() @@ -111,6 +113,8 @@ export default defineComponent({ function addNewElem(order?: number) { + visuadd.value = false + const newrec: IMyElem = { _id: undefined, type: newtype.value, @@ -324,6 +328,8 @@ export default defineComponent({ showAnimation, tabCard, tabElemsText, + visuadd, + tabadd, } }, diff --git a/src/components/CMyEditElem/CMyEditElem.vue b/src/components/CMyEditElem/CMyEditElem.vue index e13f5dbb..794129a8 100755 --- a/src/components/CMyEditElem/CMyEditElem.vue +++ b/src/components/CMyEditElem/CMyEditElem.vue @@ -8,7 +8,17 @@ " >
- +
+ + +
+