diff --git a/android/app/build.gradle b/android/app/build.gradle index 363f85da..92fc4b88 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -6,7 +6,7 @@ android { applicationId "com.ifgi.geogami" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion 31 - versionCode 13 + versionCode 14 versionName "1.0.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 25393d7b..518b2ab8 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -15,7 +15,8 @@ android:name="com.ifgi.geogami.MainActivity" android:label="@string/title_activity_main" android:theme="@style/AppTheme.NoActionBarLaunch" - android:launchMode="singleTask"> + android:launchMode="singleTask" + android:exported="true"> diff --git a/android/app/src/main/assets/capacitor.config.json b/android/app/src/main/assets/capacitor.config.json index cca87d56..a9ffb5b6 100644 --- a/android/app/src/main/assets/capacitor.config.json +++ b/android/app/src/main/assets/capacitor.config.json @@ -4,9 +4,9 @@ "bundledWebRuntime": false, "npmClient": "yarn", "webDir": "www", + "hideLogs": true, "server": { "iosScheme": "https", "androidScheme": "https" - }, - "hideLogs": true + } } \ No newline at end of file diff --git a/android/app/src/main/res/drawable-land-hdpi/splash.png b/android/app/src/main/res/drawable-land-hdpi/splash.png index e31573b4..40568945 100644 Binary files a/android/app/src/main/res/drawable-land-hdpi/splash.png and b/android/app/src/main/res/drawable-land-hdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-land-mdpi/splash.png b/android/app/src/main/res/drawable-land-mdpi/splash.png index f7a64923..bff5113b 100644 Binary files a/android/app/src/main/res/drawable-land-mdpi/splash.png and b/android/app/src/main/res/drawable-land-mdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-land-xhdpi/splash.png b/android/app/src/main/res/drawable-land-xhdpi/splash.png index 80772550..add9b8fa 100644 Binary files a/android/app/src/main/res/drawable-land-xhdpi/splash.png and b/android/app/src/main/res/drawable-land-xhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-land-xxhdpi/splash.png b/android/app/src/main/res/drawable-land-xxhdpi/splash.png index 14c6c8fe..9eee13d3 100644 Binary files a/android/app/src/main/res/drawable-land-xxhdpi/splash.png and b/android/app/src/main/res/drawable-land-xxhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-land-xxxhdpi/splash.png b/android/app/src/main/res/drawable-land-xxxhdpi/splash.png index 244ca250..6cf7171c 100644 Binary files a/android/app/src/main/res/drawable-land-xxxhdpi/splash.png and b/android/app/src/main/res/drawable-land-xxxhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-port-hdpi/splash.png b/android/app/src/main/res/drawable-port-hdpi/splash.png index 74faaa58..89442191 100644 Binary files a/android/app/src/main/res/drawable-port-hdpi/splash.png and b/android/app/src/main/res/drawable-port-hdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-port-mdpi/splash.png b/android/app/src/main/res/drawable-port-mdpi/splash.png index e944f4ad..24737dea 100644 Binary files a/android/app/src/main/res/drawable-port-mdpi/splash.png and b/android/app/src/main/res/drawable-port-mdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-port-xhdpi/splash.png b/android/app/src/main/res/drawable-port-xhdpi/splash.png index 564a82ff..5515a0d6 100644 Binary files a/android/app/src/main/res/drawable-port-xhdpi/splash.png and b/android/app/src/main/res/drawable-port-xhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-port-xxhdpi/splash.png b/android/app/src/main/res/drawable-port-xxhdpi/splash.png index bfabe687..c9fcf0e1 100644 Binary files a/android/app/src/main/res/drawable-port-xxhdpi/splash.png and b/android/app/src/main/res/drawable-port-xxhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-port-xxxhdpi/splash.png b/android/app/src/main/res/drawable-port-xxxhdpi/splash.png index 69290712..d42bbf1b 100644 Binary files a/android/app/src/main/res/drawable-port-xxxhdpi/splash.png and b/android/app/src/main/res/drawable-port-xxxhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable/launch_splash.xml b/android/app/src/main/res/drawable/launch_splash.xml new file mode 100644 index 00000000..468688ef --- /dev/null +++ b/android/app/src/main/res/drawable/launch_splash.xml @@ -0,0 +1,5 @@ + + \ No newline at end of file diff --git a/android/app/src/main/res/drawable/splash.png b/android/app/src/main/res/drawable/splash.png index f7a64923..bff5113b 100644 Binary files a/android/app/src/main/res/drawable/splash.png and b/android/app/src/main/res/drawable/splash.png differ diff --git a/android/app/src/main/res/ic_launcher-web.png b/android/app/src/main/res/ic_launcher-web.png new file mode 100644 index 00000000..712d0bd5 Binary files /dev/null and b/android/app/src/main/res/ic_launcher-web.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index c023e505..cfa5502f 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png index 2127973b..d0f3bc51 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index b441f37d..7e66f874 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-ldpi/ic_launcher.png b/android/app/src/main/res/mipmap-ldpi/ic_launcher.png new file mode 100644 index 00000000..fc5ba290 Binary files /dev/null and b/android/app/src/main/res/mipmap-ldpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 72905b85..518ed986 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png index 8ed0605c..03b6dd1a 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index 9502e47a..21de94bc 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 4d1e0771..f0ed6e83 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png index df0f1588..d2d3d5eb 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index 853db043..b58827d9 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 6cdf97c1..6cc7cee6 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png index 2960cbb6..b29bd8e7 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index 8e3093a8..83f42d0e 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 46de6e25..f4895c3f 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png index d2ea9abe..faf946b6 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index a40d73e9..d84c72da 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/playstore-icon.png b/android/app/src/main/res/playstore-icon.png new file mode 100644 index 00000000..af2844ff Binary files /dev/null and b/android/app/src/main/res/playstore-icon.png differ diff --git a/android/app/src/main/res/values/ic_launcher_background.xml b/android/app/src/main/res/values/ic_launcher_background.xml index c5d5899f..ab983282 100644 --- a/android/app/src/main/res/values/ic_launcher_background.xml +++ b/android/app/src/main/res/values/ic_launcher_background.xml @@ -1,4 +1,4 @@ - #FFFFFF + #ffffff \ No newline at end of file diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 8494ef63..1fbbb9b1 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -3,5 +3,6 @@ GeoGami GeoGami com.ifgi.geogami + com.ifgi.geogami.fileprovider com.ifgi.geogami diff --git a/android/app/src/main/res/xml/file_paths.xml b/android/app/src/main/res/xml/file_paths.xml index bd0c4d80..fdc62711 100644 --- a/android/app/src/main/res/xml/file_paths.xml +++ b/android/app/src/main/res/xml/file_paths.xml @@ -1,5 +1,4 @@ - \ No newline at end of file diff --git a/capacitor.config.json b/capacitor.config.json index cca87d56..a9ffb5b6 100644 --- a/capacitor.config.json +++ b/capacitor.config.json @@ -4,9 +4,9 @@ "bundledWebRuntime": false, "npmClient": "yarn", "webDir": "www", + "hideLogs": true, "server": { "iosScheme": "https", "androidScheme": "https" - }, - "hideLogs": true + } } \ No newline at end of file diff --git a/electron/capacitor.config.json b/electron/capacitor.config.json index cca87d56..a9ffb5b6 100644 --- a/electron/capacitor.config.json +++ b/electron/capacitor.config.json @@ -4,9 +4,9 @@ "bundledWebRuntime": false, "npmClient": "yarn", "webDir": "www", + "hideLogs": true, "server": { "iosScheme": "https", "androidScheme": "https" - }, - "hideLogs": true + } } \ No newline at end of file diff --git a/ios/App/App/capacitor.config.json b/ios/App/App/capacitor.config.json index cca87d56..a9ffb5b6 100644 --- a/ios/App/App/capacitor.config.json +++ b/ios/App/App/capacitor.config.json @@ -4,9 +4,9 @@ "bundledWebRuntime": false, "npmClient": "yarn", "webDir": "www", + "hideLogs": true, "server": { "iosScheme": "https", "androidScheme": "https" - }, - "hideLogs": true + } } \ No newline at end of file diff --git a/scripts/fixcordova7issue.js.js b/scripts/fixcordova7issue.js.js index 5b3d0461..41647d2b 100644 --- a/scripts/fixcordova7issue.js.js +++ b/scripts/fixcordova7issue.js.js @@ -5,7 +5,7 @@ module.exports = function (ctx) { - console.log("Attempting To Modify serve-config.js....") + // console.log("Attempting To Modify serve-config.js....") // Reference Dependencies var fs = ctx.requireCordovaModule('fs'), @@ -20,7 +20,7 @@ module.exports = function (ctx) { fs.stat(filePath, function (error, stat) { if (error) { - console.log(error); + // console.log(error); return; } @@ -42,7 +42,7 @@ module.exports = function (ctx) { // Loop Through The Lines and Modify the Line/Item if it contains The sourceFileString for (var i = dataArray.length - 1; i >= 0; i--) { if (dataArray[i].indexOf(sourceFileString) !== -1) { - console.log('Modifying line:' + dataArray[i]); + // console.log('Modifying line:' + dataArray[i]); dataArray[i] = targetFileString; fileModifiedSuccessfully = true; } @@ -50,7 +50,7 @@ module.exports = function (ctx) { // If Nothing Was Found/Removed/Spliced, No Need To Overwrite. if (!fileModifiedSuccessfully) { - console.log("No Changes to File: " + filePath); + // console.log("No Changes to File: " + filePath); return; } diff --git a/src/app/app.component.ts b/src/app/app.component.ts index c52e6e40..843fcf35 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -50,14 +50,14 @@ export class AppComponent { checkInternetConnection() { // watch network for a disconnection let disconnectSubscription = this.network.onDisconnect().subscribe(async () => { - //console.log('network was disconnected :-('); + //// console.log('network was disconnected :-('); this.utilService.setIsOnlineValue(false); // set behaviour sub. false this.networkAlert = await this.utilService.showToastBtn("No connection", 'dark', null) // show toast this.networkAlert.present(); }); let connectSubscription = this.network.onConnect().subscribe(() => { - //console.log('network connected!'); + //// console.log('network connected!'); this.utilService.setIsOnlineValue(true); // set behaviour sub. true this.utilService.showToast("Back online", 'success', 3000) // show toast // Remove notification when connection get back diff --git a/src/app/components/feedback/feedback.component.ts b/src/app/components/feedback/feedback.component.ts index 924732d5..2bfe6aa3 100644 --- a/src/app/components/feedback/feedback.component.ts +++ b/src/app/components/feedback/feedback.component.ts @@ -374,7 +374,7 @@ export class FeedbackComponent { } if (this.task.answer.type == AnswerType.DIRECTION) { - // console.log(this.Math.abs(directionBearing - compassHeading)); + // // console.log(this.Math.abs(directionBearing - compassHeading)); this.initFeedback( this.Math.abs(directionBearing - compassHeading) <= this.DIRECTION_TRESHOLD, @@ -525,7 +525,7 @@ export class FeedbackComponent { ) { const bounds = new mapboxgl.LngLatBounds(); bounds.extend(options.clickPosition); - // console.log(this.lastKnownPosition.coords); + // // console.log(this.lastKnownPosition.coords); bounds.extend([ this.lastKnownPosition.coords.longitude, this.lastKnownPosition.coords.latitude, @@ -677,7 +677,7 @@ export class FeedbackComponent { } public showHint(options: any = undefined) { - // console.log(options); + // // console.log(options); if (this.task.answer.type == AnswerType.POSITION) { const waypoint = this.task.answer.position.geometry.coordinates; const distance = this.helperService.getDistanceFromLatLonInM( @@ -718,7 +718,7 @@ export class FeedbackComponent { this.task.type != "theme-loc" ) { const center = centroid(this.task.question.geometry.features[0]); - // console.log(center); + // // console.log(center); const waypoint = options.clickPosition; const distance = this.helperService.getDistanceFromLatLonInM( waypoint[1], @@ -742,7 +742,7 @@ export class FeedbackComponent { } const absClckDir = this.Math.abs(options.clickDirection - evalDirection) - // console.log(absClckDir); + // // console.log(absClckDir); this.feedback.hint = "" @@ -754,7 +754,7 @@ export class FeedbackComponent { this.feedback.hint = this.task.answer?.hints?.[2] ?? this.translate.instant("Feedback.directionWrongHint"); } - // console.log(this.feedback.hint); + // // console.log(this.feedback.hint); this.changeDetectorRef.detectChanges(); } diff --git a/src/app/components/popup/popup.component.ts b/src/app/components/popup/popup.component.ts index ccb24535..6f348838 100644 --- a/src/app/components/popup/popup.component.ts +++ b/src/app/components/popup/popup.component.ts @@ -17,11 +17,11 @@ export class PopupComponent implements OnInit { constructor(public navCtrl: NavController) { } ngOnInit(): void { - //console.log("gameName: ", this.gameName) + //// console.log("gameName: ", this.gameName) } playGame(){ - // console.log("play pressed: ", this.gameName) + // // console.log("play pressed: ", this.gameName) this.navCtrl.navigateForward(`play-game/game-detail/${this.gameID}`); } diff --git a/src/app/mapControllers/layer-control.ts b/src/app/mapControllers/layer-control.ts index e2aa94ca..1b258674 100644 --- a/src/app/mapControllers/layer-control.ts +++ b/src/app/mapControllers/layer-control.ts @@ -114,7 +114,7 @@ export class LayerControl { try { this.map.removeControl(this.styleSwitcherControl); } catch (e) { - console.log(e); + // console.log(e); } if (this.compare != null) { this.compare.remove(); diff --git a/src/app/mapControllers/track-control.ts b/src/app/mapControllers/track-control.ts index 4845c2fd..55fd5e1a 100644 --- a/src/app/mapControllers/track-control.ts +++ b/src/app/mapControllers/track-control.ts @@ -108,7 +108,7 @@ export class TrackControl { // keep track permanent impl. addPermanentTrack(taskId, path = this.path){ - // console.log("(track) P index:", taskId,"path: ",path) + // // console.log("(track) P index:", taskId,"path: ",path) this.map.addSource(`permanentTrack${taskId}`, { type: 'geojson', data: path }); this.map.addLayer({ id: `permanentTrack${taskId}`, @@ -127,7 +127,7 @@ export class TrackControl { // keep track temporary impl. addTemporaryTrack(taskId, path = this.path){ - // console.log("(track) T index:", taskId,"path: ",path) + // // console.log("(track) T index:", taskId,"path: ",path) this.map.addSource(`temporaryTrack${taskId}`, { type: 'geojson', data: path }); this.map.addLayer({ id: `temporaryTrack${taskId}`, @@ -147,7 +147,7 @@ export class TrackControl { // remove track temporary impl. removeTemporaryTrack(taskId){ if (this.map.getLayer(`temporaryTrack${taskId}`)) { - // console.log('removeTemporaryTrack/////(track): ', taskId) + // // console.log('removeTemporaryTrack/////(track): ', taskId) this.map.removeLayer(`temporaryTrack${taskId}`); } } diff --git a/src/app/pages/analyze-game/analyze-game-list/analyze-game-list.page.ts b/src/app/pages/analyze-game/analyze-game-list/analyze-game-list.page.ts index 2ab829da..c27087b1 100644 --- a/src/app/pages/analyze-game/analyze-game-list/analyze-game-list.page.ts +++ b/src/app/pages/analyze-game/analyze-game-list/analyze-game-list.page.ts @@ -48,7 +48,7 @@ export class AnalyzeGameListPage implements OnInit { directory: FilesystemDirectory.Documents, encoding: FilesystemEncoding.UTF8 }); - console.log(contents); + // console.log(contents); this.http.post(`${environment.apiURL}/track`, JSON.parse(contents.data), { observe: 'response' }) .subscribe(response => alert(response.status + ' ' + response.statusText)); diff --git a/src/app/pages/create-game/create-free-task-modal/create-free-task-modal.component.ts b/src/app/pages/create-game/create-free-task-modal/create-free-task-modal.component.ts index f6aad06b..d39b8ef3 100644 --- a/src/app/pages/create-game/create-free-task-modal/create-free-task-modal.component.ts +++ b/src/app/pages/create-game/create-free-task-modal/create-free-task-modal.component.ts @@ -71,7 +71,7 @@ export class CreateFreeTaskModalComponent implements OnInit { showMarker: true, }; - console.log(this.task); + // console.log(this.task); // todo --- check it out // this.settingsChange(); diff --git a/src/app/pages/create-game/create-game-list/create-game-list.page.ts b/src/app/pages/create-game/create-game-list/create-game-list.page.ts index 6b2430f9..36428d28 100644 --- a/src/app/pages/create-game/create-game-list/create-game-list.page.ts +++ b/src/app/pages/create-game/create-game-list/create-game-list.page.ts @@ -62,7 +62,7 @@ export class CreateGameListPage implements OnInit { } }); - // console.log("this.gameFactory.game: ", this.gameFactory.game); + // // console.log("this.gameFactory.game: ", this.gameFactory.game); } ionViewWillEnter() { @@ -86,7 +86,7 @@ export class CreateGameListPage implements OnInit { // map.addControl(geolocate); // // let watch = this.geolocation.watchPosition(); // // watch.subscribe((data) => { - // // console.log(data) + // // // console.log(data) // // }); // // Add geolocate control to the map. // map.on("load", () => { @@ -95,7 +95,7 @@ export class CreateGameListPage implements OnInit { } async presentTaskModal(type: string = "nav", task: any = null, isVirtualWorld: boolean = this.isVirtualWorld) { - // console.log(task); + // // console.log(task); const modal: HTMLIonModalElement = await this.modalController.create({ component: @@ -110,7 +110,7 @@ export class CreateGameListPage implements OnInit { await modal.present(); const { data } = await modal.onWillDismiss(); - console.log(data); + // console.log(data); if (data != undefined) { if (task != null) { if (!task._id) { @@ -128,32 +128,32 @@ export class CreateGameListPage implements OnInit { addTaskToGame(task) { this.game = this.gameFactory.addTask(task); // this.gameFactory.getGame().then(game => { - // console.log(game) + // // console.log(game) // this.game = game // }); - console.log(this.game.tasks); + // console.log(this.game.tasks); } deleteTask(taskID) { - console.log("deleting", taskID); + // console.log("deleting", taskID); this.game = this.gameFactory.removeTask(taskID); } updateTask(taskID, task) { - console.log("updating", taskID); + // console.log("updating", taskID); this.game = this.gameFactory.updateTask(taskID, task); - console.log(this.game); + // console.log(this.game); } doReorder(ev: any) { // The `from` and `to` properties contain the index of the item // when the drag started and ended, respectively - console.log("Dragged from index", ev.detail.from, "to", ev.detail.to); + // console.log("Dragged from index", ev.detail.from, "to", ev.detail.to); // Before complete is called with the items they will remain in the // order before the drag - console.log("Before complete", this.game.tasks); + // console.log("Before complete", this.game.tasks); // Finish the reorder and position the item in the DOM based on // where the gesture ended. Update the items variable to the @@ -162,12 +162,12 @@ export class CreateGameListPage implements OnInit { this.gameFactory.applyReorder(this.game.tasks); - console.log(this.game.tasks); + // console.log(this.game.tasks); ev.detail.complete(true); // After complete is called the items will be in the new order - console.log("After complete", this.game.tasks); + // console.log("After complete", this.game.tasks); } toggleReorder() { @@ -175,7 +175,7 @@ export class CreateGameListPage implements OnInit { } navigateToOverview() { - //console.log("navigate"); + //// console.log("navigate"); let bundle = { isVRWorld: false, diff --git a/src/app/pages/create-game/create-game-map/create-game-map.page.ts b/src/app/pages/create-game/create-game-map/create-game-map.page.ts index ebe0fd15..97074b79 100644 --- a/src/app/pages/create-game/create-game-map/create-game-map.page.ts +++ b/src/app/pages/create-game/create-game-map/create-game-map.page.ts @@ -57,7 +57,7 @@ export class CreateGameMapPage implements OnInit { // let watch = this.geolocation.watchPosition(); // watch.subscribe((data) => { - // console.log(data) + // // console.log(data) // }); // Add geolocate control to the map. @@ -81,7 +81,7 @@ export class CreateGameMapPage implements OnInit { marker: newMarker, tasks: [] }); - console.log(this.waypoints); + // console.log(this.waypoints); this.toggleAddMarker(); this.presentTaskModal(this.waypoints.length - 1); } @@ -90,7 +90,7 @@ export class CreateGameMapPage implements OnInit { } async presentTaskModal(index: Number) { - console.log(index); + // console.log(index); const modal = await this.modalController.create({ component: CreateTaskModalPage, backdropDismiss: false, diff --git a/src/app/pages/create-game/create-game-overview/create-game-overview.page.html b/src/app/pages/create-game/create-game-overview/create-game-overview.page.html index 50c0d89e..5c979551 100644 --- a/src/app/pages/create-game/create-game-overview/create-game-overview.page.html +++ b/src/app/pages/create-game/create-game-overview/create-game-overview.page.html @@ -137,7 +137,7 @@

{{ "SaveGame.sendingData" | translate }}

{{ "SaveGame.gameSaved" | translate }}

-
+
{{ "General.done" | translate }} diff --git a/src/app/pages/create-game/create-game-overview/create-game-overview.page.ts b/src/app/pages/create-game/create-game-overview/create-game-overview.page.ts index cc22932a..72720bc4 100644 --- a/src/app/pages/create-game/create-game-overview/create-game-overview.page.ts +++ b/src/app/pages/create-game/create-game-overview/create-game-overview.page.ts @@ -363,7 +363,7 @@ export class CreateGameOverviewPage implements AfterViewInit { } async showTrackingInfo(ev: any, text: string) { - console.log(ev); + // console.log(ev); const popover = await this.popoverController.create({ component: PopoverComponent, event: ev, @@ -390,7 +390,7 @@ export class CreateGameOverviewPage implements AfterViewInit { return; } - // console.log("///Game to be uploaded: ", this.game); + // // console.log("///Game to be uploaded: ", this.game); this.gameFactory.addGameInformation({ ...this.game, bbox: this.mapSection ? this.draw.getAll() : null, @@ -403,7 +403,7 @@ export class CreateGameOverviewPage implements AfterViewInit { isCuratedGame: this.isCuratedGame // to set whether game can be viewed in curated filter list }); - console.log(this.gameFactory.game); + // console.log(this.gameFactory.game); this.showUpload = true; this.gamesService @@ -429,7 +429,7 @@ export class CreateGameOverviewPage implements AfterViewInit { async showPopover(ev: any, key: string) { let text = this.translate.instant(key); - console.log(ev); + // console.log(ev); const popover = await this.popoverController.create({ component: PopoverComponent, event: ev, diff --git a/src/app/pages/create-game/create-game-virtual-list/create-game-virtual-list.page.ts b/src/app/pages/create-game/create-game-virtual-list/create-game-virtual-list.page.ts index 885e30b1..7620f72b 100644 --- a/src/app/pages/create-game/create-game-virtual-list/create-game-virtual-list.page.ts +++ b/src/app/pages/create-game/create-game-virtual-list/create-game-virtual-list.page.ts @@ -63,15 +63,15 @@ export class CreateGameVirtualListPage implements OnInit { this.gameFactory.getGame().then((game) => (this.game = game)); - console.log("this.gameFactory.game: ",this.gameFactory.game); + // console.log("this.gameFactory.game: ",this.gameFactory.game); } ionViewWillEnter() { } async presentTaskModal(type: string = "nav", task: any = null, isVirtualWorld: boolean = this.isVirtualWorld, isVRMirrored: boolean = this.isVRMirrored) { - // console.log(task); - console.log("type: ", type, "task: ", task, "--isVR: ", isVirtualWorld); + // // console.log(task); + // console.log("type: ", type, "task: ", task, "--isVR: ", isVirtualWorld); const modal: HTMLIonModalElement = await this.modalController.create({ component: @@ -87,7 +87,7 @@ export class CreateGameVirtualListPage implements OnInit { await modal.present(); const { data } = await modal.onWillDismiss(); - // console.log("data:", data); + // // console.log("data:", data); if (data != undefined) { if (task != null) { if (!task._id) { @@ -105,28 +105,28 @@ export class CreateGameVirtualListPage implements OnInit { addTaskToGame(task) { this.game = this.gameFactory.addTask(task); - console.log("this.game.tasks: ",this.game.tasks); + // console.log("this.game.tasks: ",this.game.tasks); } deleteTask(taskID) { - console.log("deleting taskID:", taskID); + // console.log("deleting taskID:", taskID); this.game = this.gameFactory.removeTask(taskID); } updateTask(taskID, task) { - console.log("updating taskID:", taskID); + // console.log("updating taskID:", taskID); this.game = this.gameFactory.updateTask(taskID, task); - console.log("this.game:", this.game); + // console.log("this.game:", this.game); } doReorder(ev: any) { // The `from` and `to` properties contain the index of the item // when the drag started and ended, respectively - console.log("Dragged from index", ev.detail.from, "to", ev.detail.to); + // console.log("Dragged from index", ev.detail.from, "to", ev.detail.to); // Before complete is called with the items they will remain in the // order before the drag - console.log("Before complete", this.game.tasks); + // console.log("Before complete", this.game.tasks); // Finish the reorder and position the item in the DOM based on // where the gesture ended. Update the items variable to the @@ -135,12 +135,12 @@ export class CreateGameVirtualListPage implements OnInit { this.gameFactory.applyReorder(this.game.tasks); - console.log(this.game.tasks); + // console.log(this.game.tasks); ev.detail.complete(true); // After complete is called the items will be in the new order - console.log("After complete", this.game.tasks); + // console.log("After complete", this.game.tasks); } toggleReorder() { @@ -148,7 +148,7 @@ export class CreateGameVirtualListPage implements OnInit { } navigateToOverview() { - console.log("navigate"); + // console.log("navigate"); let bundle = { isVRWorld: this.isVirtualWorld, diff --git a/src/app/pages/create-game/create-info-modal/create-info-modal.component.ts b/src/app/pages/create-game/create-info-modal/create-info-modal.component.ts index 9954665d..c893cb92 100644 --- a/src/app/pages/create-game/create-info-modal/create-info-modal.component.ts +++ b/src/app/pages/create-game/create-info-modal/create-info-modal.component.ts @@ -93,7 +93,7 @@ export class CreateInfoModalComponent implements OnInit, OnChanges { async showPopover(ev: any, key: string) { let text = this.translate.instant(key); - console.log(ev); + // console.log(ev); const popover = await this.popoverController.create({ component: PopoverComponent, event: ev, diff --git a/src/app/pages/create-game/form-elements/answer-types/answer-type.component.ts b/src/app/pages/create-game/form-elements/answer-types/answer-type.component.ts index 39825a3b..1e4ad19e 100644 --- a/src/app/pages/create-game/form-elements/answer-types/answer-type.component.ts +++ b/src/app/pages/create-game/form-elements/answer-types/answer-type.component.ts @@ -41,7 +41,7 @@ export class AnswerTypeComponent implements OnInit, OnChanges { async showPopover(ev: any, key: string) { let text = this.translate.instant(key); - console.log(ev); + // console.log(ev); const popover = await this.popoverController.create({ component: PopoverComponent, event: ev, diff --git a/src/app/pages/create-game/form-elements/audio-recorder/audio-recorder.component.ts b/src/app/pages/create-game/form-elements/audio-recorder/audio-recorder.component.ts index ce22defb..0d414026 100644 --- a/src/app/pages/create-game/form-elements/audio-recorder/audio-recorder.component.ts +++ b/src/app/pages/create-game/form-elements/audio-recorder/audio-recorder.component.ts @@ -48,7 +48,7 @@ export class AudioRecorderComponent implements OnInit { this.recording = false; this.audioRecorder.stop().then(({ filename }) => { this.audioSource = `${environment.apiURL}/file/audio/${filename}`; - console.log(this.audioSource); + // console.log(this.audioSource); this.audioSourceChange.emit(this.audioSource); }); } @@ -59,7 +59,7 @@ export class AudioRecorderComponent implements OnInit { this.audioSource = `${environment.apiURL}/file/audio/${filename}`; this.changeDetectorRef.detectChanges(); - console.log(this.audioSource); + // console.log(this.audioSource); this.audioSourceChange.emit(this.audioSource); } @@ -69,7 +69,7 @@ export class AudioRecorderComponent implements OnInit { } async showPopover(ev: any, text: string) { - console.log(ev); + // console.log(ev); const popover = await this.popoverController.create({ component: PopoverComponent, event: ev, diff --git a/src/app/pages/create-game/form-elements/map/map.component.ts b/src/app/pages/create-game/form-elements/map/map.component.ts index 2ebbb92a..4d52c423 100644 --- a/src/app/pages/create-game/form-elements/map/map.component.ts +++ b/src/app/pages/create-game/form-elements/map/map.component.ts @@ -144,7 +144,7 @@ export class MapComponent implements OnInit, AfterViewInit, OnChanges, OnDestroy this._onChange(this.feature); // Temporary show loc of selected flag - console.log("Flag ( lng: ", e.lngLat.lng, "lat: ", e.lngLat.lat, " )"); + // console.log("Flag ( lng: ", e.lngLat.lng, "lat: ", e.lngLat.lat, " )"); } if (this.featureType == 'direction') { diff --git a/src/app/pages/create-game/form-elements/question-types/question-type.component.ts b/src/app/pages/create-game/form-elements/question-types/question-type.component.ts index ca071214..216fd37a 100644 --- a/src/app/pages/create-game/form-elements/question-types/question-type.component.ts +++ b/src/app/pages/create-game/form-elements/question-types/question-type.component.ts @@ -28,7 +28,7 @@ export class QuestionTypeComponent implements OnInit, OnChanges { constructor(public popoverController: PopoverController, private translate: TranslateService) { } ngOnChanges(changes: SimpleChanges): void { - console.log(changes); + // console.log(changes); this.questionChange.emit(changes.question.currentValue); } @@ -38,7 +38,7 @@ export class QuestionTypeComponent implements OnInit, OnChanges { async showPopover(ev: any, key: string) { let text = this.translate.instant(key); - console.log(ev); + // console.log(ev); const popover = await this.popoverController.create({ component: PopoverComponent, event: ev, diff --git a/src/app/pages/create-game/map-features-modal/map-features-modal.page.ts b/src/app/pages/create-game/map-features-modal/map-features-modal.page.ts index 306c9ef1..16813058 100644 --- a/src/app/pages/create-game/map-features-modal/map-features-modal.page.ts +++ b/src/app/pages/create-game/map-features-modal/map-features-modal.page.ts @@ -359,7 +359,7 @@ export class MapFeaturesModalPage implements OnInit, AfterViewInit { } if (this.features.landmarkFeatures != undefined) { - console.log("adding feature", this.features.landmarkFeatures); + // console.log("adding feature", this.features.landmarkFeatures); if (this.features.landmarkFeatures.type == "FeatureCollection") { this.features.landmarkFeatures.features.forEach((element) => { this.draw.add({ properties: {}, ...element }); diff --git a/src/app/pages/edit-game/edit-game-list/edit-game-list.page.ts b/src/app/pages/edit-game/edit-game-list/edit-game-list.page.ts index 7783fc7e..f479f448 100644 --- a/src/app/pages/edit-game/edit-game-list/edit-game-list.page.ts +++ b/src/app/pages/edit-game/edit-game-list/edit-game-list.page.ts @@ -73,7 +73,7 @@ export class EditGameListPage implements OnInit { } gameClick(game: any) { - console.log(game); + // console.log(game); this.navCtrl.navigateForward(`edit-game/${game._id}`); } } diff --git a/src/app/pages/edit-game/edit-game-overview/edit-game-overview.page.html b/src/app/pages/edit-game/edit-game-overview/edit-game-overview.page.html index 781dc303..7024c9b8 100644 --- a/src/app/pages/edit-game/edit-game-overview/edit-game-overview.page.html +++ b/src/app/pages/edit-game/edit-game-overview/edit-game-overview.page.html @@ -93,7 +93,7 @@

{{ "SaveGame.sendingData" | translate }}

{{ "SaveGame.gameSaved" | translate }}

-
+
{{ "General.done" | translate }}
\ No newline at end of file diff --git a/src/app/pages/edit-game/edit-game-overview/edit-game-overview.page.ts b/src/app/pages/edit-game/edit-game-overview/edit-game-overview.page.ts index 03fc5a92..da2491e7 100644 --- a/src/app/pages/edit-game/edit-game-overview/edit-game-overview.page.ts +++ b/src/app/pages/edit-game/edit-game-overview/edit-game-overview.page.ts @@ -444,7 +444,7 @@ export class EditGameOverviewPage implements AfterViewInit { } async showTrackingInfo(ev: any, text: string) { - console.log(ev); + // console.log(ev); const popover = await this.popoverController.create({ component: PopoverComponent, event: ev, @@ -479,7 +479,7 @@ export class EditGameOverviewPage implements AfterViewInit { place: this.game.place, isCuratedGame: this.isCuratedGame // to set whether game can be viewed in curated filter list }); - console.log(this.gameFactory.game); + // console.log(this.gameFactory.game); this.showUpload = true; @@ -516,7 +516,7 @@ export class EditGameOverviewPage implements AfterViewInit { async showPopover(ev: any, key: string) { let text = this.translate.instant(key); - console.log(ev); + // console.log(ev); const popover = await this.popoverController.create({ component: PopoverComponent, event: ev, diff --git a/src/app/pages/edit-game/edit-game-tasks/edit-game-list.page.ts b/src/app/pages/edit-game/edit-game-tasks/edit-game-list.page.ts index 2cb38d3d..ef9ed7ae 100644 --- a/src/app/pages/edit-game/edit-game-tasks/edit-game-list.page.ts +++ b/src/app/pages/edit-game/edit-game-tasks/edit-game-list.page.ts @@ -94,7 +94,7 @@ export class EditGameListPage implements OnInit { // map.addControl(geolocate); // // let watch = this.geolocation.watchPosition(); // // watch.subscribe((data) => { - // // console.log(data) + // // // console.log(data) // // }); // // Add geolocate control to the map. // map.on("load", () => { @@ -103,7 +103,7 @@ export class EditGameListPage implements OnInit { } async presentTaskModal(type: string = "nav", task: Task = null, isVirtualWorld: boolean = this.isVirtualWorld, isVRMirrored: boolean = this.isVRMirrored) { - console.log(task); + // console.log(task); const modal: HTMLIonModalElement = await this.modalController.create({ component: @@ -119,7 +119,7 @@ export class EditGameListPage implements OnInit { await modal.present(); const { data } = await modal.onWillDismiss(); - console.log(data); + // console.log(data); if (data != undefined) { if (task != null) { if (!task._id) { @@ -137,28 +137,28 @@ export class EditGameListPage implements OnInit { addTaskToGame(task: Task) { this.game = this.gameFactory.addTask(task); - console.log(this.game.tasks); + // console.log(this.game.tasks); } deleteTask(taskID) { - console.log("deleting", taskID); + // console.log("deleting", taskID); this.game = this.gameFactory.removeTask(taskID); } updateTask(taskID, task) { - console.log("updating", taskID); + // console.log("updating", taskID); this.game = this.gameFactory.updateTask(taskID, task); - console.log(this.game); + // console.log(this.game); } doReorder(ev: any) { // The `from` and `to` properties contain the index of the item // when the drag started and ended, respectively - console.log("Dragged from index", ev.detail.from, "to", ev.detail.to); + // console.log("Dragged from index", ev.detail.from, "to", ev.detail.to); // Before complete is called with the items they will remain in the // order before the drag - console.log("Before complete", this.game.tasks); + // console.log("Before complete", this.game.tasks); // Finish the reorder and position the item in the DOM based on // where the gesture ended. Update the items variable to the @@ -167,12 +167,12 @@ export class EditGameListPage implements OnInit { this.gameFactory.applyReorder(this.game.tasks); - console.log(this.game.tasks); + // console.log(this.game.tasks); ev.detail.complete(true); // After complete is called the items will be in the new order - console.log("After complete", this.game.tasks); + // console.log("After complete", this.game.tasks); } toggleReorder() { diff --git a/src/app/pages/play-game/game-detail/game-detail.page.ts b/src/app/pages/play-game/game-detail/game-detail.page.ts index 8ec81038..563c789c 100644 --- a/src/app/pages/play-game/game-detail/game-detail.page.ts +++ b/src/app/pages/play-game/game-detail/game-detail.page.ts @@ -53,7 +53,7 @@ export class GameDetailPage implements OnInit { } }) .finally(() => { - console.log(this.game); + // console.log(this.game); // this.activities = this.game.activities // this.points = this.activities[0].points // if(this.mapContainer.nativeElement) { @@ -88,7 +88,7 @@ export class GameDetailPage implements OnInit { // } pointClick(point) { - console.log(point); + // console.log(point); } startGame() { diff --git a/src/app/pages/play-game/games-overview/games-overview.page.ts b/src/app/pages/play-game/games-overview/games-overview.page.ts index d54b90d2..82a2f378 100644 --- a/src/app/pages/play-game/games-overview/games-overview.page.ts +++ b/src/app/pages/play-game/games-overview/games-overview.page.ts @@ -61,7 +61,7 @@ export class GamesOverviewPage implements OnInit { } playGame(game) { - console.log('Playing ', game); + // console.log('Playing ', game); } diff --git a/src/app/pages/play-game/play-game-list/play-game-list.page.ts b/src/app/pages/play-game/play-game-list/play-game-list.page.ts index ad6e2a82..73eaa70d 100644 --- a/src/app/pages/play-game/play-game-list/play-game-list.page.ts +++ b/src/app/pages/play-game/play-game-list/play-game-list.page.ts @@ -124,7 +124,7 @@ export class PlayGameListPage implements OnInit { } gameClick(game: any) { - console.log(game); + // console.log(game); this.navCtrl.navigateForward(`play-game/game-detail/${game._id}`); } @@ -132,7 +132,7 @@ export class PlayGameListPage implements OnInit { segmentChanged(segVal) { //--- ToDo check duplicate code and create a func for it // if mine is selected if (segVal == "mine") { - // console.log("mine"); //temp + // // console.log("mine"); //temp this.games = this.gamesTemp.filter(game => game.user == this.user['_id']); // to update shown games based on search phrase @@ -155,7 +155,7 @@ export class PlayGameListPage implements OnInit { } } else if (segVal == "curated") { // if all is selected - //console.log("curated"); + //// console.log("curated"); this.games = this.gamesTemp.filter(game => game.isCuratedGame == true); // to update shown games based on search phrase @@ -321,7 +321,7 @@ export class PlayGameListPage implements OnInit { this.game_name = e.features[0].properties.name; this.game_place = e.features[0].properties.place; this.game_numTasks = e.features[0].properties.task_num; - //console.log('properties: ', e.features[0].properties) + //// console.log('properties: ', e.features[0].properties) // Ensure that if the map is zoomed out such that // multiple copies of the feature are visible, the @@ -367,13 +367,13 @@ export class PlayGameListPage implements OnInit { this.isListTabSelected = false; if(!this.map){ - // console.log("isListTabSelected: ", this.isListTabSelected); + // // console.log("isListTabSelected: ", this.isListTabSelected); // get minimal games with locs this.gamesService.getMinimalGamesWithLocs().then(res => res.content).then(gameswithlocs => { // Get either real or VE agmes based on selected environment this.gamesWithLocs = gameswithlocs.filter(game => (game.isVRWorld == this.isVirtualWorld || (!this.isVirtualWorld && game.isVRWorld == undefined))).reverse(); - // console.log("gamesWithLocs: ", this.gamesWithLocs); + // // console.log("gamesWithLocs: ", this.gamesWithLocs); this.convertToGeoJson() }); @@ -386,14 +386,14 @@ export class PlayGameListPage implements OnInit { openListTap() { if (!this.isListTabSelected) { this.isListTabSelected = true; - // console.log("isListTabSelected: ", this.isListTabSelected); + // // console.log("isListTabSelected: ", this.isListTabSelected); } } async convertToGeoJson() { let convertedData = [] - //console.log("convertedData: ", convertedData) + //// console.log("convertedData: ", convertedData) this.gamesWithLocs.forEach(game => { if (game.coords) { @@ -413,14 +413,14 @@ export class PlayGameListPage implements OnInit { } }); - console.log("convertedData: ", convertedData) + // console.log("convertedData: ", convertedData) this.showGamesOnMap(convertedData); } showGamesOnMap(gamesListGeoJson) { if (!this.map) { - console.log("Create map ////////////"); + // console.log("Create map ////////////"); this.initMap(gamesListGeoJson); } // no need for it since we can hide the map @@ -430,7 +430,7 @@ export class PlayGameListPage implements OnInit { this.map.removeLayer(`clusters`); this.map.removeSource("clusters"); - console.log("Else ////////////"); + // console.log("Else ////////////"); this.map.addSource('clusters', { 'type': 'geojson', diff --git a/src/app/pages/play-game/playing-game/playing-game.page.html b/src/app/pages/play-game/playing-game/playing-game.page.html index 3cb325ab..c2dcf2b3 100644 --- a/src/app/pages/play-game/playing-game/playing-game.page.html +++ b/src/app/pages/play-game/playing-game/playing-game.page.html @@ -333,7 +333,7 @@

{{ "PlayGame.playersNames" | translate }}

{{ "PlayGame.congratulations" | translate }}

{{ "PlayGame.finished" | translate }}

-
+
{ @@ -1113,7 +1113,7 @@ export class PlayingGamePage implements OnInit, OnDestroy { async initTask() { this.panelMinimized = false; - console.log("Current task: ", this.task); + // console.log("Current task: ", this.task); this.trackerService.setTask(this.task); @@ -1224,7 +1224,7 @@ export class PlayingGamePage implements OnInit, OnDestroy { try { await this.zoomBounds(); } catch (e) { - console.log(e); + // console.log(e); } } @@ -1318,7 +1318,7 @@ export class PlayingGamePage implements OnInit, OnDestroy { } if (this.task.answer.type == AnswerType.DRAW) { - console.log(" tasks info: ", this.task) + // console.log(" tasks info: ", this.task) if (this.task.settings.drawPointOnly !== undefined && this.task.settings.drawPointOnly) { this.DrawControl = this.DrawControl_point; } else { @@ -1466,7 +1466,7 @@ export class PlayingGamePage implements OnInit, OnDestroy { async onOkClicked() { - console.log("onOkClicked//////") + // console.log("onOkClicked//////") const isCorrect = true; const answer: any = {}; @@ -1884,7 +1884,7 @@ export class PlayingGamePage implements OnInit, OnDestroy { } startGame() { - console.log(this.playersNames); + // console.log(this.playersNames); this.initGame(); this.showPlayersNames = false; } diff --git a/src/app/pages/showroom/map-showroom/map-showroom.page.ts b/src/app/pages/showroom/map-showroom/map-showroom.page.ts index 5fb1ac29..a00da777 100644 --- a/src/app/pages/showroom/map-showroom/map-showroom.page.ts +++ b/src/app/pages/showroom/map-showroom/map-showroom.page.ts @@ -47,11 +47,11 @@ export class MapShowroomPage implements OnInit { constructor(private OSMService: OsmService, private deviceOrientation: DeviceOrientation) { - console.log('creating orientation subscribe...'); + // console.log('creating orientation subscribe...'); this.directionSubscribe = this.deviceOrientation.watchHeading().subscribe( (data: DeviceOrientationCompassHeading) => this.currentCompassData = data ); - console.log('...done'); + // console.log('...done'); this._rotateTo = (e: DeviceOrientationEvent) => { @@ -67,7 +67,7 @@ export class MapShowroomPage implements OnInit { this._viewDirection = (e: DeviceOrientationEvent) => { // this.map.rotateTo(e.alpha, { duration: 10 }) - console.log(this.currentCompassData); + // console.log(this.currentCompassData); if (this.map.getSource('viewDirection') == undefined) { // this.map.addImage('view-direction', 'assets/icons/direction.png') diff --git a/src/app/pages/user/profile/profile.page.ts b/src/app/pages/user/profile/profile.page.ts index 6619c1e9..dc573de8 100644 --- a/src/app/pages/user/profile/profile.page.ts +++ b/src/app/pages/user/profile/profile.page.ts @@ -66,7 +66,7 @@ export class ProfilePage implements OnInit { text: this._translate.instant("User.deleteAccount"), cssClass: 'alert-button-confirm', handler: () => { - console.log("user: ", this.user); + // console.log("user: ", this.user); this.authService.DeleteAccountLogout(this.user); }, }, diff --git a/src/app/pages/user/register/register.page.ts b/src/app/pages/user/register/register.page.ts index a151cbc4..dcc700e1 100644 --- a/src/app/pages/user/register/register.page.ts +++ b/src/app/pages/user/register/register.page.ts @@ -33,7 +33,7 @@ export class RegisterPage implements OnInit { } login() { - console.log(this.loginForm.getRawValue()); + // console.log(this.loginForm.getRawValue()); this.authService.register(this.loginForm.getRawValue()); } } diff --git a/src/app/pages/user/user-management/user-management.page.ts b/src/app/pages/user/user-management/user-management.page.ts index 9bf9aa6b..c1fe70fd 100644 --- a/src/app/pages/user/user-management/user-management.page.ts +++ b/src/app/pages/user/user-management/user-management.page.ts @@ -46,7 +46,7 @@ export class UserManagementPage implements OnInit { initializeDataSource(usersData) { // Assign the data to the data source for the table to render this.dataSource = new MatTableDataSource(usersData); - console.log("this.dataSource: ", this.dataSource) + // console.log("this.dataSource: ", this.dataSource) this.dataSource.paginator = this.paginator; this.dataSource.sort = this.sort; } @@ -54,15 +54,15 @@ export class UserManagementPage implements OnInit { // update user role async changeRole(roleValue, userEmail) { if (userEmail != undefined) { - console.log("userEmail1: ", userEmail) - console.log("roleValue1: ", roleValue) + // console.log("userEmail1: ", userEmail) + // console.log("roleValue1: ", roleValue) // update user role and change save icon color to blue this.users.find(user => { if (user.email == userEmail) { user.roleIsUpdated = true user.roles = [roleValue] - console.log("user: ", user) + // console.log("user: ", user) return user; } }); diff --git a/src/app/services/audio-recorder.service.ts b/src/app/services/audio-recorder.service.ts index 937c8b9f..4acf32d4 100644 --- a/src/app/services/audio-recorder.service.ts +++ b/src/app/services/audio-recorder.service.ts @@ -65,7 +65,7 @@ export class AudioRecorderService { // const audio: HTMLAudioElement = new Audio(audioUrl); // const play: Function = (): Promise => audio.play(); - console.log(audioBlob, audioUrl); + // console.log(audioBlob, audioUrl); const formData = new FormData(); formData.append("file", audioBlob); @@ -75,7 +75,7 @@ export class AudioRecorderService { }) .then((res) => res.json()) .then((body) => { - console.log("data upload done"); + // console.log("data upload done"); resolve(body); }); }; @@ -84,7 +84,7 @@ export class AudioRecorderService { } else { Plugins.VoiceRecorder.stopRecording().then( async (result: RecordingData) => { - console.log(result.value); + // console.log(result.value); const audio = new Audio( `data:audio/aac;base64,${result.value.recordDataBase64}` @@ -100,7 +100,7 @@ export class AudioRecorderService { // const audio: HTMLAudioElement = new Audio(audioUrl); const play: Function = (): Promise => audio.play(); - console.log(audioBlob, audioUrl); + // console.log(audioBlob, audioUrl); const formData = new FormData(); formData.append("file", audioBlob); diff --git a/src/app/services/auth-service.service.ts b/src/app/services/auth-service.service.ts index 6c1bec4c..a94090bf 100644 --- a/src/app/services/auth-service.service.ts +++ b/src/app/services/auth-service.service.ts @@ -163,7 +163,7 @@ export class AuthService { } recoverSession(token) { - console.log('RECOVER'); + // console.log('RECOVER'); this.refreshTokenInProgress$.next(true); this.http .post(this.AUTH_API_URL + '/user/refresh-auth', { token }) diff --git a/src/app/services/game-factory.service.ts b/src/app/services/game-factory.service.ts index ccdb3de7..a8f9228f 100644 --- a/src/app/services/game-factory.service.ts +++ b/src/app/services/game-factory.service.ts @@ -17,7 +17,7 @@ export class GameFactoryService { ...this.game, ...data, }; - console.log("New Game: ", this.game); + // console.log("New Game: ", this.game); this.storage.set("game", this.game); } @@ -25,11 +25,11 @@ export class GameFactoryService { if (!task._id) { task._id = String(Math.floor(Date.now() / 1000)); } - // console.log(task, index); + // // console.log(task, index); if (this.game.hasOwnProperty("tasks")) { // const newTaskArr = this.game.tasks; // newTaskArr.splice(index, 0, task); - // console.log(newTaskArr); + // // console.log(newTaskArr); this.game.tasks.push(task); } else { this.game = { @@ -42,14 +42,14 @@ export class GameFactoryService { } removeTask(taskID: string) { - console.log(this.game.tasks); + // console.log(this.game.tasks); this.game.tasks = this.game.tasks.filter((t) => t._id != taskID); this.storage.set("game", this.game); return this.game; } updateTask(taskID: string, task: Task) { - console.log(task, taskID); + // console.log(task, taskID); if (task._id == undefined) { task._id = taskID; } @@ -60,7 +60,7 @@ export class GameFactoryService { return t; }); - console.log(this.game.tasks); + // console.log(this.game.tasks); this.storage.set("game", this.game); return this.game; } @@ -72,7 +72,7 @@ export class GameFactoryService { async getGame(): Promise { return this.storage.get("game").then((val) => { - console.log(val); + // console.log(val); if (val != undefined) { this.game = val; } else if (!this.game) { diff --git a/src/app/services/games.service.ts b/src/app/services/games.service.ts index 42a10338..387e0f5b 100644 --- a/src/app/services/games.service.ts +++ b/src/app/services/games.service.ts @@ -49,9 +49,9 @@ export class GamesService { } postGame(game: Game): Promise { - console.log("///Game to be posted: ", game); + // console.log("///Game to be posted: ", game); delete game._id; - console.log("///Game to be posted without id: ", game); + // console.log("///Game to be posted without id: ", game); game.tasks.forEach((task) => delete task._id); return this.http .post(`${environment.apiURL}/game`, game, { diff --git a/src/app/services/origami-orientation.service.ts b/src/app/services/origami-orientation.service.ts index 5a8fae3b..d00414cd 100644 --- a/src/app/services/origami-orientation.service.ts +++ b/src/app/services/origami-orientation.service.ts @@ -29,7 +29,7 @@ export class OrigamiOrientationService { init(isVirtualWorld: boolean) { this.isVirtualWorld = isVirtualWorld; - console.log(this.platform.platforms()); + // console.log(this.platform.platforms()); if (this.platform.is('mobile') && this.platform.is('capacitor') && !this.platform.is('mobileweb')) { // native diff --git a/src/app/services/osm.service.ts b/src/app/services/osm.service.ts index aa08f56a..6a4c0efe 100644 --- a/src/app/services/osm.service.ts +++ b/src/app/services/osm.service.ts @@ -12,10 +12,10 @@ export class OsmService { constructor(private http: HttpClient) { } getStreetCoordinates(lat: number, lng: number, radius: number = 30) { - console.log(this.lastRequest - Date.now()); + // console.log(this.lastRequest - Date.now()); if (this.lastRequest == undefined || Date.now() - this.lastRequest > this.maxRequestInterval) { this.lastRequest = Date.now(); - console.log('doing request'); + // console.log('doing request'); return this.http.get(` https://overpass-api.de/api/interpreter?data=[out:json];(way[highway~"^(primary|secondary|tertiary|residential)$"][name](around:${radius},${lat},${lng});>;);out; `).toPromise(); diff --git a/src/app/services/tracker.service.ts b/src/app/services/tracker.service.ts index 8486c43a..1e06f098 100644 --- a/src/app/services/tracker.service.ts +++ b/src/app/services/tracker.service.ts @@ -204,7 +204,7 @@ export class TrackerService { rotationCount: this.rotationCounter, }, }); - console.log(this.events); + // console.log(this.events); } createHeaders() { @@ -243,7 +243,7 @@ export class TrackerService { playersCount: this.players.length, }; - console.log(data); + // console.log(data); // Plugins.Geolocation.clearWatch({ id: this.positionWatch }); if (!this.isVirtualWorld) { @@ -261,9 +261,9 @@ export class TrackerService { directory: FilesystemDirectory.Documents, recursive: true, // like mkdir -p }); - console.log('Created dir', ret); + // console.log('Created dir', ret); } catch (e) { - console.log('Unable to make directory', e); + // console.log('Unable to make directory', e); } try { @@ -274,7 +274,7 @@ export class TrackerService { directory: FilesystemDirectory.Documents, encoding: FilesystemEncoding.UTF8, }); - console.log('Wrote file', result); + // console.log('Wrote file', result); } catch (e) { console.error('Unable to write file', e); } diff --git a/src/app/start/start.page.ts b/src/app/start/start.page.ts index 3083bd2a..b556f630 100644 --- a/src/app/start/start.page.ts +++ b/src/app/start/start.page.ts @@ -89,7 +89,7 @@ export class StartPage implements OnInit { } handleCardClick(e) { - console.log(e); + // console.log(e); } navigateGamesOverviewPage() { @@ -182,7 +182,7 @@ export class StartPage implements OnInit { // convert version value to int versionToInt(VersionInString) { let v = VersionInString.split('.'); - console.log("v: ", v[0] * 100 + v[1] * 10 + v[2] * 1); + // console.log("v: ", v[0] * 100 + v[1] * 10 + v[2] * 1); return (v[0] * 100 + v[1] * 10 + v[2] * 1) } } diff --git a/src/theme/variables.scss b/src/theme/variables.scss index b47c1b08..5033acff 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -23,73 +23,109 @@ /** primary **/ --ion-color-primary: #3880ff; - --ion-color-primary-rgb: 56, 128, 255; + --ion-color-primary-rgb: 56, + 128, + 255; --ion-color-primary-contrast: #ffffff; - --ion-color-primary-contrast-rgb: 255, 255, 255; + --ion-color-primary-contrast-rgb: 255, + 255, + 255; --ion-color-primary-shade: #3171e0; --ion-color-primary-tint: #4c8dff; /** secondary **/ --ion-color-secondary: #0cd1e8; - --ion-color-secondary-rgb: 12, 209, 232; + --ion-color-secondary-rgb: 12, + 209, + 232; --ion-color-secondary-contrast: #ffffff; - --ion-color-secondary-contrast-rgb: 255, 255, 255; + --ion-color-secondary-contrast-rgb: 255, + 255, + 255; --ion-color-secondary-shade: #0bb8cc; --ion-color-secondary-tint: #24d6ea; /** tertiary **/ --ion-color-tertiary: #7044ff; - --ion-color-tertiary-rgb: 112, 68, 255; + --ion-color-tertiary-rgb: 112, + 68, + 255; --ion-color-tertiary-contrast: #ffffff; - --ion-color-tertiary-contrast-rgb: 255, 255, 255; + --ion-color-tertiary-contrast-rgb: 255, + 255, + 255; --ion-color-tertiary-shade: #633ce0; --ion-color-tertiary-tint: #7e57ff; /** success **/ --ion-color-success: #10dc60; - --ion-color-success-rgb: 16, 220, 96; + --ion-color-success-rgb: 16, + 220, + 96; --ion-color-success-contrast: #ffffff; - --ion-color-success-contrast-rgb: 255, 255, 255; + --ion-color-success-contrast-rgb: 255, + 255, + 255; --ion-color-success-shade: #0ec254; --ion-color-success-tint: #28e070; /** warning **/ --ion-color-warning: #ffce00; - --ion-color-warning-rgb: 255, 206, 0; + --ion-color-warning-rgb: 255, + 206, + 0; --ion-color-warning-contrast: #ffffff; - --ion-color-warning-contrast-rgb: 255, 255, 255; + --ion-color-warning-contrast-rgb: 255, + 255, + 255; --ion-color-warning-shade: #e0b500; --ion-color-warning-tint: #ffd31a; /** danger **/ --ion-color-danger: #f04141; - --ion-color-danger-rgb: 245, 61, 61; + --ion-color-danger-rgb: 245, + 61, + 61; --ion-color-danger-contrast: #ffffff; - --ion-color-danger-contrast-rgb: 255, 255, 255; + --ion-color-danger-contrast-rgb: 255, + 255, + 255; --ion-color-danger-shade: #d33939; --ion-color-danger-tint: #f25454; /** dark **/ --ion-color-dark: #222428; - --ion-color-dark-rgb: 34, 34, 34; + --ion-color-dark-rgb: 34, + 34, + 34; --ion-color-dark-contrast: #ffffff; - --ion-color-dark-contrast-rgb: 255, 255, 255; + --ion-color-dark-contrast-rgb: 255, + 255, + 255; --ion-color-dark-shade: #1e2023; --ion-color-dark-tint: #383a3e; /** medium **/ --ion-color-medium: #989aa2; - --ion-color-medium-rgb: 152, 154, 162; + --ion-color-medium-rgb: 152, + 154, + 162; --ion-color-medium-contrast: #ffffff; - --ion-color-medium-contrast-rgb: 255, 255, 255; + --ion-color-medium-contrast-rgb: 255, + 255, + 255; --ion-color-medium-shade: #86888f; --ion-color-medium-tint: #a2a4ab; /** light **/ --ion-color-light: #f4f5f8; - --ion-color-light-rgb: 244, 244, 244; + --ion-color-light-rgb: 244, + 244, + 244; --ion-color-light-contrast: #000000; - --ion-color-light-contrast-rgb: 0, 0, 0; + --ion-color-light-contrast-rgb: 0, + 0, + 0; --ion-color-light-shade: #d7d8da; --ion-color-light-tint: #f5f6f9; } @@ -255,10 +291,10 @@ button.alert-button.alert-button-update { color: var(--ion-color-success-contrast); } -.connection-toast-class{ +.connection-toast-class { // --width: 100%; - --start: 10%; - --end: 10%; + --start: 10%; + --end: 10%; } // To show border between msg and dismiss button @@ -266,4 +302,21 @@ button.alert-button.alert-button-update { border-left: 1px solid #d2d2d2; //color: #030207; font-size: 15px; +} + +// For phone +.lottie-style { + /* width: 13rem; + height: 5rem; */ + width: 15rem; + height: 10rem; + +} + +// For desktop and tablet +@media only screen and (min-width: 575px) { + .lottie-style { + width: 33rem; + height: 20rem; + } } \ No newline at end of file