refactor: remove leptos template stuff, replace it with our own

orbit-systems · Mar 29, 2024 · 8e652fd · 8e652fd
1 parent 4f59a2f
commit 8e652fd
Show file tree

Hide file tree

Showing 12 changed files with 158 additions and 70 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,10 +11,19 @@ license = "MPL-2.0"
 leptos = { version = "0.6", features = ["csr", "nightly"] }
 leptos_meta = { version = "0.6", features = ["csr", "nightly"] }
 leptos_router = { version = "0.6", features = ["csr", "nightly"] }
-console_log = "1"
-console_error_panic_hook = "0.1"
-log = "0.4"
 anyhow = "1.0.81"
+meteor-rs = { git = "https://github.com/orbit-systems/meteor", version = "0.1.0" }
+tracing = "0.1.40"
+console_error_panic_hook = "0.1.7"
+tracing-wasm = "0.2.1"
+tracing-log = "0.2.0"
+web-sys = { version = "0.3", features = [
+	"WebGlBuffer",
+	"WebGl2RenderingContext",
+	"WebGlVertexArrayObject",
+	"WebGlProgram",
+	"WebGlShader",
+] }
 
 [dev-dependencies]
 wasm-bindgen = "0.2"

diff --git a/public/JetBrainsMono-Regular.woff2 b/public/JetBrainsMono-Regular.woff2
diff --git a/public/robots.txt b/public/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Allow: /
diff --git a/public/styles.css b/public/styles.css
@@ -1,16 +1,7 @@
-/* --------------------- Open Props --------------------------- */
-
-/* the props */
-@import "https://unpkg.com/open-props";
-
-/* optional imports that use the props */
-@import "https://unpkg.com/open-props/normalize.min.css";
-@import "https://unpkg.com/open-props/buttons.min.css";
-
-/* ------------------------------------------------------------ */
+@import url("https://fonts.googleapis.com/css2?family=Inter:wght@100..900&family=JetBrains+Mono:ital,wght@0,100..800;1,100..800&family=Source+Code+Pro:ital,wght@0,200..900;1,200..900&display=swap");
 
 body {
-    font-family: sans-serif;
+    font-family: Inter, sans-serif;
     text-align: center;
 }
 
@@ -26,6 +17,13 @@ body {
     justify-content: space-evenly;
 }
 
+.meteor-output {
+    font-family: "JetBrains Mono", monospace;
+    font-size: 11;
+    text-wrap: wrap;
+    overflow: scroll;
+}
+
 h1,
 h2,
 h3,

diff --git a/src/components/counter_btn.rs b/src/components/counter_btn.rs
diff --git a/src/components/meteor_component.rs b/src/components/meteor_component.rs
@@ -0,0 +1,15 @@
+use leptos::*;
+
+/// The component that displays the Meteor emulator.
+#[component]
+pub fn Meteor() -> impl IntoView {
+    view! {
+        <textarea class="meteor-output" name="output" rows="24" cols="80">
+            Test
+        </textarea>
+
+        <canvas id="meteor" width="800" height="600">
+
+        </canvas>
+    }
+}
diff --git a/src/components/mod.rs b/src/components/mod.rs
@@ -1 +1 @@
-pub mod counter_btn;
+pub mod meteor_component;
diff --git a/src/lib.rs b/src/lib.rs
@@ -19,7 +19,7 @@ pub fn App() -> impl IntoView {
         <Html lang="en" dir="ltr" attr:data-theme="light"/>
 
         // sets the document title
-        <Title text="Welcome to Leptos CSR"/>
+        <Title text="Nova: Aphelion ISA Playground"/>
 
         // injects metadata in the <head> of the page
         <Meta charset="UTF-8"/>

diff --git a/src/main.rs b/src/main.rs
@@ -2,14 +2,17 @@ use leptos::*;
 
 use nova_playground::App;
 
-fn main() {
-    // set up logging
-    _ = console_log::init_with_level(log::Level::Debug);
+fn main() -> anyhow::Result<()> {
+    // Setup logging
     console_error_panic_hook::set_once();
+    tracing_wasm::set_as_global_default();
+    tracing_log::LogTracer::init()?;
 
     mount_to_body(|| {
         view! {
             <App />
         }
-    })
+    });
+
+    Ok(())
 }
diff --git a/src/meteor.rs b/src/meteor.rs
@@ -0,0 +1 @@
+
diff --git a/src/pages/home.rs b/src/pages/home.rs
@@ -1,6 +1,6 @@
 use leptos::*;
 
-use crate::components::counter_btn::Button;
+use crate::components::meteor_component::Meteor;
 
 /// Default Home Page
 #[component]
@@ -26,28 +26,11 @@ pub fn Home() -> impl IntoView {
         }>
 
             <div class="container">
+                <h1>"nova"</h1>
 
-                <picture>
-                    <source
-                        srcset="https://raw.githubusercontent.com/leptos-rs/leptos/main/docs/logos/Leptos_logo_pref_dark_RGB.svg"
-                        media="(prefers-color-scheme: dark)"
-                    />
-                    <img
-                        src="https://raw.githubusercontent.com/leptos-rs/leptos/main/docs/logos/Leptos_logo_RGB.svg"
-                        alt="Leptos Logo"
-                        height="200"
-                        width="400"
-                    />
-                </picture>
-
-                <h1>"Welcome to Leptos"</h1>
-
-                <div class="buttons">
-                    <Button/>
-                    <Button increment=5/>
-                </div>
-
+                <Meteor/>
             </div>
+
         </ErrorBoundary>
     }
 }