diff --git a/package.json b/package.json index 3392a17..46d9b99 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,8 @@ "@tauri-apps/api": "2.6.0", "@tauri-apps/plugin-opener": "2.4.0", "react": "19.1.0", - "react-dom": "19.1.0" + "react-dom": "19.1.0", + "react-router-dom": "^7.7.0" }, "devDependencies": { "@tailwindcss/postcss": "4.1.11", diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 48c3fc2..3756459 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -1,4 +1,3 @@ -// Prevents additional console window on Windows in release, DO NOT REMOVE!! #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] fn main() { diff --git a/src/App.scss b/src/App.scss index 57c7e9a..db1f12f 100644 --- a/src/App.scss +++ b/src/App.scss @@ -1,6 +1,6 @@ -@use "tailwindcss" as *; -@use "@fontsource/roboto" as *; +@use 'tailwindcss' as *; +@use '@fontsource/roboto' as *; body { - font-family: "Roboto", sans-serif; + font-family: 'Roboto', sans-serif; } diff --git a/src/App.tsx b/src/App.tsx index f7deb72..324f7d4 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,11 +1,13 @@ -import "./App.scss"; +import { HashRouter, Route, Routes } from 'react-router-dom' +import './App.scss' +import Home from './routes/Home' -function App() { +export default function App () { return ( -
-

Berry Dash Manager

-
- ); + + + } /> + + + ) } - -export default App; diff --git a/src/main.tsx b/src/main.tsx index 2be325e..197a6e3 100644 --- a/src/main.tsx +++ b/src/main.tsx @@ -1,9 +1,9 @@ -import React from "react"; -import ReactDOM from "react-dom/client"; -import App from "./App"; +import React from 'react' +import ReactDOM from 'react-dom/client' +import App from './App' -ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render( +ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render( - , -); + +) diff --git a/src/routes/Home.tsx b/src/routes/Home.tsx new file mode 100644 index 0000000..8eece13 --- /dev/null +++ b/src/routes/Home.tsx @@ -0,0 +1,3 @@ +export default function Home () { + return

Berry Dash Manager

+} diff --git a/yarn.lock b/yarn.lock index ea9a7e2..ab4e27b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -877,6 +877,11 @@ convert-source-map@^2.0.0: resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a" integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg== +cookie@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-1.0.2.tgz#27360701532116bd3f1f9416929d176afe1e4610" + integrity sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA== + csstype@^3.0.2: version "3.1.3" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81" @@ -1181,6 +1186,21 @@ react-refresh@^0.17.0: resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.17.0.tgz#b7e579c3657f23d04eccbe4ad2e58a8ed51e7e53" integrity sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ== +react-router-dom@^7.7.0: + version "7.7.0" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-7.7.0.tgz#25be91ba474b934cdeb36b54551789c2361fbcad" + integrity sha512-wwGS19VkNBkneVh9/YD0pK3IsjWxQUVMDD6drlG7eJpo1rXBtctBqDyBm/k+oKHRAm1x9XWT3JFC82QI9YOXXA== + dependencies: + react-router "7.7.0" + +react-router@7.7.0: + version "7.7.0" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-7.7.0.tgz#9e5dc8a3be0c7a1931fcff6f32624b66a285b56a" + integrity sha512-3FUYSwlvB/5wRJVTL/aavqHmfUKe0+Xm9MllkYgGo9eDwNdkvwlJGjpPxono1kCycLt6AnDTgjmXvK3/B4QGuw== + dependencies: + cookie "^1.0.1" + set-cookie-parser "^2.6.0" + react@19.1.0: version "19.1.0" resolved "https://registry.yarnpkg.com/react/-/react-19.1.0.tgz#926864b6c48da7627f004795d6cce50e90793b75" @@ -1241,6 +1261,11 @@ semver@^6.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== +set-cookie-parser@^2.6.0: + version "2.7.1" + resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz#3016f150072202dfbe90fadee053573cc89d2943" + integrity sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ== + "source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"