diff --git a/client/components/Darkmode.svelte b/client/components/Darkmode.svelte index c7308e6..c699bad 100644 --- a/client/components/Darkmode.svelte +++ b/client/components/Darkmode.svelte @@ -5,6 +5,8 @@ import {onMount} from 'svelte'; export let theme = "light"; + export let light_icon_color="var(--color)"; + export let dark_icon_color="var(--color)" const set_theme = () => { document.documentElement.setAttribute('data-theme', theme); @@ -28,10 +30,10 @@ {#if theme == 'dark'} toggle() }> - + {:else} toggle() }> - + {/if} diff --git a/client/components/IconImage.svelte b/client/components/IconImage.svelte index 9397075..3ab7d74 100644 --- a/client/components/IconImage.svelte +++ b/client/components/IconImage.svelte @@ -9,14 +9,14 @@ export let linejoin="round"; export let name=""; export let pattern="dots-sm"; - export let height="200"; - export let width="200"; + export let height="100%"; + export let width="100%"; export let thickness="2"; export let testid=`iconimage-default-${name}`; export let hue='orange'; export let background_hue='blue'; export let grayscale = 0; - export let aspect_ratio = "16/9"; + export let aspect_ratio = "1/1"; let random_background = rando({luminosity: 'light', hue: background_hue}); let random_pattern = rando({luminosity: 'light', hue}); diff --git a/commands/deploy.js b/commands/deploy.js index 704dd84..c2820f7 100644 --- a/commands/deploy.js +++ b/commands/deploy.js @@ -7,33 +7,28 @@ export const options = [ ['--dry-run', "Don't actually update, just pretend."], ['--no-content', "DO NOT deploy the render content, not the app."], ['--no-app', "DO NOT deploy the app, not the content."], - ['--target', "rsync the results to this directory", "/var/www/learnjsthehardway.com"], ]; -const config = { - source_dir: "../ljsthw-private" -}; +export const required = [ + ['--target ', "rsync the results to this directory"], +]; export const main = (opts) => { exec_i("git pull"); - // update the modules git too - const cwd = process.cwd(); - process.chdir(config.source_dir); - exec_i("git pull"); - process.chdir(cwd) - const dry_run = opts.dryRun ? "--dry-run" : ""; if(opts.app) { exec_i("npm run knex migrate:latest"); exec_i("npm run build"); + // reset the icons because we need them all for the demo + exec_i("node bando.js icons"); + exec_i(`rsync -av --delete admin/bando public/`); } if(opts.content) { gen_players.main(); exec_i("node ./bando.js rendered"); - exec_i("node ./bando.js load"); } const ext_list = ["html", "css", "js", "svg", "xml", "md"]; diff --git a/commands/templates/rendered/pages/index.svelte b/commands/templates/rendered/pages/index.svelte index f97996d..f328d86 100644 --- a/commands/templates/rendered/pages/index.svelte +++ b/commands/templates/rendered/pages/index.svelte @@ -133,7 +133,7 @@ -

Learn JavaScript the Hard Way

+

The Bandolier

Bandolier
diff --git a/rendered/feed_index.json b/rendered/feed_index.json index 14ce29e..8f9bbef 100644 --- a/rendered/feed_index.json +++ b/rendered/feed_index.json @@ -1,21 +1,21 @@ { - "title": "Bandolier Template", - "description": "Recent updates about the `Bandolier Template` project.", - "id": "https://learnjsthehardway.com/", - "link": "https://learnjsthehardway.com/", + "title": "The Bandolier Block", + "description": "Recent updates about the `The Bandolier` project.", + "id": "https://bandolier.learnjsthehardway.com/", + "link": "https://bandolier.learnjsthehardway.com/", "language": "en", - "image": "https://learnjsthehardway.com/favicon-32x32.png", - "favicon": "https://learnjsthehardway.com/favicon.ico", + "image": "https://bandolier.learnjsthehardway.com/favicon-32x32.png", + "favicon": "https://bandolier.learnjsthehardway.com/favicon.ico", "copyright": "All rights reserved 2020, Zed A. Shaw.", "generator": "ljsthw", "feedLinks": { - "json": "https://learnjsthehardway.com/feed.json", - "atom": "https://learnjsthehardway.com/feed.atom", - "rss": "https://learnjsthehardway.com/feed.rss" + "json": "https://bandolier.learnjsthehardway.com/feed.json", + "atom": "https://bandolier.learnjsthehardway.com/feed.atom", + "rss": "https://bandolier.learnjsthehardway.com/feed.rss" }, "author": { "name": "Zed A. Shaw", "email": "help@learnjsthehardway.com", - "link": "https://learnjsthehardway.com/about" + "link": "https://bandolier.learnjsthehardway.com/about" } } diff --git a/static/admin/index.html b/static/admin/index.html index dcd9233..c65eaa7 100644 --- a/static/admin/index.html +++ b/static/admin/index.html @@ -2,11 +2,11 @@ - - + + - Bandolier Template + The Bandolier Admin