Merge 1/17

ResilientApp · Jan 18, 2024 · b63a448 · b63a448
2 parents 091bc88 + 74f9d1b
commit b63a448
Show file tree

Hide file tree

Showing 59 changed files with 562 additions and 1,046 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,4 @@ package-lock.json
 backend/__pycache__
 backend/ResilientDB_GraphQL
 backend/resilientdb
+frontend/package.json
diff --git a/backend/__pycache__/resdb.cpython-39.pyc b/backend/__pycache__/resdb.cpython-39.pyc
diff --git a/backend/main.py b/backend/main.py
@@ -2,7 +2,7 @@
 import shutil
 import os
 from controller import getUserLogin, setUserLogin, getUserList, getUserResume, setUserResume, getUserInfoCategory, setUserInfoCategory, getUserInfoAll
-from flask import Flask, request, jsonify
+from flask import Flask, request, jsonify, url_for
 from flask_jwt_extended import create_access_token, create_refresh_token, get_jwt_identity, jwt_required, JWTManager
 from flask_cors import CORS
 from datetime import timedelta
@@ -18,7 +18,7 @@
 
 
 # Setup the image upload folder
-app.config['UPLOAD_FOLDER'] = "../frontend/public/images/pictures"
+app.config['UPLOAD_FOLDER'] = "./images"
 
 CORS(app, supports_credentials=True)
 
@@ -170,13 +170,12 @@ def upload():
         return jsonify(message = "No selected file", status=400)
 
     if file and allowed_file(file.filename):
-        filename = current_user_email + ".png"
-        file_path = os.path.join(app.config['UPLOAD_FOLDER'], filename)
-        print(file_path)
-        file.save(file_path)
+        file_path = os.path.join(app.config['UPLOAD_FOLDER'], current_user_email + ".png")
+        file.save(os.path.join('./static/', file_path))
+        image_url = url_for('static', filename=file_path, _external=True)
         return jsonify(message="Upload successful", status=200, path=file_path)
     return jsonify(message="File type not allowed", status=400)
 
 if __name__ == '__main__':
-    app.run(debug=True, port = 3033)
+    app.run(debug=True, port = 3033, host="0.0.0.0")
 
diff --git a/backend/static/images/[email protected] b/backend/static/images/[email protected]
diff --git a/backend/static/images/[email protected] b/backend/static/images/[email protected]
diff --git a/frontend/dist/404.html b/frontend/dist/404.html
@@ -2,16 +2,16 @@
 <html lang="en">
     <head>
         <meta charset="UTF-8" />
-        <link rel="icon" type="image/svg+xml" href="/vue-resume-template/images/icons/resume.ico" />
+        <link rel="icon" type="image/svg+xml" href="/images/icons/resume.ico" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <title>Res-A-Me</title>
 
         <!-- Fonts -->
         <link href="https://fonts.googleapis.com/css?family=Saira:400,700" rel="stylesheet" type="text/css">
         <link href="https://fonts.googleapis.com/css?family=Archivo:400,700" rel="stylesheet" type="text/css">
         <link href="https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic" rel="stylesheet" type="text/css">
-      <script type="module" crossorigin src="/vue-resume-template/assets/index-946b4de9.js"></script>
-      <link rel="stylesheet" href="/vue-resume-template/assets/index-8e0463d9.css">
+      <script type="module" crossorigin src="/assets/index-88509652.js"></script>
+      <link rel="stylesheet" href="/assets/index-e1eb6d69.css">
     </head>
     <body class="no-scroll" style="background-color: white">
         <div id="app"></div>

diff --git a/frontend/dist/assets/fa-brands-400-003f1154.ttf b/frontend/dist/assets/fa-brands-400-003f1154.ttf
diff --git a/frontend/dist/assets/fa-brands-400-3a8924cd.woff2 b/frontend/dist/assets/fa-brands-400-3a8924cd.woff2
diff --git a/frontend/dist/assets/fa-brands-400-5656d596.ttf b/frontend/dist/assets/fa-brands-400-5656d596.ttf
diff --git a/frontend/dist/assets/fa-brands-400-faae6fc0.woff2 b/frontend/dist/assets/fa-brands-400-faae6fc0.woff2
diff --git a/frontend/dist/assets/fa-regular-400-2bccecf0.woff2 b/frontend/dist/assets/fa-regular-400-2bccecf0.woff2
diff --git a/frontend/dist/assets/fa-regular-400-5d02dc9b.ttf b/frontend/dist/assets/fa-regular-400-5d02dc9b.ttf
diff --git a/frontend/dist/assets/fa-regular-400-7d81a1a7.ttf b/frontend/dist/assets/fa-regular-400-7d81a1a7.ttf
diff --git a/frontend/dist/assets/fa-regular-400-9169d8be.woff2 b/frontend/dist/assets/fa-regular-400-9169d8be.woff2
diff --git a/frontend/dist/assets/fa-solid-900-886c8611.woff2 b/frontend/dist/assets/fa-solid-900-886c8611.woff2
diff --git a/frontend/dist/assets/fa-solid-900-9fc85f3a.woff2 b/frontend/dist/assets/fa-solid-900-9fc85f3a.woff2
diff --git a/frontend/dist/assets/fa-solid-900-cea79b34.ttf b/frontend/dist/assets/fa-solid-900-cea79b34.ttf
diff --git a/frontend/dist/assets/fa-solid-900-fbbf06d7.ttf b/frontend/dist/assets/fa-solid-900-fbbf06d7.ttf
diff --git a/frontend/dist/assets/index-88509652.js b/frontend/dist/assets/index-88509652.js
diff --git a/frontend/dist/assets/index-8e0463d9.css b/frontend/dist/assets/index-8e0463d9.css
diff --git a/frontend/dist/assets/index-946b4de9.js b/frontend/dist/assets/index-946b4de9.js
diff --git a/frontend/dist/assets/index-e1eb6d69.css b/frontend/dist/assets/index-e1eb6d69.css
diff --git a/frontend/dist/assets/materialdesignicons-webfont-28c8f97f.woff b/frontend/dist/assets/materialdesignicons-webfont-28c8f97f.woff
diff --git a/frontend/dist/assets/materialdesignicons-webfont-31010194.woff2 b/frontend/dist/assets/materialdesignicons-webfont-31010194.woff2
diff --git a/frontend/dist/assets/materialdesignicons-webfont-5159a347.eot b/frontend/dist/assets/materialdesignicons-webfont-5159a347.eot
diff --git a/frontend/dist/assets/materialdesignicons-webfont-be825c12.ttf b/frontend/dist/assets/materialdesignicons-webfont-be825c12.ttf
diff --git a/frontend/dist/data/info/profile.json b/frontend/dist/data/info/profile.json
@@ -1,84 +1,59 @@
 {
-    "name": "Jonas Einstein",
-    "profilePictureUrl": "images/pictures/avatar.png",
-
-    "locales": {
-        "en": {
-            "credits": "Designed by <strong><a class='light' href='https://github.com/ryanbalieiro'>Ryan Balieiro</a></strong>",
-            "role": "UX Designer"
-        },
-
-        "es": {
-            "credits": "Hecho por <strong><a class='light' href='https://github.com/ryanbalieiro'>Ryan Balieiro</a></strong>",
-            "role": "Designer de UX"
-        },
-
-        "fr": {
-            "credits": "Conçu par <strong><a class='light' href='https://github.com/ryanbalieiro'>Ryan Balieiro</a></strong>",
-            "role": "Designer UX"
-        },
-
-        "zh": {
-            "credits": "设计：<strong><a class='light' href='https://github.com/ryanbalieiro'>Ryan Balieiro</a></strong>",
-            "role": "用户体验设计师"
-        }
-    },
-
     "contact": {
         "address": {
-            "id": "address",
-            "value": "123 Main Street, Cupertino, CA 01234",
-            "valueShort": "Cupertino, CA 01234",
             "faIcon": "fa-solid fa-city",
-            "href": null
+            "href": "",
+            "id": "address",
+            "value": "your address",
+            "valueShort": "Cupertino, CA 01234"
         },
-
         "email": {
-            "id": "email",
-            "value": "[email protected]",
-            "valueShort": "[email protected]",
             "faIcon": "fa-solid fa-envelope",
-            "href": "mailto:[email protected]"
+            "href": "mailto:[email protected]",
+            "id": "email",
+            "valueShort": "[email protected]"
         },
-
         "facebook": {
+            "faIcon": "fa-brands fa-facebook",
+            "href": "https://facebook.com",
             "id": "facebook",
             "value": "Jonas Einstein",
-            "valueShort": "J. Einstein",
-            "faIcon": "fa-brands fa-facebook",
-            "href": "https://facebook.com"
+            "valueShort": "J. Einstein"
         },
-
         "github": {
+            "faIcon": "fa-brands fa-github",
+            "href": "https://github.com",
             "id": "github",
             "value": "@jonas.einstein.official",
-            "valueShort": "@jonas.einstein.official",
-            "faIcon": "fa-brands fa-github",
-            "href": "https://github.com"
+            "valueShort": "@jonas.einstein.official"
         },
-
         "instagram": {
+            "faIcon": "fa-brands fa-instagram",
+            "href": "https://instagram.com",
             "id": "instagram",
             "value": "@jonas.einstein.official",
-            "valueShort": "@jonas.einstein.official",
-            "faIcon": "fa-brands fa-instagram",
-            "href": "https://instagram.com"
+            "valueShort": "@jonas.einstein.official"
         },
-
         "linkedin": {
+            "faIcon": "fa-brands fa-linkedin",
+            "href": "https://linkedin.com",
             "id": "linkedin",
             "value": "@jonas.einstein.official",
-            "valueShort": "@jonas.einstein.official",
-            "faIcon": "fa-brands fa-linkedin",
-            "href": "https://linkedin.com"
+            "valueShort": "@jonas.einstein.official"
         },
-
         "phone": {
-            "id": "phone",
-            "value": "+1 (123) 456-7890",
-            "valueShort": "(123) 456-7890",
             "faIcon": "fa-solid fa-phone",
-            "href": "tel:1234567890"
+            "href": "tel:1234567890",
+            "id": "phone",
+            "value": "+1 (123) 456-7890"
         }
-    }
+    },
+    "locales": {
+        "en": {
+            "credits": "Designed by <strong><a class='light' href='https://github.com/ryanbalieiro'>Ryan Balieiro</a></strong>",
+            "role": "SWE"
+        }
+    },
+    "name": "Toby",
+    "profilePictureUrl": "images/pictures/avatar.png"
 }