Skip to content

Commit

Permalink
Merge pull request #146 from philippebeck/dev
Browse files Browse the repository at this point in the history
Release 2.1.2
  • Loading branch information
philippebeck authored Dec 31, 2023
2 parents 3cc9c31 + 654d0f7 commit 0da3f52
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 49 deletions.
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vesan",
"version": "2.1.1",
"version": "2.1.2",
"description": "UI with Vue-Elt, Servidio & Animadio",
"author": {
"name": "Philippe Beck",
Expand Down Expand Up @@ -50,7 +50,7 @@
"core-js": "^3.8.3",
"servidio": "^3.1.0",
"vue": "^3.3.9",
"vue-elt": "^2.3.4-alpha",
"vue-elt": "^2.3.5-alpha",
"vue-recaptcha": "^2.0.3",
"vue-router": "^4.1.6",
"vuex": "^4.0.2"
Expand Down
2 changes: 1 addition & 1 deletion public/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

/* SHOP */
.shop {
height: 70px;
height: 50px;
max-width: 200px;
}

Expand Down
17 changes: 1 addition & 16 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@
</NavElt>

<router-view v-slot="{ Component }" :val="val" :avatar="avatar">
<transition name="slide">
<component :is="Component" :key="$route.path"/>
</transition>
<component :is="Component" :key="$route.path"/>
</router-view>

<FootElt :title1="val.FOOT_TITLE1" :title2="val.FOOT_TITLE2" :title3="val.FOOT_TITLE3">
Expand Down Expand Up @@ -123,16 +121,3 @@ export default {
}
};
</script>

<style>
.slide-enter-active,
.slide-leave-active {
transition: opacity 500ms, transform 500ms;
}
.slide-enter-from,
.slide-leave-to {
opacity: 0;
transform: translateY(10%);
}
</style>
8 changes: 5 additions & 3 deletions src/views/data/GalleryView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
</template>
</NavElt>

<CardElt>
<CardElt itemscope itemtype="https://schema.org/ImageGallery">
<template #header>
<h1 class="sky-dark">
<h1 class="sky-dark" itemprop="name">
<i class="fa-regular fa-images fa-lg"></i>
{{ val.GALLERY_VIEW }}
</h1>
Expand All @@ -30,7 +30,9 @@
:dynamic="true"
class="grid-2sm-3md-4lg-5xl-6wd content-center">
<template #items="slotProps">
<a :href="`gallery/${slotProps.item.id}`" :title="val.TITLE_WATCH + slotProps.item.name">
<a :href="`gallery/${slotProps.item.id}`"
:title="val.TITLE_WATCH + slotProps.item.name"
itemprop="url">

<MediaElt :id="`${slotProps.item.name.toLowerCase()}`"
:src="`/img/thumbnails/galleries/${slotProps.item.cover}`"
Expand Down
8 changes: 5 additions & 3 deletions src/views/data/ImageView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,20 @@
</template>
</NavElt>

<CardElt>
<CardElt itemscope itemtype="https://schema.org/ImageGallery">
<template #header>
<h1 class="sky-dark">
<h1 class="sky-dark" itemprop="name">
<i class="fa-regular fa-image fa-lg"></i> {{ gallery.name }}
</h1>
<b>{{ gallery.author }}</b>
<b itemprop="author">{{ gallery.author }}</b>
</template>

<template #body>
<SliderElt :slides="images">
<template #slide="slotProps">
<a :href="`/img/galleries/${slotProps.slide.name}`"
:title="val.TITLE_WATCH + slotProps.slide.name"
itemprop="url"
target="_blank"
rel="noopener noreferrer">

Expand All @@ -47,6 +48,7 @@
<template #items="slotProps">
<a :href="`/img/galleries/${slotProps.item.name}`"
:title="val.TITLE_WATCH + slotProps.item.name"
itemprop="url"
target="_blank"
rel="noopener noreferrer">

Expand Down
17 changes: 9 additions & 8 deletions src/views/data/ProductView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -137,17 +137,18 @@

<template #figcaption>
<p id="figcaption" v-html="product.description"></p>
<p itemprop="offers" itemscope itemtype="https://schema.org/Offer">
<b itemprop="price" class="monospace" :content="product.price + '.00'">
{{ product.price }}
</b>
<i itemprop="priceCurrency" :content="val.CURRENCY_ISO">
{{ val.CURRENCY_SYMBOL }}
</i>
</p>
</template>
</MediaElt>

<p itemprop="offers" itemscope itemtype="https://schema.org/Offer">
<b itemprop="price" class="monospace" :content="product.price + '.00'">
{{ product.price }}
</b>
<i itemprop="priceCurrency" :content="val.CURRENCY_ISO">
{{ val.CURRENCY_SYMBOL }}
</i>
</p>

<form>
<FieldElt id="basket-option"
type="select"
Expand Down
17 changes: 9 additions & 8 deletions src/views/data/ShopView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,17 @@
<p v-html="slotProps.value.description.split(':')[0]"
class="monospace shop">
</p>
<p itemprop="offers" itemscope itemtype="https://schema.org/Offer">
<b itemprop="price" class="monospace" :content="slotProps.value.price + '.00'">
{{ slotProps.value.price }}
</b>
<i itemprop="priceCurrency" :content="val.CURRENCY_ISO">
{{ val.CURRENCY_SYMBOL }}
</i>
</p>
</template>
</MediaElt>

<p itemprop="offers" itemscope itemtype="https://schema.org/Offer">
<b itemprop="price" class="monospace" :content="slotProps.value.price + '.00'">
{{ slotProps.value.price }}
</b>
<i itemprop="priceCurrency" :content="val.CURRENCY_ISO">
{{ val.CURRENCY_SYMBOL }}
</i>
</p>
</a>
</template>
</CardElt>
Expand Down
6 changes: 4 additions & 2 deletions src/views/main/HomeView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
<h1 class="sky-dark">{{ val.HOME_VIEW }}</h1>
</header>

<CardElt>
<CardElt class="flex-col gap-tn4">
<template #header>
<h2 class="ani-flipperX-loop-altrev-into">{{ val.HOME_SUB }}</h2>
<b>{{ val.INTRO_HOME }}</b>
</template>

<template #body>
<ListElt :dynamic="true" :items="val.HOME_CONTENT" class="ani-grow-it"/>
<ListElt :dynamic="true"
:items="val.HOME_CONTENT"
class="flex-col gap-tn2"/>
</template>
</CardElt>
</main>
Expand Down

0 comments on commit 0da3f52

Please sign in to comment.