From e418603b3024fef29ca48aa7fa8b2a4b5384e969 Mon Sep 17 00:00:00 2001 From: forevermatt Date: Thu, 11 Jun 2020 19:20:22 -0400 Subject: [PATCH 1/8] Use full width, up to xl breakpoint --- src/App.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.svelte b/src/App.svelte index 03dc9c5..6752116 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -14,7 +14,7 @@ onMount(async () => { }) -
+
From 8c741662c0c33c6d4a5e3db0c7be6645fc63cc6f Mon Sep 17 00:00:00 2001 From: forevermatt Date: Thu, 11 Jun 2020 20:31:52 -0400 Subject: [PATCH 2/8] Add nice button for getting to accounts list --- package-lock.json | 93 ++++++++++++++++++++------------- package.json | 12 +++-- src/components/Button.svelte | 49 +++++++++++++++++ src/components/ButtonRow.svelte | 18 +++++++ src/views/Budget.svelte | 7 ++- 5 files changed, 137 insertions(+), 42 deletions(-) create mode 100644 src/components/Button.svelte create mode 100644 src/components/ButtonRow.svelte diff --git a/package-lock.json b/package-lock.json index 8095949..12e59bf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,6 +30,21 @@ "js-tokens": "^4.0.0" } }, + "@fortawesome/fontawesome-common-types": { + "version": "0.2.28", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.28.tgz", + "integrity": "sha512-gtis2/5yLdfI6n0ia0jH7NJs5i/Z/8M/ZbQL6jXQhCthEOe5Cr5NcQPhgTvFxNOtURE03/ZqUcEskdn2M+QaBg==", + "dev": true + }, + "@fortawesome/free-solid-svg-icons": { + "version": "5.13.0", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.13.0.tgz", + "integrity": "sha512-IHUgDJdomv6YtG4p3zl1B5wWf9ffinHIvebqQOmV3U+3SLw4fC+LUCCgwfETkbTtjy5/Qws2VoVf6z/ETQpFpg==", + "dev": true, + "requires": { + "@fortawesome/fontawesome-common-types": "^0.2.28" + } + }, "@polka/url": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/@polka/url/-/url-0.5.0.tgz", @@ -163,9 +178,9 @@ } }, "chokidar": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz", - "integrity": "sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz", + "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==", "dev": true, "requires": { "anymatch": "~3.1.1", @@ -175,7 +190,7 @@ "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", - "readdirp": "~3.3.0" + "readdirp": "~3.4.0" } }, "color-convert": { @@ -216,6 +231,12 @@ "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", "dev": true }, + "fa-svelte": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/fa-svelte/-/fa-svelte-3.1.0.tgz", + "integrity": "sha512-RqBOWwt7sc+ta9GFjbu5GOwKFRzn3rMPPSqvSGpIwsfVnpMjiI5ttv84lwNsCMEYI6/lu/iH21HUcE3TLz8RGQ==", + "dev": true + }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -226,9 +247,9 @@ } }, "fsevents": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz", - "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", + "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", "dev": true, "optional": true }, @@ -342,9 +363,9 @@ } }, "livereload-js": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-3.2.2.tgz", - "integrity": "sha512-xhScbNeC687ZINjEf/bD+BMiPx4s4q0mehcLb3zCc8+mykOtmaBR4vqzyIV9rIGdG9JjHaT0LiFdscvivCjX1Q==", + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-3.2.3.tgz", + "integrity": "sha512-dXL/WgTGI2K3oeYX/z1lngFXSKtjCB2j7n9WSSluoU6/6+N4LWNoMiCBFNgn8dh3luBn4JBajVSvM5I7Xn6SLA==", "dev": true }, "local-access": { @@ -378,9 +399,9 @@ } }, "mime": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", - "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==" + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz", + "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==" }, "mri": { "version": "1.1.5", @@ -412,12 +433,12 @@ "dev": true }, "readdirp": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz", - "integrity": "sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz", + "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", "dev": true, "requires": { - "picomatch": "^2.0.7" + "picomatch": "^2.2.1" } }, "regexparam": { @@ -453,18 +474,18 @@ } }, "rollup-plugin-livereload": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/rollup-plugin-livereload/-/rollup-plugin-livereload-1.2.0.tgz", - "integrity": "sha512-zKcS4D8ElSFj9Mv6OAM1kGB3o5LkCtEClewO8CDPEacj6p4DSvTOm6WlKSc8/WtsD0d3Q33Y96c5Jqzyaxo/8g==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/rollup-plugin-livereload/-/rollup-plugin-livereload-1.3.0.tgz", + "integrity": "sha512-abyqXaB21+nFHo+vJULBqfzNx6zXABC19UyvqgDfdoxR/8pFAd041GO+GIUe8ZYC2DbuMUmioh1Lvbk14YLZgw==", "dev": true, "requires": { "livereload": "^0.9.1" } }, "rollup-plugin-svelte": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/rollup-plugin-svelte/-/rollup-plugin-svelte-5.2.1.tgz", - "integrity": "sha512-wc93cN66sRpX6uFljVFqvWT6NU3V5ab/uLXKt2UiARuexFU/ctolzkmdXM7WM5iKdTX9scToS9sabJTJV4DUMA==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/rollup-plugin-svelte/-/rollup-plugin-svelte-5.2.2.tgz", + "integrity": "sha512-I+TJ2T+VLKGbKQcpeMJ4AR2ciROqTZNjxbiMiH4Cn1yByaB9OEuy3CnrgHHuWatQcPuF3yIViyKX7OlETWDKOQ==", "dev": true, "requires": { "require-relative": "^0.8.7", @@ -517,25 +538,25 @@ "dev": true }, "sirv": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/sirv/-/sirv-0.4.2.tgz", - "integrity": "sha512-dQbZnsMaIiTQPZmbGmktz+c74zt/hyrJEB4tdp2Jj0RNv9J6B/OWR5RyrZEvIn9fyh9Zlg2OlE2XzKz6wMKGAw==", + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/sirv/-/sirv-0.4.6.tgz", + "integrity": "sha512-rYpOXlNbpHiY4nVXxuDf4mXPvKz1reZGap/LkWp9TvcZ84qD/nPBjjH/6GZsgIjVMbOslnY8YYULAyP8jMn1GQ==", "requires": { "@polka/url": "^0.5.0", "mime": "^2.3.1" } }, "sirv-cli": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/sirv-cli/-/sirv-cli-0.4.5.tgz", - "integrity": "sha512-Fl6icSm0EwPrXSGid2xphMp//WNTSX2yENRAGnJuuZNmdc8LvE/BtdZD3MPn28ifAfDqTMwbB3dpcZojAIOiBg==", + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/sirv-cli/-/sirv-cli-0.4.6.tgz", + "integrity": "sha512-/Vj85/kBvPL+n9ibgX6FicLE8VjidC1BhlX67PYPBfbBAphzR6i0k0HtU5c2arejfU3uzq8l3SYPCwl1x7z6Ww==", "requires": { "console-clear": "^1.1.0", "get-port": "^3.2.0", "kleur": "^3.0.0", "local-access": "^1.0.1", "sade": "^1.4.0", - "sirv": "^0.4.2", + "sirv": "^0.4.6", "tinydate": "^1.0.0" } }, @@ -571,15 +592,15 @@ } }, "svelte": { - "version": "3.20.1", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.20.1.tgz", - "integrity": "sha512-m/dw52BZf+p6KYnyKLErIcGalu4pwJrQbUM7VZriRw6ZlJj1qMAZsLcIWzEB3I0hhdJwkKb7LrrvUIeqmbO92Q==", + "version": "3.23.2", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.23.2.tgz", + "integrity": "sha512-hE8GeTM83YVR4GY6/6PeDEcGct4JS5aCi+IYbCAa76oaPSfuF7L85DQYULQxlTK/KPWzw3L1GRGmC3oPG/PQoA==", "dev": true }, "svelte-spa-router": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/svelte-spa-router/-/svelte-spa-router-2.1.0.tgz", - "integrity": "sha512-9bcQPTQ6A+Z92Z+NirVVusa/Sw6nqzKwZAKfu1Cl6+XjStf12hfIcPoMfTutEBoX0Ik+z7gJbJ934PKk94BvCg==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/svelte-spa-router/-/svelte-spa-router-2.2.0.tgz", + "integrity": "sha512-S3KpmiBszjdjkU1QA9FyNgrSdQORbXWp4wl8R147Gl7KoNof/0SfFJ23+9E47jLiNz+lCw1uaCfeHJi2I60bVg==", "dev": true, "requires": { "regexparam": "1.3.0" diff --git a/package.json b/package.json index 75b381a..4aa49f5 100644 --- a/package.json +++ b/package.json @@ -18,17 +18,19 @@ }, "homepage": "https://github.com/forevermatt/svelte-budget#readme", "devDependencies": { + "@fortawesome/free-solid-svg-icons": "^5.13.0", "@rollup/plugin-commonjs": "11.0.2", "@rollup/plugin-node-resolve": "^7.0.0", + "fa-svelte": "^3.1.0", "rollup": "^1.20.0", - "rollup-plugin-livereload": "^1.0.0", - "rollup-plugin-svelte": "^5.0.3", + "rollup-plugin-livereload": "^1.3.0", + "rollup-plugin-svelte": "^5.2.2", "rollup-plugin-terser": "^5.1.2", - "svelte": "^3.0.0", - "svelte-spa-router": "^2.1.0" + "svelte": "^3.23.2", + "svelte-spa-router": "^2.2.0" }, "dependencies": { - "sirv-cli": "^0.4.4", + "sirv-cli": "^0.4.6", "uuid": "^7.0.3" } } diff --git a/src/components/Button.svelte b/src/components/Button.svelte new file mode 100644 index 0000000..e0bd46b --- /dev/null +++ b/src/components/Button.svelte @@ -0,0 +1,49 @@ + + + + + + + {#if icon } + + {/if}
+

+ { name } +
diff --git a/src/components/ButtonRow.svelte b/src/components/ButtonRow.svelte new file mode 100644 index 0000000..a3193a2 --- /dev/null +++ b/src/components/ButtonRow.svelte @@ -0,0 +1,18 @@ + + +
+
+ +
+
diff --git a/src/views/Budget.svelte b/src/views/Budget.svelte index dcf631d..8b140df 100644 --- a/src/views/Budget.svelte +++ b/src/views/Budget.svelte @@ -1,5 +1,8 @@

Budget

@@ -8,4 +11,6 @@ import BudgetOverview from '../components/BudgetOverview.svelte'

Add new category

-

Accounts

+ +