diff --git a/README.md b/README.md
index e63bf53386413ff1f20a9efba8ffa07d482b43ca..b7def2b4217794c179af56ec7e56fd55d38b5096 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ By pressing one of the queried items, a third party component React-Navigation m
#### Sorting and filtration
-The user can set parameters for sorting and filtration on the Home screen before typing in the search. If these options are set after the search is performed, the user will have to search again in order to make a new query.
+The user can set parameters for sorting and filtration on a modal accessed through the Home screen before typing in the search. If these options are set after the search is performed, the user will have to search again in order to make a new query.
### Technology and testing
@@ -95,3 +95,7 @@ More information about our linter can be found at https://eslint.org/docs/user-g
#### Why we went for this solution
A linter is needed in order to ensure a robust codebase. Without it, we would be able to have poor code which would compile, but could have unforseen consequences during runtime. ESLint is configured for Typescript in this project.
+
+### Development process
+
+During the development of P4 both group members felt that we lacked knowledge regarding the functionality implemented by the other member. The reason for this was that during P3, one of us primarily worked on the back-end and redux, while the other handled the front-end. As a result of this, pair-programming was extensively used both while refactoring the back-end and redux, and developing the new React-Native application. Due to lack of time, and a lacking understanding of how to use redux with Typescript. The application we made in P3 had a lot of bugs and illogical handling of state. We only realized this after the fact. Refactoring the code allowed us to fix this, as well as reworking how we handled requests in the back-end. This resulted in the front-end developer getting a much better understanding of what was going on under the hood. Pair-programming on React Native also gave valuable insight to the back-end developer on how to make decent components in a React(/Native) application.
diff --git a/frontend/App.tsx b/frontend/App.tsx
index 6e81c799f4c7157fcc286b4a75441eebc89ad796..3e0d798500ec6584d94f147cda106803b35dea32 100644
--- a/frontend/App.tsx
+++ b/frontend/App.tsx
@@ -10,6 +10,7 @@ import Home from "./app/views/Home.component";
import { MovieDetail } from "./app/views/MovieDetail.component";
import { ReviewList } from "./app/views/ReviewList.component";
+// We use the navigator component to allow for easy navigation inside of our application.
const Stack = createStackNavigator<StackParamList>();
const App: React.FC = (): JSX.Element => {
diff --git a/frontend/app/api/index.ts b/frontend/app/api/index.ts
index 774ea0a773a2e9b9fbbe654e3c160c2401408fe0..6d38f4a9b03b328273be9f6aacab57744630ec51 100644
--- a/frontend/app/api/index.ts
+++ b/frontend/app/api/index.ts
@@ -2,5 +2,5 @@ import axios from "axios";
// You will need to set this to your ip address when running. This is the only variable that has to be changed.
export default axios.create({
- baseURL: "http://[2001:700:300:4100:597c:4fc9:563a:9e28]:3001",
+ baseURL: "http://192.168.0.62:3001",
});
diff --git a/frontend/app/store/redux/store.ts b/frontend/app/store/redux/store.ts
index b83ce653252d7075ab36e940f8d7c211a7a62808..2814cf13be41e53e8423a9e0b414e79929f7a5c0 100644
--- a/frontend/app/store/redux/store.ts
+++ b/frontend/app/store/redux/store.ts
@@ -4,6 +4,13 @@ import { movieSlice } from "../slices/movieSlice";
import { reviewSlice } from "../slices/reviewSlice";
import { systemSlice } from "../slices/systemSlice";
+/**
+ * store contains the redux configuration and is a combination of all the states, actions and reducers made in slices.
+ * Access to following:
+ * @constructs movieSlice
+ * @constructs reviewSlice
+ * @constructs systemSlice
+ */
export const store = configureStore({
reducer: {
movies: movieSlice.reducer,
@@ -12,6 +19,8 @@ export const store = configureStore({
},
});
+// We need to create a type for typescript.
export type AppState = ReturnType<typeof store.getState>;
+// We export the dispatching of our store in order to effectively use it in our components.
export const useAppDispatch = () => useDispatch<typeof store.dispatch>();
diff --git a/frontend/app/store/slices/movieSlice.ts b/frontend/app/store/slices/movieSlice.ts
index 2978c94d9f3f920f10a9ad3e04b1ec21b7b2f551..e568131bec1c0d482b90918492be4319a4fb53a4 100644
--- a/frontend/app/store/slices/movieSlice.ts
+++ b/frontend/app/store/slices/movieSlice.ts
@@ -18,11 +18,13 @@ export interface Movie {
rating: number;
}
+// Type of the state found in the store
type MovieState = {
searchTerm: string;
movies: Array<Movie>;
};
+// Our slices, this is essentially a combination of our state, reducers and actions found in our store.
export const movieSlice = createSlice({
name: "movie-slice",
initialState: {
diff --git a/frontend/app/store/slices/reviewSlice.ts b/frontend/app/store/slices/reviewSlice.ts
index 695e660d1adfb11a4a739ebfccd189ad2b08ea19..65e638c76b7b1680784ed6dbb518b70151c6304c 100644
--- a/frontend/app/store/slices/reviewSlice.ts
+++ b/frontend/app/store/slices/reviewSlice.ts
@@ -8,10 +8,12 @@ export interface Review {
review: string;
}
+// Type of the state found in the store
type ReviewState = {
reviews: Array<Review>;
};
+// Our slices, this is essentially a combination of our state, reducers and actions found in our store.
export const reviewSlice = createSlice({
name: "review-slice",
initialState: {
diff --git a/frontend/app/store/slices/systemSlice.ts b/frontend/app/store/slices/systemSlice.ts
index 552b99b6648b5770e30e47c5a104f8aaa067949b..fb3910357afb9bc21fcd2945c5e1db9e9f66dafe 100644
--- a/frontend/app/store/slices/systemSlice.ts
+++ b/frontend/app/store/slices/systemSlice.ts
@@ -1,14 +1,16 @@
import { createSlice, PayloadAction } from "@reduxjs/toolkit";
-// State user for pagination and other system variables
+// Base model for out system state
export interface System {
count: number;
}
+// Type of the state found in the store
type SystemState = {
count: number;
};
+// Our slices, this is essentially a combination of our state, reducers and actions found in our store.
export const systemSlice = createSlice({
name: "system-slice",
initialState: {
diff --git a/frontend/app/views/Home.component.tsx b/frontend/app/views/Home.component.tsx
index 6c57aeab5e4d2ee23db889bf586ae8ba49814423..4701e4b8859b07a11b0bd5958f5acbc92da37b86 100644
--- a/frontend/app/views/Home.component.tsx
+++ b/frontend/app/views/Home.component.tsx
@@ -1,16 +1,13 @@
-import React, { useEffect, useState } from "react";
+import React, { useState } from "react";
import { View, FlatList, StyleSheet } from "react-native";
import axios from "axios";
import { AppState, useAppDispatch } from "../store/redux/store";
import { SearchHandler } from "../components/SearchHandler.component";
import { useSelector } from "react-redux";
-import { ListItem } from "react-native-elements";
import api from "../api";
import { Movie, movieSlice } from "../store/slices/movieSlice";
-import { systemSlice } from "../store/slices/systemSlice";
import { MovieListItem } from "./MovieListItem.component";
-import { sys } from "typescript";
const Home: React.FC = (): JSX.Element => {
const dispatch = useAppDispatch();
@@ -19,7 +16,9 @@ const Home: React.FC = (): JSX.Element => {
const count = useSelector((state: AppState) => state.system.count);
const [refreshing, setRefreshing] = useState(false);
- // This does not work, dispatch is async, so we will have to rework pagination. The list works.
+
+ // As it stands, this simply clear the movie page, implemented in case anything gets bugged.
+ // The intended use of this function doesn't really make sense in a movie DB
const refreshMovies = () => {
setRefreshing(true);
dispatch(movieSlice.actions.clearMovies());
@@ -42,8 +41,6 @@ const Home: React.FC = (): JSX.Element => {
.catch((e) => console.log(e));
};
- // TODO: add useEffect to re-render on state change?
-
return (
<View style={styles.container}>
<SearchHandler />
@@ -55,7 +52,7 @@ const Home: React.FC = (): JSX.Element => {
ItemSeparatorComponent={() => <View></View>}
refreshing={refreshing}
onRefresh={refreshMovies}
- onEndReached={fetchMoreMovies}
+ onMomentumScrollEnd={() => fetchMoreMovies()}
/>
</View>
</View>
diff --git a/frontend/app/views/MovieDetail.component.tsx b/frontend/app/views/MovieDetail.component.tsx
index e686c53106646d31305d49d62d7f2deb38784901..38fb566926e173205402895a262b22819ff1608a 100644
--- a/frontend/app/views/MovieDetail.component.tsx
+++ b/frontend/app/views/MovieDetail.component.tsx
@@ -22,8 +22,10 @@ const MovieDetail = (): JSX.Element => {
const navigation = useNavigation<ReviewScreenNavigationProp>();
const dispatch = useAppDispatch();
+ // We get the movie from the navigation component when a user clicks on it
const { movie } = route.params;
+ // Fetch all the reviews for the movie
const showReviews = async () => {
axios
.get(`${api.defaults.baseURL}/reviews/${movie.Column_1}`)