diff --git a/.prettierrc.json b/.prettierrc.json index bd91881..d9c88f5 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -3,5 +3,18 @@ "singleQuote": true, "jsxSingleQuote": false, "arrowParens": "avoid", - "tabWidth": 2 -} \ No newline at end of file + "tabWidth": 2, + "printWidth": 80, + "overrides": [ + { + "files": "*.svelte", + "options": { + "svelteBracketNewLine": false, + "svelteAllowShorthand": true, + "plugins": [ + "prettier-plugin-svelte" + ] + } + } + ] +} diff --git a/package.json b/package.json index a4ccc5e..5500d7b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fancy-password-input", - "version": "0.0.2", + "version": "0.1.0", "description": "A kinda cool fancy password input", "license": "MIT", "svelte": "index.js", @@ -19,6 +19,7 @@ "npm-run-all": "^4.1.5", "postcss": "^8.2.10", "prettier": "^2.7.1", + "prettier-plugin-svelte": "^2.7.1", "rollup": "^2.44.0", "rollup-plugin-copy2": "^0.3.1", "rollup-plugin-json": "^4.0.0", diff --git a/schema.json b/schema.json index b235612..13d9593 100644 --- a/schema.json +++ b/schema.json @@ -12,6 +12,11 @@ "key": "field", "label": "Field" }, + { + "type": "text", + "key": "label", + "label": "Label" + }, { "type": "number", "key": "greenThreshold", @@ -22,11 +27,6 @@ "key": "max", "label": "Max" }, - { - "type": "number", - "key": "thiccness", - "label": "Bar thiccness" - }, { "type": "text", "key": "poorMessage", @@ -39,4 +39,4 @@ } ] } -} \ No newline at end of file +} diff --git a/src/Component.svelte b/src/Component.svelte index 717073a..aeec775 100644 --- a/src/Component.svelte +++ b/src/Component.svelte @@ -1,51 +1,67 @@
+ bind:secret + {label} + {greenThreshold} + {max} + {poorMessage} + {goodMessage} />
+ + diff --git a/src/components/ComplexityBar.svelte b/src/components/ComplexityBar.svelte index 83b80d6..7907d98 100644 --- a/src/components/ComplexityBar.svelte +++ b/src/components/ComplexityBar.svelte @@ -1,27 +1,30 @@ -
+
diff --git a/src/components/FancyPassword.svelte b/src/components/FancyPassword.svelte index 7041056..4b50482 100644 --- a/src/components/FancyPassword.svelte +++ b/src/components/FancyPassword.svelte @@ -1,50 +1,81 @@
- - +
+ {#if label} +
{label}
+ {/if} + +
+ + +
{#if secret === ''} +
{:else if secret.length > greenThreshold} - {goodMessage} + {goodMessage} {:else} - {poorMessage} + {poorMessage} {/if}
diff --git a/yarn.lock b/yarn.lock index 368476b..72c27a8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1331,6 +1331,11 @@ postcss@^8.2.10: picocolors "^1.0.0" source-map-js "^1.0.2" +prettier-plugin-svelte@^2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/prettier-plugin-svelte/-/prettier-plugin-svelte-2.7.1.tgz#c04a32eeba95916d1c7a82243f7a8f8cb822ed46" + integrity sha512-H33qjhCBZyd9Zr1A5hUAYDh7j0Mf97uvy7XcA7CP4nNSYrNcPvBUf7wI8K9NptWTIs0S41QtgTWmJIUiGlEBtw== + prettier@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"