Improve design of crud user

Author: Linzeur

node_modules/.yarn-integrity

@@ -1,6 +1,6 @@
 module Api
   class Api::UsersController < ApplicationController
-    before_action :set_user, only: [:show, :update, :destroy]
+    before_action :set_user, only: [:show, :update]
 
     def index
       render json: User.all
@@ -11,7 +11,7 @@ def create
       if user.save
         render json: user, status: :created
       else
-        render json: { errors: user.errors}, status: :unprocessable_entity
+        render_errors(user.errors.full_messages.join("\n"), :unprocessable_entity)
       end
     end
 
@@ -23,21 +23,16 @@ def update
       if @user.update(user_params)
         render json: @user, status: :ok
       else
-        render json: {errors: user.errors}
+        render_errors(@user.errors.full_messages.join("\n"), :unprocessable_entity)
       end
     end
 
-    def destroy
-      @user.destroy
-      render json: {}, status: :no_content
-    end
-    
     def availableTime
       render json: User.all, each_serializer: UserAvailableTimeSerializer, option_name: params
     end
 
     rescue_from ActiveRecord::RecordNotFound do |e|
-      render json: { message: e.message }, status: :not_found
+      render_errors(e.message, :not_found)
     end
 
     private 

rails-time-track/app/controllers/api/users_controller.rb

@@ -1,9 +1,9 @@
 class User < ApplicationRecord
 
+  validates :name, :rate, presence: true
   validates :email, format: { with: /[a-zA-Z0-9]*@[a-zA-Z]*.[a-zA-Z0-9]*/, message: "Bad format"  }, presence: true, uniqueness: true
-  # validates :name, presence: true
-  # validates :role, presence true
-  # validates :rate, presence true
+  validates :role, inclusion: { in: ["Owner","Analyst", "Manager"] , message: "%{value} is not a valid role" }
+  
 
   has_secure_password
   has_secure_token

rails-time-track/app/models/user.rb

@@ -1,3 +1,3 @@
 class UserSerializer < ActiveModel::Serializer
-  attributes :id, :name, :email, :role, :rate
+  attributes :id, :name, :email, :role, :rate, :isActive
 end

rails-time-track/app/serializers/user_serializer.rb

@@ -0,0 +1,5 @@
+class AddEnableToUsers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :users, :isActive, :boolean, default: true
+  end
+end

rails-time-track/db/migrate/20190805211420_add_enable_to_users.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_07_31_161326) do
+ActiveRecord::Schema.define(version: 2019_08_05_211420) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -69,6 +69,7 @@
     t.string "token"
     t.string "reset_digest"
     t.string "reset_created_at"
+    t.boolean "isActive", default: true
     t.index ["token"], name: "index_users_on_token"
   end
 

rails-time-track/db/schema.rb

@@ -12,7 +12,7 @@
 
   manager1 = User.create(
     name: "Brayan Manager",
-    email: "linzeur@hotmail.com",
+    email: "linzeur@hotmail.com",j
     password: "123456",
     role: "Manager",
     rate: 4300
@@ -23,7 +23,8 @@
     email: "manager2@mail.com",
     password: "123456",
     role: "Manager",
-    rate: 4500
+    rate: 4500,
+    isActive: false
   )
 
   analyst1 = User.create(
@@ -35,7 +36,7 @@
   )
 
   analyst2 = User.create(
-    name: "Lucia Analyst",
+    name: "Lian Analyst",
     email: "analyst2@mail.com",
     password: "123456",
     role: "Analyst",
@@ -55,7 +56,8 @@
     email: "analyst4@mail.com",
     password: "123456",
     role: "Analyst",
-    rate: 1300
+    rate: 1300,
+    isActive: false
   )
 
   #Create projects

rails-time-track/db/seeds.rb

@@ -8,10 +8,14 @@
     "@testing-library/react": "^8.0.4",
     "chart.js": "^2.8.0",
     "jest-fetch-mock": "^2.1.2",
+    "prop-types": "^15.7.2",
     "react": "^16.8.6",
+    "react-alert": "^5.5.0",
+    "react-alert-template-basic": "^1.0.0",
     "react-dom": "^16.8.6",
     "react-icons": "^3.7.0",
-    "react-scripts": "3.0.1"
+    "react-scripts": "3.0.1",
+    "react-transition-group": "^4.2.2"
   },
   "scripts": {
     "start": "PORT=4000 react-scripts start",

react-time-track/package.json

@@ -22,7 +22,6 @@ import MyStatus from "./views/my-status";
 
 function App() {
   const logged = React.useContext(UserContext);
-  const currentUser = React.useContext(UserContext).data;
 
   return (
     <Router>
@@ -51,10 +50,10 @@ function App() {
         <ProgressProjectUser path="/projects/:project_id/users/:user_id" />
         <ProgressProjectUser path="/users/:user_id/projects/:project_id" />
         <CreateProject path="/create-project" />
-        <CreateUser path="/create-user" />
-        <Users path="/users" />
         <DailyLog path="/daily-log" />
-        <EditUser path="edit-user/:user_id" />
+        <Users path="/users" />
+        <CreateUser path="/users/new" />
+        <EditUser path="/users/:user_id" />
       </Home>
     </Router>
   );