Skip to content

Commit e592497

Browse files
phoenixcoded20ct-rushitact-dixit
authored
Stage 2.1.0 (#9)
* Update free-version (#8) * Update free-version * PR review changes * Update stage.yml * Update prod.yml --------- Co-authored-by: CodedThemes <77041536+phoenixcoded20@users.noreply.github.com> * Update stage.yml * Update package.json * deployment issue fix --------- Co-authored-by: ct-rushita <153270097+ct-rushita@users.noreply.github.com> Co-authored-by: Dikshit Moradiya <dixit.moradia@phoenixcoded.co>
1 parent bfab677 commit e592497

62 files changed

Lines changed: 2413 additions & 7833 deletions

Some content is hidden

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

.env

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
REACT_APP_VERSION = v2.1.0
1+
VITE_APP_VERSION = v3.0.0
22
GENERATE_SOURCEMAP = false
3+
34
PUBLIC_URL = https://codedthemes.com/demos/admin-templates/materially/react/free
4-
REACT_APP_BASE_NAME = /demos/admin-templates/materially/react/free
5+
VITE_APP_BASE_NAME = demos/admin-templates/materially/react/free

.env.development

Lines changed: 0 additions & 4 deletions
This file was deleted.

.env.qa

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
REACT_APP_VERSION = v2.0.0
1+
REACT_APP_VERSION = v3.0.0
22
GENERATE_SOURCEMAP = false
33
PUBLIC_URL = https://codedthemes.com/demos/admin-templates/materially/react/free/stage
4-
REACT_APP_BASE_NAME = demos/admin-templates/materially/react/free/stage
4+
VITE_APP_BASE_NAME = demos/admin-templates/materially/react/free/stage

.eslintrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,15 @@
4747
"react/display-name": "off",
4848
"react/jsx-filename-extension": "off",
4949
"no-param-reassign": "off",
50-
"react/prop-types": 1,
50+
"react/prop-types": "off",
5151
"react/require-default-props": "off",
5252
"react/no-array-index-key": "off",
5353
"react/jsx-props-no-spreading": "off",
5454
"react/forbid-prop-types": "off",
5555
"import/order": "off",
5656
"import/no-cycle": "off",
5757
"no-console": "off",
58+
"no-debugger": "off",
5859
"jsx-a11y/anchor-is-valid": "off",
5960
"prefer-destructuring": "off",
6061
"no-shadow": "off",

.github/workflows/prod.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,24 @@ jobs:
1414

1515
steps:
1616
- name: 🚚 Get latest code
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
1818

19-
- name: Use Node.js 18
20-
uses: actions/setup-node@v2-beta
19+
- name: Use Node.js 20
20+
uses: actions/setup-node@v4
2121
with:
22-
node-version: '18'
22+
node-version: '20.x'
2323

2424
- name: 🔨 Build Project
2525
run: |
26-
npm install --legacy-peer-deps
27-
npm run build
26+
yarn
27+
yarn build
2828
2929
- name: 📂 Deploy to Server
30-
uses: easingthemes/ssh-deploy@v2.1.5
30+
uses: easingthemes/ssh-deploy@main
3131
env:
3232
SSH_PRIVATE_KEY: ${{ secrets.SERVER_SSH_KEY }}
3333
# ARGS: "-rltgoDzvO --delete"
34-
SOURCE: 'build/'
34+
SOURCE: 'dist/'
3535
REMOTE_HOST: 217.21.92.35
3636
REMOTE_USER: u778408432
3737
REMOTE_PORT: '65002'

.github/workflows/stage.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
# Triggers the workflow on push or pull request events but only for the master branch
66
push:
77
branches:
8-
- stage
8+
- stage*
99

1010
jobs:
1111
SFTP-deploy:
@@ -14,24 +14,24 @@ jobs:
1414

1515
steps:
1616
- name: 🚚 Get latest code
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
1818

19-
- name: Use Node.js 18
20-
uses: actions/setup-node@v2-beta
19+
- name: Use Node.js 20
20+
uses: actions/setup-node@v4
2121
with:
22-
node-version: '18'
22+
node-version: '20.x'
2323

2424
- name: 🔨 Build Project
2525
run: |
26-
npm install --legacy-peer-deps
27-
npm run build-stage
26+
yarn
27+
yarn build-stage
2828
2929
- name: 📂 Deploy to Server
30-
uses: easingthemes/ssh-deploy@v2.1.5
30+
uses: easingthemes/ssh-deploy@main
3131
env:
3232
SSH_PRIVATE_KEY: ${{ secrets.SERVER_SSH_KEY }}
3333
# ARGS: "-rltgoDzvO --delete"
34-
SOURCE: 'build/'
34+
SOURCE: 'dist/'
3535
REMOTE_HOST: 217.21.92.35
3636
REMOTE_USER: u778408432
3737
REMOTE_PORT: '65002'

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
# production
1212
/build
13+
/dist
1314

1415
# misc
1516
.DS_Store

.yarn/install-state.gz

755 KB
Binary file not shown.

.yarnrc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nodeLinker: node-modules

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ yarn start
9999
- Redux & React context API for state management.
100100
- Redux toolkit.
101101
- React Router for navigation routing.
102-
- Support for react-script.
102+
- Support for vite.
103103
- Code splitting.
104104
- CSS-in-JS.
105105

0 commit comments

Comments
 (0)