Skip to content

Commit fe9aba6

Browse files
seanmavleyseanmavley
committed
revert to 3.4.0 firebase. Including authrelated pages
1 parent aa125d3 commit fe9aba6

10 files changed

+167
-64
lines changed

‎app/auth/resetpassword.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<div class="row">
22
<div class="small-12 medium-8 medium-centered large-6 large-centered columns">
3+
TODO
34
<h2>Reset Password</h2>
45
<form #formData='ngForm' (ngSubmit)="onSubmit(formData)">
56
<div class="row">

‎app/dashboard/account.component.html

Lines changed: 40 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,40 @@
1-
<h3>Account Page</h3>
2-
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
3-
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
4-
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
5-
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
6-
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
7-
proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
1+
<div class="small-12 medium-8 medium-centered large-6 large-centered columns">
2+
<h3>Account Page</h3> Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
3+
<hr>
4+
<h2>Change Name</h2>
5+
<form #formData='ngForm' (ngSubmit)="changeName(formData)">
6+
<div class="row">
7+
<div class="small-12 columns">
8+
<label> Old Password
9+
<input type="password" name="passwordold" (ngModel)="old" requred>
10+
</label>
11+
</div>
12+
<div class="small-12 columns">
13+
<button type="submit" class="button" [disabled]="!formData.valid">Submit</button>
14+
<br/>
15+
<a routerLink="/">Cancel</a>
16+
</div>
17+
</div>
18+
</form>
19+
<hr>
20+
<h2>Change Password</h2>
21+
<form #formData='ngForm' (ngSubmit)="onSubmit(formData)">
22+
<div class="row">
23+
<div class="small-12 columns">
24+
<label> Old Password
25+
<input type="password" name="passwordold" (ngModel)="old" requred>
26+
</label>
27+
</div>
28+
<div class="small-12 columns">
29+
<label> New Password
30+
<input type="password" name="passwordnew" (ngModel)="new" requred>
31+
</label>
32+
</div>
33+
<div class="small-12 columns">
34+
<button type="submit" class="button" [disabled]="!formData.valid">Submit</button>
35+
<br/>
36+
<a routerLink="/">Cancel</a>
37+
</div>
38+
</div>
39+
</form>
40+
</div>

‎app/dashboard/child.component.ts

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,38 @@
11
import { Component } from '@angular/core';
2+
import { AngularFire } from 'angularfire2';
23

34
@Component({
45
selector: 'profile',
56
templateUrl: 'app/dashboard/profile.component.html'
67
})
78

8-
export class ProfileComponent { }
9+
export class ProfileComponent {
10+
public userData: any;
11+
constructor(private af: AngularFire) { }
12+
13+
ngOnInit() {
14+
this.af.auth.subscribe(auth => {
15+
console.log(auth);
16+
this.userData = auth;
17+
});
18+
}
19+
20+
}
921

1022
@Component({
1123
selector: 'profile',
1224
templateUrl: 'app/dashboard/account.component.html'
1325
})
1426

15-
export class AccountComponent { }
27+
export class AccountComponent {
28+
29+
onSubmit(formData) {
30+
if(formData.valid) {
31+
console.log(formData.value);
32+
}
33+
}
34+
35+
}
1636

1737
@Component({
1838
selector: 'profile',

‎app/dashboard/dashboard.component.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<div class="row">
2-
<div class="small-12 columns">
3-
<h4 class="callout">
2+
<div class="small-12 medium-6 medium-centered columns">
3+
<h5 class="callout text-center">
44
Dashboard which only Logged in Can see this
5-
</h4>
5+
</h5>
66
</div>
77
<div class="small-12 columns">
88
<div class="menu-centered">
99
<ul class="menu">
10-
<li>Dashboard routes</li>
10+
<li>Dashboard</li>
1111
<li><a routerLink="/dashboard/profile">Profile</a></li>
1212
<li><a routerLink="/dashboard/account">Account</a></li>
1313
<li><a routerLink="/dashboard/settings">Settings</a></li>
1414
</ul>
1515
</div>
1616
<hr>
1717
</div>
18-
<div class="small-12 columns">
19-
<router-outlet></router-outlet>
20-
</div>
18+
</div>
19+
<div class="row">
20+
<router-outlet></router-outlet>
2121
</div>

‎app/dashboard/profile.component.html

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
1-
<h3>Profile Page</h3>
2-
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
3-
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
4-
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
5-
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
6-
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
7-
proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
1+
<div class="small-12 medium-8 medium-centered large-6 large-centered columns">
2+
<h3>Profile Page</h3>
3+
Below is the JSON data of the currently logged in User, but in summary:
4+
<div *ngIf="!userData" class="callout alert">
5+
<p class="lead">
6+
No Data available
7+
</p>
8+
</div>
9+
<div *ngIf="userData">
10+
<p>
11+
Email: {{ userData.auth.email }} <br>
12+
DisplayName: {{ userData.auth.displayName }} <br>
13+
Verification: {{ userData.auth.emailVerified}} <br>
14+
Login Means: {{ userData.auth.providerData | json }}
15+
</p>
16+
<hr>
17+
{{ userData | json }}
18+
</div>
19+
</div>

‎app/dashboard/settings.component.html

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
<h3>Settings Page</h3>
2-
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
3-
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
4-
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
5-
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
6-
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
7-
proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
1+
<div class="small-12 medium-8 medium-centered large-6 large-centered columns">
2+
<h3>Settings Page</h3> Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
3+
</div>

‎app/home/home.component.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ <h3 class="lead">Welcome to AngularFire 2 Authentication</h3>
55
<p>
66
This page represents the landing page of your site, and public to everyone visiting.
77
</p>
8-
98
</div>
109
</div>
1110
</div>

‎index.html

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,44 @@
11
<html>
2-
<head>
2+
3+
<head>
34
<base href="/">
45
<title>AngularFire 2 Authentication</title>
56
<meta charset="UTF-8">
67
<meta name="viewport" content="width=device-width, initial-scale=1">
78
<!-- Load CSS Stylesheets -->
89
<link rel="stylesheet" href="node_modules/foundation-sites/dist/foundation.min.css">
910
<link rel="stylesheet" href="./public/foundation-icons/foundation-icons.css" />
10-
11+
<link rel="stylesheet" type="text/css" href="./public/spinner.css">
1112
<!-- 1. Load libraries -->
12-
<!-- Polyfill(s) for older browsers -->
13+
<!-- Polyfill(s) for older browsers -->
1314
<script src="node_modules/core-js/client/shim.min.js"></script>
1415
<script src="node_modules/zone.js/dist/zone.js"></script>
1516
<script src="node_modules/reflect-metadata/Reflect.js"></script>
1617
<script src="node_modules/systemjs/dist/system.src.js"></script>
1718
<!-- 2. Configure SystemJS -->
1819
<script src="systemjs.config.js"></script>
1920
<script>
20-
System.import('app').catch(function(err){ console.error(err); });
21+
System.import('app').catch(function(err) {
22+
console.error(err);
23+
});
2124
</script>
2225
<!-- 3. Third-party libraries -->
23-
</head>
24-
<!-- 4. Display the application -->
25-
<body>
26-
<root-app>Loading...</root-app>
27-
</body>
28-
<script src="node_modules/jquery/dist/jquery.min.js"></script>
29-
<script src="node_modules/foundation-sites/dist/foundation.min.js"></script>
30-
<script type="text/javascript">
31-
$(document).foundation();
32-
</script>
26+
</head>
27+
<!-- 4. Display the application -->
28+
29+
<body>
30+
<root-app>
31+
<div class="row" style="margin-top:50px;">
32+
<div class="small-8 small-centered medium-3 medium-centered columns">
33+
<div id="loading"></div>
34+
</div>
35+
</div>
36+
</root-app>
37+
</body>
38+
<script src="node_modules/jquery/dist/jquery.min.js"></script>
39+
<script src="node_modules/foundation-sites/dist/foundation.min.js"></script>
40+
<script type="text/javascript">
41+
$(document).foundation();
42+
</script>
43+
3344
</html>

‎package.json

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"name": "angular2-quickstart",
2+
"name": "angular-quickstart",
33
"version": "1.0.0",
44
"scripts": {
5-
"start": "tsc && concurrently \"npm run tsc:w\" \"npm run lite\" ",
5+
"start": "tsc && concurrently \"tsc -w\" \"lite-server\" ",
66
"lite": "lite-server",
77
"postinstall": "typings install",
88
"tsc": "tsc",
@@ -11,30 +11,29 @@
1111
},
1212
"license": "ISC",
1313
"dependencies": {
14-
"@angular/common": "2.0.1",
15-
"@angular/compiler": "2.0.1",
16-
"@angular/core": "2.0.1",
17-
"@angular/forms": "2.0.1",
18-
"@angular/http": "2.0.1",
19-
"@angular/platform-browser": "2.0.1",
20-
"@angular/platform-browser-dynamic": "2.0.1",
21-
"@angular/router": "3.0.1",
22-
"@angular/upgrade": "2.0.1",
23-
"angular2-in-memory-web-api": "0.0.21",
14+
"@angular/common": "~2.0.1",
15+
"@angular/compiler": "~2.0.1",
16+
"@angular/core": "~2.0.1",
17+
"@angular/forms": "~2.0.1",
18+
"@angular/http": "~2.0.1",
19+
"@angular/platform-browser": "~2.0.1",
20+
"@angular/platform-browser-dynamic": "~2.0.1",
21+
"@angular/router": "~3.0.1",
22+
"@angular/upgrade": "~2.0.1",
23+
"angular-in-memory-web-api": "~0.1.1",
2424
"angularfire2": "^2.0.0-beta.5",
25-
"bootstrap": "^3.3.6",
25+
"bootstrap": "^3.3.7",
2626
"core-js": "^2.4.1",
2727
"firebase": "^3.4.0",
28-
"foundation-sites": "^6.2.3",
29-
"reflect-metadata": "^0.1.3",
28+
"reflect-metadata": "^0.1.8",
3029
"rxjs": "5.0.0-beta.12",
3130
"systemjs": "0.19.39",
32-
"zone.js": "^0.6.23"
31+
"zone.js": "^0.6.25"
3332
},
3433
"devDependencies": {
35-
"concurrently": "^3.1.0",
34+
"concurrently": "^3.0.0",
3635
"lite-server": "^2.2.2",
37-
"typescript": "^2.0.2",
38-
"typings": "^1.3.2"
36+
"typescript": "^2.0.3",
37+
"typings": "^1.4.0"
3938
}
4039
}

‎public/spinner.css

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/* Animation */
2+
@-webkit-keyframes loading {
3+
to { -webkit-transform: rotate(360deg); }
4+
}
5+
@-moz-keyframes loading {
6+
to { -moz-transform: rotate(360deg); }
7+
}
8+
@-ms-keyframes loading {
9+
to { -ms-transform: rotate(360deg); }
10+
}
11+
@keyframes loading {
12+
to { transform: rotate(360deg); }
13+
}
14+
15+
/* Loader (*/
16+
#loading {
17+
width: 8rem;
18+
height: 8rem;
19+
border-radius: 50%;
20+
background: transparent;
21+
22+
border-top: 4px solid #fff;
23+
border-right: 4px solid #fff;
24+
border-bottom: 4px solid #777;
25+
border-left: 4px solid #777;
26+
27+
-webkit-animation: loading 1.2s infinite linear;
28+
-moz-animation: loading 1.2s infinite linear;
29+
-ms-animation: loading 1.2s infinite linear;
30+
animation: loading 1.2s infinite linear;
31+
32+
}

0 commit comments

Comments
 (0)