diff --git a/.env.development b/.env.development index a0b6deb3..cb9bd8de 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.66" +APP_VERSION="0.5.67" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index 5ddbfad6..12d93e45 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.66" +APP_VERSION="0.5.67" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.risosrv b/.env.test.risosrv index 5399fbdf..573dd34e 100755 --- a/.env.test.risosrv +++ b/.env.test.risosrv @@ -1,4 +1,4 @@ -APP_VERSION="0.5.66" +APP_VERSION="0.5.67" 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 a0b6deb3..cb9bd8de 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.66" +APP_VERSION="0.5.67" 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 1ee9f4ee..fff951b9 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.66" +APP_VERSION="0.5.67" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/terradellavisione.app/.env.development b/_ALL_SITES/terradellavisione.app/.env.development index 300591d9..6242ef71 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.66" +APP_VERSION="0.5.67" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL="newfreeplanet" diff --git a/public/images/1ris_rosso.png b/public/images/1ris_rosso.png new file mode 100644 index 00000000..c1aff3ec Binary files /dev/null and b/public/images/1ris_rosso.png differ diff --git a/public/images/1ris_rosso_100.png b/public/images/1ris_rosso_100.png new file mode 100644 index 00000000..267f9158 Binary files /dev/null and b/public/images/1ris_rosso_100.png differ diff --git a/src/components/CDashboard/CDashboard.scss b/src/components/CDashboard/CDashboard.scss index 7c4fdb52..43eea64e 100755 --- a/src/components/CDashboard/CDashboard.scss +++ b/src/components/CDashboard/CDashboard.scss @@ -20,7 +20,7 @@ } .progress-base { - height: 8px; + height: 3px; border-radius: 3px; background-color: #e9ecef; } diff --git a/src/components/CDashboard/CDashboard.vue b/src/components/CDashboard/CDashboard.vue index 26666715..af54d83f 100755 --- a/src/components/CDashboard/CDashboard.vue +++ b/src/components/CDashboard/CDashboard.vue @@ -1,6 +1,9 @@ diff --git a/src/components/CEventsCalendar/CEventsCalendar.vue b/src/components/CEventsCalendar/CEventsCalendar.vue index 62a67bd3..74533fb2 100755 --- a/src/components/CEventsCalendar/CEventsCalendar.vue +++ b/src/components/CEventsCalendar/CEventsCalendar.vue @@ -1062,7 +1062,7 @@
-

+

LISTA PROSSIMI {{ showfirstN }} EVENTI:

diff --git a/src/components/CMyElem/CMyElem.vue b/src/components/CMyElem/CMyElem.vue index 3fbb373f..91f32685 100755 --- a/src/components/CMyElem/CMyElem.vue +++ b/src/components/CMyElem/CMyElem.vue @@ -577,7 +577,7 @@ rounded size="md" color="primary" - to="/signup" + to="/registrati" :label="$t('reg.submit')" > diff --git a/src/components/CMyGroup/CMyGroup.scss b/src/components/CMyGroup/CMyGroup.scss index b892863a..fc6d6911 100755 --- a/src/components/CMyGroup/CMyGroup.scss +++ b/src/components/CMyGroup/CMyGroup.scss @@ -2,3 +2,24 @@ display: flex; flex: 1; } + +.container{ + vertical-align: center; + padding: 5px; + font-size: 1.15rem; +} + +.element{ + font-weight: bold; + vertical-align: center; + padding: 5px; + font-size: 1.15rem; +} + + +.title_param{ + font-size: 1.25rem; +} +.iconcirc { + margin-right: 4px; +} diff --git a/src/components/CMyGroup/CMyGroup.ts b/src/components/CMyGroup/CMyGroup.ts index db8c246e..d90a404a 100755 --- a/src/components/CMyGroup/CMyGroup.ts +++ b/src/components/CMyGroup/CMyGroup.ts @@ -11,12 +11,13 @@ import { CUserNonVerif } from '@/components/CUserNonVerif' import { toolsext } from '@store/Modules/toolsext' import { CSaldo } from '@/components/CSaldo' import { CSendCoins } from '@/components/CSendCoins' +import { CCurrencyValue } from '@/components/CCurrencyValue' import { useCircuitStore } from '@store/CircuitStore' export default defineComponent({ name: 'CMyGroup', emits: ['setCmd'], - components: {CUserNonVerif, CSaldo, CSendCoins}, + components: {CUserNonVerif, CSaldo, CSendCoins, CCurrencyValue }, props: { mygrp: { type: Object as PropType, @@ -57,6 +58,7 @@ export default defineComponent({ const circuitStore = useCircuitStore() const showsendCoinTo = ref(false) + const showAccountInfo = ref(false) const grp = ref(null) @@ -114,7 +116,10 @@ export default defineComponent({ table, myusername, circuit, + circuitStore, showsendCoinTo, + showAccountInfo, + t, } }, }) diff --git a/src/components/CMyGroup/CMyGroup.vue b/src/components/CMyGroup/CMyGroup.vue index a2a7c65a..13c8d47b 100755 --- a/src/components/CMyGroup/CMyGroup.vue +++ b/src/components/CMyGroup/CMyGroup.vue @@ -118,6 +118,26 @@ + + + + + + + + + {{ + $t('groups.infoaccount') + }} + + + + + @@ -500,7 +525,12 @@ clickable v-close-popup @click=" - tools.cancelReqCircuit($q, myusername(), circuitname, grp.groupname) + tools.cancelReqCircuit( + $q, + myusername(), + circuitname, + grp.groupname + ) " > @@ -531,6 +561,98 @@ >
+ + + + + {{ grp.title }} + + + + +
{{ t('groups.infoaccount') }}
+
+ + + + + + + +
+ + {{ + $t('shared.createddate', { + date: tools.getstrDateYY(grp.account.date_created), + }) + }} +
+
+ + {{ + $t('shared.lastmodify', { + date: tools.getstrDateYY(grp.account.date_updated), + }) + }} +
+ +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+