cleaned up stripping logic, added favicon

engineerjoe440 · Sep 1, 2024 · 0395bdd · 0395bdd
1 parent 54e2372
commit 0395bdd
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 21 deletions.
diff --git a/backend/wordwall/api/words.py b/backend/wordwall/api/words.py
@@ -73,15 +73,17 @@ async def get_words_for_wall(
         if player_id:
             extra_filters["player_id"] = player_id
         word_records = await WordResponse.filter(
-            WordResponse.gt('word', ""), # Ensure Not Empty
-            wall_hash=wall.hash
+            wall_hash=wall.hash,
             **extra_filters
         )
         if player_id:
             # Loading for a Player Page
             return word_records
         words = {}
         for record in word_records:
+            if not record.word:
+                # Null/Empty -- Skip
+                continue
             cleaned_word = record.word.strip()
             if cleaned_word not in words:
                 words[cleaned_word] = 1 # Record Word

diff --git a/frontend/public/favicon.ico b/frontend/public/favicon.ico
diff --git a/frontend/public/file-word-box-outline.svg b/frontend/public/file-word-box-outline.svg
diff --git a/frontend/public/file-word-box.svg b/frontend/public/file-word-box.svg
diff --git a/frontend/public/index.html b/frontend/public/index.html
@@ -2,14 +2,14 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <link rel="icon" href="%PUBLIC_URL%/file-word-box-outline.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
       content="Simple, Self-Hosted, Collaborative Word Cloud Generator."
     />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <link rel="apple-touch-icon" href="%PUBLIC_URL%/file-word-box.svg" />
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
     <title>WordWall</title>
   </head>

diff --git a/frontend/public/logo192.png b/frontend/public/logo192.png
diff --git a/frontend/public/logo512.png b/frontend/public/logo512.png
diff --git a/frontend/src/FloatingCloud.js b/frontend/src/FloatingCloud.js
@@ -15,28 +15,29 @@ export default function FloatingCloud({wall_id = "test", onClick=() => {}}) {
   const [words, setWords] = React.useState([]);
 
   React.useEffect(()=>{
+    // Define API Getter
+    const getWords = () => {
+      // Call the API
+      fetch(`/api/v1/words/${wall_id}`)
+    .then(response => {
+        if (!response.ok) {
+            throw new Error("HTTP error " + response.status);
+        }
+        return response.json();
+    })
+    .then(json => {
+        setWords(json);
+    })
+    .catch(function () {
+        console.error(`Failed to load words for ${wall_id}`)
+    })
+    }
     // Load Requisites when page Completes
     getWords();
     setInterval(getWords, 1000);
-  },[]);
+  },[wall_id]);
 
 
-  const getWords = () => {
-    // Call the API
-    fetch(`/api/v1/words/${wall_id}`)
-   .then(response => {
-       if (!response.ok) {
-           throw new Error("HTTP error " + response.status);
-       }
-       return response.json();
-   })
-   .then(json => {
-       setWords(json);
-   })
-   .catch(function () {
-       console.error(`Failed to load words for ${wall_id}`)
-   })
-  }
 
   return (
     <>