surya/myprojplanet_vite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Aggiornamento a 0.6.1"

Browse Source 
This reverts commit 701e1f1968.
This commit is contained in:
Surya Paolo
2023-04-07 18:38:22 +02:00
parent 799a8a0e15
commit eb4998dcd2
13 changed files with 337 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@@ -1,4 +1,8 @@
<<<<<<< HEAD
APP_VERSION="0.5.84"
=======
APP_VERSION="0.5.85"
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet"

4
.env.example.production
View File

@@ -1,4 +1,8 @@
<<<<<<< HEAD
APP_VERSION="0.5.84"
=======
APP_VERSION="0.5.85"
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet

4
.env.test.risosrv
View File

@@ -1,4 +1,8 @@
<<<<<<< HEAD
APP_VERSION="0.5.84"
=======
APP_VERSION="0.5.85"
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet

4
_ALL_SITES/riso.app/.env.development
View File

@@ -1,4 +1,8 @@
<<<<<<< HEAD
APP_VERSION="0.5.84"
=======
APP_VERSION="0.5.85"
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet"

4
_ALL_SITES/riso.app/.env.production
View File

@@ -1,4 +1,8 @@
<<<<<<< HEAD
APP_VERSION="0.5.84"
=======
APP_VERSION="0.5.85"
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet

4
_ALL_SITES/terradellavisione.app/.env.development
View File

@@ -1,4 +1,8 @@
<<<<<<< HEAD
APP_VERSION="0.5.84"
=======
APP_VERSION="0.5.85"
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="14"
DIRECTORY_LOCAL="newfreeplanet"

2
src/components/CAccomodation/CAccomodation.ts
View File

@@ -68,7 +68,7 @@ export default defineComponent({
})
function created() {
console.log('created CAccomodation', props.mylist)
// console.log('created CAccomodation', props.mylist)
if (isValid(props.mylist)) {
// @ts-ignore
let myarr: any = props.mylist

9
src/components/CGridTableRec/CGridTableRec.vue
View File

@@ -1104,6 +1104,15 @@
>
</CMyCardCircuitPopup>
<CMyCardService v-else-if="mytable === 'myskills'"
<<<<<<< HEAD
=======
:table="mytable" :prop_myrec="myrecdialog">
</CMyCardService>
<CMyCardService v-else-if="mytable === 'mygoods'"
:table="mytable" :prop_myrec="myrecdialog">
</CMyCardService>
<CMyCardService v-else-if="mytable === 'myhosps'"
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
:table="mytable" :prop_myrec="myrecdialog">
</CMyCardService>
<CMyCardPopup v-else :table="mytable" :prop_myrec="myrecdialog">

70
src/components/CMyActivities/CMyActivities.vue
View File

@@ -91,6 +91,7 @@
myclass="myshad"
:canopen="true"
>
<<<<<<< HEAD
<div v-for="(card, ind) of mycards" :key="ind" :name="card.table">
<q-card class="q-my-md">
<div v-if="card.table === 'mygroups'">
@@ -104,6 +105,75 @@
<CMyGroup
:mygrp="grp"
:visu="costanti.USER_GROUPS"
=======
<q-tabs
v-model="mytab"
inline-label
dense
class="text-black shadow-2"
>
<q-tab name="my" icon="far fa-user" />
<q-tab name="favorite" icon="far fa-heart" />
<q-tab name="bookmark" icon="far fa-bookmark" />
</q-tabs>
<q-tab-panels
v-model="mytab"
animated
swipeable
vertical
transition-prev="jump-up"
transition-next="jump-up"
>
<q-tab-panel name="my">
<div
v-for="(card, ind) of mycards"
:key="ind"
:name="card.table"
>
<q-card class="q-my-md">
<div v-if="card.table === 'mygroups'">
<q-list>
<span
v-for="(grp, index) in listgroupsfiltered"
:key="index"
class="q-my-sm q-mx-none"
clickable
>
<CMyGroup
:mygrp="grp"
:visu="costanti.USER_GROUPS"
:noaut="true"
>
</CMyGroup>
</span>
</q-list>
</div>
<div v-else-if="card.table === 'circuits'">
<div class="text-h6">{{ card.title }}</div>
<q-list>
<span
v-for="(circuit, index) in listcircuitsfiltered"
:key="index"
class="q-my-sm q-mx-none"
clickable
>
<CMyCircuit
:mycircuit="circuit"
:visu="costanti.USER_CIRCUITS"
:noaut="true"
>
</CMyCircuit>
</span>
</q-list>
</div>
<div v-else>
<CSkill
:table="card.table"
:filtercustom="filtroutente"
:butt_modif_new="isMyRecord(myuser.username)"
:visuinpage="true"
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
:noaut="true"
>
</CMyGroup>

51
src/components/CMyCardService/CMyCardService.ts
View File

@@ -110,6 +110,57 @@ export default defineComponent({
return false
}
<<<<<<< HEAD
=======
function getRecGoodSkillByRec(rec: any) {
if (props.table === 'myskills')
return rec.recSkill
else if (props.table === 'mygoods')
return rec.recGood
return null
}
function getSectorByRec(rec: any) {
if (props.table === 'myskills')
return rec.sector
else if (props.table === 'mygoods')
return rec.sectorGood
return null
}
function clicca(tipo: any, set: any, title: string) {
if (set && myrec.value.username !== userStore.my.username && tipo === costanti.TIPOFAVBOOK.FAVORITE) {
userStore.setFavorite($q, t, myrec.value._id, props.table, myrec.value);
}
if (set && myrec.value.username !== userStore.my.username && tipo === costanti.TIPOFAVBOOK.BOOKMARK) {
userStore.setBookmark($q, t, myrec.value._id, props.table, myrec.value);
}
if (!set) {
usersList.value.show = true;
usersList.value.title = title;
usersList.value.list = myrec.value.myfav;
}
}
function naviga(path: string) {
$router.push(path)
}
function getTypeHosps() {
let obj = null
if (myrec.value.typeHosp) {
obj = globalStore.getRecordByTableSingle(toolsext.TABTYPEHOSP, myrec.value.typeHosp)
if (obj)
return obj.label
}
return obj
}
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
onMounted(mounted)
return {

141
src/components/CMyCardService/CMyCardService.vue
View File

@@ -9,6 +9,7 @@
:alt="myrec.descr">
</q-img>
<q-card-actions align="right">
<<<<<<< HEAD
<q-btn flat round :color="userStore.isFavorite(myrec._id, table) ? 'red' : ''" icon="favorite" @click="userStore.setFavorite($q, t, myrec._id, shared_consts.TABMYSKILLS)" />
<q-btn flat round :color="userStore.isBookmarked(myrec._id, table) ? 'teal' : ''" icon="bookmark" @click="userStore.setBookmark($q, t, myrec._id, shared_consts.TABMYSKILLS)"/>
<q-btn
@@ -18,6 +19,109 @@
icon="share"
@click="tools.copyToClip($q, getlinkpage(), true)"
/>
=======
<div class="">
<q-btn
flat
round
:color="userStore.isFavorite(myrec._id, table) ? 'red' : ''"
icon="favorite"
@click="clicca(costanti.TIPOFAVBOOK.FAVORITE, true)"
>
<q-badge
v-if="myrec.myfav"
color="primary"
:label="myrec.myfav.length"
floating
transparent
/>
</q-btn>
</div>
<div class="">
<q-btn
flat
round
:color="userStore.isBookmarked(myrec._id, table) ? 'teal' : ''"
icon="bookmark"
@click="clicca(costanti.TIPOFAVBOOK.BOOKMARK, true)"
>
<q-badge
v-if="myrec.mybook"
color="primary"
:label="myrec.mybook.length"
floating
transparent
/>
</q-btn>
</div>
<div>
<q-btn
flat
round
color="primary"
icon="share"
@click="tools.copyToClip($q, getlinkpage(), true)"
/>
</div>
<div>
<q-btn flat round icon="fas fa-ellipsis-h">
<q-menu>
<q-list v-if="true" style="min-width: 150px">
<q-item
v-if="!nopopup"
clickable
v-close-popup
@click="naviga(tools.getPathByTableAndRec(table, myrec))"
>
<q-item-section avatar>
<q-icon color="blue" name="fas fa-globe" />
</q-item-section>
<q-item-section>
{{ $t('event.openpage') }}
</q-item-section>
</q-item>
<q-separator />
<q-item
clickable
v-close-popup
@click="
clicca(
costanti.TIPOFAVBOOK.FAVORITE,
false,
$t('cmd.favorite')
)
"
>
<q-item-section avatar>
<q-icon color="red" name="favorite" />
</q-item-section>
<q-item-section>
{{ $t('cmd.favorite') }}
</q-item-section>
</q-item>
<q-item
clickable
v-close-popup
@click="
clicca(
costanti.TIPOFAVBOOK.BOOKMARK,
false,
$t('cmd.bookmark')
)
"
>
<q-item-section avatar>
<q-icon color="teal" name="bookmark" />
</q-item-section>
<q-item-section>
{{ $t('cmd.bookmark') }}
</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn>
</div>
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
</q-card-actions>
<q-separator />
@@ -42,7 +146,12 @@
}}</q-item-label>
</q-item-section>
</q-item>
<<<<<<< HEAD
<q-item>
=======
<q-item v-if="getSectorByRec(myrec)">
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
<q-item-section avatar>
<q-icon color="blue" name="category" />
</q-item-section>
@@ -184,6 +293,38 @@
/>
</q-card-actions>
</q-card>
<<<<<<< HEAD
=======
<div
v-if="!$q.screen.gt.sm || !nopopup"
class="row absolute-bottom text-shadow custom-caption q-px-md buttons_bottom"
>
<q-btn
v-if="myrec.profile.username_telegram"
:label="$t('dialog.contact')"
color="primary"
icon="far fa-comment"
target="_blank"
:type="tools.isUserOk() ? 'a' : 'btn'"
size="md"
rounded
:href="
tools.isUserOk()
? tools.getHttpForTelegram(myrec.profile.username_telegram)
: null
"
/>
<q-btn
v-if="!nopopup"
rounded
outline
:label="$t('dialog.close')"
color="primary"
icon="close"
v-close-popup
/>
</div>
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
</div>
</div>

36
src/css/app.scss
View File

@@ -1595,3 +1595,39 @@ h3 {
text-align: right;
color: grey;
}
<<<<<<< HEAD
=======
.buttons_bottom {
max-width: 400px;
margin-left: auto;
justify-content: space-around;
margin-right: auto;
text-align: center;
padding-top: 8px;
padding-bottom: 8px;
}
.body--light {
.buttons_bottom {
background: -webkit-gradient(linear, left top, left bottom, from(transparent), color-stop(15%, rgba(255, 255, 255, .7)));
background: linear-gradient(180deg, transparent, rgba(255, 255, 255, .7) 15%)
}
}
.body--dark {
.buttons_bottom {
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%)
}
}
.fulldiv {
min-height: 100% !important;
}
.numfav_text{
text-align: center;
color: grey;
font-size: 0.8rem;
}
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)

5
src/statics/lang/it.js
View File

@@ -1488,6 +1488,11 @@ const msg_it = {
favorite_unset: 'Rimosso dai Preferiti',
bookmark_set: 'Aggiunto ai Segnalibri',
bookmark_unset: 'Rimosso dai Segnalibri',
<<<<<<< HEAD
=======
favorite: 'Utenti Favoriti',
bookmark: 'Utenti Segnalibri',
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
},
},