Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
renaming tests and resizing icon
  • Loading branch information
enriquezrene committed Mar 12, 2020
commit 978119f56041da3b622afaadeca5036dde57880d
22 changes: 11 additions & 11 deletions src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { GettingStartedComponent } from './components/optionsSidebar/getting-started/getting-started.component';
import { ReportsComponent } from './components/optionsSidebar/reports/reports.component';
import { TimeClockComponent } from './components/optionsSidebar/time-clock/time-clock.component';
import { TimeEntriesComponent } from './components/optionsSidebar/time-entries/time-entries.component';
import { TimeOffComponent } from './components/optionsSidebar/time-off/time-off.component';
import { GettingStartedComponent } from './components/options-sidebar/getting-started/getting-started.component';
import { ReportsComponent } from './components/options-sidebar/reports/reports.component';
import { TimeClockComponent } from './components/options-sidebar/time-clock/time-clock.component';
import { TimeEntriesComponent } from './components/options-sidebar/time-entries/time-entries.component';
import { TimeOffComponent } from './components/options-sidebar/time-off/time-off.component';


const routes: Routes = [
{path: 'gettingStarted', component: GettingStartedComponent},
{path: 'getting-started', component: GettingStartedComponent},
{path: 'reports', component: ReportsComponent},
{path: 'timeClock', component: TimeClockComponent},
{path: 'timeEntries', component: TimeEntriesComponent},
{path: 'timeOff', component: TimeOffComponent},
{path: '', pathMatch: 'full', redirectTo: 'gettingStarted'},
{path: '**', pathMatch: 'full', redirectTo: 'gettingStarted'},
{path: 'time-clock', component: TimeClockComponent},
{path: 'time-entries', component: TimeEntriesComponent},
{path: 'time-off', component: TimeOffComponent},
{path: '', pathMatch: 'full', redirectTo: 'getting-started'},
{path: '**', pathMatch: 'full', redirectTo: 'getting-started'},
];

@NgModule({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe('GettingStartedComponent', () => {
fixture.detectChanges();
});

it('should create', () => {
it('should be created', () => {
expect(component).toBeTruthy();
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe('ReportsComponent', () => {
fixture.detectChanges();
});

it('should create', () => {
it('should be created', () => {
expect(component).toBeTruthy();
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe('TimeClockComponent', () => {
fixture.detectChanges();
});

it('should create', () => {
it('should be created', () => {
expect(component).toBeTruthy();
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe('TimeEntriesComponent', () => {
fixture.detectChanges();
});

it('should create', () => {
it('should be created', () => {
expect(component).toBeTruthy();
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe('TimeOffComponent', () => {
fixture.detectChanges();
});

it('should create', () => {
it('should be created', () => {
expect(component).toBeTruthy();
});
});
2 changes: 1 addition & 1 deletion src/app/components/shared/navbar/navbar.component.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<nav class="navbar navbar-dark bg-dark">
<a class="navbar-brand" href="#">
<img src="assets/img/ioet.png" width="40" height="40" class="d-inline-block align-top" alt="">
<img src="assets/img/ioet.png" width="20" height="35" class="d-inline-block align-top" alt="">
</a>

<app-clock class="text-center"></app-clock>
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/shared/navbar/navbar.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe('NavbarComponent', () => {
fixture.detectChanges();
});

it('should create', () => {
it('should be created', () => {
expect(component).toBeTruthy();
});
});
8 changes: 4 additions & 4 deletions src/app/components/shared/sidebar/sidebar.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<!-- Sidebar -->
<div class="bg-light border-right" id="sidebar-wrapper">
<div class="list-group list-group-flush">
<a [routerLink]="['/gettingStarted']" routerLinkActive="dark" class="list-group-item list-group-item-action bg-light"><i class="fas fa-flag"></i> Getting Started</a>
<a [routerLink]="['/timeClock']" routerLinkActive="dark" class="list-group-item list-group-item-action bg-light"><i class="far fa-clock"></i> Time Clock</a>
<a [routerLink]="['/timeEntries']" routerLinkActive="dark" class="list-group-item list-group-item-action bg-light"><i class="far fa-list-alt"></i> Time Entries</a>
<a [routerLink]="['/timeOff']" routerLinkActive="dark" class="list-group-item list-group-item-action bg-light"><i class="far fa-paper-plane"></i> Time Off</a>
<a [routerLink]="['/getting-started']" routerLinkActive="dark" class="list-group-item list-group-item-action bg-light"><i class="fas fa-flag"></i> Getting Started</a>
<a [routerLink]="['/time-clock']" routerLinkActive="dark" class="list-group-item list-group-item-action bg-light"><i class="far fa-clock"></i> Time Clock</a>
<a [routerLink]="['/time-entries']" routerLinkActive="dark" class="list-group-item list-group-item-action bg-light"><i class="far fa-list-alt"></i> Time Entries</a>
<a [routerLink]="['/time-off']" routerLinkActive="dark" class="list-group-item list-group-item-action bg-light"><i class="far fa-paper-plane"></i> Time Off</a>
<a [routerLink]="['/reports']" routerLinkActive="dark" class="list-group-item list-group-item-action bg-light"><i class="fas fa-chart-pie"></i> Reports</a>

</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe('SidebarComponent', () => {
fixture.detectChanges();
});

it('should create', () => {
it('should be created', () => {
expect(component).toBeTruthy();
});
});
2 changes: 1 addition & 1 deletion src/app/components/shared/user/user.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe('UserComponent', () => {
fixture.detectChanges();
});

it('should create', () => {
it('should be created', () => {
expect(component).toBeTruthy();
});
});
Binary file modified src/assets/img/ioet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.