From 838c7047ac6facd4ae917fda4092bbff56103eeb Mon Sep 17 00:00:00 2001
From: Songtone <s.ongtone@hotmail.com>
Date: Thu, 14 Nov 2019 17:06:23 -0500
Subject: [PATCH 1/3] [#86] Added phone number to Model and modified POST api
 for createUser

---
 backend/controllers/UserController.js   |   7 +-
 backend/gateways/UserGateway.js         |   6 +-
 backend/models/User.js                  |  10 +++
 backend/services/UserService.js         |   4 +-
 frontend/src/components/RegisterForm.js |  73 ++++++++++++++++
 frontend/src/constraints/Constraints.js |   8 ++
 frontend/src/pages/RegisterPage.js      | 109 ++++++++++++++++++++++++
 7 files changed, 209 insertions(+), 8 deletions(-)
 create mode 100644 frontend/src/components/RegisterForm.js
 create mode 100644 frontend/src/constraints/Constraints.js
 create mode 100644 frontend/src/pages/RegisterPage.js

diff --git a/backend/controllers/UserController.js b/backend/controllers/UserController.js
index 2b39b1c..f0b0648 100644
--- a/backend/controllers/UserController.js
+++ b/backend/controllers/UserController.js
@@ -8,14 +8,13 @@ const userController = express.Router();
 const userService = new UserService();
 
 const loginFields = ['email', 'password']
-const registerFields = ['email', 'password', 'first_name', 'last_name', 'type']
+const registerFields = ['email', 'password', 'first_name', 'last_name', 'phone_number','type']
 
 // register API
 userController.post('/', validateBody(registerFields), async (req, res) => {
     try {
-        const { email, password, first_name, last_name, type } = req.body;
-        const user = await userService.register(email, password, first_name, last_name,
-            type);
+        const { email, password, first_name, last_name, phone_number, type } = req.body;
+        const user = await userService.register(email, password, first_name, last_name, phone_number, type);
         return res.status(200).json(user);
     } catch (err) {
         return handleError(err, res);
diff --git a/backend/gateways/UserGateway.js b/backend/gateways/UserGateway.js
index 012890e..9caf16c 100644
--- a/backend/gateways/UserGateway.js
+++ b/backend/gateways/UserGateway.js
@@ -15,12 +15,13 @@ const UserGateway = {
         return user;
     },
     
-    async createUser(email, password_hash, first_name, last_name, type) {
+    async createUser(email, password_hash, first_name, last_name, phone_number, type) {
         user = new User({
             email: email,
             password_hash: password_hash,
             first_name: first_name,
             last_name: last_name,
+            phone_number,
             type: type
         });
         try {
@@ -30,7 +31,7 @@ const UserGateway = {
         }
     },
 
-    async updateUser(id, email, password_hash, first_name, last_name, type) {
+    async updateUser(id, email, password_hash, first_name, last_name, phone_number, type) {
         user = this.getUserById(id);
         try {
             return await User.updateOne({id: id},
@@ -40,6 +41,7 @@ const UserGateway = {
                         password_hash: password_hash,
                         first_name: first_name,
                         last_name: last_name,
+                        phone_number: phone_number,
                         type: type
                     }
                 }
diff --git a/backend/models/User.js b/backend/models/User.js
index f72b4e2..42c2857 100644
--- a/backend/models/User.js
+++ b/backend/models/User.js
@@ -29,6 +29,16 @@ const UserSchema = mongoose.Schema({
         required : true,
         trim : true
     },
+    phone_number:{
+        type: String,
+        required : true,
+        trim: true,
+        validate: value => {
+            if (!validator.isMobilePhone(value)) {
+                throw new Error('Invalid Phone Number')
+            }
+        }
+    },
     type: {
         type: String,
         required : true,
diff --git a/backend/services/UserService.js b/backend/services/UserService.js
index 2e8673e..096b60c 100644
--- a/backend/services/UserService.js
+++ b/backend/services/UserService.js
@@ -19,7 +19,7 @@ class UserService {
         return true
     }
 
-    async register(email, password, first_name, last_name, type) {
+    async register(email, password, first_name, last_name, phone_number,type) {
         if (!passwordValidator.validate(password)) {
             throw new BadRequestError('Password must be at least 8 characters' +  
                 ' and must include at least one digit.')
@@ -30,7 +30,7 @@ class UserService {
             throw new ResourceExistsError("Email " + email + " already in use.");
         }
         try {
-            return await UserGateway.createUser(email, hashedPassword, first_name, last_name, type);
+            return await UserGateway.createUser(email, hashedPassword, first_name, last_name, phone_number, type);
         } catch (err) {
             throw new BadRequestError(err.message);
         }
diff --git a/frontend/src/components/RegisterForm.js b/frontend/src/components/RegisterForm.js
new file mode 100644
index 0000000..3469ef3
--- /dev/null
+++ b/frontend/src/components/RegisterForm.js
@@ -0,0 +1,73 @@
+import React from 'react';
+import { Text, TextInput, View, Button, Picker } from 'react-native';
+import { registerComponent } from '../stylesheets/Stylesheet';
+
+const RegisterForm = (props) => {
+    return (
+        <View>
+            {props.error
+                ? <Text>{props.errorMsg}</Text>
+                : null
+            }
+            <Text>First Name</Text>
+            <TextInput
+                style={registerComponent.registerInputText}
+                placeholder="Your first name"
+                defaultValue={props.first_name}
+                onChangeText={text => props.handleFirstNameChange(text)}
+            />
+            <Text>Last Name</Text>
+            <TextInput
+                style={registerComponent.registerInputText}
+                placeholder="Your last name"
+                defaultValue={props.last_name}
+                onChangeText={text => props.handleLastNameChange(text)}
+            />
+            <Text>
+                Email
+            </Text>
+            <TextInput
+                style={registerComponent.registerInputText}
+                placeholder="abc@gmail.com"
+                defaultValue={props.email}
+                onChangeText={text => props.handleEmailChange(text)}
+            />
+            <Text>
+                Password
+            </Text>
+            <TextInput
+                style={registerComponent.registerInputText}
+                placeholder="password"
+                defaultValue={props.password}
+                secureTextEntry={true}
+                password={true}
+                onChangeText={text => props.handlePasswordChange(text)}
+            />
+            <Text>
+                Confirm Password
+            </Text>
+            <TextInput
+                style={registerComponent.registerInputText}
+                placeholder="confirm password"
+                defaultValue={props.confirm_password}
+                secureTextEntry={true}
+                password={true}
+                onChangeText={text => props.handleConfirmPasswordChange(text)}
+            />
+            <Text>
+                Type
+            </Text>
+            <Picker selectedValue = {props.type} onValueChange = {value => props.handleTypeChange(value)}>
+               <Picker.Item label = "Homeowner" value = "HOMEOWNER" />
+               <Picker.Item label = "Contractor" value = "CONTRACTOR" />
+               <Picker.Item label = "Inspector" value = "INSPECTOR" />
+            </Picker>
+            <Button
+                title="Sign Up"
+                onPress={() => props.handleRegister()}
+            />
+        </View>
+    );
+};
+
+export default RegisterForm;
\ No newline at end of file
diff --git a/frontend/src/constraints/Constraints.js b/frontend/src/constraints/Constraints.js
new file mode 100644
index 0000000..4b1de6c
--- /dev/null
+++ b/frontend/src/constraints/Constraints.js
@@ -0,0 +1,8 @@
+export const constraints = {
+    email: {
+      presence: true,
+      email: true
+    },
+  };
+  
+  export default constraints;
\ No newline at end of file
diff --git a/frontend/src/pages/RegisterPage.js b/frontend/src/pages/RegisterPage.js
new file mode 100644
index 0000000..c1f58ad
--- /dev/null
+++ b/frontend/src/pages/RegisterPage.js
@@ -0,0 +1,109 @@
+import React from 'react';
+import { Text, View } from 'react-native';
+import RegisterForm from '../components/RegisterForm';
+import { register } from '../apis/users/Register'
+import { registerComponent } from '../stylesheets/Stylesheet';
+import validator from 'validator';
+
+export default class RegisterPage extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      email: '',
+      password: '',
+      confirm_password: '',
+      first_name: '',
+      last_name: '',
+      type: '',
+      submitting: false,
+      error: false,
+      errorMsg: ''
+    };
+
+    this.handleEmailChange = this.handleEmailChange.bind(this);
+    this.handlePasswordChange = this.handlePasswordChange.bind(this);
+    this.handleConfirmPasswordChange = this.handleConfirmPasswordChange.bind(this);
+    this.handleFirstNameChange = this.handleFirstNameChange.bind(this);
+    this.handleLastNameChange = this.handleLastNameChange.bind(this);
+    this.handleTypeChange = this.handleTypeChange.bind(this);
+
+    this.handleRegister = this.handleRegister.bind(this);
+  }
+  static navigationOptions = {
+    title: 'Sign Up',
+  };
+
+  handleEmailChange = event => {
+    this.setState({ email: event })
+  }
+
+  handlePasswordChange = event => {
+    this.setState({ password: event })
+  }
+
+  handleConfirmPasswordChange = event => {
+    this.setState({ confirm_password: event })
+  }
+
+  handleFirstNameChange = event => {
+    this.setState({ first_name: event })
+  }
+
+  handleLastNameChange = event => {
+    this.setState({ last_name: event })
+  }
+
+  handleTypeChange = event => {
+    this.setState({ type: event })
+  }
+
+  validateEmail = (email) => {
+    var validEmail = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+    return validEmail.test(email);
+  };
+  validatePassword = (password) => {
+    var validPassword = /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{8,}$/
+    return validPassword.test(password);
+  };
+
+
+  handleRegister = async () => {
+    this.setState({ submitting: true })
+    alert(validator.isEmail(this.state.email))
+    // if (!this.validateEmail(this.state.email)) {
+    //   alert('Please Enter a Valid Email')
+    // }
+    // if (!this.validatePassword(this.state.password)) {
+    //   alert('Password must be at least 8 characters and must include at least one digit.')
+    // }
+    // if (this.state.password != this.state.confirm_password) {
+    //   alert('Passwords Must Match')
+    // }
+    try {
+      await register(this.state.email, this.state.password, this.state.first_name, this.state.last_name, this.state.type).then(async (response) => {
+        this.props.navigation.navigate('LogInPage')
+      });
+    } catch (err) {
+      this.setState({ error: true, submitting: false, errorMsg: err.message })
+    }
+  }
+
+  render() {
+    var { submitting } = this.state;
+    return (
+      <View style={registerComponent.registerPageComponent}>
+        <View style={{ width: '50%' }}>
+          <Text style={{ alignSelf: 'center' }}>Sign Up Here</Text>
+          {submitting
+            ? <Text>Loading...</Text>
+            : <RegisterForm  {...this.state}
+              handleEmailChange={this.handleEmailChange}
+              handlePasswordChange={this.handlePasswordChange} handleConfirmPasswordChange={this.handleConfirmPasswordChange}
+              handleFirstNameChange={this.handleFirstNameChange} handleLastNameChange={this.handleLastNameChange}
+              handleTypeChange={this.handleTypeChange} handleRegister={this.handleRegister} />
+          }
+        </View>
+      </View>
+    );
+  }
+}

From d10c781df6ec962a75c4277aa8011b6f704e9c70 Mon Sep 17 00:00:00 2001
From: Songtone <s.ongtone@hotmail.com>
Date: Thu, 14 Nov 2019 17:09:46 -0500
Subject: [PATCH 2/3] Fix

---
 backend/controllers/UserController.js | 2 +-
 backend/services/UserService.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/controllers/UserController.js b/backend/controllers/UserController.js
index f0b0648..3458edc 100644
--- a/backend/controllers/UserController.js
+++ b/backend/controllers/UserController.js
@@ -8,7 +8,7 @@ const userController = express.Router();
 const userService = new UserService();
 
 const loginFields = ['email', 'password']
-const registerFields = ['email', 'password', 'first_name', 'last_name', 'phone_number','type']
+const registerFields = ['email', 'password', 'first_name', 'last_name', 'phone_number', 'type']
 
 // register API
 userController.post('/', validateBody(registerFields), async (req, res) => {
diff --git a/backend/services/UserService.js b/backend/services/UserService.js
index 096b60c..12765c9 100644
--- a/backend/services/UserService.js
+++ b/backend/services/UserService.js
@@ -19,7 +19,7 @@ class UserService {
         return true
     }
 
-    async register(email, password, first_name, last_name, phone_number,type) {
+    async register(email, password, first_name, last_name, phone_number, type) {
         if (!passwordValidator.validate(password)) {
             throw new BadRequestError('Password must be at least 8 characters' +  
                 ' and must include at least one digit.')

From c3e3ff97cc7e4829f580dce12648ef4813c94c8b Mon Sep 17 00:00:00 2001
From: Songtone <s.ongtone@hotmail.com>
Date: Thu, 14 Nov 2019 17:23:53 -0500
Subject: [PATCH 3/3] removing some old filees

---
 frontend/src/components/RegisterForm.js |  73 ----------------
 frontend/src/constraints/Constraints.js |   8 --
 frontend/src/pages/RegisterPage.js      | 109 ------------------------
 3 files changed, 190 deletions(-)
 delete mode 100644 frontend/src/components/RegisterForm.js
 delete mode 100644 frontend/src/constraints/Constraints.js
 delete mode 100644 frontend/src/pages/RegisterPage.js

diff --git a/frontend/src/components/RegisterForm.js b/frontend/src/components/RegisterForm.js
deleted file mode 100644
index 3469ef3..0000000
--- a/frontend/src/components/RegisterForm.js
+++ /dev/null
@@ -1,73 +0,0 @@
-import React from 'react';
-import { Text, TextInput, View, Button, Picker } from 'react-native';
-import { registerComponent } from '../stylesheets/Stylesheet';
-
-const RegisterForm = (props) => {
-    return (
-        <View>
-            {props.error
-                ? <Text>{props.errorMsg}</Text>
-                : null
-            }
-            <Text>First Name</Text>
-            <TextInput
-                style={registerComponent.registerInputText}
-                placeholder="Your first name"
-                defaultValue={props.first_name}
-                onChangeText={text => props.handleFirstNameChange(text)}
-            />
-            <Text>Last Name</Text>
-            <TextInput
-                style={registerComponent.registerInputText}
-                placeholder="Your last name"
-                defaultValue={props.last_name}
-                onChangeText={text => props.handleLastNameChange(text)}
-            />
-            <Text>
-                Email
-            </Text>
-            <TextInput
-                style={registerComponent.registerInputText}
-                placeholder="abc@gmail.com"
-                defaultValue={props.email}
-                onChangeText={text => props.handleEmailChange(text)}
-            />
-            <Text>
-                Password
-            </Text>
-            <TextInput
-                style={registerComponent.registerInputText}
-                placeholder="password"
-                defaultValue={props.password}
-                secureTextEntry={true}
-                password={true}
-                onChangeText={text => props.handlePasswordChange(text)}
-            />
-            <Text>
-                Confirm Password
-            </Text>
-            <TextInput
-                style={registerComponent.registerInputText}
-                placeholder="confirm password"
-                defaultValue={props.confirm_password}
-                secureTextEntry={true}
-                password={true}
-                onChangeText={text => props.handleConfirmPasswordChange(text)}
-            />
-            <Text>
-                Type
-            </Text>
-            <Picker selectedValue = {props.type} onValueChange = {value => props.handleTypeChange(value)}>
-               <Picker.Item label = "Homeowner" value = "HOMEOWNER" />
-               <Picker.Item label = "Contractor" value = "CONTRACTOR" />
-               <Picker.Item label = "Inspector" value = "INSPECTOR" />
-            </Picker>
-            <Button
-                title="Sign Up"
-                onPress={() => props.handleRegister()}
-            />
-        </View>
-    );
-};
-
-export default RegisterForm;
\ No newline at end of file
diff --git a/frontend/src/constraints/Constraints.js b/frontend/src/constraints/Constraints.js
deleted file mode 100644
index 4b1de6c..0000000
--- a/frontend/src/constraints/Constraints.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export const constraints = {
-    email: {
-      presence: true,
-      email: true
-    },
-  };
-  
-  export default constraints;
\ No newline at end of file
diff --git a/frontend/src/pages/RegisterPage.js b/frontend/src/pages/RegisterPage.js
deleted file mode 100644
index c1f58ad..0000000
--- a/frontend/src/pages/RegisterPage.js
+++ /dev/null
@@ -1,109 +0,0 @@
-import React from 'react';
-import { Text, View } from 'react-native';
-import RegisterForm from '../components/RegisterForm';
-import { register } from '../apis/users/Register'
-import { registerComponent } from '../stylesheets/Stylesheet';
-import validator from 'validator';
-
-export default class RegisterPage extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      email: '',
-      password: '',
-      confirm_password: '',
-      first_name: '',
-      last_name: '',
-      type: '',
-      submitting: false,
-      error: false,
-      errorMsg: ''
-    };
-
-    this.handleEmailChange = this.handleEmailChange.bind(this);
-    this.handlePasswordChange = this.handlePasswordChange.bind(this);
-    this.handleConfirmPasswordChange = this.handleConfirmPasswordChange.bind(this);
-    this.handleFirstNameChange = this.handleFirstNameChange.bind(this);
-    this.handleLastNameChange = this.handleLastNameChange.bind(this);
-    this.handleTypeChange = this.handleTypeChange.bind(this);
-
-    this.handleRegister = this.handleRegister.bind(this);
-  }
-  static navigationOptions = {
-    title: 'Sign Up',
-  };
-
-  handleEmailChange = event => {
-    this.setState({ email: event })
-  }
-
-  handlePasswordChange = event => {
-    this.setState({ password: event })
-  }
-
-  handleConfirmPasswordChange = event => {
-    this.setState({ confirm_password: event })
-  }
-
-  handleFirstNameChange = event => {
-    this.setState({ first_name: event })
-  }
-
-  handleLastNameChange = event => {
-    this.setState({ last_name: event })
-  }
-
-  handleTypeChange = event => {
-    this.setState({ type: event })
-  }
-
-  validateEmail = (email) => {
-    var validEmail = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
-    return validEmail.test(email);
-  };
-  validatePassword = (password) => {
-    var validPassword = /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{8,}$/
-    return validPassword.test(password);
-  };
-
-
-  handleRegister = async () => {
-    this.setState({ submitting: true })
-    alert(validator.isEmail(this.state.email))
-    // if (!this.validateEmail(this.state.email)) {
-    //   alert('Please Enter a Valid Email')
-    // }
-    // if (!this.validatePassword(this.state.password)) {
-    //   alert('Password must be at least 8 characters and must include at least one digit.')
-    // }
-    // if (this.state.password != this.state.confirm_password) {
-    //   alert('Passwords Must Match')
-    // }
-    try {
-      await register(this.state.email, this.state.password, this.state.first_name, this.state.last_name, this.state.type).then(async (response) => {
-        this.props.navigation.navigate('LogInPage')
-      });
-    } catch (err) {
-      this.setState({ error: true, submitting: false, errorMsg: err.message })
-    }
-  }
-
-  render() {
-    var { submitting } = this.state;
-    return (
-      <View style={registerComponent.registerPageComponent}>
-        <View style={{ width: '50%' }}>
-          <Text style={{ alignSelf: 'center' }}>Sign Up Here</Text>
-          {submitting
-            ? <Text>Loading...</Text>
-            : <RegisterForm  {...this.state}
-              handleEmailChange={this.handleEmailChange}
-              handlePasswordChange={this.handlePasswordChange} handleConfirmPasswordChange={this.handleConfirmPasswordChange}
-              handleFirstNameChange={this.handleFirstNameChange} handleLastNameChange={this.handleLastNameChange}
-              handleTypeChange={this.handleTypeChange} handleRegister={this.handleRegister} />
-          }
-        </View>
-      </View>
-    );
-  }
-}