Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@
<variable name="TWITTER_KEY" value="RpWT5YZYdFYjPSzI8wB5O4kwP" />
<variable name="TWITTER_SECRET" value="yILFMxwPl7zK4qKuQMqqmAZ9bQbJGKbOt8gygvOPweYRamoSoq" />
</plugin>
<plugin name="cordova-plugin-firebase-analytics" spec="^1.0.1">
<variable name="FIREBASE_CORE_VERSION" value="16.0.+" />
</plugin>
<engine name="android" spec="7.0.0" />
<engine name="ios" spec="4.5.5" />
</widget>
10 changes: 8 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"@ionic-native/core": "4.8.0",
"@ionic-native/deeplinks": "^4.12.2",
"@ionic-native/facebook": "^4.11.0",
"@ionic-native/firebase-analytics": "^4.16.0",
"@ionic-native/google-plus": "^4.11.0",
"@ionic-native/in-app-browser": "^4.11.0",
"@ionic-native/safari-view-controller": "^4.12.2",
Expand All @@ -58,13 +59,16 @@
"cordova-ios": "4.5.5",
"cordova-plugin-device": "2.0.2",
"cordova-plugin-facebook4": "~2.2.0",
"cordova-plugin-firebase-analytics": "^1.0.1",
"cordova-plugin-googleplus": "^5.3.0",
"cordova-plugin-inappbrowser": "^3.0.0",
"cordova-plugin-ionic-keyboard": "2.0.5",
"cordova-plugin-ionic-webview": "1.1.19",
"cordova-plugin-screen-orientation": "^3.0.1",
"cordova-plugin-splashscreen": "5.0.2",
"cordova-plugin-whitelist": "1.3.3",
"cordova-support-android-plugin": "^1.0.1",
"cordova-support-google-services": "^1.2.1",
"core-js": "2.5.3",
"es6-promise-plugin": "^4.2.2",
"firebase": "4.12.1",
Expand Down Expand Up @@ -131,8 +135,7 @@
},
"cordova": {
"platforms": [
"android",
"ios"
"android"
],
"plugins": {
"cordova-plugin-googleplus": {
Expand Down Expand Up @@ -162,6 +165,9 @@
"ionic-plugin-deeplinks": {
"URL_SCHEME": "juntoscope",
"DEEPLINK_HOST": "juntoscope.com"
},
"cordova-plugin-firebase-analytics": {
"FIREBASE_CORE_VERSION": "16.0.+"
}
}
}
Expand Down
Binary file modified resources/ios/icon/icon-1024.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/icon/icon-40.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/icon/icon-40@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/icon/icon-40@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/icon/icon-50.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/icon/icon-50@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/icon/icon-60.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/icon/icon-60@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/icon/icon-60@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/icon/icon-72.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/icon/icon-72@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/icon/icon-76.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/icon/icon-76@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/icon/icon-83.5@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/icon/icon-small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/icon/icon-small@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/icon/icon-small@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/icon/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/icon/icon@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/splash/Default-568h@2x~iphone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/splash/Default-667h.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/splash/Default-736h.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/splash/Default-Landscape-736h.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/splash/Default-Landscape@2x~ipad.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/splash/Default-Landscape@~ipadpro.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/splash/Default-Landscape~ipad.png
Binary file modified resources/ios/splash/Default-Portrait@2x~ipad.png
Binary file modified resources/ios/splash/Default-Portrait@~ipadpro.png
Binary file modified resources/ios/splash/Default-Portrait~ipad.png
Binary file modified resources/ios/splash/Default@2x~iphone.png
Binary file modified resources/ios/splash/Default@2x~universal~anyany.png
Binary file modified resources/ios/splash/Default~iphone.png
2 changes: 2 additions & 0 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import { ConnectionsModule } from "../features/connections/connections.module";
import { ScopingModule } from "../features/scoping/scoping.module";
import { SettingsModule } from "../features/settings/settings.module";
import { Deeplinks } from "@ionic-native/deeplinks";
import { FirebaseAnalytics } from "@ionic-native/firebase-analytics";

@NgModule({
declarations: [JuntoScopeComponent, NotFoundComponent],
Expand Down Expand Up @@ -72,6 +73,7 @@ import { Deeplinks } from "@ionic-native/deeplinks";
InAppBrowser,
SafariViewController,
Deeplinks,
FirebaseAnalytics,
{ provide: ErrorHandler, useClass: IonicErrorHandler }
]
})
Expand Down
5 changes: 4 additions & 1 deletion src/features/authentication/pages/login/login.component.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Component, OnInit, OnDestroy } from "@angular/core";
import { IonicPage, NavController, NavParams } from "ionic-angular";
import { FirebaseAnalytics } from "@ionic-native/firebase-analytics";

import { FormGroup, FormBuilder, Validators } from "@angular/forms";

Expand Down Expand Up @@ -38,7 +39,8 @@ export class LoginPage implements OnInit, OnDestroy {
private actions$: Actions,
private popupSvc: PopupService,
private loadingSrv: LoadingService,
private iab: InAppBrowser
private iab: InAppBrowser,
private firebaseAnalytics: FirebaseAnalytics
) {
this.redirectSubs = this.actions$
.ofType(AuthActionTypes.AUTHENTICATED)
Expand Down Expand Up @@ -67,6 +69,7 @@ export class LoginPage implements OnInit, OnDestroy {
}

ngOnInit() {
this.firebaseAnalytics.logEvent("page_view", { page: "LoginPage" });
this.createForm();
// this.loadingSrv.initialize();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { PopupService } from "../../../../shared/popup.service";
import { ConnectionFacade } from "../../store/connection.facade";
import { LoadingService } from "../../../../shared/loading.service";
import { SafariViewController } from "@ionic-native/safari-view-controller";
import { FirebaseAnalytics } from "@ionic-native/firebase-analytics";

@IonicPage({
segment: "AddConnectionPage",
Expand All @@ -32,7 +33,8 @@ export class AddConnectionPage implements OnInit {
private actions$: Actions,
private popupSvc: PopupService,
private loadingSvc: LoadingService,
private svc: SafariViewController
private svc: SafariViewController,
private firebaseAnalytics: FirebaseAnalytics
) {
this.redirectSubs = this.actions$
.ofType(ConnectionActionTypes.ADD_SUCCESS)
Expand All @@ -51,7 +53,9 @@ export class AddConnectionPage implements OnInit {
});
}

ngOnInit() {}
ngOnInit() {
this.firebaseAnalytics.logEvent("page_view", { page: "AddConnectionPage" });
}

ngOnDestroy() {
this.errorSubscription.unsubscribe();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { TakeUntilDestroy } from "ngx-take-until-destroy";
import { Connection } from "../../../../models/connection";
import { ConnectionFacade } from "../../store/connection.facade";
import { PopupService } from "../../../../shared/popup.service";
import { FirebaseAnalytics } from "@ionic-native/firebase-analytics";

@TakeUntilDestroy()
@IonicPage({
Expand All @@ -26,10 +27,14 @@ export class ConnectionDetailsPage implements OnInit, OnDestroy {
private connectionFacade: ConnectionFacade,
private navParams: NavParams,
private navCtrl: NavController,
private popupSvc: PopupService
private popupSvc: PopupService,
private firebaseAnalytics: FirebaseAnalytics
) {}

ngOnInit() {
this.firebaseAnalytics.logEvent("page_view", {
page: "ConnectionDetailsPage"
});
this.connectionFacade.getConnections();

this.connectionSub = this.connectionFacade.connections$.subscribe(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { ConnectionFacade } from "../../store/connection.facade";
import { Project } from "../../../../models/project";
import { Connection } from "../../../../models/connection";
import { NavController, NavParams, IonicPage } from "ionic-angular";
import { FirebaseAnalytics } from "@ionic-native/firebase-analytics";

@IonicPage({
segment: "SelectProjectPage",
Expand Down Expand Up @@ -36,10 +37,12 @@ export class SelectProjectPage implements OnInit {
constructor(
private connectionFacade: ConnectionFacade,
private navCtrl: NavController,
private navParams: NavParams
private navParams: NavParams,
private firebaseAnalytics: FirebaseAnalytics
) {}

ngOnInit(): void {
this.firebaseAnalytics.logEvent("page_view", { page: "SelectProjectPage" });
this.connectionId = this.navParams.get("connectionId");
console.log("Connection id: ", this.connectionId);
this.connectionFacade.selectConnection(this.connectionId);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { TaskList } from "../../../../models/task-list";
import { Connection } from "../../../../models/connection";
import { NavParams, IonicPage } from "ionic-angular";
import { LoadingService } from "../../../../shared/loading.service";
import { FirebaseAnalytics } from "@ionic-native/firebase-analytics";

@IonicPage({
segment: "SelectTaskListPage",
Expand Down Expand Up @@ -43,10 +44,14 @@ export class SelectTaskListPage implements OnInit {
constructor(
private connectionFacade: ConnectionFacade,
private loadingSrv: LoadingService,
private navParams: NavParams
private navParams: NavParams,
private firebaseAnalytics: FirebaseAnalytics
) {}

ngOnInit(): void {
this.firebaseAnalytics.logEvent("page_view", {
page: "SelectTaskListPage"
});
this.connectionId = this.navParams.get("connectionId");
this.projectId = this.navParams.get("projectId");
this.projectName = this.navParams.get("projectName");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { PopupService } from "../../../../shared/popup.service";
import { SessionDetailModalComponent } from "../../components/session-detail-modal/session-detail-modal.component";
import { DashboardUiState } from "../../store/dashboard.reducer";
import { ScopingFacade } from "../../../scoping/store/scoping.facade";
import { FirebaseAnalytics } from "@ionic-native/firebase-analytics";

@TakeUntilDestroy()
@IonicPage({
Expand Down Expand Up @@ -49,10 +50,12 @@ export class DashboardPage implements OnInit, OnDestroy {
private connectionFacade: ConnectionFacade,
private navCtrl: NavController,
private scopingFacade: ScopingFacade,
private viewCtrl: ViewController
private viewCtrl: ViewController,
private firebaseAnalytics: FirebaseAnalytics
) {}

ngOnInit() {
this.firebaseAnalytics.logEvent("page_view", { page: "DashboardPage" });
this.dashboardFacade.getHistory();
this.connectionFacade.getConnections();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { Component } from "@angular/core";
import { Component, OnInit } from "@angular/core";
import { ScopingFacade } from "../../store/scoping.facade";
import { NavController, IonicPage } from "ionic-angular";
import { ScopingSession } from "../../../../models/scoping-session";
import { Subscription } from "rxjs";
import { FirebaseAnalytics } from "@ionic-native/firebase-analytics";

@IonicPage({
segment: "SessionResultsPage",
Expand All @@ -12,20 +13,27 @@ import { Subscription } from "rxjs";
selector: "app-session-results",
templateUrl: "./session-results.component.html"
})
export class SessionResultsPage {
export class SessionResultsPage implements OnInit {
session: ScopingSession;
sessionCode: string;
sessionSub: Subscription;

constructor(
private scopingFacade: ScopingFacade,
private navCtrl: NavController
private navCtrl: NavController,
private firebaseAnalytics: FirebaseAnalytics
) {
this.sessionSub = this.scopingFacade.session$.subscribe(session => {
this.session = session;
});
}

ngOnInit() {
this.firebaseAnalytics.logEvent("page_view", {
page: "SessionResultsPage"
});
}

ionViewWillLeave() {
if (this.sessionSub) {
this.sessionSub.unsubscribe();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import {
import { Subject, Subscription } from "rxjs";
import { HistoryService } from "../../../dashboard/services/history.service";
import { OnDestroy } from "../../../../../node_modules/ngx-take-until-destroy";
import { FirebaseAnalytics } from "@ionic-native/firebase-analytics";

@IonicPage({
segment: "SessionScopingPage",
Expand Down Expand Up @@ -73,10 +74,14 @@ export class SessionScopingPage implements OnInit, OnDestroy {
private scopingFacade: ScopingFacade,
private navParams: NavParams,
private navCtrl: NavController,
private historySvc: HistoryService
private historySvc: HistoryService,
private firebaseAnalytics: FirebaseAnalytics
) {}

ngOnInit() {
this.firebaseAnalytics.logEvent("page_view", {
page: "SessionScopingPage"
});
this.user$ = this.store.pipe(select(AuthQuery.selectUser));
this.user$.subscribe(user => {
this.user = user;
Expand Down
5 changes: 4 additions & 1 deletion src/features/settings/pages/settings/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { ConnectionFacade } from "../../../connections/store/connection.facade";
import { LoginPage } from "../../../authentication/pages/login/login.component";
import { Subscription } from "rxjs";
import { SettingsService } from "../../service/settings.service";
import { FirebaseAnalytics } from "@ionic-native/firebase-analytics";

@TakeUntilDestroy()
@IonicPage({
Expand All @@ -33,14 +34,16 @@ export class SettingsPage implements OnInit, OnDestroy {
private navCtrl: NavController,
private connectionFacade: ConnectionFacade,
private authFacade: AuthFacade,
private settingsSvc: SettingsService
private settingsSvc: SettingsService,
private firebaseAnalytics: FirebaseAnalytics
) {}

ngOnDestroy() {
this.unsub();
}

ngOnInit() {
this.firebaseAnalytics.logEvent("page_view", { page: "SettingsPage" });
this.connectionFacade.getConnections();
this.faqsSub = this.settingsSvc.getFaqs().subscribe(faqs => {
if (faqs) {
Expand Down