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

- Chart Maps Nationality

Browse Source 
- Username lowercase
- Statistics
- Telegram
This commit is contained in:
Paolo Arena
2020-01-27 15:08:03 +01:00
parent ffded7f9b1
commit f3b70c781e
15 changed files with 397 additions and 2420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/App.scss
View File

@@ -491,6 +491,11 @@ $heightBtn: 100%;
.fa-flag-it:before {
content: url('statics/icons/flag_it.svg');
overflow-y: hidden;
}
.fa-flag-si:before {
content: url('statics/icons/flag_si.svg');
}
.fa-flag-us:before {
@@ -509,6 +514,18 @@ $heightBtn: 100%;
content: url('statics/icons/flag_de.svg');
}
.fa-flag-ch:before {
content: url('statics/icons/flag_ch.svg');
}
.fa-flag-pe:before {
content: url('statics/icons/flag_pe.svg');
}
.fa-flag-hr:before {
content: url('statics/icons/flag_hr.svg');
}
.animazione {
animation-duration: 2s;
animation-fill-mode: both;
@@ -517,3 +534,10 @@ $heightBtn: 100%;
.wrapword {
overflow-wrap: break-word;
}
.clBorderWarning {
border: #f69f09 solid 5px;
border-radius: 32px;
font-size: 1rem;
padding: 4px;
}

18
src/db/i18n_website.js
View File

@@ -4,7 +4,9 @@ const msg_website = {
home: 'Home',
profile: 'Il tuo Profilo',
payment: 'Pagamenti',
SignUp: 'Registrazione',
regok: 'Registrazione Confermata',
SignUp: 'Nuova Registrazione',
SignUp_alreadylista: 'Registrazione per chi è gia nella Lista!',
SignUp2: 'Registrazione',
SignIn: 'Login',
status: 'Statistiche',
@@ -28,7 +30,8 @@ const msg_website = {
statusreg: {
reg:'Partecipanti',
giainlista:'Gia in Lista',
newreg:'Nuove Registrazioni:',
newreg:'Ultime Registrazioni:',
nationality: 'Nazionalità',
verified:'Verificata',
nonverified:'Non Verificata',
}
@@ -39,8 +42,8 @@ const msg_website = {
myAppDescription: 'Ayni',
keywords_base: 'Ayni',
myDescriz: '',
sottoTitoloApp: 'Gift Economy',
sottoTitoloApp2: 'Dare e Ricevere',
sottoTitoloApp: '',
sottoTitoloApp2: '',
sottoTitoloApp3: '',
sottoTitoloApp4: '',
},
@@ -87,6 +90,7 @@ const msg_website = {
reg:'Participantes',
giainlista:'Gia in Lista',
newreg:'Nuevas inscripciones :',
nationality: 'Nacionalidad',
verified:'Verificada',
nonverified:'No Verificada',
}
@@ -144,13 +148,14 @@ const msg_website = {
reg:'Participants',
giainlista:'Gia in Lista',
newreg:'Nouvelles inscriptions:',
nationality: 'Nationalité',
verified:'Vérifié',
nonverified:'Non Vérifié',
}
},
msg: {
myAppName: 'Ayni',
myAppNameShort: 'Ayni',
myAppNameShort: '',
myAppDescription: '',
keywords_base: '',
myDescriz: '',
@@ -186,8 +191,9 @@ const msg_website = {
Test2: 'Test2',
statusreg: {
reg:'Participants',
giainlista:'Gia in Lista',
giainlista:'Already in the List',
newreg:'New registrations:',
nationality: 'Nationality',
verified:'Verified',
nonverified:'Not Verified',
}

11
src/db/static_data.ts
View File

@@ -360,6 +360,17 @@ const baseroutes: IListRoutes[] = [
infooter: false,
separator: false
},
{
active: functionality.ENABLE_REGISTRATION,
order: 2000,
path: '/regok',
materialIcon: 'how_to_reg',
name: 'pages.regok',
component: () => import('@/views/login/regok/regok.vue'),
inmenu: false,
infooter: false,
separator: false
},
{
active: functionality.ENABLE_REGISTRATION,
order: 1000,

33
src/index.template.html
View File

@@ -1,23 +1,28 @@
<!DOCTYPE html>
<html>
<head>
<!-- <title><%= htmlWebpackPlugin.options.appName %></title>-->
<!-- <title><%= htmlWebpackPlugin.options.appName %></title>-->
<meta charset="utf-8">
<!--<meta name="description" content="<%= htmlWebpackPlugin.options.appDescription %>">-->
<!--<meta name="keywords" content="<%= htmlWebpackPlugin.options.keywords %>">-->
<meta name="format-detection" content="telephone=no">
<meta name="msapplication-tap-highlight" content="no">
<meta name="viewport"
content="user-scalable=no, initial-scale=1, minimum-scale=1, width=device-width<% if (htmlWebpackPlugin.options.ctx.mode.cordova || htmlWebpackPlugin.options.ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>">
<meta charset="utf-8">
<!--<meta name="description" content="<%= htmlWebpackPlugin.options.appDescription %>">-->
<!--<meta name="keywords" content="<%= htmlWebpackPlugin.options.keywords %>">-->
<meta name="format-detection" content="telephone=no">
<meta name="msapplication-tap-highlight" content="no">
<meta name="viewport"
content="user-scalable=no, initial-scale=1, minimum-scale=1, width=device-width<% if (htmlWebpackPlugin.options.ctx.mode.cordova || htmlWebpackPlugin.options.ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>">
<link rel="icon" href="<%= htmlWebpackPlugin.files.publicPath %>statics/icons/favicon.ico" type="image/x-icon">
<link rel="icon" type="image/png" sizes="32x32"
href="<%= htmlWebpackPlugin.files.publicPath %>statics/icons/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16"
href="<%= htmlWebpackPlugin.files.publicPath %>statics/icons/favicon-16x16.png">
<link rel="icon" href="<%= htmlWebpackPlugin.files.publicPath %>statics/icons/favicon.ico" type="image/x-icon">
<link rel="icon" type="image/png" sizes="32x32"
href="<%= htmlWebpackPlugin.files.publicPath %>statics/icons/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16"
href="<%= htmlWebpackPlugin.files.publicPath %>statics/icons/favicon-16x16.png">
<script src="<%= htmlWebpackPlugin.files.publicPath %>statics/js/track.js"></script>
<script src="<%= htmlWebpackPlugin.files.publicPath %>statics/js/track.js"></script>
<script src="https://www.gstatic.com/charts/loader.js"></script>
<!--<script src="https://unpkg.com/chart.js@2.8.0/dist/Chart.bundle.js"></script>
<script src="https://unpkg.com/vue-chartkick@0.5.1"></script>-->
</head>
<body>

26
src/root/home/home.scss
View File

@@ -15,6 +15,18 @@ p {
//text-shadow: .125rem .125rem .25rem $grayshadow;
}
.logo{
margin-left: auto;
margin-right: auto;
max-height: 250px;
max-width: 250px;
@media (max-width: 718px) {
max-height: 180px;
max-width: 180px;
}
}
h4 {
font-size: 1.25rem;
}
@@ -27,8 +39,8 @@ h4 {
}
.landing_background {
background: #000 url(../../statics/images/foto1.jpg) no-repeat 50% fixed;
background-size: cover
background: #000 url(../../statics/images/foto1.jpg) no-repeat 100% fixed;
background-size: contain !important;
}
.landing > section {
@@ -123,7 +135,7 @@ h4 {
}
.landing__header {
height: 0
height: 0vh
}
.landing__arrow {
@@ -223,7 +235,6 @@ body.mobile .landing:before {
z-index: -1;
//background: #000 url(../../statics/images/cover.jpg) 50%;
background-size: cover
}
/*
@@ -351,7 +362,7 @@ body.mobile .landing:before {
text-align: center
}
.landing__header {
height: 0
height: 10vh
}
.clgutter {
margin-top: 0;
@@ -477,5 +488,8 @@ body.mobile .landing:before {
}
.q-carousel__slide{
background-size: auto;
// background-size: auto;
background-size: contain !important;
background-repeat: no-repeat;
background-position: 50%;
}

24
src/root/home/home.ts
View File

@@ -12,7 +12,15 @@ import { tools } from '@src/store/Modules/tools'
import { func_tools, toolsext } from '@src/store/Modules/toolsext'
import { Screen } from 'quasar'
import MixinMetaTags from '@src/mixins/mixin-metatags'
import { CCardCarousel, CImgText, CTitleBanner, CStatus, CStatusReg, CNextZoom } from '@components'
import {
CCardCarousel,
CImgText,
CTitleBanner,
CStatus,
CStatusReg,
CNextZoom,
CVerifyTelegram, CVerifyEmail
} from '@components'
import MixinBase from '@src/mixins/mixin-base'
import { static_data } from '@src/db/static_data'
import { INotData } from '@src/model'
@@ -32,7 +40,7 @@ import { INotData } from '@src/model'
@Component({
mixins: [MixinBase],
components: { Logo, Footer, CMyPage, CCardCarousel, CTitleBanner, CImgText, CStatus, CStatusReg, CNextZoom }
components: { Logo, Footer, CMyPage, CCardCarousel, CTitleBanner, CImgText, CStatus, CStatusReg, CNextZoom, CVerifyTelegram, CVerifyEmail }
})
export default class Home extends MixinBase {
public text: string = ''
@@ -175,6 +183,10 @@ export default class Home extends MixinBase {
return tools
}
get TelegVerificato() {
return UserStore.state.my.profile.teleg_id > 0
}
get visuStatus() {
return !this.isVerificato || !this.TelegVerificato || UserStore.state.my.profile.paymenttypes.length === 0
}
@@ -328,12 +340,16 @@ export default class Home extends MixinBase {
return UserStore.getters.isVerificato
}
get TelegVerificato() {
return UserStore.state.my.profile.teleg_id > 0
get isEmailVerified() {
return UserStore.state.my.verified_email
}
public openrighttoolbar() {
GlobalStore.state.RightDrawerOpen = true
}
get TelegCode() {
return UserStore.state.my.profile.teleg_checkcode
}
}

49
src/root/home/home.vue
View File

@@ -8,7 +8,10 @@
</span>
<div class="landing">
<section>
<div class="text-center">
<q-img src="statics/images/background.jpg" class="logo"></q-img>
</div>
<!--<section>
<div class="landing__hero maxwidth1200 text-white">
<q-carousel
animated
@@ -78,16 +81,37 @@
</div>
</div>
<div class="landing__arrow absolute-bottom text-center">
<!--<i aria-hidden="true"-->
<!--class="q-icon text-h2 text-white material-icons">expand_more</i>-->
</div>
</q-carousel-slide>
</div>
</q-carousel>
</div>
</section>
</section> -->
<div v-if="isLogged">
<CVerifyEmail v-if="!isEmailVerified">
</CVerifyEmail>
<CVerifyTelegram v-if="TelegCode">
</CVerifyTelegram>
</div>
<div v-else>
<div v-if="!isLogged && static_data.functionality.ENABLE_REGISTRATION" align="center" style="margin:20px;">
<q-btn rounded size="lg" color="primary" @click="openrighttoolbar"
>{{$t('login.enter')}}
</q-btn>
</div>
<div v-if="!isLogged && static_data.functionality.ENABLE_REGISTRATION" align="center" style="margin:20px;">
<q-btn rounded size="lg" color="primary" to="/signup">{{$t('reg.submit')}}
</q-btn>
</div>
</div>
<CNextZoom>
</CNextZoom>
@@ -101,23 +125,6 @@
</div>
<div v-if="!isLogged && static_data.functionality.ENABLE_REGISTRATION" align="center" style="margin:20px;">
<q-btn rounded size="lg" color="primary" @click="openrighttoolbar"
>{{$t('login.enter')}}
</q-btn>
</div>
<div v-if="!isLogged && static_data.functionality.ENABLE_REGISTRATION" align="center" style="margin:20px;">
<q-btn rounded size="lg" color="primary" to="/signup">{{$t('reg.submit')}}
</q-btn>
</div>
<div v-if="!isLogged">
<div style="margin-bottom: 50px;">
</div>
</div>
<div v-if="false">
<CTitleBanner class="q-pa-xs" :title="$t('text.how')" bgcolor="bg-primary" clcolor="text-white"
mystyle=" " myclass="myshad" canopen="true">

45
src/statics/icons/flag_it.svg
View File

@@ -1,7 +1,40 @@
<svg xmlns="http://www.w3.org/2000/svg" id="flag-icon-css-it" viewBox="0 0 512 512">
<g fill-rule="evenodd" stroke-width="1pt">
<path fill="#fff" d="M0 0h512v512H0z"/>
<path fill="#009246" d="M0 0h170.7v512H0z"/>
<path fill="#ce2b37" d="M341.3 0H512v512H341.3z"/>
</g>
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
<path style="fill:#73AF00;" d="M38.345,88.273C17.167,88.273,0,105.44,0,126.618v258.759c0,21.177,17.167,38.345,38.345,38.345
h132.322V88.273H38.345z"/>
<rect x="170.67" y="88.277" style="fill:#F5F5F5;" width="170.67" height="335.45"/>
<path style="fill:#FF4B55;" d="M473.655,88.273H341.333v335.448h132.322c21.177,0,38.345-17.167,38.345-38.345V126.618
C512,105.44,494.833,88.273,473.655,88.273z"/>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 292 B

After

Width:  |  Height:  |  Size: 894 B

BIN
src/statics/images/background.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 122 KiB

After

Width:  |  Height:  |  Size: 27 KiB

BIN
src/statics/images/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 264 KiB

After

Width:  |  Height:  |  Size: 57 KiB

BIN
src/statics/images/mobile/background.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 47 KiB

After

Width:  |  Height:  |  Size: 27 KiB