rannes.dev/my-portfolio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitea.rannes.dev/christian/my-portfolio

Browse Source
This commit is contained in:
ChrQR 2024-04-20 18:13:52 +02:00
commit 83a725da39
6 changed files with 487 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

451
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
package.json
View File

@ -25,8 +25,12 @@
"tailwindcss": "^3.4.3", "tailwindcss": "^3.4.3",
"vite": "^5.0.3" "vite": "^5.0.3"
}, },
<<<<<<< HEAD
"type": "module", "type": "module",
"dependencies": { "dependencies": {
"@sveltejs/adapter-node": "^5.0.1" "@sveltejs/adapter-node": "^5.0.1"
} }
=======
"type": "module"
>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef
} }

4
src/app.html
View File

@ -9,7 +9,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
%sveltekit.head% %sveltekit.head%
</head> </head>
<<<<<<< HEAD
<body data-sveltekit-preload-data="hover" class="font-jose"> <body data-sveltekit-preload-data="hover" class="font-jose">
=======
<body data-sveltekit-preload-data="hover">
>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef
<div style="display: contents">%sveltekit.body%</div> <div style="display: contents">%sveltekit.body%</div>
</body> </body>
</html> </html>

19
src/routes/+layout.svelte
View File

@ -15,11 +15,19 @@
}, },
{ {
name: "portfolio", name: "portfolio",
<<<<<<< HEAD
subPages: ["project_a", "project_b", "project_c"], subPages: ["project_a", "project_b", "project_c"],
}, },
{ {
name: "contact", name: "contact",
subPages: ["get_in_touch", "socials"], subPages: ["get_in_touch", "socials"],
=======
subPages: ["project a", "project, b", "project c"],
},
{
name: "contact",
subPages: ["get in touch", "socials"],
>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef
}, },
{ {
name: "login", name: "login",
@ -35,7 +43,10 @@
selected = nav[event.srcElement.id]; selected = nav[event.srcElement.id];
intSelected = event.srcElement.id; intSelected = event.srcElement.id;
} }
<<<<<<< HEAD
=======
>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef
</script> </script>
<nav class="nav-container h-32 w-full"> <nav class="nav-container h-32 w-full">
@ -54,11 +65,19 @@
{#key selected} {#key selected}
<ul in:blur={{ delay: 250 }} out:blur={{ duration: 250 }} class="text-center h-4 my-1"> <ul in:blur={{ delay: 250 }} out:blur={{ duration: 250 }} class="text-center h-4 my-1">
{#each selected.subPages as subPage} {#each selected.subPages as subPage}
<<<<<<< HEAD
<li class="sub-nav-item inline-block font-jose"><a class="sub-nav-link text-xl p-2"href={(subPage)}>{subPage.replace(/_/g, ' ')}</a></li> <li class="sub-nav-item inline-block font-jose"><a class="sub-nav-link text-xl p-2"href={(subPage)}>{subPage.replace(/_/g, ' ')}</a></li>
=======
<li class="sub-nav-item inline-block font-jose"><a class="sub-nav-link text-xl p-2"href={subPage}>{subPage}</a></li>
>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef
{/each} {/each}
</ul> </ul>
{/key} {/key}
</nav> </nav>
<<<<<<< HEAD
<div class="text-center max-w-lg mx-auto"> <div class="text-center max-w-lg mx-auto">
=======
<div class="text-center w-3/5 mx-auto">
>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef
<slot /> <slot />
</div> </div>

4
src/routes/+page.svelte
View File

@ -1,4 +1,8 @@
<<<<<<< HEAD
<div class="main-container text-center"> <div class="main-container text-center">
=======
<div class="main-container w-2/4 mx-auto text-center">
>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef
<h1 class="text-xl mb-2">Welcome to my personal webpage</h1> <h1 class="text-xl mb-2">Welcome to my personal webpage</h1>
<p class="text-left">My name is Christian and I live in Copenhagen. In my professional life, I recruit in product and engineering. <p class="text-left">My name is Christian and I live in Copenhagen. In my professional life, I recruit in product and engineering.
</p> </p>

5
src/routes/about/+page.svelte
View File

@ -1,3 +1,8 @@
<<<<<<< HEAD
<h1 class="text-xl font-jose">Life is good in Copenhagen</h1> <h1 class="text-xl font-jose">Life is good in Copenhagen</h1>
<h2>I live in Copenhagen with my partner and children.</h2> <h2>I live in Copenhagen with my partner and children.</h2>
=======
<h1>This is the about page</h1>
<h2>My name is Christian, and I live in Denmark with my partner and kids.</h2>
>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef
<p>testing</p> <p>testing</p>