From 58ffa75fb03f630a5da8787d25725b86cf1f70ab Mon Sep 17 00:00:00 2001
From: Jacques Chen <jacqueschen1@gmail.com>
Date: Sat, 22 Feb 2020 22:04:38 -0800
Subject: [PATCH 1/3] simple registration

---
 App/actions/Login.js          | 64 +++++++++++++++++++++++++++++++++
 App/components/EventCard.js   |  2 +-
 App/reducers/LoginReducers.js | 13 ++++++-
 App/screens/EventScreen.js    | 67 ++++++++++++++++++++++++++++++++---
 android/gradlew               |  0
 5 files changed, 139 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 android/gradlew

diff --git a/App/actions/Login.js b/App/actions/Login.js
index e70887bbd..56297ecf0 100644
--- a/App/actions/Login.js
+++ b/App/actions/Login.js
@@ -93,6 +93,70 @@ export function populateEvents(events) {
   }
 }
 
+export function getRegistrations(id) {
+  return (dispatch) => {
+    dispatch(isLoading());
+    fetch(AMAZON_API + '/registration/queryStudent?id=' + id)
+      .then((response) => response.json())
+      .then((response) => {
+        console.log('getRegistration success');
+        dispatch(getRegistrationSuccess(response));
+      })
+      .catch(err => {
+        console.log('getRegistration failed');
+        dispatch(registrationFailed(err));
+      })
+  }
+}
+
+export function getRegistrationSuccess(response) {
+  return {
+    type: 'registrationSuccess',
+    response
+  }
+}
+
+export function registrationFailed(err) {
+  return {
+    type: 'registrationFailed',
+    err
+  }
+}
+
+export function registerUser(id, eventID) {
+  console.log("hello");
+  return (dispatch) => {
+    dispatch(isLoading());
+    const body = JSON.stringify({
+      id,
+      eventID,
+      registrationStatus: 'registered'
+    })
+    console.log(body)
+    fetch(AMAZON_API + '/registration/create', {
+      method: 'POST',
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+      },
+      body: body
+    })
+      .then((response) => response.json())
+      .then((response) => {
+        console.log(response)
+        if (response.message == 'Update succeeded') {
+          dispatch(getRegistrations(id));
+        } else {
+          dispatch(registrationFailed(err));
+        }
+      })
+      .catch(err => {
+        console.log('registration failed');
+        dispatch(registrationFailed(err));
+      })
+  }
+}
+
 export function hideSuccess() {
   return {
     type: 'hideSuccess'
diff --git a/App/components/EventCard.js b/App/components/EventCard.js
index 8e9c10e00..1aff2cc11 100644
--- a/App/components/EventCard.js
+++ b/App/components/EventCard.js
@@ -22,7 +22,7 @@ export default class EventCard extends Component {
 
         <View >
           <Image
-            source={{ uri: this.props.event.img }}
+            source={{ uri: this.props.event.imageUrl }}
             style={{
               width: width - 20,
               height: 240,
diff --git a/App/reducers/LoginReducers.js b/App/reducers/LoginReducers.js
index 7aee6e01b..a5a68d024 100644
--- a/App/reducers/LoginReducers.js
+++ b/App/reducers/LoginReducers.js
@@ -8,7 +8,8 @@ const initialState = {
   user: null,
   error: undefined,
   isVerified: false,
-  showSuccess: false
+  showSuccess: false,
+  registration: null
 }
 
 export default function loginReducer(state = initialState, action) {
@@ -62,6 +63,16 @@ export default function loginReducer(state = initialState, action) {
       return Object.assign({}, state, {
         showSuccess: true
       })
+    case 'registrationSuccess':
+      return Object.assign({}, state, {
+        registration: action.response,
+        isLoading: false
+      })
+    case 'registrationFailed':
+      return Object.assign({}, state, {
+        isLoading: false,
+        error: action.err
+      })
     default:
       return state
   }
diff --git a/App/screens/EventScreen.js b/App/screens/EventScreen.js
index 7f903c55e..0ec35e92f 100644
--- a/App/screens/EventScreen.js
+++ b/App/screens/EventScreen.js
@@ -5,10 +5,17 @@ const { width, height } = Dimensions.get('window');
 //styling
 import styles from '../styles/Styles';
 import Text from '../components/Text'
-
 import Button from '../components/Button'
+import { connect } from 'react-redux';
+import { getRegistrations, registerUser } from '../actions/Login';
+
+class EventScreen extends Component {
 
-export default class EventScreen extends Component {
+  componentDidMount() {
+    this.props.getRegistrations(this.props.userData.id);
+  }
+
+  state = { disableButton: false };
 
   getDescription(event) {
     if (event.description) {
@@ -18,24 +25,74 @@ export default class EventScreen extends Component {
     }
   }
 
+  getRegistrationStatus(eventID) {
+    const regData = this.props.registration.data;
+    const entry = regData.filter(entry => entry.eventID == eventID);
+    if (entry.length == 1) {
+      this.state.disableButton = true;
+      console.log(this.state.disableButton)
+      if (entry[0].registrationStatus == 'registered') {
+        return 'You have registered for this event!'
+      } else if (entry[0].registrationStatus == 'waitlist') {
+        return 'You have been added to the waitlist for this event.'
+      } else if (entry[0].registrationStatus == 'checkedin') {
+        return "You've checked into this event!"
+      }
+    } else {
+      return 'Click below to register!'
+    }
+  }
+
+  handleRegistration(eventID) {
+    if (!this.state.disableButton) {
+      this.props.registerUser(this.props.userData.id, eventID);
+    }
+  }
+
 
   render() {
+    if (this.props.isLoading) {
+      return (
+        <View style={styles.container}>
+          <Text style={styles.h1}>Loading Screen</Text>
+        </View>
+      )
+    }
     const { navigation } = this.props
     const event = navigation.getParam('event')
     return (
       <View>
         <Image
-          source={{ uri: event.img }}
+          source={{ uri: event.imageUrl }}
           style={{ width: width, height: 240, marginBottom: 10 }}
-          resizeMode="cover"
+          resizeMode='cover'
         />
         <View style={styles.widgetContainer}>
           <Text style={styles.h1}>{event.ename}</Text>
           <Text style={styles.colour} >{event.edate}</Text>
           <Text>{this.getDescription(event)}</Text>
-          <Button title='Sign Up' />
+          <Text style={styles.h3}>{this.getRegistrationStatus(event.id)}</Text>
+          <Button title='Sign Up'
+                  disabled = {this.state.disableButton}
+                  onPress={this.handleRegistration.bind(this, event.id)} />
         </View>
       </View>
     )
   }
 }
+
+const mapStateToProps = (state) => {
+  return {
+    userData: state.login.user,
+    registration: state.login.registration,
+    isLoading: state.login.isLoading
+  }
+}
+const mapDispatchToProps = (dispatch) => {
+  return {
+    getRegistrations: (id) => dispatch(getRegistrations(id)),
+    registerUser: (id, eventID) => dispatch(registerUser(id, eventID))
+  };
+};
+
+export default connect(mapStateToProps, mapDispatchToProps)(EventScreen);
diff --git a/android/gradlew b/android/gradlew
old mode 100644
new mode 100755

From f3fe98b4c9eed4fc57697517a6d32de9d7ebe9fc Mon Sep 17 00:00:00 2001
From: Jacques Chen <jacqueschen1@gmail.com>
Date: Sat, 22 Feb 2020 22:30:05 -0800
Subject: [PATCH 2/3] update checkin

---
 App/actions/Login.js         |  2 -
 App/screens/CheckinScreen.js | 88 +++++++++++++-----------------------
 App/screens/EventScreen.js   | 23 +++++-----
 3 files changed, 43 insertions(+), 70 deletions(-)

diff --git a/App/actions/Login.js b/App/actions/Login.js
index 56297ecf0..acce68ea5 100644
--- a/App/actions/Login.js
+++ b/App/actions/Login.js
@@ -124,7 +124,6 @@ export function registrationFailed(err) {
 }
 
 export function registerUser(id, eventID) {
-  console.log("hello");
   return (dispatch) => {
     dispatch(isLoading());
     const body = JSON.stringify({
@@ -132,7 +131,6 @@ export function registerUser(id, eventID) {
       eventID,
       registrationStatus: 'registered'
     })
-    console.log(body)
     fetch(AMAZON_API + '/registration/create', {
       method: 'POST',
       headers: {
diff --git a/App/screens/CheckinScreen.js b/App/screens/CheckinScreen.js
index 02a4b1f02..a30878f86 100644
--- a/App/screens/CheckinScreen.js
+++ b/App/screens/CheckinScreen.js
@@ -9,15 +9,8 @@ import styles from '../styles/Styles';
 import Text from '../components/Text'
 import Button from '../components/Button'
 
-
 class CheckinScreen extends Component {
-  constructor() {
-    super();
-    this.state = {
-      checkinCode: '',
-    }
-  };
-
+  state = { checkinCode: '' }
   doAlert(message) {
     Alert.alert(
       'Event Check-in',
@@ -39,55 +32,38 @@ class CheckinScreen extends Component {
     fetch(AMAZON_API + '/events/scan?code=' + this.state.checkinCode)
       .then((response) => response.json())
       .then((response) => {
-        console.log(response);
-        if (Object.keys(response).length == 1) {
-          if (response[0].opened) {
-            const studentID = this.props.userData.id;
-            let users = response[0].users;
-            if (users.hasOwnProperty(studentID)) {
-              if (users[studentID] == 'R') {
-                console.log('checkin success');
-                const body = JSON.stringify({
-                  'id': response[0].id,
-                  'userID': studentID,
-                  'status': 'C'
-                });
-                let update = fetch(AMAZON_API + '/events/userupdate',
-                  {
-                    method: 'POST',
-                    headers: {
-                      Accept: 'application/json',
-                      'Content-Type': 'application/json',
-                    },
-                    body: body
-                  })
-                  .then((update) => update.json())
-                  .then((update) => {
-                    console.log(update)
-                  })
-                  .done();
-                console.log('user check in success');
-                this.doAlert('You have successfully checked in. Hang tight!');
-
-              } else if (users[studentID] == 'C') {
-                console.log('user already checked in');
-                this.doAlert('You have already checked in. Sit tight!');
-              } else if (users[studentID] == 'W') {
-                console.log('user on waitlist');
-                this.doAlert('You are on the waitlist.');
-              } else if (users[studentID] == 'Can') {
-                console.log('user cancelled');
-                this.doAlert('You have cancelled your registration for this event.');
+        if (response.size == 1) {
+          const body = JSON.stringify({
+            id: this.props.userData.id,
+            eventID: response.data[0].id,
+            registrationStatus: 'checkedin'
+          });
+          console.log(body)
+          fetch(AMAZON_API + '/registration/create', {
+            method: 'POST',
+            headers: {
+              Accept: 'application/json',
+              'Content-Type': 'application/json',
+            },
+            body: body
+          })
+            .then((response) => response.json())
+            .then((response) => {
+              console.log(response)
+              if (response.registrationStatus == 'checkedin') {
+                this.doAlert('Checked in!');
+              } else {
+                this.doAlert('Checkin failed, the event may be full.');
               }
-            } else {
-              console.log('user not registered');
-              this.doAlert('You have not registered for this event.');
-            }
-          } else {
-            console.log('event not opened');
-            this.doAlert('Check-in for this event has not been opened yet.');
-          }
-        } else if (Object.keys(response).length == 0) {
+            })
+            .catch(err => {
+              this.doAlert('An error occured.');
+            })
+          // TODO: Readd functionality to open/close event checkin
+          // console.log('event not opened');
+          // this.doAlert('Check-in for this event has not been opened yet.');
+
+        } else if (response.size == 0) {
           console.log('no event found.');
           this.doAlert('No event with given code.');
         } else {
diff --git a/App/screens/EventScreen.js b/App/screens/EventScreen.js
index 0ec35e92f..276d0c068 100644
--- a/App/screens/EventScreen.js
+++ b/App/screens/EventScreen.js
@@ -13,41 +13,40 @@ class EventScreen extends Component {
 
   componentDidMount() {
     this.props.getRegistrations(this.props.userData.id);
-  }
+  };
 
   state = { disableButton: false };
 
   getDescription(event) {
     if (event.description) {
-      return event.description
+      return event.description;
     } else {
       return "It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English. Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like)."
     }
-  }
+  };
 
   getRegistrationStatus(eventID) {
     const regData = this.props.registration.data;
     const entry = regData.filter(entry => entry.eventID == eventID);
     if (entry.length == 1) {
       this.state.disableButton = true;
-      console.log(this.state.disableButton)
       if (entry[0].registrationStatus == 'registered') {
-        return 'You have registered for this event!'
+        return 'You have registered for this event!';
       } else if (entry[0].registrationStatus == 'waitlist') {
-        return 'You have been added to the waitlist for this event.'
+        return 'You have been added to the waitlist for this event.';
       } else if (entry[0].registrationStatus == 'checkedin') {
-        return "You've checked into this event!"
+        return "You've checked into this event!";
       }
     } else {
-      return 'Click below to register!'
+      return 'Click below to register!';
     }
-  }
+  };
 
   handleRegistration(eventID) {
     if (!this.state.disableButton) {
       this.props.registerUser(this.props.userData.id, eventID);
     }
-  }
+  };
 
 
   render() {
@@ -73,8 +72,8 @@ class EventScreen extends Component {
           <Text>{this.getDescription(event)}</Text>
           <Text style={styles.h3}>{this.getRegistrationStatus(event.id)}</Text>
           <Button title='Sign Up'
-                  disabled = {this.state.disableButton}
-                  onPress={this.handleRegistration.bind(this, event.id)} />
+            disabled={this.state.disableButton}
+            onPress={this.handleRegistration.bind(this, event.id)} />
         </View>
       </View>
     )

From ae9bb7e81ec2ec4348c81da0941f8fc654dcfe9e Mon Sep 17 00:00:00 2001
From: Jacques Chen <jacqueschen1@gmail.com>
Date: Sat, 22 Feb 2020 22:48:28 -0800
Subject: [PATCH 3/3] have checkin check for registrationstatus

---
 App/screens/CheckinScreen.js | 44 ++++++++++++++++++++++++++++++++----
 App/screens/EventScreen.js   | 11 +++++----
 2 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/App/screens/CheckinScreen.js b/App/screens/CheckinScreen.js
index a30878f86..291b20b99 100644
--- a/App/screens/CheckinScreen.js
+++ b/App/screens/CheckinScreen.js
@@ -3,6 +3,7 @@ import { Alert, View, TextInput } from 'react-native';
 import { withNavigation } from 'react-navigation';
 import { AMAZON_API } from 'react-native-dotenv';
 import { connect } from 'react-redux';
+import { getRegistrations } from '../actions/Login';
 
 // styling
 import styles from '../styles/Styles';
@@ -11,6 +12,11 @@ import Button from '../components/Button'
 
 class CheckinScreen extends Component {
   state = { checkinCode: '' }
+
+  componentDidMount() {
+    this.props.getRegistrations(this.props.userData.id);
+  };
+
   doAlert(message) {
     Alert.alert(
       'Event Check-in',
@@ -21,24 +27,39 @@ class CheckinScreen extends Component {
 
   goHome() {
     this.props.navigation.navigate('Home');
-  }
+  };
+
+  checkRegistrationStatus(eventID) {
+    const entry = this.props.registration.data.filter(entry => entry.eventID == eventID);
+    if (entry.length == 1) {
+      return entry[0].registrationStatus;
+    }
+    return '';
+  };
 
   handleCheckin() {
     console.log(this.state.checkinCode);
     if (this.state.checkinCode.length != 4) {
-      Alert.alert('Not a valid code!');
+      this.doAlert('Not a valid code!');
       return;
     }
     fetch(AMAZON_API + '/events/scan?code=' + this.state.checkinCode)
       .then((response) => response.json())
       .then((response) => {
         if (response.size == 1) {
+          const status = this.checkRegistrationStatus(response.data[0].id);
+          if (status == "checkedin") {
+            this.doAlert('You have already checked in to this event.');
+            return;
+          } else if (status != "registered") {
+            this.doAlert('You have not yet registered for this event.');
+            return;
+          }
           const body = JSON.stringify({
             id: this.props.userData.id,
             eventID: response.data[0].id,
             registrationStatus: 'checkedin'
           });
-          console.log(body)
           fetch(AMAZON_API + '/registration/create', {
             method: 'POST',
             headers: {
@@ -80,6 +101,13 @@ class CheckinScreen extends Component {
   };
 
   render() {
+    if (this.props.isLoading) {
+      return (
+        <View style={styles.container}>
+          <Text style={styles.h1}>Loading Screen</Text>
+        </View>
+      )
+    }
     return (
       <View style={styles.widgetContainer}>
         <Text style={styles.h1}>Event Check-in</Text>
@@ -110,7 +138,15 @@ class CheckinScreen extends Component {
 const mapStateToProps = (state) => {
   return {
     userData: state.login.user,
+    registration: state.login.registration,
+    isLoading: state.login.isLoading
+  };
+};
+
+const mapDispatchToProps = (dispatch) => {
+  return {
+    getRegistrations: (id) => dispatch(getRegistrations(id))
   };
 };
 
-export default withNavigation(connect(mapStateToProps)(CheckinScreen));
+export default withNavigation(connect(mapStateToProps, mapDispatchToProps)(CheckinScreen));
diff --git a/App/screens/EventScreen.js b/App/screens/EventScreen.js
index 276d0c068..21f38e30e 100644
--- a/App/screens/EventScreen.js
+++ b/App/screens/EventScreen.js
@@ -1,13 +1,14 @@
 import React, { Component } from 'react';
 import { View, Dimensions, Image } from 'react-native';
+import { connect } from 'react-redux';
+import { getRegistrations, registerUser } from '../actions/Login';
 
 const { width, height } = Dimensions.get('window');
 //styling
 import styles from '../styles/Styles';
 import Text from '../components/Text'
 import Button from '../components/Button'
-import { connect } from 'react-redux';
-import { getRegistrations, registerUser } from '../actions/Login';
+
 
 class EventScreen extends Component {
 
@@ -26,8 +27,7 @@ class EventScreen extends Component {
   };
 
   getRegistrationStatus(eventID) {
-    const regData = this.props.registration.data;
-    const entry = regData.filter(entry => entry.eventID == eventID);
+    const entry = this.props.registration.data.filter(entry => entry.eventID == eventID);
     if (entry.length == 1) {
       this.state.disableButton = true;
       if (entry[0].registrationStatus == 'registered') {
@@ -86,7 +86,8 @@ const mapStateToProps = (state) => {
     registration: state.login.registration,
     isLoading: state.login.isLoading
   }
-}
+};
+
 const mapDispatchToProps = (dispatch) => {
   return {
     getRegistrations: (id) => dispatch(getRegistrations(id)),