Release 2.1

Release 2.1

public/index.html

@@ -9,7 +9,7 @@
       name="description"
       content="Z-100's CV website :)"
     />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo171.png" />
+    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logos/elmo-logo.png" />
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
     <title>Vayan - Z-100</title>
   </head>

public/robots.txt

@@ -1,5 +1,2 @@
 # https://www.robotstxt.org/robotstxt.html
 User-agent: *
-Disallow: /contact
-Disallow: /demo
-Disallow: /projects

src/components/content/ContentSection.tsx

@@ -1,54 +1,38 @@
 import React from 'react'
 import {TextSection} from "../../domain";
 
-type ImagePos = 'left' | 'right' | 'top'
 type TextPos = 'left' | 'right' | 'centered'
 
 interface ContentSectionProps {
     textSection: TextSection,
     textPos?: TextPos,
-    image?: string,
 }
 
-export const ContentSection = ({textSection, textPos = 'left', image}: ContentSectionProps) => {
+export const ContentSection = ({textSection, textPos = 'left'}: ContentSectionProps) => {
 
-    function getImagePos(textPos: TextPos): ImagePos {
-        if (textPos === 'left') return 'right'
-        if (textPos === 'right') return 'left'
-        if (textPos === 'centered') return 'top'
 
-        throw Error(`Unknown property: ${textPos}`);
-    }
+    function mapTextToP(text: string | string[], textPos: TextPos): JSX.Element {
+
+        if (typeof text !== 'string') {
+            return (
+                <ul className="mb-8 ml-5 list-disc">
+                    {text?.map((li, index) => (
+                        <li key={index} className="mb-2">{li}</li>
+                    ))}
+                </ul>
+            );
+        }
 
-    function mapTextToP(text: string, textPos: TextPos): JSX.Element {
         return (
-            <>
+            <div className="mb-8">
                 {text.split("\n").map((line, i) => (
-                    <>
-                        { /* Ik this is a cheap solution */
-                            line === 'br' ? <br/> : <p className={"text-" + textPos} key={i}>{line}</p>
-                        }
-                    </>
+                    <p className={"text-" + textPos} key={i}>{line || <br/>}</p>
                 ))}
-            </>
-        );
-    }
-
-    const imagePos = getImagePos(textPos)
-
-    if (!textSection.texts && image) {
-        return (
-            <div className="flex flex-row my-5">
-                <div>
-                    <h1>{textSection.title}</h1>
-                    {mapTextToP(textSection.text, textPos)}
-                </div>
-                <img className={"text-" + imagePos} src={image} alt={textSection.title}/>
             </div>
         );
     }
 
-    if (!textSection.texts) {
+    if (!textSection.subTexts) {
         return (
             <div className="my-5">
                 <h1 className="mb-2">{textSection.title}</h1>
@@ -61,7 +45,7 @@ export const ContentSection = ({textSection, textPos = 'left', image}: ContentSe
         <div className="my-5">
             <h1 className="mb-2">{textSection.title}</h1>
             {mapTextToP(textSection.text, textPos)}
-            {textSection.texts!.map((text, i) => (
+            {textSection.subTexts!.map((text, i) => (
                 <>
                     <h2 className="mb-1 mt-2">{text.title}</h2>
                     {mapTextToP(text.text, textPos)}

src/components/content/ProjectSection.tsx

@@ -20,7 +20,7 @@ export const ProjectSection = ({ name, shortDesc, desc, url, image }: ProjectSec
                         <Link to={url}
                               target={"_blank"}
                               className="w-full h-48 object-cover">
-                            <h3 className="text-xl font-bold mb-2">➡️ {name}</h3>
+                            <h3 className="text-xl font-bold py-2 pr-2 hover:underline focus:underline text-link-2 visited:text-link-1">GitHub/{name}</h3>
                         </Link>
                         <p className="text-gray-700 text-base">{shortDesc}</p>
                     </span>

src/components/navigation/Navbar.tsx

@@ -12,7 +12,7 @@ export const Navbar = () => {
 
     return (
         <>
-            <div className="fixed top-0 w-full bg-dark-1 h-16">
+            <div className="fixed top-0 w-full bg-dark-1 h-16 z-50">
                 <div className="w-[50%] ml-[25%] h-full flex gap-6 items-center justify-center">
                     {routerData.map(route => (
                         <Link key={route.name}

src/components/router/Router.tsx

@@ -4,16 +4,14 @@ import {Route, Routes} from "react-router-dom";
 
 export const Router = () => {
     return (
-        <div className="w-full md:w-[80%]">
-            <Routes>
-                {routerData.map(({path, element, name}) => (
-                    <Route
-                        key={name}
-                        path={path}
-                        element={element}
-                    />
-                ))}
-            </Routes>
-        </div>
+        <Routes>
+            {routerData.map(({path, element, name}) => (
+                <Route
+                    key={name}
+                    path={path}
+                    element={element}
+                />
+            ))}
+        </Routes>
     );
 }

src/domain/mock-db/index.js

@@ -1,2 +1,3 @@
 export * from './socials-data';
 export * from './text-data';
+export * from './projects-data';