Skip to content

Commit e4d26ce

Browse files
authored
Merge pull request #6 from ioet/TSheets-UI
home screen TSheet
2 parents 9424a5d + 978119f commit e4d26ce

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+582
-548
lines changed

angular.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3-
"version": 1,
3+
"version": 1,
44
"newProjectRoot": "projects",
55
"projects": {
66
"time-tracker": {
@@ -119,6 +119,10 @@
119119
}
120120
}
121121
}
122-
}},
123-
"defaultProject": "time-tracker"
124-
}
122+
}
123+
},
124+
"defaultProject": "time-tracker",
125+
"cli": {
126+
"analytics": false
127+
}
128+
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
"zone.js": "~0.10.2"
2525
},
2626
"devDependencies": {
27-
"@angular-devkit/build-angular": "~0.900.4",
27+
"@angular-devkit/build-angular": "^0.900.5",
2828
"@angular/cli": "~9.0.4",
2929
"@angular/compiler-cli": "~9.0.3",
3030
"@angular/language-service": "~9.0.3",
31-
"@types/node": "^12.11.1",
3231
"@types/jasmine": "~3.5.0",
3332
"@types/jasminewd2": "~2.0.3",
33+
"@types/node": "^12.11.1",
3434
"codelyzer": "^5.1.2",
3535
"jasmine-core": "~3.5.0",
3636
"jasmine-spec-reporter": "~4.2.1",

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/options-sidebar/getting-started/getting-started.component';
4+
import { ReportsComponent } from './components/options-sidebar/reports/reports.component';
5+
import { TimeClockComponent } from './components/options-sidebar/time-clock/time-clock.component';
6+
import { TimeEntriesComponent } from './components/options-sidebar/time-entries/time-entries.component';
7+
import { TimeOffComponent } from './components/options-sidebar/time-off/time-off.component';
38

49

5-
const routes: Routes = [];
10+
const routes: Routes = [
11+
{path: 'getting-started', component: GettingStartedComponent},
12+
{path: 'reports', component: ReportsComponent},
13+
{path: 'time-clock', component: TimeClockComponent},
14+
{path: 'time-entries', component: TimeEntriesComponent},
15+
{path: 'time-off', component: TimeOffComponent},
16+
{path: '', pathMatch: 'full', redirectTo: 'getting-started'},
17+
{path: '**', pathMatch: 'full', redirectTo: 'getting-started'},
18+
];
619

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

0 commit comments

Comments
 (0)