Skip to content

Commit 4d2d901

Browse files
authored
Merge pull request #65 from CodeDead/release/v2.4.0
Release/v2.4.0
2 parents 39b2f19 + 9457850 commit 4d2d901

File tree

48 files changed

+4873
-13936
lines changed

Some content is hidden

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

48 files changed

+4873
-13936
lines changed

.eslintignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
src/reportWebVitals.js
21
src/setupTests.js
32
src-tauri/
43
src-tauri/*
54
.github/*
65
.yarn/*
76
node_modules/*
87
build/*
8+
dist/*
9+
vite.config.js

.github/workflows/release.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,26 @@ jobs:
1717
- name: Checkout repository
1818
uses: actions/checkout@v3
1919

20+
- name: Install dependencies (ubuntu only)
21+
if: matrix.platform == 'ubuntu-latest'
22+
run: |
23+
sudo apt-get update
24+
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev
25+
2026
- name: Node.js setup
2127
uses: actions/setup-node@v3
2228
with:
23-
node-version: 18
29+
node-version: 'lts/*'
30+
cache: 'yarn'
2431

2532
- name: Rust setup
26-
uses: actions-rs/toolchain@v1
33+
uses: dtolnay/rust-toolchain@stable
34+
35+
- name: Rust cache
36+
uses: swatinem/rust-cache@v2
2737
with:
28-
toolchain: stable
38+
workspaces: './src-tauri -> target'
2939

30-
- name: Install dependencies (ubuntu only)
31-
if: matrix.platform == 'ubuntu-latest'
32-
run: |
33-
sudo apt-get update
34-
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev
3540
- name: Install app dependencies and build web
3641
run: yarn && yarn build
3742

.github/workflows/test.yml

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,32 @@ jobs:
2424

2525
runs-on: ${{ matrix.platform }}
2626
steps:
27-
- uses: actions/checkout@v3
28-
- name: Setup node
29-
uses: actions/setup-node@v3
30-
with:
31-
node-version: 18
32-
- name: Install Rust stable
33-
uses: actions-rs/toolchain@v1
34-
with:
35-
toolchain: stable
36-
- name: Install dependencies (ubuntu only)
37-
if: matrix.platform == 'ubuntu-latest'
38-
run: |
39-
sudo apt-get update
40-
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev
41-
- name: Install app dependencies and build it
42-
run: yarn && yarn build
43-
- uses: tauri-apps/tauri-action@v0
44-
env:
45-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27+
- name: Checkout repository
28+
uses: actions/checkout@v3
29+
30+
- name: Install dependencies (ubuntu only)
31+
if: matrix.platform == 'ubuntu-latest'
32+
run: |
33+
sudo apt-get update
34+
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev
35+
36+
- name: Setup node
37+
uses: actions/setup-node@v3
38+
with:
39+
node-version: 'lts/*'
40+
cache: 'yarn'
41+
42+
- name: Rust setup
43+
uses: dtolnay/rust-toolchain@stable
44+
45+
- name: Rust cache
46+
uses: swatinem/rust-cache@v2
47+
with:
48+
workspaces: './src-tauri -> target'
49+
50+
- name: Install app dependencies and build it
51+
run: yarn && yarn build
52+
53+
- uses: tauri-apps/tauri-action@v0
54+
env:
55+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.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/releases/yarn-3.3.1.cjs

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

.yarn/releases/yarn-3.4.1.cjs

Lines changed: 873 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
nodeLinker: node-modules
22

3-
yarnPath: .yarn/releases/yarn-3.3.1.cjs
3+
yarnPath: .yarn/releases/yarn-3.4.1.cjs

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Advanced PassGen
22

3-
![Advanced PassGen](https://i.imgur.com/ci8x6rX.png)
3+
![Advanced PassGen](https://i.imgur.com/WcaJL2t.png)
44

55
![GitHub](https://img.shields.io/badge/language-JavaScript+Rust-green)
66
![GitHub](https://img.shields.io/github/license/CodeDead/Advanced-PassGen)
@@ -10,21 +10,21 @@
1010

1111
Advanced PassGen is a free and open-source application that can help you generate passwords and export them. You can export your passwords in plain text, CSV or JSON format!
1212

13-
For a live version of the application, visit [https://advancedpassgen.codedead.com](https://advancedpassgen.codedead.com).
13+
For a live version of the application, visit [our website](https://advancedpassgen.codedead.com).
1414

1515
## Building
1616

1717
Advanced PassGen uses tauri to build the desktop application. You can find more information about Tauri [here](https://tauri.app/v1/guides/getting-started/prerequisites).
1818

1919
### Web
2020

21-
You can build a web version of Advanced PassGen by running the following command:
21+
You can build a web version of Advanced PassGen using `Vite` by running the following command:
2222

2323
```shell
2424
yarn build
2525
```
2626

27-
For more information about building the web version, please read the `creact-react-app` documentation [here](https://create-react-app.dev/docs/production-build).
27+
For more information about building the web version, please read the `Vite` documentation [here](https://vitejs.dev/guide/build.html).
2828

2929
### Windows
3030

@@ -75,7 +75,7 @@ This project uses [Tauri](https://tauri.app/) to create a cross-platform applica
7575

7676
### ReactJS
7777

78-
This project uses [ReactJS](https://reactjs.org/) to create the user interface.
78+
This project uses [React](https://reactjs.org/) to create the user interface.
7979

8080
### Theme
8181

index.html

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8"/>
5+
<link rel="icon" href="/favicon.ico"/>
6+
<meta name="viewport" content="width=device-width, initial-scale=1"/>
7+
<meta name="theme-color" content="#000000"/>
8+
<meta
9+
name="description"
10+
content="Advanced PassGen is a password generator can be used to quickly generate thousands of passwords"
11+
/>
12+
<link rel="apple-touch-icon" href="/logo192.png"/>
13+
<link rel="manifest" href="/manifest.json"/>
14+
<title>Advanced PassGen</title>
15+
</head>
16+
<body>
17+
<noscript>You need to enable JavaScript to run this app.</noscript>
18+
<div id="root"></div>
19+
<script type="module" src="/src/index.jsx"></script>
20+
</body>
21+
</html>

package.json

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,27 @@
11
{
22
"name": "advanced-passgen",
3-
"version": "2.3.0",
3+
"version": "2.4.0",
44
"private": true,
55
"dependencies": {
6-
"@emotion/react": "^11.10.5",
7-
"@emotion/styled": "^11.10.5",
6+
"@emotion/react": "^11.10.6",
7+
"@emotion/styled": "^11.10.6",
88
"@fontsource/roboto": "^4.5.8",
9-
"@mui/icons-material": "^5.11.0",
10-
"@mui/material": "^5.11.3",
11-
"@shopify/react-web-worker": "^5.0.6",
9+
"@mui/icons-material": "^5.11.11",
10+
"@mui/material": "^5.11.11",
11+
"@mui/x-data-grid": "^6.0.0",
12+
"@shopify/react-web-worker": "^5.0.9",
1213
"@tauri-apps/api": "^1.2.0",
13-
"@testing-library/jest-dom": "^5.16.5",
14-
"@testing-library/react": "^13.4.0",
15-
"@testing-library/user-event": "^14.4.3",
1614
"crypto-js": "^4.1.1",
1715
"react": "^18.2.0",
1816
"react-dom": "^18.2.0",
19-
"react-router-dom": "^6.6.1",
20-
"react-scripts": "^5.0.1",
21-
"react-virtualized": "^9.22.3",
22-
"uuid": "^9.0.0",
23-
"web-vitals": "^3.1.0"
17+
"react-router-dom": "^6.8.2"
2418
},
2519
"scripts": {
26-
"start": "react-scripts start",
20+
"start": "vite",
21+
"build": "vite build",
22+
"preview": "vite build && vite preview",
2723
"dev": "tauri dev",
28-
"build": "react-scripts build",
29-
"test": "react-scripts test",
30-
"eject": "react-scripts eject"
24+
"lint": "eslint . --ext .ts,.tsx,.js,.jsx"
3125
},
3226
"eslintConfig": {
3327
"extends": [
@@ -47,15 +41,19 @@
4741
"last 1 safari version"
4842
]
4943
},
50-
"packageManager": "yarn@3.3.1",
44+
"packageManager": "yarn@3.4.1",
5145
"devDependencies": {
52-
"@tauri-apps/cli": "^1.2.2",
46+
"@tauri-apps/cli": "^1.2.3",
47+
"@vitejs/plugin-react": "^3.1.0",
5348
"cross-env": "^7.0.3",
54-
"eslint": "^8.31.0",
49+
"eslint": "^8.35.0",
5550
"eslint-config-airbnb": "^19.0.4",
56-
"eslint-plugin-import": "^2.26.0",
57-
"eslint-plugin-jsx-a11y": "^6.6.1",
58-
"eslint-plugin-react": "^7.31.11",
59-
"eslint-plugin-react-hooks": "^4.6.0"
51+
"eslint-plugin-import": "^2.27.5",
52+
"eslint-plugin-jsx-a11y": "^6.7.1",
53+
"eslint-plugin-react": "^7.32.2",
54+
"eslint-plugin-react-hooks": "^4.6.0",
55+
"vite": "^4.1.4",
56+
"vite-plugin-eslint": "^1.8.1",
57+
"vite-plugin-svgr": "^2.4.0"
6058
}
6159
}

0 commit comments

Comments
 (0)