Skip to content

Commit 2223611

Browse files
ct-dixitphoenixcoded20
ct-dixit
and
phoenixcoded20
authored
theme upgrade into vite (codedthemes#47)
* theme upgrade into vite complete * add yarn.lock and fix apexChart issue and also change public url * github file add * add code of conduct file * yml file update * Updated meta --------- Co-authored-by: CodedThemes <[email protected]>
1 parent e9cc9a9 commit 2223611

File tree

141 files changed

+5539
-10303
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+5539
-10303
lines changed

‎.env

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
1-
REACT_APP_VERSION = v1.2.0
2-
GENERATE_SOURCEMAP = false
1+
VITE_APP_VERSION=v1.3.0
2+
GENERATE_SOURCEMAP=false
3+
4+
## Backend API URL
5+
PUBLIC_URL = https://mantisdashboard.io/free
6+
VITE_APP_BASE_NAME = /free

‎.github/workflows/prod.yml

+16-11
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,44 @@
1-
name: Node - SSH deploy
1+
name: Prod deploy
22

33
# Controls when the action will run.
44
on:
55
# Triggers the workflow on push or pull request events but only for the master branch
66
push:
7-
branches: [main]
7+
branches:
8+
- master
89
pull_request:
9-
branches: [main]
10+
types:
11+
- closed
12+
branches:
13+
- master
1014

1115
jobs:
12-
SFTP-deploy:
16+
if_merged:
17+
if: github.event.pull_request.merged == true
1318
name: 🎉 Deploy
1419
runs-on: ubuntu-latest
1520

1621
steps:
1722
- name: 🚚 Get latest code
18-
uses: actions/checkout@v2
23+
uses: actions/checkout@v4
1924

20-
- name: Use Node.js 16
21-
uses: actions/setup-node@v2-beta
25+
- name: Use Node.js 20
26+
uses: actions/setup-node@v4
2227
with:
23-
node-version: '16'
28+
node-version: '20'
2429

2530
- name: 🔨 Build Project
2631
run: |
2732
yarn
2833
yarn build
2934
3035
- name: 📂 Deploy to Server
31-
uses: easingthemes/ssh-deploy@v2.1.5
36+
uses: easingthemes/ssh-deploy@v4
3237
env:
3338
SSH_PRIVATE_KEY: ${{ secrets.SERVER_SSH_KEY }}
3439
# ARGS: "-rltgoDzvO --delete"
35-
SOURCE: 'build/'
40+
SOURCE: 'dist/'
3641
REMOTE_HOST: 192.34.62.123
3742
REMOTE_USER: mantis
3843
TARGET: public_html/free
39-
EXCLUDE: '/dist/, /node_modules/'
44+
EXCLUDE: '/build/, /node_modules/'

‎.gitignore

+3-5
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ bower_components
3636

3737
# Compiled binary addons (https://nodejs.org/api/addons.html)
3838
build/Release
39+
build
3940

4041
# Dependency directories
4142
node_modules/
@@ -103,8 +104,5 @@ dist
103104
# TernJS port file
104105
.tern-port
105106

106-
# Backup file
107-
*.bak
108-
109-
#output
110-
build
107+
# wincompare file
108+
.bak

‎public/favicon.svg ‎favicon.svg

File renamed without changes.

‎index.html

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8" />
5+
<link rel="icon" href="/favicon.svg" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1" />
7+
<meta name="theme-color" content="#000000" />
8+
<meta name="description" content="Mantis is react free admin template build using Vite" />
9+
<link rel="apple-touch-icon" href="/logo192.png" />
10+
<title>Mantis React Admin Dashboard</title>
11+
12+
<!-- this is to resolve issue in old safari browser in tablet -->
13+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/ResizeObserver.min.js"></script>
14+
</head>
15+
<body>
16+
<noscript>You need to enable JavaScript to run this app.</noscript>
17+
<div id="root"></div>
18+
<!--
19+
This HTML file is a template.
20+
If you open it directly in the browser, you will see an empty page.
21+
22+
You can add webfonts, meta tags, or analytics to this file.
23+
The build step will place the bundled scripts into the <body> tag.
24+
25+
To begin the development, run `npm start` or `yarn start`.
26+
To create a production bundle, use `npm run build` or `yarn build`.
27+
-->
28+
<script type="module" src="/src/index.jsx"></script>
29+
</body>
30+
</html>

‎jsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"compilerOptions": {
33
"target": "esnext",
4-
"module": "esnext",
4+
"module": "commonjs",
55
"baseUrl": "src"
66
},
77
"include": ["src/**/*"],

‎package.json

+46-38
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,60 @@
11
{
22
"name": "mantis-free-react-admin-template",
3-
"version": "1.2.0",
3+
"version": "1.3.0",
44
"private": true,
55
"homepage": "https://mantisdashboard.io/free",
6+
"author": {
7+
"name": "CodedThemes",
8+
"email": "[email protected]",
9+
"url": "https://codedthemes.com/"
10+
},
11+
"scripts": {
12+
"start": "vite",
13+
"build": "vite build",
14+
"build-stage": "env-cmd -f .env.qa vite build",
15+
"preview": "vite preview",
16+
"lint": "eslint \"src/**/*.{js,jsx,ts,tsx}\"",
17+
"lint:fix": "eslint --fix \"src/**/*.{js,jsx,ts,tsx}\"",
18+
"prettier": "prettier --write \"src/**/*.{js,jsx,ts,tsx}\""
19+
},
620
"dependencies": {
721
"@ant-design/colors": "^7.0.2",
8-
"@ant-design/icons": "^5.2.6",
22+
"@ant-design/icons": "^5.3.1",
923
"@emotion/cache": "^11.11.0",
10-
"@emotion/react": "^11.11.3",
24+
"@emotion/react": "^11.11.4",
1125
"@emotion/styled": "^11.11.0",
12-
"@mui/lab": "^5.0.0-alpha.162",
13-
"@mui/material": "^5.15.6",
14-
"@reduxjs/toolkit": "^2.1.0",
15-
"@testing-library/jest-dom": "^6.4.0",
16-
"@testing-library/react": "^14.2.0",
17-
"@testing-library/user-event": "^14.5.2",
18-
"apexcharts": "^3.45.2",
26+
"@fontsource/inter": "^5.0.17",
27+
"@fontsource/poppins": "^5.0.12",
28+
"@fontsource/public-sans": "^5.0.17",
29+
"@fontsource/roboto": "^5.0.12",
30+
"@mui/base": "^5.0.0-beta.38",
31+
"@mui/lab": "^5.0.0-alpha.167",
32+
"@mui/material": "^5.15.12",
33+
"@mui/system": "^5.15.12",
34+
"@svgr/webpack": "^8.1.0",
35+
"@vitejs/plugin-react": "^4.2.1",
36+
"apexcharts": "^3.49.0",
1937
"formik": "^2.4.5",
20-
"framer-motion": "^11.0.3",
21-
"history": "^5.3.0",
38+
"framer-motion": "^11.0.8",
2239
"lodash": "^4.17.21",
40+
"process": "^0.11.10",
2341
"prop-types": "^15.8.1",
2442
"react": "^18.2.0",
2543
"react-apexcharts": "^1.4.1",
2644
"react-copy-to-clipboard": "^5.1.0",
2745
"react-device-detect": "^2.2.3",
2846
"react-dom": "^18.2.0",
29-
"react-draggable": "^4.4.6",
30-
"react-element-to-jsx-string": "^15.0.0",
31-
"react-number-format": "^5.3.1",
32-
"react-perfect-scrollbar": "^1.5.8",
33-
"react-redux": "^9.1.0",
34-
"react-router": "^6.21.3",
35-
"react-router-dom": "^6.21.3",
36-
"react-scripts": "^5.0.1",
37-
"react-syntax-highlighter": "^15.5.0",
38-
"react-window": "^1.8.10",
39-
"redux": "^5.0.1",
40-
"simplebar": "^5.3.8",
41-
"simplebar-react": "^2.4.1",
42-
"typescript": "4.8.3",
47+
"react-number-format": "^5.3.3",
48+
"react-router": "^6.22.3",
49+
"react-router-dom": "^6.22.3",
50+
"simplebar-react": "^3.2.4",
51+
"slick-carousel": "^1.8.1",
52+
"swr": "^2.2.5",
53+
"util": "^0.12.5",
54+
"vite": "^5.2.10",
55+
"vite-jsconfig-paths": "^2.0.1",
4356
"web-vitals": "^3.5.2",
44-
"yup": "^1.3.3"
45-
},
46-
"scripts": {
47-
"start": "react-scripts start",
48-
"build": "react-scripts build",
49-
"test": "react-scripts test",
50-
"eject": "react-scripts eject"
57+
"yup": "^1.4.0"
5158
},
5259
"eslintConfig": {
5360
"extends": [
@@ -73,8 +80,8 @@
7380
]
7481
},
7582
"devDependencies": {
76-
"@babel/core": "^7.23.9",
77-
"@babel/eslint-parser": "^7.23.9",
83+
"@babel/core": "^7.24.0",
84+
"@babel/eslint-parser": "^7.23.10",
7885
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
7986
"eslint": "^8.56.0",
8087
"eslint-config-prettier": "^9.1.0",
@@ -83,8 +90,9 @@
8390
"eslint-plugin-import": "^2.29.1",
8491
"eslint-plugin-jsx-a11y": "^6.8.0",
8592
"eslint-plugin-prettier": "^5.1.3",
86-
"eslint-plugin-react": "^7.33.2",
93+
"eslint-plugin-react": "^7.34.0",
8794
"eslint-plugin-react-hooks": "^4.6.0",
88-
"prettier": "^3.2.4"
95+
"prettier": "^3.2.5",
96+
"react-error-overlay": "6.0.11"
8997
}
90-
}
98+
}

‎public/index.html

-72
This file was deleted.

‎src/App.js

-16
This file was deleted.

‎src/App.jsx

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import { RouterProvider } from 'react-router-dom';
2+
3+
// project import
4+
import router from 'routes';
5+
import ThemeCustomization from 'themes';
6+
7+
import ScrollTop from 'components/ScrollTop';
8+
9+
// ==============================|| APP - THEME, ROUTER, LOCAL ||============================== //
10+
11+
export default function App() {
12+
return (
13+
<ThemeCustomization>
14+
<ScrollTop>
15+
<RouterProvider router={router} />
16+
</ScrollTop>
17+
</ThemeCustomization>
18+
);
19+
}

‎src/App.test.js

-9
This file was deleted.

0 commit comments

Comments
 (0)