Skip to content
This repository was archived by the owner on Nov 18, 2021. It is now read-only.

Commit f526c64

Browse files
Cecil Du ToitCecil Du Toit
Cecil Du Toit
authored and
Cecil Du Toit
committed
Fix routing.
1 parent ecefd6a commit f526c64

File tree

3 files changed

+23
-22
lines changed

3 files changed

+23
-22
lines changed

‎index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<html>
22

33
<head>
4-
<base href="./">
4+
<base href=".">
55
<meta charset="UTF-8">
66
<title>Office 365 Desktop Experience</title>
77
<!-- Material Design -->
88
<link rel="stylesheet" href="node_modules/material-design-lite/dist/material.blue-red.min.css" />
99
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
1010
<!--<link href="https://cdnjs.cloudflare.com/ajax/libs/material-design-iconic-font/2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet">-->
11-
<script>
11+
<!--<script>
1212
window.electron = require('electron');
13-
</script>
13+
</script>-->
1414
</head>
1515

1616
<body>

‎src/app/app.module.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import { NotesComponent } from "../notes/notes.component";
1818
import { TasksComponent } from "../tasks/tasks.component";
1919
import { TrendingComponent } from "../trending/trending.component";
2020
import { UsersComponent } from "../users/users.component";
21+
import { AuthGuardService } from "../auth/auth-guard.service"
2122

2223
@NgModule({
2324
imports: [ BrowserModule, HttpModule, APP_ROUTING ],
@@ -26,6 +27,6 @@ import { UsersComponent } from "../users/users.component";
2627
ContactsComponent, GroupsComponent, MailsComponent, NotesComponent, TasksComponent, TrendingComponent,
2728
UsersComponent ],
2829
bootstrap: [ AppComponent ],
29-
providers: [ AuthService, ElectronService, ProfileComponent, ToastComponent ]
30+
providers: [ AuthService, AuthGuardService, ElectronService, ProfileComponent, ToastComponent ]
3031
})
3132
export class AppModule { }

‎src/app/view-main.html

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,31 @@
77
<div class="mdl-layout-spacer"></div>
88
<!-- Navigation. We hide it in small screens. -->
99
<nav class="mdl-navigation mdl-layout--large-screen-only">
10-
<a class="mdl-navigation__link" [routerLink]="['./Home']" title="Home">
10+
<a class="mdl-navigation__link" [routerLink]="['/home']" title="Home">
1111
<i class="material-icons">home</i>
1212
</a>
13-
<a class="mdl-navigation__link" [routerLink]="['./Files']" title="My Files">
13+
<a class="mdl-navigation__link" [routerLink]="['/files']" title="My Files">
1414
<i class="material-icons">insert_drive_file</i>
1515
</a>
16-
<a class="mdl-navigation__link" [routerLink]="['./Mails']" title="My Mails">
16+
<a class="mdl-navigation__link" [routerLink]="['/mails']" title="My Mails">
1717
<i class="material-icons">mail</i>
1818
</a>
19-
<a class="mdl-navigation__link" [routerLink]="['./Groups']" title="My Groups">
19+
<a class="mdl-navigation__link" [routerLink]="['/groups']" title="My Groups">
2020
<i class="material-icons">group_work</i>
2121
</a>
22-
<a class="mdl-navigation__link" [routerLink]="['./Contacts']" title="My Contacts">
22+
<a class="mdl-navigation__link" [routerLink]="['/contacts']" title="My Contacts">
2323
<i class="material-icons">contacts</i>
2424
</a>
25-
<a class="mdl-navigation__link" [routerLink]="['./Users']" title="People">
25+
<a class="mdl-navigation__link" [routerLink]="['/users']" title="People">
2626
<i class="material-icons">supervisor_account</i>
2727
</a>
28-
<a class="mdl-navigation__link" [routerLink]="['./Tasks']" title="My Tasks">
28+
<a class="mdl-navigation__link" [routerLink]="['/tasks']" title="My Tasks">
2929
<i class="material-icons">playlist_add_check</i>
3030
</a>
31-
<a class="mdl-navigation__link" [routerLink]="['./Notes']" title="My Notebooks">
31+
<a class="mdl-navigation__link" [routerLink]="['/notes']" title="My Notebooks">
3232
<i class="material-icons">book</i>
3333
</a>
34-
<a class="mdl-navigation__link" [routerLink]="['./Trending']" title="Trending Content">
34+
<a class="mdl-navigation__link" [routerLink]="['/trending']" title="Trending Content">
3535
<i class="material-icons">trending_up</i>
3636
</a>
3737
</nav>
@@ -40,31 +40,31 @@
4040
<div class="mdl-layout__drawer">
4141
<span class="mdl-layout-title">Menu</span>
4242
<nav class="mdl-navigation">
43-
<a class="mdl-navigation__link" [routerLink]="['./Home']">
43+
<a class="mdl-navigation__link" [routerLink]="['/home']">
4444
<i class="material-icons">home</i> Home
4545
</a>
46-
<a class="mdl-navigation__link" [routerLink]="['./Files']">
46+
<a class="mdl-navigation__link" [routerLink]="['/files']">
4747
<i class="material-icons">insert_drive_file</i> My Files
4848
</a>
49-
<a class="mdl-navigation__link" [routerLink]="['./Mails']">
49+
<a class="mdl-navigation__link" [routerLink]="['/mails']">
5050
<i class="material-icons">mail</i> My Mails
5151
</a>
52-
<a class="mdl-navigation__link" [routerLink]="['./Groups']">
52+
<a class="mdl-navigation__link" [routerLink]="['/groups']">
5353
<i class="material-icons">group_work</i> My Groups
5454
</a>
55-
<a class="mdl-navigation__link" [routerLink]="['./Contacts']">
55+
<a class="mdl-navigation__link" [routerLink]="['/contacts']">
5656
<i class="material-icons">contacts</i> My Contacts
5757
</a>
58-
<a class="mdl-navigation__link" [routerLink]="['./Users']">
58+
<a class="mdl-navigation__link" [routerLink]="['/users']">
5959
<i class="material-icons">supervisor_account</i> People
6060
</a>
61-
<a class="mdl-navigation__link" [routerLink]="['./Tasks']">
61+
<a class="mdl-navigation__link" [routerLink]="['/tasks']">
6262
<i class="material-icons">playlist_add_check</i> My Tasks
6363
</a>
64-
<a class="mdl-navigation__link" [routerLink]="['./Notes']">
64+
<a class="mdl-navigation__link" [routerLink]="['/notes']">
6565
<i class="material-icons">book</i> My Notebooks
6666
</a>
67-
<a class="mdl-navigation__link" [routerLink]="['./Trending']">
67+
<a class="mdl-navigation__link" [routerLink]="['/trending']">
6868
<i class="material-icons">trending_up</i> Trending Content
6969
</a>
7070
</nav>

0 commit comments

Comments
 (0)