core: Added ProzillaOS router

Prozilla · Prozilla · commit 2a0f6b279fa0 · 2024-10-07T20:05:26.000+02:00
diff --git a/packages/apps/browser/CHANGELOG.md b/packages/apps/browser/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @prozilla-os/browser
 
+## 1.1.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @prozilla-os/core@1.3.1
+
 ## 1.1.5
 
 ### Patch Changes
diff --git a/packages/apps/browser/package.json b/packages/apps/browser/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@prozilla-os/browser",
 	"description": "A ProzillaOS application for browsing the internet.",
-	"version": "1.1.5",
+	"version": "1.1.6",
 	"homepage": "https://os.prozilla.dev/browser",
 	"author": {
 		"name": "Prozilla",
diff --git a/packages/apps/calculator/CHANGELOG.md b/packages/apps/calculator/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @prozilla-os/calculator
 
+## 1.1.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @prozilla-os/core@1.3.1
+
 ## 1.1.5
 
 ### Patch Changes
diff --git a/packages/apps/calculator/package.json b/packages/apps/calculator/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@prozilla-os/calculator",
 	"description": "A ProzillaOS application for making basic calculations.",
-	"version": "1.1.5",
+	"version": "1.1.6",
 	"homepage": "https://os.prozilla.dev/calculator",
 	"author": {
 		"name": "Prozilla",
diff --git a/packages/apps/file-explorer/CHANGELOG.md b/packages/apps/file-explorer/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @prozilla-os/file-explorer
 
+## 1.1.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @prozilla-os/core@1.3.1
+
 ## 1.1.5
 
 ### Patch Changes
diff --git a/packages/apps/file-explorer/package.json b/packages/apps/file-explorer/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@prozilla-os/file-explorer",
 	"description": "A standard ProzillaOS application for browsing files.",
-	"version": "1.1.5",
+	"version": "1.1.6",
 	"homepage": "https://os.prozilla.dev/file-explorer",
 	"author": {
 		"name": "Prozilla",
diff --git a/packages/apps/logic-sim/CHANGELOG.md b/packages/apps/logic-sim/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @prozilla-os/logic-sim
 
+## 1.1.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @prozilla-os/core@1.3.1
+
 ## 1.1.5
 
 ### Patch Changes
diff --git a/packages/apps/logic-sim/package.json b/packages/apps/logic-sim/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@prozilla-os/logic-sim",
 	"description": "A ProzillaOS application for simulating digital logic.",
-	"version": "1.1.5",
+	"version": "1.1.6",
 	"homepage": "https://os.prozilla.dev/logic-sim",
 	"author": {
 		"name": "Prozilla",
diff --git a/packages/apps/media-viewer/CHANGELOG.md b/packages/apps/media-viewer/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @prozilla-os/media-viewer
 
+## 1.1.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @prozilla-os/core@1.3.1
+
 ## 1.1.5
 
 ### Patch Changes
diff --git a/packages/apps/media-viewer/package.json b/packages/apps/media-viewer/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@prozilla-os/media-viewer",
 	"description": "A ProzillaOS application for viewing different kinds of media.",
-	"version": "1.1.5",
+	"version": "1.1.6",
 	"homepage": "https://os.prozilla.dev/media-viewer",
 	"author": {
 		"name": "Prozilla",
diff --git a/packages/apps/settings/CHANGELOG.md b/packages/apps/settings/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @prozilla-os/settings
 
+## 1.1.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @prozilla-os/core@1.3.1
+  - @prozilla-os/file-explorer@1.1.6
+
 ## 1.1.5
 
 ### Patch Changes
diff --git a/packages/apps/settings/package.json b/packages/apps/settings/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@prozilla-os/settings",
 	"description": "A settings app for ProzillaOS.",
-	"version": "1.1.5",
+	"version": "1.1.6",
 	"homepage": "https://os.prozilla.dev/settings",
 	"author": {
 		"name": "Prozilla",
diff --git a/packages/apps/terminal/CHANGELOG.md b/packages/apps/terminal/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @prozilla-os/terminal
 
+## 1.1.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @prozilla-os/core@1.3.1
+
 ## 1.1.6
 
 ### Patch Changes
diff --git a/packages/apps/terminal/package.json b/packages/apps/terminal/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@prozilla-os/terminal",
 	"description": "A terminal/shell application for ProzillaOS.",
-	"version": "1.1.6",
+	"version": "1.1.7",
 	"homepage": "https://os.prozilla.dev/terminal",
 	"author": {
 		"name": "Prozilla",
diff --git a/packages/apps/text-editor/CHANGELOG.md b/packages/apps/text-editor/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @prozilla-os/text-editor
 
+## 1.1.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @prozilla-os/core@1.3.1
+
 ## 1.1.5
 
 ### Patch Changes
diff --git a/packages/apps/text-editor/package.json b/packages/apps/text-editor/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@prozilla-os/text-editor",
 	"description": "A text editor application for ProzillaOS.",
-	"version": "1.1.5",
+	"version": "1.1.6",
 	"homepage": "https://os.prozilla.dev/text-editor",
 	"author": {
 		"name": "Prozilla",
diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @prozilla-os/core
 
+## 1.3.1
+
+### Patch Changes
+
+- Added ProzillaOS router
+
 ## 1.3.0
 
 ### Minor Changes
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@prozilla-os/core",
 	"description": "A React component library written in TypeScript for building web-based operating systems, made by Prozilla.",
-	"version": "1.3.0",
+	"version": "1.3.1",
 	"homepage": "https://os.prozilla.dev",
 	"author": {
 		"name": "Prozilla",
diff --git a/packages/core/src/components/standalone/StandaloneHeader.module.css b/packages/core/src/components/standalone/StandaloneHeader.module.css
@@ -53,7 +53,7 @@
 	justify-content: center;
 	align-items: center;
 	color: var(--foreground-color-1);
-	background: none;
+	background: none !important;
 	font-size: 1rem;
 	transition: color 300ms ease-in-out;
 }
diff --git a/packages/core/src/components/standalone/StandaloneHeader.tsx b/packages/core/src/components/standalone/StandaloneHeader.tsx
@@ -1,18 +1,20 @@
 import { ReactSVG } from "react-svg";
-import { NAME } from "../../config/branding.config";
 import styles from "./StandaloneHeader.module.css";
 import { faTimes } from "@fortawesome/free-solid-svg-icons";
-import { Button } from "prozilla-os";
+import { Button } from "../_utils/button/Button";
+import { useSystemManager } from "../../hooks/system/systemManagerContext";
 
 interface StandaloneHeaderProps {
 	exit: Function;
 }
 
 export function StandaloneHeader({ exit }: StandaloneHeaderProps) {
+	const { systemName } = useSystemManager();
+
 	return <header className={styles.Header}>
 		<a className={styles.Logo} href="/" tabIndex={0}>
 			<ReactSVG src={"/assets/logo.svg"}/>
-			<h1>{NAME}</h1>
+			<h1>{systemName}</h1>
 		</a>
 		<Button className={styles.ExitButton} onClick={exit} icon={faTimes}>
 			Exit
diff --git a/packages/core/src/main.ts b/packages/core/src/main.ts
@@ -3,6 +3,7 @@ export * from "./components";
 export * from "./hooks";
 export * from "./constants";
 export * from "./styles";
+export * from "./router";
 
 import "./styles/global.css";
 
diff --git a/packages/core/src/router/Router.tsx b/packages/core/src/router/Router.tsx
@@ -2,19 +2,25 @@ import { BrowserRouter, Route, Routes } from "react-router-dom";
 import { DefaultRoute } from "./routes/DefaultRoute";
 import { StandaloneRoute } from "./routes/StandaloneRoute";
 import { NoRoute } from "./routes/NoRoute";
-import { useSystemManager } from "prozilla-os";
+import { useSystemManager } from "../hooks/system/systemManagerContext";
 
-export function Router() {
+interface RouterProps {
+	path?: string;
+	homePage?: JSX.Element;
+	fallbackPage?: JSX.Element;
+}
+
+export function Router({ path = "/", homePage = <DefaultRoute/>, fallbackPage = <NoRoute/> }: RouterProps) {
 	const { appsConfig } = useSystemManager();
 
 	return <BrowserRouter>
 		<Routes>
-			<Route path="/">
-				<Route index element={<DefaultRoute/>}/>
+			<Route path={path}>
+				<Route index element={homePage}/>
 				{appsConfig.apps.map((app) => 
 					<Route path={app.id} key={app.id} element={<StandaloneRoute app={app}/>}/>
 				)}
-				<Route path="*" element={<NoRoute/>}/>
+				<Route path="*" element={fallbackPage}/>
 			</Route>
 		</Routes>
 	</BrowserRouter>;
diff --git a/packages/core/src/router/index.ts b/packages/core/src/router/index.ts
@@ -0,0 +1,4 @@
+export { Router } from "./Router";
+export { DefaultRoute } from "./routes/DefaultRoute";
+export { NoRoute } from "./routes/NoRoute";
+export { StandaloneRoute } from "./routes/StandaloneRoute";
diff --git a/packages/core/src/router/routes/DefaultRoute.tsx b/packages/core/src/router/routes/DefaultRoute.tsx
@@ -0,0 +1,13 @@
+import { WindowsView } from "../../components/windows/WindowsView";
+import { ModalsView } from "../../components/modals/ModalsView";
+import { Taskbar } from "../../components/taskbar/Taskbar";
+import { Desktop } from "../../components/desktop/Desktop";
+
+export function DefaultRoute() {
+	return <>
+		<Taskbar/>
+		<WindowsView/>
+		<ModalsView/>
+		<Desktop/>
+	</>;
+}
diff --git a/packages/core/src/router/routes/NoRoute.module.css b/packages/core/src/router/routes/NoRoute.module.css
diff --git a/packages/core/src/router/routes/NoRoute.tsx b/packages/core/src/router/routes/NoRoute.tsx
@@ -1,6 +1,15 @@
 import { faArrowRight } from "@fortawesome/free-solid-svg-icons";
 import styles from "./NoRoute.module.css";
-import { Button, utilStyles } from "prozilla-os";
+import { Button } from "../../components/_utils/button/Button";
+import utilStyles from "../../styles/utils.module.css";
+
+export interface NoRouteProps {
+	/**
+	 * Title of the route
+	 * @default "404: Not Found"
+	 */
+	title: string;
+} 
 
 export function NoRoute() {
 	return <span className={styles.NoRoute}>
diff --git a/packages/core/src/router/routes/StandaloneRoute.module.css b/packages/core/src/router/routes/StandaloneRoute.module.css
diff --git a/packages/core/src/router/routes/StandaloneRoute.tsx b/packages/core/src/router/routes/StandaloneRoute.tsx
@@ -1,14 +1,17 @@
 import { useCallback, useEffect, useState } from "react";
 import styles from "./StandaloneRoute.module.css";
-import { NAME } from "../../config/branding.config";
-import { App, generateUrl, getViewportParams, ModalsView, openUrl, setViewportIcon, setViewportTitle } from "prozilla-os";
 import { StandaloneHeader } from "../../components/standalone/StandaloneHeader";
+import { App } from "../../features/apps/app";
+import { useSystemManager } from "../../hooks/system/systemManagerContext";
+import { generateUrl, getViewportParams, openUrl, setViewportIcon, setViewportTitle } from "../../features/_utils/browser.utils";
+import { ModalsView } from "../../components/modals/ModalsView";
 
 interface StandaloneRouteProps {
 	app: App;
 }
 
 export function StandaloneRoute({ app }: StandaloneRouteProps) {
+	const { systemName } = useSystemManager();
 	const [title, setTitle] = useState(app.name);
 	const [iconUrl, setIconUrl] = useState(app.iconUrl ?? "");
 
@@ -17,7 +20,7 @@ export function StandaloneRoute({ app }: StandaloneRouteProps) {
 
 		const setViewportTitleAndIcon = () => {
 			if (import.meta.env.DEV)
-				setViewportTitle(`${title} | ${NAME}`);
+				setViewportTitle(`${title} | ${systemName}`);
 			setViewportIcon(iconUrl);
 		};
 
diff --git a/packages/demo/package.json b/packages/demo/package.json
@@ -26,12 +26,12 @@
 		"@fortawesome/fontawesome-svg-core": "^6.5.2",
 		"@fortawesome/free-solid-svg-icons": "^6.5.2",
 		"@fortawesome/react-fontawesome": "^0.2.2",
-		"@prozilla-os/ball-maze": "^1.0.2",
+		"@prozilla-os/ball-maze": "^1.0.3",
 		"@prozilla-os/bliss-radio": "^1.0.6",
 		"@prozilla-os/logic-sim": "workspace:*",
-		"@prozilla-os/minesweeper": "^1.0.2",
+		"@prozilla-os/minesweeper": "^1.0.3",
 		"@prozilla-os/skins": "workspace:*",
-		"@prozilla-os/wordle": "^1.0.2",
+		"@prozilla-os/wordle": "^1.1.1",
 		"prozilla-os": "workspace:*",
 		"react": "^18.3.1",
 		"react-dom": "^18.3.1",
@@ -43,6 +43,7 @@
 	},
 	"devDependencies": {
 		"@eslint/js": "^9.5.0",
+		"@prozilla-os/dev-tools": "^1.0.2",
 		"@types/eslint": "^8.56.10",
 		"@types/gh-pages": "^6.1.0",
 		"@types/node": "^20.14.6",
diff --git a/packages/demo/src/Main.tsx b/packages/demo/src/Main.tsx
@@ -1,9 +1,8 @@
 import { ReactElement, useEffect, useState } from "react";
-import { Router } from "./router/Router";
 import { defaultSkin } from "./config/skin.config";
 import { NAME, TAG_LINE } from "./config/branding.config";
 import { appsConfig } from "./config/apps.config";
-import { getViewportParams, ProzillaOS } from "prozilla-os";
+import { getViewportParams, ProzillaOS, Router } from "prozilla-os";
 import { macOsSkin, minimalSkin, pixelSkin } from "@prozilla-os/skins";
 
 export function Main(): ReactElement {
diff --git a/packages/demo/src/router/routes/DefaultRoute.tsx b/packages/demo/src/router/routes/DefaultRoute.tsx
diff --git a/packages/dev-tools/CHANGELOG.md b/packages/dev-tools/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @prozilla-os/dev-tools
 
+## 1.0.2
+
+### Patch Changes
+
+- Added ProzillaOS router
+- Updated dependencies
+  - @prozilla-os/core@1.3.1
+
 ## 1.0.1
 
 ### Patch Changes
diff --git a/packages/dev-tools/package.json b/packages/dev-tools/package.json
diff --git a/packages/dev-tools/src/configs/app.vite.config.ts b/packages/dev-tools/src/configs/app.vite.config.ts
diff --git a/packages/dev-tools/src/features/console.ts b/packages/dev-tools/src/features/console.ts
diff --git a/packages/dev-tools/src/scripts/stageSite.ts b/packages/dev-tools/src/scripts/stageSite.ts
diff --git a/packages/docs/.vitepress/packages.config.ts b/packages/docs/.vitepress/packages.config.ts
diff --git a/packages/prozilla-os/CHANGELOG.md b/packages/prozilla-os/CHANGELOG.md
diff --git a/packages/prozilla-os/package.json b/packages/prozilla-os/package.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@prozilla-os/browser",`
`3`	`3`	`"description": "A ProzillaOS application for browsing the internet.",`
`4`		`- "version": "1.1.5",`
	`4`	`+ "version": "1.1.6",`
`5`	`5`	`"homepage": "https://os.prozilla.dev/browser",`
`6`	`6`	`"author": {`
`7`	`7`	`"name": "Prozilla",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@prozilla-os/calculator",`
`3`	`3`	`"description": "A ProzillaOS application for making basic calculations.",`
`4`		`- "version": "1.1.5",`
	`4`	`+ "version": "1.1.6",`
`5`	`5`	`"homepage": "https://os.prozilla.dev/calculator",`
`6`	`6`	`"author": {`
`7`	`7`	`"name": "Prozilla",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@prozilla-os/file-explorer",`
`3`	`3`	`"description": "A standard ProzillaOS application for browsing files.",`
`4`		`- "version": "1.1.5",`
	`4`	`+ "version": "1.1.6",`
`5`	`5`	`"homepage": "https://os.prozilla.dev/file-explorer",`
`6`	`6`	`"author": {`
`7`	`7`	`"name": "Prozilla",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@prozilla-os/logic-sim",`
`3`	`3`	`"description": "A ProzillaOS application for simulating digital logic.",`
`4`		`- "version": "1.1.5",`
	`4`	`+ "version": "1.1.6",`
`5`	`5`	`"homepage": "https://os.prozilla.dev/logic-sim",`
`6`	`6`	`"author": {`
`7`	`7`	`"name": "Prozilla",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@prozilla-os/media-viewer",`
`3`	`3`	`"description": "A ProzillaOS application for viewing different kinds of media.",`
`4`		`- "version": "1.1.5",`
	`4`	`+ "version": "1.1.6",`
`5`	`5`	`"homepage": "https://os.prozilla.dev/media-viewer",`
`6`	`6`	`"author": {`
`7`	`7`	`"name": "Prozilla",`