diff --git a/buntspecht-backend/pom.xml b/buntspecht-backend/pom.xml index 0186569..2e0372f 100644 --- a/buntspecht-backend/pom.xml +++ b/buntspecht-backend/pom.xml @@ -14,7 +14,7 @@ ${java.version} ${java.version} 5.1.0 - 0.1.0 + 0.2.0 diff --git a/buntspecht-frontend/package-lock.json b/buntspecht-frontend/package-lock.json index 92b181c..b64e445 100644 --- a/buntspecht-frontend/package-lock.json +++ b/buntspecht-frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "buntspecht-web", - "version": "0.1.0", + "version": "0.2.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "buntspecht-web", - "version": "0.1.0", + "version": "0.2.0", "license": "AGPL3", "dependencies": { "@angular/animations": "^18.2.7", diff --git a/buntspecht-frontend/package.json b/buntspecht-frontend/package.json index 7a14c2f..7580afb 100644 --- a/buntspecht-frontend/package.json +++ b/buntspecht-frontend/package.json @@ -1,6 +1,6 @@ { "name": "buntspecht-web", - "version": "0.1.0", + "version": "0.2.0", "license": "AGPL3", "scripts": { "ng": "ng", diff --git a/buntspecht-frontend/src/app/pages/login/login.page.scss b/buntspecht-frontend/src/app/pages/login/login.page.scss index 82c9a7c..312c555 100644 --- a/buntspecht-frontend/src/app/pages/login/login.page.scss +++ b/buntspecht-frontend/src/app/pages/login/login.page.scss @@ -6,11 +6,11 @@ img.logo { mat-form-field, mat-slide-toggle { display: block; - margin-bottom: 25px; + margin: 20px 0; } a.external-login { - margin: 15px 0; + margin: 20px 0; flex-basis: 100%; flex-shrink: 0; } diff --git a/buntspecht-frontend/src/app/pages/notfound/notfound.page.scss b/buntspecht-frontend/src/app/pages/notfound/notfound.page.scss index deebf28..66880c6 100644 --- a/buntspecht-frontend/src/app/pages/notfound/notfound.page.scss +++ b/buntspecht-frontend/src/app/pages/notfound/notfound.page.scss @@ -1,6 +1,6 @@ .box { margin: 5px; - min-width: 400px; + min-width: 390px; @media screen and (min-width: 576px) { max-width: 100%; diff --git a/buntspecht-frontend/src/app/pages/password/password.page.scss b/buntspecht-frontend/src/app/pages/password/password.page.scss index 3d47c68..ae9f0bf 100644 --- a/buntspecht-frontend/src/app/pages/password/password.page.scss +++ b/buntspecht-frontend/src/app/pages/password/password.page.scss @@ -1,11 +1,11 @@ mat-form-field { display: block; - margin: 25px 0 !important; + margin: 20px 0 !important; } form { margin: 5px; - min-width: 400px; + min-width: 390px; @media screen and (min-width: 576px) { max-width: 100%; diff --git a/buntspecht-frontend/src/app/pages/profile/profile.page.scss b/buntspecht-frontend/src/app/pages/profile/profile.page.scss index 87ea653..a5ac048 100644 --- a/buntspecht-frontend/src/app/pages/profile/profile.page.scss +++ b/buntspecht-frontend/src/app/pages/profile/profile.page.scss @@ -1,12 +1,12 @@ mat-form-field, mat-slide-toggle { display: block; - margin: 25px 0 !important; + margin: 20px 0 !important; } form { margin: 5px; - min-width: 400px; + min-width: 390px; @media screen and (min-width: 576px) { max-width: 100%; diff --git a/buntspecht-frontend/src/app/pages/turnover/turnover.page.scss b/buntspecht-frontend/src/app/pages/turnover/turnover.page.scss index 5f004f1..97d55fe 100644 --- a/buntspecht-frontend/src/app/pages/turnover/turnover.page.scss +++ b/buntspecht-frontend/src/app/pages/turnover/turnover.page.scss @@ -1,6 +1,6 @@ mat-form-field { display: block; - margin: 25px 0 !important; + margin: 20px 0 !important; } mat-chip mat-icon.mat-icon-inline { @@ -10,7 +10,7 @@ mat-chip mat-icon.mat-icon-inline { form { margin: 5px; - min-width: 400px; + min-width: 390px; @media screen and (min-width: 576px) { max-width: 100%; diff --git a/buntspecht-frontend/src/app/pages/unavailable/unavailable.page.scss b/buntspecht-frontend/src/app/pages/unavailable/unavailable.page.scss index deebf28..66880c6 100644 --- a/buntspecht-frontend/src/app/pages/unavailable/unavailable.page.scss +++ b/buntspecht-frontend/src/app/pages/unavailable/unavailable.page.scss @@ -1,6 +1,6 @@ .box { margin: 5px; - min-width: 400px; + min-width: 390px; @media screen and (min-width: 576px) { max-width: 100%; diff --git a/buntspecht-frontend/src/app/pages/users/users.page.html b/buntspecht-frontend/src/app/pages/users/users.page.html index f7b2c15..2cf3a25 100644 --- a/buntspecht-frontend/src/app/pages/users/users.page.html +++ b/buntspecht-frontend/src/app/pages/users/users.page.html @@ -66,7 +66,7 @@
-
+
{{'profile.username' | i18n}} diff --git a/buntspecht-frontend/src/app/ui/main/main.ui.html b/buntspecht-frontend/src/app/ui/main/main.ui.html index 7a42d64..5e9d6d7 100644 --- a/buntspecht-frontend/src/app/ui/main/main.ui.html +++ b/buntspecht-frontend/src/app/ui/main/main.ui.html @@ -9,10 +9,14 @@ {{'buntspecht' | i18n}} - @if (authenticated) { + @if (authenticated && isBiggerScreen) { edit - {{'turnover.create' | i18n}} + {{'turnover.create' | i18n}} + + } @if (authenticated && !isBiggerScreen) { + + edit } @@ -59,26 +63,26 @@ - + @if (authenticated) { - + receipt {{(admin ? 'turnovers.mine' : 'turnovers') | i18n}} @if(admin) { - + insert_chart_outlined {{'management' | i18n}} - + receipt_long {{'turnovers' | i18n}} - + people {{'users' | i18n}} diff --git a/buntspecht-frontend/src/app/ui/main/main.ui.ts b/buntspecht-frontend/src/app/ui/main/main.ui.ts index 2ca314a..7ac8832 100644 --- a/buntspecht-frontend/src/app/ui/main/main.ui.ts +++ b/buntspecht-frontend/src/app/ui/main/main.ui.ts @@ -30,6 +30,7 @@ export class UiMain { admin: boolean = false; debug: boolean = false; hasUpdate: boolean = false; + isBiggerScreen: boolean = false; touchThresh: number = 150; touchStartX: number; @@ -88,8 +89,10 @@ export class UiMain { const width = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth; if (width < 768) { this.opened = false; + this.isBiggerScreen = false; } else { this.opened = true; + this.isBiggerScreen = true; } if (localStorage.getItem("buntspecht.darkTheme") == "true") { @@ -162,15 +165,6 @@ export class UiMain { }) } - isBiggerScreen() { - const width = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth; - if (width < 768) { - return false; - } else { - return true; - } - } - openExternal(event, url, target = '_self') { window.open(url, target); this.preventClose(event); @@ -180,8 +174,10 @@ export class UiMain { onResize(event) { if (event.target.innerWidth < 768) { this.opened = false; + this.isBiggerScreen = false; } else { this.opened = true; + this.isBiggerScreen = true; } }