Skip to content

Commit

Permalink
theme upgrade into vite (#47)
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
ct-dixit and phoenixcoded20 authored May 5, 2024
1 parent e9cc9a9 commit 2223611
Show file tree
Hide file tree
Showing 141 changed files with 5,539 additions and 10,303 deletions.
8 changes: 6 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
REACT_APP_VERSION = v1.2.0
GENERATE_SOURCEMAP = false
VITE_APP_VERSION=v1.3.0
GENERATE_SOURCEMAP=false

## Backend API URL
PUBLIC_URL = https://mantisdashboard.io/free
VITE_APP_BASE_NAME = /free
27 changes: 16 additions & 11 deletions .github/workflows/prod.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,44 @@
name: Node - SSH deploy
name: Prod deploy

# Controls when the action will run.
on:
# Triggers the workflow on push or pull request events but only for the master branch
push:
branches: [main]
branches:
- master
pull_request:
branches: [main]
types:
- closed
branches:
- master

jobs:
SFTP-deploy:
if_merged:
if: github.event.pull_request.merged == true
name: 🎉 Deploy
runs-on: ubuntu-latest

steps:
- name: 🚚 Get latest code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Use Node.js 16
uses: actions/setup-node@v2-beta
- name: Use Node.js 20
uses: actions/setup-node@v4
with:
node-version: '16'
node-version: '20'

- name: 🔨 Build Project
run: |
yarn
yarn build
- name: 📂 Deploy to Server
uses: easingthemes/ssh-deploy@v2.1.5
uses: easingthemes/ssh-deploy@v4
env:
SSH_PRIVATE_KEY: ${{ secrets.SERVER_SSH_KEY }}
# ARGS: "-rltgoDzvO --delete"
SOURCE: 'build/'
SOURCE: 'dist/'
REMOTE_HOST: 192.34.62.123
REMOTE_USER: mantis
TARGET: public_html/free
EXCLUDE: '/dist/, /node_modules/'
EXCLUDE: '/build/, /node_modules/'
8 changes: 3 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ bower_components

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release
build

# Dependency directories
node_modules/
Expand Down Expand Up @@ -103,8 +104,5 @@ dist
# TernJS port file
.tern-port

# Backup file
*.bak

#output
build
# wincompare file
.bak
File renamed without changes
30 changes: 30 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="/favicon.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="Mantis is react free admin template build using Vite" />
<link rel="apple-touch-icon" href="/logo192.png" />
<title>Mantis React Admin Dashboard</title>

<!-- this is to resolve issue in old safari browser in tablet -->
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/ResizeObserver.min.js"></script>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
<script type="module" src="/src/index.jsx"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion jsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"target": "esnext",
"module": "esnext",
"module": "commonjs",
"baseUrl": "src"
},
"include": ["src/**/*"],
Expand Down
84 changes: 46 additions & 38 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,53 +1,60 @@
{
"name": "mantis-free-react-admin-template",
"version": "1.2.0",
"version": "1.3.0",
"private": true,
"homepage": "https://mantisdashboard.io/free",
"author": {
"name": "CodedThemes",
"email": "[email protected]",
"url": "https://codedthemes.com/"
},
"scripts": {
"start": "vite",
"build": "vite build",
"build-stage": "env-cmd -f .env.qa vite build",
"preview": "vite preview",
"lint": "eslint \"src/**/*.{js,jsx,ts,tsx}\"",
"lint:fix": "eslint --fix \"src/**/*.{js,jsx,ts,tsx}\"",
"prettier": "prettier --write \"src/**/*.{js,jsx,ts,tsx}\""
},
"dependencies": {
"@ant-design/colors": "^7.0.2",
"@ant-design/icons": "^5.2.6",
"@ant-design/icons": "^5.3.1",
"@emotion/cache": "^11.11.0",
"@emotion/react": "^11.11.3",
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.0",
"@mui/lab": "^5.0.0-alpha.162",
"@mui/material": "^5.15.6",
"@reduxjs/toolkit": "^2.1.0",
"@testing-library/jest-dom": "^6.4.0",
"@testing-library/react": "^14.2.0",
"@testing-library/user-event": "^14.5.2",
"apexcharts": "^3.45.2",
"@fontsource/inter": "^5.0.17",
"@fontsource/poppins": "^5.0.12",
"@fontsource/public-sans": "^5.0.17",
"@fontsource/roboto": "^5.0.12",
"@mui/base": "^5.0.0-beta.38",
"@mui/lab": "^5.0.0-alpha.167",
"@mui/material": "^5.15.12",
"@mui/system": "^5.15.12",
"@svgr/webpack": "^8.1.0",
"@vitejs/plugin-react": "^4.2.1",
"apexcharts": "^3.49.0",
"formik": "^2.4.5",
"framer-motion": "^11.0.3",
"history": "^5.3.0",
"framer-motion": "^11.0.8",
"lodash": "^4.17.21",
"process": "^0.11.10",
"prop-types": "^15.8.1",
"react": "^18.2.0",
"react-apexcharts": "^1.4.1",
"react-copy-to-clipboard": "^5.1.0",
"react-device-detect": "^2.2.3",
"react-dom": "^18.2.0",
"react-draggable": "^4.4.6",
"react-element-to-jsx-string": "^15.0.0",
"react-number-format": "^5.3.1",
"react-perfect-scrollbar": "^1.5.8",
"react-redux": "^9.1.0",
"react-router": "^6.21.3",
"react-router-dom": "^6.21.3",
"react-scripts": "^5.0.1",
"react-syntax-highlighter": "^15.5.0",
"react-window": "^1.8.10",
"redux": "^5.0.1",
"simplebar": "^5.3.8",
"simplebar-react": "^2.4.1",
"typescript": "4.8.3",
"react-number-format": "^5.3.3",
"react-router": "^6.22.3",
"react-router-dom": "^6.22.3",
"simplebar-react": "^3.2.4",
"slick-carousel": "^1.8.1",
"swr": "^2.2.5",
"util": "^0.12.5",
"vite": "^5.2.10",
"vite-jsconfig-paths": "^2.0.1",
"web-vitals": "^3.5.2",
"yup": "^1.3.3"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
"yup": "^1.4.0"
},
"eslintConfig": {
"extends": [
Expand All @@ -73,8 +80,8 @@
]
},
"devDependencies": {
"@babel/core": "^7.23.9",
"@babel/eslint-parser": "^7.23.9",
"@babel/core": "^7.24.0",
"@babel/eslint-parser": "^7.23.10",
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
Expand All @@ -83,8 +90,9 @@
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react": "^7.34.0",
"eslint-plugin-react-hooks": "^4.6.0",
"prettier": "^3.2.4"
"prettier": "^3.2.5",
"react-error-overlay": "6.0.11"
}
}
}
72 changes: 0 additions & 72 deletions public/index.html

This file was deleted.

16 changes: 0 additions & 16 deletions src/App.js

This file was deleted.

19 changes: 19 additions & 0 deletions src/App.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { RouterProvider } from 'react-router-dom';

// project import
import router from 'routes';
import ThemeCustomization from 'themes';

import ScrollTop from 'components/ScrollTop';

// ==============================|| APP - THEME, ROUTER, LOCAL ||============================== //

export default function App() {
return (
<ThemeCustomization>
<ScrollTop>
<RouterProvider router={router} />
</ScrollTop>
</ThemeCustomization>
);
}
9 changes: 0 additions & 9 deletions src/App.test.js

This file was deleted.

Loading

0 comments on commit 2223611

Please sign in to comment.