diff --git a/src/components/API/API.js b/src/components/API/API.js new file mode 100644 index 0000000..aa1fa1e --- /dev/null +++ b/src/components/API/API.js @@ -0,0 +1,31 @@ +const API = {}; + +API.get = (endpoint) => callFetch(endpoint, 'GET'); +API.post = (endpoint, data) => callFetch(endpoint, 'POST', data); +API.put = (endpoint, data) => callFetch(endpoint, 'PUT', data); +API.delete = (endpoint) => callFetch(endpoint, 'DELETE'); + +export default API; + +const callFetch = async (endpoint, method, dataObj = null) => { + // Build request object + let requestObj = {method: method}; // GET, POST, PUT or DELETE + if (dataObj) + requestObj = { + ...requestObj, + headers: {'Content-type': 'application/json'}, + body: JSON.stringify(dataObj), + }; + + // Call the fetch and process the return + try { + let result = null; + const response = await fetch(endpoint, requestObj); + if (response.status !== 204) result = await response.json(); + return response.status >= 200 && response.status < 300 + ? {isSuccess: true, result} + : {isSuccess: false, message: `${result.message}`}; + } catch (error) { + return {isSuccess: false, message: error.message}; + } +}; diff --git a/src/components/API/useLoad.js b/src/components/API/useLoad.js new file mode 100644 index 0000000..6b2584f --- /dev/null +++ b/src/components/API/useLoad.js @@ -0,0 +1,28 @@ +import {useEffect, useState} from "react"; +import API from "./API"; + + +const useLoad = (loadEndpoint) => { + + // State ---------------------- + + const [records, setRecords] = useState([]); + const [isLoading, setIsLoading] = useState(true); + + // Loader ---------------------- + const loadRecords = async (endpoint) => { + const response = await API.get(endpoint); + setIsLoading(false); + if (response.isSuccess) setRecords(response.result); + }; + + useEffect(() => { + loadRecords(loadEndpoint); + }, []); + + // return ---------------------- + + return [records, setRecords, isLoading, loadRecords]; +}; + +export default useLoad; \ No newline at end of file diff --git a/src/components/UI/RenderCount.js b/src/components/UI/RenderCount.js index 1fdce24..bb0264d 100644 --- a/src/components/UI/RenderCount.js +++ b/src/components/UI/RenderCount.js @@ -1,5 +1,5 @@ -import { useRef } from "react"; -import { Text, StyleSheet } from "react-native"; +import {useRef} from "react"; +import {Text, StyleSheet} from "react-native"; const RenderCount = ({backgroundColor = 'dodgerblue', fontColor = 'white'}) => { // Initialisation ------------- @@ -9,7 +9,7 @@ const RenderCount = ({backgroundColor = 'dodgerblue', fontColor = 'white'}) => { // Handlers ------------------- // View ----------------------- return ( - + Number of renders: {renderCount.current} ); diff --git a/src/components/entity/modules/ModuleView.js b/src/components/entity/modules/ModuleView.js index 134aad3..1e31276 100644 --- a/src/components/entity/modules/ModuleView.js +++ b/src/components/entity/modules/ModuleView.js @@ -24,13 +24,14 @@ const ModuleView = ({module, onDelete, onModify}) => { // View ----------------------- return ( - + View {module.ModuleCode} {module.ModuleName} Level {module.ModuleLevel} + cohort {module.ModuleYearID} - {module.ModuleLeaderName} (Module Leader) + {module.ModuleLeaderID} (Module Leader) diff --git a/src/components/entity/modules/moduleForm.js b/src/components/entity/modules/moduleForm.js index a46990b..80ed4e0 100644 --- a/src/components/entity/modules/moduleForm.js +++ b/src/components/entity/modules/moduleForm.js @@ -1,16 +1,17 @@ -import {StyleSheet, Text, TextInput, View} from "react-native"; +import { Text } from "react-native"; import {useState} from "react"; import Icons from "../../UI/Icons"; import Form from "../../UI/Form"; +import useLoad from "../../API/useLoad"; const defaultModule = { ModuleID: null, ModuleCode: null, ModuleName: null, ModuleLevel: null, + ModuleYearID: null, ModuleLeaderID: null, - ModuleLeaderName: null, - ModuleImage: null, + ModuleImageURL: null, }; const ModuleForm = ({originalModule, onSubmit, onCancel}) => { @@ -20,6 +21,10 @@ const ModuleForm = ({originalModule, onSubmit, onCancel}) => { defaultModule.ModuleID = Math.floor(100000 + Math.random() * 900000); defaultModule.ModuleImage = 'https://images.freeimages.com/images/small-preview/cf5/cellphone-1313194.jpg'; + const yearsEndpoint = 'https://softwarehub.uk/unibase/api/years'; + + const staffEndpoint = 'https://softwarehub.uk/unibase/api/users/staff'; + const levels = [ {value: 3, label: '3 (Foundation)'}, {value: 4, label: '4 (First Year)'}, @@ -28,11 +33,23 @@ const ModuleForm = ({originalModule, onSubmit, onCancel}) => { {value: 7, label: '7 (Masters)'}, ]; + // const cohorts = [ + // {value: 1, label: 'local 2022-23'}, + // {value: 2, label: 'local 2023-24'}, + // {value: 3, label: 'local 2024-25'}, + // {value: 3, label: 'local 2025-26'}, + // {value: 5, label: 'local 2026-27'}, + // ]; + // State ---------------------- const [module, setModule] = useState(originalModule || defaultModule); + const [years, , isYearsLoading] = useLoad(yearsEndpoint); + + const [Leaders, , isLeadersLoading] = useLoad(staffEndpoint); + // Handlers ------------------- const handleChange = (field, value) => { @@ -47,6 +64,11 @@ const ModuleForm = ({originalModule, onSubmit, onCancel}) => { const submitLabel = originalModule ? 'Modify' : 'Add'; const submitIcon = originalModule ? : ; + const cohorts = years.map((year) => ({value: year.YearID, label: year.YearName})); + const staff = Leaders.map((leader) => ({ + value: leader.UserID, + label: ` ${leader.UserFirstname} ${leader.UserLastname} ` + })); return (
{ value={module.ModuleName} onChange={(value) => handleChange('ModuleName', value)} /> + {isYearsLoading ? Loading Levels... : + handleChange('ModuleLevel', value)} + isLoading={isYearsLoading} + /> + } handleChange('ModuleLevel', value)} + label='Module cohort' + value={module.ModuleYearID} + onChange={(value) => handleChange('ModuleYearID', value)} + prompt={'Select module cohort...'} + options={cohorts} + isLoading={isYearsLoading} /> - handleChange('ModuleLeaderName', value)} + handleChange('ModuleLeaderID', value)} + prompt={'Select module leader...'} + options={staff} + isLoading={isLeadersLoading} /> + handleChange('ModuleImage', value)} + value={module.ModuleImageURL} + onChange={(value) => handleChange('ModuleImageURL', value)} /> {/* This is to test whether the correct Data was being stored in Local State */} @@ -95,9 +132,6 @@ const ModuleForm = ({originalModule, onSubmit, onCancel}) => { ); }; -const styles = StyleSheet.create({ - formContainer: {}, - item: {}, -}); +// const styles = StyleSheet.create({}); export default ModuleForm; \ No newline at end of file diff --git a/src/components/layout/Screen.js b/src/components/layout/Screen.js index cb4683e..f0daca0 100644 --- a/src/components/layout/Screen.js +++ b/src/components/layout/Screen.js @@ -1,7 +1,7 @@ import {StatusBar} from "expo-status-bar"; import {StyleSheet, View} from "react-native"; -const Screen = ({children}) => { +const Screen = ({ children }) => { // Initialisation ------------- // State ---------------------- // Handlers ------------------- diff --git a/src/components/screens/ModuleListScreen.js b/src/components/screens/ModuleListScreen.js index 1947231..1a1fab1 100644 --- a/src/components/screens/ModuleListScreen.js +++ b/src/components/screens/ModuleListScreen.js @@ -1,19 +1,26 @@ -import {useState} from "react"; -import {LogBox, StyleSheet} from "react-native"; +// import {useState, useEffect} from "react"; +import {LogBox, Text} from "react-native"; import Screen from "../layout/Screen"; import ModuleList from "../entity/modules/ModuleList"; -import initialModules from "../../data/modules.js"; +// import API from "../API/API"; +// import initialModules from "../../data/modules.js"; // import RenderCount from "../UI/RenderCount"; import {Button, ButtonTray} from "../UI/Button"; import Icons from "../UI/Icons"; +import useLoad from "../API/useLoad"; + const ModuleListScreen = ({navigation}) => { // Initialisation ------------- // let modules = initialModules; LogBox.ignoreLogs(['Non-serializable values were found in the navigation state']); + + const modulesEndpoint = 'https://softwarehub.uk/unibase/api/modules'; + // State ---------------------- - const [modules, setModules] = useState(initialModules); + + const [modules, setModules, isLoading, loadModules] = useLoad(modulesEndpoint); // Handlers ------------------- @@ -39,7 +46,7 @@ const ModuleListScreen = ({navigation}) => { const onModify = (module) => { handleModify(module); - navigation.replace('ModuleViewScreen', { module, onDelete, onModify }); + navigation.replace('ModuleViewScreen', {module, onDelete, onModify}); }; const goToViewScreen = (module) => @@ -57,12 +64,15 @@ const ModuleListScreen = ({navigation}) => {