-
Dashboard
-
Cupboard
-
Basket
-
+
Dashboard
+
Cupboard
+
Basket
brightness_7
diff --git a/ufund-ui/src/app/app.component.ts b/ufund-ui/src/app/app.component.ts
index 78fd050..fafffef 100644
--- a/ufund-ui/src/app/app.component.ts
+++ b/ufund-ui/src/app/app.component.ts
@@ -1,10 +1,10 @@
import {Component, OnInit, Inject, ViewContainerRef} from '@angular/core';
import {BehaviorSubject} from 'rxjs';
-import { DOCUMENT } from '@angular/common';
+import {DOCUMENT, Location} from '@angular/common';
import {AuthService} from './services/auth.service';
import {ToastsService} from './services/toasts.service';
import {User, userType} from './models/User';
-import {ActivatedRoute, Router} from '@angular/router';
+import {Router} from '@angular/router';
import {ModalService} from './services/modal.service';
@Component({
@@ -20,10 +20,10 @@ export class AppComponent implements OnInit {
constructor(
private authService: AuthService,
private router: Router,
- private route: ActivatedRoute,
protected toastService: ToastsService,
private viewContainerRef: ViewContainerRef,
protected modalService: ModalService,
+ protected location: Location,
@Inject(DOCUMENT) private document: Document
) {}
@@ -41,6 +41,12 @@ export class AppComponent implements OnInit {
console.log("Key found", dataParsed.key)
}
+ if (this.location.path() == '/cupboard') {
+ console.log("work")
+ } else {
+ console.log(this.location.path())
+ }
+
let theme = localStorage.getItem("theme")
if(!theme) {
// if no color scheme is set, get the system settings
--
cgit v1.2.3
From bb4e0e55fee7ec8f34c36e6299301d612a0de2ce Mon Sep 17 00:00:00 2001
From: sowgro
Date: Mon, 7 Apr 2025 16:46:53 -0400
Subject: Redo login page
---
.../src/app/components/login/login.component.css | 40 +++++++++++++++++----
.../src/app/components/login/login.component.html | 9 +++--
.../src/app/components/signup/signup.component.css | 42 +++++++++++++++++++++-
.../app/components/signup/signup.component.html | 2 ++
4 files changed, 80 insertions(+), 13 deletions(-)
(limited to 'ufund-ui/src/app')
diff --git a/ufund-ui/src/app/components/login/login.component.css b/ufund-ui/src/app/components/login/login.component.css
index f38865b..810d924 100644
--- a/ufund-ui/src/app/components/login/login.component.css
+++ b/ufund-ui/src/app/components/login/login.component.css
@@ -7,7 +7,7 @@
overflow: hidden;
background-color: transparent;
background-blend-mode: darken;
- margin-top: -150px;
+ margin-top: -66px;
}
#bg-cr {
@@ -16,7 +16,8 @@
top:0;
width: 100vw;
height: calc(100vh + 150px);
- background: linear-gradient(to bottom, rgba(84, 45, 0, 0) 30%, rgba(84, 45, 0, 0.1) 40%), url("/login-cr.png");
+ background-image: linear-gradient(rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0.1)), url("/login-cr.jpg");
+ background-size: cover;
opacity: calc(var(--opacity-cr));
z-index: 1;
}
@@ -26,31 +27,38 @@
top:0;
width: 100vw;
height: 100vh;
- background: linear-gradient(to bottom, rgba(0, 0, 0, 1) 0%, rgba(0, 0, 0, 0.5) 30%), url("/login-jf.png");
+ background: linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)), url("/login-jf.jpg");
+ /*backdrop-filter: brightness(1%);*/
+ background-size: cover;
opacity: var(--opacity-jf);
z-index: 1;
}
#box {
+ animation: ease-in-out fadeIn .1s;
display: flex;
flex-direction: column;
- align-items: center;
+ /*align-items: center;*/
aspect-ratio: 4/5;
min-height: 50vh;
- margin-top: 15vh;
+ /*margin-top: 15vh;*/
gap: 10px;
background-color: color-mix(in srgb, var(--background-color), transparent 50%);
backdrop-filter: blur(10px);
- padding: 50px 40px;
+ padding: 30px;
border-radius: 5px;
border-style: solid;
border-width: 1px;
border-color: var(--highlight-color);
z-index: 2;
+ justify-content: center;
}
#greeting {
- font-size: 32px;
+ color: var(--highlight-color);
+ padding: 0;
+ margin: 0;
+ /*font-size: 32px;*/
/* text-decoration: underline;
text-decoration-color: var(--highlight-color); */
}
@@ -70,3 +78,21 @@
text-decoration-thickness: 1px;
text-decoration-color: var(--highlight-color);
}
+
+input {
+ width: 100%;
+}
+
+h1 {
+ margin-top: 0;
+}
+
+@keyframes fadeIn {
+ from {
+ transform: translateY(-20px);
+ opacity: 0
+ }
+ to {
+ opacity: 1
+ }
+}
diff --git a/ufund-ui/src/app/components/login/login.component.html b/ufund-ui/src/app/components/login/login.component.html
index 27eab96..8b8f5b3 100644
--- a/ufund-ui/src/app/components/login/login.component.html
+++ b/ufund-ui/src/app/components/login/login.component.html
@@ -1,11 +1,10 @@
diff --git a/ufund-ui/src/app/components/signup/signup.component.css b/ufund-ui/src/app/components/signup/signup.component.css
index 207135f..4073931 100644
--- a/ufund-ui/src/app/components/signup/signup.component.css
+++ b/ufund-ui/src/app/components/signup/signup.component.css
@@ -11,17 +11,19 @@
}
#box {
+ animation: ease-in-out fadeIn .1s;
display: flex;
flex-direction: column;
max-width: 500px;
gap: 10px;
backdrop-filter: blur(10px);
background-color: color-mix(in srgb, var(--background-color), transparent 50%);
- padding: 30px;
+ padding: 90px 30px;
border-radius: 5px;
border-style: solid;
border-width: 1px;
border-color: var(--highlight-color);
+ z-index: 2;
& > div {
display: flex;
@@ -85,3 +87,41 @@
}
}
+h1 {
+ margin-top: 0;
+}
+
+#bg-cr {
+ position: absolute;
+ margin-top: -150px;
+ top:0;
+ width: 100vw;
+ height: calc(100vh + 150px);
+ background-image: linear-gradient(rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0.1)), url("/login-cr.jpg");
+ background-size: cover;
+ opacity: calc(var(--opacity-cr));
+ z-index: 1;
+}
+
+#bg-jf {
+ position: absolute;
+ top:0;
+ width: 100vw;
+ height: 100vh;
+ background: linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)), url("/login-jf.jpg");
+ /*backdrop-filter: brightness(1%);*/
+ background-size: cover;
+ opacity: var(--opacity-jf);
+ z-index: 1;
+}
+
+@keyframes fadeIn {
+ from {
+ transform: translateY(-20px);
+ opacity: 0
+ }
+ to {
+ opacity: 1
+ }
+}
+
diff --git a/ufund-ui/src/app/components/signup/signup.component.html b/ufund-ui/src/app/components/signup/signup.component.html
index ef2fc27..78f5099 100644
--- a/ufund-ui/src/app/components/signup/signup.component.html
+++ b/ufund-ui/src/app/components/signup/signup.component.html
@@ -26,3 +26,5 @@
+
+
+ 
+