feature/Add bio and location to users

Author: LewisYoul

app/controllers/application_controller.rb

@@ -8,6 +8,6 @@ class ApplicationController < ActionController::Base
   def configure_permitted_parameters
     devise_parameter_sanitizer.permit(:sign_up) { |u| u.permit(:name, :email, :password)}
 
-    devise_parameter_sanitizer.permit(:account_update) { |u| u.permit(:name, :email, :password, :current_password)}
+    devise_parameter_sanitizer.permit(:account_update) { |u| u.permit(:name, :email, :bio, :location, :password, :current_password)}
   end
 end

app/controllers/registrations_controller.rb

@@ -1,6 +1,6 @@
 class RegistrationsController < Devise::RegistrationsController
   def update
-    if current_user.update(sign_up_params)
+    if current_user.update(account_update_params)
       render json: { message: "Profile updated" }
     else
       render json: { message: "Failed to update profile" }, status: 400

app/javascript/edit-profile.vue

@@ -22,6 +22,7 @@ import EditAvatar from './edit-avatar';
 import FormField from './form-field';
 
 import usersMixin from './mixins/usersMixin';
+import { EventBus } from './event-bus.js';
 
 export default {
   components: { EditAvatar, FormField },
@@ -32,8 +33,8 @@ export default {
     return {
       userParams: {
         name: this.currentUser.name,
-        bio: 'Dummy bio',
-        location: 'Cambridge UK'
+        bio: this.currentUser.bio,
+        location: this.currentUser.location
       }
     }
   },
@@ -45,14 +46,13 @@ export default {
 
   methods: {
     saveForm() {
-      console.log('params', this.userParams)
-
       this.updateUser(this.userParams)
         .then(res => {
-          console.log('aya', res)
+          EventBus.$emit('presentToast', res.data.message)
         })
         .catch(error => {
           console.error(error)
+          EventBus.$emit('presentToast', error.response.data.message)
         })
     }
   }

db/migrate/20200621112744_add_bio_and_location_to_users.rb

@@ -0,0 +1,6 @@
+class AddBioAndLocationToUsers < ActiveRecord::Migration[6.0]
+  def change
+    add_column :users, :bio, :string, default: ''
+    add_column :users, :location, :string, default: ''
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_05_31_082400) do
+ActiveRecord::Schema.define(version: 2020_06_21_112744) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -81,6 +81,8 @@
     t.datetime "remember_created_at"
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
+    t.string "bio", default: ""
+    t.string "location", default: ""
     t.index ["email"], name: "index_users_on_email", unique: true
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end