Merge pull request #3 from gavinmorrisseau/Flask

Add Flask
gavinmorrisseau · Dec 11, 2023 · b9718d1 · b9718d1
2 parents 1882375 + 66846a4
commit b9718d1
Show file tree

Hide file tree

Showing 148 changed files with 31,949 additions and 75 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
 .cache
 playground.py
-.gitignore
 .DS_Store
diff --git a/FlaskApp/app.py b/FlaskApp/app.py
@@ -0,0 +1,15 @@
+from flask import Flask, render_template, request
+
+app = Flask(__name__)
+
+@app.route("/")
+def index():
+    return render_template("index.html")
+@app.route("/result", methods=["POST", "GET"])
+def result():
+    output = request.form.to_dict()
+    question = output["question"]
+    return render_template("index.html", question=question)
+
+if __name__ == "__main__":
+    app.run(debug=True, port=5001)
diff --git a/src/gpt.py → FlaskApp/src/gpt.py b/src/gpt.py → FlaskApp/src/gpt.py
diff --git a/src/gpt_for_web.py → FlaskApp/src/gpt_for_web.py b/src/gpt_for_web.py → FlaskApp/src/gpt_for_web.py
@@ -21,7 +21,7 @@ def wait_on_run(run, thread):
 )
 
 thread = client.beta.threads.create()
-PROMPT = input("[*]: ")
+PROMPT = input("[*]: ").lower().strip() or "Give me a list of 5 random great songs"
 ASSISTANT_ID = "asst_Z8EJORrugfSAMUgxKXWNAaXw"
 
 message = client.beta.threads.messages.create(

diff --git a/src/main.py → FlaskApp/src/spotifyAPI.py b/src/main.py → FlaskApp/src/spotifyAPI.py
diff --git a/assets/images/GrayscaleTransparent.png → ...ic/assets/images/GrayscaleTransparent.png b/assets/images/GrayscaleTransparent.png → ...ic/assets/images/GrayscaleTransparent.png
diff --git a/assets/images/OriginalLogo.png → ...App/static/assets/images/OriginalLogo.png b/assets/images/OriginalLogo.png → ...App/static/assets/images/OriginalLogo.png
diff --git a/assets/images/OriginalLogoSymbol.png → ...atic/assets/images/OriginalLogoSymbol.png b/assets/images/OriginalLogoSymbol.png → ...atic/assets/images/OriginalLogoSymbol.png
diff --git a/assets/images/OriginalLogoSymbolSquare.png → ...ssets/images/OriginalLogoSymbolSquare.png b/assets/images/OriginalLogoSymbolSquare.png → ...ssets/images/OriginalLogoSymbolSquare.png
diff --git a/assets/images/OriginalLogoSymbolSquare.svg → ...ssets/images/OriginalLogoSymbolSquare.svg b/assets/images/OriginalLogoSymbolSquare.svg → ...ssets/images/OriginalLogoSymbolSquare.svg
diff --git a/assets/images/OriginalLogoTransparent.png → ...assets/images/OriginalLogoTransparent.png b/assets/images/OriginalLogoTransparent.png → ...assets/images/OriginalLogoTransparent.png
diff --git a/assets/images/TransparentLogo.png → .../static/assets/images/TransparentLogo.png b/assets/images/TransparentLogo.png → .../static/assets/images/TransparentLogo.png
diff --git a/assets/images/favicon.png → FlaskApp/static/assets/images/favicon.png b/assets/images/favicon.png → FlaskApp/static/assets/images/favicon.png
diff --git a/assets/images/favicon.svg → FlaskApp/static/assets/images/favicon.svg b/assets/images/favicon.svg → FlaskApp/static/assets/images/favicon.svg
diff --git a/FlaskApp/static/js/index.js b/FlaskApp/static/js/index.js
diff --git a/index.css → FlaskApp/static/styles/index.css b/index.css → FlaskApp/static/styles/index.css
@@ -22,12 +22,13 @@ html, body {
 body {
     font-size: 16px;
     font-family: Arial, sans-serif;
+    background-color: #FAF9F6;
 }
 
 /* Add styles for the header */
 header {
-    background-color: #333;
-    color: #fff;
+    background-color: #555555;
+    color: #FAF9F6;
     padding: 20px;
 }
 
@@ -51,70 +52,65 @@ form {
     margin-bottom: 20px;
 }
 
-textarea {
-    width: 100%;
-    padding: 10px;
-    border: 1px solid #ccc;
-    border-radius: 4px;
-}
-
 #header * {
-    background-color: #fff;
+    background-color: #FAF9F6;
     color: #141214;
     text-align: center;
 }
 
 #headertext {
     font-size: 2.5rem;
     font-weight: 800;
-    margin-top: 16rem;
+    margin-top: 8rem;
     color: #555555;
 }
 
+#headerlogo {
+    position: relative;
+    display: inline;
+    margin-left: auto;
+    margin-right: auto;
+    width: 6rem;
+    height: 6rem;
+    top: 1.6rem;
+}
+
 #subtext {
     position: relative;
     font-size: 1rem;
     font-weight: 400;
-    margin-bottom: 4rem;
+    margin-bottom: 6rem;
     color: #555555;
 }
 
-.chat * {
+.chatbox * {
     text-align: center;
 }
 
 input {
-    width: 20%;
-    height: 1.7rem;
+    width: 27%;
+    height: 2.05rem;
     text-align: left;
+    border-radius: 4px;
+    background-color: #555555;
+    color:#FAF9F6
 }
 
 input::placeholder {
-    text-align: center;    
-
+    text-align: center;
+    background-color: #555555;
+    color: #FAF9F6;
 }
 
 .button {
     padding: 10px 20px;
     text-align: left;
-    color: #fff;
-    background-color: #515151;
-    border: none;
-    border-radius: 4px;
+    color: #FAF9F6;
+    background-color: #555555;
 }
 
 .button:hover {
     background-color:#000;
     color: #fff
 }
 
-#headerlogo {
-    position: relative;
-    display: inline;
-    margin-left: auto;
-    margin-right: auto;
-    width: 6rem;
-    height: 6rem;
-    top: 1.6rem;
-}
-
diff --git a/FlaskApp/templates/index.html b/FlaskApp/templates/index.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+     <!-- Favicon -->
+    <link rel="icon" type="image/svg+xml" href="../static/assets/images/favicon.svg">
+    <link rel="icon" type="image/png" href="../static/assets/images/favicon.png">
+    <!-- Theming -->
+    <meta name="theme-color" content="#FAF9F6">
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <!-- Title and Stylesheet -->
+    <title>aijukebox.net</title>
+    <link rel="stylesheet" href="/static/styles/index.css" />
+</head>
+<body>
+    <div class="noselect" id="header">
+        <h1 id="headertext">hey, boss<img id="headerlogo" src="../static/assets/images/OriginalLogoTransparent.png" alt="logo"></h1>
+        <p id="subtext">what's the mood today?</p>
+    </div>
+    <div class="chatbox">
+        <div class="chatbox__input">
+            <form action="/result" method="POST">
+                <input type="text" name="question" id="question" placeholder="type a message ...">
+                <button class="button">send</button>
+            </form>
+            {% if question%}
+            <p>{{question}}</p>   
+            {% endif %} 
+        </div>
+    </div>
+    <script src="static/js/index.js"></script>
+</body>
+</html>
diff --git a/__pycache__/app.cpython-310.pyc b/__pycache__/app.cpython-310.pyc
diff --git a/index.html b/index.html
diff --git a/index.js b/index.js
diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json