Admin young

.gitignore

@@ -21,6 +21,7 @@ npm-debug.log*
 coverage/
 dist/
 node_modules/
+src/environments
 tmp/
 temp/
 hooks/

config.xml

@@ -84,5 +84,5 @@
     <plugin name="cordova-plugin-statusbar" spec="^2.4.2" />
     <plugin name="cordova-plugin-ionic-keyboard" spec="^2.1.2" />
     <engine name="ios" spec="^4.5.5" />
-    <engine name="android" spec="7.0.0" />
+    <engine name="android" spec="7.1.4" />
 </widget>

package.json

@@ -17,43 +17,46 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/common": "7.1.3",
-    "@angular/core": "7.1.3",
-    "@angular/forms": "7.1.3",
+    "@angular/common": "~7.1.0",
+    "@angular/core": "~7.1.0",
+    "@angular/fire": "^5.1.1",
+    "@angular/forms": "~7.1.0",
     "@angular/http": "~7.1.0",
-    "@angular/platform-browser": "7.1.3",
-    "@angular/platform-browser-dynamic": "7.1.3",
+    "@angular/platform-browser": "7.1.0",
+    "@angular/platform-browser-dynamic": "7.1.0",
     "@angular/pwa": "0.11.0",
-    "@angular/router": "7.1.3",
+    "@angular/router": "7.1.0",
     "@angular/service-worker": "~7.1.0",
     "@ionic-native/core": "5.0.0-beta.15",
     "@ionic-native/in-app-browser": "5.0.0-beta.15",
     "@ionic-native/splash-screen": "5.0.0-beta.15",
     "@ionic-native/status-bar": "5.0.0-beta.15",
-    "@ionic/angular": "4.0.0-beta.19",
+    "@ionic/angular": "^4.0.0-beta.16",
     "@ionic/storage": "^2.1.3",
-    "cordova-android": "7.0.0",
+    "angularfire2": "^5.1.1",
+    "cordova-android": "7.1.4",
     "cordova-ios": "^4.5.5",
     "cordova-plugin-device": "^2.0.2",
     "cordova-plugin-inappbrowser": "^3.0.0",
-    "cordova-plugin-ionic-keyboard": "^2.1.2",
-    "cordova-plugin-ionic-webview": "^2.0.0",
+    "cordova-plugin-ionic-keyboard": "^2.1.3",
+    "cordova-plugin-ionic-webview": "^2.3.1",
     "cordova-plugin-splashscreen": "^5.0.2",
     "cordova-plugin-statusbar": "^2.4.2",
-    "cordova-plugin-whitelist": "^1.3.2",
+    "cordova-plugin-whitelist": "^1.3.3",
     "core-js": "^2.5.7",
+    "firebase": "^5.7.2",
     "rxjs": "6.3.3",
     "sw-toolbox": "3.6.0",
     "zone.js": "^0.8.26"
   },
   "devDependencies": {
     "@angular-devkit/architect": "0.11.0",
     "@angular-devkit/build-angular": "0.11.0",
-    "@angular-devkit/core": "7.1.2",
-    "@angular-devkit/schematics": "7.1.2",
+    "@angular-devkit/core": "7.1.0",
+    "@angular-devkit/schematics": "7.1.0",
     "@angular/cli": "7.1.0",
-    "@angular/compiler": "7.1.3",
-    "@angular/compiler-cli": "7.1.3",
+    "@angular/compiler": "7.1.0",
+    "@angular/compiler-cli": "7.1.0",
     "@angular/language-service": "~7.1.0",
     "@ionic/angular-toolkit": "1.2.0",
     "@ionic/lab": "^1.0.0",
@@ -85,7 +88,9 @@
       "cordova-plugin-inappbrowser": {},
       "cordova-plugin-splashscreen": {},
       "cordova-plugin-whitelist": {},
-      "cordova-plugin-ionic-webview": {},
+      "cordova-plugin-ionic-webview": {
+        "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
+      },
       "cordova-plugin-statusbar": {},
       "cordova-plugin-ionic-keyboard": {}
     }

src/app/app-routing.module.ts

@@ -1,6 +1,5 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { CheckTutorial } from './providers/check-tutorial.service';
 
 const routes: Routes = [
   {
@@ -30,9 +29,13 @@ const routes: Routes = [
   },
   {
     path: 'tutorial',
-    loadChildren: './pages/tutorial/tutorial.module#TutorialModule',
-    canLoad: [CheckTutorial]
-  }
+    loadChildren: './pages/tutorial/tutorial.module#TutorialModule'
+  },
+  {
+    path: 'setup',
+    loadChildren: './setup/tabs-setup/tabs-setup.module#TabsSetupPageModule'
+  },
+  { path: 'session-edit', loadChildren: './setup/sessions/session-edit/session-edit.module#SessionEditPageModule' },
 ];
 
 @NgModule({

src/app/app.component.html

@@ -14,7 +14,7 @@
             Navigate
           </ion-list-header>
           <ion-menu-toggle auto-hide="false" *ngFor="let p of appPages; let i = index">
-            <ion-item [routerLink]="p.url">
+            <ion-item button (click)="navigate(p.url)" [disabled]="!loggedIn">
               <ion-icon slot="start" [name]="p.icon"></ion-icon>
               <ion-label>
                 {{p.title}}
@@ -73,7 +73,7 @@
           </ion-menu-toggle>
 
           <ion-menu-toggle auto-hide="false">
-            <ion-item routerLink="/support">
+            <ion-item button (click)="navigate('/support')" [disabled]='true'>
               <ion-icon slot="start" name="help"></ion-icon>
               <ion-label>
                 Support
@@ -91,7 +91,19 @@
           </ion-menu-toggle>
         </ion-list>
 
-        <ion-list>
+        <ion-list *ngIf="keyword === 'admin'">
+            <ion-list-header>
+              Configuration
+            </ion-list-header>
+            <ion-menu-toggle auto-hide="false">
+              <ion-item button (click)="onSetup()">
+                <ion-icon slot="start" name="hammer"></ion-icon>
+                <ion-label>Set Up</ion-label>
+              </ion-item>
+            </ion-menu-toggle>
+          </ion-list>
+
+        <ion-list *ngIf="keyword !== 'admin'">
           <ion-list-header>
             Tutorial
           </ion-list-header>

src/app/app.component.ts

@@ -17,26 +17,27 @@ export class AppComponent implements OnInit {
   appPages = [
     {
       title: 'Schedule',
-      url: '/app/tabs/schedule',
+      url: '/app/tabs/(schedule:schedule)',
       icon: 'calendar'
     },
     {
       title: 'Speakers',
-      url: '/app/tabs/speakers',
+      url: '/app/tabs/(speakers:speakers)',
       icon: 'contacts'
     },
     {
       title: 'Map',
-      url: '/app/tabs/map',
+      url: '/app/tabs/(map:map)',
       icon: 'map'
     },
     {
       title: 'About',
-      url: '/app/tabs/about',
+      url: '/app/tabs/(about:about)',
       icon: 'information-circle'
     }
   ];
   loggedIn = false;
+  keyword = '';
 
   constructor(
     private events: Events,
@@ -52,7 +53,9 @@ export class AppComponent implements OnInit {
   }
 
   ngOnInit() {
-    this.checkLoginStatus();
+    this.userData.isLoggedIn().then(loggedIn => {
+      this.updateLoggedInStatus(loggedIn);
+    });
     this.listenForLoginEvents();
   }
 
@@ -63,15 +66,12 @@ export class AppComponent implements OnInit {
     });
   }
 
-  checkLoginStatus() {
-    return this.userData.isLoggedIn().then(loggedIn => {
-      return this.updateLoggedInStatus(loggedIn);
-    });
-  }
-
   updateLoggedInStatus(loggedIn: boolean) {
     setTimeout(() => {
       this.loggedIn = loggedIn;
+      this.userData.getUser().then(user => {
+        this.keyword = user ? user.username : '' ;
+      });
     }, 300);
   }
 
@@ -89,15 +89,23 @@ export class AppComponent implements OnInit {
     });
   }
 
+  navigate(url: string) {
+    return this.router.navigateByUrl(url);
+  }
+
   logout() {
     this.userData.logout().then(() => {
-      return this.router.navigateByUrl('/app/tabs/schedule');
+      return this.openTutorial();
     });
   }
 
+  onSetup() {
+    this.router.navigateByUrl('/setup/tabs/(sessions:sessions)');
+  }
+
   openTutorial() {
     this.menu.enable(false);
-    this.storage.set('ion_did_tutorial', false);
+    this.storage.set('ion_did_tutorial', 'false');
     this.router.navigateByUrl('/tutorial');
   }
 }

src/app/app.module.ts

@@ -7,10 +7,14 @@ import { StatusBar } from '@ionic-native/status-bar/ngx';
 import { IonicModule } from '@ionic/angular';
 import { IonicStorageModule } from '@ionic/storage';
 
+import { environment } from '../environments/environment';
+import { AngularFireModule } from 'angularfire2';
+import { AngularFirestoreModule } from 'angularfire2/firestore';
+import { AngularFireStorageModule } from 'angularfire2/storage';
+import { AngularFireAuthModule } from 'angularfire2/auth';
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { ServiceWorkerModule } from '@angular/service-worker';
-import { environment } from '../environments/environment';
 
 @NgModule({
   imports: [
@@ -21,10 +25,14 @@ import { environment } from '../environments/environment';
     IonicStorageModule.forRoot(),
     ServiceWorkerModule.register('ngsw-worker.js', {
       enabled: environment.production
-    })
+    }),
+    AngularFireModule.initializeApp(environment.firebase, 'ionic-conference'),
+    AngularFireAuthModule,
+    AngularFirestoreModule,
+    AngularFireStorageModule
   ],
   declarations: [AppComponent],
   providers: [InAppBrowser, SplashScreen, StatusBar],
-  bootstrap: [AppComponent]
+  bootstrap: [AppComponent],
 })
 export class AppModule {}

src/app/directive/drop-zone.directive.ts

@@ -0,0 +1,31 @@
+import { Directive, HostListener, Output, EventEmitter } from '@angular/core';
+
+@Directive({
+  selector: '[appDropZone]'
+})
+export class DropZoneDirective {
+
+  @Output() dropped =  new EventEmitter<FileList>();
+  @Output() hovered =  new EventEmitter<boolean>();
+
+  constructor() { }
+
+  @HostListener('drop', ['$event'])
+  onDrop($event) {
+    $event.preventDefault();
+    this.dropped.emit($event.dataTransfer.files);
+    this.hovered.emit(false);
+  }
+
+  @HostListener('dragover', ['$event'])
+  onDragOver($event) {
+    $event.preventDefault();
+    this.hovered.emit(true);
+  }
+
+  @HostListener('dragleave', ['$event'])
+  onDragLeave($event) {
+    $event.preventDefault();
+    this.hovered.emit(false);
+  }
+}

src/app/directive/dropzone.directive.ts

@@ -0,0 +1,31 @@
+import { Directive, HostListener, Output, EventEmitter } from '@angular/core';
+
+@Directive({
+  selector: '[appDropzone]'
+})
+export class DropzoneDirective {
+
+  @Output() dropped =  new EventEmitter<FileList>();
+  @Output() hovered =  new EventEmitter<boolean>();
+
+  constructor() { }
+
+  @HostListener('drop', ['$event'])
+  onDrop($event) {
+    $event.preventDefault();
+    this.dropped.emit($event.dataTransfer.files);
+    this.hovered.emit(false);
+  }
+
+  @HostListener('dragover', ['$event'])
+  onDragOver($event) {
+    $event.preventDefault();
+    this.hovered.emit(true);
+  }
+
+  @HostListener('dragleave', ['$event'])
+  onDragLeave($event) {
+    $event.preventDefault();
+    this.hovered.emit(false);
+  }
+}