trying media files to serve from server itself

DaemonLab · Dec 28, 2023 · 27f4468 · 27f4468
1 parent b8d64e9
commit 27f4468
Show file tree

Hide file tree

Showing 45 changed files with 10 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@ db.sqlite3
 db1.sqlite3
 __pycache__
 migrations
-venv
+venv
+media
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3
+FROM python:3.10
 
 ENV PYTHONUNBUFFERED 1
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,6 +7,7 @@ services:
       - 8000:8000
     volumes:
       - ./db/db.sqlite3:/app/db.sqlite3
+      # - ./media:/app/
     env_file:
       - ./.env
 
@@ -16,5 +17,6 @@ services:
       - 80:80
     volumes:
       - ./db/db.sqlite3:/app/db.sqlite3
+      # - ./media:/app/
     depends_on:
       - web
diff --git a/home/views.py b/home/views.py
@@ -298,7 +298,7 @@ def addLongRebateBill(request):
                     text = "Allocation ID for the entered email does not exist"
                     print(e)
         except:
-            text = "Email ID does not exist in the database. Please eneter the correct email ID"
+            text = "Email ID does not exist in the database. Please login using the correct email ID"
         request.session["text"] = text
         return redirect(request.path)
     text = request.session.get("text", "")

diff --git a/media/documents/PhD_and_PG_Admission_International_Students_Flyer_23-24.pdf b/media/documents/PhD_and_PG_Admission_International_Students_Flyer_23-24.pdf
diff --git a/media/documents/PhD_and_PG_Admission_International_Students_Flyer_23-24_FAIxF0s.pdf b/media/documents/PhD_and_PG_Admission_International_Students_Flyer_23-24_FAIxF0s.pdf
diff --git a/media/documents/PhD_and_PG_Admission_International_Students_Flyer_23-24_WrRvMXb.pdf b/media/documents/PhD_and_PG_Admission_International_Students_Flyer_23-24_WrRvMXb.pdf
diff --git a/media/documents/PhD_and_PG_Admission_International_Students_Flyer_23-24_hPxi58p.pdf b/media/documents/PhD_and_PG_Admission_International_Students_Flyer_23-24_hPxi58p.pdf
diff --git a/media/documents/PhD_and_PG_Admission_International_Students_Flyer_23-24_kvr4z71.pdf b/media/documents/PhD_and_PG_Admission_International_Students_Flyer_23-24_kvr4z71.pdf
diff --git a/media/static/images/Aladdin.JPG b/media/static/images/Aladdin.JPG
diff --git a/media/static/images/Amul.JPG b/media/static/images/Amul.JPG
diff --git a/media/static/images/Amul_Parlor.JPG b/media/static/images/Amul_Parlor.JPG
diff --git a/media/static/images/Asoosiate_Dining_Warden.jpg b/media/static/images/Asoosiate_Dining_Warden.jpg
diff --git a/media/static/images/Asoosiate_Dining_Warden_EVk7P9W.jpg b/media/static/images/Asoosiate_Dining_Warden_EVk7P9W.jpg
diff --git a/media/static/images/Bakelogy.JPG b/media/static/images/Bakelogy.JPG
diff --git a/media/static/images/Bakeology.jpg b/media/static/images/Bakeology.jpg
diff --git a/media/static/images/Committee_Member_1.png b/media/static/images/Committee_Member_1.png
diff --git a/media/static/images/Committee_Member_2.png.jpg b/media/static/images/Committee_Member_2.png.jpg
diff --git a/media/static/images/Cutting_edge.jpg b/media/static/images/Cutting_edge.jpg
diff --git a/media/static/images/DSC09907.JPG b/media/static/images/DSC09907.JPG
diff --git a/media/static/images/DSC09907_54bsHKG.JPG b/media/static/images/DSC09907_54bsHKG.JPG
diff --git a/media/static/images/DSC09908.JPG b/media/static/images/DSC09908.JPG
diff --git a/media/static/images/DSC09908_2kixziT.JPG b/media/static/images/DSC09908_2kixziT.JPG
diff --git a/media/static/images/DSC09909.JPG b/media/static/images/DSC09909.JPG
diff --git a/media/static/images/DSC09909_YWcU03b.JPG b/media/static/images/DSC09909_YWcU03b.JPG
diff --git a/media/static/images/DSC09910_Ps4lp9e.JPG b/media/static/images/DSC09910_Ps4lp9e.JPG
diff --git a/media/static/images/DSC09910_Ps4lp9e_gh94aA9.JPG b/media/static/images/DSC09910_Ps4lp9e_gh94aA9.JPG
diff --git a/media/static/images/DSC09911_F8UqzUJ.JPG b/media/static/images/DSC09911_F8UqzUJ.JPG
diff --git a/media/static/images/DSC09913_SJSrIuf.JPG b/media/static/images/DSC09913_SJSrIuf.JPG
diff --git a/media/static/images/Electronic_Shop.JPG b/media/static/images/Electronic_Shop.JPG
diff --git a/media/static/images/IITI3.png b/media/static/images/IITI3.png
diff --git a/media/static/images/IMG-7560.jpg b/media/static/images/IMG-7560.jpg
diff --git a/media/static/images/Laundry.jpg b/media/static/images/Laundry.jpg
diff --git a/media/static/images/Ms_Laundary.JPG b/media/static/images/Ms_Laundary.JPG
diff --git a/media/static/images/Pic_Lfresco1.jpg b/media/static/images/Pic_Lfresco1.jpg
diff --git a/media/static/images/dining_Warden.jpg b/media/static/images/dining_Warden.jpg
diff --git a/media/static/images/lalit.png b/media/static/images/lalit.png
diff --git a/media/static/images/lalit_1tIEzDx.png b/media/static/images/lalit_1tIEzDx.png
diff --git a/media/static/images/lalit_5sfWUPA.png b/media/static/images/lalit_5sfWUPA.png
diff --git a/media/static/images/lalit_n2OgA71.png b/media/static/images/lalit_n2OgA71.png
diff --git a/media/static/images/lalit_oPgQj2W.png b/media/static/images/lalit_oPgQj2W.png
diff --git a/media/static/images/mess_cover.jpg b/media/static/images/mess_cover.jpg
diff --git a/media/static/images/teapost.jpg b/media/static/images/teapost.jpg
diff --git a/messWebsite/settings.py b/messWebsite/settings.py
@@ -193,9 +193,9 @@
 
 DEFAULT_FILE_STORAGE = 'cloudinary_storage.storage.RawMediaCloudinaryStorage'
 DEFAULT_FILE_STORAGE = 'cloudinary_storage.storage.MediaCloudinaryStorage'
+# MEDIA_ROOT = os.path.join(BASE_DIR, 'media/')
 MEDIA_URL= '/media/'
 
-
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field
 

diff --git a/nginx/default.conf b/nginx/default.conf
@@ -10,9 +10,7 @@ server{
     location /{
         proxy_pass http://django;
     }
-    location /media {
-        autoindex on;
-        alias /home/myusername/myproject/media/;
-    }
-
+    # location /media/ {
+    #     alias /app/media/;
+    # }
 }