Merge pull request #9 from JOTTMEDIA/feature/Conner

feat: New team member, scroll behavior, Update dependencies
JOTTMEDIA · Jan 27, 2025 · 5661952 · 5661952
2 parents 3b83909 + f31e425
commit 5661952
Show file tree

Hide file tree

Showing 14 changed files with 4,587 additions and 5,793 deletions.
diff --git a/app.vue b/app.vue
@@ -41,7 +41,7 @@ onUnmounted(() => {
 });
 </script>
 
-<style lang="scss">
+<style>
 
 @media (hover: hover) {
   * {
@@ -82,14 +82,14 @@ onUnmounted(() => {
     }
   }
 
-  .page-enter-active,
-  .page-leave-active {
-    transition: all 0.4s;
-  }
-  .page-enter-from,
-  .page-leave-to {
-    opacity: 0;
-    filter: blur(1rem);
-  }
+}
+.page-enter-active,
+.page-leave-active {
+  transition: all 0.4s;
+}
+.page-enter-from,
+.page-leave-to {
+  opacity: 0;
+  filter: blur(1rem);
 }
 </style>
diff --git a/app/router.options.ts b/app/router.options.ts
@@ -0,0 +1,11 @@
+import type { RouterConfig } from "@nuxt/schema";
+
+export default <RouterConfig>{
+  async scrollBehavior(to, from, savedPosition) {
+    if (savedPosition) {
+      return savedPosition;
+    } else {
+      return { top: 0 };
+    }
+  },
+};
diff --git a/assets/images/team/conner.jpg b/assets/images/team/conner.jpg
diff --git a/components/Image.vue b/components/Image.vue
@@ -70,15 +70,17 @@ const getImageAbsolutePath = (imageName: string): string | undefined => {
 </script>
 
 <style lang="scss">
+@use 'sass:color';
+$color: #fff;
 .shine {
   position: relative;
   overflow: hidden;
 
   &::before {
     background: linear-gradient(
-      to right,
-      fade_out(#fff, 1) 0%,
-      fade_out(#fff, 0.7) 100%
+            to right,
+            fade_out($color, 1) 0%,
+            fade_out($color, 0.7) 100%
     );
     content: "";
     display: block;

diff --git a/content/team/Conner.md b/content/team/Conner.md
@@ -0,0 +1,11 @@
+---
+name: Conner
+hint: Conner // Entwicklung
+quote: „<b class="text-jm-primary-brown">Mich fasziniert,</b> wie man mit Softwareentwicklung effiziente <b>Lösungen</b> für komplexe <b>Probleme</b> schaffen kann."
+description: Mein Name ist Conner! Schon in jungen Jahren habe ich mich für die Entwicklung von Anwendungen begeistert. Diese Leidenschaft hat mich dazu inspiriert, eine Ausbildung zum Fachinformatiker in Hannover zu absolvieren. Besonders interessiere ich mich für die Entwicklung von Webanwendungen, mobilen Apps und Lösungen im Bereich des Internet of Things (IoT). "Mich fasziniert, wie man mit Softwareentwicklung effiziente Lösungen für komplexe Probleme schaffen kann."
+src: team/conner.jpg
+imageAlt: Conner
+bg: bg-jm-secondary-grey
+button: border-jm-primary-green text-jm-primary-green
+align: left
+---
diff --git a/content/team/Inke.md b/content/team/Inke.md
@@ -7,5 +7,5 @@ src: team/inke.jpg
 imageAlt: Inke
 bg: bg-jm-secondary-grey
 button: border-jm-primary-green text-jm-primary-green
-align: left
+align: right
 ---
diff --git a/content/team/Jan.md b/content/team/Jan.md
@@ -7,5 +7,5 @@ src: team/jan.jpg
 imageAlt: Jan
 bg: bg-jm-primary-brown
 button: border-jm-primary-green text-jm-primary-green
-align: right
+align: left
 ---
diff --git a/content/team/Jonathan.md b/content/team/Jonathan.md
@@ -7,5 +7,5 @@ src: team/jonathan.jpg
 imageAlt: Jonathan
 bg: bg-jm-primary-green
 button: border-jm-primary-brown text-jm-primary-brown
-align: left
+align: right
 ---
diff --git a/content/team/Paul.md b/content/team/Paul.md
@@ -7,5 +7,5 @@ src: team/paul.jpg
 imageAlt: Paul
 bg: bg-jm-secondary-grey
 button: border-jm-primary-green text-jm-primary-green
-align: right
+align: left
 ---
diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -1,67 +1,71 @@
 // https://nuxt.com/docs/api/configuration/nuxt-config
+
 export default defineNuxtConfig({
-    devtools: {
-        enabled: true,
-        timeline: {
-            enabled: true
-        }
-    },
-    routeRules: {
-        '/': {prerender: true},
-    },
-    app: {
-        pageTransition: {name: 'page', mode: 'out-in'},
-        layoutTransition: {name: 'page', mode: 'out-in'},
-        head: {
-            title: 'Dein Büro für Entwicklung und Design – JOTT.MEDIA',
-            meta: [
-                {charset: 'utf-8'},
-                {name: 'viewport', content: 'width=device-width, initial-scale=1'},
-                {
-                    name: 'description',
-                    content: 'Wir unterstützen dich und dein Unternehmen eigene Prozesse digital zu vereinfachen, um mehr Zeit, mehr Zufriedenheit und mehr Qualität zu gewinnen und erfoglreich zu wachsen.'
-                },
-                {name: 'format-detection', content: 'telephone=no'},
-                {name: 'msapplication-TileColor', content: '#ffffff'},
-                {name: 'theme-color', content: '#ffffff'},
-            ],
-            link: [
-                {rel: 'icon', type: 'image/x-icon', href: '/favicon.ico'},
-                {
-                    rel: 'apple-touch-icon',
-                    sizes: '180x180',
-                    href: '/apple-touch-icon.png',
-                },
-                {
-                    rel: 'icon',
-                    type: 'image/png',
-                    sizes: '32x32',
-                    href: '/favicon-32x32.png',
-                },
-                {
-                    rel: 'icon',
-                    type: 'image/png',
-                    sizes: '16x16',
-                    href: '/favicon-16x16.png',
-                },
-                {rel: 'manifest', href: '/site.webmanifest'},
-                {rel: 'mask-icon', href: '/safari-pinned-tab.svg', color: '#5bbad5'},
-            ]
-        },
-    },
-    extends: ['@nuxt/ui-pro'],
-    modules: [
-        '@nuxt/content',
-        '@nuxt/ui',
-        '@vueuse/nuxt',
-        '@nuxt/image',
-        '@nuxthq/studio'
-    ],
-    pages: true,
-    colorMode: {
-        preference: 'light'
-    },
-    ui: {
-        icons: ['mdi']
-    }
-})
+  devtools: {
+      enabled: true,
+      timeline: {
+          enabled: true
+      }
+  },
+  routeRules: {
+      '/': {prerender: true},
+  },
+
+  app: {
+      pageTransition: {name: 'page', mode: 'out-in'},
+      layoutTransition: { name: 'page', mode: 'out-in' },
+      head: {
+          title: 'Dein Büro für Entwicklung und Design – JOTT.MEDIA',
+          meta: [
+              {charset: 'utf-8'},
+              {name: 'viewport', content: 'width=device-width, initial-scale=1'},
+              {
+                  name: 'description',
+                  content: 'Wir unterstützen dich und dein Unternehmen eigene Prozesse digital zu vereinfachen, um mehr Zeit, mehr Zufriedenheit und mehr Qualität zu gewinnen und erfoglreich zu wachsen.'
+              },
+              {name: 'format-detection', content: 'telephone=no'},
+              {name: 'msapplication-TileColor', content: '#ffffff'},
+              {name: 'theme-color', content: '#ffffff'},
+          ],
+          link: [
+              {rel: 'icon', type: 'image/x-icon', href: '/favicon.ico'},
+              {
+                  rel: 'apple-touch-icon',
+                  sizes: '180x180',
+                  href: '/apple-touch-icon.png',
+              },
+              {
+                  rel: 'icon',
+                  type: 'image/png',
+                  sizes: '32x32',
+                  href: '/favicon-32x32.png',
+              },
+              {
+                  rel: 'icon',
+                  type: 'image/png',
+                  sizes: '16x16',
+                  href: '/favicon-16x16.png',
+              },
+              {rel: 'manifest', href: '/site.webmanifest'},
+              {rel: 'mask-icon', href: '/safari-pinned-tab.svg', color: '#5bbad5'},
+          ]
+      },
+  },
+
+  extends: ['@nuxt/ui-pro'],
+
+  modules: [
+      '@nuxt/content',
+      '@nuxt/ui',
+      '@vueuse/nuxt',
+      '@nuxt/image',
+      '@nuxthq/studio'
+  ],
+  pages: true,
+  colorMode: {
+      preference: 'light'
+  },
+    uiPro: { routerOptions: false },
+
+  compatibilityDate: '2025-01-13'
+})