Merge pull request #299 from COS301-SE-2023/dev

Dev
COS301-SE-2023 · Oct 26, 2023 · 590b124 · 590b124
2 parents ac44ac7 + 9d5fb14
commit 590b124
Show file tree

Hide file tree

Showing 888 changed files with 38,559 additions and 56 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,8 @@
 FROM nginx:1.14-alpine
 
 #copy static files
-COPY ./frontend/dist/domain-pulse /usr/share/nginx/html
+COPY ./frontend/dist/domain-pulse /usr/share/nginx/html/domain-pulse
+COPY ./frontend/info-page /usr/share/nginx/html/info-page
 
 #copy nginx conf files
 COPY ./nginx/nginx.conf /etc/nginx/nginx.conf

diff --git a/README.md b/README.md
@@ -194,10 +194,10 @@ Note that Domain Pulse is a web application and the preferred means of using the
 
 # **🚀How to Contribute**
 
-Thank you for your interest in Domain Pulse! Should you want to contribute to the project, please feel free to contact us at [email protected] at share your idea for the project. 
+Thank you for your interest in Domain Pulse! Should you want to contribute to the project, please feel free to contact us at [email protected] to share your idea for the project. 
 <br>
 <br>
-After contacting us, please feel free to clone the repo, create a branch off of 'dev' and implement your feature or bug fix. Please consult our <a href="https://github.com/COS301-SE-2023/Domain-Pulse-A-Sentiment-Analysis-Platform/blob/main/documentation/Technical%20Installation%20Manual/technical-installation-manual.pdf">️Technical Installation Manual<a> for instructios on how to get the app up and running. Once you have implemented your changes, you can create a pull request back to 'dev' which we will review. 
+After contacting us, please feel free to clone the repo, create a branch off of 'dev' and implement your feature or bug fix. Please consult our <a href="https://github.com/COS301-SE-2023/Domain-Pulse-A-Sentiment-Analysis-Platform/blob/main/documentation/Technical%20Installation%20Manual/technical-installation-manual.pdf">️Technical Installation Manual<a> for instructions on how to get the app up and running. Once you have implemented your changes, you can create a pull request back to 'dev' which we will review. 
 <br>
 <br>
 In order to be considered, your changes: 1) must be verified to be correct and non-malicious by a member of the Ctrl Alt Defeat Team, 2) pass all of the build and test checks, and 3) meet code coverage requirements in terms of both patch and project coverage. 

diff --git a/backend/sourceconnector/refresh/tests.py b/backend/sourceconnector/refresh/tests.py
@@ -402,7 +402,7 @@ def test_get_comments_by_video_id(self, mock_call_youtube_api):
                     "snippet": {
                         "topLevelComment": {
                             "snippet": {
-                                "textDisplay": "Comment 1",
+                                "textOriginal": "Comment 1",
                                 "updatedAt": "2023-07-23T10:00:00Z",
                             }
                         }
@@ -412,7 +412,7 @@ def test_get_comments_by_video_id(self, mock_call_youtube_api):
                     "snippet": {
                         "topLevelComment": {
                             "snippet": {
-                                "textDisplay": "Comment 2",
+                                "textOriginal": "Comment 2",
                                 "updatedAt": "2023-07-25T15:30:00Z",
                             }
                         }
@@ -587,7 +587,7 @@ def test_handle_youtube_request_integration(self, mocked_youtube):
                     "snippet": {
                         "topLevelComment": {
                             "snippet": {
-                                "textDisplay": "Comment 1",
+                                "textOriginal": "Comment 1",
                                 "updatedAt": "2023-07-23T10:00:00Z",
                             }
                         }
@@ -597,7 +597,7 @@ def test_handle_youtube_request_integration(self, mocked_youtube):
                     "snippet": {
                         "topLevelComment": {
                             "snippet": {
-                                "textDisplay": "Comment 2",
+                                "textOriginal": "Comment 2",
                                 "updatedAt": "2023-07-25T15:30:00Z",
                             }
                         }

diff --git a/backend/sourceconnector/youtube/youtube_connector.py b/backend/sourceconnector/youtube/youtube_connector.py
@@ -32,7 +32,7 @@ def get_comments_by_video_id(video_id: str, last_refresh_time):
     if "items" in data:
         for item in data["items"]:
             snippet = item["snippet"]["topLevelComment"]["snippet"]
-            original_text = snippet["textDisplay"]
+            original_text = snippet["textOriginal"]
             last_updated_time = snippet["updatedAt"]
             datetime_object = datetime.strptime(last_updated_time, "%Y-%m-%dT%H:%M:%SZ")
             last_updated_timestamp = datetime_object.timestamp()

diff --git a/documentation/ADD/ArchitecturalDesignDocument.pdf b/documentation/ADD/ArchitecturalDesignDocument.pdf
diff --git a/documentation/ADD/Demo4Architecture.jpg b/documentation/ADD/Demo4Architecture.jpg
diff --git a/frontend/angular.json b/frontend/angular.json
@@ -50,12 +50,12 @@
                 {
                   "type": "initial",
                   "maximumWarning": "500kb",
-                  "maximumError": "1mb"
+                  "maximumError": "3mb"
                 },
                 {
                   "type": "anyComponentStyle",
                   "maximumWarning": "2kb",
-                  "maximumError": "4kb"
+                  "maximumError": "25kb"
                 }
               ],
               "outputHashing": "all"