@@ -22,3 +25,4 @@
>
}
+}
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 2c3506c..2edeccf 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -9,6 +9,7 @@ import { CommonModule } from '@angular/common';
import { SharedService } from './services/shared.service';
import { ContactDeleteComponent } from './components/contacts/contact-delete/contact-delete.component';
import { OverlayComponent } from './shared/components/overlay/overlay.component';
+import { FirebaseService } from './services/firebase.service';
@Component({
selector: 'app-root',
@@ -28,16 +29,26 @@ import { OverlayComponent } from './shared/components/overlay/overlay.component'
})
export class AppComponent {
title = 'join';
+ isLoggedIn: string = '';
+
constructor(
public langService: LanguageService,
- private router: Router,
- public sharedService: SharedService
+ public sharedService: SharedService,
+ private firebaseService: FirebaseService,
+ private router: Router
) {
- this.router.events.subscribe((event) => {});
+ this.isLoggedIn = this.firebaseService.getCurrentUserId();
}
ngOnInit() {
- this.getUserIdInLocalStorage();
+ console.log(this.isLoggedIn);
+
+ if (this.isLoggedIn === undefined) {
+ this.router.navigate(['/login']);
+ } else {
+ this.getUserIdInLocalStorage();
+ this.router.navigate(['/summary']);
+ }
}
getUserIdInLocalStorage() {
diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts
index b622e01..8a6a356 100644
--- a/src/app/app.routes.ts
+++ b/src/app/app.routes.ts
@@ -9,9 +9,11 @@ import { ContactsComponent } from './components/contacts/contacts.component';
import { OverlayComponent } from './shared/components/overlay/overlay.component';
import { TaskOverlayComponent } from './shared/components/overlay/task-overlay/task-overlay.component';
import { TaskEditOverlayComponent } from './shared/components/overlay/task-edit-overlay/task-edit-overlay.component';
+import { LoginComponent } from './components/login/login.component';
export const routes: Routes = [
{ path: '', component: SummaryComponent },
+ { path: 'login', component: LoginComponent },
{ path: 'summary', component: SummaryComponent },
{ path: 'add-task', component: AddTaskComponent },
{ path: 'add-task/:id', component: AddTaskComponent },
diff --git a/src/app/components/login/login.component.html b/src/app/components/login/login.component.html
new file mode 100644
index 0000000..147cfc4
--- /dev/null
+++ b/src/app/components/login/login.component.html
@@ -0,0 +1 @@
+
login works!
diff --git a/src/app/components/login/login.component.scss b/src/app/components/login/login.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/components/login/login.component.spec.ts b/src/app/components/login/login.component.spec.ts
new file mode 100644
index 0000000..1e19e5d
--- /dev/null
+++ b/src/app/components/login/login.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { LoginComponent } from './login.component';
+
+describe('LoginComponent', () => {
+ let component: LoginComponent;
+ let fixture: ComponentFixture
;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ imports: [LoginComponent]
+ })
+ .compileComponents();
+
+ fixture = TestBed.createComponent(LoginComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/components/login/login.component.ts b/src/app/components/login/login.component.ts
new file mode 100644
index 0000000..2967c55
--- /dev/null
+++ b/src/app/components/login/login.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+
+@Component({
+ selector: 'app-login',
+ standalone: true,
+ imports: [],
+ templateUrl: './login.component.html',
+ styleUrl: './login.component.scss'
+})
+export class LoginComponent {
+
+}
diff --git a/src/app/services/firebase.service.ts b/src/app/services/firebase.service.ts
index 6b49f00..9dbb8f1 100644
--- a/src/app/services/firebase.service.ts
+++ b/src/app/services/firebase.service.ts
@@ -22,7 +22,7 @@ export class FirebaseService implements OnDestroy {
allTasks: Task[] = [];
filteredTasks: Task[] = [];
allUsers: User[] = [];
- isUserLogin: boolean = true;
+ isUserLogin: boolean = false;
unsubTask;
unsubUser;