From 5b2a102bfea9cb7ce418dd72e16065276dba0257 Mon Sep 17 00:00:00 2001 From: Yanick Champoux Date: Mon, 8 May 2023 16:07:16 -0400 Subject: [PATCH] use the named layouts --- src/lib/components/MainLayout.svelte | 7 +--- src/routes/{ => (about)}/about/+layout.svelte | 0 src/routes/{ => (about)}/about/+page.svelte | 0 src/routes/{ => (about)}/about/about.test.js | 0 src/routes/{ => (about)}/about/layout.test.js | 0 .../{ => (about)}/about/see-also/+page.svelte | 0 .../{export => (editor)}/+layout.svelte | 22 +++++------- src/routes/{ => (editor)}/editor/+page.svelte | 0 src/routes/{ => (editor)}/editor/page.test.js | 0 src/routes/(editor)/export/+page.svelte | 11 ++++++ .../export}/Serialized.svelte | 34 +++++++++++++++++-- .../export}/Serialized.test.js | 7 ++-- .../{ => (editor)}/export/print/+page.svelte | 0 .../print/PrintShip/Armor/index.story.svelte | 0 .../export/print/PrintShip/Armor/index.svelte | 0 .../export/print/PrintShip/Cargo.svelte | 0 .../print/PrintShip/Firecons/index.svelte | 0 .../print/PrintShip/Hull/index.story.svelte | 0 .../export/print/PrintShip/Hull/index.svelte | 0 .../print/PrintShip/Identification.svelte | 0 .../print/PrintShip/MainSystems/Drive.svelte | 0 .../print/PrintShip/MainSystems/Ftl.svelte | 0 .../print/PrintShip/MainSystems/index.svelte | 0 .../PrintShip/Screens/index.story.svelte | 0 .../print/PrintShip/Screens/index.svelte | 0 .../print/PrintShip/Weapons/Beam.svelte | 0 .../print/PrintShip/Weapons/Beams.svelte | 0 .../Weapons/Graser/index.story.svelte | 0 .../PrintShip/Weapons/Graser/index.svelte | 0 .../print/PrintShip/Weapons/Needlebeam.svelte | 0 .../export/print/PrintShip/Weapons/PDS.svelte | 0 .../print/PrintShip/Weapons/Scattergun.svelte | 0 .../PrintShip/Weapons/Submunition.svelte | 0 .../Weapons/Torpedo/index.story.svelte | 0 .../PrintShip/Weapons/Torpedo/index.svelte | 0 .../PrintShip/Weapons/index.story.svelte | 0 .../print/PrintShip/Weapons/index.svelte | 0 .../print/PrintShip/Weapons/index.test.js | 0 .../print/PrintShip/Weapons/printComps.js | 0 .../export/print/PrintShip/index.story.svelte | 0 .../export/print/PrintShip/index.svelte | 0 .../export/print/PrintShip/index.test.ts | 0 .../export/print/PrintShip/sample-ship.ts | 0 .../export/[format=outputFormat]/+page.js | 6 ---- .../export/[format=outputFormat]/+page.svelte | 21 ------------ 45 files changed, 54 insertions(+), 54 deletions(-) rename src/routes/{ => (about)}/about/+layout.svelte (100%) rename src/routes/{ => (about)}/about/+page.svelte (100%) rename src/routes/{ => (about)}/about/about.test.js (100%) rename src/routes/{ => (about)}/about/layout.test.js (100%) rename src/routes/{ => (about)}/about/see-also/+page.svelte (100%) rename src/routes/{export => (editor)}/+layout.svelte (50%) rename src/routes/{ => (editor)}/editor/+page.svelte (100%) rename src/routes/{ => (editor)}/editor/page.test.js (100%) create mode 100644 src/routes/(editor)/export/+page.svelte rename src/routes/{export/[format=outputFormat] => (editor)/export}/Serialized.svelte (58%) rename src/routes/{export/[format=outputFormat] => (editor)/export}/Serialized.test.js (51%) rename src/routes/{ => (editor)}/export/print/+page.svelte (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/Armor/index.story.svelte (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/Armor/index.svelte (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/Cargo.svelte (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/Firecons/index.svelte (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/Hull/index.story.svelte (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/Hull/index.svelte (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/Identification.svelte (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/MainSystems/Drive.svelte (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/MainSystems/Ftl.svelte (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/MainSystems/index.svelte (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/Screens/index.story.svelte (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/Screens/index.svelte (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/Weapons/Beam.svelte (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/Weapons/Beams.svelte (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/Weapons/Graser/index.story.svelte (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/Weapons/Graser/index.svelte (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/Weapons/Needlebeam.svelte (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/Weapons/PDS.svelte (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/Weapons/Scattergun.svelte (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/Weapons/Submunition.svelte (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/Weapons/Torpedo/index.story.svelte (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/Weapons/Torpedo/index.svelte (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/Weapons/index.story.svelte (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/Weapons/index.svelte (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/Weapons/index.test.js (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/Weapons/printComps.js (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/index.story.svelte (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/index.svelte (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/index.test.ts (100%) rename src/routes/{ => (editor)}/export/print/PrintShip/sample-ship.ts (100%) delete mode 100644 src/routes/export/[format=outputFormat]/+page.js delete mode 100644 src/routes/export/[format=outputFormat]/+page.svelte diff --git a/src/lib/components/MainLayout.svelte b/src/lib/components/MainLayout.svelte index 4608d7c..765d1ef 100644 --- a/src/lib/components/MainLayout.svelte +++ b/src/lib/components/MainLayout.svelte @@ -7,7 +7,7 @@
Editor - Export + + edit + editor + print print output - json + export - - output - yaml + + input + import - diff --git a/src/routes/editor/+page.svelte b/src/routes/(editor)/editor/+page.svelte similarity index 100% rename from src/routes/editor/+page.svelte rename to src/routes/(editor)/editor/+page.svelte diff --git a/src/routes/editor/page.test.js b/src/routes/(editor)/editor/page.test.js similarity index 100% rename from src/routes/editor/page.test.js rename to src/routes/(editor)/editor/page.test.js diff --git a/src/routes/(editor)/export/+page.svelte b/src/routes/(editor)/export/+page.svelte new file mode 100644 index 0000000..6ace38a --- /dev/null +++ b/src/routes/(editor)/export/+page.svelte @@ -0,0 +1,11 @@ + + + diff --git a/src/routes/export/[format=outputFormat]/Serialized.svelte b/src/routes/(editor)/export/Serialized.svelte similarity index 58% rename from src/routes/export/[format=outputFormat]/Serialized.svelte rename to src/routes/(editor)/export/Serialized.svelte index b2f5d07..866287a 100644 --- a/src/routes/export/[format=outputFormat]/Serialized.svelte +++ b/src/routes/(editor)/export/Serialized.svelte @@ -6,16 +6,25 @@ on:error={copyError}>{copyLabel} content_paste +
+ + arrow_drop_down +
-
{data}
+
{serialized}