start of web ui leaderboard

fatfingers23 · Nov 3, 2023 · 84b811e · 84b811e
1 parent 462a545
commit 84b811e
Show file tree

Hide file tree

Showing 20 changed files with 358 additions and 357 deletions.
diff --git a/trackscape-discord-api/src/controllers/clan_controller.rs b/trackscape-discord-api/src/controllers/clan_controller.rs
@@ -0,0 +1,33 @@
+use actix_web::{get, web, Error, HttpResponse, Scope};
+use serde::{Deserialize, Serialize};
+use trackscape_discord_shared::database::BotMongoDb;
+use web::Data;
+
+#[derive(Deserialize, Serialize)]
+struct ClanViewModel {
+    id: String,
+    name: String,
+}
+
+#[get("/list")]
+async fn list_clans(mongodb: Data<BotMongoDb>) -> Result<HttpResponse, Error> {
+    let result = mongodb.guilds.list_clans().await;
+
+    match result {
+        Ok(clans) => {
+            let view_models: Vec<ClanViewModel> = clans
+                .into_iter()
+                .map(|clan| ClanViewModel {
+                    id: clan.id.to_string(),
+                    name: clan.clan_name.unwrap(),
+                })
+                .collect();
+            Ok(HttpResponse::Ok().json(view_models))
+        }
+        Err(_) => Ok(HttpResponse::InternalServerError().body("Failed to list clans.")),
+    }
+}
+
+pub fn clan_controller() -> Scope {
+    web::scope("/clans").service(list_clans)
+}
diff --git a/trackscape-discord-api/src/controllers/mod.rs b/trackscape-discord-api/src/controllers/mod.rs
@@ -1,3 +1,4 @@
 pub mod bot_info_controller;
 pub mod chat_controller;
+pub mod clan_controller;
 pub mod drop_log_controller;
diff --git a/trackscape-discord-api/src/main.rs b/trackscape-discord-api/src/main.rs
@@ -25,6 +25,7 @@ use trackscape_discord_shared::ge_api::ge_api::{get_item_mapping, GeItemMapping}
 use uuid::Uuid;
 
 pub use self::websocket_server::{ChatServer, ChatServerHandle};
+use crate::controllers::clan_controller::clan_controller;
 use crate::controllers::drop_log_controller::drop_log_controller;
 use actix_files::{Files, NamedFile};
 use log::{error, info};
@@ -113,7 +114,8 @@ async fn actix_web(
             web::scope("/api")
                 .service(chat_controller())
                 .service(info_controller())
-                .service(drop_log_controller()),
+                .service(drop_log_controller())
+                .service(clan_controller()),
         )
         .service(Files::new("/", "./trackscape-discord-api/ui/").index_file("index.html"))
         .app_data(web::Data::new(server_tx.clone()))

diff --git a/trackscape-discord-api/ui/assets/index-2c18a9aa.css b/trackscape-discord-api/ui/assets/index-2c18a9aa.css
diff --git a/trackscape-discord-api/ui/assets/index-4d8bb280.js b/trackscape-discord-api/ui/assets/index-4d8bb280.js
diff --git a/trackscape-discord-api/ui/assets/index-c22bc2ef.css b/trackscape-discord-api/ui/assets/index-c22bc2ef.css
diff --git a/trackscape-discord-api/ui/assets/index-dff543f3.js b/trackscape-discord-api/ui/assets/index-dff543f3.js
diff --git a/trackscape-discord-api/ui/index.html b/trackscape-discord-api/ui/index.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
-<html lang="en" data-theme="dracula">
+<html lang="en">
   <head>
     <meta charset="UTF-8">
     <link rel="icon" href="/favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>TrackScape</title>
-    <script type="module" crossorigin src="/assets/index-95baca75.js"></script>
-    <link rel="stylesheet" href="/assets/index-d145a158.css">
+    <script type="module" crossorigin src="/assets/index-dff543f3.js"></script>
+    <link rel="stylesheet" href="/assets/index-c22bc2ef.css">
   </head>
   <body>
     <div id="app"></div>

diff --git a/trackscape-discord-shared/src/database/guilds_db.rs b/trackscape-discord-shared/src/database/guilds_db.rs
@@ -3,17 +3,21 @@ use crate::helpers::hash_string;
 use crate::osrs_broadcast_extractor::osrs_broadcast_extractor::{
     BroadcastType, DiaryTier, QuestDifficulty,
 };
-use anyhow::Result;
+use anyhow::{Error, Result};
 use async_recursion::async_recursion;
+use futures::TryStreamExt;
 use mockall::predicate::*;
 use mongodb::bson::{doc, DateTime};
-use mongodb::{bson, Database};
+use mongodb::options::FindOptions;
+use mongodb::{bson, Cursor, Database};
 use rand::Rng;
 use serde::{Deserialize, Serialize};
 use std::string::ToString;
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct RegisteredGuildModel {
+    #[serde(rename = "_id")]
+    pub id: bson::oid::ObjectId,
     pub guild_id: u64,
     //Channel to send broadcast messages
     pub clan_name: Option<String>,
@@ -37,6 +41,7 @@ impl RegisteredGuildModel {
         let verification_code = Self::generate_code();
         let hashed_verification_code = hash_string(verification_code.clone());
         Self {
+            id: bson::oid::ObjectId::new(),
             guild_id,
             clan_name: None,
             broadcast_channel: None,
@@ -205,4 +210,18 @@ impl GuildsDb {
             .await
             .expect("Failed to delete document for the Discord guild.");
     }
+
+    pub async fn list_clans(&self) -> Result<Vec<RegisteredGuildModel>, anyhow::Error> {
+        let collection = self
+            .db
+            .collection::<RegisteredGuildModel>(RegisteredGuildModel::COLLECTION_NAME);
+        let opts = FindOptions::builder().sort(doc! { "clan_name": 1 }).build();
+        let filter = doc! {"clan_name": {"$ne": ""}};
+        let result = collection.find(filter, opts).await;
+
+        return match result {
+            Ok(cursor) => Ok(cursor.try_collect().await.unwrap()),
+            Err(e) => Err(anyhow::Error::new(e)),
+        };
+    }
 }
diff --git a/trackscape-discord-ui/index.html b/trackscape-discord-ui/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" data-theme="dracula">
+<html lang="en">
   <head>
     <meta charset="UTF-8">
     <link rel="icon" href="/favicon.ico">

diff --git a/trackscape-discord-ui/src/App.vue b/trackscape-discord-ui/src/App.vue
@@ -1,11 +1,29 @@
 <script setup lang="ts">
 import { RouterLink, RouterView } from 'vue-router'
-import HelloWorld from './components/HelloWorld.vue'
+
+import NavMenu from "@/components/nav-menu.vue";
 </script>
 
 <template>
+  <nav-menu/>
+  <main class="bg-base-200">
+    <RouterView />
+    <footer class="
+        footer
+        p-10
+        bg-neutral
+        text-neutral-content">
+      <div>
+        <div class="w-10 rounded-full">
+          <img class="rounded-full"
+               src="@/assets/img/Trackscape_Logo_icon.png"/>
+        </div>
+        <p>Trackscape.<br>OSRS tooling for clans!</p>
+      </div>
+
+    </footer>
+  </main>
 
-  <RouterView />
 </template>
 
 <style scoped>

diff --git a/trackscape-discord-ui/src/assets/img/trackscape_logo.png b/trackscape-discord-ui/src/assets/img/trackscape_logo.png
diff --git a/trackscape-discord-ui/src/components/HelloWorld.vue b/trackscape-discord-ui/src/components/HelloWorld.vue
diff --git a/trackscape-discord-ui/src/components/TheWelcome.vue b/trackscape-discord-ui/src/components/TheWelcome.vue
diff --git a/trackscape-discord-ui/src/components/WelcomeItem.vue b/trackscape-discord-ui/src/components/WelcomeItem.vue
diff --git a/trackscape-discord-ui/src/components/__tests__/HelloWorld.spec.ts b/trackscape-discord-ui/src/components/__tests__/HelloWorld.spec.ts