Update .gitignore to exclude Android/Gradle files and enhance TimeEntryController and TimefixService for better error handling and performance. Refactor frontend components to use AppBrand for consistent branding across views.
This commit is contained in:
BIN
frontend/images/stechuhr.png
Normal file
BIN
frontend/images/stechuhr.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 MiB |
@@ -2,7 +2,9 @@
|
||||
<html lang="de">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<link rel="icon" href="/favicon.ico">
|
||||
<link rel="icon" href="/favicon.ico" sizes="any">
|
||||
<link rel="icon" type="image/png" href="/stechuhr.png">
|
||||
<link rel="apple-touch-icon" href="/stechuhr.png">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>TimeClock v3 - Zeiterfassung</title>
|
||||
</head>
|
||||
|
||||
BIN
frontend/public/favicon.ico
Normal file
BIN
frontend/public/favicon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 31 KiB |
BIN
frontend/public/stechuhr.png
Normal file
BIN
frontend/public/stechuhr.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 MiB |
@@ -3,9 +3,7 @@
|
||||
<div class="navbar" v-if="authStore.isAuthenticated">
|
||||
<div class="navbar-inner">
|
||||
<div class="container">
|
||||
<h1 class="brand">
|
||||
<RouterLink to="/">Stechuhr</RouterLink>
|
||||
</h1>
|
||||
<AppBrand />
|
||||
<div class="nav-title-menu">
|
||||
<h2 class="page-title" v-if="pageTitle">{{ pageTitle }}</h2>
|
||||
<div class="nav-collapse">
|
||||
@@ -47,12 +45,13 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { RouterLink, RouterView, useRoute } from 'vue-router'
|
||||
import { RouterView, useRoute } from 'vue-router'
|
||||
import { useAuthStore } from './stores/authStore'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { computed } from 'vue'
|
||||
import StatusBox from './components/StatusBox.vue'
|
||||
import SideMenu from './components/SideMenu.vue'
|
||||
import AppBrand from './components/AppBrand.vue'
|
||||
|
||||
const authStore = useAuthStore()
|
||||
const router = useRouter()
|
||||
@@ -133,24 +132,6 @@ const pageTitle = computed(() => {
|
||||
flex-direction: row;
|
||||
}
|
||||
|
||||
.brand {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.brand a {
|
||||
font-weight: bold;
|
||||
color: #000;
|
||||
padding: 12px 20px 12px 0;
|
||||
font-size: 24px;
|
||||
text-decoration: none;
|
||||
transition: color 0.2s;
|
||||
}
|
||||
|
||||
.brand a:hover {
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.nav-collapse {
|
||||
display: flex;
|
||||
width: 100%;
|
||||
|
||||
54
frontend/src/components/AppBrand.vue
Normal file
54
frontend/src/components/AppBrand.vue
Normal file
@@ -0,0 +1,54 @@
|
||||
<template>
|
||||
<h1 class="brand">
|
||||
<RouterLink :to="to" class="brand-link">
|
||||
<img src="/stechuhr.png" alt="Stechuhr" class="brand-logo" width="32" height="32" />
|
||||
<span class="brand-text">Stechuhr</span>
|
||||
</RouterLink>
|
||||
</h1>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { RouterLink } from 'vue-router'
|
||||
|
||||
defineProps({
|
||||
to: {
|
||||
type: String,
|
||||
default: '/',
|
||||
},
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.brand {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.brand-link {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
font-weight: bold;
|
||||
color: #000;
|
||||
padding: 8px 20px 8px 0;
|
||||
font-size: 24px;
|
||||
text-decoration: none;
|
||||
transition: color 0.2s;
|
||||
}
|
||||
|
||||
.brand-link:hover {
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.brand-logo {
|
||||
display: block;
|
||||
flex-shrink: 0;
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
object-fit: contain;
|
||||
}
|
||||
|
||||
.brand-text {
|
||||
line-height: 1;
|
||||
}
|
||||
</style>
|
||||
@@ -3,9 +3,7 @@
|
||||
<div class="navbar">
|
||||
<div class="navbar-inner">
|
||||
<div class="container">
|
||||
<h1 class="brand">
|
||||
<router-link to="/">Stechuhr</router-link>
|
||||
</h1>
|
||||
<AppBrand />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -115,6 +113,7 @@ import { ref } from 'vue'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { useAuthStore } from '../stores/authStore'
|
||||
import { API_BASE_URL } from '@/config/api'
|
||||
import AppBrand from '../components/AppBrand.vue'
|
||||
|
||||
const API_URL = API_BASE_URL
|
||||
const router = useRouter()
|
||||
@@ -189,24 +188,6 @@ body {
|
||||
border-bottom: 1px solid #e0ffe0;
|
||||
}
|
||||
|
||||
.brand {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.brand a {
|
||||
font-weight: bold;
|
||||
color: #000;
|
||||
padding: 12px 20px 12px 0;
|
||||
font-size: 24px;
|
||||
text-decoration: none;
|
||||
transition: color 0.2s;
|
||||
}
|
||||
|
||||
.brand a:hover {
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.contents {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
|
||||
@@ -3,9 +3,7 @@
|
||||
<div class="navbar">
|
||||
<div class="navbar-inner">
|
||||
<div class="container">
|
||||
<h1 class="brand">
|
||||
<router-link to="/">Stechuhr</router-link>
|
||||
</h1>
|
||||
<AppBrand />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -69,6 +67,7 @@
|
||||
<script setup>
|
||||
import { ref } from 'vue'
|
||||
import { useAuthStore } from '../stores/authStore'
|
||||
import AppBrand from '../components/AppBrand.vue'
|
||||
|
||||
const authStore = useAuthStore()
|
||||
const email = ref('')
|
||||
@@ -137,24 +136,6 @@ const copyResetLink = async () => {
|
||||
border-bottom: 1px solid #e0ffe0;
|
||||
}
|
||||
|
||||
.brand {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.brand a {
|
||||
font-weight: bold;
|
||||
color: #000;
|
||||
padding: 12px 20px 12px 0;
|
||||
font-size: 24px;
|
||||
text-decoration: none;
|
||||
transition: color 0.2s;
|
||||
}
|
||||
|
||||
.brand a:hover {
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.contents {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
|
||||
@@ -3,9 +3,7 @@
|
||||
<div class="navbar">
|
||||
<div class="navbar-inner">
|
||||
<div class="container">
|
||||
<h1 class="brand">
|
||||
<router-link to="/">Stechuhr</router-link>
|
||||
</h1>
|
||||
<AppBrand />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -81,6 +79,7 @@
|
||||
import { ref, onMounted } from 'vue'
|
||||
import { useRoute } from 'vue-router'
|
||||
import { useAuthStore } from '../stores/authStore'
|
||||
import AppBrand from '../components/AppBrand.vue'
|
||||
|
||||
const route = useRoute()
|
||||
const authStore = useAuthStore()
|
||||
@@ -143,24 +142,6 @@ const handleReset = async () => {
|
||||
border-bottom: 1px solid #e0ffe0;
|
||||
}
|
||||
|
||||
.brand {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.brand a {
|
||||
font-weight: bold;
|
||||
color: #000;
|
||||
padding: 12px 20px 12px 0;
|
||||
font-size: 24px;
|
||||
text-decoration: none;
|
||||
transition: color 0.2s;
|
||||
}
|
||||
|
||||
.brand a:hover {
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.contents {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
|
||||
@@ -3,9 +3,7 @@
|
||||
<div class="navbar">
|
||||
<div class="navbar-inner">
|
||||
<div class="container">
|
||||
<h1 class="brand">
|
||||
<router-link to="/">Stechuhr</router-link>
|
||||
</h1>
|
||||
<AppBrand />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -96,6 +94,7 @@
|
||||
import { ref } from 'vue'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { useAuthStore } from '../stores/authStore'
|
||||
import AppBrand from '../components/AppBrand.vue'
|
||||
|
||||
const router = useRouter()
|
||||
const authStore = useAuthStore()
|
||||
@@ -163,24 +162,6 @@ const handleRegister = async () => {
|
||||
border-bottom: 1px solid #e0ffe0;
|
||||
}
|
||||
|
||||
.brand {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.brand a {
|
||||
font-weight: bold;
|
||||
color: #000;
|
||||
padding: 12px 20px 12px 0;
|
||||
font-size: 24px;
|
||||
text-decoration: none;
|
||||
transition: color 0.2s;
|
||||
}
|
||||
|
||||
.brand a:hover {
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.contents {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
|
||||
Reference in New Issue
Block a user