From c39f3b077be9cfd37c6a186dda11786f69dee24b Mon Sep 17 00:00:00 2001 From: Benyamin <23664159+Benyamin001@users.noreply.github.com> Date: Tue, 30 Aug 2022 15:34:29 +0430 Subject: [PATCH 1/3] Fix show error --- src/pages/KycUsers/KycUsers.js | 2 +- src/pages/Users/Users.js | 2 +- src/pages/Withdraws/Withdraws.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/KycUsers/KycUsers.js b/src/pages/KycUsers/KycUsers.js index 7d8b674..2f39fe7 100644 --- a/src/pages/KycUsers/KycUsers.js +++ b/src/pages/KycUsers/KycUsers.js @@ -119,7 +119,7 @@ const KycUsers = () => { : "" } - {(!isLoading && users.total > paginate.perPage) && + {(!isLoading && users?.total > paginate.perPage) &&
diff --git a/src/pages/Users/Users.js b/src/pages/Users/Users.js index 0e7e40d..069ae93 100644 --- a/src/pages/Users/Users.js +++ b/src/pages/Users/Users.js @@ -86,7 +86,7 @@ const Users = () => { : "" } - {(!isLoading && users.total > paginate.perPage)&& + {(!isLoading && users?.total > paginate.perPage)&&
diff --git a/src/pages/Withdraws/Withdraws.js b/src/pages/Withdraws/Withdraws.js index 71fb630..4e5a08a 100644 --- a/src/pages/Withdraws/Withdraws.js +++ b/src/pages/Withdraws/Withdraws.js @@ -98,7 +98,7 @@ const Withdraws = () => { : "" } - {(!isLoading && withdraws.total > paginate.perPage) && + {(!isLoading && withdraws?.total > paginate.perPage) &&
From b6c193259e50228873528b59742c8549322f98aa Mon Sep 17 00:00:00 2001 From: Benyamin <23664159+Benyamin001@users.noreply.github.com> Date: Tue, 18 Oct 2022 11:35:39 +0330 Subject: [PATCH 2/3] #11/Add new env --- Dockerfile | 4 -- docker-compose.build.yml | 2 - docker-compose.override.yml | 2 - docker-compose.yml | 2 + env-map.js | 2 + public/{ => assets}/favicon.ico | Bin .../logo/android-chrome-192x192.png | Bin .../logo/android-chrome-512x512.png | Bin .../logo/android-icon-144x144.png | Bin .../logo/android-icon-192x192.png | Bin .../{ => assets}/logo/android-icon-36x36.png | Bin .../{ => assets}/logo/android-icon-48x48.png | Bin .../{ => assets}/logo/android-icon-72x72.png | Bin .../{ => assets}/logo/android-icon-96x96.png | Bin .../{ => assets}/logo/apple-icon-114x114.png | Bin .../{ => assets}/logo/apple-icon-120x120.png | Bin .../{ => assets}/logo/apple-icon-144x144.png | Bin .../{ => assets}/logo/apple-icon-152x152.png | Bin .../{ => assets}/logo/apple-icon-180x180.png | Bin public/{ => assets}/logo/apple-icon-57x57.png | Bin public/{ => assets}/logo/apple-icon-60x60.png | Bin public/{ => assets}/logo/apple-icon-72x72.png | Bin public/{ => assets}/logo/apple-icon-76x76.png | Bin .../logo/apple-icon-precomposed.png | Bin public/{ => assets}/logo/apple-icon.png | Bin public/{ => assets}/logo/apple-touch-icon.png | Bin public/{ => assets}/logo/browserconfig.xml | 0 public/{ => assets}/logo/favicon-16x16.png | Bin public/{ => assets}/logo/favicon-32x32.png | Bin public/{ => assets}/logo/favicon-96x96.png | Bin public/{ => assets}/logo/favicon.ico | Bin public/assets/logo/logo-mini.svg | 1 + public/assets/logo/logo.svg | 1 + public/{ => assets}/logo/ms-icon-144x144.png | Bin public/{ => assets}/logo/ms-icon-150x150.png | Bin public/{ => assets}/logo/ms-icon-310x310.png | Bin public/{ => assets}/logo/ms-icon-70x70.png | Bin public/{ => assets}/manifest.json | 16 ++++---- public/index.html | 36 +++++++++--------- src/components/SideBar/SideBar.js | 2 +- src/index.js | 5 +++ src/pages/Login/Login.js | 4 +- src/scss/_layout.scss | 2 +- 43 files changed, 41 insertions(+), 38 deletions(-) rename public/{ => assets}/favicon.ico (100%) rename public/{ => assets}/logo/android-chrome-192x192.png (100%) rename public/{ => assets}/logo/android-chrome-512x512.png (100%) rename public/{ => assets}/logo/android-icon-144x144.png (100%) rename public/{ => assets}/logo/android-icon-192x192.png (100%) rename public/{ => assets}/logo/android-icon-36x36.png (100%) rename public/{ => assets}/logo/android-icon-48x48.png (100%) rename public/{ => assets}/logo/android-icon-72x72.png (100%) rename public/{ => assets}/logo/android-icon-96x96.png (100%) rename public/{ => assets}/logo/apple-icon-114x114.png (100%) rename public/{ => assets}/logo/apple-icon-120x120.png (100%) rename public/{ => assets}/logo/apple-icon-144x144.png (100%) rename public/{ => assets}/logo/apple-icon-152x152.png (100%) rename public/{ => assets}/logo/apple-icon-180x180.png (100%) rename public/{ => assets}/logo/apple-icon-57x57.png (100%) rename public/{ => assets}/logo/apple-icon-60x60.png (100%) rename public/{ => assets}/logo/apple-icon-72x72.png (100%) rename public/{ => assets}/logo/apple-icon-76x76.png (100%) rename public/{ => assets}/logo/apple-icon-precomposed.png (100%) rename public/{ => assets}/logo/apple-icon.png (100%) rename public/{ => assets}/logo/apple-touch-icon.png (100%) rename public/{ => assets}/logo/browserconfig.xml (100%) rename public/{ => assets}/logo/favicon-16x16.png (100%) rename public/{ => assets}/logo/favicon-32x32.png (100%) rename public/{ => assets}/logo/favicon-96x96.png (100%) rename public/{ => assets}/logo/favicon.ico (100%) create mode 100644 public/assets/logo/logo-mini.svg create mode 100644 public/assets/logo/logo.svg rename public/{ => assets}/logo/ms-icon-144x144.png (100%) rename public/{ => assets}/logo/ms-icon-150x150.png (100%) rename public/{ => assets}/logo/ms-icon-310x310.png (100%) rename public/{ => assets}/logo/ms-icon-70x70.png (100%) rename public/{ => assets}/manifest.json (65%) diff --git a/Dockerfile b/Dockerfile index 44b9c38..342d0d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,10 +5,6 @@ ENV NODE_ENV production RUN npm install ARG GENERATE_SOURCEMAP=false ENV GENERATE_SOURCEMAP $GENERATE_SOURCEMAP -ARG REACT_APP_DEFAULT_DIRECTION=LTR -ENV REACT_APP_DEFAULT_DIRECTION $REACT_APP_DEFAULT_DIRECTION -ARG REACT_APP_BRAND_NAME=OPEX -ENV REACT_APP_BRAND_NAME $REACT_APP_BRAND_NAME RUN npm run build FROM nginx:1.20.2 diff --git a/docker-compose.build.yml b/docker-compose.build.yml index 142c623..82358d8 100644 --- a/docker-compose.build.yml +++ b/docker-compose.build.yml @@ -5,6 +5,4 @@ services: build: context: . args: - - REACT_APP_DEFAULT_DIRECTION=LTR - - REACT_APP_BRAND_NAME=OPEX - GENERATE_SOURCEMAP=$GENERATE_SOURCEMAP diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 41560af..8809e9c 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -5,6 +5,4 @@ services: build: context: . args: - - REACT_APP_DEFAULT_DIRECTION=LTR - - REACT_APP_BRAND_NAME=OPEX - GENERATE_SOURCEMAP=$GENERATE_SOURCEMAP diff --git a/docker-compose.yml b/docker-compose.yml index 5264efb..0c91294 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,6 +3,8 @@ services: admin-panel: image: ghcr.io/opexdev/admin-panel environment: + - APP_TITLE=$ADMIN_TITLE + - DESCRIPTION=$ADMIN_DESCRIPTION - API_BASE_URL=$API_BASE_URL - FRONT_URL=$FRONT_URL - CLIENT_ID=$CLIENT_ID diff --git a/env-map.js b/env-map.js index f643316..2d57bd9 100644 --- a/env-map.js +++ b/env-map.js @@ -1,4 +1,6 @@ window.env = { + REACT_APP_TITLE: "$APP_TITLE", + REACT_APP_DESCRIPTION_CONTENT: "$DESCRIPTION", REACT_APP_API_BASE_URL: "$API_BASE_URL", REACT_APP_FRONT_URL: "$FRONT_URL", REACT_APP_CLIENT_ID: "$CLIENT_ID", diff --git a/public/favicon.ico b/public/assets/favicon.ico similarity index 100% rename from public/favicon.ico rename to public/assets/favicon.ico diff --git a/public/logo/android-chrome-192x192.png b/public/assets/logo/android-chrome-192x192.png similarity index 100% rename from public/logo/android-chrome-192x192.png rename to public/assets/logo/android-chrome-192x192.png diff --git a/public/logo/android-chrome-512x512.png b/public/assets/logo/android-chrome-512x512.png similarity index 100% rename from public/logo/android-chrome-512x512.png rename to public/assets/logo/android-chrome-512x512.png diff --git a/public/logo/android-icon-144x144.png b/public/assets/logo/android-icon-144x144.png similarity index 100% rename from public/logo/android-icon-144x144.png rename to public/assets/logo/android-icon-144x144.png diff --git a/public/logo/android-icon-192x192.png b/public/assets/logo/android-icon-192x192.png similarity index 100% rename from public/logo/android-icon-192x192.png rename to public/assets/logo/android-icon-192x192.png diff --git a/public/logo/android-icon-36x36.png b/public/assets/logo/android-icon-36x36.png similarity index 100% rename from public/logo/android-icon-36x36.png rename to public/assets/logo/android-icon-36x36.png diff --git a/public/logo/android-icon-48x48.png b/public/assets/logo/android-icon-48x48.png similarity index 100% rename from public/logo/android-icon-48x48.png rename to public/assets/logo/android-icon-48x48.png diff --git a/public/logo/android-icon-72x72.png b/public/assets/logo/android-icon-72x72.png similarity index 100% rename from public/logo/android-icon-72x72.png rename to public/assets/logo/android-icon-72x72.png diff --git a/public/logo/android-icon-96x96.png b/public/assets/logo/android-icon-96x96.png similarity index 100% rename from public/logo/android-icon-96x96.png rename to public/assets/logo/android-icon-96x96.png diff --git a/public/logo/apple-icon-114x114.png b/public/assets/logo/apple-icon-114x114.png similarity index 100% rename from public/logo/apple-icon-114x114.png rename to public/assets/logo/apple-icon-114x114.png diff --git a/public/logo/apple-icon-120x120.png b/public/assets/logo/apple-icon-120x120.png similarity index 100% rename from public/logo/apple-icon-120x120.png rename to public/assets/logo/apple-icon-120x120.png diff --git a/public/logo/apple-icon-144x144.png b/public/assets/logo/apple-icon-144x144.png similarity index 100% rename from public/logo/apple-icon-144x144.png rename to public/assets/logo/apple-icon-144x144.png diff --git a/public/logo/apple-icon-152x152.png b/public/assets/logo/apple-icon-152x152.png similarity index 100% rename from public/logo/apple-icon-152x152.png rename to public/assets/logo/apple-icon-152x152.png diff --git a/public/logo/apple-icon-180x180.png b/public/assets/logo/apple-icon-180x180.png similarity index 100% rename from public/logo/apple-icon-180x180.png rename to public/assets/logo/apple-icon-180x180.png diff --git a/public/logo/apple-icon-57x57.png b/public/assets/logo/apple-icon-57x57.png similarity index 100% rename from public/logo/apple-icon-57x57.png rename to public/assets/logo/apple-icon-57x57.png diff --git a/public/logo/apple-icon-60x60.png b/public/assets/logo/apple-icon-60x60.png similarity index 100% rename from public/logo/apple-icon-60x60.png rename to public/assets/logo/apple-icon-60x60.png diff --git a/public/logo/apple-icon-72x72.png b/public/assets/logo/apple-icon-72x72.png similarity index 100% rename from public/logo/apple-icon-72x72.png rename to public/assets/logo/apple-icon-72x72.png diff --git a/public/logo/apple-icon-76x76.png b/public/assets/logo/apple-icon-76x76.png similarity index 100% rename from public/logo/apple-icon-76x76.png rename to public/assets/logo/apple-icon-76x76.png diff --git a/public/logo/apple-icon-precomposed.png b/public/assets/logo/apple-icon-precomposed.png similarity index 100% rename from public/logo/apple-icon-precomposed.png rename to public/assets/logo/apple-icon-precomposed.png diff --git a/public/logo/apple-icon.png b/public/assets/logo/apple-icon.png similarity index 100% rename from public/logo/apple-icon.png rename to public/assets/logo/apple-icon.png diff --git a/public/logo/apple-touch-icon.png b/public/assets/logo/apple-touch-icon.png similarity index 100% rename from public/logo/apple-touch-icon.png rename to public/assets/logo/apple-touch-icon.png diff --git a/public/logo/browserconfig.xml b/public/assets/logo/browserconfig.xml similarity index 100% rename from public/logo/browserconfig.xml rename to public/assets/logo/browserconfig.xml diff --git a/public/logo/favicon-16x16.png b/public/assets/logo/favicon-16x16.png similarity index 100% rename from public/logo/favicon-16x16.png rename to public/assets/logo/favicon-16x16.png diff --git a/public/logo/favicon-32x32.png b/public/assets/logo/favicon-32x32.png similarity index 100% rename from public/logo/favicon-32x32.png rename to public/assets/logo/favicon-32x32.png diff --git a/public/logo/favicon-96x96.png b/public/assets/logo/favicon-96x96.png similarity index 100% rename from public/logo/favicon-96x96.png rename to public/assets/logo/favicon-96x96.png diff --git a/public/logo/favicon.ico b/public/assets/logo/favicon.ico similarity index 100% rename from public/logo/favicon.ico rename to public/assets/logo/favicon.ico diff --git a/public/assets/logo/logo-mini.svg b/public/assets/logo/logo-mini.svg new file mode 100644 index 0000000..177983a --- /dev/null +++ b/public/assets/logo/logo-mini.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/logo/logo.svg b/public/assets/logo/logo.svg new file mode 100644 index 0000000..aacba74 --- /dev/null +++ b/public/assets/logo/logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/logo/ms-icon-144x144.png b/public/assets/logo/ms-icon-144x144.png similarity index 100% rename from public/logo/ms-icon-144x144.png rename to public/assets/logo/ms-icon-144x144.png diff --git a/public/logo/ms-icon-150x150.png b/public/assets/logo/ms-icon-150x150.png similarity index 100% rename from public/logo/ms-icon-150x150.png rename to public/assets/logo/ms-icon-150x150.png diff --git a/public/logo/ms-icon-310x310.png b/public/assets/logo/ms-icon-310x310.png similarity index 100% rename from public/logo/ms-icon-310x310.png rename to public/assets/logo/ms-icon-310x310.png diff --git a/public/logo/ms-icon-70x70.png b/public/assets/logo/ms-icon-70x70.png similarity index 100% rename from public/logo/ms-icon-70x70.png rename to public/assets/logo/ms-icon-70x70.png diff --git a/public/manifest.json b/public/assets/manifest.json similarity index 65% rename from public/manifest.json rename to public/assets/manifest.json index bbc2d6d..9e1c543 100644 --- a/public/manifest.json +++ b/public/assets/manifest.json @@ -1,45 +1,45 @@ { - "short_name": "OPEX Admin Panel", + "short_name": "Opex", "name": "Open Source Exchange", "icons": [ { - "src": "logo/android-icon-36x36.png", + "src": "/assets/logo/android-icon-36x36.png", "sizes": "36x36", "type": "image\/png", "density": "0.75" }, { - "src": "logo/android-icon-48x48.png", + "src": "/assets/logo/android-icon-48x48.png", "sizes": "48x48", "type": "image\/png", "density": "1.0" }, { - "src": "logo/android-icon-72x72.png", + "src": "/assets/logo/android-icon-72x72.png", "sizes": "72x72", "type": "image\/png", "density": "1.5" }, { - "src": "logo/android-icon-96x96.png", + "src": "/assets/logo/android-icon-96x96.png", "sizes": "96x96", "type": "image\/png", "density": "2.0" }, { - "src": "logo/android-icon-144x144.png", + "src": "/assets/logo/android-icon-144x144.png", "sizes": "144x144", "type": "image\/png", "density": "3.0" }, { - "src": "logo/android-icon-192x192.png", + "src": "/assets/logo/android-icon-192x192.png", "sizes": "192x192", "type": "image\/png", "density": "4.0" } ], - "start_url": ".", + "start_url": "/", "display": "standalone", "theme_color": "#000000", "background_color": "#ffffff" diff --git a/public/index.html b/public/index.html index cb985ee..22d1946 100644 --- a/public/index.html +++ b/public/index.html @@ -2,7 +2,7 @@ - + @@ -11,27 +11,27 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - Opex Admin Panel + %REACT_APP_TITLE% @@ -40,4 +40,4 @@
- + \ No newline at end of file diff --git a/src/components/SideBar/SideBar.js b/src/components/SideBar/SideBar.js index b7d9d6b..ce7ceed 100644 --- a/src/components/SideBar/SideBar.js +++ b/src/components/SideBar/SideBar.js @@ -7,7 +7,7 @@ const SideBar = ({closeMenu}) => { return
- logo + logo
diff --git a/src/index.js b/src/index.js index c95af28..e7bf2ab 100644 --- a/src/index.js +++ b/src/index.js @@ -8,6 +8,11 @@ import Opex from "./Opex"; import {QueryClient, QueryClientProvider,} from '@tanstack/react-query' import {ReactQueryDevtools} from '@tanstack/react-query-devtools' +//add custom title & meta +const meta = document.getElementsByTagName('meta') +document.title = window.env.REACT_APP_TITLE; +meta.description.content = window.env.REACT_APP_DESCRIPTION_CONTENT + // Create a react-query client const queryClient = new QueryClient() diff --git a/src/pages/Login/Login.js b/src/pages/Login/Login.js index 7a444d0..beaaf31 100644 --- a/src/pages/Login/Login.js +++ b/src/pages/Login/Login.js @@ -61,10 +61,10 @@ const Login = () => { style={{backgroundImage: `url('${toAbsoluteUrl("/media/img/spaceStar.png")}')`}}>
- +

Welcome To Admin Panel

-
+ { loading ? : <>
Date: Tue, 18 Oct 2022 13:30:09 +0330 Subject: [PATCH 3/3] Add version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3655644..9b89b2d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "opex-admin-panel", - "version": "v1.0.0-beta.3", + "version": "v1.0.0-beta.4", "private": true, "license": "MIT", "dependencies": {