Skip to content

Commit

Permalink
add in model for team-member, add in styling for homepage.
Browse files Browse the repository at this point in the history
  • Loading branch information
Jason Ainsworth git config --global user.email [email protected] config --global user.name Jason authored and Jason Ainsworth git config --global user.email [email protected] config --global user.name Jason committed Jun 16, 2017
1 parent 5f2e803 commit 09d8898
Show file tree
Hide file tree
Showing 12 changed files with 94 additions and 8 deletions.
21 changes: 21 additions & 0 deletions src/app/app.component.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
.center-text {
text-align: center;
}

.headline {
font-size: 75px;
color: white;
}

.bg-img {
background-image: url(/assets/img/bg-img2.jpg);
background-position: center;
background-size: cover;
background-repeat: no-repeat;
z-index: -1;
position: fixed;
top: 0;
left: 0;
height: 100%;
width: 100%;
}
14 changes: 7 additions & 7 deletions src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<nav class="navbar">
<div class="navbar-nav navbar-right">
<p class="nav-item" routerLink="">link</p>
<p class="nav-item" routerLink="">link</p>
</div>
<nav class="navbar navbar-inverse bg-primary">
<p class="navbar-brand" routerLink="">Home</p>
<a class="navbar-brand" routerLink="team-members">Team Members</a>
</nav>
</nav>

<div class="jumbotron">
<h1>{{title}}</h1>
</div>

<h1 class="center-text headline">Terminal Velocity</h1>


<div class="container">
<router-outlet></router-outlet>
Expand Down
4 changes: 3 additions & 1 deletion src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { AngularFireDatabaseModule } from 'angularfire2/database';
import { routing } from './app.routing';
import { AppComponent } from './app.component';
import { WelcomeComponent } from './welcome/welcome.component';
import { TeamMembersComponent } from './team-members/team-members.component';

export const firebaseConfig = {
apiKey: masterFirebaseConfig.apiKey,
Expand All @@ -21,7 +22,8 @@ export const firebaseConfig = {
@NgModule({
declarations: [
AppComponent,
WelcomeComponent
WelcomeComponent,
TeamMembersComponent
],
imports: [
BrowserModule,
Expand Down
5 changes: 5 additions & 0 deletions src/app/app.routing.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
import { ModuleWithProviders } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { WelcomeComponent } from './welcome/welcome.component';
import { TeamMembersComponent } from './team-members/team-members.component';

const appRoutes: Routes = [
{
path: '',
component: WelcomeComponent
},
{
path: 'team-members',
component: TeamMembersComponent
}

];
Expand Down
Empty file.
3 changes: 3 additions & 0 deletions src/app/team-members/team-members.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<p>
team-members works!
</p>
25 changes: 25 additions & 0 deletions src/app/team-members/team-members.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';

import { TeamMembersComponent } from './team-members.component';

describe('TeamMembersComponent', () => {
let component: TeamMembersComponent;
let fixture: ComponentFixture<TeamMembersComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ TeamMembersComponent ]
})
.compileComponents();
}));

beforeEach(() => {
fixture = TestBed.createComponent(TeamMembersComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should be created', () => {
expect(component).toBeTruthy();
});
});
15 changes: 15 additions & 0 deletions src/app/team-members/team-members.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';

@Component({
selector: 'app-team-members',
templateUrl: './team-members.component.html',
styleUrls: ['./team-members.component.css']
})
export class TeamMembersComponent implements OnInit {

constructor() { }

ngOnInit() {
}

}
12 changes: 12 additions & 0 deletions src/app/welcome/welcome.component.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
.bg-img {
background-image: url(/assets/img/bg-img2.jpg);
background-position: center;
background-size: cover;
background-repeat: no-repeat;
z-index: -1;
position: fixed;
top: 0;
left: 0;
height: 100%;
width: 100%;
}
3 changes: 3 additions & 0 deletions src/app/welcome/welcome.component.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@

<div class="bg-img"></div>

<p>
welcome works!
</p>
Binary file added src/assets/img/bg-img1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/bg-img2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 09d8898

Please sign in to comment.