Merge branch 'main' of https://gitea.rannes.dev/christian/my-portfolio
This commit is contained in:
commit
7f8bd72cb0
1
.dockerignore
Normal file
1
.dockerignore
Normal file
|
|
@ -0,0 +1 @@
|
|||
node_modules
|
||||
28
.onedev-buildspec.yml
Normal file
28
.onedev-buildspec.yml
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
version: 31
|
||||
jobs:
|
||||
- name: portfolio ci
|
||||
steps:
|
||||
- !CheckoutStep
|
||||
name: checkout
|
||||
cloneCredential: !DefaultCredential {}
|
||||
withLfs: false
|
||||
withSubmodules: false
|
||||
condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
|
||||
- !CommandStep
|
||||
name: build
|
||||
runInContainer: false
|
||||
interpreter: !DefaultInterpreter
|
||||
commands: |
|
||||
npm build
|
||||
useTTY: true
|
||||
condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
|
||||
- !BuildImageStep
|
||||
name: build image
|
||||
tags: rannes.dev/portfolio
|
||||
publish: false
|
||||
removeDanglingImages: true
|
||||
condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
|
||||
retryCondition: never
|
||||
maxRetries: 3
|
||||
retryDelay: 30
|
||||
timeout: 3600
|
||||
12
Dockerfile
Normal file
12
Dockerfile
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
FROM node:12 AS build
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
COPY package.json ./
|
||||
COPY package-lock.json ./
|
||||
RUN npm install
|
||||
COPY . ./
|
||||
RUN npm run build
|
||||
|
||||
FROM nginx:1.19-alpine
|
||||
COPY --from=build /app/public /usr/share/nginx/html
|
||||
548
package-lock.json
generated
548
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
|
|
@ -25,5 +25,12 @@
|
|||
"tailwindcss": "^3.4.3",
|
||||
"vite": "^5.0.3"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"type": "module",
|
||||
"dependencies": {
|
||||
"@sveltejs/adapter-node": "^5.0.1"
|
||||
}
|
||||
=======
|
||||
"type": "module"
|
||||
>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,11 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
%sveltekit.head%
|
||||
</head>
|
||||
<<<<<<< HEAD
|
||||
<body data-sveltekit-preload-data="hover" class="font-jose">
|
||||
=======
|
||||
<body data-sveltekit-preload-data="hover">
|
||||
>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef
|
||||
<div style="display: contents">%sveltekit.body%</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -15,11 +15,23 @@
|
|||
},
|
||||
{
|
||||
name: "portfolio",
|
||||
<<<<<<< HEAD
|
||||
subPages: ["learnings", "project a", "project b", "project c"],
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
subPages: ["project_a", "project_b", "project_c"],
|
||||
},
|
||||
{
|
||||
name: "contact",
|
||||
subPages: ["get_in_touch", "socials"],
|
||||
=======
|
||||
subPages: ["project a", "project, b", "project c"],
|
||||
>>>>>>> 83a725da3916d4176d50fd4e4ea7cfd56d42e9e1
|
||||
},
|
||||
{
|
||||
name: "contact",
|
||||
subPages: ["get in touch", "socials"],
|
||||
>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef
|
||||
},
|
||||
{
|
||||
name: "login",
|
||||
|
|
@ -35,6 +47,10 @@
|
|||
selected = nav[event.srcElement.id];
|
||||
intSelected = event.srcElement.id;
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef
|
||||
</script>
|
||||
|
||||
<nav class="nav-container h-32 w-full">
|
||||
|
|
@ -53,11 +69,23 @@
|
|||
{#key selected}
|
||||
<ul in:blur={{ delay: 250 }} out:blur={{ duration: 250 }} class="text-center h-4 my-1">
|
||||
{#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}</a></li>
|
||||
>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef
|
||||
{/each}
|
||||
</ul>
|
||||
{/key}
|
||||
</nav>
|
||||
<<<<<<< HEAD
|
||||
<div class="text-center max-w-xl mx-auto">
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
<div class="text-center max-w-lg mx-auto">
|
||||
=======
|
||||
<div class="text-center w-3/5 mx-auto">
|
||||
>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef
|
||||
>>>>>>> 83a725da3916d4176d50fd4e4ea7cfd56d42e9e1
|
||||
<slot />
|
||||
</div>
|
||||
|
|
@ -1,4 +1,12 @@
|
|||
<<<<<<< HEAD
|
||||
<div class="main-container text-center">
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
<div class="main-container text-center">
|
||||
=======
|
||||
<div class="main-container w-2/4 mx-auto text-center">
|
||||
>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef
|
||||
>>>>>>> 83a725da3916d4176d50fd4e4ea7cfd56d42e9e1
|
||||
<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>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
<<<<<<< HEAD
|
||||
<h1 class="text-xl font-jose">Life is good in Copenhagen</h1>
|
||||
<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>
|
||||
1
src/routes/get_in_touch/+page.svelte
Normal file
1
src/routes/get_in_touch/+page.svelte
Normal file
|
|
@ -0,0 +1 @@
|
|||
<h1> does it work?</h1>
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
<<<<<<< HEAD
|
||||
<h1>What should this look like?</h1>
|
||||
|
||||
<div class="content text-left px-8">
|
||||
|
|
@ -10,3 +11,6 @@
|
|||
<li>Mix of them all</li>
|
||||
</ol>
|
||||
</div>
|
||||
=======
|
||||
<h1 class="text-2xl font-jose">aaaawwww yea the pride of my life</h1>
|
||||
>>>>>>> 83a725da3916d4176d50fd4e4ea7cfd56d42e9e1
|
||||
|
|
|
|||
2
src/routes/resume/+page.svelte
Normal file
2
src/routes/resume/+page.svelte
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
<h1 class="text-xl">Get ready for my resume baby!</h1>
|
||||
<p>resumes are getting longer and longer these day, and this one is no exception!</p>
|
||||
Loading…
Reference in New Issue
Block a user