Move static and uploads to public dir

15 files changed, 6 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
index 011cb94..b37ffcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ main.css
 tmp
 log.txt
 *.rdb
+uploads
 
 # Created by https://www.gitignore.io/api/linux,macos,python,windows
 
diff --git a/app/static/jquery.min.js b/app/public/static/jquery.min.js
index 98ef5cc..98ef5cc 100644
--- a/app/static/jquery.min.js
+++ b/app/public/static/jquery.min.js
diff --git a/app/static/jumbotron.png b/app/public/static/jumbotron.png
index 5df9f9a..5df9f9a 100644
--- a/app/static/jumbotron.png
+++ b/app/public/static/jumbotron.png
diff --git a/app/static/logo.svg b/app/public/static/logo.svg
index 73f185e..73f185e 100644
--- a/app/static/logo.svg
+++ b/app/public/static/logo.svg
diff --git a/app/static/logo_dark.svg b/app/public/static/logo_dark.svg
index 12f1915..12f1915 100644
--- a/app/static/logo_dark.svg
+++ b/app/public/static/logo_dark.svg
diff --git a/app/static/notification.svg b/app/public/static/notification.svg
index edd648e..edd648e 100644
--- a/app/static/notification.svg
+++ b/app/public/static/notification.svg
diff --git a/app/static/notification_alert.svg b/app/public/static/notification_alert.svg
index f2c3bb5..f2c3bb5 100644
--- a/app/static/notification_alert.svg
+++ b/app/public/static/notification_alert.svg
diff --git a/app/static/package_create.js b/app/public/static/package_create.js
index 2b992f5..2b992f5 100644
--- a/app/static/package_create.js
+++ b/app/public/static/package_create.js
diff --git a/app/static/placeholder.png b/app/public/static/placeholder.png
index a5729f8..a5729f8 100644
--- a/app/static/placeholder.png
+++ b/app/public/static/placeholder.png
diff --git a/app/static/polltask.js b/app/public/static/polltask.js
index f6b528d..f6b528d 100644
--- a/app/static/polltask.js
+++ b/app/public/static/polltask.js
diff --git a/app/static/url.min.js b/app/public/static/url.min.js
index 478d1fc..478d1fc 100644
--- a/app/static/url.min.js
+++ b/app/public/static/url.min.js
diff --git a/app/tasks/importtasks.py b/app/tasks/importtasks.py
index 61b60d9..ced48a9 100644
--- a/app/tasks/importtasks.py
+++ b/app/tasks/importtasks.py
@@ -247,7 +247,7 @@ def importRepoScreenshot(id):
 
 	try:
 		filename = randomString(10) + ".png"
-		imagePath = os.path.join(app.config["UPLOAD_FOLDER"], filename)
+		imagePath = os.path.join("public/uploads", filename)
 		print(imagePath)
 		urllib.request.urlretrieve(urlmaker.getScreenshotURL(), imagePath)
 
diff --git a/app/utils.py b/app/utils.py
index 3293c5a..6be889e 100644
--- a/app/utils.py
+++ b/app/utils.py
@@ -47,7 +47,7 @@ def doFileUpload(file, allowedExtensions, fileTypeName):
 		return None
 
 	filename = randomString(10) + "." + ext
-	file.save(os.path.join(app.config["UPLOAD_FOLDER"], filename))
+	file.save(os.path.join("public/uploads", filename))
 	return "/uploads/" + filename
 
 
diff --git a/app/views/__init__.py b/app/views/__init__.py
index 38ebdfd..924dc67 100644
--- a/app/views/__init__.py
+++ b/app/views/__init__.py
@@ -34,12 +34,11 @@ def domain(url):
 # Use nginx to serve files on production instead
 @app.route("/static/<path:path>")
 def send_static(path):
-	return send_from_directory("static", path)
+	return send_from_directory("public/static", path)
 
 @app.route("/uploads/<path:path>")
 def send_upload(path):
-	import os
-	return send_from_directory(os.path.abspath(app.config["UPLOAD_FOLDER"]), path)
+	return send_from_directory("public/uploads", path)
 
 @app.route("/")
 @menu.register_menu(app, ".", "Home")
diff --git a/config.example.cfg b/config.example.cfg
index 53313c6..41d685c 100644
--- a/config.example.cfg
+++ b/config.example.cfg
@@ -13,11 +13,9 @@ GITHUB_CLIENT_SECRET = ""
 CELERY_BROKER_URL='redis://localhost:6379'
 CELERY_RESULT_BACKEND='redis://localhost:6379'
 
-UPLOAD_FOLDER="tmp"
-
 USER_ENABLE_REGISTER = False
 USER_ENABLE_CHANGE_USERNAME = False
-s
+
 MAIL_USERNAME=""
 MAIL_PASSWORD=""
 MAIL_DEFAULT_SENDER=""