Merge branch 'master' into Booking

This commit is contained in:
Paolo Arena
2019-10-10 16:02:47 +02:00
committed by GitHub
5 changed files with 12 additions and 16 deletions

View File

@@ -28,7 +28,7 @@
"dependencies": {
"@babel/plugin-transform-runtime": "^7.4.0",
"@babel/runtime": "^7.0.0",
"@quasar/extras": "^1.3.1",
"@quasar/extras": "^1.3.2",
"@types/vuelidate": "^0.7.0",
"@vue/eslint-config-standard": "^4.0.0",
"acorn": "^6.0.0",
@@ -50,7 +50,7 @@
"normalize.css": "^8.0.0",
"npm": "^6.10.1",
"nprogress": "^0.2.0",
"quasar": "^1.1.0",
"quasar": "^1.1.6",
"quasar-extras": "^2.0.8",
"register-service-worker": "^1.0.0",
"vee-validate": "^2.1.2",
@@ -85,7 +85,8 @@
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@babel/plugin-syntax-import-meta": "^7.2.0",
"@babel/preset-env": "^7.4.2",
"@quasar/app": "^1.0.6",
"@quasar/app": "^1.1.2",
"@quasar/quasar-app-extension-colorize": "^1.0.0-alpha.1",
"@quasar/quasar-app-extension-typescript": "^1.0.0-alpha.11",
"@types/dotenv": "^4.0.3",
"@types/jest": "^23.1.4",

View File

@@ -320,7 +320,6 @@ export default class Header extends Vue {
get mySurname() {
return UserStore.state.surname
}
get Verificato() {
return UserStore.state.verified_email
}

View File

@@ -125,12 +125,12 @@
<div id="profile">
<q-img class="absolute-top" src="../../statics/images/landing_first_section.png"
style="height: 150px">
<div class="absolute-bottom bg-transparent text-black">
<div class="absolute-bottom bg-transparent text-black center_img">
<q-avatar class="q-mb-sm">
<q-avatar class="q-mb-sm center_img">
<img src="../../statics/images/avatar-1.svg">
</q-avatar>
<div v-if="Username" class="text-weight-bold">{{ Username }}</div>
<div v-if="Username" class="text-weight-bold text-user">{{ Username }} - {{ Name }}</div>
<div v-else class="text-italic">{{ $t('user.loggati') }}</div>
<!--<span class="text-white" v-if="Verificato"> {{$t('reg.verificato')}} </span>-->

View File

@@ -256,8 +256,6 @@ const lang_available: ILang[] = [
// { label: 'German', icon: 'fa-flag-de', value: 'de', image: '../statics/images/de.png', short: 'DE' },
]
const preLoadImages: IPreloadImages[] = []
const functionality: IFunctionality = {
SHOW_USER_MENU: true,
SHOW_IF_IS_SERVER_CONNECTION: false,
@@ -265,12 +263,10 @@ const functionality: IFunctionality = {
ENABLE_PROJECTS_LOADING: true,
SHOW_NEWSLETTER: false,
SHOW_ONLY_POLICY: false,
BOOKING_EVENTS: false
EVENTS_CAN_BOOKING: false
}
export const static_data = {
routes,
functionality,
ds_operatori,
lang_available,

View File

@@ -27,7 +27,7 @@ h4 {
}
.landing_background {
background: #000 url(../../statics/images/cover.jpg) no-repeat 50% fixed;
background: #000 url(../../statics/images/foto1.jpg) no-repeat 50% fixed;
background-size: cover
}
@@ -281,17 +281,17 @@ body.mobile .landing:before {
}
.homep-cover-img-1 {
background: #000 url(../../statics/images/cover.jpg) no-repeat 50% fixed;
background: #000 url(../../statics/images/foto1.jpg) no-repeat 50% fixed;
//transition: background-image 1s ease-in-out;
}
.homep-cover-img-2 {
background: #000 url(../../statics/images/hand_people.jpg) no-repeat 50% fixed;
background: #000 url(../../statics/images/foto2.jpg) no-repeat 50% fixed;
//transition: background-image 1s ease-in-out;
}
.homep-cover-img-3 {
background: #000 url(../../statics/images/cibo_sano.jpg) no-repeat 50% fixed;
background: #000 url(../../statics/images/foto3.jpg) no-repeat 50% fixed;
//transition: background-image 1s ease-in-out;
}