Release v1.0.0-beta.1

.github/workflows/dev.yml

@@ -0,0 +1,28 @@
+name: Push images on dev branch update
+
+on:
+  push:
+    branches:
+      - develop
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    name: OPEX mobile app build
+    env:
+      TAG: dev
+    steps:
+      - name: Checkout Source Code
+        uses: actions/checkout@v2
+      - name: Build Docker images
+        env:
+          GENERATE_SOURCEMAP: '' 
+        run: docker-compose -f docker-compose.build.yml build
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Push images to GitHub Container Registry
+        run: docker-compose -f docker-compose.build.yml push

.github/workflows/main.yml

@@ -0,0 +1,28 @@
+name: Push images on main branch update
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    name: OPEX mobile app build
+    env:
+      TAG: latest
+    steps:
+      - name: Checkout Source Code
+        uses: actions/checkout@v2
+      - name: Build Docker images
+        env:
+          GENERATE_SOURCEMAP: false 
+        run: docker-compose -f docker-compose.build.yml build
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Push images to GitHub Container Registry
+        run: docker-compose -f docker-compose.build.yml push

.github/workflows/pr.yml

@@ -0,0 +1,18 @@
+name: Build on pull request
+
+on:
+  pull_request:
+    types: [ opened, synchronize, reopened ]
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    name: OPEX mobile app build
+    steps:
+      - name: Checkout Source Code
+        uses: actions/checkout@v2
+      - name: Build Docker images
+        env:
+          TAG: latest
+          GENERATE_SOURCEMAP: false
+        run: docker-compose -f docker-compose.build.yml build

Dockerfile

@@ -1,16 +1,17 @@
 FROM node:lts-fermium AS build
-COPY . /web-app
-WORKDIR /web-app
+COPY . /mobile-app
+WORKDIR /mobile-app
 ENV NODE_ENV production
+RUN yarn cache clean
 RUN yarn install --immutable
 ARG GENERATE_SOURCEMAP='false'
 ENV GENERATE_SOURCEMAP $GENERATE_SOURCEMAP
 RUN yarn build
 
 FROM nginx:1.20.2
 COPY default.conf /etc/nginx/conf.d
-COPY --from=build /web-app/build /var/www/opex/html
+COPY --from=build /mobile-app/build /var/www/opex/html
 WORKDIR /var/www/opex/html
 COPY env-map.js .
 CMD cat env-map.js | envsubst > env.js && nginx -g "daemon off;"
-EXPOSE 80
+EXPOSE 80

docker-compose.build.yml

@@ -1,7 +1,7 @@
 version: "3.8"
 services:
-  web-app:
-    image: ghcr.io/opexdev/web-app:$TAG
+  mobile-app:
+    image: ghcr.io/opexdev/mobile-app:$TAG
     build:
       context: .
       args:

docker-compose.yml

@@ -1,11 +1,23 @@
 version: "3.8"
 services:
-  web-app:
-    image: ghcr.io/opexdev/web-app
+  mobile-app:
+    image: ghcr.io/opexdev/mobile-app
     environment:
+      - ENV=$WEB_APP_ENV
+      - APP_TITLE=$WEB_APP_TITLE
+      - DESCRIPTION=$WEB_APP_DESCRIPTION
       - API_BASE_URL=$API_BASE_URL
       - CLIENT_ID=$CLIENT_ID
+      - LOGIN_CLIENT_ID=$CLIENT_LOGIN_ID
       - CLIENT_SECRET=$CLIENT_SECRET
+      - MULTI_LANGS_SUPPORT=$MULTI_LANGS_SUPPORT
+      - PRELOAD_LANG=$PRELOAD_LANG
+      - LANGS_SUPPORT=$LANGS_SUPPORT
+      - DEFAULT_THEME=$DEFAULT_THEME
+      - REGISTER_EMAIL_ADDRESS=$REGISTER_EMAIL_ADDRESS
+      - REFERENCE_FIAT_CURRENCY=$WEB_APP_REFERENCE_FIAT_CURRENCY
+      - CALENDAR_TYPE=$WEB_APP_CALENDAR_TYPE
+      - BROWSER_URL=$WEB_APP_BROWSER_URL
     networks:
       - default
     deploy:

env-map.js

@@ -1,5 +1,18 @@
 window.env = {
+    REACT_APP_ENV: "$ENV",
+    REACT_APP_TITLE: "$APP_TITLE",
+    REACT_APP_DESCRIPTION_CONTENT: "$DESCRIPTION",
     REACT_APP_API_BASE_URL: "$API_BASE_URL",
+    REACT_APP_LOGIN_CLIENT_ID: "$CLIENT_ID",
     REACT_APP_CLIENT_ID: "$CLIENT_ID",
-    REACT_APP_CLIENT_SECRET: "$CLIENT_SECRET"
-}
+    REACT_APP_CLIENT_SECRET: "$CLIENT_SECRET",
+    REACT_APP_MULTI_LANGS_SUPPORT : "$MULTI_LANGS_SUPPORT",
+    REACT_APP_PRELOAD_LANG : "$PRELOAD_LANG",
+    REACT_APP_LANGS_SUPPORT : "$LANGS_SUPPORT",
+    REACT_APP_DEFAULT_THEME : "$DEFAULT_THEME",
+    REACT_APP_SYSTEM_EMAIL_ADDRESS : "$REGISTER_EMAIL_ADDRESS",
+    REACT_APP_REFERENCE_FIAT_CURRENCY : "$REFERENCE_FIAT_CURRENCY",
+    REACT_APP_CALENDAR_TYPE : "$CALENDAR_TYPE",
+    REACT_APP_BROWSER_URL : "$BROWSER_URL",
+
+}

package.json

@@ -1,10 +1,12 @@
 {
   "name": "opex",
-  "version": "0.1.1",
+  "version": "v1.0.0-beta.1",
   "homepage": "",
   "private": true,
   "dependencies": {
-    "@testing-library/jest-dom": "^5.11.9",
+    "@tanstack/react-query": "^4.16.1",
+    "@tanstack/react-query-devtools": "^4.16.1",
+    "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^12.7.4",
     "axios": "^0.27.2",
@@ -13,6 +15,7 @@
     "i18next": "^21.8.0",
     "i18next-browser-languagedetector": "^6.1.4",
     "i18next-http-backend": "^1.4.0",
+    "js-api-client": "https://github.com/opexdev/js-api-client.git#develop",
     "jwt-decode": "^3.1.2",
     "lightweight-charts": "^3.8.0",
     "moment-jalaali": "^0.9.2",
@@ -30,13 +33,17 @@
     "react-qr-code": "^2.0.7",
     "react-redux": "^7.2.2",
     "react-router-dom": "^6.3.0",
-    "react-scripts": "4.0.1",
+    "react-scripts": "^5.0.1",
     "react-select": "^5.3.2",
+    "react-swipeable-list": "^1.7.0",
     "react-tooltip": "^4.2.21",
     "redux": "^4.2.0",
     "redux-saga": "^1.1.3",
     "web-vitals": "^0.2.4"
   },
+  "resolutions": {
+    "react-error-overlay": "6.0.9"
+  },
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts build",
@@ -61,5 +68,5 @@
       "last 1 safari version"
     ]
   },
-  "packageManager": "yarn@3.2.0"
+  "packageManager": "yarn@3.2.4"
 }