Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev/integration to Development #138

Closed
wants to merge 24 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
9399a72
Backend User Registration with Custom Token
tlh26 Jul 6, 2024
3451082
Fully Integrated User Registration with JWT
tlh26 Jul 7, 2024
320f6ae
Dynamically Identify & Authenticate Users for User Profile
tlh26 Jul 7, 2024
39baf31
Code of Post Creation
tlh26 Jul 8, 2024
871f0c5
Functionality To Ensure Unique Username
tlh26 Jul 8, 2024
9f90088
Merge pull request #128 from COS301-SE-2024/dev/int/users
tlh26 Jul 8, 2024
327631e
Bug Fix
tlh26 Jul 8, 2024
222adcf
Merge pull request #129 from COS301-SE-2024/dev/int/users
tlh26 Jul 8, 2024
75404ea
Merge pull request #130 from COS301-SE-2024/dev/integration
asa-siphuma Jul 8, 2024
f0922ce
updated dependencies
asa-siphuma Jul 8, 2024
17bc417
random username generator
asa-siphuma Jul 8, 2024
8a62c96
Updated Firebase Config For Storage
tlh26 Jul 9, 2024
55f7fe3
Profile setup page complete
asa-siphuma Jul 9, 2024
6e33c3c
minor changes
asa-siphuma Jul 9, 2024
2fe16d8
services shortcut
asa-siphuma Jul 9, 2024
1791ada
services minor fix
asa-siphuma Jul 9, 2024
8b24713
Edit profile: current user details displayed
asa-siphuma Jul 9, 2024
c56c412
minor changes
asa-siphuma Jul 9, 2024
a4a490b
Merge branch 'dev/frontend' into dev/front/registration-page
asa-siphuma Jul 9, 2024
ecec2c6
Merge pull request #135 from COS301-SE-2024/dev/front/registration-page
asa-siphuma Jul 9, 2024
50a1522
Merge pull request #136 from COS301-SE-2024/dev/frontend
asa-siphuma Jul 10, 2024
fb3f2d1
Merge branch 'dev/integration' into dev/int/users
tlh26 Jul 10, 2024
581f5df
Merge pull request #137 from COS301-SE-2024/dev/int/users
tlh26 Jul 10, 2024
8dc0c7b
Update TMDBApiService.js
tlh26 Jul 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions App.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,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 SearchPage from "./frontend/src/Screens/SearchPage";
import GenrePage from "./frontend/src/Screens/GenrePage";
Expand All @@ -37,6 +38,7 @@ import Notifications from "./frontend/src/Screens/Notifications";
import WatchlistDetails from "./frontend/src/Screens/WatchlistDetails";
import EditWatchlist from "./frontend/src/Screens/EditWatchlist";


const Nav = createNativeStackNavigator();

export default function App() {
Expand All @@ -58,9 +60,9 @@ export default function App() {
// }}
>
{/* <Nav.Screen name="LandingPage" component={LandingPage} options={{ headerShown: false }} /> */}
{/* <Nav.Screen name="SignupPage" component={SignupPage} options={{ headerShown: false }} /> */}
{/* <Nav.Screen name="LoginPage" component={LoginPage} options={{ headerShown: false }} /> */}

<Nav.Screen name="SignupPage" component={SignupPage} options={{ headerShown: false }} />
<Nav.Screen name="ProfileSetup" component={ProfileSetup} options={{ headerShown: false }} />
<Nav.Screen name="LoginPage" component={LoginPage} options={{ headerShown: false }} />
<Nav.Screen name="HomePage" component={HomePage} options={{ header: () => <MainHeader /> }} />
<Nav.Screen name="MovieDescriptionPage" component={MovieDescriptionPage} options={({ navigation }) => ({
title: "movieHub.",
Expand Down
2 changes: 2 additions & 0 deletions backend/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const userRouter = require('./src/Users/users.router');
const watchlistRouter = require('./src/Watchlist/list.router');
const postRouter = require('./src/Post/post.router');
const likesRouter = require('./src/Likes/likes.router');
const authRouter = require('./src/Auth/auth.router'); // Import Firebase authentication middleware
const cors = require('cors'); // since we are using more than on port
const https = require('https');
const fs = require('fs');
Expand All @@ -21,6 +22,7 @@ app.use(cors({
}));

app.use(express.json());
app.use('/auth', authRouter);
app.use('/users', userRouter);
app.use('/list', watchlistRouter);
app.use('/post', postRouter);
Expand Down
Loading
Loading