mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 12:37:53 +00:00
-implement create chat group
This commit is contained in:
tiago.kayaya
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+5
-5
@@ -31,14 +31,14 @@
|
||||
<output-test url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/intermediates/javac/debugUnitTest/classes" />
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor">
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/res/rs/debug" type="java-resource" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/renderscript_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
|
||||
|
||||
Generated
+2
-2
@@ -30,9 +30,9 @@
|
||||
<output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugUnitTest/classes" />
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$/../../../app">
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" type="java-resource" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
|
||||
|
||||
Generated
+4
-4
@@ -31,15 +31,15 @@
|
||||
<output-test url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/intermediates/javac/debugUnitTest/classes" />
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins">
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/res/rs/debug" type="java-resource" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/renderscript_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/src/debug/res" type="java-resource" />
|
||||
|
||||
Generated
+5
-45
@@ -16,26 +16,20 @@
|
||||
<change beforePath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/fileHashes.bin" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/fileHashes.lock" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/modules/-195070525/capacitor-android.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/-195070525/capacitor-android.iml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/modules/app/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/app.iml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/modules/capacitor-cordova-android-plugins/capacitor-cordova-android-plugins.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/capacitor-cordova-android-plugins/capacitor-cordova-android-plugins.iml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeLibDexDebug/classes_0.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeLibDexDebug/classes_0.dex" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeLibDexDebug/classes_1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeLibDexDebug/classes_1.dex" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeProjectDexDebug/classes.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeProjectDexDebug/classes.dex" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/external_file_lib_dex_archives/debug/out/0_jetified-sqlite-connector.jar" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/external_file_lib_dex_archives/debug/out/0_jetified-sqlite-connector.jar" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugAssets/merger.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugAssets/merger.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es5.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es2015.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es5.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es5.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es2015.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es5.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es5.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/index-index-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/index-index-module-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/index-index-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/index-index-module-es5.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es2015.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es5.js" afterDir="false" />
|
||||
@@ -44,16 +38,6 @@
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es2015.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es5.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es5.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es2015.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es5.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es5.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/runtime-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/runtime-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/runtime-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/runtime-es5.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-messages-options-messages-options-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-messages-options-messages-options-module-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-messages-options-messages-options-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-messages-options-messages-options-module-es2015.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-messages-options-messages-options-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-messages-options-messages-options-module-es5.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-messages-options-messages-options-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-messages-options-messages-options-module-es5.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/52440b056b1aa7e444700e1b30e7ba04fc227da8465af2637304fa37124a40a4_0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/52440b056b1aa7e444700e1b30e7ba04fc227da8465af2637304fa37124a40a4_0.jar" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/52440b056b1aa7e444700e1b30e7ba04fc227da8465af2637304fa37124a40a4_1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/52440b056b1aa7e444700e1b30e7ba04fc227da8465af2637304fa37124a40a4_1.jar" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/52440b056b1aa7e444700e1b30e7ba04fc227da8465af2637304fa37124a40a4_2.jar" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/52440b056b1aa7e444700e1b30e7ba04fc227da8465af2637304fa37124a40a4_2.jar" afterDir="false" />
|
||||
@@ -62,18 +46,10 @@
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/gpr/gabinetedigital/MainActivity$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/gpr/gabinetedigital/MainActivity$1.dex" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/gpr/gabinetedigital/MainActivity.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/gpr/gabinetedigital/MainActivity.dex" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/outputs/apk/debug/app-debug.apk" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/outputs/apk/debug/app-debug.apk" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/common-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/common-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/common-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/common-es5.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es2015.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es5.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es5.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/home-home-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/home-home-module-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/home-home-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/home-home-module-es2015.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/home-home-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/home-home-module-es5.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/home-home-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/home-home-module-es5.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/index-index-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/index-index-module-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/index-index-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/index-index-module-es5.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/main-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/main-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/main-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/main-es2015.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/main-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/main-es5.js" afterDir="false" />
|
||||
@@ -82,30 +58,14 @@
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es2015.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es5.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es5.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es2015.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es5.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es5.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/runtime-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/runtime-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/runtime-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/runtime-es5.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-messages-options-messages-options-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-messages-options-messages-options-module-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-messages-options-messages-options-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-messages-options-messages-options-module-es2015.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-messages-options-messages-options-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-messages-options-messages-options-module-es5.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-messages-options-messages-options-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-messages-options-messages-options-module-es5.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../src/app/pages/chat/chat.page.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../src/app/pages/chat/chat.page.ts" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../src/app/pages/chat/group-messages/group-messages.page.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../src/app/pages/chat/group-messages/group-messages.page.ts" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../src/app/pages/chat/new-group/new-group.page.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../src/app/pages/chat/new-group/new-group.page.ts" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../src/app/services/chat.service.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../src/app/services/chat.service.ts" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../src/app/shared/popover/chat-popover/chat-popover.page.html" beforeDir="false" afterPath="$PROJECT_DIR$/../src/app/shared/popover/chat-popover/chat-popover.page.html" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../src/app/shared/popover/chat-popover/chat-popover.page.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../src/app/shared/popover/chat-popover/chat-popover.page.ts" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../src/environments/environment.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../src/environments/environment.ts" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||
</component>
|
||||
<component name="ExecutionTargetManager" SELECTED_TARGET="Pixel_2_API_27" />
|
||||
<component name="ExecutionTargetManager" SELECTED_TARGET="XU020961" />
|
||||
<component name="ExternalProjectsData">
|
||||
<projectState path="$PROJECT_DIR$">
|
||||
<ProjectState />
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
+1
-1
@@ -1,4 +1,4 @@
|
||||
#Wed Jan 20 16:14:05 WAT 2021
|
||||
#Thu Jan 21 09:26:08 WAT 2021
|
||||
path.3=classes_1.dex
|
||||
path.2=classes_0.dex
|
||||
path.1=classes.dex
|
||||
|
||||
+3
@@ -55,6 +55,8 @@ __webpack_require__.r(__webpack_exports__);
|
||||
/* harmony import */ var _group_contacts_routing_module__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./group-contacts-routing.module */ "./src/app/pages/chat/group-messages/group-contacts/group-contacts-routing.module.ts");
|
||||
/* harmony import */ var _group_contacts_page__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./group-contacts.page */ "./src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts");
|
||||
/* harmony import */ var src_app_shared_shared_module__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! src/app/shared/shared.module */ "./src/app/shared/shared.module.ts");
|
||||
/* harmony import */ var src_app_pipes_pipes_module__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! src/app/pipes/pipes.module */ "./src/app/pipes/pipes.module.ts");
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -72,6 +74,7 @@ GroupContactsPageModule = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"
|
||||
_angular_forms__WEBPACK_IMPORTED_MODULE_3__["FormsModule"],
|
||||
_ionic_angular__WEBPACK_IMPORTED_MODULE_4__["IonicModule"],
|
||||
src_app_shared_shared_module__WEBPACK_IMPORTED_MODULE_7__["SharedModule"],
|
||||
src_app_pipes_pipes_module__WEBPACK_IMPORTED_MODULE_8__["PipesModule"],
|
||||
_group_contacts_routing_module__WEBPACK_IMPORTED_MODULE_5__["GroupContactsPageRoutingModule"]
|
||||
],
|
||||
declarations: [_group_contacts_page__WEBPACK_IMPORTED_MODULE_6__["GroupContactsPage"]]
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
{"version":3,"sources":["./src/app/pages/chat/group-messages/group-contacts/group-contacts-routing.module.ts","./src/app/pages/chat/group-messages/group-contacts/group-contacts.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACc;AAEG;AAE1D,MAAM,MAAM,GAAW;IACrB;QACE,IAAI,EAAE,EAAE;QACR,SAAS,EAAE,sEAAiB;KAC7B;CACF,CAAC;AAMF,IAAa,8BAA8B,GAA3C,MAAa,8BAA8B;CAAG;AAAjC,8BAA8B;IAJ1C,8DAAQ,CAAC;QACR,OAAO,EAAE,CAAC,4DAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACxC,OAAO,EAAE,CAAC,4DAAY,CAAC;KACxB,CAAC;GACW,8BAA8B,CAAG;AAAH;;;;;;;;;;;;;;;;;;;;;;;;AChBF;AACM;AACF;AAEA;AAEoC;AAEvB;AACE;AAY5D,IAAa,uBAAuB,GAApC,MAAa,uBAAuB;CAAG;AAA1B,uBAAuB;IAVnC,8DAAQ,CAAC;QACR,OAAO,EAAE;YACP,4DAAY;YACZ,0DAAW;YACX,0DAAW;YACX,yEAAY;YACZ,6FAA8B;SAC/B;QACD,YAAY,EAAE,CAAC,sEAAiB,CAAC;KAClC,CAAC;GACW,uBAAuB,CAAG;AAAH","file":"group-contacts-group-contacts-module-es2015.js","sourcesContent":["import { NgModule } from '@angular/core';\r\nimport { Routes, RouterModule } from '@angular/router';\r\n\r\nimport { GroupContactsPage } from './group-contacts.page';\r\n\r\nconst routes: Routes = [\r\n {\r\n path: '',\r\n component: GroupContactsPage\r\n }\r\n];\r\n\r\n@NgModule({\r\n imports: [RouterModule.forChild(routes)],\r\n exports: [RouterModule],\r\n})\r\nexport class GroupContactsPageRoutingModule {}\r\n","import { NgModule } from '@angular/core';\r\nimport { CommonModule } from '@angular/common';\r\nimport { FormsModule } from '@angular/forms';\r\n\r\nimport { IonicModule } from '@ionic/angular';\r\n\r\nimport { GroupContactsPageRoutingModule } from './group-contacts-routing.module';\r\n\r\nimport { GroupContactsPage } from './group-contacts.page';\r\nimport { SharedModule } from 'src/app/shared/shared.module';\r\n\r\n@NgModule({\r\n imports: [\r\n CommonModule,\r\n FormsModule,\r\n IonicModule,\r\n SharedModule,\r\n GroupContactsPageRoutingModule\r\n ],\r\n declarations: [GroupContactsPage]\r\n})\r\nexport class GroupContactsPageModule {}\r\n"],"sourceRoot":"webpack:///"}
|
||||
{"version":3,"sources":["./src/app/pages/chat/group-messages/group-contacts/group-contacts-routing.module.ts","./src/app/pages/chat/group-messages/group-contacts/group-contacts.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACc;AAEG;AAE1D,MAAM,MAAM,GAAW;IACrB;QACE,IAAI,EAAE,EAAE;QACR,SAAS,EAAE,sEAAiB;KAC7B;CACF,CAAC;AAMF,IAAa,8BAA8B,GAA3C,MAAa,8BAA8B;CAAG;AAAjC,8BAA8B;IAJ1C,8DAAQ,CAAC;QACR,OAAO,EAAE,CAAC,4DAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACxC,OAAO,EAAE,CAAC,4DAAY,CAAC;KACxB,CAAC;GACW,8BAA8B,CAAG;AAAH;;;;;;;;;;;;;;;;;;;;;;;;;AChBF;AACM;AACF;AAEA;AAEoC;AAEvB;AACE;AACH;AAazD,IAAa,uBAAuB,GAApC,MAAa,uBAAuB;CAAG;AAA1B,uBAAuB;IAXnC,8DAAQ,CAAC;QACR,OAAO,EAAE;YACP,4DAAY;YACZ,0DAAW;YACX,0DAAW;YACX,yEAAY;YACZ,sEAAW;YACX,6FAA8B;SAC/B;QACD,YAAY,EAAE,CAAC,sEAAiB,CAAC;KAClC,CAAC;GACW,uBAAuB,CAAG;AAAH","file":"group-contacts-group-contacts-module-es2015.js","sourcesContent":["import { NgModule } from '@angular/core';\r\nimport { Routes, RouterModule } from '@angular/router';\r\n\r\nimport { GroupContactsPage } from './group-contacts.page';\r\n\r\nconst routes: Routes = [\r\n {\r\n path: '',\r\n component: GroupContactsPage\r\n }\r\n];\r\n\r\n@NgModule({\r\n imports: [RouterModule.forChild(routes)],\r\n exports: [RouterModule],\r\n})\r\nexport class GroupContactsPageRoutingModule {}\r\n","import { NgModule } from '@angular/core';\r\nimport { CommonModule } from '@angular/common';\r\nimport { FormsModule } from '@angular/forms';\r\n\r\nimport { IonicModule } from '@ionic/angular';\r\n\r\nimport { GroupContactsPageRoutingModule } from './group-contacts-routing.module';\r\n\r\nimport { GroupContactsPage } from './group-contacts.page';\r\nimport { SharedModule } from 'src/app/shared/shared.module';\r\nimport { PipesModule } from 'src/app/pipes/pipes.module';\r\n\r\n@NgModule({\r\n imports: [\r\n CommonModule,\r\n FormsModule,\r\n IonicModule,\r\n SharedModule,\r\n PipesModule,\r\n GroupContactsPageRoutingModule\r\n ],\r\n declarations: [GroupContactsPage]\r\n})\r\nexport class GroupContactsPageModule {}\r\n"],"sourceRoot":"webpack:///"}
|
||||
+7
-1
@@ -128,13 +128,19 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
var src_app_shared_shared_module__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(
|
||||
/*! src/app/shared/shared.module */
|
||||
"./src/app/shared/shared.module.ts");
|
||||
/* harmony import */
|
||||
|
||||
|
||||
var src_app_pipes_pipes_module__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(
|
||||
/*! src/app/pipes/pipes.module */
|
||||
"./src/app/pipes/pipes.module.ts");
|
||||
|
||||
var GroupContactsPageModule = function GroupContactsPageModule() {
|
||||
_classCallCheck(this, GroupContactsPageModule);
|
||||
};
|
||||
|
||||
GroupContactsPageModule = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([Object(_angular_core__WEBPACK_IMPORTED_MODULE_1__["NgModule"])({
|
||||
imports: [_angular_common__WEBPACK_IMPORTED_MODULE_2__["CommonModule"], _angular_forms__WEBPACK_IMPORTED_MODULE_3__["FormsModule"], _ionic_angular__WEBPACK_IMPORTED_MODULE_4__["IonicModule"], src_app_shared_shared_module__WEBPACK_IMPORTED_MODULE_7__["SharedModule"], _group_contacts_routing_module__WEBPACK_IMPORTED_MODULE_5__["GroupContactsPageRoutingModule"]],
|
||||
imports: [_angular_common__WEBPACK_IMPORTED_MODULE_2__["CommonModule"], _angular_forms__WEBPACK_IMPORTED_MODULE_3__["FormsModule"], _ionic_angular__WEBPACK_IMPORTED_MODULE_4__["IonicModule"], src_app_shared_shared_module__WEBPACK_IMPORTED_MODULE_7__["SharedModule"], src_app_pipes_pipes_module__WEBPACK_IMPORTED_MODULE_8__["PipesModule"], _group_contacts_routing_module__WEBPACK_IMPORTED_MODULE_5__["GroupContactsPageRoutingModule"]],
|
||||
declarations: [_group_contacts_page__WEBPACK_IMPORTED_MODULE_6__["GroupContactsPage"]]
|
||||
})], GroupContactsPageModule);
|
||||
/***/
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
{"version":3,"sources":["webpack:///src/app/pages/chat/group-messages/group-contacts/group-contacts-routing.module.ts","webpack:///src/app/pages/chat/group-messages/group-contacts/group-contacts.module.ts"],"names":["routes","path","component","GroupContactsPageRoutingModule","imports","forChild","exports","GroupContactsPageModule","declarations"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,QAAMA,MAAM,GAAW,CACrB;AACEC,UAAI,EAAE,EADR;AAEEC,eAAS,EAAE;AAFb,KADqB,CAAvB;;AAWA,QAAaC,8BAA8B;AAAA;AAAA,KAA3C;;AAAaA,kCAA8B,6DAJ1C,+DAAS;AACRC,aAAO,EAAE,CAAC,6DAAaC,QAAb,CAAsBL,MAAtB,CAAD,CADD;AAERM,aAAO,EAAE,CAAC,4DAAD;AAFD,KAAT,CAI0C,GAA9BH,8BAA8B,CAA9B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ACKb,QAAaI,uBAAuB;AAAA;AAAA,KAApC;;AAAaA,2BAAuB,6DAVnC,+DAAS;AACRH,aAAO,EAAE,CACP,4DADO,EAEP,0DAFO,EAGP,0DAHO,EAIP,yEAJO,EAKP,6FALO,CADD;AAQRI,kBAAY,EAAE,CAAC,sEAAD;AARN,KAAT,CAUmC,GAAvBD,uBAAuB,CAAvB","file":"group-contacts-group-contacts-module-es5.js","sourcesContent":["import { NgModule } from '@angular/core';\r\nimport { Routes, RouterModule } from '@angular/router';\r\n\r\nimport { GroupContactsPage } from './group-contacts.page';\r\n\r\nconst routes: Routes = [\r\n {\r\n path: '',\r\n component: GroupContactsPage\r\n }\r\n];\r\n\r\n@NgModule({\r\n imports: [RouterModule.forChild(routes)],\r\n exports: [RouterModule],\r\n})\r\nexport class GroupContactsPageRoutingModule {}\r\n","import { NgModule } from '@angular/core';\r\nimport { CommonModule } from '@angular/common';\r\nimport { FormsModule } from '@angular/forms';\r\n\r\nimport { IonicModule } from '@ionic/angular';\r\n\r\nimport { GroupContactsPageRoutingModule } from './group-contacts-routing.module';\r\n\r\nimport { GroupContactsPage } from './group-contacts.page';\r\nimport { SharedModule } from 'src/app/shared/shared.module';\r\n\r\n@NgModule({\r\n imports: [\r\n CommonModule,\r\n FormsModule,\r\n IonicModule,\r\n SharedModule,\r\n GroupContactsPageRoutingModule\r\n ],\r\n declarations: [GroupContactsPage]\r\n})\r\nexport class GroupContactsPageModule {}\r\n"]}
|
||||
{"version":3,"sources":["webpack:///src/app/pages/chat/group-messages/group-contacts/group-contacts-routing.module.ts","webpack:///src/app/pages/chat/group-messages/group-contacts/group-contacts.module.ts"],"names":["routes","path","component","GroupContactsPageRoutingModule","imports","forChild","exports","GroupContactsPageModule","declarations"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,QAAMA,MAAM,GAAW,CACrB;AACEC,UAAI,EAAE,EADR;AAEEC,eAAS,EAAE;AAFb,KADqB,CAAvB;;AAWA,QAAaC,8BAA8B;AAAA;AAAA,KAA3C;;AAAaA,kCAA8B,6DAJ1C,+DAAS;AACRC,aAAO,EAAE,CAAC,6DAAaC,QAAb,CAAsBL,MAAtB,CAAD,CADD;AAERM,aAAO,EAAE,CAAC,4DAAD;AAFD,KAAT,CAI0C,GAA9BH,8BAA8B,CAA9B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ACOb,QAAaI,uBAAuB;AAAA;AAAA,KAApC;;AAAaA,2BAAuB,6DAXnC,+DAAS;AACRH,aAAO,EAAE,CACP,4DADO,EAEP,0DAFO,EAGP,0DAHO,EAIP,yEAJO,EAKP,sEALO,EAMP,6FANO,CADD;AASRI,kBAAY,EAAE,CAAC,sEAAD;AATN,KAAT,CAWmC,GAAvBD,uBAAuB,CAAvB","file":"group-contacts-group-contacts-module-es5.js","sourcesContent":["import { NgModule } from '@angular/core';\r\nimport { Routes, RouterModule } from '@angular/router';\r\n\r\nimport { GroupContactsPage } from './group-contacts.page';\r\n\r\nconst routes: Routes = [\r\n {\r\n path: '',\r\n component: GroupContactsPage\r\n }\r\n];\r\n\r\n@NgModule({\r\n imports: [RouterModule.forChild(routes)],\r\n exports: [RouterModule],\r\n})\r\nexport class GroupContactsPageRoutingModule {}\r\n","import { NgModule } from '@angular/core';\r\nimport { CommonModule } from '@angular/common';\r\nimport { FormsModule } from '@angular/forms';\r\n\r\nimport { IonicModule } from '@ionic/angular';\r\n\r\nimport { GroupContactsPageRoutingModule } from './group-contacts-routing.module';\r\n\r\nimport { GroupContactsPage } from './group-contacts.page';\r\nimport { SharedModule } from 'src/app/shared/shared.module';\r\nimport { PipesModule } from 'src/app/pipes/pipes.module';\r\n\r\n@NgModule({\r\n imports: [\r\n CommonModule,\r\n FormsModule,\r\n IonicModule,\r\n SharedModule,\r\n PipesModule,\r\n GroupContactsPageRoutingModule\r\n ],\r\n declarations: [GroupContactsPage]\r\n})\r\nexport class GroupContactsPageModule {}\r\n"]}
|
||||
@@ -634,7 +634,7 @@ __webpack_require__.r(__webpack_exports__);
|
||||
// The list of file replacements can be found in `angular.json`.
|
||||
const environment = {
|
||||
production: false,
|
||||
apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V3/api/',
|
||||
apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/',
|
||||
/* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/', */
|
||||
apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
|
||||
domain: 'gabinetedigital.local',
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -775,7 +775,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
|
||||
var environment = {
|
||||
production: false,
|
||||
apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V3/api/',
|
||||
apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/',
|
||||
|
||||
/* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/', */
|
||||
apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
|
||||
|
||||
File diff suppressed because one or more lines are too long
+42
-80
@@ -35,7 +35,7 @@ __webpack_require__.r(__webpack_exports__);
|
||||
|
||||
"use strict";
|
||||
__webpack_require__.r(__webpack_exports__);
|
||||
/* harmony default export */ __webpack_exports__["default"] = ("<ion-header class=\"ion-no-border\">\r\n <ion-toolbar class=\"header-toolbar\">\r\n <div class=\"main-header\">\r\n <div class=\"title-content\">\r\n <div class=\"back-icon\">\r\n <ion-icon (click)=\"close()\" slot=\"end\" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>\r\n </div>\r\n <div class=\"div-title\">\r\n <ion-label class=\"title\">Contactos</ion-label>\r\n </div>\r\n <app-btn-seguinte (click)=\"groupMessages()\"></app-btn-seguinte>\r\n </div>\r\n </div>\r\n </ion-toolbar>\r\n <ion-toolbar class=\"toolbar-search\">\r\n <div class=\"search\">\r\n <ion-searchbar (ionChange)=\"onChange($event)\" placeholder=\"Pesquisar por cantacto\" ></ion-searchbar>\r\n </div>\r\n </ion-toolbar>\r\n</ion-header>\r\n\r\n<ion-content>\r\n <ion-refresher name=\"refresher\" slot=\"fixed\" (ionRefresh)=\"doRefresh($event)\">\r\n <ion-progress-bar type=\"indeterminate\" *ngIf=\"showLoader\"></ion-progress-bar>\r\n <ion-refresher-content>\r\n </ion-refresher-content>\r\n </ion-refresher>\r\n <div class=\"main-content\">\r\n \r\n <!-- <ion-list>\r\n <ion-item *ngFor=\"let user of searchedItem\">\r\n {{user.name}}\r\n </ion-item>\r\n </ion-list> -->\r\n\r\n <ion-virtual-scroll [items]=\"users\" approxItemHeight=\"70px\" [headerFn]=\"separateLetter\">\r\n \r\n <div class=\"item-divider\" *virtualHeader=\"let header\">\r\n <ion-label>{{header}}</ion-label>\r\n </div>\r\n\r\n <div *virtualItem=\"let user\" class=\"item-checkbox\">\r\n <ion-checkbox color=\"primary\"></ion-checkbox>\r\n <p>{{user.first}} {{user.last}}</p>\r\n <ion-icon name=\"ellipse\"></ion-icon>\r\n </div>\r\n \r\n </ion-virtual-scroll>\r\n \r\n </div> \r\n</ion-content>\r\n");
|
||||
/* harmony default export */ __webpack_exports__["default"] = ("<ion-header class=\"ion-no-border\">\r\n <ion-toolbar class=\"header-toolbar\">\r\n <div class=\"main-header\">\r\n <div class=\"title-content\">\r\n <div class=\"back-icon\">\r\n <ion-icon (click)=\"close()\" slot=\"end\" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>\r\n </div>\r\n <div class=\"div-title\">\r\n <ion-label class=\"title\">Contactos</ion-label>\r\n </div>\r\n <app-btn-seguinte (click)=\"groupMessages()\"></app-btn-seguinte>\r\n </div>\r\n </div>\r\n </ion-toolbar>\r\n <ion-toolbar class=\"toolbar-search\">\r\n <div class=\"search\">\r\n <ion-searchbar debounce=\"500\" (ionChange)=\"onChange($event)\" placeholder=\"Pesquisar por cantacto\" ></ion-searchbar>\r\n </div>\r\n </ion-toolbar>\r\n</ion-header>\r\n\r\n<ion-content>\r\n <ion-refresher name=\"refresher\" slot=\"fixed\" (ionRefresh)=\"doRefresh($event)\">\r\n <ion-progress-bar type=\"indeterminate\" *ngIf=\"showLoader\"></ion-progress-bar>\r\n <ion-refresher-content>\r\n </ion-refresher-content>\r\n </ion-refresher>\r\n \r\n <div class=\"main-content\">\r\n <ion-virtual-scroll [items]=\"users | filter:textSearch: 'name'\" approxItemHeight=\"70px\" [headerFn]=\"separateLetter\">\r\n \r\n <div class=\"item-divider\" *virtualHeader=\"let header\">\r\n <ion-label>{{header}}</ion-label>\r\n </div>\r\n\r\n <div *virtualItem=\"let user\" class=\"item-checkbox\">\r\n <ion-checkbox color=\"primary\"></ion-checkbox>\r\n <p>{{user.name}}</p>\r\n <ion-icon name=\"ellipse\"></ion-icon>\r\n </div>\r\n \r\n </ion-virtual-scroll>\r\n \r\n </div> \r\n</ion-content>\r\n");
|
||||
|
||||
/***/ }),
|
||||
|
||||
@@ -606,55 +606,30 @@ __webpack_require__.r(__webpack_exports__);
|
||||
/* harmony import */ var _angular_common_http__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @angular/common/http */ "./node_modules/@angular/common/__ivy_ngcc__/fesm2015/http.js");
|
||||
/* harmony import */ var _angular_core__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @angular/core */ "./node_modules/@angular/core/__ivy_ngcc__/fesm2015/core.js");
|
||||
/* harmony import */ var _ionic_angular__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @ionic/angular */ "./node_modules/@ionic/angular/__ivy_ngcc__/fesm2015/ionic-angular.js");
|
||||
/* harmony import */ var _group_messages_page__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../group-messages.page */ "./src/app/pages/chat/group-messages/group-messages.page.ts");
|
||||
/* harmony import */ var src_app_services_auth_service__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! src/app/services/auth.service */ "./src/app/services/auth.service.ts");
|
||||
/* harmony import */ var src_app_services_chat_service__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! src/app/services/chat.service */ "./src/app/services/chat.service.ts");
|
||||
/* harmony import */ var _group_messages_page__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../group-messages.page */ "./src/app/pages/chat/group-messages/group-messages.page.ts");
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
let GroupContactsPage = class GroupContactsPage {
|
||||
constructor(modalController, http) {
|
||||
constructor(modalController, http, chatService, authService) {
|
||||
this.modalController = modalController;
|
||||
this.http = http;
|
||||
this.chatService = chatService;
|
||||
this.authService = authService;
|
||||
this.users = [];
|
||||
this.contact = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"];
|
||||
this.contacts = [
|
||||
{
|
||||
first: 'Ana',
|
||||
last: 'Manuel',
|
||||
url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
|
||||
},
|
||||
{
|
||||
first: 'Abdullah',
|
||||
last: 'Hill',
|
||||
url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
|
||||
},
|
||||
{
|
||||
first: 'Batur',
|
||||
last: 'Oymen',
|
||||
url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
|
||||
},
|
||||
{
|
||||
first: 'Bianca',
|
||||
last: 'Costa',
|
||||
url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
|
||||
},
|
||||
{
|
||||
first: 'Zaya',
|
||||
last: 'Mary',
|
||||
url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
|
||||
},
|
||||
{
|
||||
first: 'Tiago',
|
||||
last: 'Kayaya',
|
||||
url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
|
||||
}
|
||||
];
|
||||
this.headers = new _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpHeaders"]();
|
||||
this.headers = this.headers.set('Access-Control-Allow-Origin', '*');
|
||||
this.headers = this.headers.set('Access-Control-Allow-Methods', 'POST, GET, OPTIONS, PUT');
|
||||
this.headers = this.headers.set('Accept', 'application/json');
|
||||
this.headers = this.headers.set('content-type', 'application/json');
|
||||
this.authService.userData$.subscribe((res) => {
|
||||
this.loggedUser = res;
|
||||
});
|
||||
this.textSearch = "";
|
||||
this.dm = null;
|
||||
this.room = null;
|
||||
}
|
||||
ngOnInit() {
|
||||
this.loadUsers();
|
||||
@@ -663,47 +638,27 @@ let GroupContactsPage = class GroupContactsPage {
|
||||
this.options = {
|
||||
headers: this.headers,
|
||||
};
|
||||
/* this.http.get('https://randomuser.me/api/?results=100', this.options)
|
||||
.subscribe(res => {
|
||||
this.users = res['results'].sort((a,b) => {
|
||||
if(a.name.first < b.name.first){
|
||||
return -1;
|
||||
}
|
||||
if(a.name.first > b.name.first){
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
});
|
||||
console.log(res);
|
||||
console.log(this.users);
|
||||
}); */
|
||||
this.users = this.contacts.sort((a, b) => {
|
||||
if (a.first < b.first) {
|
||||
return -1;
|
||||
}
|
||||
if (a.first > b.first) {
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
this.chatService.getAllUsers().subscribe((res) => {
|
||||
console.log(res.users);
|
||||
this.contacts = res.users.filter(data => data.username != this.loggedUser.me.username);
|
||||
this.users = this.contacts.sort((a, b) => {
|
||||
if (a.name < b.name) {
|
||||
return -1;
|
||||
}
|
||||
if (a.name > b.name) {
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
});
|
||||
this.showLoader = false;
|
||||
});
|
||||
}
|
||||
separateLetter(record, recordIndex, records) {
|
||||
/* if(recordIndex == 0){
|
||||
return record.name.first[0];
|
||||
}
|
||||
|
||||
let first_prev = records[recordIndex - 1].name.first[0];
|
||||
let first_current = record.name.first[0];
|
||||
|
||||
if(first_prev != first_current){
|
||||
return first_current;
|
||||
}
|
||||
return null; */
|
||||
if (recordIndex == 0) {
|
||||
return record.first[0];
|
||||
return record.name[0];
|
||||
}
|
||||
let first_prev = records[recordIndex - 1].first[0];
|
||||
let first_current = record.first[0];
|
||||
let first_prev = records[recordIndex - 1].name[0];
|
||||
let first_current = record.name[0];
|
||||
if (first_prev != first_current) {
|
||||
return first_current;
|
||||
}
|
||||
@@ -712,9 +667,10 @@ let GroupContactsPage = class GroupContactsPage {
|
||||
doRefresh(event) {
|
||||
}
|
||||
close() {
|
||||
this.modalController.dismiss();
|
||||
this.modalController.dismiss(true);
|
||||
}
|
||||
onChange(event) {
|
||||
this.textSearch = event.detail.value;
|
||||
}
|
||||
clicked() {
|
||||
console.log('clicked');
|
||||
@@ -723,19 +679,25 @@ let GroupContactsPage = class GroupContactsPage {
|
||||
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
|
||||
this.close();
|
||||
const modal = yield this.modalController.create({
|
||||
component: _group_messages_page__WEBPACK_IMPORTED_MODULE_4__["GroupMessagesPage"],
|
||||
component: _group_messages_page__WEBPACK_IMPORTED_MODULE_6__["GroupMessagesPage"],
|
||||
componentProps: {},
|
||||
cssClass: 'contacts',
|
||||
backdropDismiss: false
|
||||
});
|
||||
yield modal.present();
|
||||
modal.onDidDismiss();
|
||||
modal.onDidDismiss().then(res => {
|
||||
if (res.data) {
|
||||
console.log('go to new group');
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
};
|
||||
GroupContactsPage.ctorParameters = () => [
|
||||
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_3__["ModalController"] },
|
||||
{ type: _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpClient"] }
|
||||
{ type: _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpClient"] },
|
||||
{ type: src_app_services_chat_service__WEBPACK_IMPORTED_MODULE_5__["ChatService"] },
|
||||
{ type: src_app_services_auth_service__WEBPACK_IMPORTED_MODULE_4__["AuthService"] }
|
||||
];
|
||||
GroupContactsPage = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
|
||||
Object(_angular_core__WEBPACK_IMPORTED_MODULE_2__["Component"])({
|
||||
|
||||
+1
-1
File diff suppressed because one or more lines are too long
+105
-118
@@ -61,7 +61,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
/* harmony default export */
|
||||
|
||||
|
||||
__webpack_exports__["default"] = "<ion-header class=\"ion-no-border\">\r\n <ion-toolbar class=\"header-toolbar\">\r\n <div class=\"main-header\">\r\n <div class=\"title-content\">\r\n <div class=\"back-icon\">\r\n <ion-icon (click)=\"close()\" slot=\"end\" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>\r\n </div>\r\n <div class=\"div-title\">\r\n <ion-label class=\"title\">Contactos</ion-label>\r\n </div>\r\n <app-btn-seguinte (click)=\"groupMessages()\"></app-btn-seguinte>\r\n </div>\r\n </div>\r\n </ion-toolbar>\r\n <ion-toolbar class=\"toolbar-search\">\r\n <div class=\"search\">\r\n <ion-searchbar (ionChange)=\"onChange($event)\" placeholder=\"Pesquisar por cantacto\" ></ion-searchbar>\r\n </div>\r\n </ion-toolbar>\r\n</ion-header>\r\n\r\n<ion-content>\r\n <ion-refresher name=\"refresher\" slot=\"fixed\" (ionRefresh)=\"doRefresh($event)\">\r\n <ion-progress-bar type=\"indeterminate\" *ngIf=\"showLoader\"></ion-progress-bar>\r\n <ion-refresher-content>\r\n </ion-refresher-content>\r\n </ion-refresher>\r\n <div class=\"main-content\">\r\n \r\n <!-- <ion-list>\r\n <ion-item *ngFor=\"let user of searchedItem\">\r\n {{user.name}}\r\n </ion-item>\r\n </ion-list> -->\r\n\r\n <ion-virtual-scroll [items]=\"users\" approxItemHeight=\"70px\" [headerFn]=\"separateLetter\">\r\n \r\n <div class=\"item-divider\" *virtualHeader=\"let header\">\r\n <ion-label>{{header}}</ion-label>\r\n </div>\r\n\r\n <div *virtualItem=\"let user\" class=\"item-checkbox\">\r\n <ion-checkbox color=\"primary\"></ion-checkbox>\r\n <p>{{user.first}} {{user.last}}</p>\r\n <ion-icon name=\"ellipse\"></ion-icon>\r\n </div>\r\n \r\n </ion-virtual-scroll>\r\n \r\n </div> \r\n</ion-content>\r\n";
|
||||
__webpack_exports__["default"] = "<ion-header class=\"ion-no-border\">\r\n <ion-toolbar class=\"header-toolbar\">\r\n <div class=\"main-header\">\r\n <div class=\"title-content\">\r\n <div class=\"back-icon\">\r\n <ion-icon (click)=\"close()\" slot=\"end\" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>\r\n </div>\r\n <div class=\"div-title\">\r\n <ion-label class=\"title\">Contactos</ion-label>\r\n </div>\r\n <app-btn-seguinte (click)=\"groupMessages()\"></app-btn-seguinte>\r\n </div>\r\n </div>\r\n </ion-toolbar>\r\n <ion-toolbar class=\"toolbar-search\">\r\n <div class=\"search\">\r\n <ion-searchbar debounce=\"500\" (ionChange)=\"onChange($event)\" placeholder=\"Pesquisar por cantacto\" ></ion-searchbar>\r\n </div>\r\n </ion-toolbar>\r\n</ion-header>\r\n\r\n<ion-content>\r\n <ion-refresher name=\"refresher\" slot=\"fixed\" (ionRefresh)=\"doRefresh($event)\">\r\n <ion-progress-bar type=\"indeterminate\" *ngIf=\"showLoader\"></ion-progress-bar>\r\n <ion-refresher-content>\r\n </ion-refresher-content>\r\n </ion-refresher>\r\n \r\n <div class=\"main-content\">\r\n <ion-virtual-scroll [items]=\"users | filter:textSearch: 'name'\" approxItemHeight=\"70px\" [headerFn]=\"separateLetter\">\r\n \r\n <div class=\"item-divider\" *virtualHeader=\"let header\">\r\n <ion-label>{{header}}</ion-label>\r\n </div>\r\n\r\n <div *virtualItem=\"let user\" class=\"item-checkbox\">\r\n <ion-checkbox color=\"primary\"></ion-checkbox>\r\n <p>{{user.name}}</p>\r\n <ion-icon name=\"ellipse\"></ion-icon>\r\n </div>\r\n \r\n </ion-virtual-scroll>\r\n \r\n </div> \r\n</ion-content>\r\n";
|
||||
/***/
|
||||
},
|
||||
|
||||
@@ -1079,48 +1079,40 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
/* harmony import */
|
||||
|
||||
|
||||
var _group_messages_page__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(
|
||||
var src_app_services_auth_service__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(
|
||||
/*! src/app/services/auth.service */
|
||||
"./src/app/services/auth.service.ts");
|
||||
/* harmony import */
|
||||
|
||||
|
||||
var src_app_services_chat_service__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(
|
||||
/*! src/app/services/chat.service */
|
||||
"./src/app/services/chat.service.ts");
|
||||
/* harmony import */
|
||||
|
||||
|
||||
var _group_messages_page__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(
|
||||
/*! ../group-messages.page */
|
||||
"./src/app/pages/chat/group-messages/group-messages.page.ts");
|
||||
|
||||
var GroupContactsPage = /*#__PURE__*/function () {
|
||||
function GroupContactsPage(modalController, http) {
|
||||
function GroupContactsPage(modalController, http, chatService, authService) {
|
||||
var _this6 = this;
|
||||
|
||||
_classCallCheck(this, GroupContactsPage);
|
||||
|
||||
this.modalController = modalController;
|
||||
this.http = http;
|
||||
this.chatService = chatService;
|
||||
this.authService = authService;
|
||||
this.users = [];
|
||||
this.contact = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"];
|
||||
this.contacts = [{
|
||||
first: 'Ana',
|
||||
last: 'Manuel',
|
||||
url: 'https://randomuser.me/api/portraits/med/women/54.jpg'
|
||||
}, {
|
||||
first: 'Abdullah',
|
||||
last: 'Hill',
|
||||
url: 'https://randomuser.me/api/portraits/med/women/54.jpg'
|
||||
}, {
|
||||
first: 'Batur',
|
||||
last: 'Oymen',
|
||||
url: 'https://randomuser.me/api/portraits/med/women/54.jpg'
|
||||
}, {
|
||||
first: 'Bianca',
|
||||
last: 'Costa',
|
||||
url: 'https://randomuser.me/api/portraits/med/women/54.jpg'
|
||||
}, {
|
||||
first: 'Zaya',
|
||||
last: 'Mary',
|
||||
url: 'https://randomuser.me/api/portraits/med/women/54.jpg'
|
||||
}, {
|
||||
first: 'Tiago',
|
||||
last: 'Kayaya',
|
||||
url: 'https://randomuser.me/api/portraits/med/women/54.jpg'
|
||||
}];
|
||||
this.headers = new _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpHeaders"]();
|
||||
this.headers = this.headers.set('Access-Control-Allow-Origin', '*');
|
||||
this.headers = this.headers.set('Access-Control-Allow-Methods', 'POST, GET, OPTIONS, PUT');
|
||||
this.headers = this.headers.set('Accept', 'application/json');
|
||||
this.headers = this.headers.set('content-type', 'application/json');
|
||||
this.authService.userData$.subscribe(function (res) {
|
||||
_this6.loggedUser = res;
|
||||
});
|
||||
this.textSearch = "";
|
||||
this.dm = null;
|
||||
this.room = null;
|
||||
}
|
||||
|
||||
_createClass(GroupContactsPage, [{
|
||||
@@ -1131,54 +1123,39 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
}, {
|
||||
key: "loadUsers",
|
||||
value: function loadUsers() {
|
||||
var _this7 = this;
|
||||
|
||||
this.options = {
|
||||
headers: this.headers
|
||||
};
|
||||
/* this.http.get('https://randomuser.me/api/?results=100', this.options)
|
||||
.subscribe(res => {
|
||||
this.users = res['results'].sort((a,b) => {
|
||||
if(a.name.first < b.name.first){
|
||||
this.chatService.getAllUsers().subscribe(function (res) {
|
||||
console.log(res.users);
|
||||
_this7.contacts = res.users.filter(function (data) {
|
||||
return data.username != _this7.loggedUser.me.username;
|
||||
});
|
||||
_this7.users = _this7.contacts.sort(function (a, b) {
|
||||
if (a.name < b.name) {
|
||||
return -1;
|
||||
}
|
||||
if(a.name.first > b.name.first){
|
||||
|
||||
if (a.name > b.name) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
});
|
||||
console.log(res);
|
||||
console.log(this.users);
|
||||
}); */
|
||||
|
||||
this.users = this.contacts.sort(function (a, b) {
|
||||
if (a.first < b.first) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (a.first > b.first) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
_this7.showLoader = false;
|
||||
});
|
||||
}
|
||||
}, {
|
||||
key: "separateLetter",
|
||||
value: function separateLetter(record, recordIndex, records) {
|
||||
/* if(recordIndex == 0){
|
||||
return record.name.first[0];
|
||||
}
|
||||
let first_prev = records[recordIndex - 1].name.first[0];
|
||||
let first_current = record.name.first[0];
|
||||
if(first_prev != first_current){
|
||||
return first_current;
|
||||
}
|
||||
return null; */
|
||||
if (recordIndex == 0) {
|
||||
return record.first[0];
|
||||
return record.name[0];
|
||||
}
|
||||
|
||||
var first_prev = records[recordIndex - 1].first[0];
|
||||
var first_current = record.first[0];
|
||||
var first_prev = records[recordIndex - 1].name[0];
|
||||
var first_current = record.name[0];
|
||||
|
||||
if (first_prev != first_current) {
|
||||
return first_current;
|
||||
@@ -1192,11 +1169,13 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
}, {
|
||||
key: "close",
|
||||
value: function close() {
|
||||
this.modalController.dismiss();
|
||||
this.modalController.dismiss(true);
|
||||
}
|
||||
}, {
|
||||
key: "onChange",
|
||||
value: function onChange(event) {}
|
||||
value: function onChange(event) {
|
||||
this.textSearch = event.detail.value;
|
||||
}
|
||||
}, {
|
||||
key: "clicked",
|
||||
value: function clicked() {
|
||||
@@ -1214,7 +1193,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
this.close();
|
||||
_context6.next = 3;
|
||||
return this.modalController.create({
|
||||
component: _group_messages_page__WEBPACK_IMPORTED_MODULE_4__["GroupMessagesPage"],
|
||||
component: _group_messages_page__WEBPACK_IMPORTED_MODULE_6__["GroupMessagesPage"],
|
||||
componentProps: {},
|
||||
cssClass: 'contacts',
|
||||
backdropDismiss: false
|
||||
@@ -1226,7 +1205,11 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
return modal.present();
|
||||
|
||||
case 6:
|
||||
modal.onDidDismiss();
|
||||
modal.onDidDismiss().then(function (res) {
|
||||
if (res.data) {
|
||||
console.log('go to new group');
|
||||
}
|
||||
});
|
||||
|
||||
case 7:
|
||||
case "end":
|
||||
@@ -1246,6 +1229,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
type: _ionic_angular__WEBPACK_IMPORTED_MODULE_3__["ModalController"]
|
||||
}, {
|
||||
type: _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpClient"]
|
||||
}, {
|
||||
type: src_app_services_chat_service__WEBPACK_IMPORTED_MODULE_5__["ChatService"]
|
||||
}, {
|
||||
type: src_app_services_auth_service__WEBPACK_IMPORTED_MODULE_4__["AuthService"]
|
||||
}];
|
||||
};
|
||||
|
||||
@@ -1367,11 +1354,11 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
_createClass(GroupMessagesPage, [{
|
||||
key: "ngOnInit",
|
||||
value: function ngOnInit() {
|
||||
var _this6 = this;
|
||||
var _this8 = this;
|
||||
|
||||
this.authService.userData$.subscribe(function (res) {
|
||||
_this6.loggedUser = res;
|
||||
console.log(_this6.loggedUser);
|
||||
_this8.loggedUser = res;
|
||||
console.log(_this8.loggedUser);
|
||||
});
|
||||
this.getGroupContacts();
|
||||
this.loadGroupMessages();
|
||||
@@ -1379,45 +1366,45 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
}, {
|
||||
key: "getGroupContacts",
|
||||
value: function getGroupContacts() {
|
||||
var _this7 = this;
|
||||
var _this9 = this;
|
||||
|
||||
//If group is private call getGroupMembers
|
||||
if (this.room.t === 'p') {
|
||||
this.chatService.getGroupMembers(this.room._id).subscribe(function (res) {
|
||||
console.log(res);
|
||||
_this7.members = res['members'];
|
||||
_this9.members = res['members'];
|
||||
});
|
||||
} //Otherwise call getChannelMembers for públic groups
|
||||
else {
|
||||
this.chatService.getChannelMembers(this.room._id).subscribe(function (res) {
|
||||
console.log(res);
|
||||
_this7.members = res['members'];
|
||||
_this9.members = res['members'];
|
||||
});
|
||||
}
|
||||
}
|
||||
}, {
|
||||
key: "loadGroupMessages",
|
||||
value: function loadGroupMessages() {
|
||||
var _this8 = this;
|
||||
var _this10 = this;
|
||||
|
||||
//If group is private call getGroupMembers
|
||||
if (this.room.t === 'p') {
|
||||
this.chatService.getPrivateGroupMessages(this.room._id).subscribe(function (res) {
|
||||
console.log(res);
|
||||
_this8.messages = res['messages'].reverse();
|
||||
_this10.messages = res['messages'].reverse();
|
||||
});
|
||||
} //Otherwise call getChannelMembers for públic groups
|
||||
else {
|
||||
this.chatService.getPublicGroupMessages(this.room._id).subscribe(function (res) {
|
||||
console.log(res);
|
||||
_this8.messages = res['messages'].reverse();
|
||||
_this10.messages = res['messages'].reverse();
|
||||
});
|
||||
}
|
||||
}
|
||||
}, {
|
||||
key: "sendMessage",
|
||||
value: function sendMessage() {
|
||||
var _this9 = this;
|
||||
var _this11 = this;
|
||||
|
||||
var body = {
|
||||
"message": {
|
||||
@@ -1426,7 +1413,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
}
|
||||
};
|
||||
this.chatService.sendMessage(body).subscribe(function (res) {
|
||||
_this9.loadGroupMessages();
|
||||
_this11.loadGroupMessages();
|
||||
});
|
||||
this.message = "";
|
||||
}
|
||||
@@ -1477,7 +1464,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
key: "openOptions",
|
||||
value: function openOptions(ev) {
|
||||
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
|
||||
var _this10 = this;
|
||||
var _this12 = this;
|
||||
|
||||
var popover;
|
||||
return regeneratorRuntime.wrap(function _callee8$(_context8) {
|
||||
@@ -1503,7 +1490,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
case 5:
|
||||
popover.onDidDismiss().then(function (res) {
|
||||
if (res.data) {
|
||||
_this10.modalController.dismiss();
|
||||
_this12.modalController.dismiss();
|
||||
}
|
||||
|
||||
;
|
||||
@@ -1705,7 +1692,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
|
||||
var ContactsPage = /*#__PURE__*/function () {
|
||||
function ContactsPage(modalController, http, chatService, authService) {
|
||||
var _this11 = this;
|
||||
var _this13 = this;
|
||||
|
||||
_classCallCheck(this, ContactsPage);
|
||||
|
||||
@@ -1715,7 +1702,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
this.authService = authService;
|
||||
this.users = [];
|
||||
this.authService.userData$.subscribe(function (res) {
|
||||
_this11.loggedUser = res;
|
||||
_this13.loggedUser = res;
|
||||
});
|
||||
this.textSearch = "";
|
||||
this.dm = null;
|
||||
@@ -1735,17 +1722,17 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
}, {
|
||||
key: "loadUsers",
|
||||
value: function loadUsers() {
|
||||
var _this12 = this;
|
||||
var _this14 = this;
|
||||
|
||||
this.options = {
|
||||
headers: this.headers
|
||||
};
|
||||
this.chatService.getAllUsers().subscribe(function (res) {
|
||||
console.log(res.users);
|
||||
_this12.contacts = res.users.filter(function (data) {
|
||||
return data.username != _this12.loggedUser.me.username;
|
||||
_this14.contacts = res.users.filter(function (data) {
|
||||
return data.username != _this14.loggedUser.me.username;
|
||||
});
|
||||
_this12.users = _this12.contacts.sort(function (a, b) {
|
||||
_this14.users = _this14.contacts.sort(function (a, b) {
|
||||
if (a.name < b.name) {
|
||||
return -1;
|
||||
}
|
||||
@@ -1756,7 +1743,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
|
||||
return 0;
|
||||
});
|
||||
_this12.showLoader = false;
|
||||
_this14.showLoader = false;
|
||||
});
|
||||
}
|
||||
}, {
|
||||
@@ -1791,32 +1778,32 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
}, {
|
||||
key: "createRoom",
|
||||
value: function createRoom(username) {
|
||||
var _this13 = this;
|
||||
var _this15 = this;
|
||||
|
||||
var body = {
|
||||
username: username
|
||||
};
|
||||
this.chatService.createRoom(body).subscribe(function (res) {
|
||||
console.log(res);
|
||||
_this13.room = res['room'];
|
||||
_this15.room = res['room'];
|
||||
|
||||
_this13.getDirectMessage(_this13.room._id);
|
||||
_this15.getDirectMessage(_this15.room._id);
|
||||
});
|
||||
}
|
||||
}, {
|
||||
key: "getDirectMessage",
|
||||
value: function getDirectMessage(roomId) {
|
||||
var _this14 = this;
|
||||
var _this16 = this;
|
||||
|
||||
console.log(roomId);
|
||||
this.chatService.getAllDirectMessages().subscribe(function (res) {
|
||||
var result = res['ims'].filter(function (data) {
|
||||
return data._id == roomId;
|
||||
});
|
||||
_this14.dm = result[0];
|
||||
console.log(_this14.dm);
|
||||
_this16.dm = result[0];
|
||||
console.log(_this16.dm);
|
||||
|
||||
_this14.openModal(_this14.dm);
|
||||
_this16.openModal(_this16.dm);
|
||||
});
|
||||
}
|
||||
}, {
|
||||
@@ -2025,12 +2012,12 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
_createClass(MessagesPage, [{
|
||||
key: "ngOnInit",
|
||||
value: function ngOnInit() {
|
||||
var _this15 = this;
|
||||
var _this17 = this;
|
||||
|
||||
this.scrollToBottom();
|
||||
this.authService.userData$.subscribe(function (res) {
|
||||
_this15.loggedUser = res;
|
||||
console.log(_this15.loggedUser);
|
||||
_this17.loggedUser = res;
|
||||
console.log(_this17.loggedUser);
|
||||
});
|
||||
/* console.log(this.dm); */
|
||||
|
||||
@@ -2065,16 +2052,16 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
}, {
|
||||
key: "checkUserPresence",
|
||||
value: function checkUserPresence() {
|
||||
var _this16 = this;
|
||||
var _this18 = this;
|
||||
|
||||
this.chatService.getUserPresence(this.dm.lastMessage.u._id).subscribe(function (res) {
|
||||
_this16.userPresence = res['presence'];
|
||||
_this18.userPresence = res['presence'];
|
||||
});
|
||||
}
|
||||
}, {
|
||||
key: "sendMessage",
|
||||
value: function sendMessage() {
|
||||
var _this17 = this;
|
||||
var _this19 = this;
|
||||
|
||||
var body = {
|
||||
"message": {
|
||||
@@ -2083,31 +2070,31 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
}
|
||||
};
|
||||
this.chatService.sendMessage(body).subscribe(function (res) {
|
||||
_this17.loadMessages();
|
||||
_this19.loadMessages();
|
||||
});
|
||||
this.message = "";
|
||||
}
|
||||
}, {
|
||||
key: "loadMessages",
|
||||
value: function loadMessages() {
|
||||
var _this18 = this;
|
||||
var _this20 = this;
|
||||
|
||||
this.chatService.getRoomMessages(this.dm._id).subscribe(function (res) {
|
||||
/* console.log(res); */
|
||||
_this18.messages = res['messages'].reverse();
|
||||
_this20.messages = res['messages'].reverse();
|
||||
});
|
||||
}
|
||||
}, {
|
||||
key: "getChatMembers",
|
||||
value: function getChatMembers() {
|
||||
var _this19 = this;
|
||||
var _this21 = this;
|
||||
|
||||
this.chatService.getMembers(this.dm._id).subscribe(function (res) {
|
||||
_this19.dmUsers = res['members'].filter(function (data) {
|
||||
return data.username != _this19.loggedUser.me.username;
|
||||
_this21.dmUsers = res['members'].filter(function (data) {
|
||||
return data.username != _this21.loggedUser.me.username;
|
||||
});
|
||||
console.log(res);
|
||||
console.log(_this19.dmUsers);
|
||||
console.log(_this21.dmUsers);
|
||||
});
|
||||
}
|
||||
}, {
|
||||
@@ -2655,7 +2642,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
key: "showPicker",
|
||||
value: function showPicker() {
|
||||
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee20() {
|
||||
var _this20 = this;
|
||||
var _this22 = this;
|
||||
|
||||
var picker;
|
||||
return regeneratorRuntime.wrap(function _callee20$(_context20) {
|
||||
@@ -2674,29 +2661,29 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
cssClass: 'btn-cancel',
|
||||
handler: function handler(value) {
|
||||
console.log('button done pressed');
|
||||
_this20.selectedDuration = [value.days.value, value.hours.value, value.minutes.value];
|
||||
console.log(_this20.selectedDuration);
|
||||
_this22.selectedDuration = [value.days.value, value.hours.value, value.minutes.value];
|
||||
console.log(_this22.selectedDuration);
|
||||
|
||||
if (value.days.value != null && value.hours.value != null && value.minutes.value != null) {
|
||||
if (value.days.value > 0) {
|
||||
if (value.days.value == 1) {
|
||||
if (value.hours.value == 1) {
|
||||
_this20.displayDuration = value.days.value + " day " + value.hours.value + " hora " + value.minutes.value + " minutos";
|
||||
_this22.displayDuration = value.days.value + " day " + value.hours.value + " hora " + value.minutes.value + " minutos";
|
||||
} else {
|
||||
_this20.displayDuration = value.days.value + " days " + value.hours.value + " horas " + value.minutes.value + " minutos";
|
||||
_this22.displayDuration = value.days.value + " days " + value.hours.value + " horas " + value.minutes.value + " minutos";
|
||||
}
|
||||
} else {
|
||||
if (value.hours.value == 1) {
|
||||
_this20.displayDuration = value.days.value + " days " + value.hours.value + " hora " + value.minutes.value + " minutos";
|
||||
_this22.displayDuration = value.days.value + " days " + value.hours.value + " hora " + value.minutes.value + " minutos";
|
||||
} else {
|
||||
_this20.displayDuration = value.days.value + " days " + value.hours.value + " horas " + value.minutes.value + " minutos";
|
||||
_this22.displayDuration = value.days.value + " days " + value.hours.value + " horas " + value.minutes.value + " minutos";
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (value.hours.value == 1) {
|
||||
_this20.displayDuration = value.hours.value + " hora " + value.minutes.value + " minutos";
|
||||
_this22.displayDuration = value.hours.value + " hora " + value.minutes.value + " minutos";
|
||||
} else {
|
||||
_this20.displayDuration = value.hours.value + " horas " + value.minutes.value + " minutos";
|
||||
_this22.displayDuration = value.hours.value + " horas " + value.minutes.value + " minutos";
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2800,7 +2787,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
|
||||
case 5:
|
||||
picker.onDidDismiss().then(function (data) {
|
||||
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(_this20, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee19() {
|
||||
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(_this22, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee19() {
|
||||
var day, hour, minutes;
|
||||
return regeneratorRuntime.wrap(function _callee19$(_context19) {
|
||||
while (1) {
|
||||
|
||||
+1
-1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
@@ -55,6 +55,8 @@ __webpack_require__.r(__webpack_exports__);
|
||||
/* harmony import */ var _group_contacts_routing_module__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./group-contacts-routing.module */ "./src/app/pages/chat/group-messages/group-contacts/group-contacts-routing.module.ts");
|
||||
/* harmony import */ var _group_contacts_page__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./group-contacts.page */ "./src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts");
|
||||
/* harmony import */ var src_app_shared_shared_module__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! src/app/shared/shared.module */ "./src/app/shared/shared.module.ts");
|
||||
/* harmony import */ var src_app_pipes_pipes_module__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! src/app/pipes/pipes.module */ "./src/app/pipes/pipes.module.ts");
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -72,6 +74,7 @@ GroupContactsPageModule = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"
|
||||
_angular_forms__WEBPACK_IMPORTED_MODULE_3__["FormsModule"],
|
||||
_ionic_angular__WEBPACK_IMPORTED_MODULE_4__["IonicModule"],
|
||||
src_app_shared_shared_module__WEBPACK_IMPORTED_MODULE_7__["SharedModule"],
|
||||
src_app_pipes_pipes_module__WEBPACK_IMPORTED_MODULE_8__["PipesModule"],
|
||||
_group_contacts_routing_module__WEBPACK_IMPORTED_MODULE_5__["GroupContactsPageRoutingModule"]
|
||||
],
|
||||
declarations: [_group_contacts_page__WEBPACK_IMPORTED_MODULE_6__["GroupContactsPage"]]
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
{"version":3,"sources":["./src/app/pages/chat/group-messages/group-contacts/group-contacts-routing.module.ts","./src/app/pages/chat/group-messages/group-contacts/group-contacts.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACc;AAEG;AAE1D,MAAM,MAAM,GAAW;IACrB;QACE,IAAI,EAAE,EAAE;QACR,SAAS,EAAE,sEAAiB;KAC7B;CACF,CAAC;AAMF,IAAa,8BAA8B,GAA3C,MAAa,8BAA8B;CAAG;AAAjC,8BAA8B;IAJ1C,8DAAQ,CAAC;QACR,OAAO,EAAE,CAAC,4DAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACxC,OAAO,EAAE,CAAC,4DAAY,CAAC;KACxB,CAAC;GACW,8BAA8B,CAAG;AAAH;;;;;;;;;;;;;;;;;;;;;;;;AChBF;AACM;AACF;AAEA;AAEoC;AAEvB;AACE;AAY5D,IAAa,uBAAuB,GAApC,MAAa,uBAAuB;CAAG;AAA1B,uBAAuB;IAVnC,8DAAQ,CAAC;QACR,OAAO,EAAE;YACP,4DAAY;YACZ,0DAAW;YACX,0DAAW;YACX,yEAAY;YACZ,6FAA8B;SAC/B;QACD,YAAY,EAAE,CAAC,sEAAiB,CAAC;KAClC,CAAC;GACW,uBAAuB,CAAG;AAAH","file":"group-contacts-group-contacts-module-es2015.js","sourcesContent":["import { NgModule } from '@angular/core';\r\nimport { Routes, RouterModule } from '@angular/router';\r\n\r\nimport { GroupContactsPage } from './group-contacts.page';\r\n\r\nconst routes: Routes = [\r\n {\r\n path: '',\r\n component: GroupContactsPage\r\n }\r\n];\r\n\r\n@NgModule({\r\n imports: [RouterModule.forChild(routes)],\r\n exports: [RouterModule],\r\n})\r\nexport class GroupContactsPageRoutingModule {}\r\n","import { NgModule } from '@angular/core';\r\nimport { CommonModule } from '@angular/common';\r\nimport { FormsModule } from '@angular/forms';\r\n\r\nimport { IonicModule } from '@ionic/angular';\r\n\r\nimport { GroupContactsPageRoutingModule } from './group-contacts-routing.module';\r\n\r\nimport { GroupContactsPage } from './group-contacts.page';\r\nimport { SharedModule } from 'src/app/shared/shared.module';\r\n\r\n@NgModule({\r\n imports: [\r\n CommonModule,\r\n FormsModule,\r\n IonicModule,\r\n SharedModule,\r\n GroupContactsPageRoutingModule\r\n ],\r\n declarations: [GroupContactsPage]\r\n})\r\nexport class GroupContactsPageModule {}\r\n"],"sourceRoot":"webpack:///"}
|
||||
{"version":3,"sources":["./src/app/pages/chat/group-messages/group-contacts/group-contacts-routing.module.ts","./src/app/pages/chat/group-messages/group-contacts/group-contacts.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACc;AAEG;AAE1D,MAAM,MAAM,GAAW;IACrB;QACE,IAAI,EAAE,EAAE;QACR,SAAS,EAAE,sEAAiB;KAC7B;CACF,CAAC;AAMF,IAAa,8BAA8B,GAA3C,MAAa,8BAA8B;CAAG;AAAjC,8BAA8B;IAJ1C,8DAAQ,CAAC;QACR,OAAO,EAAE,CAAC,4DAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACxC,OAAO,EAAE,CAAC,4DAAY,CAAC;KACxB,CAAC;GACW,8BAA8B,CAAG;AAAH;;;;;;;;;;;;;;;;;;;;;;;;;AChBF;AACM;AACF;AAEA;AAEoC;AAEvB;AACE;AACH;AAazD,IAAa,uBAAuB,GAApC,MAAa,uBAAuB;CAAG;AAA1B,uBAAuB;IAXnC,8DAAQ,CAAC;QACR,OAAO,EAAE;YACP,4DAAY;YACZ,0DAAW;YACX,0DAAW;YACX,yEAAY;YACZ,sEAAW;YACX,6FAA8B;SAC/B;QACD,YAAY,EAAE,CAAC,sEAAiB,CAAC;KAClC,CAAC;GACW,uBAAuB,CAAG;AAAH","file":"group-contacts-group-contacts-module-es2015.js","sourcesContent":["import { NgModule } from '@angular/core';\r\nimport { Routes, RouterModule } from '@angular/router';\r\n\r\nimport { GroupContactsPage } from './group-contacts.page';\r\n\r\nconst routes: Routes = [\r\n {\r\n path: '',\r\n component: GroupContactsPage\r\n }\r\n];\r\n\r\n@NgModule({\r\n imports: [RouterModule.forChild(routes)],\r\n exports: [RouterModule],\r\n})\r\nexport class GroupContactsPageRoutingModule {}\r\n","import { NgModule } from '@angular/core';\r\nimport { CommonModule } from '@angular/common';\r\nimport { FormsModule } from '@angular/forms';\r\n\r\nimport { IonicModule } from '@ionic/angular';\r\n\r\nimport { GroupContactsPageRoutingModule } from './group-contacts-routing.module';\r\n\r\nimport { GroupContactsPage } from './group-contacts.page';\r\nimport { SharedModule } from 'src/app/shared/shared.module';\r\nimport { PipesModule } from 'src/app/pipes/pipes.module';\r\n\r\n@NgModule({\r\n imports: [\r\n CommonModule,\r\n FormsModule,\r\n IonicModule,\r\n SharedModule,\r\n PipesModule,\r\n GroupContactsPageRoutingModule\r\n ],\r\n declarations: [GroupContactsPage]\r\n})\r\nexport class GroupContactsPageModule {}\r\n"],"sourceRoot":"webpack:///"}
|
||||
@@ -128,13 +128,19 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
var src_app_shared_shared_module__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(
|
||||
/*! src/app/shared/shared.module */
|
||||
"./src/app/shared/shared.module.ts");
|
||||
/* harmony import */
|
||||
|
||||
|
||||
var src_app_pipes_pipes_module__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(
|
||||
/*! src/app/pipes/pipes.module */
|
||||
"./src/app/pipes/pipes.module.ts");
|
||||
|
||||
var GroupContactsPageModule = function GroupContactsPageModule() {
|
||||
_classCallCheck(this, GroupContactsPageModule);
|
||||
};
|
||||
|
||||
GroupContactsPageModule = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([Object(_angular_core__WEBPACK_IMPORTED_MODULE_1__["NgModule"])({
|
||||
imports: [_angular_common__WEBPACK_IMPORTED_MODULE_2__["CommonModule"], _angular_forms__WEBPACK_IMPORTED_MODULE_3__["FormsModule"], _ionic_angular__WEBPACK_IMPORTED_MODULE_4__["IonicModule"], src_app_shared_shared_module__WEBPACK_IMPORTED_MODULE_7__["SharedModule"], _group_contacts_routing_module__WEBPACK_IMPORTED_MODULE_5__["GroupContactsPageRoutingModule"]],
|
||||
imports: [_angular_common__WEBPACK_IMPORTED_MODULE_2__["CommonModule"], _angular_forms__WEBPACK_IMPORTED_MODULE_3__["FormsModule"], _ionic_angular__WEBPACK_IMPORTED_MODULE_4__["IonicModule"], src_app_shared_shared_module__WEBPACK_IMPORTED_MODULE_7__["SharedModule"], src_app_pipes_pipes_module__WEBPACK_IMPORTED_MODULE_8__["PipesModule"], _group_contacts_routing_module__WEBPACK_IMPORTED_MODULE_5__["GroupContactsPageRoutingModule"]],
|
||||
declarations: [_group_contacts_page__WEBPACK_IMPORTED_MODULE_6__["GroupContactsPage"]]
|
||||
})], GroupContactsPageModule);
|
||||
/***/
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"version":3,"sources":["webpack:///src/app/pages/chat/group-messages/group-contacts/group-contacts-routing.module.ts","webpack:///src/app/pages/chat/group-messages/group-contacts/group-contacts.module.ts"],"names":["routes","path","component","GroupContactsPageRoutingModule","imports","forChild","exports","GroupContactsPageModule","declarations"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,QAAMA,MAAM,GAAW,CACrB;AACEC,UAAI,EAAE,EADR;AAEEC,eAAS,EAAE;AAFb,KADqB,CAAvB;;AAWA,QAAaC,8BAA8B;AAAA;AAAA,KAA3C;;AAAaA,kCAA8B,6DAJ1C,+DAAS;AACRC,aAAO,EAAE,CAAC,6DAAaC,QAAb,CAAsBL,MAAtB,CAAD,CADD;AAERM,aAAO,EAAE,CAAC,4DAAD;AAFD,KAAT,CAI0C,GAA9BH,8BAA8B,CAA9B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ACKb,QAAaI,uBAAuB;AAAA;AAAA,KAApC;;AAAaA,2BAAuB,6DAVnC,+DAAS;AACRH,aAAO,EAAE,CACP,4DADO,EAEP,0DAFO,EAGP,0DAHO,EAIP,yEAJO,EAKP,6FALO,CADD;AAQRI,kBAAY,EAAE,CAAC,sEAAD;AARN,KAAT,CAUmC,GAAvBD,uBAAuB,CAAvB","file":"group-contacts-group-contacts-module-es5.js","sourcesContent":["import { NgModule } from '@angular/core';\r\nimport { Routes, RouterModule } from '@angular/router';\r\n\r\nimport { GroupContactsPage } from './group-contacts.page';\r\n\r\nconst routes: Routes = [\r\n {\r\n path: '',\r\n component: GroupContactsPage\r\n }\r\n];\r\n\r\n@NgModule({\r\n imports: [RouterModule.forChild(routes)],\r\n exports: [RouterModule],\r\n})\r\nexport class GroupContactsPageRoutingModule {}\r\n","import { NgModule } from '@angular/core';\r\nimport { CommonModule } from '@angular/common';\r\nimport { FormsModule } from '@angular/forms';\r\n\r\nimport { IonicModule } from '@ionic/angular';\r\n\r\nimport { GroupContactsPageRoutingModule } from './group-contacts-routing.module';\r\n\r\nimport { GroupContactsPage } from './group-contacts.page';\r\nimport { SharedModule } from 'src/app/shared/shared.module';\r\n\r\n@NgModule({\r\n imports: [\r\n CommonModule,\r\n FormsModule,\r\n IonicModule,\r\n SharedModule,\r\n GroupContactsPageRoutingModule\r\n ],\r\n declarations: [GroupContactsPage]\r\n})\r\nexport class GroupContactsPageModule {}\r\n"]}
|
||||
{"version":3,"sources":["webpack:///src/app/pages/chat/group-messages/group-contacts/group-contacts-routing.module.ts","webpack:///src/app/pages/chat/group-messages/group-contacts/group-contacts.module.ts"],"names":["routes","path","component","GroupContactsPageRoutingModule","imports","forChild","exports","GroupContactsPageModule","declarations"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,QAAMA,MAAM,GAAW,CACrB;AACEC,UAAI,EAAE,EADR;AAEEC,eAAS,EAAE;AAFb,KADqB,CAAvB;;AAWA,QAAaC,8BAA8B;AAAA;AAAA,KAA3C;;AAAaA,kCAA8B,6DAJ1C,+DAAS;AACRC,aAAO,EAAE,CAAC,6DAAaC,QAAb,CAAsBL,MAAtB,CAAD,CADD;AAERM,aAAO,EAAE,CAAC,4DAAD;AAFD,KAAT,CAI0C,GAA9BH,8BAA8B,CAA9B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ACOb,QAAaI,uBAAuB;AAAA;AAAA,KAApC;;AAAaA,2BAAuB,6DAXnC,+DAAS;AACRH,aAAO,EAAE,CACP,4DADO,EAEP,0DAFO,EAGP,0DAHO,EAIP,yEAJO,EAKP,sEALO,EAMP,6FANO,CADD;AASRI,kBAAY,EAAE,CAAC,sEAAD;AATN,KAAT,CAWmC,GAAvBD,uBAAuB,CAAvB","file":"group-contacts-group-contacts-module-es5.js","sourcesContent":["import { NgModule } from '@angular/core';\r\nimport { Routes, RouterModule } from '@angular/router';\r\n\r\nimport { GroupContactsPage } from './group-contacts.page';\r\n\r\nconst routes: Routes = [\r\n {\r\n path: '',\r\n component: GroupContactsPage\r\n }\r\n];\r\n\r\n@NgModule({\r\n imports: [RouterModule.forChild(routes)],\r\n exports: [RouterModule],\r\n})\r\nexport class GroupContactsPageRoutingModule {}\r\n","import { NgModule } from '@angular/core';\r\nimport { CommonModule } from '@angular/common';\r\nimport { FormsModule } from '@angular/forms';\r\n\r\nimport { IonicModule } from '@ionic/angular';\r\n\r\nimport { GroupContactsPageRoutingModule } from './group-contacts-routing.module';\r\n\r\nimport { GroupContactsPage } from './group-contacts.page';\r\nimport { SharedModule } from 'src/app/shared/shared.module';\r\nimport { PipesModule } from 'src/app/pipes/pipes.module';\r\n\r\n@NgModule({\r\n imports: [\r\n CommonModule,\r\n FormsModule,\r\n IonicModule,\r\n SharedModule,\r\n PipesModule,\r\n GroupContactsPageRoutingModule\r\n ],\r\n declarations: [GroupContactsPage]\r\n})\r\nexport class GroupContactsPageModule {}\r\n"]}
|
||||
@@ -634,7 +634,7 @@ __webpack_require__.r(__webpack_exports__);
|
||||
// The list of file replacements can be found in `angular.json`.
|
||||
const environment = {
|
||||
production: false,
|
||||
apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V3/api/',
|
||||
apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/',
|
||||
/* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/', */
|
||||
apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
|
||||
domain: 'gabinetedigital.local',
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -775,7 +775,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
|
||||
var environment = {
|
||||
production: false,
|
||||
apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V3/api/',
|
||||
apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/',
|
||||
|
||||
/* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/', */
|
||||
apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -35,7 +35,7 @@ __webpack_require__.r(__webpack_exports__);
|
||||
|
||||
"use strict";
|
||||
__webpack_require__.r(__webpack_exports__);
|
||||
/* harmony default export */ __webpack_exports__["default"] = ("<ion-header class=\"ion-no-border\">\r\n <ion-toolbar class=\"header-toolbar\">\r\n <div class=\"main-header\">\r\n <div class=\"title-content\">\r\n <div class=\"back-icon\">\r\n <ion-icon (click)=\"close()\" slot=\"end\" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>\r\n </div>\r\n <div class=\"div-title\">\r\n <ion-label class=\"title\">Contactos</ion-label>\r\n </div>\r\n <app-btn-seguinte (click)=\"groupMessages()\"></app-btn-seguinte>\r\n </div>\r\n </div>\r\n </ion-toolbar>\r\n <ion-toolbar class=\"toolbar-search\">\r\n <div class=\"search\">\r\n <ion-searchbar (ionChange)=\"onChange($event)\" placeholder=\"Pesquisar por cantacto\" ></ion-searchbar>\r\n </div>\r\n </ion-toolbar>\r\n</ion-header>\r\n\r\n<ion-content>\r\n <ion-refresher name=\"refresher\" slot=\"fixed\" (ionRefresh)=\"doRefresh($event)\">\r\n <ion-progress-bar type=\"indeterminate\" *ngIf=\"showLoader\"></ion-progress-bar>\r\n <ion-refresher-content>\r\n </ion-refresher-content>\r\n </ion-refresher>\r\n <div class=\"main-content\">\r\n \r\n <!-- <ion-list>\r\n <ion-item *ngFor=\"let user of searchedItem\">\r\n {{user.name}}\r\n </ion-item>\r\n </ion-list> -->\r\n\r\n <ion-virtual-scroll [items]=\"users\" approxItemHeight=\"70px\" [headerFn]=\"separateLetter\">\r\n \r\n <div class=\"item-divider\" *virtualHeader=\"let header\">\r\n <ion-label>{{header}}</ion-label>\r\n </div>\r\n\r\n <div *virtualItem=\"let user\" class=\"item-checkbox\">\r\n <ion-checkbox color=\"primary\"></ion-checkbox>\r\n <p>{{user.first}} {{user.last}}</p>\r\n <ion-icon name=\"ellipse\"></ion-icon>\r\n </div>\r\n \r\n </ion-virtual-scroll>\r\n \r\n </div> \r\n</ion-content>\r\n");
|
||||
/* harmony default export */ __webpack_exports__["default"] = ("<ion-header class=\"ion-no-border\">\r\n <ion-toolbar class=\"header-toolbar\">\r\n <div class=\"main-header\">\r\n <div class=\"title-content\">\r\n <div class=\"back-icon\">\r\n <ion-icon (click)=\"close()\" slot=\"end\" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>\r\n </div>\r\n <div class=\"div-title\">\r\n <ion-label class=\"title\">Contactos</ion-label>\r\n </div>\r\n <app-btn-seguinte (click)=\"groupMessages()\"></app-btn-seguinte>\r\n </div>\r\n </div>\r\n </ion-toolbar>\r\n <ion-toolbar class=\"toolbar-search\">\r\n <div class=\"search\">\r\n <ion-searchbar debounce=\"500\" (ionChange)=\"onChange($event)\" placeholder=\"Pesquisar por cantacto\" ></ion-searchbar>\r\n </div>\r\n </ion-toolbar>\r\n</ion-header>\r\n\r\n<ion-content>\r\n <ion-refresher name=\"refresher\" slot=\"fixed\" (ionRefresh)=\"doRefresh($event)\">\r\n <ion-progress-bar type=\"indeterminate\" *ngIf=\"showLoader\"></ion-progress-bar>\r\n <ion-refresher-content>\r\n </ion-refresher-content>\r\n </ion-refresher>\r\n \r\n <div class=\"main-content\">\r\n <ion-virtual-scroll [items]=\"users | filter:textSearch: 'name'\" approxItemHeight=\"70px\" [headerFn]=\"separateLetter\">\r\n \r\n <div class=\"item-divider\" *virtualHeader=\"let header\">\r\n <ion-label>{{header}}</ion-label>\r\n </div>\r\n\r\n <div *virtualItem=\"let user\" class=\"item-checkbox\">\r\n <ion-checkbox color=\"primary\"></ion-checkbox>\r\n <p>{{user.name}}</p>\r\n <ion-icon name=\"ellipse\"></ion-icon>\r\n </div>\r\n \r\n </ion-virtual-scroll>\r\n \r\n </div> \r\n</ion-content>\r\n");
|
||||
|
||||
/***/ }),
|
||||
|
||||
@@ -606,55 +606,30 @@ __webpack_require__.r(__webpack_exports__);
|
||||
/* harmony import */ var _angular_common_http__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @angular/common/http */ "./node_modules/@angular/common/__ivy_ngcc__/fesm2015/http.js");
|
||||
/* harmony import */ var _angular_core__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @angular/core */ "./node_modules/@angular/core/__ivy_ngcc__/fesm2015/core.js");
|
||||
/* harmony import */ var _ionic_angular__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @ionic/angular */ "./node_modules/@ionic/angular/__ivy_ngcc__/fesm2015/ionic-angular.js");
|
||||
/* harmony import */ var _group_messages_page__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../group-messages.page */ "./src/app/pages/chat/group-messages/group-messages.page.ts");
|
||||
/* harmony import */ var src_app_services_auth_service__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! src/app/services/auth.service */ "./src/app/services/auth.service.ts");
|
||||
/* harmony import */ var src_app_services_chat_service__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! src/app/services/chat.service */ "./src/app/services/chat.service.ts");
|
||||
/* harmony import */ var _group_messages_page__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../group-messages.page */ "./src/app/pages/chat/group-messages/group-messages.page.ts");
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
let GroupContactsPage = class GroupContactsPage {
|
||||
constructor(modalController, http) {
|
||||
constructor(modalController, http, chatService, authService) {
|
||||
this.modalController = modalController;
|
||||
this.http = http;
|
||||
this.chatService = chatService;
|
||||
this.authService = authService;
|
||||
this.users = [];
|
||||
this.contact = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"];
|
||||
this.contacts = [
|
||||
{
|
||||
first: 'Ana',
|
||||
last: 'Manuel',
|
||||
url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
|
||||
},
|
||||
{
|
||||
first: 'Abdullah',
|
||||
last: 'Hill',
|
||||
url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
|
||||
},
|
||||
{
|
||||
first: 'Batur',
|
||||
last: 'Oymen',
|
||||
url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
|
||||
},
|
||||
{
|
||||
first: 'Bianca',
|
||||
last: 'Costa',
|
||||
url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
|
||||
},
|
||||
{
|
||||
first: 'Zaya',
|
||||
last: 'Mary',
|
||||
url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
|
||||
},
|
||||
{
|
||||
first: 'Tiago',
|
||||
last: 'Kayaya',
|
||||
url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
|
||||
}
|
||||
];
|
||||
this.headers = new _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpHeaders"]();
|
||||
this.headers = this.headers.set('Access-Control-Allow-Origin', '*');
|
||||
this.headers = this.headers.set('Access-Control-Allow-Methods', 'POST, GET, OPTIONS, PUT');
|
||||
this.headers = this.headers.set('Accept', 'application/json');
|
||||
this.headers = this.headers.set('content-type', 'application/json');
|
||||
this.authService.userData$.subscribe((res) => {
|
||||
this.loggedUser = res;
|
||||
});
|
||||
this.textSearch = "";
|
||||
this.dm = null;
|
||||
this.room = null;
|
||||
}
|
||||
ngOnInit() {
|
||||
this.loadUsers();
|
||||
@@ -663,47 +638,27 @@ let GroupContactsPage = class GroupContactsPage {
|
||||
this.options = {
|
||||
headers: this.headers,
|
||||
};
|
||||
/* this.http.get('https://randomuser.me/api/?results=100', this.options)
|
||||
.subscribe(res => {
|
||||
this.users = res['results'].sort((a,b) => {
|
||||
if(a.name.first < b.name.first){
|
||||
return -1;
|
||||
}
|
||||
if(a.name.first > b.name.first){
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
});
|
||||
console.log(res);
|
||||
console.log(this.users);
|
||||
}); */
|
||||
this.users = this.contacts.sort((a, b) => {
|
||||
if (a.first < b.first) {
|
||||
return -1;
|
||||
}
|
||||
if (a.first > b.first) {
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
this.chatService.getAllUsers().subscribe((res) => {
|
||||
console.log(res.users);
|
||||
this.contacts = res.users.filter(data => data.username != this.loggedUser.me.username);
|
||||
this.users = this.contacts.sort((a, b) => {
|
||||
if (a.name < b.name) {
|
||||
return -1;
|
||||
}
|
||||
if (a.name > b.name) {
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
});
|
||||
this.showLoader = false;
|
||||
});
|
||||
}
|
||||
separateLetter(record, recordIndex, records) {
|
||||
/* if(recordIndex == 0){
|
||||
return record.name.first[0];
|
||||
}
|
||||
|
||||
let first_prev = records[recordIndex - 1].name.first[0];
|
||||
let first_current = record.name.first[0];
|
||||
|
||||
if(first_prev != first_current){
|
||||
return first_current;
|
||||
}
|
||||
return null; */
|
||||
if (recordIndex == 0) {
|
||||
return record.first[0];
|
||||
return record.name[0];
|
||||
}
|
||||
let first_prev = records[recordIndex - 1].first[0];
|
||||
let first_current = record.first[0];
|
||||
let first_prev = records[recordIndex - 1].name[0];
|
||||
let first_current = record.name[0];
|
||||
if (first_prev != first_current) {
|
||||
return first_current;
|
||||
}
|
||||
@@ -712,9 +667,10 @@ let GroupContactsPage = class GroupContactsPage {
|
||||
doRefresh(event) {
|
||||
}
|
||||
close() {
|
||||
this.modalController.dismiss();
|
||||
this.modalController.dismiss(true);
|
||||
}
|
||||
onChange(event) {
|
||||
this.textSearch = event.detail.value;
|
||||
}
|
||||
clicked() {
|
||||
console.log('clicked');
|
||||
@@ -723,19 +679,25 @@ let GroupContactsPage = class GroupContactsPage {
|
||||
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
|
||||
this.close();
|
||||
const modal = yield this.modalController.create({
|
||||
component: _group_messages_page__WEBPACK_IMPORTED_MODULE_4__["GroupMessagesPage"],
|
||||
component: _group_messages_page__WEBPACK_IMPORTED_MODULE_6__["GroupMessagesPage"],
|
||||
componentProps: {},
|
||||
cssClass: 'contacts',
|
||||
backdropDismiss: false
|
||||
});
|
||||
yield modal.present();
|
||||
modal.onDidDismiss();
|
||||
modal.onDidDismiss().then(res => {
|
||||
if (res.data) {
|
||||
console.log('go to new group');
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
};
|
||||
GroupContactsPage.ctorParameters = () => [
|
||||
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_3__["ModalController"] },
|
||||
{ type: _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpClient"] }
|
||||
{ type: _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpClient"] },
|
||||
{ type: src_app_services_chat_service__WEBPACK_IMPORTED_MODULE_5__["ChatService"] },
|
||||
{ type: src_app_services_auth_service__WEBPACK_IMPORTED_MODULE_4__["AuthService"] }
|
||||
];
|
||||
GroupContactsPage = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
|
||||
Object(_angular_core__WEBPACK_IMPORTED_MODULE_2__["Component"])({
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -61,7 +61,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
/* harmony default export */
|
||||
|
||||
|
||||
__webpack_exports__["default"] = "<ion-header class=\"ion-no-border\">\r\n <ion-toolbar class=\"header-toolbar\">\r\n <div class=\"main-header\">\r\n <div class=\"title-content\">\r\n <div class=\"back-icon\">\r\n <ion-icon (click)=\"close()\" slot=\"end\" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>\r\n </div>\r\n <div class=\"div-title\">\r\n <ion-label class=\"title\">Contactos</ion-label>\r\n </div>\r\n <app-btn-seguinte (click)=\"groupMessages()\"></app-btn-seguinte>\r\n </div>\r\n </div>\r\n </ion-toolbar>\r\n <ion-toolbar class=\"toolbar-search\">\r\n <div class=\"search\">\r\n <ion-searchbar (ionChange)=\"onChange($event)\" placeholder=\"Pesquisar por cantacto\" ></ion-searchbar>\r\n </div>\r\n </ion-toolbar>\r\n</ion-header>\r\n\r\n<ion-content>\r\n <ion-refresher name=\"refresher\" slot=\"fixed\" (ionRefresh)=\"doRefresh($event)\">\r\n <ion-progress-bar type=\"indeterminate\" *ngIf=\"showLoader\"></ion-progress-bar>\r\n <ion-refresher-content>\r\n </ion-refresher-content>\r\n </ion-refresher>\r\n <div class=\"main-content\">\r\n \r\n <!-- <ion-list>\r\n <ion-item *ngFor=\"let user of searchedItem\">\r\n {{user.name}}\r\n </ion-item>\r\n </ion-list> -->\r\n\r\n <ion-virtual-scroll [items]=\"users\" approxItemHeight=\"70px\" [headerFn]=\"separateLetter\">\r\n \r\n <div class=\"item-divider\" *virtualHeader=\"let header\">\r\n <ion-label>{{header}}</ion-label>\r\n </div>\r\n\r\n <div *virtualItem=\"let user\" class=\"item-checkbox\">\r\n <ion-checkbox color=\"primary\"></ion-checkbox>\r\n <p>{{user.first}} {{user.last}}</p>\r\n <ion-icon name=\"ellipse\"></ion-icon>\r\n </div>\r\n \r\n </ion-virtual-scroll>\r\n \r\n </div> \r\n</ion-content>\r\n";
|
||||
__webpack_exports__["default"] = "<ion-header class=\"ion-no-border\">\r\n <ion-toolbar class=\"header-toolbar\">\r\n <div class=\"main-header\">\r\n <div class=\"title-content\">\r\n <div class=\"back-icon\">\r\n <ion-icon (click)=\"close()\" slot=\"end\" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>\r\n </div>\r\n <div class=\"div-title\">\r\n <ion-label class=\"title\">Contactos</ion-label>\r\n </div>\r\n <app-btn-seguinte (click)=\"groupMessages()\"></app-btn-seguinte>\r\n </div>\r\n </div>\r\n </ion-toolbar>\r\n <ion-toolbar class=\"toolbar-search\">\r\n <div class=\"search\">\r\n <ion-searchbar debounce=\"500\" (ionChange)=\"onChange($event)\" placeholder=\"Pesquisar por cantacto\" ></ion-searchbar>\r\n </div>\r\n </ion-toolbar>\r\n</ion-header>\r\n\r\n<ion-content>\r\n <ion-refresher name=\"refresher\" slot=\"fixed\" (ionRefresh)=\"doRefresh($event)\">\r\n <ion-progress-bar type=\"indeterminate\" *ngIf=\"showLoader\"></ion-progress-bar>\r\n <ion-refresher-content>\r\n </ion-refresher-content>\r\n </ion-refresher>\r\n \r\n <div class=\"main-content\">\r\n <ion-virtual-scroll [items]=\"users | filter:textSearch: 'name'\" approxItemHeight=\"70px\" [headerFn]=\"separateLetter\">\r\n \r\n <div class=\"item-divider\" *virtualHeader=\"let header\">\r\n <ion-label>{{header}}</ion-label>\r\n </div>\r\n\r\n <div *virtualItem=\"let user\" class=\"item-checkbox\">\r\n <ion-checkbox color=\"primary\"></ion-checkbox>\r\n <p>{{user.name}}</p>\r\n <ion-icon name=\"ellipse\"></ion-icon>\r\n </div>\r\n \r\n </ion-virtual-scroll>\r\n \r\n </div> \r\n</ion-content>\r\n";
|
||||
/***/
|
||||
},
|
||||
|
||||
@@ -1079,48 +1079,40 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
/* harmony import */
|
||||
|
||||
|
||||
var _group_messages_page__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(
|
||||
var src_app_services_auth_service__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(
|
||||
/*! src/app/services/auth.service */
|
||||
"./src/app/services/auth.service.ts");
|
||||
/* harmony import */
|
||||
|
||||
|
||||
var src_app_services_chat_service__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(
|
||||
/*! src/app/services/chat.service */
|
||||
"./src/app/services/chat.service.ts");
|
||||
/* harmony import */
|
||||
|
||||
|
||||
var _group_messages_page__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(
|
||||
/*! ../group-messages.page */
|
||||
"./src/app/pages/chat/group-messages/group-messages.page.ts");
|
||||
|
||||
var GroupContactsPage = /*#__PURE__*/function () {
|
||||
function GroupContactsPage(modalController, http) {
|
||||
function GroupContactsPage(modalController, http, chatService, authService) {
|
||||
var _this6 = this;
|
||||
|
||||
_classCallCheck(this, GroupContactsPage);
|
||||
|
||||
this.modalController = modalController;
|
||||
this.http = http;
|
||||
this.chatService = chatService;
|
||||
this.authService = authService;
|
||||
this.users = [];
|
||||
this.contact = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"];
|
||||
this.contacts = [{
|
||||
first: 'Ana',
|
||||
last: 'Manuel',
|
||||
url: 'https://randomuser.me/api/portraits/med/women/54.jpg'
|
||||
}, {
|
||||
first: 'Abdullah',
|
||||
last: 'Hill',
|
||||
url: 'https://randomuser.me/api/portraits/med/women/54.jpg'
|
||||
}, {
|
||||
first: 'Batur',
|
||||
last: 'Oymen',
|
||||
url: 'https://randomuser.me/api/portraits/med/women/54.jpg'
|
||||
}, {
|
||||
first: 'Bianca',
|
||||
last: 'Costa',
|
||||
url: 'https://randomuser.me/api/portraits/med/women/54.jpg'
|
||||
}, {
|
||||
first: 'Zaya',
|
||||
last: 'Mary',
|
||||
url: 'https://randomuser.me/api/portraits/med/women/54.jpg'
|
||||
}, {
|
||||
first: 'Tiago',
|
||||
last: 'Kayaya',
|
||||
url: 'https://randomuser.me/api/portraits/med/women/54.jpg'
|
||||
}];
|
||||
this.headers = new _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpHeaders"]();
|
||||
this.headers = this.headers.set('Access-Control-Allow-Origin', '*');
|
||||
this.headers = this.headers.set('Access-Control-Allow-Methods', 'POST, GET, OPTIONS, PUT');
|
||||
this.headers = this.headers.set('Accept', 'application/json');
|
||||
this.headers = this.headers.set('content-type', 'application/json');
|
||||
this.authService.userData$.subscribe(function (res) {
|
||||
_this6.loggedUser = res;
|
||||
});
|
||||
this.textSearch = "";
|
||||
this.dm = null;
|
||||
this.room = null;
|
||||
}
|
||||
|
||||
_createClass(GroupContactsPage, [{
|
||||
@@ -1131,54 +1123,39 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
}, {
|
||||
key: "loadUsers",
|
||||
value: function loadUsers() {
|
||||
var _this7 = this;
|
||||
|
||||
this.options = {
|
||||
headers: this.headers
|
||||
};
|
||||
/* this.http.get('https://randomuser.me/api/?results=100', this.options)
|
||||
.subscribe(res => {
|
||||
this.users = res['results'].sort((a,b) => {
|
||||
if(a.name.first < b.name.first){
|
||||
this.chatService.getAllUsers().subscribe(function (res) {
|
||||
console.log(res.users);
|
||||
_this7.contacts = res.users.filter(function (data) {
|
||||
return data.username != _this7.loggedUser.me.username;
|
||||
});
|
||||
_this7.users = _this7.contacts.sort(function (a, b) {
|
||||
if (a.name < b.name) {
|
||||
return -1;
|
||||
}
|
||||
if(a.name.first > b.name.first){
|
||||
|
||||
if (a.name > b.name) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
});
|
||||
console.log(res);
|
||||
console.log(this.users);
|
||||
}); */
|
||||
|
||||
this.users = this.contacts.sort(function (a, b) {
|
||||
if (a.first < b.first) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (a.first > b.first) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
_this7.showLoader = false;
|
||||
});
|
||||
}
|
||||
}, {
|
||||
key: "separateLetter",
|
||||
value: function separateLetter(record, recordIndex, records) {
|
||||
/* if(recordIndex == 0){
|
||||
return record.name.first[0];
|
||||
}
|
||||
let first_prev = records[recordIndex - 1].name.first[0];
|
||||
let first_current = record.name.first[0];
|
||||
if(first_prev != first_current){
|
||||
return first_current;
|
||||
}
|
||||
return null; */
|
||||
if (recordIndex == 0) {
|
||||
return record.first[0];
|
||||
return record.name[0];
|
||||
}
|
||||
|
||||
var first_prev = records[recordIndex - 1].first[0];
|
||||
var first_current = record.first[0];
|
||||
var first_prev = records[recordIndex - 1].name[0];
|
||||
var first_current = record.name[0];
|
||||
|
||||
if (first_prev != first_current) {
|
||||
return first_current;
|
||||
@@ -1192,11 +1169,13 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
}, {
|
||||
key: "close",
|
||||
value: function close() {
|
||||
this.modalController.dismiss();
|
||||
this.modalController.dismiss(true);
|
||||
}
|
||||
}, {
|
||||
key: "onChange",
|
||||
value: function onChange(event) {}
|
||||
value: function onChange(event) {
|
||||
this.textSearch = event.detail.value;
|
||||
}
|
||||
}, {
|
||||
key: "clicked",
|
||||
value: function clicked() {
|
||||
@@ -1214,7 +1193,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
this.close();
|
||||
_context6.next = 3;
|
||||
return this.modalController.create({
|
||||
component: _group_messages_page__WEBPACK_IMPORTED_MODULE_4__["GroupMessagesPage"],
|
||||
component: _group_messages_page__WEBPACK_IMPORTED_MODULE_6__["GroupMessagesPage"],
|
||||
componentProps: {},
|
||||
cssClass: 'contacts',
|
||||
backdropDismiss: false
|
||||
@@ -1226,7 +1205,11 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
return modal.present();
|
||||
|
||||
case 6:
|
||||
modal.onDidDismiss();
|
||||
modal.onDidDismiss().then(function (res) {
|
||||
if (res.data) {
|
||||
console.log('go to new group');
|
||||
}
|
||||
});
|
||||
|
||||
case 7:
|
||||
case "end":
|
||||
@@ -1246,6 +1229,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
type: _ionic_angular__WEBPACK_IMPORTED_MODULE_3__["ModalController"]
|
||||
}, {
|
||||
type: _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpClient"]
|
||||
}, {
|
||||
type: src_app_services_chat_service__WEBPACK_IMPORTED_MODULE_5__["ChatService"]
|
||||
}, {
|
||||
type: src_app_services_auth_service__WEBPACK_IMPORTED_MODULE_4__["AuthService"]
|
||||
}];
|
||||
};
|
||||
|
||||
@@ -1367,11 +1354,11 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
_createClass(GroupMessagesPage, [{
|
||||
key: "ngOnInit",
|
||||
value: function ngOnInit() {
|
||||
var _this6 = this;
|
||||
var _this8 = this;
|
||||
|
||||
this.authService.userData$.subscribe(function (res) {
|
||||
_this6.loggedUser = res;
|
||||
console.log(_this6.loggedUser);
|
||||
_this8.loggedUser = res;
|
||||
console.log(_this8.loggedUser);
|
||||
});
|
||||
this.getGroupContacts();
|
||||
this.loadGroupMessages();
|
||||
@@ -1379,45 +1366,45 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
}, {
|
||||
key: "getGroupContacts",
|
||||
value: function getGroupContacts() {
|
||||
var _this7 = this;
|
||||
var _this9 = this;
|
||||
|
||||
//If group is private call getGroupMembers
|
||||
if (this.room.t === 'p') {
|
||||
this.chatService.getGroupMembers(this.room._id).subscribe(function (res) {
|
||||
console.log(res);
|
||||
_this7.members = res['members'];
|
||||
_this9.members = res['members'];
|
||||
});
|
||||
} //Otherwise call getChannelMembers for públic groups
|
||||
else {
|
||||
this.chatService.getChannelMembers(this.room._id).subscribe(function (res) {
|
||||
console.log(res);
|
||||
_this7.members = res['members'];
|
||||
_this9.members = res['members'];
|
||||
});
|
||||
}
|
||||
}
|
||||
}, {
|
||||
key: "loadGroupMessages",
|
||||
value: function loadGroupMessages() {
|
||||
var _this8 = this;
|
||||
var _this10 = this;
|
||||
|
||||
//If group is private call getGroupMembers
|
||||
if (this.room.t === 'p') {
|
||||
this.chatService.getPrivateGroupMessages(this.room._id).subscribe(function (res) {
|
||||
console.log(res);
|
||||
_this8.messages = res['messages'].reverse();
|
||||
_this10.messages = res['messages'].reverse();
|
||||
});
|
||||
} //Otherwise call getChannelMembers for públic groups
|
||||
else {
|
||||
this.chatService.getPublicGroupMessages(this.room._id).subscribe(function (res) {
|
||||
console.log(res);
|
||||
_this8.messages = res['messages'].reverse();
|
||||
_this10.messages = res['messages'].reverse();
|
||||
});
|
||||
}
|
||||
}
|
||||
}, {
|
||||
key: "sendMessage",
|
||||
value: function sendMessage() {
|
||||
var _this9 = this;
|
||||
var _this11 = this;
|
||||
|
||||
var body = {
|
||||
"message": {
|
||||
@@ -1426,7 +1413,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
}
|
||||
};
|
||||
this.chatService.sendMessage(body).subscribe(function (res) {
|
||||
_this9.loadGroupMessages();
|
||||
_this11.loadGroupMessages();
|
||||
});
|
||||
this.message = "";
|
||||
}
|
||||
@@ -1477,7 +1464,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
key: "openOptions",
|
||||
value: function openOptions(ev) {
|
||||
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
|
||||
var _this10 = this;
|
||||
var _this12 = this;
|
||||
|
||||
var popover;
|
||||
return regeneratorRuntime.wrap(function _callee8$(_context8) {
|
||||
@@ -1503,7 +1490,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
case 5:
|
||||
popover.onDidDismiss().then(function (res) {
|
||||
if (res.data) {
|
||||
_this10.modalController.dismiss();
|
||||
_this12.modalController.dismiss();
|
||||
}
|
||||
|
||||
;
|
||||
@@ -1705,7 +1692,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
|
||||
var ContactsPage = /*#__PURE__*/function () {
|
||||
function ContactsPage(modalController, http, chatService, authService) {
|
||||
var _this11 = this;
|
||||
var _this13 = this;
|
||||
|
||||
_classCallCheck(this, ContactsPage);
|
||||
|
||||
@@ -1715,7 +1702,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
this.authService = authService;
|
||||
this.users = [];
|
||||
this.authService.userData$.subscribe(function (res) {
|
||||
_this11.loggedUser = res;
|
||||
_this13.loggedUser = res;
|
||||
});
|
||||
this.textSearch = "";
|
||||
this.dm = null;
|
||||
@@ -1735,17 +1722,17 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
}, {
|
||||
key: "loadUsers",
|
||||
value: function loadUsers() {
|
||||
var _this12 = this;
|
||||
var _this14 = this;
|
||||
|
||||
this.options = {
|
||||
headers: this.headers
|
||||
};
|
||||
this.chatService.getAllUsers().subscribe(function (res) {
|
||||
console.log(res.users);
|
||||
_this12.contacts = res.users.filter(function (data) {
|
||||
return data.username != _this12.loggedUser.me.username;
|
||||
_this14.contacts = res.users.filter(function (data) {
|
||||
return data.username != _this14.loggedUser.me.username;
|
||||
});
|
||||
_this12.users = _this12.contacts.sort(function (a, b) {
|
||||
_this14.users = _this14.contacts.sort(function (a, b) {
|
||||
if (a.name < b.name) {
|
||||
return -1;
|
||||
}
|
||||
@@ -1756,7 +1743,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
|
||||
return 0;
|
||||
});
|
||||
_this12.showLoader = false;
|
||||
_this14.showLoader = false;
|
||||
});
|
||||
}
|
||||
}, {
|
||||
@@ -1791,32 +1778,32 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
}, {
|
||||
key: "createRoom",
|
||||
value: function createRoom(username) {
|
||||
var _this13 = this;
|
||||
var _this15 = this;
|
||||
|
||||
var body = {
|
||||
username: username
|
||||
};
|
||||
this.chatService.createRoom(body).subscribe(function (res) {
|
||||
console.log(res);
|
||||
_this13.room = res['room'];
|
||||
_this15.room = res['room'];
|
||||
|
||||
_this13.getDirectMessage(_this13.room._id);
|
||||
_this15.getDirectMessage(_this15.room._id);
|
||||
});
|
||||
}
|
||||
}, {
|
||||
key: "getDirectMessage",
|
||||
value: function getDirectMessage(roomId) {
|
||||
var _this14 = this;
|
||||
var _this16 = this;
|
||||
|
||||
console.log(roomId);
|
||||
this.chatService.getAllDirectMessages().subscribe(function (res) {
|
||||
var result = res['ims'].filter(function (data) {
|
||||
return data._id == roomId;
|
||||
});
|
||||
_this14.dm = result[0];
|
||||
console.log(_this14.dm);
|
||||
_this16.dm = result[0];
|
||||
console.log(_this16.dm);
|
||||
|
||||
_this14.openModal(_this14.dm);
|
||||
_this16.openModal(_this16.dm);
|
||||
});
|
||||
}
|
||||
}, {
|
||||
@@ -2025,12 +2012,12 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
_createClass(MessagesPage, [{
|
||||
key: "ngOnInit",
|
||||
value: function ngOnInit() {
|
||||
var _this15 = this;
|
||||
var _this17 = this;
|
||||
|
||||
this.scrollToBottom();
|
||||
this.authService.userData$.subscribe(function (res) {
|
||||
_this15.loggedUser = res;
|
||||
console.log(_this15.loggedUser);
|
||||
_this17.loggedUser = res;
|
||||
console.log(_this17.loggedUser);
|
||||
});
|
||||
/* console.log(this.dm); */
|
||||
|
||||
@@ -2065,16 +2052,16 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
}, {
|
||||
key: "checkUserPresence",
|
||||
value: function checkUserPresence() {
|
||||
var _this16 = this;
|
||||
var _this18 = this;
|
||||
|
||||
this.chatService.getUserPresence(this.dm.lastMessage.u._id).subscribe(function (res) {
|
||||
_this16.userPresence = res['presence'];
|
||||
_this18.userPresence = res['presence'];
|
||||
});
|
||||
}
|
||||
}, {
|
||||
key: "sendMessage",
|
||||
value: function sendMessage() {
|
||||
var _this17 = this;
|
||||
var _this19 = this;
|
||||
|
||||
var body = {
|
||||
"message": {
|
||||
@@ -2083,31 +2070,31 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
}
|
||||
};
|
||||
this.chatService.sendMessage(body).subscribe(function (res) {
|
||||
_this17.loadMessages();
|
||||
_this19.loadMessages();
|
||||
});
|
||||
this.message = "";
|
||||
}
|
||||
}, {
|
||||
key: "loadMessages",
|
||||
value: function loadMessages() {
|
||||
var _this18 = this;
|
||||
var _this20 = this;
|
||||
|
||||
this.chatService.getRoomMessages(this.dm._id).subscribe(function (res) {
|
||||
/* console.log(res); */
|
||||
_this18.messages = res['messages'].reverse();
|
||||
_this20.messages = res['messages'].reverse();
|
||||
});
|
||||
}
|
||||
}, {
|
||||
key: "getChatMembers",
|
||||
value: function getChatMembers() {
|
||||
var _this19 = this;
|
||||
var _this21 = this;
|
||||
|
||||
this.chatService.getMembers(this.dm._id).subscribe(function (res) {
|
||||
_this19.dmUsers = res['members'].filter(function (data) {
|
||||
return data.username != _this19.loggedUser.me.username;
|
||||
_this21.dmUsers = res['members'].filter(function (data) {
|
||||
return data.username != _this21.loggedUser.me.username;
|
||||
});
|
||||
console.log(res);
|
||||
console.log(_this19.dmUsers);
|
||||
console.log(_this21.dmUsers);
|
||||
});
|
||||
}
|
||||
}, {
|
||||
@@ -2655,7 +2642,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
key: "showPicker",
|
||||
value: function showPicker() {
|
||||
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee20() {
|
||||
var _this20 = this;
|
||||
var _this22 = this;
|
||||
|
||||
var picker;
|
||||
return regeneratorRuntime.wrap(function _callee20$(_context20) {
|
||||
@@ -2674,29 +2661,29 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
cssClass: 'btn-cancel',
|
||||
handler: function handler(value) {
|
||||
console.log('button done pressed');
|
||||
_this20.selectedDuration = [value.days.value, value.hours.value, value.minutes.value];
|
||||
console.log(_this20.selectedDuration);
|
||||
_this22.selectedDuration = [value.days.value, value.hours.value, value.minutes.value];
|
||||
console.log(_this22.selectedDuration);
|
||||
|
||||
if (value.days.value != null && value.hours.value != null && value.minutes.value != null) {
|
||||
if (value.days.value > 0) {
|
||||
if (value.days.value == 1) {
|
||||
if (value.hours.value == 1) {
|
||||
_this20.displayDuration = value.days.value + " day " + value.hours.value + " hora " + value.minutes.value + " minutos";
|
||||
_this22.displayDuration = value.days.value + " day " + value.hours.value + " hora " + value.minutes.value + " minutos";
|
||||
} else {
|
||||
_this20.displayDuration = value.days.value + " days " + value.hours.value + " horas " + value.minutes.value + " minutos";
|
||||
_this22.displayDuration = value.days.value + " days " + value.hours.value + " horas " + value.minutes.value + " minutos";
|
||||
}
|
||||
} else {
|
||||
if (value.hours.value == 1) {
|
||||
_this20.displayDuration = value.days.value + " days " + value.hours.value + " hora " + value.minutes.value + " minutos";
|
||||
_this22.displayDuration = value.days.value + " days " + value.hours.value + " hora " + value.minutes.value + " minutos";
|
||||
} else {
|
||||
_this20.displayDuration = value.days.value + " days " + value.hours.value + " horas " + value.minutes.value + " minutos";
|
||||
_this22.displayDuration = value.days.value + " days " + value.hours.value + " horas " + value.minutes.value + " minutos";
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (value.hours.value == 1) {
|
||||
_this20.displayDuration = value.hours.value + " hora " + value.minutes.value + " minutos";
|
||||
_this22.displayDuration = value.hours.value + " hora " + value.minutes.value + " minutos";
|
||||
} else {
|
||||
_this20.displayDuration = value.hours.value + " horas " + value.minutes.value + " minutos";
|
||||
_this22.displayDuration = value.hours.value + " horas " + value.minutes.value + " minutos";
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2800,7 +2787,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
|
||||
case 5:
|
||||
picker.onDidDismiss().then(function (data) {
|
||||
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(_this20, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee19() {
|
||||
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(_this22, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee19() {
|
||||
var day, hour, minutes;
|
||||
return regeneratorRuntime.wrap(function _callee19$(_context19) {
|
||||
while (1) {
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1,7 @@
|
||||
export class Contact{
|
||||
_id: string;
|
||||
username: string;
|
||||
name: string;
|
||||
email:string;
|
||||
isRequired: boolean;
|
||||
}
|
||||
@@ -8,7 +8,7 @@
|
||||
<div class="div-title">
|
||||
<ion-label class="title">Contactos</ion-label>
|
||||
</div>
|
||||
<app-btn-seguinte (click)="groupMessages()"></app-btn-seguinte>
|
||||
<app-btn-seguinte *ngIf="groupName" (click)="createGroup()"></app-btn-seguinte>
|
||||
</div>
|
||||
</div>
|
||||
</ion-toolbar>
|
||||
@@ -34,7 +34,7 @@
|
||||
</div>
|
||||
|
||||
<div *virtualItem="let user" class="item-checkbox">
|
||||
<ion-checkbox color="primary"></ion-checkbox>
|
||||
<ion-checkbox (ionChange)="selectedContact(user)" color="primary"></ion-checkbox>
|
||||
<p>{{user.name}}</p>
|
||||
<ion-icon name="ellipse"></ion-icon>
|
||||
</div>
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
import { HttpClient, HttpHeaders } from '@angular/common/http';
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
import { ModalController } from '@ionic/angular';
|
||||
import { ModalController, NavParams } from '@ionic/angular';
|
||||
import { AuthService } from 'src/app/services/auth.service';
|
||||
import { ChatService } from 'src/app/services/chat.service';
|
||||
import { NewGroupPage } from '../../new-group/new-group.page';
|
||||
import { GroupMessagesPage } from '../group-messages.page';
|
||||
|
||||
@Component({
|
||||
@@ -24,12 +25,15 @@ export class GroupContactsPage implements OnInit {
|
||||
textSearch:string;
|
||||
room:any;
|
||||
dm:any;
|
||||
isGroupCreated:boolean;
|
||||
groupName:string;
|
||||
|
||||
constructor(
|
||||
private modalController: ModalController,
|
||||
private http: HttpClient,
|
||||
private chatService: ChatService,
|
||||
private authService: AuthService,
|
||||
private navParams: NavParams,
|
||||
)
|
||||
{
|
||||
this.authService.userData$.subscribe((res:any)=>{
|
||||
@@ -37,12 +41,16 @@ export class GroupContactsPage implements OnInit {
|
||||
});
|
||||
this.textSearch="";
|
||||
this.dm=null;
|
||||
this.room=null;
|
||||
this.room=null;
|
||||
this.isGroupCreated = this.navParams.get('isCreated');
|
||||
this.groupName = this.navParams.get('name');
|
||||
this.room = this.navParams.get('room');
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
this.loadUsers();
|
||||
|
||||
console.log(this.groupName);
|
||||
console.log(this.isGroupCreated);
|
||||
}
|
||||
|
||||
loadUsers(){
|
||||
@@ -82,8 +90,28 @@ export class GroupContactsPage implements OnInit {
|
||||
doRefresh(event){
|
||||
|
||||
}
|
||||
close(){
|
||||
this.modalController.dismiss(true);
|
||||
|
||||
async close(){
|
||||
this.modalController.dismiss();
|
||||
if(this.isGroupCreated){
|
||||
console.log('go to conversa');
|
||||
}
|
||||
else{
|
||||
this.modalController.dismiss();
|
||||
console.log('go to new group page');
|
||||
const modal = await this.modalController.create({
|
||||
component: NewGroupPage,
|
||||
componentProps: {
|
||||
name:this.groupName,
|
||||
duration:'',
|
||||
},
|
||||
cssClass: 'new-group',
|
||||
backdropDismiss: false,
|
||||
});
|
||||
await modal.present();
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
onChange(event){
|
||||
this.textSearch = event.detail.value;
|
||||
@@ -92,22 +120,50 @@ export class GroupContactsPage implements OnInit {
|
||||
console.log('clicked');
|
||||
|
||||
}
|
||||
async groupMessages(){
|
||||
selectedContact(user:any){
|
||||
this.groupName = this.room.name;
|
||||
console.log(user);
|
||||
|
||||
}
|
||||
createGroup(){
|
||||
if(!this.isGroupCreated){
|
||||
let body = { "name":this.groupName, }
|
||||
this.chatService.addGroup(body).subscribe(res=>{
|
||||
console.log(res['group']);
|
||||
this.openGroupMessages(res['group']);
|
||||
});
|
||||
}
|
||||
else{
|
||||
this.openGroupMessages(this.room);
|
||||
}
|
||||
}
|
||||
async newGroup(){
|
||||
this.close();
|
||||
const modal = await this.modalController.create({
|
||||
component: NewGroupPage,
|
||||
cssClass: 'new-group',
|
||||
backdropDismiss: false,
|
||||
});
|
||||
await modal.present();
|
||||
modal.onDidDismiss();
|
||||
}
|
||||
|
||||
async openGroupMessages(room:any){
|
||||
console.log(room);
|
||||
this.createGroup();
|
||||
this.isGroupCreated=true;
|
||||
this.close();
|
||||
const modal = await this.modalController.create({
|
||||
component: GroupMessagesPage,
|
||||
componentProps: {},
|
||||
cssClass: 'contacts',
|
||||
componentProps: {
|
||||
room: room,
|
||||
},
|
||||
cssClass: 'group-messages',
|
||||
backdropDismiss: false
|
||||
});
|
||||
|
||||
await modal.present();
|
||||
modal.onDidDismiss().then(res=>{
|
||||
if(res.data){
|
||||
console.log('go to new group');
|
||||
|
||||
}
|
||||
});
|
||||
modal.onDidDismiss();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -6,6 +6,7 @@ import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popo
|
||||
import { ChatPopoverPage } from 'src/app/shared/popover/chat-popover/chat-popover.page';
|
||||
import { ContactsPage } from '../new-group/contacts/contacts.page';
|
||||
import { NewGroupPage } from '../new-group/new-group.page';
|
||||
import { GroupContactsPage } from './group-contacts/group-contacts.page';
|
||||
|
||||
@Component({
|
||||
selector: 'app-group-messages',
|
||||
@@ -13,9 +14,12 @@ import { NewGroupPage } from '../new-group/new-group.page';
|
||||
styleUrls: ['./group-messages.page.scss'],
|
||||
})
|
||||
export class GroupMessagesPage implements OnInit {
|
||||
isGroupCreated:boolean;
|
||||
loggedUser: any;
|
||||
message:any;
|
||||
messages:any;
|
||||
|
||||
|
||||
room:any;
|
||||
members:any;
|
||||
contacts: string[] = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"];
|
||||
@@ -28,7 +32,8 @@ export class GroupMessagesPage implements OnInit {
|
||||
private chatService: ChatService,
|
||||
private navParams: NavParams,
|
||||
private authService: AuthService,
|
||||
) {
|
||||
) {
|
||||
this.isGroupCreated = true;
|
||||
this.room = this.navParams.get('room');
|
||||
}
|
||||
|
||||
@@ -144,8 +149,11 @@ export class GroupMessagesPage implements OnInit {
|
||||
}
|
||||
async addContacts(){
|
||||
const modal = await this.modalController.create({
|
||||
component: ContactsPage,
|
||||
componentProps: {},
|
||||
component: GroupContactsPage,
|
||||
componentProps: {
|
||||
isCreated: this.isGroupCreated,
|
||||
room: this.room,
|
||||
},
|
||||
cssClass: 'contacts',
|
||||
backdropDismiss: false
|
||||
});
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
<ion-content>
|
||||
<div class="main-content">
|
||||
<div class="item-container">
|
||||
<ion-input placeholder="Título"></ion-input>
|
||||
<ion-input [(ngModel)]="groupName" placeholder="Título"></ion-input>
|
||||
</div>
|
||||
<div class="item-container-no-border">
|
||||
<ion-checkbox (ionChange)="_ionChange($event)" color="primary"></ion-checkbox>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { analyzeAndValidateNgModules } from '@angular/compiler';
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
import { ModalController, PickerController, PopoverController } from '@ionic/angular';
|
||||
import { ModalController, NavParams, PickerController, PopoverController } from '@ionic/angular';
|
||||
import { GroupDurationPage } from 'src/app/shared/popover/group-duration/group-duration.page';
|
||||
import { GroupContactsPage } from '../group-messages/group-contacts/group-contacts.page';
|
||||
|
||||
@@ -10,17 +10,22 @@ import { GroupContactsPage } from '../group-messages/group-contacts/group-contac
|
||||
styleUrls: ['./new-group.page.scss'],
|
||||
})
|
||||
export class NewGroupPage implements OnInit {
|
||||
isGroupCreated:boolean;
|
||||
showLoader: boolean;
|
||||
displayDuration: any;
|
||||
showDuration: boolean;
|
||||
selectedDuration = ['','',''];
|
||||
groupName:string;
|
||||
|
||||
constructor(
|
||||
private pickerController: PickerController,
|
||||
private popoverController: PopoverController,
|
||||
private modalController: ModalController,
|
||||
) {
|
||||
|
||||
private modalController: ModalController,
|
||||
private navParams: NavParams,
|
||||
)
|
||||
{
|
||||
this.isGroupCreated = false;
|
||||
this.groupName = this.navParams.get('name');
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
@@ -34,16 +39,20 @@ export class NewGroupPage implements OnInit {
|
||||
}
|
||||
|
||||
async addContacts(){
|
||||
this.close();
|
||||
this.modalController.dismiss();
|
||||
|
||||
const modal = await this.modalController.create({
|
||||
component: GroupContactsPage,
|
||||
componentProps: {},
|
||||
componentProps: {
|
||||
isCreated:this.isGroupCreated,
|
||||
name:this.groupName,
|
||||
duration:'',
|
||||
},
|
||||
cssClass: 'contacts',
|
||||
backdropDismiss: false
|
||||
});
|
||||
|
||||
await modal.present();
|
||||
|
||||
modal.onDidDismiss();
|
||||
}
|
||||
|
||||
|
||||
@@ -22,9 +22,11 @@ export class AttendeeModalPage implements OnInit {
|
||||
}
|
||||
|
||||
save(){
|
||||
this.modalCtrl.dismiss(this.contacts.filter(function(contact) {
|
||||
this.modalCtrl.dismiss(
|
||||
this.contacts.filter(function(contact) {
|
||||
return contact.IsRequired == true;
|
||||
}));
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
close(){
|
||||
|
||||
@@ -156,6 +156,9 @@ export class ChatService {
|
||||
}
|
||||
|
||||
/* GROUPS */
|
||||
addGroup(body:any){
|
||||
return this.http.post(environment.apiChatUrl+'groups.create', body, this.options);
|
||||
}
|
||||
getGroupMembers(roomId:string){
|
||||
let params = new HttpParams();
|
||||
let url=environment.apiChatUrl+'groups.members';
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
export const environment = {
|
||||
production: false,
|
||||
apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V3/api/',
|
||||
apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/',
|
||||
/* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/', */
|
||||
apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
|
||||
domain: 'gabinetedigital.local',
|
||||
|
||||
Reference in New Issue
Block a user