remove folders

time-tracker/src/app/app.component.html

@@ -1,3 +1,3 @@
 <app-navbar></app-navbar>
 
-<app-sidebar-options></app-sidebar-options>
+<app-sidebar></app-sidebar>

time-tracker/src/app/app.module.ts

@@ -7,6 +7,9 @@ import { NavbarComponent } from './components/shared/navbar/navbar.component';
 import { TimeclockComponent } from './components/shared/clock/timeclock/timeclock.component';
 import { UserOptionsComponent } from './components/shared/user/user-options/user-options.component';
 import { SidebarOptionsComponent } from './components/shared/sidebar/sidebar-options/sidebar-options.component';
+import { ClockComponent } from './components/shared/clock/clock.component';
+import { SidebarComponent } from './components/shared/sidebar/sidebar.component';
+import { UserComponent } from './components/shared/user/user.component';
 
 @NgModule({
   declarations: [
@@ -15,6 +18,9 @@ import { SidebarOptionsComponent } from './components/shared/sidebar/sidebar-opt
     TimeclockComponent,
     UserOptionsComponent,
     SidebarOptionsComponent,
+    ClockComponent,
+    SidebarComponent,
+    UserComponent,
   ],
   imports: [
     BrowserModule,

time-tracker/src/app/components/shared/clock/timeclock/timeclock.component.spec.ts → time-tracker/src/app/components/shared/clock/clock.component.spec.ts

@@ -1,20 +1,20 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TimeclockComponent } from './timeclock.component';
+import { ClockComponent } from './clock.component';
 
-describe('TimeclockComponent', () => {
-  let component: TimeclockComponent;
-  let fixture: ComponentFixture<TimeclockComponent>;
+describe('ClockComponent', () => {
+  let component: ClockComponent;
+  let fixture: ComponentFixture<ClockComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ TimeclockComponent ]
+      declarations: [ ClockComponent ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(TimeclockComponent);
+    fixture = TestBed.createComponent(ClockComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

time-tracker/src/app/components/shared/clock/clock.component.ts

@@ -0,0 +1,26 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-clock',
+  templateUrl: './clock.component.html',
+  styleUrls: ['./clock.component.css']
+})
+export class ClockComponent implements OnInit {
+
+  currentDate: Date;
+  hour: number;
+  minutes: number;
+  seconds: number;
+
+  constructor() {
+    this.currentDate = new Date();
+    this.hour = this.currentDate.getHours();
+    this.minutes = this.currentDate.getMinutes();
+    this.seconds = this.currentDate.getSeconds();
+   }
+
+
+  ngOnInit(): void {
+  }
+
+}

time-tracker/src/app/components/shared/navbar/navbar.component.html

@@ -3,7 +3,7 @@
         <img src="assets/img/ioet.png" width="40" height="40" class="d-inline-block align-top" alt="">
     </a>
 
-    <app-timeclock class="text-center"></app-timeclock>
-    <app-user-options></app-user-options>
+    <app-clock class="text-center"></app-clock>
+    <app-user></app-user>
 
 </nav>

time-tracker/src/app/components/shared/sidebar/sidebar-options/sidebar-options.component.html → time-tracker/src/app/components/shared/sidebar/sidebar.component.html

@@ -1,6 +1,5 @@
 <div class="d-flex" id="wrapper">
 
-    <!-- Sidebar -->
     <div class="bg-light border-right" id="sidebar-wrapper">
         <div class="list-group list-group-flush">
             <a href="#" class="list-group-item list-group-item-action bg-light"><i class="fas fa-flag"></i>   Getting Started</a>
@@ -10,16 +9,12 @@
             <a href="#" class="list-group-item list-group-item-action bg-light"><i class="fas fa-chart-pie"></i>   Reports</a>
         </div>
     </div>
-    <!-- /#sidebar-wrapper -->
 
-    <!-- Page Content -->
     <div id="page-content-wrapper">
 
         <div class="container-fluid">
             <h1 class="mt-4">Content</h1>
             <p>Lorem ipsum dolor sit, amet consectetur adipisicing elit. Voluptatibus sequi voluptates quasi laudantium vel hic quam rem consectetur cupiditate officia delectus totam sapiente, excepturi error? Eos, laudantium voluptatem. Amet, eum?.</p>
         </div>
-        <!-- /#page-content-wrapper -->
 
-    </div>
-    <!-- /#wrapper -->
+    </div>

time-tracker/src/app/components/shared/user/user-options/user-options.component.spec.ts → time-tracker/src/app/components/shared/sidebar/sidebar.component.spec.ts

@@ -1,20 +1,20 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { UserOptionsComponent } from './user-options.component';
+import { SidebarComponent } from './sidebar.component';
 
-describe('UserOptionsComponent', () => {
-  let component: UserOptionsComponent;
-  let fixture: ComponentFixture<UserOptionsComponent>;
+describe('SidebarComponent', () => {
+  let component: SidebarComponent;
+  let fixture: ComponentFixture<SidebarComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ UserOptionsComponent ]
+      declarations: [ SidebarComponent ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(UserOptionsComponent);
+    fixture = TestBed.createComponent(SidebarComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

time-tracker/src/app/components/shared/sidebar/sidebar.component.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-sidebar',
+  templateUrl: './sidebar.component.html',
+  styleUrls: ['./sidebar.component.css']
+})
+export class SidebarComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}

time-tracker/src/app/components/shared/sidebar/sidebar-options/sidebar-options.component.spec.ts → time-tracker/src/app/components/shared/user/user.component.spec.ts

@@ -1,20 +1,20 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { SidebarOptionsComponent } from './sidebar-options.component';
+import { UserComponent } from './user.component';
 
-describe('SidebarOptionsComponent', () => {
-  let component: SidebarOptionsComponent;
-  let fixture: ComponentFixture<SidebarOptionsComponent>;
+describe('UserComponent', () => {
+  let component: UserComponent;
+  let fixture: ComponentFixture<UserComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ SidebarOptionsComponent ]
+      declarations: [ UserComponent ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(SidebarOptionsComponent);
+    fixture = TestBed.createComponent(UserComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

time-tracker/src/app/components/shared/user/user.component.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-user',
+  templateUrl: './user.component.html',
+  styleUrls: ['./user.component.css']
+})
+export class UserComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}