Skip to content

Dev routers rebase #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aashil wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Dev routers rebase #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2328d4
Add router to the stackbot so that we can navigate more efficiently.
Aug 26, 2016
7ebcb4a
Use LocationStrategy and HashLocationStrategy to use hashes in the url.
Aug 26, 2016
6e12693
PROD-253: Fixme
Aug 26, 2016
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
8 changes: 6 additions & 2 deletions default/src/app/app.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ <h1>Stackbot</h1>
<div class="col-lg-4 col-lg-offset-4">
<search></search>
<auth-button></auth-button>
<auth-integrations></auth-integrations>
<report></report>

<a [routerLink]="['/report']" routerLinkActive="active">Report</a><br>
<a [routerLink]="['/integrations']" routerLinkActive="active">Integrations</a><br>

<router-outlet></router-outlet>

</div>
</div>
12 changes: 11 additions & 1 deletion default/src/app/app.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { AngularFireModule, AuthProviders, AuthMethods } from 'angularfire2';

import {
LocationStrategy,
HashLocationStrategy
} from '@angular/common';

import { HTTP_PROVIDERS } from '@angular/http';
import { AUTH_PROVIDERS } from 'angular2-jwt';
import { FocusMeDirective } from './shared/focus-me.directive';
Expand All @@ -16,7 +21,9 @@ import { ReportComponent } from './report/index';
import { AuthService, AuthButtonComponent, AuthIntegrationsComponent } from './auth/index';
import { SearchComponent } from './search/index';

// DO NOT DELETE: This is needed or the compiler says, Cannot find namespace 'firebase'.
import { routing, appRoutingProviders } from './app.routing';

// DO NOT DELETE: This is needed of the compiler says, Cannot find namespace 'firebase'.
/* tslint:disable */
import * as firebase from 'firebase';
/* tslint:enable */
Expand All @@ -42,6 +49,8 @@ let providers = [
HTTP_PROVIDERS,
AuthService,
BackendService,
appRoutingProviders,
{provide: LocationStrategy, useClass: HashLocationStrategy}
];

let declarations = [
Expand All @@ -59,6 +68,7 @@ let imports = [
FormsModule,
CommonModule,
BrowserModule,
routing
];


Expand Down
15 changes: 15 additions & 0 deletions default/src/app/app.routing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { Routes, RouterModule } from '@angular/router';
import {IntegrationsComponent} from './integrations.component';
import { ReportComponent} from './report/index';

const appRoutes: Routes = [
{ path: 'report', component: ReportComponent },
{ path: 'integrations', component: IntegrationsComponent },
{ path: '', component: IntegrationsComponent },
];

export const appRoutingProviders: any[] = [

];

export const routing = RouterModule.forRoot(appRoutes);
1 change: 1 addition & 0 deletions default/src/app/integrations.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<h1>This is integrations page</h1>
7 changes: 7 additions & 0 deletions default/src/app/integrations.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { Component } from '@angular/core';

@Component({
templateUrl: 'integrations.component.html'
})

export class IntegrationsComponent { }
1 change: 1 addition & 0 deletions default/src/app/report/report.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<div>
<h1> Report </h1>
<table *ngIf="data" class="table table-striped">
<thead>
<tr>
Expand Down
1 change: 1 addition & 0 deletions default/src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<!doctype html>
<html>
<head>
<base href="/">
<meta charset="utf-8">
<title>Stackbot</title>
<base href="/">
Expand Down