Skip to content

Commit fe84536

Browse files
adriandarianadriandarian
committed
Merge remote-tracking branch 'origin/origin/feature/navbar' into develop
2 parents 6d4b313 + 25003f0 commit fe84536

23 files changed

Lines changed: 8616 additions & 17 deletions

‎.gitignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ pids
1111
*.pid
1212
*.seed
1313
*.pid.lock
14-
package-lock.json
15-
yarn.lock
1614

1715

1816
# Directory for instrumented libs generated by jscoverage/JSCover

‎angular.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,13 @@
2828
"src/assets"
2929
],
3030
"styles": [
31-
"src/styles.scss"
31+
"src/styles.scss",
32+
"node_modules/bootstrap/dist/css/bootstrap.min.css"
3233
],
33-
"scripts": []
34+
"scripts": [
35+
"node_modules/jquery/dist/jquery.min.js",
36+
"node_modules/bootstrap/dist/js/bootstrap.min.js"
37+
]
3438
},
3539
"configurations": {
3640
"production": {

‎package.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,20 @@
2121
"@angular/platform-browser": "~8.2.11",
2222
"@angular/platform-browser-dynamic": "~8.2.11",
2323
"@angular/router": "~8.2.11",
24+
"@ng-bootstrap/ng-bootstrap": "^5.2.1",
2425
"@ngrx/effects": "^8.5.2",
2526
"@ngrx/entity": "^8.5.2",
2627
"@ngrx/store": "^8.5.2",
2728
"@ngrx/store-devtools": "^8.5.2",
29+
"@popperjs/core": "^2.0.4",
2830
"axios": "^0.19.0",
31+
"bootstrap": "^4.4.1",
32+
"eslint": "^5.16.0",
33+
"jquery": "^3.4.1",
34+
"popper.js": "^1.16.1",
2935
"rxjs": "~6.5.3",
3036
"tslib": "^1.10.0",
31-
"zone.js": "^0.10.2"
37+
"zone.js": "^0.9.1"
3238
},
3339
"devDependencies": {
3440
"@angular-devkit/build-angular": "~0.803.14",

‎src/app/app-routing.module.ts‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,41 @@
11
import { NgModule } from "@angular/core";
22
import { Routes, RouterModule } from "@angular/router";
33

4-
import { HomeComponent, CoffeeNCodeComponent } from "./containers";
4+
import { HomeComponent, CoffeeNCodeComponent, ProjectsComponent, WorkshopsComponent, InterviewsComponent, MembersComponent, AccountComponent, CalendarComponent } from "./containers";
55

66
const routes: Routes = [
77
{
88
path: "home",
99
component: HomeComponent
1010
},
11+
{
12+
path: "calendar",
13+
component: CalendarComponent
14+
},
1115
{
1216
path: "coffee-n-code",
1317
component: CoffeeNCodeComponent
1418
},
19+
{
20+
path: "projects",
21+
component: ProjectsComponent
22+
},
23+
{
24+
path: "workshops",
25+
component: WorkshopsComponent
26+
},
27+
{
28+
path: "interview",
29+
component: InterviewsComponent
30+
},
31+
{
32+
path: "members",
33+
component: MembersComponent
34+
},
35+
{
36+
path: "account",
37+
component: AccountComponent
38+
},
1539
{
1640
path: "",
1741
redirectTo: "/home",
@@ -24,3 +48,4 @@ const routes: Routes = [
2448
exports: [RouterModule]
2549
})
2650
export class AppRoutingModule {}
51+
``

‎src/app/app.component.html‎

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,52 @@
1-
<router-outlet></router-outlet>
1+
<!-- <app-navbar>
2+
<nav>
3+
<a routerLink="/home" routerLinkActive="active">home</a>
4+
<a routerLink="/coffee-n-code" routerLinkActive="active">Coffee and Code</a>
5+
</nav> -->
6+
7+
8+
9+
<nav class="navbar navbar-expand-lg navbar-light bg-light">
10+
<a class="navbar-brand" routerLink="">ACM @ UCM</a>
11+
<button class="navbar-toggler" type="button" (click)="toggleNavbar()" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
12+
<span class="navbar-toggler-icon"></span>
13+
</button>
14+
15+
<div class="collapse navbar-collapse" [ngClass]="{ 'show': navbarOpen }">
16+
<ul class="navbar-nav mr-auto">
17+
<li class="nav-item active">
18+
<a class="nav-link" routerLink="/home" routerLinkActive="active">Home <span class="sr-only">(current)</span></a>
19+
</li>
20+
<li class="nav-item">
21+
<a class="nav-link" routerLink="calendar" routerLinkActive="active">Calendar</a>
22+
</li>
23+
<li class="nav-item">
24+
<a class="nav-link" routerLink="projects" routerLinkActive="active">Projects</a>
25+
</li>
26+
<li class="nav-item">
27+
<a class="nav-link" routerLink="workshops" routerLinkActive="active">Workshops</a>
28+
</li>
29+
<li class="nav-item">
30+
<a class="nav-link" routerLink="members" routerLinkActive="active">Members</a>
31+
</li>
32+
<li class="nav-item dropdown">
33+
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
34+
Professional
35+
</a>
36+
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
37+
<a class="dropdown-item" href="coffee-n-code">Coffee and Code</a>
38+
<a class="dropdown-item" href="interview">Interview</a>
39+
</div>
40+
</li>
41+
<li class="nav-item">
42+
<a class="nav-link" routerLink="privacy" routerLinkActive="active">Privacy Policy</a>
43+
</li>
44+
<li class="nav-item">
45+
<a class="nav-link" routerLink="terms" routerLinkActive="active">Terms and Conditions</a>
46+
</li>
47+
</ul>
48+
<a class="nav-link" routerLink="account" routerLinkActive="active">Account</a>
49+
</div>
50+
</nav>
51+
52+
<router-outlet></router-outlet>

‎src/app/app.component.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { Component, OnInit } from "@angular/core";
22
import { Store } from "@ngrx/store";
33
import { MemberStoreActions } from './root-store';
44

5+
56
@Component({
67
selector: "app-root",
78
templateUrl: "./app.component.html",

‎src/app/app.module.ts‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { NgModule } from "@angular/core";
33
import { BrowserModule } from "@angular/platform-browser";
44
import { HttpClientModule } from "@angular/common/http";
55
import { StoreDevtoolsModule } from "@ngrx/store-devtools";
6+
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
67

78
import { AppRoutingModule } from "./app-routing.module"; // Routing Import
89
import { AppComponent } from "./app.component"; // Main app import
@@ -25,6 +26,8 @@ import {
2526

2627
// NgRx Store Imports
2728
import { RootStoreModule } from "./root-store";
29+
import { MembersComponent } from './containers/members/members.component';
30+
import { AccountComponent } from './containers/account/account.component';
2831

2932
@NgModule({
3033
declarations: [
@@ -40,10 +43,12 @@ import { RootStoreModule } from "./root-store";
4043
LanComponent,
4144
CodeEditorComponent,
4245
InterviewsComponent,
43-
CalendarComponent
46+
CalendarComponent,
47+
MembersComponent,
48+
AccountComponent
4449
],
4550
imports: [
46-
HttpClientModule,
51+
NgbModule
4752

4853
// Angular
4954
BrowserModule,
@@ -69,6 +74,7 @@ import { RootStoreModule } from "./root-store";
6974
maxAge: 25, // Retains last 25 states
7075
})
7176
],
77+
HttpClientModule,
7278
providers: [],
7379
bootstrap: [AppComponent]
7480
})

‎src/app/components/navbar/navbar.component.html‎

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,37 @@
1-
<p>navbar works!</p>
1+
<nav class="navbar navbar-expand-lg navbar-light bg-light">
2+
<a class="navbar-brand" [routerLink]="['/home']" routerLinkActive="router-link-active" >Navbar</a>
3+
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
4+
aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
5+
<span class="navbar-toggler-icon"></span>
6+
</button>
7+
8+
<div class="collapse navbar-collapse" id="navbarSupportedContent">
9+
<ul class="navbar-nav mr-auto">
10+
<li class="nav-item active">
11+
<a class="nav-link" routerLink="/home" routerLinkActive="active">Home <span class="sr-only">(current)</span></a>
12+
</li>
13+
<li class="nav-item">
14+
<a class="nav-link" [routerLink]="['/coffee-n-code']" routerLinkActive="router-link-active" >Coffee and Code</a>
15+
</li>
16+
<li class="nav-item dropdown">
17+
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown"
18+
aria-haspopup="true" aria-expanded="false">
19+
Dropdown
20+
</a>
21+
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
22+
<a class="dropdown-item" href="#">Action</a>
23+
<a class="dropdown-item" href="#">Another action</a>
24+
<div class="dropdown-divider"></div>
25+
<a class="dropdown-item" href="#">Something else here</a>
26+
</div>
27+
</li>
28+
<li class="nav-item">
29+
<a class="nav-link disabled" href="#">Disabled</a>
30+
</li>
31+
</ul>
32+
<form class="form-inline my-2 my-lg-0">
33+
<input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
34+
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
35+
</form>
36+
</div>
37+
</nav>

‎src/app/containers/account/account.component.html‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<p>Account data dynamically displaying all personal data contained in member.ts model</p>
2+
<p>Data will be obtained from NgRx framework once a successful login attempt occurs</p>
3+
<p>Allows photo upload</p>
4+
<p>Allows editing of all data contained in members.ts</p>
5+
<p>Has form submission requesting change for their personal webpage (must be approved by officers)</p>

‎src/app/containers/account/account.component.scss‎

Whitespace-only changes.

0 commit comments

Comments
 (0)