Loaded inventory to result page

Developer-Students-Clubs-MESCOE · Apr 9, 2021 · 99588e4 · 99588e4
1 parent e1d48b0
commit 99588e4
Show file tree

Hide file tree

Showing 26 changed files with 203 additions and 3,944 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,7 +1,3 @@
 {
-<<<<<<< Updated upstream
     "python.pythonPath": "d:\\Program Files\\Python 64 bit\\python.exe"
-=======
-    "python.pythonPath": "/home/khushi/myvirtualenv/env/bin/python3"
->>>>>>> Stashed changes
 }
diff --git a/Google_Solutions/__pycache__/settings.cpython-39.pyc b/Google_Solutions/__pycache__/settings.cpython-39.pyc
diff --git a/Google_Solutions/settings.py b/Google_Solutions/settings.py
@@ -123,7 +123,7 @@
 STATIC_URL = '/static/'
 STATICFILES_DIRS = [
     BASE_DIR / "static",
-    '/Google_Solutions/static/',
+    '/static/',
 ]
 
 LOGIN_REDIRECT_URL = '/result'
diff --git a/Homepage/static/images/food_wastage.png b/Homepage/static/images/food_wastage.png
diff --git a/Homepage/static/images/logo.png b/Homepage/static/images/logo.png
diff --git a/Homepage/static/images/restaurant-1.png b/Homepage/static/images/restaurant-1.png
diff --git a/Homepage/static/images/restaurant-2.png b/Homepage/static/images/restaurant-2.png
diff --git a/Homepage/static/images/restaurant-3.png b/Homepage/static/images/restaurant-3.png