Merge remote-tracking branch 'origin/main'

hoangsonww · Feb 27, 2024 · 843f632 · 843f632
2 parents 380b156 + bc5cbf8
commit 843f632
Show file tree

Hide file tree

Showing 132 changed files with 4,886 additions and 1,357 deletions.
diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
diff --git a/.idea/dataSources/791709d9-b4c0-4b2f-87d0-642aa59a89d3.xml b/.idea/dataSources/791709d9-b4c0-4b2f-87d0-642aa59a89d3.xml
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Son Nguyen
+Copyright (c) 2023 Son Nguyen Hoang
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/MovieVerse-Frontend/App.vue b/MovieVerse-Frontend/App.vue
diff --git a/MovieVerse-Frontend/html/trivia.html b/MovieVerse-Frontend/html/trivia.html
@@ -73,7 +73,7 @@
             }
 
             #form {
-                margin-top: 20px;
+                margin-top: 0;
             }
         }
     </style>

diff --git a/MovieVerse-Mobile/config.xml b/MovieVerse-Mobile/config.xml
@@ -13,7 +13,7 @@
         <!-- Android icon -->
         <icon src="www/icons/AndroidIcon.png" density="xxxhdpi"/>
     </platform>
-    <content src="index.html" />
+    <content src="launch-screen.html" />
     <allow-intent href="http://*/*" />
     <allow-intent href="https://*/*" />
 </widget>
diff --git a/MovieVerse-Mobile/platforms/android/app/src/main/assets/www/404.html b/MovieVerse-Mobile/platforms/android/app/src/main/assets/www/404.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -198,6 +199,7 @@
         document.addEventListener('DOMContentLoaded', rotateUserStats);
     </script>
 </head>
+
 <body class="movie-details-body">
     <header>
         <a href="index.html" style="text-decoration: none; color: inherit; cursor: pointer">

diff --git a/MovieVerse-Frontend/404.html → ...n/assets/www/MovieVerse-Frontend/404.html b/MovieVerse-Frontend/404.html → ...n/assets/www/MovieVerse-Frontend/404.html
diff --git a/...-Mobile/platforms/android/app/src/main/assets/www/MovieVerse-Frontend/README.md b/...-Mobile/platforms/android/app/src/main/assets/www/MovieVerse-Frontend/README.md
@@ -24,6 +24,7 @@ The HTML directory includes all the markup files necessary for the structure of
 - `actor-details.html`: A detailed view of actor profiles.
 - `company-details.html`: Provides information about movie production companies.
 - `create-account.html`: Allows users to create an account on MovieVerse.
+- `chatbot.html`: A chatbot feature for interacting with users.
 - `director-details.html`: Detailed information about movie directors.
 - `discussions.html`: A platform for users to discuss various movie-related topics.
 - `favorites.html`: Allows users to view and manage their favorite movies.
@@ -37,6 +38,10 @@ The HTML directory includes all the markup files necessary for the structure of
 - `sign-in.html`: Allows users to sign in to their MovieVerse account.
 - `terms-of-service.html`: The terms governing the use of MovieVerse.
 - `trivia.html`: A trivia game to test users' movie knowledge.
+- `tv-details.html`: Detailed information about TV shows.
+- `offline.html`: A page to display when the app is offline.
+- `404.html`: A 404 error page for when a page is not found.
+- `index.ejs`: The entry point for the app.
 
 ### JS Directory
 
@@ -79,6 +84,22 @@ Please note that it is currently under development, and the components may under
 - `UserProfile.jsx`: Component for managing user profiles
 - `FeaturedMoviesCarousel.jsx`: Component for featured movies carousel
 
+### Tests Directory
+
+The tests directory contains a collection of test scripts for the MovieVerse application. These tests are designed to ensure that the app's functionality is working as expected and to identify any potential issues or bugs.
+
+- `apiTests.js`: Tests for the API functionality
+- `chatbotInteractionTests.js`: Tests for the chatbot interaction
+- `eventListenerTests.js`: Tests for event listeners
+- `favoritesPageTests.js`: Tests for the favorites page
+- `localStorageTests.js`: Tests for local storage functionality
+- `movieDetailsRenderTests.js`: Tests for rendering movie details
+- `movieDetailsUtilityTests.js`: Tests for movie details utility functions
+- `movieSearchTests.js`: Tests for movie search functionality
+- `renderTests.js`: Tests for rendering components
+- `uiTests.js`: Tests for the user interface
+- `utilityTests.js`: Tests for utility functions
+
 ## Getting Started
 
 To get started with MovieVerse:

diff --git a/...eVerse-Mobile/platforms/android/app/src/main/assets/www/MovieVerse-Frontend/css/style.css b/...eVerse-Mobile/platforms/android/app/src/main/assets/www/MovieVerse-Frontend/css/style.css
@@ -949,7 +949,7 @@ h2 {
 }
 
 h2:hover {
-    color: #f509d9;
+    color: orange;
     transition: 0.1s linear;
 }
 
@@ -2632,4 +2632,94 @@ footer {
     margin-top: 40px;
     background-color: #7378c5;
     color: white;
+    transition: 0.3s ease-in;
+}
+
+footer p:hover {
+    transition: 0.1s ease-in;
+    color: #ff8623;
+}
+
+.notification-btn {
+    position: fixed;
+    top: 5px;
+    right: 20px;
+    z-index: 100;
+    background-color: #7378c5;
+    color: white;
+    border: none;
+    cursor: pointer;
+    padding: 9px;
+    border-radius: 8px;
+    transition: 0.1s ease-in;
+}
+
+#closeModalButton {
+    background-color: #7378c5;
+    color: white;
+    border: none;
+    border-radius: 8px;
+    cursor: pointer;
+    font-size: 16px;
+    text-align: center;
+    transition: 0.1s ease-in;
+}
+
+#closeModalButton:hover {
+    background-color: #ff8623;
+}
+
+#closeModalButton {
+    margin: 10px auto;
+    display: block;
+}
+
+.notification-btn:hover {
+    background-color: #ff8623;
+}
+
+.notification-modal {
+    position: fixed;
+    top: 50px;
+    right: 20px;
+    background-color: #7378c5;
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+    border-radius: 5px;
+    padding: 20px;
+    width: 300px;
+    z-index: 100;
+    color: white;
+}
+
+@media (max-width: 900px) {
+    .notification-modal {
+        right: 12.5px;
+    }
+
+    .notification-btn {
+        right: 12.5px;
+    }
+}
+
+.notification-link:hover {
+    color: #f509d9 !important;
+}
+
+.notification-modal h4 {
+    margin: 0;
+    padding-bottom: 10px;
+    border-bottom: 1px solid #eee;
+}
+
+.notification-modal ul {
+    list-style: none;
+    padding: 0;
+    margin-top: 10px;
+    max-height: 200px;
+    overflow-y: auto;
+}
+
+.notification-modal ul li {
+    padding: 10px 0;
+    border-bottom: 1px solid #eee;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -73,7 +73,7 @@ @@
                 }
                 #form {
-                    margin-top: 20px;
+                    margin-top: 0;
                 }
             }
         </style>
@@ Expand Down @@