Skip to content

Commit

Permalink
Merge pull request #65 from CodeDead/release/v2.4.0
Browse files Browse the repository at this point in the history
Release/v2.4.0
  • Loading branch information
CodeDead committed Mar 5, 2023
2 parents 39b2f19 + 9457850 commit 4d2d901
Show file tree
Hide file tree
Showing 48 changed files with 4,873 additions and 13,936 deletions.
3 changes: 2 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
src/reportWebVitals.js
src/setupTests.js
src-tauri/
src-tauri/*
.github/*
.yarn/*
node_modules/*
build/*
dist/*
vite.config.js
21 changes: 13 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,26 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v3

- name: Install dependencies (ubuntu only)
if: matrix.platform == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev
- name: Node.js setup
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 'lts/*'
cache: 'yarn'

- name: Rust setup
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@stable

- name: Rust cache
uses: swatinem/rust-cache@v2
with:
toolchain: stable
workspaces: './src-tauri -> target'

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

Expand Down
48 changes: 29 additions & 19 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,32 @@ jobs:

runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v3
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: 18
- name: Install Rust stable
uses: actions-rs/toolchain@v1
with:
toolchain: stable
- name: Install dependencies (ubuntu only)
if: matrix.platform == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev
- name: Install app dependencies and build it
run: yarn && yarn build
- uses: tauri-apps/tauri-action@v0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Checkout repository
uses: actions/checkout@v3

- name: Install dependencies (ubuntu only)
if: matrix.platform == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: 'lts/*'
cache: 'yarn'

- name: Rust setup
uses: dtolnay/rust-toolchain@stable

- name: Rust cache
uses: swatinem/rust-cache@v2
with:
workspaces: './src-tauri -> target'

- name: Install app dependencies and build it
run: yarn && yarn build

- uses: tauri-apps/tauri-action@v0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

# production
/build
/dist

# misc
.DS_Store
Expand Down
823 changes: 0 additions & 823 deletions .yarn/releases/yarn-3.3.1.cjs

This file was deleted.

873 changes: 873 additions & 0 deletions .yarn/releases/yarn-3.4.1.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.3.1.cjs
yarnPath: .yarn/releases/yarn-3.4.1.cjs
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Advanced PassGen

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

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

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!

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

## Building

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).

### Web

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

```shell
yarn build
```

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

### Windows

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

### ReactJS

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

### Theme

Expand Down
21 changes: 21 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8"/>
<link rel="icon" href="/favicon.ico"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<meta name="theme-color" content="#000000"/>
<meta
name="description"
content="Advanced PassGen is a password generator can be used to quickly generate thousands of passwords"
/>
<link rel="apple-touch-icon" href="/logo192.png"/>
<link rel="manifest" href="/manifest.json"/>
<title>Advanced PassGen</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<script type="module" src="/src/index.jsx"></script>
</body>
</html>
48 changes: 23 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,33 +1,27 @@
{
"name": "advanced-passgen",
"version": "2.3.0",
"version": "2.4.0",
"private": true,
"dependencies": {
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"@emotion/react": "^11.10.6",
"@emotion/styled": "^11.10.6",
"@fontsource/roboto": "^4.5.8",
"@mui/icons-material": "^5.11.0",
"@mui/material": "^5.11.3",
"@shopify/react-web-worker": "^5.0.6",
"@mui/icons-material": "^5.11.11",
"@mui/material": "^5.11.11",
"@mui/x-data-grid": "^6.0.0",
"@shopify/react-web-worker": "^5.0.9",
"@tauri-apps/api": "^1.2.0",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^14.4.3",
"crypto-js": "^4.1.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.6.1",
"react-scripts": "^5.0.1",
"react-virtualized": "^9.22.3",
"uuid": "^9.0.0",
"web-vitals": "^3.1.0"
"react-router-dom": "^6.8.2"
},
"scripts": {
"start": "react-scripts start",
"start": "vite",
"build": "vite build",
"preview": "vite build && vite preview",
"dev": "tauri dev",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
"lint": "eslint . --ext .ts,.tsx,.js,.jsx"
},
"eslintConfig": {
"extends": [
Expand All @@ -47,15 +41,19 @@
"last 1 safari version"
]
},
"packageManager": "yarn@3.3.1",
"packageManager": "yarn@3.4.1",
"devDependencies": {
"@tauri-apps/cli": "^1.2.2",
"@tauri-apps/cli": "^1.2.3",
"@vitejs/plugin-react": "^3.1.0",
"cross-env": "^7.0.3",
"eslint": "^8.31.0",
"eslint": "^8.35.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsx-a11y": "^6.6.1",
"eslint-plugin-react": "^7.31.11",
"eslint-plugin-react-hooks": "^4.6.0"
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react-hooks": "^4.6.0",
"vite": "^4.1.4",
"vite-plugin-eslint": "^1.8.1",
"vite-plugin-svgr": "^2.4.0"
}
}
43 changes: 0 additions & 43 deletions public/index.html

This file was deleted.

Loading

0 comments on commit 4d2d901

Please sign in to comment.