win98

warycat · Jan 24, 2022 · 4e5ce54 · 4e5ce54
1 parent e2e4a27
commit 4e5ce54
Show file tree

Hide file tree

Showing 50 changed files with 2,079 additions and 322 deletions.
diff --git a/server/src/context/app.rs b/server/src/context/app.rs
@@ -0,0 +1,14 @@
+use crate::context::*;
+
+pub struct AppContext {
+    pub title: String,
+    pub tag: String,
+}
+
+impl AppContext {
+    pub fn new(data: Data<AppData>) -> Self {
+        let title = data.title.borrow().to_string();
+        let tag = data.tag.borrow().to_string();
+        AppContext { title, tag }
+    }
+}
diff --git a/server/src/context/find.rs b/server/src/context/find.rs
@@ -0,0 +1,9 @@
+use crate::context::*;
+
+#[derive(Template, new)]
+#[template(path = "find.j2")]
+pub struct FindContext {
+    pub app: AppContext,
+    pub session: SessionData,
+    pub path: String,
+}
diff --git a/server/src/context/google.rs b/server/src/context/google.rs
@@ -21,8 +21,8 @@ pub struct GoogleIndexContext {
     pub app: AppContext,
     pub session: SessionData,
     pub path: String,
-    pub codejam_rows: Vec<GoogleIndexRow>,
-    pub kickstart_rows: Vec<GoogleIndexRow>,
+    pub rows_codejam: Vec<GoogleIndexRow>,
+    pub rows_kickstart: Vec<GoogleIndexRow>,
 }
 
 #[derive(Template, new)]

diff --git a/server/src/context/home.rs b/server/src/context/home.rs
@@ -1,22 +1,9 @@
 use crate::context::*;
 
-pub struct AppContext {
-    pub title: String,
-    pub tag: String,
-}
-
 #[derive(Template, new)]
 #[template(path = "home.j2")]
 pub struct HomeContext {
     pub app: AppContext,
     pub session: SessionData,
     pub path: String,
 }
-
-impl AppContext {
-    pub fn new(data: Data<AppData>) -> Self {
-        let title = data.title.borrow().to_string();
-        let tag = data.tag.borrow().to_string();
-        AppContext { title, tag }
-    }
-}
diff --git a/server/src/context/leetcode.rs b/server/src/context/leetcode.rs
@@ -28,7 +28,9 @@ pub struct LeetcodeIndexContext {
     pub app: AppContext,
     pub session: SessionData,
     pub path: String,
-    pub rows: Vec<LeetcodeIndexRow>,
+    pub rows_easy: Vec<LeetcodeIndexRow>,
+    pub rows_medium: Vec<LeetcodeIndexRow>,
+    pub rows_hard: Vec<LeetcodeIndexRow>,
 }
 
 #[derive(Template, new)]

diff --git a/server/src/context/mod.rs b/server/src/context/mod.rs
@@ -1,11 +1,15 @@
 mod adventofcode;
+mod app;
+mod find;
 mod google;
 mod home;
 mod leetcode;
 mod nes;
 mod sitemap;
 
 pub use adventofcode::*;
+pub use app::*;
+pub use find::*;
 pub use google::*;
 pub use home::*;
 pub use leetcode::*;
@@ -52,6 +56,7 @@ impl_render_wrapper!(GoogleIndexContext);
 impl_render_wrapper!(GoogleDetailContext);
 impl_render_wrapper!(NesIndexContext);
 impl_render_wrapper!(NesDetailContext);
+impl_render_wrapper!(FindContext);
 
 impl_txt_render_wrapper!(SitemapContext);
 impl_txt_render_wrapper!(RobotsContext);
diff --git a/server/src/files.rs b/server/src/files.rs
@@ -24,3 +24,9 @@ async fn data_files(req: HttpRequest) -> Result<NamedFile> {
     let path: PathBuf = ["data", filename].iter().collect();
     Ok(NamedFile::open(path)?)
 }
+
+#[get("/favicon.ico")]
+async fn favicon_file(_req: HttpRequest) -> Result<NamedFile> {
+    let path: PathBuf = ["static", "ico", "windows.ico"].iter().collect();
+    Ok(NamedFile::open(path)?)
+}
diff --git a/server/src/main.rs b/server/src/main.rs
@@ -35,7 +35,7 @@ async fn main() -> std::io::Result<()> {
     let tag = env::var("TAG").expect("TAG");
     let turn_static_auth_secret =
         env::var("TURN_STATIC_AUTH_SECRET").expect("TURN_STATIC_AUTH_SECRET");
-    let title = "RUST GYM".to_string();
+    let title = "Rust Gym".to_string();
     info!("{} {}", title, tag);
     let app_data = AppData::new(tag, title, turn_static_auth_secret);
     let search_addr = SearchAgent::new(pool.clone()).start();
@@ -54,6 +54,7 @@ async fn main() -> std::io::Result<()> {
             .data(registry_addr.clone())
             .data(uap_addr.clone())
             .service(routes::home::home)
+            .service(routes::find::find)
             .service(routes::nes_index::nes_index)
             .service(routes::nes_detail::nes_detail)
             .service(routes::leetcode_index::leetcode_index)
@@ -67,6 +68,7 @@ async fn main() -> std::io::Result<()> {
             .service(files::client_files)
             .service(files::static_files)
             .service(files::data_files)
+            .service(files::favicon_file)
             .service(web::resource("/ws/").to(agents::websocket::ws_index))
     })
     .bind("127.0.0.1:8080")?

diff --git a/server/src/routes/find.rs b/server/src/routes/find.rs
@@ -0,0 +1,19 @@
+use crate::app_data::AppData;
+use crate::context::*;
+use crate::session_data::update_session;
+use actix_session::Session;
+use actix_web::get;
+use actix_web::web;
+use actix_web::Error;
+use actix_web::HttpRequest;
+use actix_web::HttpResponse;
+
+#[get("/find")]
+pub async fn find(
+    req: HttpRequest,
+    data: web::Data<AppData>,
+    session: Session,
+) -> Result<HttpResponse, Error> {
+    let session_data = update_session(session)?;
+    FindContext::new(AppContext::new(data), session_data, req.path().to_string()).render_wrapper()
+}
diff --git a/server/src/routes/leetcode_index.rs b/server/src/routes/leetcode_index.rs
@@ -29,11 +29,33 @@ pub async fn leetcode_index(
         .order(schema::leetcode_question::dsl::id)
         .load(&conn)
         .map_err(ErrorNotFound)?;
+
+    let mut rows_easy = vec![];
+    let mut rows_medium = vec![];
+    let mut rows_hard = vec![];
+    for row in rows {
+        match row.level {
+            1 => {
+                rows_easy.push(row);
+            }
+            2 => {
+                rows_medium.push(row);
+            }
+            3 => {
+                rows_hard.push(row);
+            }
+            _ => {
+                panic!();
+            }
+        }
+    }
     LeetcodeIndexContext::new(
         AppContext::new(data),
         session_data,
         req.path().to_string(),
-        rows,
+        rows_easy,
+        rows_medium,
+        rows_hard,
     )
     .render_wrapper()
 }
diff --git a/server/src/routes/mod.rs b/server/src/routes/mod.rs
@@ -1,5 +1,6 @@
 pub mod adventofcode_detail;
 pub mod adventofcode_index;
+pub mod find;
 pub mod google_detail;
 pub mod google_index;
 pub mod home;

diff --git a/server/templates/adventofcode-detail.j2 b/server/templates/adventofcode-detail.j2
@@ -1,33 +1,53 @@
-{% extends "home.j2" %}
+{% extends "desktop.j2" %}
 
 {% block title %}
   {{app.title}} AdventOfCode {{description.year}} Day {{description.day}} {{description.title}} Rust Solution
 {% endblock %}
 
 {% block content %}
-<div>{{description.html|safe}}</div>
-<h2>Rust Solution</h2>
-<pre><code class="rust">{{solution.source}}</code></pre>
-
-<div class="grid grid-cols-2 flex justify-between">
-  <div class="flex">
-    <a target="_blank" href="{{description.practice_url()}}">
-      <button type="button" class="border border-green-500 bg-green-500 text-white rounded-md px-4 py-2 m-2 transition duration-500 ease select-none hover:bg-green-500 focus:outline-none focus:shadow-outline">Practice</button>
-    </a>
-  </div>
-
-  <div class="flex justify-end">
-  <a target="_blank" href="http://twitter.com/share?text={{app.title}} AdventOfCode {{description.year}} Day {{description.day}} {{description.title}} Rust Solution&url=https://rustgym.com{{description.href()}}&hashtags=rustgym,adventofcode,rust">
-    <button type="button" class="border border-blue-400 bg-blue-400 text-white rounded-md px-4 py-2 m-2 transition duration-500 ease select-none hover:bg-blue-500 focus:outline-none focus:shadow-outline">Tweet</button>
-  </a> 
-    <a target="_blank" href="https://www.facebook.com/sharer/sharer.php?u=rustgym.com{{description.href()}}" >
-      <button type="button" class="border border-blue-600 bg-blue-600 text-white rounded-md px-4 py-2 m-2 transition duration-500 ease select-none hover:bg-blue-700 focus:outline-none focus:shadow-outline">Facebook</button>
-    </a>
-  </div>
-</div>
+<div class="component">
+    <div class="window" >
+        <div class="title-bar">
+            <div class="title-bar-text">{{description.title}}</div>
+            <div class="title-bar-controls">
+                <button aria-label="Minimize"></button>
+                <button aria-label="Maximize"></button>
+                <button aria-label="Close"></button>
+            </div>
+        </div>
+        <div class="window-body">
+            <div>{{description.html|safe}}</div>
+            <section class="field-row" style="justify-content: flex-end">
+                <a target="_blank" href="{{description.practice_url()}}">
+                    <button>Practice</button>
+                </a>
+                <a target="_blank" href="http://twitter.com/share?text={{app.title}} AdventOfCode {{description.year}} Day {{description.day}} {{description.title}} Rust Solution&url=https://rustgym.com{{description.href()}}&hashtags=rustgym,adventofcode,rust">
+                    <button>Tweet</button>
+                </a>
+                <a target="_blank" href="https://www.facebook.com/sharer/sharer.php?u=rustgym.com{{description.href()}}" >
+                    <button>Facebook</button>
+                </a>
+                <a target="_blank" href="https://github.com/warycat/rustgym/issues/new?title=AdventOfCode {{description.year}} Day {{description.day}} {{description.title}}">
+                    <button type="button">Issue</button>
+                </a>
+            </section>
+        </div>
+    </div>
 
+    <div class="window" >
+        <div class="title-bar">
+            <div class="title-bar-text">{{description.title}}</div>
+            <div class="title-bar-controls">
+                <button aria-label="Minimize"></button>
+                <button aria-label="Maximize"></button>
+                <button aria-label="Close"></button>
+            </div>
+        </div>
+        <div class="window-body">
+          <pre><code class="rust">{{solution.source}}</code></pre>
+        </div>
+    </div>
 
-<div>
-  <p>Having problems with this solution? <a href="https://github.com/warycat/rustgym/issues/new?title=AdventOfCode {{description.year}} Day {{description.day}} {{description.title}}">Click here</a> to submit an issue on github.</p>
 </div>
 {% endblock %}
+
diff --git a/server/templates/adventofcode-index.j2 b/server/templates/adventofcode-index.j2
@@ -1,32 +1,47 @@
-{% extends "home.j2" %}
+{% extends "desktop.j2" %}
 
 {% block title %}
   {{app.title}} AdventOfCode Rust Solutions
 {% endblock %}
 
 {% block content %}
-<table class="table-auto">
-  <thead>
-    <tr>
-      <th>Year</th>
-      <th>Day</th>
-      <th>AdventOfCode {{rows.len()}} Rust Solutions</th>
-    </tr>
-  </thead>
-  <tbody>
-    {% for row in rows %}
-      <tr>
-        <td>
-          {{row.year}}
-        </td>
-        <td>
-          {{row.day}}
-        </td>
-        <td>
-          <a href="{{row.href()}}"> {{row.title}}</a>
-        </td>
-      </tr>
-    {% endfor %}
-  </tbody>
-</table>
-{% endblock %}
+<div class="component">
+    <div class="window" >
+        <div class="title-bar">
+            <div class="title-bar-text">AdventOfCode Solutions</div>
+            <div class="title-bar-controls">
+                <button aria-label="Minimize"></button>
+                <button aria-label="Maximize"></button>
+                <button aria-label="Close"></button>
+            </div>
+        </div>
+        <div class="window-body">
+            <table class="table-auto">
+            <thead>
+                <tr>
+                <th>Year</th>
+                <th>Day</th>
+                <th>AdventOfCode {{rows.len()}} Rust Solutions</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for row in rows %}
+                <tr>
+                    <td>
+                        {{row.year}}
+                    </td>
+                    <td>
+                        {{row.day}}
+                    </td>
+                    <td>
+                        <a href="{{row.href()}}"> {{row.title}}</a>
+                    </td>
+                </tr>
+                {% endfor %}
+            </tbody>
+            </table>
+        </div>
+    </div>
+</div>
+{% endblock %}
+