Skip to content

Commit

Permalink
Merge pull request #95 from La-CHATTE-2-0/upgrade/vue3
Browse files Browse the repository at this point in the history
Upgrade/vue3
  • Loading branch information
alanlecart authored Jun 14, 2024
2 parents fb4b211 + 63c2d17 commit 051b2a2
Show file tree
Hide file tree
Showing 13 changed files with 218 additions and 225 deletions.
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />

<meta name="theme-color" content="#212529" />
<meta name="theme-color" content="#121212" />
<meta name="description" content="Code de la Faluche Amiénoise" />
<title>Code Amiénois</title>
<link rel="icon" href="/favicon.ico" />
Expand Down
381 changes: 170 additions & 211 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"preview": "vite preview"
},
"dependencies": {
"pinia": "^2.1.7",
"vite-plugin-pwa": "^0.20.0",
"vue": "^3.4.27",
"vite-plugin-radar": "^0.9.6",
"vue": "^3.4.28",
"vue-router": "^4.3.3",
"vuetify": "^3.6.9"
},
Expand All @@ -21,7 +21,7 @@
"@vitejs/plugin-vue": "^5.0.5",
"sass": "^1.77.5",
"typescript": "^5.4.5",
"vite": "^5.2.13",
"vite": "^5.3.1",
"vue-tsc": "^2.0.21"
},
"repository": {
Expand Down
Binary file modified public/favicon.ico
Binary file not shown.
Binary file modified public/icons-128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/icons-192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/icons-512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 11 additions & 5 deletions src/components/Birthdays.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@
</v-expansion-panel-title>
<v-expansion-panel-text>
<strong>Centenaire de la Faluche</strong>
<ul class="ml-4">
<ul class="ml-4 mb-4">
<li>Reims, les 25 et 26 Juin 1988</li>
</ul>

<strong>États Généraux de la Faluche</strong>
<ul class="ml-4">
<strong class="mt-6">États Généraux de la Faluche</strong>
<ul class="ml-4 mb-4">
<li>Dijon, les 23, 24 et 25 Juin 1989</li>
</ul>

<strong>Convention Nationale de la Faluche</strong>
<ul>
<ul class="ml-4 mb-4">
<li>Lille, les 22, 23 et 24 juin 1990</li>
</ul>

<strong>Congrès Nationaux de la Faluche</strong>
<ul>
<ul class="ml-4 mb-4">
<li>Clermont-Ferrand, les 23, 24 et 25 Juin 1991</li>
<li>Poitiers les 24, 25 et 26 Juin 1992</li>
<li>Nancy, les 3, 4 et 5 Juillet 1993</li>
Expand Down Expand Up @@ -59,3 +59,9 @@
</v-expansion-panel>
</v-expansion-panels>
</template>

<style scoped>
li {
margin-left: 15px;
}
</style>
2 changes: 1 addition & 1 deletion src/components/articles/Article6Spé.vue
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ import "../../sass/base/_tables.scss";
<div class="pt-2">Sage-Femme</div>
<div class="py-2">
<v-icon icon="mdi-repeat"></v-icon>
Velours fushia pas au code national
Velours fushia au code national
</div>
</td>
<td data-matiere>Velours fiolet</td>
Expand Down
1 change: 1 addition & 0 deletions src/components/shared/AppHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ function toggleTheme() {

<template v-slot:image>
<v-img
alt=""
gradient="to top right, rgba(0,0,0,.9), rgba(0,0,0,.7)"
></v-img>
</template>
Expand Down
24 changes: 24 additions & 0 deletions src/layout/MainLayout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,30 @@ import AppHeader from "../components/shared/AppHeader.vue";
<v-main style="max-width: 900px; margin: auto">
<slot></slot>
</v-main>
<v-footer>
<v-row justify="center" no-gutters>
<v-col class="text-center my-2" cols="12">
<a href="https://github.com/La-CHATTE-2-0/code-amienois">
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
style="
width: 20px;
fill: rgba(
var(--v-theme-on-background),
var(--v-high-emphasis-opacity)
);
"
>
<title>github</title>
<path
d="M12,2A10,10 0 0,0 2,12C2,16.42 4.87,20.17 8.84,21.5C9.34,21.58 9.5,21.27 9.5,21C9.5,20.77 9.5,20.14 9.5,19.31C6.73,19.91 6.14,17.97 6.14,17.97C5.68,16.81 5.03,16.5 5.03,16.5C4.12,15.88 5.1,15.9 5.1,15.9C6.1,15.97 6.63,16.93 6.63,16.93C7.5,18.45 8.97,18 9.54,17.76C9.63,17.11 9.89,16.67 10.17,16.42C7.95,16.17 5.62,15.31 5.62,11.5C5.62,10.39 6,9.5 6.65,8.79C6.55,8.54 6.2,7.5 6.75,6.15C6.75,6.15 7.59,5.88 9.5,7.17C10.29,6.95 11.15,6.84 12,6.84C12.85,6.84 13.71,6.95 14.5,7.17C16.41,5.88 17.25,6.15 17.25,6.15C17.8,7.5 17.45,8.54 17.35,8.79C18,9.5 18.38,10.39 18.38,11.5C18.38,15.32 16.04,16.16 13.81,16.41C14.17,16.72 14.5,17.33 14.5,18.26C14.5,19.6 14.5,20.68 14.5,21C14.5,21.27 14.66,21.59 15.17,21.5C19.14,20.16 22,16.42 22,12A10,10 0 0,0 12,2Z"
/>
</svg>
</a>
</v-col>
</v-row>
</v-footer>
</template>

<style scoped></style>
4 changes: 0 additions & 4 deletions src/main.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { createApp } from 'vue'
import { createPinia } from 'pinia'
import '@mdi/font/css/materialdesignicons.css'

// Vuetify
Expand All @@ -25,12 +24,9 @@ const vuetify = createVuetify({
}
})

const pinia = createPinia()

const app = createApp(App)
app.use(vuetify)
app.use(router)
app.use(pinia)

app.component('MainLayout', MainLayout)
app.component('Code', Code)
Expand Down
7 changes: 7 additions & 0 deletions vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { defineConfig } from 'vite'
import vue from '@vitejs/plugin-vue'
import { VitePWA } from 'vite-plugin-pwa'
import { VitePluginRadar } from 'vite-plugin-radar'

// https://vitejs.dev/config/
export default defineConfig({
Expand Down Expand Up @@ -52,5 +53,11 @@ export default defineConfig({
enabled: true
}
}),
VitePluginRadar({
// Google Analytics tag injection
analytics: {
id: 'G-XPELB5DRNK',
},
})
],
})

0 comments on commit 051b2a2

Please sign in to comment.