Merge branch 'main' of https://github.com/john-david3/cs3305-team11

nginx/nginx.conf

@@ -93,20 +93,27 @@ http {
             expires -1d;
         }
 
-        #! Unused right now so the following are inaccurate locations 
-        # The thumbnails location
-        location ~ ^/stream/(.+)/thumbnails/(.+\.jpg)$ {
-            alias /stream_data/$1/thumbnails/$2;
+        ## The thumbnails location
+        location ~ ^/stream/(.+)/thumbnails/(.+\.png)$ {
+             alias /stream_data/stream/$1/$2;
 
-            # The thumbnails should not be cacheable
+             # The thumbnails should not be cacheable
+             expires -1d;
+        }
+
+        ## The vods location
+        location ~ ^/stream/(.+)/vods/(.+\.mp4)$ {
+            alias /stream_data/vods/$1/$2;
+
+             # The vods should not be cacheable
             expires -1d;
         }
 
-        # The vods location
-        location ~ ^/stream/(.+)/vods/(.+\.mp4)$ {
-            alias /stream_data/$1/vods/$2;
+        ## Profile pictures location
+        location ~ ^/user/(.+)/profile_picture$ {
+            alias /stream_data/profile_pictures/$1.png;
 
-            # The vods should not be cacheable
+            # The profile pictures should not be cacheable
             expires -1d;
         }