Skip to content

Commit 1d8b56b

Browse files
committed
remove folders
1 parent 953af69 commit 1d8b56b

19 files changed

+84
-130
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<app-navbar></app-navbar>
22

3-
<app-sidebar-options></app-sidebar-options>
3+
<app-sidebar></app-sidebar>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ import { NavbarComponent } from './components/shared/navbar/navbar.component';
77
import { TimeclockComponent } from './components/shared/clock/timeclock/timeclock.component';
88
import { UserOptionsComponent } from './components/shared/user/user-options/user-options.component';
99
import { SidebarOptionsComponent } from './components/shared/sidebar/sidebar-options/sidebar-options.component';
10+
import { ClockComponent } from './components/shared/clock/clock.component';
11+
import { SidebarComponent } from './components/shared/sidebar/sidebar.component';
12+
import { UserComponent } from './components/shared/user/user.component';
1013

1114
@NgModule({
1215
declarations: [
@@ -15,6 +18,9 @@ import { SidebarOptionsComponent } from './components/shared/sidebar/sidebar-opt
1518
TimeclockComponent,
1619
UserOptionsComponent,
1720
SidebarOptionsComponent,
21+
ClockComponent,
22+
SidebarComponent,
23+
UserComponent,
1824
],
1925
imports: [
2026
BrowserModule,
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
22

3-
import { TimeclockComponent } from './timeclock.component';
3+
import { ClockComponent } from './clock.component';
44

5-
describe('TimeclockComponent', () => {
6-
let component: TimeclockComponent;
7-
let fixture: ComponentFixture<TimeclockComponent>;
5+
describe('ClockComponent', () => {
6+
let component: ClockComponent;
7+
let fixture: ComponentFixture<ClockComponent>;
88

99
beforeEach(async(() => {
1010
TestBed.configureTestingModule({
11-
declarations: [ TimeclockComponent ]
11+
declarations: [ ClockComponent ]
1212
})
1313
.compileComponents();
1414
}));
1515

1616
beforeEach(() => {
17-
fixture = TestBed.createComponent(TimeclockComponent);
17+
fixture = TestBed.createComponent(ClockComponent);
1818
component = fixture.componentInstance;
1919
fixture.detectChanges();
2020
});
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
import { Component, OnInit } from '@angular/core';
2+
3+
@Component({
4+
selector: 'app-clock',
5+
templateUrl: './clock.component.html',
6+
styleUrls: ['./clock.component.css']
7+
})
8+
export class ClockComponent implements OnInit {
9+
10+
currentDate: Date;
11+
hour: number;
12+
minutes: number;
13+
seconds: number;
14+
15+
constructor() {
16+
this.currentDate = new Date();
17+
this.hour = this.currentDate.getHours();
18+
this.minutes = this.currentDate.getMinutes();
19+
this.seconds = this.currentDate.getSeconds();
20+
}
21+
22+
23+
ngOnInit(): void {
24+
}
25+
26+
}

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

Lines changed: 0 additions & 25 deletions
This file was deleted.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<img src="assets/img/ioet.png" width="40" height="40" class="d-inline-block align-top" alt="">
44
</a>
55

6-
<app-timeclock class="text-center"></app-timeclock>
7-
<app-user-options></app-user-options>
6+
<app-clock class="text-center"></app-clock>
7+
<app-user></app-user>
88

99
</nav>

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

Lines changed: 0 additions & 48 deletions
This file was deleted.

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

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)