Loop3 · jrrcdev · Mar 14, 2020 · Mar 21, 2020 · Mar 27, 2020 · Mar 28, 2020
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,19 @@
+commands
+nginx
+node_modules
+public
+scripts
+src
+*.yml
+*.yaml
+.env*
+.git*
+.snyk
+*.md
+Dockerfile*
+jest*.js
+yarn.lock
+docker-entrypoint.sh
+*.tar.gz
+ui/.env
+ui/.env.sample
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,27 @@
+FROM node:14-slim as builder
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update
+
+WORKDIR /source
+
+COPY --chown=node:node . /source
+
+WORKDIR /source/ui
+
+RUN yarn && yarn build
+
+FROM node:14-slim
+
+WORKDIR /app
+
+COPY --from=builder --chown=node:node /source/ui .
+
+RUN yarn global add serve
+
+USER node
+
+EXPOSE 3000
+
+ENTRYPOINT [ "serve", "-s", "build", "-l", "3000" ]
diff --git a/build.sh b/build.sh
@@ -0,0 +1,13 @@
+docker rmi $(docker images | grep '^<none>' | awk '{print $3}')
+
+tag=$1
+
+docker build -t whatspro/crm:$tag .
+
+docker push whatspro/crm:$tag
+
+docker builder prune -f
+
+docker rmi whatspro/crm:$tag
+
+docker rmi $(docker images | grep '^<none>' | awk '{print $3}')
diff --git a/ui/.prettierrc b/ui/.prettierrc
@@ -0,0 +1,3 @@
+{
+  "singleQuote": true
+}
diff --git a/ui/package.json b/ui/package.json
@@ -54,6 +54,7 @@
     "react-color": "^2.17.3",
     "react-copy-to-clipboard": "^5.0.1",
     "react-dom": "^16.11.0",
+    "react-dropzone": "^11.4.2",
     "react-markdown": "^3.3.0",
     "react-router-dom": "^5.1.2",
     "react-scripts": "^3.0.1",
@@ -94,6 +95,8 @@
     "record-cypress": "cypress run --record --key fd048d49-6b4c-4e6b-885f-819a533c2fc4"
   },
   "devDependencies": {
+    "cypress": "^4.9.0",
+    "@types/dom-mediacapture-record": "^1.0.11",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",
     "lint-staged": "^5.0.0",
@@ -102,8 +105,7 @@
     "tslint": "^5.18.0",
     "tslint-config-prettier": "^1.18.0",
     "tslint-react": "^4.0.0",
-    "typescript": "^3.0.3",
-    "cypress": "^4.9.0"
+    "typescript": "^3.0.3"
   },
   "browserslist": [
     ">0.2%",

diff --git a/ui/public/favicon-unread.png b/ui/public/favicon-unread.png
diff --git a/ui/public/favicon.png b/ui/public/favicon.png
diff --git a/ui/public/images/erxes.png b/ui/public/images/erxes.png
diff --git a/ui/public/images/logo-dark.png b/ui/public/images/logo-dark.png
diff --git a/ui/public/images/logo-image.png b/ui/public/images/logo-image.png
diff --git a/ui/public/images/logo.png b/ui/public/images/logo.png
diff --git a/ui/public/index.html b/ui/public/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="pt-br">
   <head>
     <meta charset="utf-8" />
     <meta
@@ -25,7 +25,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>erxes</title>
+    <title>WhatsPro</title>
   </head>
   <body>
     <script src="%PUBLIC_URL%/js/env.js"></script>
@@ -46,15 +46,19 @@
       };
 
       window.envMaps = [
-        { name: 'REACT_APP_API_URL', processValue: '%REACT_APP_API_URL%' },
+        { name: 'REACT_APP_API_URL', processValue: '%REACT_APP_API_URL%', 
+          endpoint:  'https://hostname/api' },
         {
           name: 'REACT_APP_API_SUBSCRIPTION_URL',
-          processValue: '%REACT_APP_API_SUBSCRIPTION_URL%',
+          processValue: '%REACT_APP_API_SUBSCRIPTION_URL%', 
+          endpoint:  'wss://hostname/subscriptions',
         },
-        { name: 'REACT_APP_CDN_HOST', processValue: '%REACT_APP_CDN_HOST%' },
+        { name: 'REACT_APP_CDN_HOST', processValue: '%REACT_APP_CDN_HOST%', 
+          endpoint:  'https://hostname/widgets' },
         {
           name: 'REACT_APP_DASHBOARD_URL',
-          processValue: '%REACT_APP_DASHBOARD_URL%',
+          processValue: '%REACT_APP_DASHBOARD_URL%', 
+          endpoint:  'https://hostname/dash',
         },
       ];
 
@@ -63,7 +67,8 @@
 
         localStorage.setItem(
           `erxes_env_${envMap.name}`,
-          getEnv(envMap.name, envMap.processValue)
+
+          envMap.processValue.replace(`%${envMap.name}%`, envMap.endpoint.replace('hostname', location.host))
         );
       }
     </script>

diff --git a/ui/src/appContext.tsx b/ui/src/appContext.tsx
@@ -6,6 +6,7 @@ import React from 'react';
 interface IState {
   currentUser?: IUser;
   currentLanguage: string;
+  isLoading: boolean;
   isShownIndicator: boolean;
   isRemovingImport: boolean;
   isDoneIndicatorAction: boolean;
@@ -31,11 +32,12 @@ export class AppProvider extends React.Component<
     super(props);
 
     // initiliaze locale ======
-    const currentLanguage = localStorage.getItem('currentLanguage') || 'en';
+    const currentLanguage = localStorage.getItem('currentLanguage') || process.env.REACT_APP_DEFAULT_LANGUAGE || 'pt-br';
 
     this.state = {
       currentUser: props.currentUser,
       currentLanguage,
+      isLoading: false,
       isShownIndicator: false,
       isRemovingImport: false,
       isDoneIndicatorAction: false
@@ -80,23 +82,31 @@ export class AppProvider extends React.Component<
   }
 
   setLocale = (currentLanguage: string): void => {
+    console.log(currentLanguage);
+
+    document.documentElement.lang = currentLanguage;
+
     if (currentLanguage !== 'mn') {
       import(`dayjs/locale/${currentLanguage}`)
         .then(() => dayjs.locale(currentLanguage))
-        .catch(_ => dayjs.locale('en'));
+        .catch(_ => dayjs.locale('pt-br'));
     }
 
     import(`./locales/${currentLanguage}.json`)
       .then(data => {
         const translations = data.default;
         T.setTexts(translations);
+
+        setTimeout(() => {
+          this.setState({ isLoading: false });
+        }, 1000);
       })
       .catch(e => console.log(e)); // tslint:disable-line
   };
 
   changeLanguage = (languageCode): void => {
     if (this.state.currentLanguage !== languageCode) {
-      localStorage.setItem('currentLanguage', languageCode || 'en');
+      localStorage.setItem('currentLanguage', languageCode || 'pt-br');
       window.location.reload();
     }
   };
@@ -105,16 +115,22 @@ export class AppProvider extends React.Component<
     const {
       currentUser,
       currentLanguage,
+      isLoading,
       isShownIndicator,
       isRemovingImport,
       isDoneIndicatorAction
     } = this.state;
 
+    if (isLoading) {
+      return null;
+    }
+
     return (
       <AppContext.Provider
         value={{
           currentUser,
           currentLanguage,
+          isLoading,
           changeLanguage: this.changeLanguage,
           closeLoadingBar: this.closeLoadingBar,
           showLoadingBar: this.showLoadingBar,

diff --git a/ui/src/locales/ar.json b/ui/src/locales/ar.json
@@ -287,7 +287,7 @@
   "Sub segment of": "الجزء الفرعي من",
   "Color": "اللون",
   "Filters": "مرشحات",
-  "User(s) will recieve this message": "سوف يستلم المستخدم / المستخدمين هذه الرسالة",
+  "User(s) will receive this message": "سوف يستلم المستخدم / المستخدمين هذه الرسالة",
   "Color code": "رمز اللون",
   "Engage Message": "إشراك الرسالة",
   "Item counts": "التهم البند",

diff --git a/ui/src/locales/bn.json b/ui/src/locales/bn.json
@@ -287,7 +287,7 @@
   "Sub segment of": "উপ বিভাগ",
   "Color": "রঙ",
   "Filters": "ফিল্টার",
-  "User(s) will recieve this message": "ব্যবহারকারী (গুলি) এই বার্তাটি গ্রহণ করবে",
+  "User(s) will receive this message": "ব্যবহারকারী (গুলি) এই বার্তাটি গ্রহণ করবে",
   "Color code": "রঙের কোড",
   "Engage Message": "বার্তা নিযুক্ত করুন",
   "Item counts": "আইটেম গণনা",

diff --git a/ui/src/locales/cs.json b/ui/src/locales/cs.json
@@ -287,7 +287,7 @@
   "Sub segment of": "Dílčí segment",
   "Color": "Barva",
   "Filters": "Filtry",
-  "User(s) will recieve this message": "Uživatel (y) obdrží tuto zprávu",
+  "User(s) will receive this message": "Uživatel (y) obdrží tuto zprávu",
   "Color code": "Barevný kód",
   "Engage Message": "Zapojte zprávu",
   "Item counts": "Položka se počítá",

diff --git a/ui/src/locales/de.json b/ui/src/locales/de.json
@@ -278,7 +278,7 @@
   "Sub segment of": "Untersegment von",
   "Color": "Farbe",
   "Filters": "Filter",
-  "User(s) will recieve this message": "Benutzer erhalten diese Nachricht",
+  "User(s) will receive this message": "Benutzer erhalten diese Nachricht",
   "Color code": "Farbcode",
   "Engage Message": "Nachricht einleiten",
   "Item counts": "Artikelanzahl",