Skip to content

Commit 47ee4f3

Browse files
committed
routes working
1 parent 370f57a commit 47ee4f3

File tree

4 files changed

+24
-27
lines changed

4 files changed

+24
-27
lines changed

src/app/app-routing.module.ts

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,24 @@
11
import { NgModule } from '@angular/core';
22
import { Routes, RouterModule } from '@angular/router';
3+
import { GettingStartedComponent } from './components/optionsSidebar/getting-started/getting-started.component';
4+
import { ReportsComponent } from './components/optionsSidebar/reports/reports.component';
5+
import { TimeClockComponent } from './components/optionsSidebar/time-clock/time-clock.component';
6+
import { TimeEntriesComponent } from './components/optionsSidebar/time-entries/time-entries.component';
7+
import { TimeOffComponent } from './components/optionsSidebar/time-off/time-off.component';
38

49

5-
const routes: Routes = [];
10+
const routes: Routes = [
11+
{path: 'gettingStarted', component: GettingStartedComponent},
12+
{path: 'reports', component: ReportsComponent},
13+
{path: 'timeClock', component: TimeClockComponent},
14+
{path: 'timeEntries', component: TimeEntriesComponent},
15+
{path: 'timeOff', component: TimeOffComponent},
16+
{path: '', pathMatch: 'full', redirectTo: 'gettingStarted'},
17+
{path: '**', pathMatch: 'full', redirectTo: 'gettingStarted'},
18+
];
619

720
@NgModule({
8-
imports: [RouterModule.forRoot(routes)],
21+
imports: [RouterModule.forRoot(routes, { useHash: true })],
922
exports: [RouterModule]
1023
})
1124
export class AppRoutingModule { }

src/app/app.component.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
<app-navbar></app-navbar>
22

3-
<app-sidebar></app-sidebar>
3+
<app-sidebar>
4+
<router-outlet></router-outlet>
5+
</app-sidebar>

src/app/app.module.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ import { NavbarComponent } from './components/shared/navbar/navbar.component';
77
import { UserComponent } from './components/shared/user/user.component';
88
import { SidebarComponent } from './components/shared/sidebar/sidebar.component';
99
import { ClockComponent } from './components/shared/clock/clock.component';
10-
import { OptionsSidebarComponent } from './components/options-sidebar/options-sidebar.component';
11-
import { GettingStartedComponent } from './components/optionsSidebar/getting-started/getting-started.component';
12-
import { TimeClockComponent } from './components/optionsSidebar/time-clock/time-clock.component';
13-
import { TimeEntriesComponent } from './components/optionsSidebar/time-entries/time-entries.component';
14-
import { TimeOffComponent } from './components/optionsSidebar/time-off/time-off.component';
15-
import { ReportsComponent } from './components/optionsSidebar/reports/reports.component';
1610

1711
@NgModule({
1812
declarations: [
@@ -21,12 +15,6 @@ import { ReportsComponent } from './components/optionsSidebar/reports/reports.co
2115
UserComponent,
2216
SidebarComponent,
2317
ClockComponent,
24-
OptionsSidebarComponent,
25-
GettingStartedComponent,
26-
TimeClockComponent,
27-
TimeEntriesComponent,
28-
TimeOffComponent,
29-
ReportsComponent,
3018
],
3119
imports: [
3220
BrowserModule,

src/app/components/shared/sidebar/sidebar.component.html

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,18 @@
33
<!-- Sidebar -->
44
<div class="bg-light border-right" id="sidebar-wrapper">
55
<div class="list-group list-group-flush">
6-
<a href="#" class="list-group-item list-group-item-action bg-light"><i class="fas fa-flag"></i> Getting Started</a>
7-
<a href="#" class="list-group-item list-group-item-action bg-light"><i class="far fa-clock"></i> Time Clock</a>
8-
<a href="#" class="list-group-item list-group-item-action bg-light"><i class="far fa-list-alt"></i> Time Entries</a>
9-
<a href="#" class="list-group-item list-group-item-action bg-light"><i class="far fa-paper-plane"></i> Time Off</a>
10-
<a href="#" class="list-group-item list-group-item-action bg-light"><i class="fas fa-chart-pie"></i> Reports</a>
6+
<a [routerLink]="['/gettingStarted']" routerLinkActive="dark" class="list-group-item list-group-item-action bg-light"><i class="fas fa-flag"></i> Getting Started</a>
7+
<a [routerLink]="['/timeClock']" routerLinkActive="dark" class="list-group-item list-group-item-action bg-light"><i class="far fa-clock"></i> Time Clock</a>
8+
<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>
9+
<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>
10+
<a [routerLink]="['/reports']" routerLinkActive="dark" class="list-group-item list-group-item-action bg-light"><i class="fas fa-chart-pie"></i> Reports</a>
1111

1212
</div>
1313
</div>
1414
<!-- /#sidebar-wrapper -->
1515

1616
<!-- Page Content -->
17-
<div id="page-content-wrapper">
18-
<div class="container-fluid">
19-
<h1 class="mt-4">Simple Sidebar</h1>
20-
<p>The starting state of the menu will appear collapsed on smaller screens, and will appear non-collapsed on larger screens. When toggled using the button below, the menu will change.</p>
21-
<p>Make sure to keep all page content within the <code>#page-content-wrapper</code>. The top navbar is optional, and just for demonstration. Just create an element with the <code>#menu-toggle</code> ID which will toggle the menu when clicked.</p>
22-
</div>
23-
</div>
17+
<router-outlet></router-outlet>
2418
<!-- /#page-content-wrapper -->
2519

2620
</div>

0 commit comments

Comments
 (0)