Webpage Editor functionality

This commit is contained in:
paoloar77
2022-11-10 19:32:56 +01:00
parent 2bd31200b4
commit 9fe37c9f3c
38 changed files with 1387 additions and 384 deletions

View File

@@ -1,6 +1,6 @@
APP_VERSION="0.5.26" APP_VERSION="0.5.26"
SERVICE_WORKER_FILE="service-worker.js" SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13" APP_ID="16"
DIRECTORY_LOCAL="newfreeplanet" DIRECTORY_LOCAL="newfreeplanet"
DIRECTORY_SERVER="freeplanet_serverside" DIRECTORY_SERVER="freeplanet_serverside"
SERVERDIR_WEBSITE="" SERVERDIR_WEBSITE=""
@@ -12,9 +12,9 @@ LANG_DEFAULT="it"
PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF"
MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T"
MONGODB_HOST="https://localhost:3000" MONGODB_HOST="https://localhost:3000"
LOGO_REG='riso-logo-full.png' LOGO_REG='kolibrilab-logo-full.png'
TEST_NAME="Paolo" TEST_NAME="Surya"
TEST_SURNAME="Arena" TEST_SURNAME="Paolo"
TEST_EMAIL="" TEST_EMAIL=""
TEST_USERNAME="" TEST_USERNAME=""
TEST_PASSWORD="" TEST_PASSWORD=""

View File

@@ -0,0 +1,452 @@
.testo-banda {
//background: -webkit-gradient(linear, left top, left bottom, from(#3144f0), to(transparent));
//background: linear-gradient(180deg, #3144f0, transparent);
//background: rgba(0, 0, 0, .6)
}
$grayshadow: #555;
$textcol: blue;
$textcol_scuro: darkblue;
p {
margin: 0 0 1.25rem;
//text-shadow: .125rem .125rem .25rem $grayshadow;
}
h4 {
font-size: 1.25rem;
}
.mycard {
visibility: hidden;
}
.landing {
}
.landing_background {
background: #000 url(../../../public/images/foto1.jpg) no-repeat 50% fixed;
background-size: cover
}
.landing > section {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-pack: center;
-ms-flex-pack: center;
justify-content: center;
//padding: 0 16px
}
.intro {
display: flex;
justify-content: space-between;
align-items: stretch;
/* flex-flow: row nowrap; */
padding: 1.25rem 0 1.25rem 0;
margin: .125rem;
* {
width: 100%;
flex: 1;
margin-left: auto;
margin-right: auto;
}
&__associazione {
min-width: 350px;
}
&__comeassociarsi {
min-width: 350px;
}
}
.subtitle {
font-weight: 600;
text-align: center;
letter-spacing: 0.125rem;
text-transform: uppercase;
font-size: 1rem;
}
.landing > section.padding {
padding: 5.62rem 1rem;
}
.landing > section.padding_testo {
padding-top: 1.25rem;
padding-bottom: 1rem;
}
.landing > section.padding_gallery {
padding-top: 3.125rem;
padding-bottom: 5.625rem;
}
.landing > section > div {
position: relative;
width: 100%
}
.maxwidth1200 {
max-width: 1200px;
}
.landing__toolbar {
background: -webkit-gradient(linear, left top, left bottom, from(#000), to(transparent));
background: linear-gradient(180deg, #000, transparent);
padding: 0 !important
}
.landing__toolbar .q-btn {
border-radius: 0 0 .315rem .315rem;
-ms-flex-item-align: stretch;
align-self: stretch
}
.landing__hero {
min-height: 50vh
}
.landing__header {
height: 18vh
}
.landing__arrow {
bottom: 1.5rem;
opacity: .4
}
.landing__front {
background: -webkit-gradient(linear, left top, left bottom, from(transparent), color-stop(15%, rgba(0, 0, 0, .6)));
background: linear-gradient(180deg, transparent, rgba(0, 0, 0, .6) 15%)
}
.landing__logo {
width: 9.40rem;
height: 9.40rem;
margin-top: 1.315rem;
//-webkit-animation: logo-rotate 240s linear infinite;
//animation: logo-rotate 240s linear infinite
}
.landing__features .q-icon {
font-size: 4rem
}
h4 {
line-height: 1.5;
text-shadow: .25rem .25rem .5rem $grayshadow;
}
.landing__features h4, .landing__features h6 {
margin: 1rem 0
}
.landing__features p {
opacity: .7;
font-size: 1rem;
line-height: 1.5;
}
.landing__footer {
//background: -webkit-gradient(linear, left top, left bottom, color-stop(65%, rgba(0, 0, 0, .1)), to(#000));
background: linear-gradient(180deg, rgba(0, 0, 0, .8) 95%, #FFF);
padding-top: 4.5rem !important;
padding-bottom: 4.5rem !important;
padding-left: 1.25rem;
padding-right: 1.25rem;
color: #9f9f9f;
}
.icon_contact:hover {
color: blue;
border-color: white;
border-width: .0625rem;
}
.landing__footer .doc-link {
color: $textcol;
}
.landing__footer .doc-link:hover {
opacity: .8
}
.landing__swirl-bg {
background-repeat: no-repeat !important;
background-position: top;
background-size: contain !important;
background-image: url(../../../public/images/landing_first_section.png) !important
}
.feat-descr {
font-size: 1.15rem;
}
.feat-descr:hover {
transition: opacity 0.5s ease-in-out;
opacity: 0.9;
}
.q-col-gutter-sm {
padding: 3.125rem 3.125rem;
//margin-left: -48px
}
body.mobile .landing {
//background: unset
}
body.mobile .landing:before {
content: "";
position: fixed;
top: 0;
height: 100vh;
left: 0;
right: 0;
bottom: 0;
z-index: -1;
//background: #000 url(../../public/images/cover.jpg) 50%;
background-size: cover
}
/*
@-webkit-keyframes logo-rotate {
to {
-webkit-transform: rotate(-1turn);
transform: rotate(-1turn)
}
}
@keyframes logo-rotate {
to {
-webkit-transform: rotate(-1turn);
transform: rotate(-1turn)
}
}
*/
.home {
//background-color: rgb(250, 250, 250);
padding: 3.125rem;
display: flex;
//flex-wrap: nowrap;
flex-direction: column;
align-items: center;
justify-content: space-between;
}
.btn-start {
margin: 3.125rem;
}
.shadow {
//color: white;
text-shadow: 0.125rem 0.125rem 0.25rem $grayshadow;
}
.text-h1, h1 {
font-size: 3rem;
font-weight: bold;
line-height: 3rem;
letter-spacing: -.01562em;
margin-bottom: 8px !important;
}
.text-h2 {
font-size: 3.75rem;
font-weight: 300;
line-height: 3.75rem;
letter-spacing: -.00833em;
}
.text-weight-bold {
font-weight: 700;
}
.text-vers {
font-size: 0.75rem;
font-weight: 400;
line-height: 1.75rem;
letter-spacing: .00937em;
text-shadow: .25rem .25rem .5rem $grayshadow;
}
.homep-cover-img-1 {
background: #000 url(../../../public/images/foto1.jpg) no-repeat 50% fixed;
//transition: background-image 1s ease-in-out;
}
.homep-cover-img-2 {
background: #000 url(../../../public/images/foto2.jpg) no-repeat 50% fixed;
//transition: background-image 1s ease-in-out;
}
.homep-cover-img-3 {
background: #000 url(../../../public/images/foto3.jpg) no-repeat 50% fixed;
//transition: background-image 1s ease-in-out;
}
.homep-cover-img.hide-filter:before {
opacity: 0
}
.landing__footer-icons {
font-size: 1.75rem
}
.landing__footer-icons a {
margin: 0 .5rem .5rem;
text-decoration: none;
outline: 0;
color: $textcol;
transition: color .28s
}
.landing__footer-icons a:hover {
color: $textcol_scuro;
}
.doc-img {
max-width: 100%;
}
.mylist {
background: #3fdaff;
padding-left: 1.25rem;
}
.clgutter {
margin-top: 1.25rem;
padding: .62rem;
}
.carousel_img_3 {
//background-image: url(../../public/images/cibo_sano.jpg);
background-size: cover !important;
background-position: 50% center !important;
background-repeat: no-repeat !important;
}
@media (max-width: 718px) {
// PER VERSIONE MOBILE
.landing__hero {
text-align: center
}
.landing__header {
height: 7vh
}
.clgutter {
margin-top: 0;
padding: 0;
}
.landing__hero .text-h1, h1 {
font-size: 2rem;
line-height: 2.05rem;
margin-bottom: 1.25rem
}
.landing > section.padding {
padding: 2.5rem 1rem;
}
.landing > section.padding_testo {
padding-top: 1.25rem;
padding-bottom: 1rem;
}
.landing > section.padding_gallery {
padding-top: 3.125rem;
padding-bottom: 5.625rem;
max-width: 800px;
}
.landing > section.padding_gallery > div {
padding-top: 3.125rem;
padding-bottom: 5.625rem;
}
.landing__features h4, .landing__features h6 {
margin: 1.25rem 0
}
h4 {
line-height: 1.4;
text-shadow: 0.25rem 0.25rem 0.5rem $grayshadow;
}
.landing .feature-item {
text-align: center;
margin-top: 1.25rem;
}
.landing__hero-content {
padding-bottom: 11.25rem;
}
.landing__hero2-content {
padding-bottom: 7.25rem;
}
.landing__hero-btns {
-webkit-box-pack: center;
-ms-flex-pack: center;
justify-content: center
}
.q-col-gutter-sm {
padding: .625rem .315rem;
}
.text-subtitle1 {
font-size: 1.25rem;
}
.text-vers {
font-size: 0.6rem;
}
.carousel_img_3 {
//background-image: url(../../public/images/cibo_sano.jpg);
background-size: 620px 620px !important;
background-position: 50% top !important;
background-repeat: no-repeat !important;
}
}
.custom-caption {
text-align: center;
padding: .75rem;
color: $textcol;
background-color: rgba(0, 0, 0, .3);
}
.sfondo-grigio {
padding: 1rem;
color: $textcol;
background-color: rgba(0, 0, 0, .35);
}
.mycontacts {
color: gray;
letter-spacing: 0.078rem;
}
.mycontacts_title {
text-shadow: 0.125rem 0.125rem 0.125rem #555;
font-weight: bold;
color: #999;
letter-spacing: 0.125rem;
}
.mycontacts_text {
color: #999;
letter-spacing: 0.093rem;
}

View File

@@ -0,0 +1,54 @@
import { defineComponent, ref, onMounted, watch, computed } from 'vue'
import { useGlobalStore } from '@store/globalStore'
import { useRoute } from 'vue-router'
import { useUserStore } from '@store/UserStore'
import { Logo } from '@/components/logo'
import { LandingFooter } from '@/components/LandingFooter'
import { CMyPage } from '@/components/CMyPage/index'
import { tools } from '@src/store/Modules/tools'
import { static_data } from '@src/db/static_data'
import { toolsext } from '@src/store/Modules/toolsext'
import { Screen } from 'quasar'
import { CCardCarousel, CEventsCalendar, CMyElem, COpenStreetMap } from '@components'
import MixinBase from '@src/mixins/mixin-base'
import { firstimagehome } from '@src/db/static_data'
import MixinMetaTags from '@/mixins/mixin-metatags'
export default defineComponent({
name: 'home_arcadei',
components: { Logo, LandingFooter, CMyPage, CMyElem },
setup() {
const userStore = useUserStore()
const globalStore = useGlobalStore()
const { setValDb, getValDb } = MixinBase()
function getheightgallery() {
if (tools.isMobile())
return '400px'
else
return '600px'
}
function created() {
//
}
created()
return {
tools,
toolsext,
static_data,
getheightgallery,
getValDb,
globalStore,
}
},
})

View File

@@ -0,0 +1,18 @@
<template>
<q-page>
<CMyPage title="Home">
<span v-for="(myelem, ind) in globalStore.getMyElems('home')" :key="ind">
<CMyElem v-if="myelem.active" :myelem="myelem">
</CMyElem>
</span>
</CMyPage>
</q-page>
</template>
<script lang="ts" src="./home_arcadei.ts">
</script>
<style lang="scss" scoped>
@import './home_arcadei.scss';
</style>

View File

@@ -1,9 +1,9 @@
{ {
"name": "riso", "name": "kolibrilab",
"version": "0.5.3", "version": "0.5.3",
"description": "Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.", "description": "kolibrilab",
"productName": "Riso", "productName": "kolibrilab",
"author": "Paolo Arena", "author": "Surya Paolo",
"private": true, "private": true,
"keywords": [], "keywords": [],
"license": "MIT", "license": "MIT",
@@ -36,7 +36,6 @@
"bcryptjs": "^2.4.3", "bcryptjs": "^2.4.3",
"chart.js": "^3.9.1", "chart.js": "^3.9.1",
"core-js": "^3.25.0", "core-js": "^3.25.0",
"crypto": "^1.0.1",
"date-fns": "^2.29.2", "date-fns": "^2.29.2",
"dotenv": "^16.0.2", "dotenv": "^16.0.2",
"echarts": "^5.3.3", "echarts": "^5.3.3",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -147,7 +147,7 @@ module.exports = configure((ctx) => ({
}, },
devServer: { devServer: {
https: false, https: false,
port: 8084, port: 8090,
open: false, // opens browser window automatically open: false, // opens browser window automatically
}, },
@@ -275,77 +275,6 @@ module.exports = configure((ctx) => ({
}, },
// https://v2.quasar.dev/quasar-cli/developing-pwa/configuring-pwa // https://v2.quasar.dev/quasar-cli/developing-pwa/configuring-pwa
pwa: {
workboxPluginMode: 'InjectManifest', // 'GenerateSW' or 'InjectManifest'
workboxOptions: {}, // only for GenerateSW
extendGenerateSWOptions (cfg) {
cfg.skipWaiting = false
cfg.clientsClaim = false
},
// for the custom service worker ONLY (/src-pwa/custom-service-worker.[js|ts])
// if using workbox in InjectManifest mode
chainWebpackCustomSW(chain) {
// chain.plugin('eslint-webpack-plugin')
// .use(ESLintPlugin, [{ extensions: ['js'] }])
},
manifest: {
name: 'Riso',
short_name: 'Riso',
description: 'Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.',
display: 'standalone',
orientation: 'portrait',
background_color: '#ffffff',
theme_color: '#027be3',
icons: [
{
src: 'images/riso-android-icon-512x512.png',
sizes: '512x512',
type: 'image/png',
},
{
src: 'images/riso-android-icon-384x384.png',
sizes: '384x384',
type: 'image/png',
},
{
src: 'images/riso-android-icon-192x192.png',
sizes: '192x192',
type: 'image/png',
},
{
src: 'images/riso-android-icon-144x144.png',
sizes: '144x144',
type: 'image/png',
},
{
src: 'images/riso-android-icon-96x96.png',
sizes: '96x96',
type: 'image/png',
},
{
src: 'images/riso-apple-icon-120x120.png',
sizes: '120x120',
type: 'image/png',
},
{
src: 'images/riso-apple-icon-144x144.png',
sizes: '144x144',
type: 'image/png',
},
{
src: 'images/riso-apple-icon-152x152.png',
sizes: '152x152',
type: 'image/png',
},
{
src: 'images/riso-apple-icon-180x180.png',
sizes: '180x180',
type: 'image/png',
},
],
},
},
// Full list of options: https://v2.quasar.dev/quasar-cli/developing-cordova-apps/configuring-cordova // Full list of options: https://v2.quasar.dev/quasar-cli/developing-cordova-apps/configuring-cordova
cordova: { cordova: {
@@ -359,37 +288,5 @@ module.exports = configure((ctx) => ({
// Full list of options: https://v2.quasar.dev/quasar-cli/developing-electron-apps/configuring-electron // Full list of options: https://v2.quasar.dev/quasar-cli/developing-electron-apps/configuring-electron
electron: { electron: {
bundler: 'packager', // 'packager' or 'builder'
packager: {
// https://github.com/electron-userland/electron-packager/blob/master/docs/api.md#options
// OS X / Mac App Store
// appBundleId: '',
// appCategoryType: '',
// osxSign: '',
// protocol: 'myapp://path',
// Windows only
// win32metadata: { ... }
},
builder: {
// https://www.electron.build/configuration/configuration
appId: 'Riso',
},
// "chain" is a webpack-chain object https://github.com/neutrinojs/webpack-chain
chainWebpack(/* chain */) {
// do something with the Electron main process Webpack cfg
// extendWebpackMain also available besides this chainWebpackMain
},
// "chain" is a webpack-chain object https://github.com/neutrinojs/webpack-chain
chainWebpackPreload(/* chain */) {
// do something with the Electron main process Webpack cfg
// extendWebpackPreload also available besides this chainWebpackPreload
},
}, },
})) }))

View File

@@ -520,7 +520,7 @@ export default defineComponent({
} }
} }
// console.log('sortBy', sortBy) console.log('sortBy', sortBy)
const filtersearch: any[] = [] const filtersearch: any[] = []
const filtersearch2: any[] = [] const filtersearch2: any[] = []
@@ -867,7 +867,7 @@ export default defineComponent({
pagination.value.sortBy = sortBy pagination.value.sortBy = sortBy
pagination.value.descending = descending pagination.value.descending = descending
// console.log('pagination', pagination) console.log('pagination', pagination)
// ...and turn of loading indicator // ...and turn of loading indicator
loading.value = false loading.value = false

View File

@@ -359,6 +359,7 @@
:columns="mycolumns" :columns="mycolumns"
:filter="myfilter" :filter="myfilter"
v-model:pagination="pagination" v-model:pagination="pagination"
@request="onRequest"
virtual-scroll virtual-scroll
:row-key="colkey" :row-key="colkey"
:loading="loading" :loading="loading"

View File

@@ -15,25 +15,52 @@ import { CCardCarousel } from '@src/components/CCardCarousel'
import { CMyPage } from '@src/components/CMyPage' import { CMyPage } from '@src/components/CMyPage'
import { CMyPageIntro } from '@src/components/CMyPageIntro' import { CMyPageIntro } from '@src/components/CMyPageIntro'
import { CEventsCalendar } from '@src/components/CEventsCalendar' import { CEventsCalendar } from '@src/components/CEventsCalendar'
import { CMyEditor } from '@src/components/CMyEditor'
import MixinMetaTags from '@/mixins/mixin-metatags' import MixinMetaTags from '@/mixins/mixin-metatags'
import { useQuasar } from 'quasar'
import { useI18n } from '@/boot/i18n'
export default defineComponent({ export default defineComponent({
name: 'CMyElem', name: 'CMyElem',
components: { CImgTitle, CTitle, LandingFooter, CEventsCalendar, CCardCarousel, COpenStreetMap, CMyPage, CMyPageIntro }, components: { CImgTitle, CTitle, LandingFooter, CEventsCalendar, CCardCarousel, COpenStreetMap, CMyPage, CMyPageIntro, CMyEditor },
props: { props: {
myelem: { myelem: {
type: Object as PropType<IMyElem>, type: Object as PropType<IMyElem>,
required: true, required: true,
}, },
editOn: {
type: Boolean,
required: false,
default: false,
},
addOn: {
type: Boolean,
required: false,
default: false,
}
}, },
setup(props) { setup(props) {
const globalStore = useGlobalStore() const globalStore = useGlobalStore()
const { setmeta, getsrcbyimg } = MixinMetaTags() const { setmeta, getsrcbyimg } = MixinMetaTags()
const $q = useQuasar()
const { t } = useI18n()
const animare = ref(0) const animare = ref(0)
const slide = ref(0) const slide = ref(0)
const slide2 = ref(0) const slide2 = ref(0)
const disableSave = ref(true)
const neworder = ref(<number|undefined>0)
const myel = toRef(props, 'myelem')
const newtype = ref(<any>'')
watch(() => myel.value.order, (value, oldval) => {
mounted()
})
function getArrDisciplines() { function getArrDisciplines() {
return globalStore.disciplines.filter((rec: any) => rec.showinhome) return globalStore.disciplines.filter((rec: any) => rec.showinhome)
@@ -46,6 +73,69 @@ export default defineComponent({
return '600px' return '600px'
} }
function saveElem() {
// Save Elem record
const myelem = props.myelem
myelem.order = neworder.value
globalStore.saveMyElem($q, t, myelem).then((ris) => {
if (ris) {
// OK
disableSave.value = true
}
})
}
function addNewElem(order?: number) {
const newrec: IMyElem = {
_id: undefined,
type: newtype.value,
path: props.myelem.path,
order: order ? order : 1000,
active: true,
container: ''
}
globalStore.addNewElem($q, t, newrec)
}
function delElem() {
$q.dialog({
message: 'Eliminare ' + props.myelem.container + ' ?',
html: true,
ok: {
label: 'Elimina',
push: true,
},
title: '',
cancel: true,
persistent: false,
}).onOk(async () => {
// Save Elem record
await globalStore.delMyElem($q, t, props.myelem).then((ris) => {
if (ris) {
// OK
disableSave.value = true
}
})
})
}
function modifElem(value: any) {
disableSave.value = false
}
function mounted() {
neworder.value = props.myelem.order
if (props.myelem)
newtype.value = props.myelem.type
}
onMounted(mounted)
return { return {
tools, tools,
shared_consts, shared_consts,
@@ -56,6 +146,14 @@ export default defineComponent({
animare, animare,
setmeta, setmeta,
getsrcbyimg, getsrcbyimg,
saveElem,
myel,
disableSave,
modifElem,
delElem,
addNewElem,
newtype,
neworder,
} }
}, },

View File

@@ -1,56 +1,287 @@
<template> <template>
<div v-if="myelem"> <div v-if="myel">
<div v-if="myelem.type === shared_consts.ELEMTYPE.TEXT"> <q-bar v-if="editOn" dense class="bg-blue-1 text-white q-px-sm">
<div :class="myelem.class">{{ myelem.container }}</div> <q-input
</div> style="max-width: 60px"
<div v-if="myelem.type === shared_consts.ELEMTYPE.MARGINI"> hide-bottom-space
<div :style="`margin: ` + myelem.size"></div> borderless
</div> dense
<div v-else-if="myelem.type === shared_consts.ELEMTYPE.TITLE"> @update:model-value="modifElem"
<CTitle v-model="neworder"
:imgbackground="myelem.imgback" v-on:keyup.enter="saveElem"
:headtitle="myelem.title" :sizes="myelem.size" :styleadd="myelem.styleadd"> type="number"
</CTitle> >
</div> </q-input>
<div v-else-if="myelem.type === shared_consts.ELEMTYPE.IMGTITLE"> <q-space/>
<CImgTitle v-if="myelem.container" :src="myelem.container" :title="myelem.title"> <q-btn
</CImgTitle> icon="fas fa-trash-alt"
</div> color="negative"
<div v-else-if="myelem.type === shared_consts.ELEMTYPE.HTML"> dense
<div :class="myelem.class" v-html="myelem.containerHtml"></div> flat
</div> size="sm"
<div v-else-if="myelem.type === shared_consts.ELEMTYPE.IMAGE"> @click="delElem">
<div class="text-center"> </q-btn>
<q-img :src="myelem.container" class="img" :width="myelem.width" :height="myelem.height"></q-img>
<q-select v-if="addOn"
v-model="newtype"
dense
style="width: 150px;"
:options="shared_consts.TypesElem"
emit-value map-options>
</q-select>
<q-btn
v-if="addOn"
size="sm"
dense
flat
icon="fas fa-plus"
color="positive"
@click="addNewElem(myelem.order-10)">
</q-btn>
</q-bar>
<div v-if="myel.type === shared_consts.ELEMTYPE.TEXT">
<div v-if="editOn">
<q-input
class="fa-border"
@update:model-value="modifElem"
v-model="myel.container"
filled
v-on:keyup.enter="saveElem"
>
</q-input>
</div>
<div v-else
:class="myel.class">{{ myel.container }}
</div> </div>
</div> </div>
<div v-else-if="myelem.type === shared_consts.ELEMTYPE.VIDEO"> <div v-if="myel.type === shared_consts.ELEMTYPE.MARGINI">
<div v-if="editOn">
<q-input
label="Margine:"
class="fa-border"
@update:model-value="modifElem"
v-model="myel.size"
filled
v-on:keyup.enter="saveElem"
>
</q-input>
</div>
<div :style="`margin: ` + myel.size"></div>
</div>
<div v-else-if="myel.type === shared_consts.ELEMTYPE.TITLE">
<div v-if="editOn">
<q-input
class="fa-border"
@update:model-value="modifElem"
v-model="myel.title"
filled
v-on:keyup.enter="saveElem"
>
</q-input>
</div>
<div v-else>
<CTitle
:imgbackground="myel.imgback"
:headtitle="myel.title" :sizes="myel.size" :styleadd="myel.styleadd">
</CTitle>
</div>
</div>
<div v-else-if="myel.type === shared_consts.ELEMTYPE.IMGTITLE">
<div v-if="editOn">
<q-input
label="Img"
class="fa-border"
@update:model-value="modifElem"
v-model="myel.container"
filled
v-on:keyup.enter="saveElem"
>
</q-input>
<q-input
label="Title"
class="fa-border"
@update:model-value="modifElem"
v-model="myel.container"
filled
v-on:keyup.enter="saveElem"
>
</q-input>
</div>
<div v-else>
<CImgTitle v-if="myel.container" :src="myel.container" :title="myel.title">
</CImgTitle>
</div>
</div>
<div v-else-if="myel.type === shared_consts.ELEMTYPE.HTML">
<div v-if="editOn">
<q-input
label="Classe:"
@update:model-value="modifElem"
v-model="myel.class"
filled
v-on:keyup.enter="saveElem"
>
</q-input>
<CMyEditor
v-model:value="myel.containerHtml" title="" @keyup.enter.stop
:showButtons="false"
:canModify="true"
@update:value="modifElem"
@showandsave="saveElem"
>
</CMyEditor>
</div>
<div v-else>
<div :class="myel.class" v-html="myel.containerHtml"></div>
</div>
</div>
<div v-else-if="myel.type === shared_consts.ELEMTYPE.IMAGE">
<div v-if="editOn">
<q-input
label="NomeFile Img:"
@update:model-value="modifElem"
v-model="myel.container"
filled
v-on:keyup.enter="saveElem"
>
</q-input>
<div class="row">
<q-input
label="Width:"
type="number"
@update:model-value="modifElem"
v-model="myel.width"
filled
v-on:keyup.enter="saveElem"
>
</q-input>
<q-input
label="Height:"
type="number"
@update:model-value="modifElem"
v-model="myel.height"
filled
v-on:keyup.enter="saveElem"
>
</q-input>
</div>
</div>
<div class="text-center">
<q-img :src="myel.container" class="img" :width="myel.width.toString()" :height="myel.height.toString()"></q-img>
</div>
</div>
<div v-else-if="myel.type === shared_consts.ELEMTYPE.VIDEO">
<div v-if="editOn" class="row">
<q-input
label="NomeFile Video:"
@update:model-value="modifElem"
v-model="myel.container"
filled
v-on:keyup.enter="saveElem"
>
</q-input>
<q-input
label="Ratio:"
type="number"
@update:model-value="modifElem"
v-model="myel.ratio"
filled
v-on:keyup.enter="saveElem"
>
</q-input>
</div>
<q-video v-if="!!rec.container" :src="rec.container" :ratio="rec.ratio"> <q-video v-if="!!rec.container" :src="rec.container" :ratio="rec.ratio">
</q-video> </q-video>
</div> </div>
<div v-else-if="myelem.type === shared_consts.ELEMTYPE.FOOTER"> <div v-else-if="myel.type === shared_consts.ELEMTYPE.FOOTER">
<LandingFooter></LandingFooter> <LandingFooter></LandingFooter>
</div> </div>
<div v-else-if="myelem.type === shared_consts.ELEMTYPE.PAGE"> <div v-else-if="myel.type === shared_consts.ELEMTYPE.PAGE">
<CMyPage :mypath="myelem.container"></CMyPage> <div v-if="editOn" class="row">
<q-input
label="Nome Pagina:"
@update:model-value="modifElem"
v-model="myel.container"
filled
v-on:keyup.enter="saveElem"
>
</q-input>
</div>
<CMyPage :mypath="myel.container"></CMyPage>
</div> </div>
<div v-else-if="myelem.type === shared_consts.ELEMTYPE.PAGEINTRO"> <div v-else-if="myel.type === shared_consts.ELEMTYPE.PAGEINTRO">
<CMyPageIntro :mypath="myelem.container" :maxheightimg="myelem.heightimg" :maxwidthimg="myelem.widthimg" :link="myelem.link"></CMyPageIntro> <div v-if="editOn" class="row">
<q-input
label="NomeFile Img:"
@update:model-value="modifElem"
v-model="myel.container"
filled
v-on:keyup.enter="saveElem"
>
</q-input>
<q-input
label="Width:"
type="number"
@update:model-value="modifElem"
v-model="myel.widthimg"
filled
v-on:keyup.enter="saveElem"
>
</q-input>
<q-input
label="Height:"
type="number"
@update:model-value="modifElem"
v-model="myel.heightimg"
filled
v-on:keyup.enter="saveElem"
>
</q-input>
<q-input
label="Link:"
@update:model-value="modifElem"
v-model="myel.link"
filled
v-on:keyup.enter="saveElem"
>
</q-input>
</div>
<CMyPageIntro :mypath="myel.container" :maxheightimg="myel.heightimg" :maxwidthimg="myel.widthimg" :link="myel.link"></CMyPageIntro>
</div> </div>
<div v-else-if="myelem.type === shared_consts.ELEMTYPE.CAROUSEL_IDISCIPLINE"> <div v-else-if="myel.type === shared_consts.ELEMTYPE.CAROUSEL_IDISCIPLINE">
<CCardCarousel :myarr="getArrDisciplines()"> <CCardCarousel :myarr="getArrDisciplines()">
</CCardCarousel> </CCardCarousel>
</div> </div>
<div v-else-if="myelem.type === shared_consts.ELEMTYPE.OPENSTREETMAP"> <div v-else-if="myel.type === shared_consts.ELEMTYPE.OPENSTREETMAP">
<!-- Da Fare --> <!-- Da Fare -->
<COpenStreetMap :imgmap="getValDb('IMGMAP', false)" :urlmap="getValDb('URLMAP', false)" :title="getValDb('MAP_TITLE', false)" <COpenStreetMap :imgmap="getValDb('IMGMAP', false)" :urlmap="getValDb('URLMAP', false)" :title="getValDb('MAP_TITLE', false)"
:coordinates="getValDb('COORD_MAP_1', false)" :coord_big="getValDb('COORD_MAP_BIG', false)"> :coordinates="getValDb('COORD_MAP_1', false)" :coord_big="getValDb('COORD_MAP_BIG', false)">
</COpenStreetMap> </COpenStreetMap>
</div> </div>
<div v-else-if="myelem.type === shared_consts.ELEMTYPE.CAROUSEL_IMGS"> <div v-else-if="myel.type === shared_consts.ELEMTYPE.CAROUSEL_IMGS">
<section class="maxwidth padding_gallery bg-white text-grey-10 text-center" > <section class="maxwidth padding_gallery bg-white text-grey-10 text-center">
<div v-if="editOn" class="row">
<q-input
label="lista:"
@update:model-value="modifElem"
v-model="myel.list"
filled
v-on:keyup.enter="saveElem"
>
</q-input>
</div>
<q-carousel <q-carousel
swipeable swipeable
@@ -61,42 +292,43 @@
thumbnails thumbnails
infinite infinite
height="600"> height="600">
<q-carousel-slide v-for="(rec, index) in myelem.list" :key="index" :name="index" <q-carousel-slide v-for="(rec, index) in myel.list" :key="index" :name="index"
:img-src="getsrcbyimg(`images/`+ rec.imagefile)" :img-src="getsrcbyimg(`images/`+ rec.imagefile)"
:alt="rec.alt" :alt="rec.alt"
class="carousel_slide"> class="carousel_slide">
<div class="absolute-bottom custom-caption" style="margin-bottom: 70px"> <div class="absolute-bottom custom-caption" style="margin-bottom: 70px">
<div class="text-h5"><span <div class="text-h5"><span
class="text-h6 text-grey-1 shadow-max">{{index + 1}}. </span> class="text-h6 text-grey-1 shadow-max">{{ index + 1 }}. </span>
<span v-if="rec.alt" <span v-if="rec.alt"
class="text-h6 text-grey-2 shadow">{{rec.alt}}</span></div> class="text-h6 text-grey-2 shadow">{{ rec.alt }}</span></div>
<div class="text-subtitle1" v-if="rec.description"><span class="text-grey-4 shadow">{{rec.description}}</span> <div class="text-subtitle1" v-if="rec.description"><span class="text-grey-4 shadow">{{ rec.description }}</span>
</div> </div>
</div> </div>
</q-carousel-slide> </q-carousel-slide>
</q-carousel> </q-carousel>
</section> </section>
</div> </div>
<div v-else-if="myelem.type === shared_consts.ELEMTYPE.CAROUSEL_HOME"> <div v-else-if="myel.type === shared_consts.ELEMTYPE.CAROUSEL_HOME">
<section> <section>
<div class="landing"> <div class="landing">
<div class="landing__hero maxwidth1200 text-white"> <div class="landing__hero maxwidth1200 text-white">
<q-carousel <q-carousel
animated animated
:autoplay="animare" :autoplay="animare"
swipeable swipeable
infinite infinite
navigation navigation
transition-next="slide-left" transition-next="slide-left"
transition-prev="slide-right" transition-prev="slide-right"
v-model="slide" v-model="slide"
:height="getheightgallery()" :height="getheightgallery()"
width="100%" width="100%"
> >
<q-carousel-slide <q-carousel-slide
v-for="(myrec, ind) in myelem.list" :key="ind" v-for="(myrec, ind) in myel.list" :key="ind"
:name="ind" :name="ind"
:img-src="getsrcbyimg(`images/`+ myrec.imagefile)"> :img-src="getsrcbyimg(`images/`+ myrec.imagefile)">
<div class="landing__header"></div> <div class="landing__header"></div>
<div class="landing__hero-content row justify-center q-gutter-xs clgutter"> <div class="landing__hero-content row justify-center q-gutter-xs clgutter">
@@ -107,13 +339,13 @@
<div class="q-gutter-xs testo-banda clgutter"> <div class="q-gutter-xs testo-banda clgutter">
<h1 class="text-h1 shadow-max">{{ tools.getappname() }}</h1> <h1 class="text-h1 shadow-max">{{ tools.getappname() }}</h1>
<div class="text-subtitle1 shadow text-italic q-pl-sm"> <div class="text-subtitle1 shadow text-italic q-pl-sm">
{{myelem.container}}&nbsp; {{ myel.container }}&nbsp;
</div> </div>
<div class="text-subtitle1 shadow-max big text-italic q-pl-sm"> <div class="text-subtitle1 shadow-max big text-italic q-pl-sm">
{{myelem.container2}} {{ myel.container2 }}
</div> </div>
<div class="text-subtitle2 shadow text-italic q-pl-sm"> <div class="text-subtitle2 shadow text-italic q-pl-sm">
{{myelem.container3}} {{ myel.container3 }}
</div> </div>
<div> <div>
<br><br> <br><br>
@@ -129,23 +361,34 @@
class="q-icon text-h2 text-white material-icons">expand_more</i> class="q-icon text-h2 text-white material-icons">expand_more</i>
</div>--> </div>-->
</q-carousel-slide> </q-carousel-slide>
</q-carousel> </q-carousel>
</div> </div>
</div> </div>
</section> </section>
</div> </div>
<div v-else-if="myelem.type === shared_consts.ELEMTYPE.CALENDAR"> <div v-else-if="myel.type === shared_consts.ELEMTYPE.CALENDAR">
<CEventsCalendar :mysingleevent="null" :showfirstN="myelem.number || 3"> <CEventsCalendar :mysingleevent="null" :showfirstN="myel.number || 3">
</CEventsCalendar> </CEventsCalendar>
</div> </div>
<div v-else-if="myelem.type === shared_consts.ELEMTYPE.CHECK_EMAIL"> <div v-else-if="myel.type === shared_consts.ELEMTYPE.CHECK_EMAIL">
<div class="q-pa-md q-gutter-md"> <div class="q-pa-md q-gutter-md">
<div v-if="tools.isLogged() && !isVerified" class="text-verified">{{ <div v-if="tools.isLogged() && !isVerified" class="text-verified">{{
$t('components.authentication.email_verification.link_sent') }} $t('components.authentication.email_verification.link_sent')
}}
</div> </div>
</div> </div>
</div> </div>
<q-btn
v-if="editOn && !disableSave"
icon="fas fa-check"
color="positive"
label="Salva"
size="sm"
:disable="disableSave"
@click="saveElem">
</q-btn>
</div> </div>
</template> </template>

View File

@@ -66,7 +66,9 @@ export default defineComponent({
load() load()
return { rec } return {
rec, globalStore
}
}, },
}) })

View File

@@ -24,9 +24,7 @@
<div v-if="!!rec.content3" v-html="rec.content3"></div> <div v-if="!!rec.content3" v-html="rec.content3"></div>
<q-video v-if="!!rec.video3" :src="rec.video3" :ratio="rec.ratio3"></q-video> <q-video v-if="!!rec.video3" :src="rec.video3" :ratio="rec.ratio3"></q-video>
<div v-if="!!rec.content4" v-html="rec.content4"></div> <div v-if="!!rec.content4" v-html="rec.content4"></div>
</div> </div>
</div> </div>
<div v-else> <div v-else>

View File

@@ -0,0 +1,98 @@
import {
computed,
defineComponent, onMounted, ref, toRef, watch,
} from 'vue'
import { IMyElem, IMyPage } from '@src/model'
import { useGlobalStore } from '@store/globalStore'
import { LandingFooter } from '@/components/LandingFooter'
import { CMyElem } from '@/components/CMyElem'
import { CImgTitle } from '../CImgTitle/index'
import { CTitle } from '../CTitle/index'
import { tools } from '@store/Modules/tools'
import { useQuasar } from 'quasar'
import { useI18n } from '@/boot/i18n'
import { shared_consts } from '@/common/shared_vuejs'
export default defineComponent({
name: 'CMyPageElem',
components: { LandingFooter, CImgTitle, CTitle, CMyElem },
props: {
title: String,
mypath: {
type: String,
required: true,
},
img: {
type: String,
required: false,
default: '',
},
imgbackground: {
type: String,
required: false,
default: '',
},
sizes: {
type: String,
required: false,
default: '',
},
styleadd: {
type: String,
required: false,
default: '',
},
nofooter: {
type: Boolean,
required: false,
default: false,
},
},
setup(props) {
const rec = ref<IMyPage | null>(null)
const mypathin = toRef(props, 'mypath')
const $q = useQuasar()
const { t } = useI18n()
const editOn = ref(false)
const addOn = ref(false)
const globalStore = useGlobalStore()
const myelems = computed(() => {
if (mypathin.value)
return globalStore.getMyElems(mypathin.value)
else
return null
})
const load = async (): Promise<void> => {
// console.log('load', mypathin.value)
if (mypathin.value !== '') rec.value = await globalStore.loadPage('/' + mypathin.value)
}
watch(() => props.mypath, async (to: string, from: string) => {
console.log('... load', mypathin.value, props.mypath)
await load()
})
onMounted(load)
return {
rec, myelems,
mypathin,
editOn,
addOn,
tools,
shared_consts,
}
},
})

View File

@@ -0,0 +1,75 @@
<template>
<div>
<div v-if="mypathin && !!rec">
<q-toolbar>
<q-toggle v-if="tools.isManager()"
v-model="editOn"
icon="fas fa-pencil-alt"
>
</q-toggle>
<q-toggle v-if="tools.isManager()"
v-model="addOn"
icon="fas fa-plus"
>
</q-toggle>
</q-toolbar>
<div class="q-ma-sm q-gutter-sm q-pa-xs">
<div v-if="!!rec.img1" class="text-center">
<q-img :src="``+ rec.img1" class="img"></q-img>
</div>
<div v-if="!!rec.content" v-html="rec.content"></div>
<q-video v-if="!!rec.video1" :src="rec.video1" :ratio="rec.ratio1">
</q-video>
<div v-if="!!rec.img2" class="text-center">
<q-img :src="``+ rec.img2" class="img"></q-img>
</div>
<div v-if="!!rec.content2" v-html="rec.content2"></div>
<q-video v-if="!!rec.video2" :src="rec.video2" :ratio="rec.ratio2"></q-video>
<div v-if="!!rec.img3" class="text-center">
<q-img :src="``+ rec.img2" class="img"></q-img>
</div>
<div v-if="!!rec.content3" v-html="rec.content3"></div>
<q-video v-if="!!rec.video3" :src="rec.video3" :ratio="rec.ratio3"></q-video>
<div v-if="!!rec.content4" v-html="rec.content4"></div>
<span v-for="(myelem, ind) in myelems" :key="ind">
<CMyElem v-if="myelem.active" :myelem="myelem" :editOn="editOn" :addOn="addOn">
</CMyElem>
</span>
</div>
</div>
<div v-else>
<div v-if="!!title">
<CTitle
v-if="imgbackground" :imgbackground="imgbackground"
:headtitle="title" :sizes="sizes" :styleadd="styleadd"></CTitle>
<div v-if="!imgbackground">
<CImgTitle v-if="img" :src="img" :title="title">
</CImgTitle>
</div>
<slot></slot>
<div v-if="!nofooter">
<LandingFooter></LandingFooter>
</div>
</div>
</div>
</div>
</template>
<script lang="ts" src="./CMyPageElem.ts">
</script>
<style lang="scss" scoped>
@import './CMyPageElem.scss';
</style>

View File

@@ -0,0 +1 @@
export { default as CMyPageElem } from './CMyPageElem.vue'

View File

@@ -0,0 +1,4 @@
Con la mia contribuzione, dopo l'approvazione dell'assemblea generale entro a far parte del Comitato, con la mia
presenza morale, spirituale, intellettuale e/o contribuendo alle attività pratiche necessarie alla creazione ed
attuazione degli scopi costitutivi.

View File

@@ -16,6 +16,7 @@ export * from './CMyCart'
export * from './CMyFieldDb' export * from './CMyFieldDb'
export * from './CMyFieldRec' export * from './CMyFieldRec'
export * from './CMyPage' export * from './CMyPage'
export * from './CMyPageElem'
export * from './CMyPageIntro' export * from './CMyPageIntro'
export * from './CMyElem' export * from './CMyElem'
export * from './CMyTeacher' export * from './CMyTeacher'

View File

@@ -1,9 +1,9 @@
const msg_website_it = { const msg_website_it = {
ws: { ws: {
sitename: 'Riso', sitename: 'KolibriLab',
siteshortname: 'RISO', siteshortname: 'KolibriLab',
description: 'Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.', description: '',
keywords: 'riso, piattaforma di scambio, rete italiana scambio orizzontale, riso app, riso piattaforma, scambio e baratto, momenta RIS', keywords: '',
}, },
products: { products: {
quantity: 'Quantità', quantity: 'Quantità',
@@ -54,9 +54,9 @@ const msg_website_it = {
need_Telegram: 'Per poter utilizzare la Piattaforma occorre avere <a href="https://play.google.com/store/apps/details?id=org.telegram.messenger" target="_blank">Telegram</a> installato<br>', need_Telegram: 'Per poter utilizzare la Piattaforma occorre avere <a href="https://play.google.com/store/apps/details?id=org.telegram.messenger" target="_blank">Telegram</a> installato<br>',
Registrazione_Con_Bot: '1) Copia questo username cliccandoci sopra:', Registrazione_Con_Bot: '1) Copia questo username cliccandoci sopra:',
SignUpIscrizione: 'Diventa Socio CNM', SignUpIscrizione: 'Diventa Socio CNM',
SignUpArcadei: 'Aderisci ad Arcadei',
SignUp_alreadylista: 'Registrazione per quelli che erano già nella lista di Notevole (del 2019) !', SignUp_alreadylista: 'Registrazione per quelli che erano già nella lista di Notevole (del 2019) !',
SignUp2: 'Registrazione', SignUp2: 'Registrazione',
SignUp3: 'Reg',
SignUpBot: 'Registrati', SignUpBot: 'Registrati',
SignIn: 'Login', SignIn: 'Login',
status: 'Statistiche', status: 'Statistiche',
@@ -114,8 +114,10 @@ const msg_website_it = {
hours: 'Ore', hours: 'Ore',
department: 'Uffici', department: 'Uffici',
title: 'Titolo', title: 'Titolo',
subtitle: 'SottoTitolo',
path: 'Percorso', path: 'Percorso',
img1: 'Immagine 1', img1: 'Immagine 1',
imgsize: 'ImgSize',
contentfield: 'Testo 1', contentfield: 'Testo 1',
video1: 'Video 1', video1: 'Video 1',
ratio1: 'Ratio 1', ratio1: 'Ratio 1',
@@ -142,8 +144,8 @@ const msg_website_it = {
color: 'Colore', color: 'Colore',
}, },
msg: { msg: {
myAppName: 'Riso', myAppName: 'Arcadei',
myAppDescription: 'Il primo Vero Social Libero, Equo e Solidale, dove Vive Consapevolezza e Aiuto Comunitario. Gratuito', myAppDescription: 'Modello Comunitario',
underconstruction: 'App in costruzione...', underconstruction: 'App in costruzione...',
myDescriz: '', myDescriz: '',
sottoTitoloApp: 'Il primo Vero Social', sottoTitoloApp: 'Il primo Vero Social',
@@ -158,32 +160,37 @@ const msg_website_it = {
+ ' che intere popolazioni antiche conoscevano bene.', + ' che intere popolazioni antiche conoscevano bene.',
descrapp_pag2: 'E\' giunta l\'ora di utilizzare i nuovi strumenti <strong>Tecnologici</strong> a nostro <strong>favore</strong>, per <strong>Liberarci</strong> ' descrapp_pag2: 'E\' giunta l\'ora di utilizzare i nuovi strumenti <strong>Tecnologici</strong> a nostro <strong>favore</strong>, per <strong>Liberarci</strong> '
+ 'così piano piano dalla <strong>schiavitù</strong> del <strong>"Lavoro per generare Denaro"</strong> e trasformando le nostre <strong>Capacitá</strong> in ' + 'così piano piano dalla <strong>schiavitù</strong> del <strong>"Lavoro per generare Denaro"</strong> e trasformando le nostre <strong>Capacitá</strong> in '
+ '<strong>Risorse Umane</strong> per poterci sostenere e vivere in <strong>Armonia</strong> con gli altri.<br>' + + '<strong>Risorse Umane</strong> per poterci sostenere e vivere in <strong>Armonia</strong> con gli altri.',
'<br><strong>R.I.S.O.</strong><br>' +
'<em>Siamo una rete di comunità consapevoli, basata sul sostegno reciproco, la fiducia, la condivisione e l\'ascolto. \n' +
'Coltiviamo terreno fertile per creare, in armonia con la natura, un mondo di collettività libere e autosufficienti, attraverso un circuito di scambio di esperienze umane, beni e servizi.<br>' +
'Partecipa al cambiamento. RISO sei anche tu!</em>',
freesocial: { freesocial: {
title: 'Social', title: 'Social',
descr: 'Una Community organizzata per <strong>Categorie</strong>, dove potrai unirti a <strong>Gruppi Tematici</strong>, ' descr: 'Una Community organizzata per <strong>Categorie</strong>, dove potrai unirti a <strong>Gruppi Tematici</strong>, '
+ 'Condividere <strong>Esperienze</strong> e unire Competenze per organizzare e sostenere <strong>Progetti Innovativi</strong> per il Popolo.<br><br>' + 'Condividere <strong>Esperienze</strong> e unire Competenze per organizzare e sostenere <strong>Progetti Innovativi</strong> per il Popolo.<br><br>'
+ 'Verranno evidenziati sviluppi <strong>Etici</strong> come l\'<strong>Auto-Produzione</strong>, la <strong>Sostenibilitá</strong>, ' + 'Verranno evidenziati sviluppi <strong>Etici</strong> come l\'<strong>Auto-Produzione</strong>, la <strong>Sostenibilitá</strong>, '
+ 'la Buona <strong>Salute Naturale</strong> e il <strong>Rispetto per l\'Ambiente</strong> e per tutti gli <strong>Esseri Viventi</strong> di questo ' + 'la Buona <strong>Salute Naturale</strong> e il <strong>Rispetto per l\'Ambiente</strong> e per tutti gli <strong>Esseri Viventi</strong> di questo '
+ '<strong>Pianeta</strong>.', + '<strong>Pianeta</strong>. Chiunque potrá esprimere il proprio <strong>Consenso o Dissenso</strong> partecipando a <strong>Sondaggi Interattivi</strong>'
+ ' e realizzare insieme i <strong>Cambiamenti</strong> necessari alla nostra Società.',
}, },
freetalent: { freetalent: {
title: 'Beni e Servizi', title: 'Beni e Servizi',
descr: 'Condividi i tuoi <strong>Talenti</strong> e <strong>Abilità</strong>, ' descr: 'Condividi i tuoi <strong>Talenti</strong> e <strong>Abilità</strong>, '
+ 'Nel Dare e Ricevere, si creeranno così legami di <strong>Amicizia, Solidarietà, Cooperazione e Divertimento</strong><br><br>' + + 'Nel Dare e Ricevere, si creeranno così legami di <strong>Amicizia, Solidarietà, Cooperazione e Divertimento</strong><br><br>' +
'Favoriamo lo scambio locale di <strong>Beni e Servizi</strong> dove potrai scegliere cosa chiedere in cambio (Dono, Offerta Libera, Baratto, Monete Alternative, ecc...).' 'Favoriamo lo scambio locale di <strong>Beni e Servizi</strong> grazie ad un sistema di baratto organizzato, in cui la comunità stessa si pone come garante.'
}, },
coin: { coin: {
title: 'RIS - Credito Alternativo', title: 'RIS - Credito Alternativo',
descr: '<strong>Stiamo lavorando</strong> anche per creare una sorta di "moneta alternativa" per conteggiare gli scambi che avvengono tra di noi, quando il semplice baratto risulta non applicabile.<br>' +
'Partendo dalle basi del <strong>Si.Cre.Na.C.C - Sistema di Credito Naturale a Copertura Certa</strong>.<br>' +
'<em>Ciascun operatore potrà creare moneta all\'occorrenza, se il saldo del suo conto non sarà sufficiente a coprire la spesa. Potrà quindi mandare il suo conto in "scoperto", accollandosi il conseguente' +
' Debito, accreditando l\'equivalente somma all\'operatore ricevente, il quale la annovera nel suo conto in qualità di Credito. ' +
'L\'equilibrio tra il credito dell\'uno ed il debito dell\'altro ha come conseguenza che il debitore dovrà lavorare per rifondere il debito, mentre il ricevente potrà usare il credito come moneta.</em><br>' +
'Per maggiori informazioni consultare il libro gratuito <a href="https://sicrenacc.info/" target="_blank">cliccando qui</a>.'
}, },
freeliving: { freeliving: {
title: 'Gruppi Territoriali', title: 'Gruppi Territoriali',
descr: 'Questo progetto vuole diffondere la creazione di Gruppi Territoriali Provinciali, ' descr: 'Questo progetto vuole diffondere la creazione di Gruppi Territoriali Provinciali,'
+ 'per poter favorire progetti condivisi in ambito territoriale e creare così una <strong>Rete di Fiducia</strong> fino al <strong>vicinato</strong>, come giá viene praticato in piccolo, in numerosi <strong>Ecovillaggi</strong> e Comunità del mondo.', + 'per poter favorire progetti condivisi in ambito territoriale e creare così una <strong>Rete di Fiducia</strong> fino al vicinato, come giá viene praticato in piccolo, in numerosi <strong>Ecovillaggi</strong> e Comunità del mondo.',
}, },
freecollabora: { freecollabora: {
@@ -231,9 +238,9 @@ const msg_website_it = {
}, },
multiplatform: { multiplatform: {
title: 'Multi-piattaforma', title: 'Multi-piattaforma',
descr: 'E\' compatibile con Google Chrome, Firefox, Opera, Safari, iPhone, Android e PC. L\'Applicazione s\'installa facilmente, senza dover passare dallo store. ' descr: 'E\' compatibile con Google Chrome, Firefox, Opera, Safari, iPhone, Android e PC. L\'Applicazione s\'installa facilmente, senza passare dallo store. '
+ 'basta entrare sul sito <strong>www.riso.app</strong>.<br>' + 'basta entrare sul sito <strong>www.riso.app</strong>.<br>'
+ 'Dopo la registrazione chiederà di aggiungerlo alla <strong>Schermata Home</strong> (oppure cliccare sul menu "..." del browser e scegliere "<strong>Installa APP</strong>")', + 'Dopo la registrazione chiederà di aggiungerlo allo schermo (o cliccare sul menu del browser "Installa APP")',
}, },
free: { free: {
title: 'Gratuita, Open Source e Niente Pubblicità', title: 'Gratuita, Open Source e Niente Pubblicità',

View File

@@ -7,29 +7,29 @@ import {
import { func } from '@store/Modules/fieldsTable' import { func } from '@store/Modules/fieldsTable'
const functionality: IFunctionality = { const functionality: IFunctionality = {
PWA: true, PWA: false,
SHOW_USER_MENU: true, // Cambiare con true SHOW_USER_MENU: true, // Cambiare con true
SHOW_PROFILE: true, SHOW_PROFILE: true,
SHOW_REG_BUTTON: true, SHOW_REG_BUTTON: true,
ENABLE_REGISTRATION: true, ENABLE_REGISTRATION: true,
ENABLE_REG_BY_BOT: true, ENABLE_REG_BY_BOT: false,
ENABLE_REG_NEED_TELEGRAM: true, ENABLE_REG_NEED_TELEGRAM: false,
SHOW_NEWSLETTER: false, SHOW_NEWSLETTER: false,
SHOW_ONLY_POLICY: true, SHOW_ONLY_POLICY: true,
ENABLE_TODOS_LOADING: false, ENABLE_TODOS_LOADING: false,
ENABLE_PROJECTS_LOADING: false, ENABLE_PROJECTS_LOADING: false,
SHOW_IF_IS_SERVER_CONNECTION: false, SHOW_IF_IS_SERVER_CONNECTION: false,
SHOW_MESSAGES: false, SHOW_MESSAGES: false,
SHOW_NOTIF: true, SHOW_NOTIF: false,
SHOW_COINS: true, SHOW_COINS: false,
BOOKING_EVENTS: true, BOOKING_EVENTS: false,
ENABLE_ECOMMERCE: false, ENABLE_ECOMMERCE: false,
ENABLE_REG_ISP: true, ENABLE_REG_ISP: true,
ENABLE_GROUPS: true, ENABLE_GROUPS: false,
ENABLE_CIRCUITS: true, ENABLE_CIRCUITS: false,
SHOW_COMPETENZE: true, SHOW_COMPETENZE: false,
ENABLE_VIEW_GROUPS: true, ENABLE_VIEW_GROUPS: false,
ENABLE_VIEW_USERS: true, ENABLE_VIEW_USERS: false,
ENABLE_VIEW_PROFILE: true, ENABLE_VIEW_PROFILE: true,
} }
@@ -345,6 +345,20 @@ const routes_manager: IListRoutes[] = [
onlyManager: true, onlyManager: true,
onlyEditor: true onlyEditor: true
}, },
{
active: true,
order: 32,
path: '/admin/home',
materialIcon: 'fas fa-file-alt',
name: 'otherpages.admin.elems',
component: () => import('@/rootgen/admin/editElems/editElems.vue'),
inmenu: true,
submenu: true,
level_parent: 0,
level_child: 0.5,
onlyManager: true,
onlyEditor: true
},
{ {
active: true, active: true,
order: 30, order: 30,
@@ -476,78 +490,12 @@ const baseroutes: IListRoutes[] = [
path: '/', path: '/',
materialIcon: 'home', materialIcon: 'home',
name: 'pages.home', name: 'pages.home',
component: () => import('@src/root/mainview/mainview.vue'), component: () => import('@src/root_spec/home_kolibrilab/home_kolibrilab.vue'),
reqauth: false, reqauth: false,
inmenu: true, inmenu: true,
infooter: true, infooter: true,
}, },
{ /*{
active: true,
order: 12,
path: '/goods',
materialIcon: 'fas fa-tshirt',
name: 'mypages.goods',
component: () => import('@/root/goods/goods.vue'),
meta: { requiresAuth: true },
inmenu: true,
infooter: true,
},
{
active: true,
order: 15,
path: '/services',
materialIcon: 'fas fa-house-user',
name: 'mypages.services',
component: () => import('@/root/services/services.vue'),
meta: { requiresAuth: true },
inmenu: true,
infooter: true,
},
{
active: true,
order: 15,
path: '/provapao',
materialIcon: 'fas fa-house-user',
name: 'mypages.provapao',
component: () => import('@/root/provapao/provapao.vue'),
meta: { requiresAuth: true },
inmenu: false,
infooter: false,
},
{
active: true,
order: 15,
path: '/hosps',
materialIcon: 'fas fa-bed',
name: 'mypages.hosp',
component: () => import('@/root/hosp/hosp.vue'),
meta: { requiresAuth: true },
inmenu: true,
infooter: true,
},
{
active: true,
order: 20,
path: '/events',
materialIcon: 'fas fa-bullhorn',
name: 'mypages.events',
component: () => import('@/root/eventi/eventi.vue'),
meta: { requiresAuth: true },
inmenu: true,
infooter: true,
},
{
active: true,
order: 100,
path: '/presentazione',
materialIcon: 'fas fa-info',
name: 'pages.presentazione',
component: () => import('@src/root/presentazione/presentazione.vue'),
reqauth: false,
inmenu: true,
infooter: true,
},
{
active: true, active: true,
order: 120, order: 120,
path: '/myprofile', path: '/myprofile',
@@ -557,7 +505,7 @@ const baseroutes: IListRoutes[] = [
meta: { requiresAuth: true }, meta: { requiresAuth: true },
inmenu: true, inmenu: true,
infooter: true, infooter: true,
}, },*/
{ {
active: true, active: true,
order: 120, order: 120,
@@ -569,17 +517,6 @@ const baseroutes: IListRoutes[] = [
inmenu: false, inmenu: false,
infooter: false, infooter: false,
}, },
{
active: true,
order: 130,
path: '/friends',
materialIcon: 'fas fa-user-friends',
name: 'mypages.friends',
component: () => import('@/views/user/myfriends/myfriends.vue'),
meta: { requiresAuth: true },
inmenu: true,
infooter: true,
},
{ {
active: functionality.ENABLE_GROUPS, active: functionality.ENABLE_GROUPS,
order: 132, order: 132,
@@ -623,7 +560,7 @@ const baseroutes: IListRoutes[] = [
meta: { requiresAuth: true, newpage: true }, meta: { requiresAuth: true, newpage: true },
inmenu: false, inmenu: false,
infooter: false, infooter: false,
},{ }, {
active: true, active: true,
order: 137, order: 137,
path: '/circuit/:path', path: '/circuit/:path',
@@ -678,16 +615,6 @@ const baseroutes: IListRoutes[] = [
inmenu: false, inmenu: false,
infooter: false, infooter: false,
}, },
{
active: true,
order: 150,
path: '/fundraising',
materialIcon: 'fas fa-hand-holding-heart',
name: 'pages.fundraising',
component: () => import('@src/root/fundraising/fundraising.vue'),
inmenu: true,
infooter: true,
},
{ {
active: true, active: true,
order: 200, order: 200,
@@ -709,6 +636,17 @@ const baseroutes: IListRoutes[] = [
inmenu: false, inmenu: false,
infooter: false, infooter: false,
}, },
{
active: true,
order: 15,
path: '/provapao',
materialIcon: 'fas fa-house-user',
name: 'mypages.provapao',
component: () => import('@/root/provapao/provapao.vue'),
meta: { requiresAuth: true },
inmenu: false,
infooter: false,
},
{ {
active: true, active: true,
order: 400, order: 400,
@@ -770,17 +708,6 @@ const baseroutes: IListRoutes[] = [
inmenu: false, inmenu: false,
infooter: true infooter: true
}, },
{
active: functionality.ENABLE_REGISTRATION && functionality.ENABLE_REG_NEED_TELEGRAM,
order: 1000,
path: '/signup/:invited/:usernameteleg/:idteleg/:regexpire',
materialIcon: 'how_to_reg',
name: 'pages.SignUp',
component: () => import('@/views/login/signup/signup.vue'),
inmenu: false,
infooter: false,
separator: false
},
{ {
active: functionality.ENABLE_REG_BY_BOT, active: functionality.ENABLE_REG_BY_BOT,
order: 1000, order: 1000,
@@ -791,34 +718,23 @@ const baseroutes: IListRoutes[] = [
infooter: functionality.ENABLE_REG_BY_BOT, infooter: functionality.ENABLE_REG_BY_BOT,
separator: false separator: false
}, },
/*{ {
active: functionality.ENABLE_REGISTRATION && !functionality.ENABLE_REG_NEED_TELEGRAM, active: functionality.ENABLE_REGISTRATION && !functionality.ENABLE_REG_NEED_TELEGRAM,
order: 1000, order: 1000,
path: '/signup', path: '/signup',
materialIcon: 'how_to_reg', materialIcon: 'how_to_reg',
name: 'pages.SignUp', name: 'pages.SignUp',
component: () => import('@/views/login/signup/signup_noteleg.vue'), component: () => import('@/views/login/signup_noteleg/signup_noteleg.vue'),
inmenu: false,
infooter: false,
separator: false
},*/
{
active: true,
order: 1001,
path: '/signup/:invited',
materialIcon: 'how_to_reg',
name: 'pages.SignUp2',
component: () => import('@/views/login/signup/signup.vue'),
inmenu: false, inmenu: false,
infooter: false, infooter: false,
separator: false separator: false
}, },
{ {
active: true, active: true,
order: 1002, order: 1001,
path: '/signup/:invited/:regexpire', path: '/signup/:invited',
materialIcon: 'how_to_reg', materialIcon: 'how_to_reg',
name: 'pages.SignUp3', name: 'pages.SignUp2',
component: () => import('@/views/login/signup/signup.vue'), component: () => import('@/views/login/signup/signup.vue'),
inmenu: false, inmenu: false,
infooter: false, infooter: false,
@@ -842,7 +758,7 @@ const baseroutes: IListRoutes[] = [
materialIcon: 'account_circle', materialIcon: 'account_circle',
name: 'pages.SignIn', name: 'pages.SignIn',
component: () => import('@/views/login/signin_noreg/signin_noreg.vue'), component: () => import('@/views/login/signin_noreg/signin_noreg.vue'),
inmenu: true, inmenu: false,
infooter: true infooter: true
}, },
// --- NOT IN MENU: --- // --- NOT IN MENU: ---
@@ -882,7 +798,7 @@ const baseroutes: IListRoutes[] = [
isseparator: true, isseparator: true,
inmenu: true, inmenu: true,
}, },
{ /*{
active: true, active: true,
order: 80, order: 80,
path: '/calendario-eventi', path: '/calendario-eventi',
@@ -893,6 +809,8 @@ const baseroutes: IListRoutes[] = [
inmenu: true, inmenu: true,
infooter: true infooter: true
}, },
*/
{ {
active: true, active: true,
order: 1000, order: 1000,

View File

@@ -114,6 +114,7 @@ export interface IMyBot {
export interface IMyElem { export interface IMyElem {
_id?: string _id?: string
type?: number type?: number
path?: string
title?: string title?: string
container?: string container?: string
container2?: string container2?: string
@@ -123,11 +124,11 @@ export interface IMyElem {
ratio?: string ratio?: string
containerHtml?: string containerHtml?: string
size?: string size?: string
order?: string order?: number
width?: string width?: number
height?: string height?: number
heightimg?: string heightimg?: number
widthimg?: string widthimg?: number
link?: string link?: string
onlyif_logged?: boolean onlyif_logged?: boolean
active?: boolean active?: boolean

View File

@@ -3,11 +3,11 @@ import { defineComponent, ref, onMounted, watch, computed } from 'vue'
import { useGlobalStore } from '@store/globalStore' import { useGlobalStore } from '@store/globalStore'
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'
import MixinMetaTags from '@/mixins/mixin-metatags' import MixinMetaTags from '@/mixins/mixin-metatags'
import { CMyPage } from '@/components/CMyPage' import { CMyPageElem } from '@/components/CMyPageElem'
export default defineComponent({ export default defineComponent({
name: 'Mypage', name: 'Mypage',
components: { CMyPage }, components: { CMyPageElem },
setup() { setup() {
const rec = ref({}) const rec = ref({})
const globalStore = useGlobalStore() const globalStore = useGlobalStore()

View File

@@ -1,6 +1,7 @@
<template> <template>
<div v-if="isfinishLoading && !!rec"> <div v-if="isfinishLoading && !!rec">
<CMyPage <CMyPageElem
v-if="rec.path"
:title="rec.title" :imgbackground="`` + rec.imgback" :title="rec.title" :imgbackground="`` + rec.imgback"
:mypath="rec.path" :mypath="rec.path"
:sizes="`max-height: ` + rec.heightimg + `px`"> :sizes="`max-height: ` + rec.heightimg + `px`">
@@ -14,7 +15,7 @@
}} }}
</span> </span>
</CMyPage> </CMyPageElem>
</div> </div>
</template> </template>
<script lang="ts" src="./mypage.ts"> <script lang="ts" src="./mypage.ts">

View File

@@ -412,6 +412,12 @@ body.mobile .landing:before {
font-size: 0.6rem; font-size: 0.6rem;
} }
.carousel_img_3 {
//background-image: url(../../public/images/cibo_sano.jpg);
background-size: 620px 620px !important;
background-position: 50% top !important;
background-repeat: no-repeat !important;
}
} }

View File

View File

@@ -0,0 +1,67 @@
import { defineComponent, ref, onMounted, computed, watch } from 'vue'
import { CImgText } from '../../../components/CImgText/index'
import { CCard } from '@/components/CCard'
import { CMyPage } from '@/components/CMyPage'
import { CTitleBanner } from '@/components/CTitleBanner'
import { CGridTableRec } from '@/components/CGridTableRec'
import { colmyelems } from '@src/store/Modules/fieldsTable'
import MixinMetaTags from '@/mixins/mixin-metatags'
import { tools } from '@store/Modules/tools'
import { shared_consts } from '@/common/shared_vuejs'
import { IMyPage } from 'model'
import { useGlobalStore } from '@store/globalStore'
export default defineComponent({
name: 'editElems',
setup() {
const { setmeta } = MixinMetaTags()
const globalStore = useGlobalStore()
const arrPages = ref([] as any[])
const pageSel = ref('')
watch(() => pageSel.value, (newval: any, oldval) => {
tools.setCookie('s_elems', newval)
})
const filtercustom = computed(() => [{ path: pageSel.value }] )
function mounted() {
arrPages.value = []
arrPages.value.push({label: '[Vuoto]', path: ''})
for (const page of globalStore.mypage) {
const rec = {
// @ts-ignore
label: page.title,
// @ts-ignore
value: page.path
}
arrPages.value.push(rec)
}
// filtercustom.value = [{ userId: userStore.my._id }]
}
onMounted(mounted)
pageSel.value = tools.getCookie('s_elems', '')
return {
colmyelems,
setmeta,
arrPages,
pageSel,
filtercustom,
}
},
components: { CImgText, CCard, CMyPage, CTitleBanner, CGridTableRec }
})

View File

@@ -1,5 +1,5 @@
ù<template> ù<template>
<CMyPage title="Pagina Home" imgbackground="images/calendario_eventi.jpg" sizes="max-height: 120px"> <CMyPage title="Elementi Pagine" imgbackground="images/calendario_eventi.jpg" sizes="max-height: 120px">
<span>{{ <span>{{
setmeta({ setmeta({
title: 'Pagina Home', title: 'Pagina Home',
@@ -10,22 +10,29 @@
</span> </span>
<div class="q-ma-sm q-gutter-sm q-pa-xs"> <div class="q-ma-sm q-gutter-sm q-pa-xs">
<CTitleBanner title="Pagina Home"></CTitleBanner> <CTitleBanner title="Elementi Pagine"></CTitleBanner>
<q-select rounded outlined v-model="pageSel"
:options="arrPages"
label="Pagina" emit-value map-options>
</q-select>
<CGridTableRec <CGridTableRec
prop_mytable="myelems" prop_mytable="myelems"
prop_mytitle="Pagina Home" prop_mytitle="Elementi Pagina"
:prop_mycolumns="colmyelems" :prop_mycolumns="colmyelems"
:filtercustom="filtercustom"
prop_colkey="title" prop_colkey="title"
nodataLabel="Nessun elemento di Pagina Home" nodataLabel="Nessun elemento di Modifica Elementi"
noresultLabel="Il filtro selezionato non ha trovato nessun risultato"> noresultLabel="Il filtro selezionato non ha trovato nessun risultato">
</CGridTableRec> </CGridTableRec>
</div> </div>
</CMyPage> </CMyPage>
</template> </template>
<script lang="ts" src="./home.ts"> <script lang="ts" src="./editElems.ts">
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import 'home.scss'; @import 'editElems.scss';
</style> </style>

View File

@@ -1,24 +0,0 @@
import { defineComponent, ref, onMounted } from 'vue'
import { CImgText } from '../../../components/CImgText/index'
import { CCard } from '@/components/CCard'
import { CMyPage } from '@/components/CMyPage'
import { CTitleBanner } from '@/components/CTitleBanner'
import { CGridTableRec } from '@/components/CGridTableRec'
import { colmyelems } from '@src/store/Modules/fieldsTable'
import MixinMetaTags from '@/mixins/mixin-metatags'
export default defineComponent({
name: 'Home',
components: { CImgText, CCard, CMyPage, CTitleBanner, CGridTableRec },
setup() {
const { setmeta } = MixinMetaTags()
return {
colmyelems,
setmeta,
}
}
})

View File

@@ -71,6 +71,7 @@ const msg_it = {
monete: 'Monete', monete: 'Monete',
pages: 'Pagine', pages: 'Pagine',
Home: 'Pagina Home', Home: 'Pagina Home',
elems: 'Elementi Pagine',
operators: 'Operatori', operators: 'Operatori',
disciplines: 'Discipline', disciplines: 'Discipline',
media: 'Media', media: 'Media',
@@ -1250,7 +1251,32 @@ const msg_it = {
bookings: 'Prenotaz.', bookings: 'Prenotaz.',
profile: 'Profilo', profile: 'Profilo',
circuits: 'Circuiti', circuits: 'Circuiti',
} },
myelems: {
active: 'active',
title: 'title',
path: 'Path',
order: 'Order',
type: 'Type',
container: 'Container',
container2: 'Container2',
container3: 'Container3',
number: 'Number',
imgback: 'imgback',
size: 'size',
ratio: 'ratio',
containerHtml: 'containerHtml',
height: 'height',
heightimg: 'heightimg',
widthimg: 'widthimg',
link: 'link',
width: 'width',
onlyif_logged: 'onlyif_logged',
color: 'color',
class: 'class',
styleadd: 'styleadd',
},
}, },
}; };

View File

@@ -126,6 +126,7 @@ export const colgallery = [
export const colmyelems = [ export const colmyelems = [
AddCol({ name: 'active', label_trans: 'myelems.active', fieldtype: costanti.FieldType.boolean }), AddCol({ name: 'active', label_trans: 'myelems.active', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'title', label_trans: 'myelems.title' }), AddCol({ name: 'title', label_trans: 'myelems.title' }),
AddCol({ name: 'path', label_trans: 'myelems.path' }),
AddCol({ name: 'order', label_trans: 'myelems.order', fieldtype: costanti.FieldType.number }), AddCol({ name: 'order', label_trans: 'myelems.order', fieldtype: costanti.FieldType.number }),
AddCol({ name: 'type', label_trans: 'myelems.type', fieldtype: costanti.FieldType.select, jointable: 'elemtypes' }), AddCol({ name: 'type', label_trans: 'myelems.type', fieldtype: costanti.FieldType.select, jointable: 'elemtypes' }),
AddCol({ name: 'container', label_trans: 'myelems.container' }), AddCol({ name: 'container', label_trans: 'myelems.container' }),

View File

@@ -29,6 +29,7 @@ import { static_data } from '@src/db/static_data'
import bcrypt from 'bcryptjs' import bcrypt from 'bcryptjs'
import { useTodoStore } from '@store/Todos' import { useTodoStore } from '@store/Todos'
import { Router } from 'vue-router' import { Router } from 'vue-router'
import { useProjectStore } from '@store/Projects' import { useProjectStore } from '@store/Projects'
@@ -257,7 +258,7 @@ export const useUserStore = defineStore('UserStore', {
// Check if is this User! // Check if is this User!
if (this.my.username === username) return this.my if (this.my.username === username) return this.my
let trovato:any = null let trovato: any = null
if (this.usersList) trovato = this.usersList.find((item: any) => item.username === username) if (this.usersList) trovato = this.usersList.find((item: any) => item.username === username)
if (trovato) { if (trovato) {
@@ -283,7 +284,7 @@ export const useUserStore = defineStore('UserStore', {
}, },
getImgUserByUsername(username: string): string { getImgUserByUsername(username: string): string {
let img = this.getImgByUsername(username) const img = this.getImgByUsername(username)
return img ? img : 'images/noimg-user.svg' return img ? img : 'images/noimg-user.svg'
}, },
@@ -309,6 +310,7 @@ export const useUserStore = defineStore('UserStore', {
return costanti.DIR_UPLOAD + 'profile/' + userparam.username + '/' + userparam.profile.img return costanti.DIR_UPLOAD + 'profile/' + userparam.username + '/' + userparam.profile.img
} }
} catch (e) { } catch (e) {
//
} }
if (!reale) if (!reale)
return 'images/noimg.png' return 'images/noimg.png'
@@ -363,6 +365,7 @@ export const useUserStore = defineStore('UserStore', {
if (circ.photos && circ.photos.length > 0) if (circ.photos && circ.photos.length > 0)
return costanti.DIR_UPLOAD + 'circuits/' + circ.path + '/' + circ.photos[0].imagefile return costanti.DIR_UPLOAD + 'circuits/' + circ.path + '/' + circ.photos[0].imagefile
} catch (e) { } catch (e) {
//
} }
return 'images/noimg.png' return 'images/noimg.png'
}, },
@@ -370,9 +373,10 @@ export const useUserStore = defineStore('UserStore', {
getImgByGroup(group: IMyGroup): string { getImgByGroup(group: IMyGroup): string {
try { try {
//++Todo: Sistemare! // ++Todo: Sistemare!
return costanti.DIR_UPLOAD + 'mygroups/' + group.groupname + '/' + group.photos[0].imagefile return costanti.DIR_UPLOAD + 'mygroups/' + group.groupname + '/' + group.photos[0].imagefile
} catch (e) { } catch (e) {
//
} }
return 'images/noimg.png' return 'images/noimg.png'
}, },
@@ -411,7 +415,7 @@ export const useUserStore = defineStore('UserStore', {
}, },
getNameSurnameByUsername(username: string): string { getNameSurnameByUsername(username: string): string {
let user = this.getUserByUsername(username) const user = this.getUserByUsername(username)
if (user) return `${user.name} ` + !!user.surname ? user.surname : '' if (user) return `${user.name} ` + !!user.surname ? user.surname : ''
return `(${username})` return `(${username})`
}, },
@@ -420,7 +424,7 @@ export const useUserStore = defineStore('UserStore', {
// Check if is this User! // Check if is this User!
if (this.my._id === userId) return this.my if (this.my._id === userId) return this.my
let trovato:any = null let trovato: any = null
if (this.usersList) trovato = this.usersList.find((item: any) => item._id === userId) if (this.usersList) trovato = this.usersList.find((item: any) => item._id === userId)

View File

@@ -5,8 +5,8 @@ import {
IConfig, IConfig,
IDataToSet, IDataToSet,
IGlobalState, IGlobalState,
IListRoutes, IListRoutes, IMyElem,
IMyPage, IParamsPickup, IMyPage, IMySkill, IParamsPickup,
IParamsQuery, IParamsQuery,
ISettings, ISettings,
StateConnection, StateConnection,
@@ -178,6 +178,10 @@ export const useGlobalStore = defineStore('GlobalStore', {
getPage: (state: IGlobalState) => (path: string): IMyPage | undefined => state.mypage.find((page) => (`/${page.path}`) === path), getPage: (state: IGlobalState) => (path: string): IMyPage | undefined => state.mypage.find((page) => (`/${page.path}`) === path),
getMyElems: (state: IGlobalState) => (path: string): IMyElem[] | [] => {
return state.myelems.filter((page: IMyElem) => (page.path === path)).sort((a: any, b: any) => a.order - b.order)
},
getmenu: (state: IGlobalState): any => { getmenu: (state: IGlobalState): any => {
// console.log('getmenu', cfgrouter.getmenu()) // console.log('getmenu', cfgrouter.getmenu())
@@ -1727,6 +1731,52 @@ export const useGlobalStore = defineStore('GlobalStore', {
}, },
async delMyElem($q: any, t: any, myelem: IMyElem) {
if (!myelem._id)
return false
return await this.DeleteRec({table: 'myelems', id: myelem._id }).then((ris) => {
if (ris) {
this.myelems = this.myelems.filter((rec) => rec._id !== myelem._id)
tools.showPositiveNotif($q, t('db.deletedrecord'))
} else {
tools.showNegativeNotif($q, t('db.recdelfailed'))
}
})
},
async saveMyElem($q: any, t: any, myelem: IMyElem) {
const mydata = {
table: 'myelems',
data: {}
}
mydata.data = myelem
return await this.saveTable(mydata)
.then((ris) => {
if (ris) {
tools.showPositiveNotif($q, t('db.recupdated'))
} else {
tools.showNegativeNotif($q, t('db.recfailed'))
}
return ris
}).catch((e) => {
tools.showNegativeNotif($q, t('db.recfailed'))
return false
})
},
async addNewElem($q: any, t: any, myelem: IMyElem) {
const myrec = await this.saveMyElem($q, t, myelem)
if (myrec) {
myelem._id = myrec._id
this.myelems.push(myelem)
}
},
}, },
}) })

View File

@@ -38,7 +38,10 @@
"@model": ["src/model/index.ts"], "@model": ["src/model/index.ts"],
"@model/*": ["src/model/*"], "@model/*": ["src/model/*"],
"model": ["src/model/index.ts"], "model": ["src/model/index.ts"],
"enums": ["src/enums/*"] "enums": ["src/enums/*"],
"crypto": [
"node_modules/bcryptjs"
],
} }
}, },
"exclude": [ "exclude": [

View File

@@ -4146,11 +4146,6 @@ crypto-random-string@^4.0.0:
dependencies: dependencies:
type-fest "^1.0.1" type-fest "^1.0.1"
crypto@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/crypto/-/crypto-1.0.1.tgz#2af1b7cad8175d24c8a1b0778255794a21803037"
integrity sha512-VxBKmeNcqQdiUQUW2Tzq0t377b54N2bMtXO/qiLa+6eRRmmC4qT3D4OnTGoT/U6O9aklQ/jTwbOtRMTTY8G0Ig==
css-color-names@0.0.4: css-color-names@0.0.4:
version "0.0.4" version "0.0.4"
resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0" resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"