diff --git a/AddMe/package-lock.json b/AddMe/package-lock.json index 14631436..bd668468 100644 --- a/AddMe/package-lock.json +++ b/AddMe/package-lock.json @@ -591,14 +591,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -617,7 +615,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -797,8 +794,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -904,8 +900,7 @@ "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, @@ -7230,8 +7225,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -7259,7 +7253,6 @@ "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7274,8 +7267,7 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", @@ -7286,8 +7278,7 @@ "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -7404,8 +7395,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -7417,7 +7407,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -7432,7 +7421,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -7440,14 +7428,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -7466,7 +7452,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -7547,8 +7532,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -7560,7 +7544,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -7646,8 +7629,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -7683,7 +7665,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -7703,7 +7684,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -7747,14 +7727,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, @@ -13289,8 +13267,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -13333,8 +13310,7 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", @@ -13345,8 +13321,7 @@ "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -13463,8 +13438,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -13476,7 +13450,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -13506,7 +13479,6 @@ "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -13525,7 +13497,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -13619,7 +13590,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -13705,8 +13675,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -13742,7 +13711,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -13762,7 +13730,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -13806,14 +13773,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, diff --git a/AddMe/src/app/camera/camera.page.html b/AddMe/src/app/camera/camera.page.html index 92aadb90..b5c8aca7 100644 --- a/AddMe/src/app/camera/camera.page.html +++ b/AddMe/src/app/camera/camera.page.html @@ -1,12 +1,11 @@ - - + + Camera - diff --git a/AddMe/src/app/camera/camera.page.scss b/AddMe/src/app/camera/camera.page.scss index e69de29b..dfdbaa89 100644 --- a/AddMe/src/app/camera/camera.page.scss +++ b/AddMe/src/app/camera/camera.page.scss @@ -0,0 +1,6 @@ +ion-content +{ + opacity:0; + width:100vw; + height:100vh; +} \ No newline at end of file diff --git a/AddMe/src/app/camera/camera.page.ts b/AddMe/src/app/camera/camera.page.ts index 50d2e50c..6f90c129 100644 --- a/AddMe/src/app/camera/camera.page.ts +++ b/AddMe/src/app/camera/camera.page.ts @@ -8,29 +8,33 @@ import { QRScanner, QRScannerStatus } from '@ionic-native/qr-scanner/ngx'; styleUrls: ['./camera.page.scss'], }) export class CameraPage implements OnInit { - - constructor(private router: Router, private qrScanner: QRScanner) { } + constructor(private router: Router, private qrScanCtrl: QRScanner) { } goToHome() { this.router.navigate(['home']); } + ngOnInit(){ + this.qrScanCtrl.prepare() + .then((status: QRScannerStatus) => { + if (status.authorized) { + // Open camera preview + this.qrScanCtrl.show(); + const scanSub = this.qrScanCtrl.scan().subscribe((text: string) => { + // At this point, a QR code was recognized and scanned + alert(`QR Code Scanned!: ${text}`) + // The QR data is stored in 'text'... - ngOnInit() { - this.qrScanner.prepare().then((state: QRScannerStatus) => { - if(state.authorized) { - alert("authorized"); - this.qrScanner.useBackCamera(); - - this.qrScanner.show(); - this.qrScanner.scan().subscribe(txt => { - alert(txt); - //this.qrScanner.hide(); + // Close QR scanner + this.qrScanCtrl.hide(); + this.qrScanCtrl.destroy(); + scanSub.unsubscribe() }); - } else if(state.denied) { - alert("denied"); - this.qrScanner.openSettings(); - } - }).catch((e: any) => alert('Error: '+e)); + } + else if (status.denied) { + alert('camera permission denied'); + this.qrScanCtrl.openSettings(); + } + }) + .catch((e: any) => {alert(e)}); } - } diff --git a/AddMe/src/app/contacts/contacts.page.html b/AddMe/src/app/contacts/contacts.page.html index 3d8888c1..af188a7f 100644 --- a/AddMe/src/app/contacts/contacts.page.html +++ b/AddMe/src/app/contacts/contacts.page.html @@ -8,17 +8,130 @@ - - - - - Home - - - - - Contacts - - - + + + + Allen + + + + Amaya Gaines + + + + Andrea + + + + + Anissa Blackman + + + + Araceli Cruz + + + + Brenda Jackson + + + + cece + + + + Candice Campbell + + + + Dad + + + + + Darleen Creech + + + + + Dianne glover + + + + Ebone Shines + + + + + + Lara + + + + Louise Siebo + + + + + Ming Minor + + + + + Mr.Hair + + + + Mrs.Pearl + + + + + + Zang Qiang + + + + + + + + + + + Home + + + + + Contacts + + + + + \ No newline at end of file diff --git a/AddMe/src/app/contacts/contacts.page.scss b/AddMe/src/app/contacts/contacts.page.scss index e69de29b..4b72baaa 100644 --- a/AddMe/src/app/contacts/contacts.page.scss +++ b/AddMe/src/app/contacts/contacts.page.scss @@ -0,0 +1,3 @@ +ion-icon { + padding-right: 10px; +} diff --git a/AddMe/src/app/firebase-backend.service.ts b/AddMe/src/app/firebase-backend.service.ts index bdc162ef..b3614824 100644 --- a/AddMe/src/app/firebase-backend.service.ts +++ b/AddMe/src/app/firebase-backend.service.ts @@ -32,10 +32,11 @@ export class FirebaseBackendService { }); } // Getting user data from firebase - async getUserData() { + async getUserData(): Promise { var userProfile: backend.user; await firebase.database().ref('Users/'+this.uid).once('value', function(snap) { - userProfile = snap.val(); + var val = snap.val(); + userProfile = new backend.user(val.uid, val.name, val.username, val.email, val.phoneNumber, val.DOB, val.photo, val.socials, val.contacts, val.qrCodes,); }); return userProfile; } diff --git a/AddMe/src/app/home/home.page.html b/AddMe/src/app/home/home.page.html index 4d24b517..cbff015a 100644 --- a/AddMe/src/app/home/home.page.html +++ b/AddMe/src/app/home/home.page.html @@ -1,13 +1,13 @@ - - + + - - - - - + + + + + Home @@ -16,66 +16,51 @@ - - - - - Home - - - - - Contacts - - - - - - - - - - - - - - - - - - - Instagram - - - - Facebook - - - - Twitter - - - - Snapchat - - - - - - - - + + {{profile.name}} + + - - + + - + - --> - - + + + Contacts + + + + + diff --git a/AddMe/src/app/home/home.page.scss b/AddMe/src/app/home/home.page.scss index c8e798ea..d6677c1e 100644 --- a/AddMe/src/app/home/home.page.scss +++ b/AddMe/src/app/home/home.page.scss @@ -1,3 +1,15 @@ .pad { padding-right: 10px; -} \ No newline at end of file +} +.user { + ion-img { + width: 40%; + max-width: 400px; + left: 50%; + transform: translateX(-50%); + position: relative + } + ion-text { + font-size: 200%; + } +} diff --git a/AddMe/src/app/home/home.page.ts b/AddMe/src/app/home/home.page.ts index 41cebb03..54a2143b 100644 --- a/AddMe/src/app/home/home.page.ts +++ b/AddMe/src/app/home/home.page.ts @@ -3,6 +3,8 @@ import { Router } from '@angular/router'; import { FirebaseBackendService } from '../firebase-backend.service'; import * as firebase from 'firebase'; import { ThrowStmt } from '@angular/compiler'; +import * as backend from '../backendClasses'; + @Component({ selector: 'app-home', templateUrl: 'home.page.html', @@ -10,6 +12,7 @@ import { ThrowStmt } from '@angular/compiler'; }) export class HomePage { private firebase: FirebaseBackendService; + private profile: backend.user = new backend.user(null,null,null,null,null,null,null,null,null,null); constructor(private router: Router) { firebase.auth().onAuthStateChanged(firebaseUser => { if(!firebaseUser) @@ -19,6 +22,9 @@ export class HomePage { else { this.firebase = new FirebaseBackendService(firebase.auth().currentUser.uid); + this.firebase.getUserData().then(dat => { + this.profile = dat; + }); } }); diff --git a/AddMe/src/app/login/login.page.html b/AddMe/src/app/login/login.page.html index 09038986..43b4336b 100644 --- a/AddMe/src/app/login/login.page.html +++ b/AddMe/src/app/login/login.page.html @@ -26,7 +26,7 @@ - + Login @@ -34,7 +34,7 @@ - + Login @@ -42,7 +42,7 @@ - + Login diff --git a/AddMe/src/app/qrcode/qrcode.page.html b/AddMe/src/app/qrcode/qrcode.page.html index 7b5f86f6..da96d0af 100644 --- a/AddMe/src/app/qrcode/qrcode.page.html +++ b/AddMe/src/app/qrcode/qrcode.page.html @@ -1,7 +1,7 @@ - - + + QRcode @@ -46,7 +46,7 @@ align-items:center; } -
+
{ + if(!firebaseUser) + { + this.router.navigate(['login']); + } + else + { + this.firebase = new FirebaseBackendService(firebase.auth().currentUser.uid); + this.firebase.getUserData().then(dat => { + this.profile = dat; + this.qrData = JSON.stringify(this.profile.getQrCodes); + console.log(this.qrData); + }); + } + }); + } goToHome(){ this.router.navigate(['home']); diff --git a/AddMe/src/app/settings/settings.page.html b/AddMe/src/app/settings/settings.page.html index 40d93bc5..f06274e3 100644 --- a/AddMe/src/app/settings/settings.page.html +++ b/AddMe/src/app/settings/settings.page.html @@ -1,15 +1,17 @@ - - - - Log Out + + + + + + Settings - + diff --git a/AddMe/src/app/signup/signup.page.html b/AddMe/src/app/signup/signup.page.html index 92f38cf1..8fe36a04 100644 --- a/AddMe/src/app/signup/signup.page.html +++ b/AddMe/src/app/signup/signup.page.html @@ -1,12 +1,11 @@ Sign Up - - - Log In + + - + @@ -107,7 +106,7 @@
- +