Skip to content

Commit

Permalink
Merge pull request #9 from DaniloMurer/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@DaniloMurer
DaniloMurer authored Aug 12, 2024
2 parents 43e5d94 + eb841d7 commit dba15aa
Show file tree
Hide file tree
Showing 22 changed files with 6,493 additions and 6,048 deletions.
2 changes: 2 additions & 0 deletions .run/StartServer.run.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<working_directory value="$PROJECT_DIR$/server" />
<envs>
<env name="DB_CONNECTION" value="host=localhost user=postgres password=gorm dbname=gorm port=5432 sslmode=disable TimeZone=Europe/Zurich" />
<env name="ADMIN_USERNAME" value="admin" />
<env name="ADMIN_PASSWORD" value="testico" />
</envs>
<kind value="FILE" />
<package value="server" />
Expand Down
77 changes: 69 additions & 8 deletions client/app.vue
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,75 @@
<script setup lang="ts">
const username = ref('');
const password = ref('');
const login = function() {
const requestBody = {
username: username.value,
password: password.value,
token: ''
}
$fetch('/api/authentication', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'Accept': 'application/json',
},
body: JSON.stringify(requestBody)
}).then((data: any) => {
localStorage.setItem('token', data.token)
const loginModal = document.getElementById('loginModal');
if (loginModal) {
loginModal.close();
navigateTo('/admin')
}
}).catch(err => {
console.error(err)
})
}
onMounted(() => {
window.addEventListener('keydown', (e) => {
if (e.ctrlKey && e.altKey && e.key === 'l') {
document.getElementById('loginModal').showModal();
}
})
})
</script>
<template>
<div class="p-3 flex flex-col h-lvh gap-16">
<div class="navbar bg-gray-800 rounded-2xl shadow-2xl">
<a class="btn btn-ghost text-xl">churrer.xyz</a>
</div>
<NuxtRouteAnnouncer/>
<NuxtPage/>
</div>
<div class="p-3 flex flex-col h-lvh gap-16">
<div class="navbar bg-gray-800 rounded-2xl shadow-2xl">
<div class="flex-1">
<a class="btn btn-ghost text-xl" href="/">churrer.xyz</a>
</div>
</div>
<dialog id="loginModal" class="modal">
<div class="modal-box p-5">
<form method="dialog">
<button class="btn btn-sm btn-circle btn-ghost absolute right-2 top-2">✕</button>
</form>
<div class="flex flex-col align-items-center gap-16">
<h3 class="text-lg font-bold">Log-In</h3>
<div>
<div class="label">
<span class="label-text">Username</span>
</div>
<input class="input input-primary w-11/12" v-model="username"/>
</div>
<div>
<div class="label">
<span class="label-text">Password</span>
</div>
<input type="password" class="input input-primary w-11/12" v-model="password"/>
</div>
</div>
<button class="btn btn-secondary w-24 float-right mt-16 mr-10" v-on:click="login()">Login</button>
</div>
</dialog>
<NuxtRouteAnnouncer/>
<NuxtPage/>
</div>
</template>
<style>
html {
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
}
</style>
78 changes: 41 additions & 37 deletions client/components/Experiences.vue
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,41 @@
<script setup lang="ts">
</script>

<template>
<ul class="timeline timeline-vertical timeline-snap-icon">
<li>
<div class="timeline-start mb-10">
<WorkCard class="lg:mr-10" data-aos="fade-right" data-aos-duration="1000" title="Apprentice"
company="Würth ITensis" timeframe="01.08.2018 - 31.07.2022" text="Developing as well as maintaining Java applications
and ABAP / SAPUI5 development"/>
</div>
<div class="timeline-middle">
<span class="iconify carbon--time text-xl"></span>
</div>
<hr/>
</li>
<li>
<div class="timeline-end mb-10">
<WorkCard class="lg:ml-10"
data-aos="fade-left"
data-aos-duration="1000"
title="Junior Software Engineer"
company="Würth ITensis"
timeframe="01.08.2022 - Current"
text="Migrating existing apps to OpenShift Platform. Engineering and maintaining k8s DevOps infrastructure. Developing and maintaining Java applications with Docker. Developing and maintaining SAPUI5 and ABAP applications. Requirements-Engineering with clients"/>
</div>
<div class="timeline-middle">
<span class="iconify carbon--time text-xl"></span>
</div>
</li>
</ul>
</template>

<style scoped>
</style>
<script setup lang="ts">
let experiences = ref([])
onMounted(() => {
$fetch('/api/experiences', {
method: 'GET',
headers: {
'Accept': 'application/json',
}
}).then((data: any) => {
experiences.value = data;
console.log(experiences)
}).catch((err) => {
console.error('Something went wrong. check backend logs....', err);
})
})
</script>

<template>
<ul class="timeline timeline-vertical timeline-snap-icon">
<li v-for="(experience, index) in experiences">
<div class="mb-10" :class="index % 2 == 0 ? 'timeline-start' : 'timeline-end'">
<WorkCard :class="index % 2 == 0 ? 'lg:mr-10' : 'lg:ml-10'"
:data-aos="index % 2 == 0 ? 'fade-right' : 'fade-left'"
data-aos-duration="1000"
:title="experience.position"
:company="experience.company" :timeframe="experience.timeFrame"
:text="experience.responsibilities"/>
</div>
<div class="timeline-middle">
<span class="iconify carbon--time text-xl"></span>
</div>
<!-- fixme: https://github.com/DaniloMurer/churrer.xyz/issues/8 -->
<hr v-if="index % 2 == 0"/>
</li>
</ul>
</template>

<style scoped>
</style>
78 changes: 31 additions & 47 deletions client/components/Technologies.vue
View file
Original file line number Diff line number Diff line change
@@ -1,47 +1,31 @@
<script setup lang="ts">
</script>

<template>
<div class="stats stats-vertical lg:stats-horizontal bg-base-300 p-2">
<div class="stat">
<div class="stat-figure">
<span class="iconify logos--java iconify-color text-8xl"/>
</div>
<div class="stat-title text-primary text-2xl">Java</div>
<div class="stat-value text-accent">3+ Years</div>
<div class="stat-desc text-wrap">Experience in JavaEE, Vaadin, Spring Boot</div>
</div>

<div class="stat">
<div class="stat-figure">
<span class="iconify logos--javascript iconify-color text-8xl"/>
</div>
<div class="stat-title text-primary text-2xl">JavaScript</div>
<div class="stat-value text-accent">3+ Years</div>
<div class="stat-desc text-wrap">Experience in Node.js, SAPUI5, Frontend Development</div>
</div>
<div class="stat">
<div class="stat-figure">
<span class="iconify logos--typescript-icon iconify-color text-8xl"/>
</div>
<div class="stat-title text-primary text-2xl">TypeScript</div>
<div class="stat-value text-accent">1 Year</div>
<div class="stat-desc text-wrap">Vue / Nuxt, Nest.js</div>
</div>

<div class="stat">
<div class="stat-figure">
<span class="iconify logos--kubernetes iconify-color text-8xl"/>
</div>
<div class="stat-title text-primary text-2xl">Kubernetes</div>
<div class="stat-value text-accent">2 Years</div>
<div class="stat-desc text-wrap">K8s, OpenShift, Cluster Management, DevOps and GitOps</div>
</div>
</div>
<p class="mt-4">Of course there is more, but you can ask me about that personally!</p>
</template>

<style scoped>
</style>
<script setup lang="ts">
let technologies = ref([])
$fetch('/api/technologies', {
method: 'GET',
headers: {
'Accept': 'application/json',
}
}).then((data: any) => {
technologies.value = data;
})
</script>

<template>
<div class="stats stats-vertical lg:stats-horizontal bg-base-300 p-2">
<div class="stat" v-for="technology in technologies">
<div class="stat-figure">
<span class="iconify iconify-color text-8xl" :class="technology.logoClass"/>
</div>
<div class="stat-title text-primary text-2xl">{{ technology.name }}</div>
<div class="stat-value text-accent">{{ technology.experience }}</div>
<div class="stat-desc text-wrap">{{ technology.description }}</div>
</div>
</div>
<p class="mt-4">Of course there is more, but you can ask me about that personally!</p>
</template>

<style scoped>
</style>
14 changes: 7 additions & 7 deletions client/nuxt.config.ts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// https://nuxt.com/docs/api/configuration/nuxt-config
export default defineNuxtConfig({
compatibilityDate: '2024-04-03',
devtools: {enabled: true},
modules: ["@nuxtjs/tailwindcss", "nuxt-aos"],
telemetry: false
})
// https://nuxt.com/docs/api/configuration/nuxt-config
export default defineNuxtConfig({
compatibilityDate: '2024-04-03',
devtools: {enabled: true},
modules: ["@nuxtjs/tailwindcss", "nuxt-aos"],
telemetry: false,
})
46 changes: 23 additions & 23 deletions client/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"name": "client",
"version": "0.0.0",
"scripts": {
"build": "nuxt build",
"dev": "nuxt dev",
"generate": "nuxt generate",
"preview": "nuxt preview",
"postinstall": "nuxt prepare"
},
"dependencies": {
"@nuxtjs/tailwindcss": "^6.12.1",
"daisyui": "^4.12.10",
"nuxt": "^3.12.4",
"nuxt-aos": "^1.2.5",
"vue": "latest"
},
"devDependencies": {
"@iconify-json/carbon": "^1.1.36",
"@iconify-json/logos": "^1.1.43",
"@iconify/tailwind": "^1.1.1"
}
}
{
"name": "client",
"version": "0.0.0",
"scripts": {
"build": "nuxt build",
"dev": "nuxt dev",
"generate": "nuxt generate",
"preview": "nuxt preview",
"postinstall": "nuxt prepare"
},
"dependencies": {
"@nuxtjs/tailwindcss": "^6.12.1",
"daisyui": "^4.12.10",
"nuxt": "^3.12.4",
"nuxt-aos": "^1.2.5",
"vue": "latest"
},
"devDependencies": {
"@iconify-json/carbon": "^1.1.36",
"@iconify-json/logos": "^1.1.43",
"@iconify/tailwind": "^1.1.1"
}
}
Loading

0 comments on commit dba15aa

Please sign in to comment.