Merge branch 'develop' into docker-dev-prod

feat(webapp): optimize the setup organization page design

.gitignore

@@ -1 +1,2 @@
-node_modules/
+node_modules/
+data

docker-compose.yml

@@ -0,0 +1,34 @@
+version: '3.3'
+
+services:
+  mysql:
+    build:
+      context: ./docker/mysql
+      args:
+        - MYSQL_DATABASE=bigcapital_system
+        - MYSQL_USER=default_user
+        - MYSQL_PASSWORD=secret
+        - MYSQL_ROOT_PASSWORD=root
+    volumes:
+      - ./data/mysql/:/var/lib/mysql
+    expose:
+      - '3306'
+    ports:
+      - '3306:3306'
+
+  mongo:
+    build: ./docker/mongo
+    expose:
+      - '27017'
+    volumes:
+      - ./data/mongo/:/var/lib/mongodb
+    ports:
+      - '27017:27017'
+
+  redis:
+    build:
+      context: ./docker/redis
+    expose:
+      - "6379"
+    volumes:
+      - ./data/redis:/data

docker/mongo/Dockerfile

@@ -0,0 +1 @@
+FROM mongo:5.0

docker/mysql/Dockerfile

@@ -0,0 +1,18 @@
+FROM mysql:5.7
+
+ADD my.cnf /etc/mysql/conf.d/my.cnf
+
+RUN chown -R mysql:root /var/lib/mysql/
+
+ARG MYSQL_DATABASE=default_database
+ARG MYSQL_USER=default_user
+ARG MYSQL_PASSWORD=secret
+ARG MYSQL_ROOT_PASSWORD=root
+
+ENV MYSQL_DATABASE=$MYSQL_DATABASE
+ENV MYSQL_USER=$MYSQL_USER
+ENV MYSQL_PASSWORD=$MYSQL_PASSWORD
+ENV MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD
+
+CMD ["mysqld"]
+EXPOSE 3306

docker/mysql/my.cnf

@@ -0,0 +1,2 @@
+[mysqld]
+bind-address = 0.0.0.0

docker/redis/Dockerfile

@@ -0,0 +1,5 @@
+FROM redis:4.0
+
+COPY redis.conf /usr/local/etc/redis/redis.conf
+
+CMD [ "redis-server", "/usr/local/etc/redis/redis.conf" ]

docker/redis/redis.conf

@@ -0,0 +1,48 @@
+daemonize no
+pidfile /var/run/redis.pid
+port 6379
+tcp-backlog 511
+timeout 0
+tcp-keepalive 0
+loglevel notice
+logfile ""
+databases 16
+save 900 1
+save 300 10
+save 60 10000
+stop-writes-on-bgsave-error yes
+rdbcompression yes
+rdbchecksum yes
+dbfilename dump.rdb
+slave-serve-stale-data yes
+slave-read-only yes
+repl-diskless-sync no
+repl-diskless-sync-delay 5
+repl-disable-tcp-nodelay no
+slave-priority 100
+appendonly no
+appendfilename "appendonly.aof"
+appendfsync everysec
+no-appendfsync-on-rewrite no
+auto-aof-rewrite-percentage 100
+auto-aof-rewrite-min-size 64mb
+aof-load-truncated yes
+lua-time-limit 5000
+slowlog-log-slower-than 10000
+slowlog-max-len 128
+latency-monitor-threshold 0
+notify-keyspace-events ""
+hash-max-ziplist-entries 512
+hash-max-ziplist-value 64
+list-max-ziplist-entries 512
+list-max-ziplist-value 64
+set-max-intset-entries 512
+zset-max-ziplist-entries 128
+zset-max-ziplist-value 64
+hll-sparse-max-bytes 3000
+activerehashing yes
+client-output-buffer-limit normal 0 0 0
+client-output-buffer-limit slave 256mb 64mb 60
+client-output-buffer-limit pubsub 32mb 8mb 60
+hz 10
+aof-rewrite-incremental-fsync yes

packages/webapp/src/components/Dashboard/DashboardTopbar/index.ts

@@ -1 +1,3 @@
-export * from './DashboardTopbar';
+import DashboardTopbar from './DashboardTopbar';
+
+export default DashboardTopbar;

packages/webapp/src/containers/Setup/SetupLeftSection.tsx

@@ -27,13 +27,6 @@ function SetupLeftSectionFooter() {
 
   return (
     <div className={'content__footer'}>
-      <div className={'content__contact-info'}>
-        <p>
-          <T id={'setup.left_side.footer_help'} />{' '}
-          <span>{'+21892-738-1987'}</span>
-        </p>
-      </div>
-
       <div className={'content__links'}>
         <For render={FooterLinkItem} of={footerLinks} />
       </div>

packages/webapp/src/containers/Setup/SetupOrganizationPage.tsx

@@ -54,15 +54,6 @@ function SetupOrganizationPage({ wizard }) {
 
   return (
     <div className={'setup-organization'}>
-      <div className={'setup-organization__title-wrap'}>
-        <h1>
-          <T id={'setup.organization.title'} />
-        </h1>
-        <p class="paragraph">
-          <T id={'setup.organization.description'} />
-        </p>
-      </div>
-
       <Formik
         validationSchema={validationSchema}
         initialValues={initialValues}

packages/webapp/src/lang/en/index.json

@@ -1237,7 +1237,7 @@
   "expense.details.total": "Total",
   "manual_journal.details.subtotal": "Subtotal",
   "manual_journal.details.total": "Total",
-  "setup.left_side.title": "Register a New Organization now!.",
+  "setup.left_side.title": "Register a New Organization now!",
   "setup.left_side.description": "You have a Bigcapital account",
   "setup.left_side.footer_help": "We’re Here to Help!",
   "setup.plan.plans": "Plans & Payment",

packages/webapp/src/style/pages/Setup/Organization.scss

@@ -1,30 +1,17 @@
 
 .setup-organization {
-  width: 580px;
+  max-width: 600px;
+  width: 100%;
   margin: 0 auto;
-  padding: 45px 0 20px;
+  padding: 45px 25px 20px;
-
-  &__title-wrap {
-    margin-bottom: 20px;
-
-    h1 {
-      margin-top: 0;
-      margin-bottom: 10px;
-      color: #565e6c;
-    }
-    .paragraph {
-      opacity: 0.8;
-    }
-  }
 
   form {
     h3 {
-      color: #6b7382;
+      color: #868f9f;
-      margin-bottom: 1.6rem;
+      margin-bottom: 2rem;
-      font-weight: 500;
+      font-weight: 600;
     }
   }
-
   .bp3-form-group {
     margin-bottom: 24px;
 
@@ -64,10 +51,10 @@
 
   .register-org-button {
     .bp3-button {
-      background-color: #0052cc;
+      background-color: #1c2448;
-      min-width: 175px;
       height: 40px;
       font-size: 15px;
+      width: 100%;
     }
   }
 }

packages/webapp/src/style/pages/Setup/SetupPage.scss

@@ -13,12 +13,17 @@
       display: block;
       width: 100%;
       height: 1px;
-      max-width: 350px;
+      max-width: 600px;
-      min-width: 350px;
+      min-width: 600px;
 
       @media only screen and (max-width: 1200px) {
-        min-width: 300px;
+        min-width: 500px;
-        max-width: 350px;
+        max-width: 500px;
+      }
+
+      @media only screen and (max-width: 1024px) {
+        min-width: 400px;
+        max-width: 400px;
       }
     }
 
@@ -40,17 +45,20 @@
 
   &__left-section {
     position: fixed;
-    background-color: #01115e;
+    background-color: #2f3d6f;
     overflow: auto;
     z-index: 1;
     height: 100%;
     width: 100%;
     left: 0;
     top: 0;
-    width: 350px;
+    width: 600px;
 
     @media only screen and (max-width: 1200px) {
-      width: 300px;
+      width: 500px;
+    }
+    @media only screen and (max-width: 1024px) {
+      width: 400px;
     }
 
     .content {
@@ -63,24 +71,29 @@
       height: 100%;
 
       &__logo {
-        opacity: 0.65;
+        opacity: 0.75;
         margin-bottom: 60px;
         padding-left: 10px;
       }
 
       &__title {
-        font-size: 26px;
+        font-size: 50px;
-        font-weight: 600;
+        font-weight: 100;
         line-height: normal;
-        margin-bottom: 20px;
+        margin-bottom: 14px;
         margin-top: 14px;
         color: rgba(255, 255, 255, 0.75);
+
+        @media only screen and (max-width: 1024px) {
+          font-size: 45px;
+        }
       }
 
       &__text {
-        font-size: 16px;
+        font-size: 18px;
         opacity: 0.75;
         margin-bottom: 10px;
+        font-weight: 200;
       }
 
       &__organization {
@@ -96,31 +109,21 @@
       }
 
       &__divider {
-        height: 3px;
+        height: 1px;
-        width: 100px;
+        width: 60%;
-        background: rgba(255, 255, 255, 0.15);
+        background: rgba(255, 255, 255, 0.25);
-        margin: 10px 0;
+        margin: 18px 0;
       }
 
       &__footer {
         margin-top: auto;
-      }
+        border-top: 1px solid rgba(255, 255, 255, 0.25);
-
+        padding-top: 20px;
-      &__contact-info {
-        font-size: 16px;
-        margin-bottom: 20px;
-        opacity: 0.75;
-        padding-bottom: 5px;
-        border-bottom: 1px solid rgba(255, 255, 255, 0.15);
-
-        p>span {
-          unicode-bidi: plaintext;
-        }
       }
 
       &__links {
         text-align: left;
-        opacity: 0.55;
+        opacity: 0.65;
 
         >div {
           font-size: 13px;
@@ -148,12 +151,14 @@
 
   ul {
     display: flex;
+    padding: 0 20px;
+    justify-content: center;
   }
 
   li {
     position: relative;
     list-style-type: none;
-    width: 25%;
+    width: 33%;
     text-align: center;
     color: #333;
     font-size: 16px;

vercel.json

@@ -3,7 +3,6 @@
   "devCommand": "npm run dev:webapp",
   "installCommand": "npm install && npm run bootstrap",
   "outputDirectory": "packages/webapp/build",
-  "ignoreCommand": "git diff HEAD^ HEAD --quiet ./packages/webapp/",
   "env": {
     "CI": "false"
   }