Revert "Merge branch 'main' into development"

This reverts commit bec6307, reversing changes made to 03b6487.
COS301-SE-2024 · Aug 12, 2024 · 0837655 · 0837655
1 parent bec6307
commit 0837655
Show file tree

Hide file tree

Showing 107 changed files with 11,509 additions and 552 deletions.
diff --git a/.babelrc b/.babelrc
diff --git a/.gitignore b/.gitignore
@@ -37,3 +37,5 @@ yarn-error.*
 
 # Jest
 /jest.config.js
+
+package-lock.json
diff --git a/App.js b/App.js
@@ -1,4 +1,4 @@
-import 'regenerator-runtime/runtime';
+import "regenerator-runtime/runtime";
 import { StyleSheet, Text, View } from "react-native";
 import React from "react";
 import { useState } from "react";
@@ -9,7 +9,7 @@ import { GestureHandlerRootView } from "react-native-gesture-handler";
 import ProfilePage from "./frontend/src/Screens/ProfilePage";
 import EditProfile from "./frontend/src/Screens/EditProfile";
 import Icon from "react-native-vector-icons/MaterialIcons";
-import CustomDrawer from "./frontend/src/Components/ProfileDrawer";
+import CustomDrawer from "./frontend/src/Screens/ProfileDrawer";
 import HomePage from "./frontend/src/Screens/HomePage";
 import Home from "./frontend/src/Screens/Home";
 import MainHeader from "./frontend/src/Components/MainHeader";
@@ -18,6 +18,7 @@ import SearchHeader from "./frontend/src/Components/SearchHeader";
 import ProfileHeader from "./frontend/src/Components/ProfileHeader";
 import LoginPage from "./frontend/src/Screens/LoginPage";
 import SignupPage from "./frontend/src/Screens/SignupPage";
+import ProfileSetup from "./frontend/src/Screens/ProfileSetupPage";
 import LandingPage from "./frontend/src/Screens/LandingPage";
 import ExplorePage from "./frontend/src/Screens/ExplorePage";
 import SearchPage from "./frontend/src/Screens/SearchPage";
@@ -57,16 +58,9 @@ import Rooms from "./frontend/src/Screens/Rooms";
 const Nav = createNativeStackNavigator();
 
 export default function App() {
-    const [drawerVisible, setDrawerVisible] = useState(false);
     const [navigationState, setNavigationState] = useState(null);
+    const theme = useTheme();
 
-    const toggleDrawer = () => {
-        setDrawerVisible(!drawerVisible);
-    };
-
-    const closeDrawer = () => {
-        setDrawerVisible(false);
-    };
     return (
         // <WebSocketProvider>
         <GestureHandlerRootView>

diff --git a/Documents/coding_standards.md b/Documents/coding_standards.md
diff --git a/Documents/srs_v1.pdf b/Documents/srs_v1.pdf
diff --git a/Documents/srs_v2.pdf b/Documents/srs_v2.pdf
diff --git a/Documents/user_manual.pdf b/Documents/user_manual.pdf
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 <p align="center">
   <div align="center">
        <h1 align="center">Girls Gone Code </h1> 
-  <img src="https://github.com/COS301-SE-2024/MovieHub/assets/134503930/6691e89c-7e55-4919-a12f-72363f3082dd" style="height: 7%;">
+  <img src="https://github.com/COS301-SE-2024/MovieHub/assets/134503930/1e1ca1d9-4474-48ce-833b-07e82e5f29db" style="height: 7%;">
     <br>
     <br>
   <h1 align="center">Engage with Films Like Never Before!</h1>
@@ -11,7 +11,6 @@
 </h3>
 <div align="center">
 
-
   # Badges #
 ![GitHub issues](https://img.shields.io/github/issues/COS301-SE-2024/MovieHub)
 ![GitHub pull requests](https://img.shields.io/github/issues-pr/COS301-SE-2024/MovieHub)
@@ -32,31 +31,15 @@
 
 [Girls Gone Code - Demo1](https://drive.google.com/file/d/1f2MYe6KOZmrjrmMTc_NtuJ8d3Rhkcvde/view?usp=sharing)
 
-[Girls Gone Code - Demo2](https://drive.google.com/file/d/1f2MYe6KOZmrjrmMTc_NtuJ8d3Rhkcvde/view?usp=sharing)
-
-[Girls Gone Code - Demo3](https://drive.google.com/file/d/1f2MYe6KOZmrjrmMTc_NtuJ8d3Rhkcvde/view?usp=sharing)
-
 # Project Management #
 [Project Board](https://github.com/orgs/COS301-SE-2024/projects/72)
 
 # Documentation #
-[User Manual](https://drive.google.com/file/d/1iv4GoROOOOWD6gOVhm0HEjQvYxB16WmX/view?usp=drive_link)
-
-[Coding Standards](Documents/coding_standards.md)
-
-[Technical Installation Guide](https://docs.google.com/document/d/1zp0Hbq3SqKYIm8k-iSeQAuG_CHX94tTBwCCRNEXxHXU)
-
-[System Requirements Specification](Documents/srs_v1.pdf)
-
-[System Requirements Specification V2](Documents/srs_v2.pdf)
-
-[System Requirements Specification V3](https://docs.google.com/document/d/1ogFLG_cuWd7z3-1SvTDk6gqk7DkN6dANgGDCkluFNEk)
+[System Requirements Specification](https://drive.google.com/drive/folders/16fJP4jYCHB0H5OU3CgpYu_xFF-FxxibN?usp=sharing)
 
 ## Branching Strategy
-![image](https://github.com/COS301-SE-2024/MovieHub/assets/40609889/a27a0067-9f71-423c-a333-9a0b716767bf)
-
 We use GitFlow as our branching strategy, with main, development, and feature branches.
-
+![image](https://github.com/COS301-SE-2024/MovieHub/assets/40609889/a27a0067-9f71-423c-a333-9a0b716767bf)
 
 ## Branch Naming Convention
 **Main Branch**: `main`

diff --git a/assets/adaptive-icon.png b/assets/adaptive-icon.png
diff --git a/assets/favicon.png b/assets/favicon.png
diff --git a/assets/film.jpg b/assets/film.jpg
diff --git a/assets/film2.jpg b/assets/film2.jpg
diff --git a/assets/icon.png b/assets/icon.png
diff --git a/assets/movieposters.jpg b/assets/movieposters.jpg
diff --git a/assets/neon.jpg b/assets/neon.jpg
diff --git a/assets/spectre.jpg b/assets/spectre.jpg
diff --git a/assets/splash.png b/assets/splash.png
diff --git a/assets/undraw_access_account_re_8spm 1.png b/assets/undraw_access_account_re_8spm 1.png
diff --git a/assets/undraw_faq_re_31cw 1.png b/assets/undraw_faq_re_31cw 1.png
diff --git a/assets/undraw_my_app_re_gxtj 1.png b/assets/undraw_my_app_re_gxtj 1.png
diff --git a/assets/undraw_pending_approval_xuu9 1.png b/assets/undraw_pending_approval_xuu9 1.png
diff --git a/assets/undraw_sign_up_n6im 1.png b/assets/undraw_sign_up_n6im 1.png
diff --git a/assets/undraw_social_girl_re_kdrx 1.png b/assets/undraw_social_girl_re_kdrx 1.png
diff --git a/assets/vintagefilm.jpg b/assets/vintagefilm.jpg
diff --git a/babel.config.js b/babel.config.js
@@ -2,5 +2,7 @@ module.exports = function(api) {
   api.cache(true);
   return {
     presets: ['babel-preset-expo'],
+    plugins: [['module:react-native-dotenv'],'react-native-reanimated/plugin',],
+
   };
 };
diff --git a/backend/.gitignore b/backend/.gitignore
@@ -2,3 +2,39 @@
 .env
 node_modules/
 yarn.lock
+coverage/
+
+# Expo
+.expo/
+dist/
+web-build/
+
+# Native
+*.orig.*
+*.jks
+*.p8
+*.p12
+*.key
+*.mobileprovision
+
+# Metro
+.metro-health-check*
+
+# debug
+npm-debug.*
+yarn-debug.*
+yarn-error.*
+
+# macOS
+.DS_Store
+*.pem
+
+# local env files
+.env*.local
+.env
+
+# typescript
+*.tsbuildinfo
+
+# Jest
+/jest.config.js
diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/src/Auth/auth.router.js b/backend/src/Auth/auth.router.js
@@ -1,10 +1,10 @@
-import express from 'express';
-import authController from '../auth.controller';
+const express = require('express');
+const authController = require('./auth.controller');
 
 const router = express.Router();
 
 router.post('/register', authController.register);
 router.post('/login', authController.login);
 router.post('/logout', authController.logout);
 
-export default router;
+module.exports =router;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -37,3 +37,5 @@ yarn-error.*

		# Jest
		/jest.config.js

		package-lock.json