Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
made auth page new frontpage, and some other minor routing fixes and …
…look fixes
  • Loading branch information
rrc12004 committed Feb 19, 2019
1 parent 37e5552 commit be32550
Show file tree
Hide file tree
Showing 7 changed files with 70 additions and 34 deletions.
4 changes: 2 additions & 2 deletions src/app/app.module.ts
Expand Up @@ -30,8 +30,8 @@ import { SignUpComponent } from './sign-up/sign-up.component';
BrowserAnimationsModule,
RouterModule.forRoot([

{path: '', component: FrontpageComponent},
{path: 'authentication', component: AuthenticationComponent},
{path: 'dashboard', component: FrontpageComponent},
{path: '', component: AuthenticationComponent},
{path: 'generator-search', component: GeneratorSearchComponent},
{path: 'statistics', component: StatisticsComponent},
{path: 'warnings', component: WarningsComponent},
Expand Down
36 changes: 23 additions & 13 deletions src/app/authentication/authentication.component.html
@@ -1,18 +1,28 @@
<div class = "container ">
<div class = "row">
<div class = "col-md-6 mx-auto mt-4">
<h4 class = "text-center mb-3">Log In</h4>
<div class="container ">
<div class="row">
<div class="col-md-6 mx-auto mt-4">
<h4 class="text-center mb-3">Log In</h4>
<form>
<div class="form-group">
<label for="exampleInputEmail1">Email address</label>
<input type="email" class="form-control" id="exampleInputEmail1" aria-describedby="emailHelp" placeholder="Enter email">
</div>
<div class="form-group">
<label for="exampleInputPassword1">Password</label>
<input type="password" class="form-control" id="exampleInputPassword1" placeholder="Password">
</div>
<a routerLink = "/generator-search"><button type="submit" class="btn btn-primary">Submit</button></a>

<div class="form-group">
<label for="exampleInputEmail1">Email address</label>
<input type="email" class="form-control" id="exampleInputEmail1" aria-describedby="emailHelp"
placeholder="Enter email">
</div>

<div class="form-group">
<label for="exampleInputPassword1">Password</label>
<input type="password" class="form-control" id="exampleInputPassword1" placeholder="Password">
</div>
<a routerLink="/generator-search"><button type="submit" class="btn btn-primary">Submit</button></a>
</form>
<p>
<br>
The Kinsley Group is a leading energy solutions supplier with a 50 plus year legacy of sales, rental and
service of quality energy systems. Our commercial businesses include Kinsley Power Systems, a top distributor
of industrial and residential KOHLER® generators for over 50 years and Kinsley Energy Systems, representing
prime movers for co-generation, biomass and landfill applications.
</p>
</div>
</div>
</div>
1 change: 1 addition & 0 deletions src/app/frontpage/frontpage.component.html
@@ -1,3 +1,4 @@

<div class = "container">
<div class = "row">
<div class = "col-md">
Expand Down
13 changes: 13 additions & 0 deletions src/app/header/header.component.css
@@ -0,0 +1,13 @@
.nav-link {
padding: 20px;
}
.nav-item {
/* padding-left: 20px; */
padding-right: 20px;
}
.logo {
float: right;
}
.clearfix {
overflow: auto;
}
50 changes: 31 additions & 19 deletions src/app/header/header.component.html
@@ -1,28 +1,40 @@
<header>
<header>
<nav class="navbar navbar-expand-lg navbar-dark" style="background-color: black;">

<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
<li class="nav-item ">

<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
<li class="nav-item">
<a class="nav-image" routerLink="/generator-search"><img src="assets/images/home.png"
class=" d-block img-fluid py-3 pl-3" alt="Dashboard Image" height="42" width="42"></a>
</li>
<li class="nav-item ">
<a class="nav-link" routerLink="/visualization">Visualization</a>
</li>
<!-- <li class="nav-item ">
<a class="nav-link" routerLink="/statistics">Statistics</a>
</li>
<li class="nav-item">
<a class="nav-link" routerLink="/warnings">Warnings</a>
</li>
<li class="nav-item">
<a class="nav-link" routerLink="/history">History</a>
</li>

</ul>
<form class="form-inline my-2 my-lg-0">
<input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
<button class="btn btn-light my-2 my-sm-0" type="submit">Search</button>
</form>
</div>

</li> -->

</ul>
<form class="form-inline my-2 my-lg-0">
<!-- <input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
<button class="btn btn-light my-2 my-sm-0" type="submit">Search</button> -->
<a class="nav-left-image" routerLink="/"><img src="assets/images/logout.png"
class=" d-block img-fluid py-3 pl-3" alt="Logout Image" height="42" width="42"></a>
</form>
</div>
</nav>
<a routerLink = "/"><img src = "assets/images/logo2.png" class=" d-block img-fluid py-3 pl-3" alt="Responsive image"></a>
</header>
<div class="clearfix">
<a class="logo" routerLink="/generator-search"><img src="assets/images/logo2.png" class=" d-block img-fluid py-3 pl-3"
alt="Kinsley image"></a>
</div>
</header>
Binary file added src/assets/images/home.png
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/images/logout.png
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 be32550

Please sign in to comment.