Merge pull request #5 from mrepol742/master

fix bug
hallofcodes · Apr 12, 2024 · 504656f · 504656f
2 parents f881823 + fda9163
commit 504656f
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 28 deletions.
diff --git a/index.html b/index.html
@@ -5,7 +5,22 @@
   <meta charset="UTF-8">
   <link rel="icon" href="/favicon.ico">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta name="google-site-verification" content="h5iYzE_wKfzBF13wGtJkYOsbKlIBikLLI6SjCtTyJ58" />
+  <meta name="hostname" content="hallofcodes.github.io">
+  <meta name="theme-color" content="#ffffff">
+  <meta name="twitter:card" content="summary">
+  <meta name="twitter:site" content="@">
+  <meta name="twitter:creator" content="@">
+  <meta name="twitter:title" content="Hall of Codes - Merging Programmers Beyond Conflicts">
+  <meta name="twitter:description"
+      content="Be part of a vibrant community where innovation thrives and collaboration is key.">
+  <meta name="twitter:image" content="https://hallofcodes.github.io/cover.jpg">
+  <meta property="og:url" content="https://hallofcodes.github.io/">
+  <meta property="og:title" content="Hall of Codes - Merging Programmers Beyond Conflicts">
+  <meta property="og:description"
+      content="Be part of a vibrant community where innovation thrives and collaboration is key.">
+  <meta property="og:type" content="website">
+  <meta property="og:image" content="https://hallofcodes.github.io/cover.jpg">
+  <meta property="og:image:type" content="image/jpeg">
   <script>
     if (localStorage.getItem('color-theme') === 'dark' || (!('color-theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
       document.documentElement.classList.add('dark');
@@ -21,7 +36,7 @@
         j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true; j.src =
           'https://www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f);
     })(window, document, 'script', 'dataLayer', 'GTM-TS7RV4J4');</script>
-  <title>Hall of Codes</title>
+  <title>Hall of Codes - Merging Programmers Beyond Conflicts</title>
 </head>
 
 <body>

diff --git a/public/404.html b/public/404.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <link rel="icon" href="/favicon.ico">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="hostname" content="hallofcodes.github.io">
+    <link rel="canonical" href="https://hallofcodes.github.io/">
+    <meta http-equiv="refresh" content="1; url = https://hallofcodes.github.io/" />
+    <meta name="theme-color" content="#ffffff">
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:site" content="@">
+    <meta name="twitter:creator" content="@">
+    <meta name="twitter:title" content="Hall of Codes - Merging Programmers Beyond Conflicts">
+    <meta name="twitter:description"
+        content="Be part of a vibrant community where innovation thrives and collaboration is key.">
+    <meta name="twitter:image" content="https://hallofcodes.github.io/cover.jpg">
+    <meta property="og:url" content="https://hallofcodes.github.io/">
+    <meta property="og:title" content="Hall of Codes - Merging Programmers Beyond Conflicts">
+    <meta property="og:description"
+        content="Be part of a vibrant community where innovation thrives and collaboration is key.">
+    <meta property="og:type" content="website">
+    <meta property="og:image" content="https://hallofcodes.github.io/cover.jpg">
+    <meta property="og:image:type" content="image/jpeg">
+
+    <title>Hall of Codes - Merging Programmers Beyond Conflicts</title>
+</head>
+
+<body>
+</body>
+
+</html>
diff --git a/public/cover.jpg b/public/cover.jpg
diff --git a/public/google022983bf0cf659ae.html b/public/google022983bf0cf659ae.html
@@ -0,0 +1 @@
+google-site-verification: google022983bf0cf659ae.html
diff --git a/src/components/NavComponent.vue b/src/components/NavComponent.vue
@@ -1,7 +1,7 @@
 <template>
     <nav class="bg-white dark:bg-gray-900 max-w-full z-20 top-0 start-0">
         <div class="flex flex-wrap items-center justify-between mx-auto pt-5 pb-5 pl-4 pr-4">
-            <a href="https://hallofcodes.github.io/" class="flex items-center space-x-3 rtl:space-x-reverse">
+            <a href="/" class="flex items-center space-x-3 rtl:space-x-reverse">
                 <img src="https://avatars.githubusercontent.com/u/93744673?s=200&v=4" class="rounded-full h-7"
                     alt="Hall of Codes Logo">
                 <span class="self-center text-2xl font-semibold whitespace-nowrap dark:text-white">hallofcodes</span>
@@ -37,25 +37,21 @@
                 class="items-center justify-between w-full md:flex md:w-auto md:order-1" id="navbar-sticky">
                 <ul
                     class="flex flex-col w-full p-4 md:p-0 mt-4 font-medium border border-gray-100 rounded-lg bg-gray-50 md:space-x-8 rtl:space-x-reverse md:flex-row md:mt-0 md:border-0 md:bg-white dark:bg-gray-900 md:bg-gray-900 dark:border-gray-700">
+
                     <li>
-                        <a href="/"
-                            class="block py-2 px-3 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 md:dark:hover:text-blue-500 dark:text-white dark:hover:bg-gray-900 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700">Home</a>
+                        <router-link to="/" class="block py-2 px-3 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 md:dark:hover:text-blue-500 dark:text-white dark:hover:bg-gray-900 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700">Home</router-link>
                     </li>
                     <li>
-                        <a href="/about"
-                            class="block py-2 px-3 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 md:dark:hover:text-blue-500 dark:text-white dark:hover:bg-gray-900 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700">About</a>
+                        <router-link to="/about" class="block py-2 px-3 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 md:dark:hover:text-blue-500 dark:text-white dark:hover:bg-gray-900 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700">About</router-link>
                     </li>
                     <li>
-                        <a href="/events"
-                            class="block py-2 px-3 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 md:dark:hover:text-blue-500 dark:text-white dark:hover:bg-gray-900 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700">Events</a>
+                        <router-link to="/events" class="block py-2 px-3 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 md:dark:hover:text-blue-500 dark:text-white dark:hover:bg-gray-900 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700">Events</router-link>
                     </li>
                     <li>
-                        <a href="/projects"
-                            class="block py-2 px-3 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 md:dark:hover:text-blue-500 dark:text-white dark:hover:bg-gray-900 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700">Projects</a>
+                        <router-link to="/projects" class="block py-2 px-3 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 md:dark:hover:text-blue-500 dark:text-white dark:hover:bg-gray-900 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700">Projects</router-link>
                     </li>
                     <li>
-                        <a href="/contact"
-                            class="block py-2 px-3 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 md:dark:hover:text-blue-500 dark:text-white dark:hover:bg-gray-900 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700">Contact</a>
+                        <router-link to="/contact" class="block py-2 px-3 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 md:dark:hover:text-blue-500 dark:text-white dark:hover:bg-gray-900 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700">Contact</router-link>
                     </li>
                 </ul>
             </div>

diff --git a/src/router/index.js b/src/router/index.js
@@ -1,14 +1,8 @@
 import { createRouter, createWebHistory } from 'vue-router'
 import Home from '../views/HomeView.vue'
-import About from '../views/AboutView.vue'
-import Contact from '../views/ContactView.vue'
-import Events from '../views/EventsView.vue'
-import Projects from '../views/ProjectsView.vue'
-import Privacypolicy from '../views/legal/PrivacyPolicyView.vue'
-import TermsAndConditions from '../views/legal/TermsAndConditionsView.vue'
 
 const router = createRouter({
-  history: createWebHistory(import.meta.env.BASE_URL),
+  history: createWebHistory(),
   routes: [
     {
       path: '/',
@@ -22,34 +16,41 @@ const router = createRouter({
     {
       path: '/about',
       name: 'About - Hall of Codes',
-      component: About
+      component: () => import('../views/AboutView.vue')
     },
     {
       path: '/contact',
       name: 'Contact - Hall of Codes',
-      component: Contact
+      component: () => import('../views/ContactView.vue')
     },
     {
       path: '/events',
       name: 'Events - Hall of Codes',
-      component: Events
+      component: () => import('../views/EventsView.vue')
     },
     {
       path: '/projects',
       name: 'Projects - Hall of Codes',
-      component: Projects
+      component: () => import('../views/ProjectsView.vue')
     },
     {
       path: '/privacypolicy',
       name: 'Privacy Policy - Hall of Codes',
-      component: Privacypolicy
+      component: () => import('../views/legal/PrivacyPolicyView.vue')
     },
     {
       path: '/termsandconditions',
       name: 'Terms and Conditions - Hall of Codes',
-      component: TermsAndConditions
+      component: () => import('../views/legal/TermsAndConditionsView.vue')
     }
-  ]
+  ],
+  scrollBehavior(to, from, savedPosition) {
+    if (savedPosition) {
+      return savedPosition
+    } else {
+      return { top: 0 }
+    }
+  },
 })
 
 router.beforeEach((to, from, next) => {

diff --git a/src/views/ProjectsView.vue b/src/views/ProjectsView.vue
@@ -39,7 +39,6 @@ import Project from '../components/ProjectComponent.vue'
                     </ul>
 
                 </div>
-
 
                 <!-- Project 1 -->
                 <Project :source="source_orion" :website="website_orion" :projectPhoto="photo_orion">
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		google-site-verification: google022983bf0cf659ae.html
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,7 +39,6 @@ import Project from '../components/ProjectComponent.vue' @@
                         </ul>
                     </div>
                     <!-- Project 1 -->
                     <Project :source="source_orion" :website="website_orion" :projectPhoto="photo_orion">
@@ Expand Down @@