From 047136d68b9dff80f13f446bd542b145cb57cab0 Mon Sep 17 00:00:00 2001 From: av8ta Date: Sun, 7 Apr 2024 19:37:29 +1000 Subject: [PATCH] move route from /threlte to / --- README.md | 2 +- applications/web/package.json | 2 +- .../routes/{threlte => (cad)}/+page.svelte | 0 .../routes/{threlte => (cad)}/AppBar.svelte | 0 .../src/routes/{threlte => (cad)}/Arc.svelte | 0 .../{threlte => (cad)}/BottomBar.svelte | 0 .../routes/{threlte => (cad)}/Circle.svelte | 0 .../ExtrusionFeature.svelte | 0 .../src/routes/{threlte => (cad)}/Face.svelte | 0 .../{threlte => (cad)}/FeatureHistory.svelte | 0 .../src/routes/{threlte => (cad)}/Line.svelte | 0 .../{threlte => (cad)}/MainDisplay.svelte | 0 .../{threlte => (cad)}/NewCircleTool.svelte | 0 .../{threlte => (cad)}/NewLineTool.svelte | 0 .../NewRectangleTool.svelte | 0 .../{threlte => (cad)}/PassiveSketch.svelte | 0 .../routes/{threlte => (cad)}/Plane.svelte | 0 .../{threlte => (cad)}/PlaneFeature.svelte | 0 .../routes/{threlte => (cad)}/Point2D.svelte | 0 .../routes/{threlte => (cad)}/Point3D.svelte | 0 .../{threlte => (cad)}/PointFeature.svelte | 0 .../routes/{threlte => (cad)}/Scene.svelte | 0 .../{threlte => (cad)}/SelectTool.svelte | 0 .../SelectableSurface.svelte | 0 .../routes/{threlte => (cad)}/Sketch.svelte | 0 .../{threlte => (cad)}/SketchFeature.svelte | 0 .../routes/{threlte => (cad)}/Solid.svelte | 0 .../{threlte => (cad)}/SolidItem.svelte | 0 .../routes/{threlte => (cad)}/ToolBar.svelte | 0 applications/web/src/routes/+page.svelte | 26 ------------------- applications/web/tests/e2e/test.ts | 4 +-- packages/shared/types.d.ts | 1 - 32 files changed, 4 insertions(+), 31 deletions(-) rename applications/web/src/routes/{threlte => (cad)}/+page.svelte (100%) rename applications/web/src/routes/{threlte => (cad)}/AppBar.svelte (100%) rename applications/web/src/routes/{threlte => (cad)}/Arc.svelte (100%) rename applications/web/src/routes/{threlte => (cad)}/BottomBar.svelte (100%) rename applications/web/src/routes/{threlte => (cad)}/Circle.svelte (100%) rename applications/web/src/routes/{threlte => (cad)}/ExtrusionFeature.svelte (100%) rename applications/web/src/routes/{threlte => (cad)}/Face.svelte (100%) rename applications/web/src/routes/{threlte => (cad)}/FeatureHistory.svelte (100%) rename applications/web/src/routes/{threlte => (cad)}/Line.svelte (100%) rename applications/web/src/routes/{threlte => (cad)}/MainDisplay.svelte (100%) rename applications/web/src/routes/{threlte => (cad)}/NewCircleTool.svelte (100%) rename applications/web/src/routes/{threlte => (cad)}/NewLineTool.svelte (100%) rename applications/web/src/routes/{threlte => (cad)}/NewRectangleTool.svelte (100%) rename applications/web/src/routes/{threlte => (cad)}/PassiveSketch.svelte (100%) rename applications/web/src/routes/{threlte => (cad)}/Plane.svelte (100%) rename applications/web/src/routes/{threlte => (cad)}/PlaneFeature.svelte (100%) rename applications/web/src/routes/{threlte => (cad)}/Point2D.svelte (100%) rename applications/web/src/routes/{threlte => (cad)}/Point3D.svelte (100%) rename applications/web/src/routes/{threlte => (cad)}/PointFeature.svelte (100%) rename applications/web/src/routes/{threlte => (cad)}/Scene.svelte (100%) rename applications/web/src/routes/{threlte => (cad)}/SelectTool.svelte (100%) rename applications/web/src/routes/{threlte => (cad)}/SelectableSurface.svelte (100%) rename applications/web/src/routes/{threlte => (cad)}/Sketch.svelte (100%) rename applications/web/src/routes/{threlte => (cad)}/SketchFeature.svelte (100%) rename applications/web/src/routes/{threlte => (cad)}/Solid.svelte (100%) rename applications/web/src/routes/{threlte => (cad)}/SolidItem.svelte (100%) rename applications/web/src/routes/{threlte => (cad)}/ToolBar.svelte (100%) delete mode 100644 applications/web/src/routes/+page.svelte diff --git a/README.md b/README.md index ae073984..c6736e56 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ This software is offered under the [Elastic License 2.0](https://www.elastic.co/ ## Running The Code -If you're just trying to kick the tires, [click here](https://cadmium-nine.vercel.app/threlte) to view the live web demo. +If you're just trying to kick the tires, [click here](https://MattFerraro.github.io/CADmium/) to view the live web demo. To build locally using pnpm workspace & turbo: diff --git a/applications/web/package.json b/applications/web/package.json index fe8b4d79..328c0206 100644 --- a/applications/web/package.json +++ b/applications/web/package.json @@ -6,7 +6,7 @@ "dev": "vite dev", "build": "vite build", "serve": "pnpm build && serve -p 5173 dist", - "clean": "rm -rf .turbo .sveltekit dist node_modules", + "clean": "rm -rf .turbo .svelte-kit dist node_modules", "preview": "vite preview", "test": "pnpm test:integration && pnpm test:unit", "lint": "prettier --plugin-search-dir . --check . && eslint .", diff --git a/applications/web/src/routes/threlte/+page.svelte b/applications/web/src/routes/(cad)/+page.svelte similarity index 100% rename from applications/web/src/routes/threlte/+page.svelte rename to applications/web/src/routes/(cad)/+page.svelte diff --git a/applications/web/src/routes/threlte/AppBar.svelte b/applications/web/src/routes/(cad)/AppBar.svelte similarity index 100% rename from applications/web/src/routes/threlte/AppBar.svelte rename to applications/web/src/routes/(cad)/AppBar.svelte diff --git a/applications/web/src/routes/threlte/Arc.svelte b/applications/web/src/routes/(cad)/Arc.svelte similarity index 100% rename from applications/web/src/routes/threlte/Arc.svelte rename to applications/web/src/routes/(cad)/Arc.svelte diff --git a/applications/web/src/routes/threlte/BottomBar.svelte b/applications/web/src/routes/(cad)/BottomBar.svelte similarity index 100% rename from applications/web/src/routes/threlte/BottomBar.svelte rename to applications/web/src/routes/(cad)/BottomBar.svelte diff --git a/applications/web/src/routes/threlte/Circle.svelte b/applications/web/src/routes/(cad)/Circle.svelte similarity index 100% rename from applications/web/src/routes/threlte/Circle.svelte rename to applications/web/src/routes/(cad)/Circle.svelte diff --git a/applications/web/src/routes/threlte/ExtrusionFeature.svelte b/applications/web/src/routes/(cad)/ExtrusionFeature.svelte similarity index 100% rename from applications/web/src/routes/threlte/ExtrusionFeature.svelte rename to applications/web/src/routes/(cad)/ExtrusionFeature.svelte diff --git a/applications/web/src/routes/threlte/Face.svelte b/applications/web/src/routes/(cad)/Face.svelte similarity index 100% rename from applications/web/src/routes/threlte/Face.svelte rename to applications/web/src/routes/(cad)/Face.svelte diff --git a/applications/web/src/routes/threlte/FeatureHistory.svelte b/applications/web/src/routes/(cad)/FeatureHistory.svelte similarity index 100% rename from applications/web/src/routes/threlte/FeatureHistory.svelte rename to applications/web/src/routes/(cad)/FeatureHistory.svelte diff --git a/applications/web/src/routes/threlte/Line.svelte b/applications/web/src/routes/(cad)/Line.svelte similarity index 100% rename from applications/web/src/routes/threlte/Line.svelte rename to applications/web/src/routes/(cad)/Line.svelte diff --git a/applications/web/src/routes/threlte/MainDisplay.svelte b/applications/web/src/routes/(cad)/MainDisplay.svelte similarity index 100% rename from applications/web/src/routes/threlte/MainDisplay.svelte rename to applications/web/src/routes/(cad)/MainDisplay.svelte diff --git a/applications/web/src/routes/threlte/NewCircleTool.svelte b/applications/web/src/routes/(cad)/NewCircleTool.svelte similarity index 100% rename from applications/web/src/routes/threlte/NewCircleTool.svelte rename to applications/web/src/routes/(cad)/NewCircleTool.svelte diff --git a/applications/web/src/routes/threlte/NewLineTool.svelte b/applications/web/src/routes/(cad)/NewLineTool.svelte similarity index 100% rename from applications/web/src/routes/threlte/NewLineTool.svelte rename to applications/web/src/routes/(cad)/NewLineTool.svelte diff --git a/applications/web/src/routes/threlte/NewRectangleTool.svelte b/applications/web/src/routes/(cad)/NewRectangleTool.svelte similarity index 100% rename from applications/web/src/routes/threlte/NewRectangleTool.svelte rename to applications/web/src/routes/(cad)/NewRectangleTool.svelte diff --git a/applications/web/src/routes/threlte/PassiveSketch.svelte b/applications/web/src/routes/(cad)/PassiveSketch.svelte similarity index 100% rename from applications/web/src/routes/threlte/PassiveSketch.svelte rename to applications/web/src/routes/(cad)/PassiveSketch.svelte diff --git a/applications/web/src/routes/threlte/Plane.svelte b/applications/web/src/routes/(cad)/Plane.svelte similarity index 100% rename from applications/web/src/routes/threlte/Plane.svelte rename to applications/web/src/routes/(cad)/Plane.svelte diff --git a/applications/web/src/routes/threlte/PlaneFeature.svelte b/applications/web/src/routes/(cad)/PlaneFeature.svelte similarity index 100% rename from applications/web/src/routes/threlte/PlaneFeature.svelte rename to applications/web/src/routes/(cad)/PlaneFeature.svelte diff --git a/applications/web/src/routes/threlte/Point2D.svelte b/applications/web/src/routes/(cad)/Point2D.svelte similarity index 100% rename from applications/web/src/routes/threlte/Point2D.svelte rename to applications/web/src/routes/(cad)/Point2D.svelte diff --git a/applications/web/src/routes/threlte/Point3D.svelte b/applications/web/src/routes/(cad)/Point3D.svelte similarity index 100% rename from applications/web/src/routes/threlte/Point3D.svelte rename to applications/web/src/routes/(cad)/Point3D.svelte diff --git a/applications/web/src/routes/threlte/PointFeature.svelte b/applications/web/src/routes/(cad)/PointFeature.svelte similarity index 100% rename from applications/web/src/routes/threlte/PointFeature.svelte rename to applications/web/src/routes/(cad)/PointFeature.svelte diff --git a/applications/web/src/routes/threlte/Scene.svelte b/applications/web/src/routes/(cad)/Scene.svelte similarity index 100% rename from applications/web/src/routes/threlte/Scene.svelte rename to applications/web/src/routes/(cad)/Scene.svelte diff --git a/applications/web/src/routes/threlte/SelectTool.svelte b/applications/web/src/routes/(cad)/SelectTool.svelte similarity index 100% rename from applications/web/src/routes/threlte/SelectTool.svelte rename to applications/web/src/routes/(cad)/SelectTool.svelte diff --git a/applications/web/src/routes/threlte/SelectableSurface.svelte b/applications/web/src/routes/(cad)/SelectableSurface.svelte similarity index 100% rename from applications/web/src/routes/threlte/SelectableSurface.svelte rename to applications/web/src/routes/(cad)/SelectableSurface.svelte diff --git a/applications/web/src/routes/threlte/Sketch.svelte b/applications/web/src/routes/(cad)/Sketch.svelte similarity index 100% rename from applications/web/src/routes/threlte/Sketch.svelte rename to applications/web/src/routes/(cad)/Sketch.svelte diff --git a/applications/web/src/routes/threlte/SketchFeature.svelte b/applications/web/src/routes/(cad)/SketchFeature.svelte similarity index 100% rename from applications/web/src/routes/threlte/SketchFeature.svelte rename to applications/web/src/routes/(cad)/SketchFeature.svelte diff --git a/applications/web/src/routes/threlte/Solid.svelte b/applications/web/src/routes/(cad)/Solid.svelte similarity index 100% rename from applications/web/src/routes/threlte/Solid.svelte rename to applications/web/src/routes/(cad)/Solid.svelte diff --git a/applications/web/src/routes/threlte/SolidItem.svelte b/applications/web/src/routes/(cad)/SolidItem.svelte similarity index 100% rename from applications/web/src/routes/threlte/SolidItem.svelte rename to applications/web/src/routes/(cad)/SolidItem.svelte diff --git a/applications/web/src/routes/threlte/ToolBar.svelte b/applications/web/src/routes/(cad)/ToolBar.svelte similarity index 100% rename from applications/web/src/routes/threlte/ToolBar.svelte rename to applications/web/src/routes/(cad)/ToolBar.svelte diff --git a/applications/web/src/routes/+page.svelte b/applications/web/src/routes/+page.svelte deleted file mode 100644 index 7ccedb97..00000000 --- a/applications/web/src/routes/+page.svelte +++ /dev/null @@ -1,26 +0,0 @@ -
-

CADmium

-
-

- CADmium is an experimental CAD program that runs entirely in the browser. It is similar to Onshape in that there is - no software to install, but similar to FreeCAD in that it is entirely open source. -

-
-

- You can try it out here or check out the source code - here! -

-
- - diff --git a/applications/web/tests/e2e/test.ts b/applications/web/tests/e2e/test.ts index 54cb814b..eb9dcd92 100644 --- a/applications/web/tests/e2e/test.ts +++ b/applications/web/tests/e2e/test.ts @@ -7,11 +7,11 @@ test("index page has expected title", async ({ page }) => { }) test("has history pane", async ({ page }) => { - await page.goto("/threlte") + await page.goto("/") await expect(page.getByText("History")).toBeVisible() }) test("has origin in history panel", async ({ page }) => { - await page.goto("/threlte") + await page.goto("/") await expect(page.getByText("origin")).toBeVisible() }) diff --git a/packages/shared/types.d.ts b/packages/shared/types.d.ts index ea18a54a..d0643bac 100644 --- a/packages/shared/types.d.ts +++ b/packages/shared/types.d.ts @@ -1,4 +1,3 @@ -// import type Point3D from "./routes/threlte/Point3D.svelte" import type { Vector2, Vector3, Vector2Like, Vector3Like } from "three" interface IDictionary {