Skip to content

Release v1.0.0-beta.4 #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hossein-ab99 merged 4 commits into from
Oct 18, 2022
Merged

Release v1.0.0-beta.4 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c39f3b0
Fix show error
Benyamin001 Aug 30, 2022
b6c1932
#11/Add new env
Benyamin001 Oct 18, 2022
843f233
Merge pull request #12 from opexdev/11/add-new-env
Benyamin001 Oct 18, 2022
6ed67d3
Add version
Hossein-ab99 Oct 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,4 @@ services:
build:
context: .
args:
- REACT_APP_DEFAULT_DIRECTION=LTR
- REACT_APP_BRAND_NAME=OPEX
- GENERATE_SOURCEMAP=$GENERATE_SOURCEMAP
2 changes: 0 additions & 2 deletions docker-compose.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,4 @@ services:
build:
context: .
args:
- REACT_APP_DEFAULT_DIRECTION=LTR
- REACT_APP_BRAND_NAME=OPEX
- GENERATE_SOURCEMAP=$GENERATE_SOURCEMAP
2 changes: 2 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions env-map.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
0 public/favicon.ico → public/assets/favicon.ico
View file
Open in desktop
File renamed without changes.
0 public/logo/android-chrome-192x192.png → ...ic/assets/logo/android-chrome-192x192.png
View file
Open in desktop
File renamed without changes
0 public/logo/android-chrome-512x512.png → ...ic/assets/logo/android-chrome-512x512.png
View file
Open in desktop
File renamed without changes
0 public/logo/android-icon-144x144.png → public/assets/logo/android-icon-144x144.png
View file
Open in desktop
File renamed without changes
0 public/logo/android-icon-192x192.png → public/assets/logo/android-icon-192x192.png
View file
Open in desktop
File renamed without changes
0 public/logo/android-icon-36x36.png → public/assets/logo/android-icon-36x36.png
View file
Open in desktop
File renamed without changes
0 public/logo/android-icon-48x48.png → public/assets/logo/android-icon-48x48.png
View file
Open in desktop
File renamed without changes
0 public/logo/android-icon-72x72.png → public/assets/logo/android-icon-72x72.png
View file
Open in desktop
File renamed without changes
0 public/logo/android-icon-96x96.png → public/assets/logo/android-icon-96x96.png
View file
Open in desktop
File renamed without changes
0 public/logo/apple-icon-114x114.png → public/assets/logo/apple-icon-114x114.png
View file
Open in desktop
File renamed without changes
0 public/logo/apple-icon-120x120.png → public/assets/logo/apple-icon-120x120.png
View file
Open in desktop
File renamed without changes
0 public/logo/apple-icon-144x144.png → public/assets/logo/apple-icon-144x144.png
View file
Open in desktop
File renamed without changes
0 public/logo/apple-icon-152x152.png → public/assets/logo/apple-icon-152x152.png
View file
Open in desktop
File renamed without changes
0 public/logo/apple-icon-180x180.png → public/assets/logo/apple-icon-180x180.png
View file
Open in desktop
File renamed without changes
0 public/logo/apple-icon-57x57.png → public/assets/logo/apple-icon-57x57.png
View file
Open in desktop
File renamed without changes
0 public/logo/apple-icon-60x60.png → public/assets/logo/apple-icon-60x60.png
View file
Open in desktop
File renamed without changes
0 public/logo/apple-icon-72x72.png → public/assets/logo/apple-icon-72x72.png
View file
Open in desktop
File renamed without changes
0 public/logo/apple-icon-76x76.png → public/assets/logo/apple-icon-76x76.png
View file
Open in desktop
File renamed without changes
0 public/logo/apple-icon-precomposed.png → ...ic/assets/logo/apple-icon-precomposed.png
View file
Open in desktop
File renamed without changes
0 public/logo/apple-icon.png → public/assets/logo/apple-icon.png
View file
Open in desktop
File renamed without changes
0 public/logo/apple-touch-icon.png → public/assets/logo/apple-touch-icon.png
View file
Open in desktop
File renamed without changes
0 public/logo/browserconfig.xml → public/assets/logo/browserconfig.xml
View file
Open in desktop
File renamed without changes.
0 public/logo/favicon-16x16.png → public/assets/logo/favicon-16x16.png
View file
Open in desktop
File renamed without changes
0 public/logo/favicon-32x32.png → public/assets/logo/favicon-32x32.png
View file
Open in desktop
File renamed without changes
0 public/logo/favicon-96x96.png → public/assets/logo/favicon-96x96.png
View file
Open in desktop
File renamed without changes
0 public/logo/favicon.ico → public/assets/logo/favicon.ico
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions public/assets/logo/logo-mini.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/logo/logo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 public/logo/ms-icon-144x144.png → public/assets/logo/ms-icon-144x144.png
View file
Open in desktop
File renamed without changes
0 public/logo/ms-icon-150x150.png → public/assets/logo/ms-icon-150x150.png
View file
Open in desktop
File renamed without changes
0 public/logo/ms-icon-310x310.png → public/assets/logo/ms-icon-310x310.png
View file
Open in desktop
File renamed without changes
0 public/logo/ms-icon-70x70.png → public/assets/logo/ms-icon-70x70.png
View file
Open in desktop
File renamed without changes
16 changes: 8 additions & 8 deletions public/manifest.json → public/assets/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
36 changes: 18 additions & 18 deletions public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="icon" href="%PUBLIC_URL%/assets/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1 , maximum-scale=1.0, user-scalable=no" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="OPEX Admin Panel"/>
Expand All @@ -11,27 +11,27 @@
<link href="%PUBLIC_URL%/css/bootstrap.min.css" rel="stylesheet">
<link href="%PUBLIC_URL%/css/all.min.css" rel="stylesheet">

<link rel="manifest" href="%PUBLIC_URL%/manifest.json?v=2.0.0" />
<link rel="manifest" href="%PUBLIC_URL%/assets/manifest.json?v=3.0.0" />

<link rel="apple-touch-icon" sizes="57x57" href="%PUBLIC_URL%/logo/apple-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="%PUBLIC_URL%/logo/apple-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="%PUBLIC_URL%/logo/apple-icon-72x72.png">
<link rel="apple-touch-icon" sizes="76x76" href="%PUBLIC_URL%/logo/apple-icon-76x76.png">
<link rel="apple-touch-icon" sizes="114x114" href="%PUBLIC_URL%/logo/apple-icon-114x114.png">
<link rel="apple-touch-icon" sizes="120x120" href="%PUBLIC_URL%/logo/apple-icon-120x120.png">
<link rel="apple-touch-icon" sizes="144x144" href="%PUBLIC_URL%/logo/apple-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="%PUBLIC_URL%/logo/apple-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="%PUBLIC_URL%/logo/apple-icon-180x180.png">
<link rel="icon" type="image/png" sizes="192x192" href="%PUBLIC_URL%/logo/android-icon-192x192.png">
<link rel="icon" type="image/png" sizes="32x32" href="%PUBLIC_URL%/logo/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="96x96" href="%PUBLIC_URL%/logo/favicon-96x96.png">
<link rel="icon" type="image/png" sizes="16x16" href="%PUBLIC_URL%/logo/favicon-16x16.png">
<link rel="apple-touch-icon" sizes="57x57" href="%PUBLIC_URL%/assets/logo/apple-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="%PUBLIC_URL%/assets/logo/apple-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="%PUBLIC_URL%/assets/logo/apple-icon-72x72.png">
<link rel="apple-touch-icon" sizes="76x76" href="%PUBLIC_URL%/assets/logo/apple-icon-76x76.png">
<link rel="apple-touch-icon" sizes="114x114" href="%PUBLIC_URL%/assets/logo/apple-icon-114x114.png">
<link rel="apple-touch-icon" sizes="120x120" href="%PUBLIC_URL%/assets/logo/apple-icon-120x120.png">
<link rel="apple-touch-icon" sizes="144x144" href="%PUBLIC_URL%/assets/logo/apple-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="%PUBLIC_URL%/assets/logo/apple-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="%PUBLIC_URL%/assets/logo/apple-icon-180x180.png">
<link rel="icon" type="image/png" sizes="192x192" href="%PUBLIC_URL%/assets/logo/android-icon-192x192.png">
<link rel="icon" type="image/png" sizes="32x32" href="%PUBLIC_URL%/assets/logo/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="96x96" href="%PUBLIC_URL%/assets/logo/favicon-96x96.png">
<link rel="icon" type="image/png" sizes="16x16" href="%PUBLIC_URL%/assets/logo/favicon-16x16.png">

<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Roboto+Flex:opsz@8..144&family=Roboto:wght@300;500&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Open+Sans&family=Poppins:wght@300;500&family=Roboto+Flex:opsz@8..144&family=Roboto:wght@300;500&display=swap" rel="stylesheet">

<title>Opex Admin Panel</title>
<title>%REACT_APP_TITLE%</title>

<script src="%PUBLIC_URL%/env.js"></script>

Expand All @@ -40,4 +40,4 @@
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion src/components/SideBar/SideBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const SideBar = ({closeMenu}) => {
return <div className={`sidebar text-color ${closeMenu ? "close" : "open"}`}>

<div className="d-flex justify-content-center align-items-center py-5">
<img src={toAbsoluteUrl('/media/img/logo.svg')} alt="logo" className="logo"/>
<img src={toAbsoluteUrl('/assets/logo/logo-mini.svg')} alt="logo" className="logo"/>
</div>


Expand Down
5 changes: 5 additions & 0 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion src/pages/KycUsers/KycUsers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ const KycUsers = () => {
</div>
: ""
}
{(!isLoading && users.total > paginate.perPage) &&
{(!isLoading && users?.total > paginate.perPage) &&
<div className="mt-2">
<Pagination total={users.total} paginate={paginate}/>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/pages/Login/Login.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ const Login = () => {
style={{backgroundImage: `url('${toAbsoluteUrl("/media/img/spaceStar.png")}')`}}>
<div className="login-content text-center">
<div className="mb-5">
<img src={toAbsoluteUrl("media/img/opexLogoPlus.svg")} className="mb-5" alt=""/>
<img src={toAbsoluteUrl("/assets/logo/logo.svg")} className="mb-3" alt=""/>
<h1 className="fw-bold mt-5">Welcome To Admin Panel</h1>
</div>
<form className="this-login-form mt-5" onSubmit={handleSubmit}>
<form className="this-login-form mt-2" onSubmit={handleSubmit}>
{
loading ? <Loading/> : <>
<div className="d-flex flex-column justify-content-center align-items-center"
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Users/Users.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ const Users = () => {
</div>
: ""
}
{(!isLoading && users.total > paginate.perPage)&&
{(!isLoading && users?.total > paginate.perPage)&&
<div className="mt-2">
<Pagination total={users.total} paginate={paginate}/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Withdraws/Withdraws.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const Withdraws = () => {
</div>
: ""
}
{(!isLoading && withdraws.total > paginate.perPage) &&
{(!isLoading && withdraws?.total > paginate.perPage) &&
<div className="mt-2">
<Pagination total={withdraws.total} paginate={paginate}/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/scss/_layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ body {
}

html, body {
font-family: 'Roboto Flex', iranyekan, serif;
font-family: 'Poppins Flex', iranyekan, serif;
color: #ecececc7 !important;
}

Expand Down