Merge pull request #5 from charliettaylor/charlie/admin-stuff

Update admin page, fix winner bug
charliettaylor · Oct 15, 2024 · 2b0d056 · 2b0d056
2 parents c4dd58c + f50c941
commit 2b0d056
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 21 deletions.
diff --git a/database.py b/database.py
@@ -162,6 +162,6 @@ def set_winner(self, pic_id: int):
         if pic is None:
             return None
 
-        pic.winner = ~pic.winner  # pyright: ignore [reportAttributeAccessIssue]
+        pic.winner = not pic.winner  # pyright: ignore [reportAttributeAccessIssue]
         self.db.commit()
         return pic
diff --git a/main.py b/main.py
@@ -4,7 +4,7 @@
 from typing import Annotated
 
 from fastapi import Cookie, FastAPI, Form, HTTPException, Request, Response
-from fastapi.responses import HTMLResponse
+from fastapi.responses import HTMLResponse, RedirectResponse
 from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
 from twilio.request_validator import RequestValidator
@@ -212,7 +212,7 @@ def set_winner(pic_id: int, password: Annotated[str | None, Cookie()] = None):
         raise HTTPException(status_code=401, detail="Unauthorized")
 
     if db.set_winner(pic_id) is not None:
-        return "Winner set"
+        return RedirectResponse(url="/admin", status_code=303)
 
     raise HTTPException(status_code=404, detail="Pic not found")
 

diff --git a/templates/admin.html b/templates/admin.html
@@ -4,29 +4,41 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="icon" href="/static/favicon.ico" type="image/x-icon">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@picocss/pico@2/css/pico.min.css">
     <title>Admin Portal</title>
 </head>
 
 <body>
-    <h1>Admin Shit</h1>
+    <header class="container">
+        <hgroup>
+            <h1>Admin Shit</h1>
+        </hgroup>
+    </header>
+    <main class="container">
+        <section>
+            <div class="grid">
+                <input type="text" id="prompt" placeholder="Send prompt" name="prompt" />
+                <button type="submit">Send</button>
+            </div>
+        </section>
+        <section>
+            <h2>Editor's Choice</h2>
+            <ul style="list-style-type: none;">
+                {% for prompt in prompts %}
+                <li>
+                    <a href="{{prompt.url}}">
+                        {{prompt.id}} - {{prompt.prompt}}
+                    </a>
+                </li>
+                {% endfor %}
+            </ul>
 
-    <ul>
-        <li>
-            Send prompt: <input type="text" id="prompt" name="prompt" /> <button>Send</button>
-        </li>
-        <li>Other stuff...</li>
-    </ul>
-
-    Select winners:
-    <ul>
-        {% for prompt in prompts %}
-        <li>
-            <a href="{{prompt.url}}">
-                {{prompt.id}} - {{prompt.prompt}}
-            </a>
-        </li>
-        {% endfor %}
-    </ul>
+        </section>
+    </main>
+    <footer class="container">
+        <small>Made by Charlie and Aaron</small>
+    </footer>
 </body>
 
 </html>