Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ The theme used in this application is [MUI](https://mui.com/).

### Images

The application icon was provided by [RemixIcon](https://remixicon.com/).
The application icon (and derivatives) are provided by [RemixIcon](https://remixicon.com/).
All other images were provided by [MUI](https://mui.com/material-ui/material-icons/).

### Translations

Expand Down
35 changes: 12 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
{
"name": "advanced-passgen",
"version": "2.4.3",
"version": "2.5.0",
"private": true,
"type": "module",
"dependencies": {
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@fontsource/roboto": "^5.0.8",
"@mui/icons-material": "^5.14.19",
"@mui/material": "^5.14.20",
"@mui/system": "^5.14.20",
"@mui/x-data-grid": "^6.18.4",
"@mui/icons-material": "^5.15.0",
"@mui/material": "^5.15.0",
"@mui/system": "^5.15.0",
"@mui/x-data-grid": "^6.18.5",
"@shopify/react-web-worker": "^5.0.13",
"@tauri-apps/api": "1.5.1",
"@tauri-apps/api": "^1.5.2",
"crypto-js": "^4.2.0",
"graphemer": "^1.4.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.20.1"
"react-router-dom": "^6.21.0"
},
"scripts": {
"start": "vite",
Expand All @@ -31,31 +32,19 @@
"react-app/jest"
]
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"packageManager": "[email protected]",
"devDependencies": {
"@tauri-apps/cli": "^1.5.7",
"@tauri-apps/cli": "^1.5.8",
"@vitejs/plugin-react": "^4.2.1",
"cross-env": "^7.0.3",
"eslint": "^8.55.0",
"eslint": "^8.56.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-react-app": "^7.0.1",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"vite": "^5.0.7",
"vite": "^5.0.10",
"vite-plugin-eslint": "^1.8.1",
"vite-plugin-svgr": "^4.2.0"
}
Expand Down
75 changes: 38 additions & 37 deletions src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "advanced-passgen"
version = "2.4.3"
version = "2.5.0"
description = "Advanced PassGen can be used to quickly generate thousands of passwords"
authors = ["CodeDead <[email protected]>"]
license = "GPL-3.0-only"
Expand Down
7 changes: 4 additions & 3 deletions src-tauri/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ async fn generate_passwords(
let mut total_character_set = String::from(character_set);
total_character_set.push_str(include_symbols);

let char_count = total_character_set.graphemes(true).count();
let graphemes = total_character_set.graphemes(true);
let char_count = graphemes.clone().count();

if !allow_duplicates {
let mut current = min_length;
Expand All @@ -75,15 +76,15 @@ async fn generate_passwords(
}

let mut rng = rand::thread_rng();
let chars = total_character_set.chars();
let chars = graphemes.collect::<Vec<&str>>();
for _n in 0..amount {
let mut can_continue = false;
while !can_continue {
let mut password = String::from("");
let length = rng.gen_range(min_length..(max_length + 1));
for _j in 0..length {
let index = rng.gen_range(0..char_count);
password.push(chars.clone().nth(index).unwrap());
password.push_str(chars.clone()[index]);
}

if allow_duplicates || (!allow_duplicates && !password_list.contains(&password)) {
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"package": {
"productName": "advanced-passgen",
"version": "2.4.3"
"version": "2.5.0"
},
"tauri": {
"allowlist": {
Expand Down
2 changes: 2 additions & 0 deletions src/components/CreatePasswordDialog/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ const CreatePasswordDialog = ({ open, onCreate, onClose }) => {
characterSet,
includeSymbols,
allowDuplicates,
useEmojis,
} = state2;

const [title, setTitle] = useState('');
Expand All @@ -57,6 +58,7 @@ const CreatePasswordDialog = ({ open, onCreate, onClose }) => {
numbers,
specialCharacters,
brackets,
useEmojis,
);

const worker = useWorker(createWorker);
Expand Down
Loading