Merge branch 'RegisterWizard' of https://github.com/abouolia/Bigcapital into RegisterWizard

client/src/components/Dashboard/Dashboard.js

@@ -22,13 +22,13 @@ function Dashboard({
   // #withSettings
   requestFetchOptions,
 }) {
-  // const fetchOptions = useQuery(
-  //   ['options'], () => requestFetchOptions(),
-  // );
+  const fetchOptions = useQuery(
+    ['options'], () => requestFetchOptions(),
+  );
 
   return (
     <EnsureOrganizationIsReady>
-      <DashboardLoadingIndicator isLoading={false}>
+      <DashboardLoadingIndicator isLoading={fetchOptions.isFetching}>
         <Switch>
           <Route path="/preferences">
             <DashboardSplitPane>

client/src/containers/Setup/SetupInitializingForm.js

@@ -37,7 +37,7 @@ function SetupInitializingForm({
           It's time to make your accounting really simple!
         </h1>
         <p className={'paragraph'}>
-          while we set up your account,please remember to verify your account by
+          while we set up your account, please remember to verify your account by
           clicking on the link we sent to yout registered email address
         </p>
       </div>

client/src/containers/Setup/SetupLeftSection.js

@@ -47,7 +47,7 @@ function SetupLeftSection({
 
         <div className={'content__organization'}>
           <span class="organization-id">
-            Your oragnization ID: <span class="id">{ currentOrganizationId }</span>,
+            Oragnization ID: <span class="id">{ currentOrganizationId }</span>,
           </span>
           <br />
           <span class="signout">

client/src/style/pages/authentication.scss

@@ -106,7 +106,7 @@
     h3 {
       font-weight: 500;
       font-size: 22px;
-      color: #444;
+      color: #2d2b43;
       margin: 0 0 12px;
     }
 

client/src/style/pages/register-wizard-page.scss

@@ -196,13 +196,16 @@
   padding: 45px 0 20px;
 
   &__title-wrap{
-    margin-bottom: 20px;
+    margin-bottom: 32px;
 
     h1 {
       margin-top: 0;
       margin-bottom: 10px;
       color: #565e6c;
     }
+    .paragraph{
+      opacity: 0.75;
+    }
   }
 
   &__form{
@@ -252,28 +255,33 @@
     background: rgba(92, 112, 128, 0.2);
     border-radius: 40px;
     display: block;
-    height: 8px;
+    height: 6px;
     overflow: hidden;
     position: relative;
     width: 80%;
     margin: 0 auto;
+
+    .bp3-progress-meter {
+      background-color: #809cb3;
+    }
   }
 
   &__title {
     text-align: center;
     margin-top: 35px;
+
     h1 {
-      font-size: 24px;
-      font-weight: 700;
-      color: #000;
-      // color: #6d6d6d;
+      font-size: 22px;
+      font-weight: 600;
+      color: #454c59;
+      margin-top: 0;
+      margin-bottom: 14px;
     }
 
     .paragraph {
-      font-size: 15px;
-      line-height: 1.5;
-      padding: 0 20%;
-    }
-    
+      width: 70%;
+      margin: 0 auto;
+      color: #2e4266;
+    }   
   }
 }