Skip to content

Commit

Permalink
Merge pull request #1
Browse files Browse the repository at this point in the history
Telemetry feature & Go backend
  • Loading branch information
DaniloMurer authored Aug 8, 2024
2 parents ea9c8f4 + b66a693 commit 5bb4c9d
Show file tree
Hide file tree
Showing 51 changed files with 617 additions and 1,542 deletions.
14 changes: 14 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
; https://editorconfig.org/

root = true

[*]
charset = utf-8
indent_style = tab
indent_size = 4
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.{yaml,yml}]
indent_size = 2
8 changes: 6 additions & 2 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ name: building churrer.xyz
on:
push:
branches: [ "main" ]
pull_request:
branches: ["main"]

jobs:
build:
Expand All @@ -26,5 +24,11 @@ jobs:
- name: publish client docker image
run: docker push ghcr.io/danilomurer/churrer.xyz:${{ steps.version.outputs.current_version }}

- name: build server docker image
run: docker build ./server/ --tag ghcr.io/danilomurer/churrer.xyz-server:${{ steps.version.outputs.current_version }}

- name: publish server docker image
run: docker push ghcr.io/danilomurer/churrer.xyz-server:${{ steps.version.outputs.current_version }}



2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,7 @@ logs
**/*.pid.lock
**/.nuxt

.idea

# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
35 changes: 0 additions & 35 deletions .onedev-buildspec.yml

This file was deleted.

7 changes: 4 additions & 3 deletions .run/start client.run.xml → .run/StartClient.run.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="start client" type="js.build_tools.npm">
<package-json value="$PROJECT_DIR$/package.json" />
<configuration default="false" name="StartClient" type="js.build_tools.npm">
<package-json value="$PROJECT_DIR$/client/package.json" />
<command value="run" />
<scripts>
<script value="client:startdev" />
<script value="dev" />
</scripts>
<node-interpreter value="project" />
<package-manager value="yarn" />
<envs />
<method v="2" />
</configuration>
Expand Down
13 changes: 13 additions & 0 deletions .run/StartDb.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="StartDb" type="docker-deploy" factoryName="docker-compose.yml"
server-name="Docker">
<deployment type="docker-compose.yml">
<settings>
<option name="envFilePath" value=""/>
<option name="commandLineOptions" value="--build"/>
<option name="sourceFilePath" value="server/.docker/docker-compose.postgres.yaml"/>
</settings>
</deployment>
<method v="2"/>
</configuration>
</component>
14 changes: 14 additions & 0 deletions .run/StartServer.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="StartServer" type="GoApplicationRunConfiguration" factoryName="Go Application">
<module name="churrer.xyz" />
<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" />
</envs>
<kind value="FILE" />
<package value="server" />
<directory value="$PROJECT_DIR$" />
<filePath value="$PROJECT_DIR$/server/main.go" />
<method v="2" />
</configuration>
</component>
40 changes: 0 additions & 40 deletions .run/server.run.xml

This file was deleted.

12 changes: 0 additions & 12 deletions .run/start dev mongo.run.xml

This file was deleted.

10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,29 @@
# churrer.xyz

[see what it looks like for yourself](https://churrer.xyz)

## Setup

### Frontend

install dependencies and start app using yarn

```bash
# install dependencies (doesn't include quarkus atm)
yarn install
# start nuxt frontend
yarn client:startdev
```
if you don't feel like running the yarn command to start the frontend:

don't worry, I got you covered. simply run the Intellij [StartClient](.run/StartClient.run.xml) run config.

> [!WARNING]
> `yarn install` and workspaces only work correctly in linux / macos. On windows this doesn't work.<br>
> it's a known [issue](https://github.com/yarnpkg/yarn/issues/4564) in yarn
for more nuxt stuff refer to [the client readme](./client/README.md)

### Backend
coming eventually. until then refer to [the backend readme](./server/README.md)

coming eventually
4 changes: 2 additions & 2 deletions client/app.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<div class="navbar bg-gray-800 rounded-2xl shadow-2xl">
<a class="btn btn-ghost text-xl">churrer.xyz</a>
</div>
<NuxtRouteAnnouncer />
<NuxtRouteAnnouncer/>
<NuxtPage/>
</div>
</template>
<style>
html {
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
}
</style>
</style>
53 changes: 27 additions & 26 deletions client/components/Experiences.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,35 @@
</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
<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>
</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>
</style>
49 changes: 26 additions & 23 deletions client/components/Hero.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,33 @@
</script>

<template>
<div class="hero bg-base-300 lg:w-max rounded-2xl shadow-2xl">
<div class="hero-content flex-col lg:flex-row p-10">
<!-- <span class="iconify logos&#45;&#45;kubernetes iconify-color text-9xl"/>-->
<div class="avatar placeholder">
<div class="bg-secondary text-neutral-content w-36 rounded-full">
<span class="text-3xl">Churrer</span>
</div>
</div>
<div>
<h1 class="text-5xl font-bold">Danilo Jakob</h1>
<p class="py-6">
The developer you were looking for all along!
</p>
<p class="py-6 flex gap-3 content-center">
<span class="iconify carbon--email text-2xl text-accent"/><a class="link-accent" href="mailto:[email protected]">[email protected]</a>
</p>
<p class="py-6 flex gap-3 content-center">
<span class="iconify logos--github-icon text-accent w-6 h-6"/><a class="link-accent" href="https://github.com/DaniloMurer">See my work</a>
</p>
</div>
</div>
</div>
<div class="hero bg-base-300 lg:w-max rounded-2xl shadow-2xl">
<div class="hero-content flex-col lg:flex-row p-10">
<!-- <span class="iconify logos&#45;&#45;kubernetes iconify-color text-9xl"/>-->
<div class="avatar placeholder">
<div class="bg-secondary text-neutral-content w-36 rounded-full">
<span class="text-3xl">Churrer</span>
</div>
</div>
<div>
<h1 class="text-5xl font-bold">Danilo Jakob</h1>
<p class="py-6">
The developer you were looking for all along!
</p>
<p class="py-6 flex gap-3 content-center">
<span class="iconify carbon--email text-2xl text-accent"/><a class="link-accent"
href="mailto:[email protected]">[email protected]</a>
</p>
<p class="py-6 flex gap-3 content-center">
<span class="iconify logos--github-icon text-accent w-6 h-6"/><a class="link-accent"
href="https://github.com/DaniloMurer">See
my work</a>
</p>
</div>
</div>
</div>
</template>

<style scoped>
</style>
</style>
Loading

0 comments on commit 5bb4c9d

Please sign in to comment.