another iteration

app/qml/onboarding/MMAcceptInvitation.qml

@@ -1,3 +1,5 @@
+
+
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -6,17 +8,32 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
 
 Page {
   id: root
 
+  signal backClicked
+  signal continueClicked
+  signal createWorkspaceClicked
+
   ColumnLayout {
-      MMOnboardingHeader {
-        headerTitle: tr("Accept Invitation")
-      }
+    MMOnboardingHeader {
+      headerTitle: qsTr("Accept Invitation")
+
+      onBackClicked: root.backClicked()
+    }
+
+    ToolButton {
+      onClicked: root.continueClicked()
+      text: qsTr("Continue")
+    }
+
+    ToolButton {
+      onClicked: root.createWorkspaceClicked()
+      text: qsTr("Create Workspace")
+    }
   }
 }

app/qml/onboarding/MMChangeServerButton.qml

@@ -0,0 +1,19 @@
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+Button {
+  id: root
+
+  // TODO
+  text: "https://app.merginmaps.com"
+}

app/qml/onboarding/MMCreateWorkspace.qml

@@ -1,3 +1,5 @@
+
+
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -6,17 +8,34 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
 
 Page {
   id: root
 
+  signal continueClicked
+
   ColumnLayout {
-      MMOnboardingHeader {
-        headerTitle: tr("Create Workspace")
-      }
+    MMOnboardingHeader {
+      headerTitle: qsTr("Create Workspace")
+      step: 1
+      backVisible: false
+    }
+
+    Label {
+      text: qsTr("Workspace is a place to store your projects. Colleagues can be invited to your workspace to collaborate on projects.")
+    }
+
+    Label {
+      // TODO
+      text: qsTr("A good candidate for a workspace name is the name of your team or organisation.")
+    }
+
+    ToolButton {
+      onClicked: root.continueClicked()
+      text: qsTr("Continue")
+    }
   }
 }

app/qml/onboarding/MMHowYouFoundUs.qml

@@ -1,3 +1,5 @@
+
+
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -6,17 +8,27 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
 
 Page {
   id: root
 
+  signal backClicked
+  signal continueClicked
+
   ColumnLayout {
-      MMOnboardingHeader {
-        headerTitle: tr("HowYouFoundUs")
-      }
+    MMOnboardingHeader {
+      headerTitle: qsTr("HowYouFoundUs")
+      step: 2
+
+      onBackClicked: root.backClicked()
+    }
+
+    ToolButton {
+      onClicked: root.continueClicked()
+      text: qsTr("Continue")
+    }
   }
 }

app/qml/onboarding/MMLogin.qml

@@ -1,3 +1,5 @@
+
+
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -6,39 +8,89 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
+import "../components"
 
 Page {
   id: root
 
-  signal signInClicked()
-  signal signUpClicked()
-  signal changeServerClicked()
+  anchors.fill: parent
+
+  signal backClicked
+  signal signInClicked
+  signal signUpClicked
+  signal changeServerClicked
+  signal forgotPasswordClicked
+
+  // TODO - lazy loaded?
+  MMDrawer {
+    id: changeServerDrawer
+
+    title: qsTr("Change server")
+    primaryButton: qsTr("Confirm")
+    visible: false
+    specialComponent: MMInput {
+      title: qsTr("Server address")
+    }
+
+    onPrimaryButtonClicked: {
+      changeServerButton.text = specialComponent.text
+      visible = false
+      root.changeServerClicked()
+    }
+  }
 
   ColumnLayout {
+    id: layout
+
+    anchors.fill: parent
 
     MMOnboardingHeader {
-      headerTitle: tr("Sign In")
+      headerTitle: qsTr("Log In")
+      Layout.fillWidth: true
+      onBackClicked: root.backClicked()
+    }
+
+    MMInput {
+      title: qsTr("Username")
     }
 
-    ToolButton {
+    MMPasswordInput {
+      title: qsTr("Password")
+      regexp: '(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])(?=.{6,})'
+      errorMsg: qsTr("Password must contain at least 6 characters\nMinimum 1 number, uppercase and lowercase letter and special character.")
+    }
+
+    MMButton {
+      text: qsTr("Forgot password?")
+      transparent: true
       onClicked: root.signInClicked()
-      text: "Sign in"
     }
 
-    ToolButton {
-      onClicked: root.signUpClicked()
-      text: "Sign up"
+    MMButton {
+      text: qsTr("Sign in")
+
+      onClicked: root.signInClicked()
     }
 
-    ToolButton {
-      onClicked: root.changeServerClicked()
-      text: "Change Server"
+    MMOnboardingHlineText {
+      title: qsTr("Don't have an account?")
     }
-  }
 
+    MMLinkButton {
+      text: qsTr("Sign up")
 
+      onClicked: root.signUpClicked()
+    }
+
+    MMChangeServerButton {
+      id: changeServerButton
+
+      onClicked: {
+        changeServerDrawer.visible = true
+      }
+    }
+  }
 }