From adb052d1dee86d827ba1ec7c8cf28447f44d17ba Mon Sep 17 00:00:00 2001 From: Arthur DANJOU Date: Tue, 17 Aug 2021 15:32:55 +0200 Subject: [PATCH] Working hardly --- .npmrc | 2 - nuxt.config.ts | 3 +- package.json | 23 +- settings/Modules.ts | 2 +- src/components/AboutHome.vue | 2 +- src/components/AdHome.vue | 2 +- src/components/Announcement.vue | 24 +- src/components/ContactForm.vue | 2 +- src/components/Footer.vue | 185 +++-- src/components/GuestBookForm.vue | 2 +- src/components/GuestbookMessage.vue | 2 +- src/components/Header.vue | 36 +- src/components/Logo.vue | 18 + src/components/MobileNavbar.vue | 97 ++- src/components/Post.vue | 2 +- src/components/Project.vue | 2 +- src/components/ProjectsHome.vue | 2 +- src/components/SideMenu.vue | 66 +- src/components/icons/MenuIcon.vue | 2 +- src/content/formations.json | 16 +- src/content/projects.json | 2 +- src/layouts/default.vue | 48 +- src/locales/en-EN.ts | 26 +- src/locales/fr-FR.ts | 43 +- src/pages/contact.vue | 13 - src/pages/projects.vue | 2 +- src/pages/services.vue | 18 + src/plugins/main.ts | 2 +- src/store/index.ts | 5 +- tsconfig.json | 4 +- types/index.d.ts | 36 - types/types.ts | 12 +- yarn.lock | 1054 ++++++++++++++------------- 33 files changed, 988 insertions(+), 767 deletions(-) delete mode 100755 .npmrc create mode 100644 src/components/Logo.vue create mode 100644 src/pages/services.vue mode change 100755 => 100644 src/plugins/main.ts delete mode 100755 types/index.d.ts diff --git a/.npmrc b/.npmrc deleted file mode 100755 index bac7fb0..0000000 --- a/.npmrc +++ /dev/null @@ -1,2 +0,0 @@ -shamefully-hoist=true -ignore-workspace-root-check=true diff --git a/nuxt.config.ts b/nuxt.config.ts index 056f307..4d103bb 100755 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -6,6 +6,7 @@ import arch from './settings/Arch' import plugins from './settings/Plugins' import css from './settings/Style' import configs from './settings/RuntimeConfig' +import {NuxtConfig} from "@nuxt/types"; const config = { head, @@ -16,6 +17,6 @@ const config = { css, buildModules, ...configs, -} +} as NuxtConfig export default config diff --git a/package.json b/package.json index efd2d40..15b522b 100755 --- a/package.json +++ b/package.json @@ -10,8 +10,9 @@ "dependencies": { "@nuxt/content": "^1.14.0", "@nuxtjs/axios": "^5.13.6", - "@nuxtjs/composition-api": "0.23.4", + "@nuxtjs/composition-api": "0.26.0", "@nuxtjs/dotenv": "^1.4.1", + "@nuxtjs/i18n": "^7.0.2", "@nuxtjs/proxy": "^2.1.0", "@nuxtjs/redirect-module": "^0.3.1", "@nuxtjs/robots": "^2.5.0", @@ -19,20 +20,18 @@ "@nuxtjs/sitemap": "^2.4.0", "@nuxtjs/universal-storage": "^0.5.9", "axios": "^0.21.1", - "core-js": "^3.14.0", - "nuxt": "^2.15.7", - "nuxt-i18n": "^6.27.1", - "prism-themes": "^1.7.0", - "sass": "^1.35.1", - "vuex": "^3.6.2", - "windicss": "^3.1.3" + "core-js": "^3.16.1", + "nuxt": "^2.15.8", + "prism-themes": "^1.8.0", + "sass": "^1.37.5", + "windicss": "^3.1.7" }, "devDependencies": { - "@nuxt/types": "^2.15.7", + "@nuxt/types": "^2.15.8", "@nuxt/typescript-build": "^2.1.0", - "@nuxtjs/color-mode": "^2.0.10", - "markdown-it-prism": "^2.1.6", - "nuxt-windicss": "^1.1.1", + "@nuxtjs/color-mode": "^2.1.1", + "markdown-it-prism": "^2.1.8", + "nuxt-windicss": "^1.2.3", "sass-loader": "10.1.1" } } diff --git a/settings/Modules.ts b/settings/Modules.ts index 011f387..0a566ba 100755 --- a/settings/Modules.ts +++ b/settings/Modules.ts @@ -89,7 +89,7 @@ const sentry = { export default [ ['@nuxtjs/axios', axios], - ['nuxt-i18n', i18n], + ['@nuxtjs/i18n', i18n], ['@nuxt/content', content], ['@nuxtjs/universal-storage', storage], ['@nuxtjs/robots', robots], diff --git a/src/components/AboutHome.vue b/src/components/AboutHome.vue index cc25b6c..03c1920 100755 --- a/src/components/AboutHome.vue +++ b/src/components/AboutHome.vue @@ -33,7 +33,7 @@ export default defineComponent({ .catch((error) => { $sentry.captureEvent(error) }); - }) + }, 'infos') return { info diff --git a/src/components/AdHome.vue b/src/components/AdHome.vue index f4f30a1..94072c6 100755 --- a/src/components/AdHome.vue +++ b/src/components/AdHome.vue @@ -37,6 +37,6 @@ diff --git a/src/components/Announcement.vue b/src/components/Announcement.vue index 86cb889..0b9d03a 100644 --- a/src/components/Announcement.vue +++ b/src/components/Announcement.vue @@ -1,28 +1,24 @@ + + diff --git a/src/components/MobileNavbar.vue b/src/components/MobileNavbar.vue index 2b1903d..8cf3d92 100644 --- a/src/components/MobileNavbar.vue +++ b/src/components/MobileNavbar.vue @@ -1,41 +1,31 @@ - - diff --git a/src/components/Post.vue b/src/components/Post.vue index dde4df9..68d76c7 100755 --- a/src/components/Post.vue +++ b/src/components/Post.vue @@ -1,5 +1,5 @@ diff --git a/src/pages/projects.vue b/src/pages/projects.vue index 4a1bf56..04392d6 100755 --- a/src/pages/projects.vue +++ b/src/pages/projects.vue @@ -1,5 +1,5 @@