Merge pull request #208 from tyler-furby/patch-1

Add forms for profile social accounts and about section
SoftwareEngineeringDaily · Apr 27, 2018 · 1d6e27c · 1d6e27c
2 parents 8e9c136 + cf4e493
commit 1d6e27c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/config/param-validation.js b/config/param-validation.js
@@ -7,9 +7,14 @@ export default {
       username: Joi.string().required(),
       name: Joi.string().required(),
       bio: Joi.string().allow(''),
+      about: Joi.string().allow(''),
+      github: Joi.string().allow(''),
+      linkedin: Joi.string().allow(''),
+      twitter: Joi.string().allow(''),
       website: Joi.string().allow(''),
       isAvatarSet: Joi.boolean().required(),
-      email: Joi.string().email().allow('')
+      email: Joi.string().email().allow(''),
+      publicEmail: Joi.string().email().allow('')
     },
     params: {
       userId: Joi.string().hex().required()

diff --git a/server/models/user.model.js b/server/models/user.model.js
@@ -34,9 +34,21 @@ const UserSchema = new mongoose.Schema({
   bio: {
     type: String
   },
+  about: {
+    type: String
+  },
   website: {
     type: String
   },
+  linkedin: {
+    type: String
+  },
+  twitter: {
+    type: String
+  },
+  github: {
+    type: String
+  },
   verified: {
     type: Boolean,
     default: false
@@ -48,6 +60,9 @@ const UserSchema = new mongoose.Schema({
   email: {
     type: String
   },
+  publicEmail: {
+    type: String
+  },
   facebook: {
     id: {
       type: String
@@ -151,7 +166,7 @@ UserSchema.statics = {
   isValidHash: function validPassword({ original, hash }) {
     return bcrypt.compareSync(original, hash);
   },
-  updatableFields: ['username', 'website', 'bio', 'name', 'email']
+  updatableFields: ['username', 'website', 'bio', 'publicEmail', 'twitter', 'github', 'linkedin', 'about', 'name', 'email']
 };
 
 /**