Add onboarding (signup, ...) to main app

MerginMaps · Dec 21, 2023 · 79eded8 · 79eded8
1 parent 8f313be
commit 79eded8
Show file tree

Hide file tree

Showing 31 changed files with 864 additions and 279 deletions.
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -66,6 +66,7 @@ set(MM_SRCS
     layersproxymodel.cpp
     main.cpp
     mapthemesmodel.cpp
+    notificationmodel.cpp
     projectsmodel.cpp
     projectsproxymodel.cpp
     projectwizard.cpp
@@ -146,6 +147,7 @@ set(MM_HDRS
     layersmodel.h
     layersproxymodel.h
     mapthemesmodel.h
+    notificationmodel.h
     projectsmodel.h
     projectsproxymodel.h
     projectwizard.h

diff --git a/app/icons/WarnLogoImage.svg b/app/icons/WarnLogoImage.svg
diff --git a/app/icons/icons.qrc b/app/icons/icons.qrc
@@ -63,6 +63,7 @@
         <file>WaterResources.svg</file>
         <file>XMark.svg</file>
         <file>XTwitter.svg</file>
+        <file>WarnLogoImage.svg</file>
         <file>Youtube.svg</file>
         <file>ZoomToProject.svg</file>
         <file>Minus.svg</file>

diff --git a/app/main.cpp b/app/main.cpp
@@ -33,7 +33,7 @@
 #include "qgsmaplayerproxymodel.h"
 #include "qgsnetworkaccessmanager.h"
 #include "geodiffutils.h"
-
+#include "merginerrortypes.h"
 #include "androidutils.h"
 #include "ios/iosutils.h"
 #include "inpututils.h"
@@ -71,6 +71,7 @@
 #include "qgsvectorlayer.h"
 #include "qgsunittypes.h"
 #include "mmstyle.h"
+#include "notificationmodel.h"
 
 #include "rememberattributescontroller.h"
 #include "attributecontroller.h"
@@ -498,6 +499,7 @@ int main( int argc, char *argv[] )
   MerginProjectStatusModel mpsm( localProjectsManager );
   InputHelp help( ma.get(), &iu );
   ProjectWizard pw( projectDir );
+  NotificationModel notificationModel;
 
   // layer models
   LayersModel lm;
@@ -614,6 +616,7 @@ int main( int argc, char *argv[] )
 
 
   // Register to QQmlEngine
+  engine.rootContext()->setContextProperty( "__notificationModel", &notificationModel );
   engine.rootContext()->setContextProperty( "__androidUtils", &au );
   engine.rootContext()->setContextProperty( "__iosUtils", &iosUtils );
   engine.rootContext()->setContextProperty( "__inputUtils", &iu );

diff --git a/app/mmstyle.h b/app/mmstyle.h
@@ -149,6 +149,7 @@ class MMStyle: public QObject
     Q_PROPERTY( QUrl acceptInvitationLogoImage READ acceptInvitationLogoImage CONSTANT )
     Q_PROPERTY( QUrl reachedDataLimitImage READ reachedDataLimitImage CONSTANT )
     Q_PROPERTY( QUrl uploadImage READ uploadImage CONSTANT )
+    Q_PROPERTY( QUrl warnLogoImage READ warnLogoImage CONSTANT )
 
     // Map items
     Q_PROPERTY( double mapItemHeight READ mapItemHeight CONSTANT )
@@ -283,6 +284,7 @@ class MMStyle: public QObject
     QUrl acceptInvitationImage() {return QUrl( "qrc:/AcceptInvitationImage.svg" ); }
     QUrl uploadImage() {return QUrl( "qrc:/UploadImage.svg" );}
     QUrl reachedDataLimitImage() {return QUrl( "qrc:/ReachedDataLimitImage.svg" );}
+    QUrl warnLogoImage() {return QUrl( "qrc:/WarnLogoImage.svg" );}
 
     double mapItemHeight() {return 50 * mDp;}
 

diff --git a/gallery/notificationmodel.cpp → app/notificationmodel.cpp b/gallery/notificationmodel.cpp → app/notificationmodel.cpp
diff --git a/gallery/notificationmodel.h → app/notificationmodel.h b/gallery/notificationmodel.h → app/notificationmodel.h
diff --git a/app/qml/CMakeLists.txt b/app/qml/CMakeLists.txt
@@ -71,12 +71,16 @@ set(MM_QML
     components/MMToolbarButton.qml
     components/MMToolbarLongButton.qml
     components/MMToolbarMenuButton.qml
+    components/MMWarningBubble.qml
     onboarding/MMAcceptInvitation.qml
     onboarding/MMCreateWorkspace.qml
     onboarding/MMHowYouFoundUs.qml
     onboarding/MMLogin.qml
     onboarding/MMSignUp.qml
     onboarding/MMWhichIndustry.qml
+    onboarding/MMOnboardingController.qml
+    onboarding/MMCreateWorkspaceController.qml
+    onboarding/MMAcceptInvitationController.qml
     dialogs/MigrateToMerginDialog.qml
     dialogs/MissingAuthDialog.qml
     dialogs/NoPermissionsDialog.qml