From 3a8e25ef8ce561afc239dc405f541acbea447c27 Mon Sep 17 00:00:00 2001
From: Iliyan Ganev <ganeviliyan@gmail.com>
Date: Fri, 5 May 2017 18:29:12 -0700
Subject: [PATCH] Add some forms

---
 app/controllers/session_controller.rb |  4 +-
 app/controllers/user_controller.rb    | 61 +++++++++++++--------------
 app/views/sessions/new.erb            | 16 ++++---
 app/views/users/edit.erb              | 18 ++++++++
 app/views/users/index.erb             | 18 ++++++++
 app/views/users/new.erb               | 20 +++------
 app/views/users/show.erb              | 12 +++---
 7 files changed, 89 insertions(+), 60 deletions(-)
 create mode 100644 app/views/users/edit.erb
 create mode 100644 app/views/users/index.erb

diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb
index 4213dfb..e309f65 100644
--- a/app/controllers/session_controller.rb
+++ b/app/controllers/session_controller.rb
@@ -4,8 +4,8 @@
 
 
 post '/sessions' do
-  @user = User.where(username: params[:user][:username]).first
-  if @user && @user.authenticate?(params[:user][:password])
+  @user = User.where(username: params[:username]).first
+  if @user && @user.authenticate?(params[:password])
     session[:id] = @user.id
     redirect "/users/#{@user.id}"
   else
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index e5ef6c7..835484c 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -1,9 +1,9 @@
-# #index
-# get '/users' do
-#   @users = User.all
-#   @users.map{|user| user.email.to_s}
-#   erb :'users/index'
-# end
+#index get all users info
+get '/users' do
+  @users = User.all
+  @users.map{|user| user.email.to_s}
+  erb :'users/index'
+end
 
 
 #new
@@ -32,38 +32,37 @@
 end
 
 
+#edit
+get '/users/:id/edit' do
+  @user = User.find(params[:id])
+  erb :'users/edit'
+end
 
-# #edit
-# get '/users/:id/edit' do
-#   @user = User.find(params[:id])
-#   erb :'users/edit'
-# end
-
-# #update
-# def update_user
-#   @user = User.find(params[:id])
-#   @user.update(params[:user])
-#   if @user.valid?
-#     redirect "/users/#{@user.id}"
-#   else
-#     @errors = @user.errors.full_messages
-#     erb :'users/edit'
-#   end
-# end
+#update
+def update_user
+  @user = User.find(params[:id])
+  @user.update(params[:user])
+  if @user.valid?
+    redirect "/users/#{@user.id}"
+  else
+    @errors = @user.errors.full_messages
+    erb :'users/edit'
+  end
+end
 
 # patch '/users/:id' do
 #   update_user
 # end
 
-# put '/users/:id' do
-#   update_user
-# end
+put '/users/:id' do
+  update_user
+end
 
 
-# #delete
-# delete '/users/:id' do
-#   User.find(params[:id]).destroy!
-#   redirect '/users'
-# end
+#delete
+delete '/users/:id' do
+  User.find(params[:id]).destroy!
+  redirect '/users'
+end
 
 
diff --git a/app/views/sessions/new.erb b/app/views/sessions/new.erb
index 89d55bb..8277833 100644
--- a/app/views/sessions/new.erb
+++ b/app/views/sessions/new.erb
@@ -1,12 +1,14 @@
-<h1> sessions/new   page </h1>
-<form method = "post" action = "/sessions">
-<label>Username:</label>
-<input type = "text" name = "user[username]">
+<h1>Login</h1>
 <br>
-<label>Password:</label>
-<input type = "password" name = "user[password]">
 <br>
-<input type = "submit", value = "Login">
+<form action = "/sessions" method = "post">
+  <label>Username:</label><br>
+  <input type = "text" name = "username">
+  <br>
+  <label>Password:</label><br>
+  <input type = "password" name = "password">
+  <br>
+  <input type = "submit", value = "Login">
 </form>
 
 <%= erb :'_errors' %>
diff --git a/app/views/users/edit.erb b/app/views/users/edit.erb
new file mode 100644
index 0000000..49e1510
--- /dev/null
+++ b/app/views/users/edit.erb
@@ -0,0 +1,18 @@
+<h1>Edit user details</h1>
+
+
+<form method="post" action="/users/<%= @user.id %>">
+    <input type="hidden" name="_method" value="put" />
+
+    <label for="username">username:</label><br>
+    <input id="user_name" name="user[username]" type="text" value="<%= @user.username %>"><br>
+
+    <label for="user_email">Email</label><br>
+    <input id="user_email" name="user[email]" type="text" value="<%=@user.email %>"/><br>
+
+    <label for="user_password">Password</label><br>
+    <input id="user_password" name="user[password]" type="password"/>
+
+    <input type="submit" value="Edit User" class="button">
+</form>
+
diff --git a/app/views/users/index.erb b/app/views/users/index.erb
new file mode 100644
index 0000000..83b076c
--- /dev/null
+++ b/app/views/users/index.erb
@@ -0,0 +1,18 @@
+<h1>All Users</h1>
+<div class="users">
+  <ul>
+    <% @users.each do |user| %>
+      <li><%= "#{user.username} - #{user.email}"%> - <a href="/users/<%=user.id %>">Show details</a>
+      <a href="/users/<%=user.id %>/edit">Edit</a>
+
+      <form method="post" action="/users/<%=user.id %>">
+      <input name="_method" type="hidden" value="delete" />
+      <input name="commit" type="submit" value="Delete"/>
+      </form>
+      </li>
+    <% end %>
+  </ul>
+</div>
+
+
+
diff --git a/app/views/users/new.erb b/app/views/users/new.erb
index 2dc4539..4efbaa3 100644
--- a/app/views/users/new.erb
+++ b/app/views/users/new.erb
@@ -1,20 +1,10 @@
-<h1>NEW USER PAGE</h1>
-</br>
-</br>
+<h1>New User Page</h1>
 
 <form method = "post" action = "/users">
-<label>username:</label>
-<input type = "text" name = "user[username]">
-</br>
-<label>email:</label>
-<input type = "email" name = "user[email]">
-<br>
-<label>Password:</label>
-<input type = "password" name = "user[password]">
-<br>
-<input type = "submit", value = "Register User">
+    <input type = "text" name = "user[username]" value="<%=@user.username %>" placeholder="enter username"><br>
+    <input type = "email" name = "user[email]" value="<%=@user.email %>" placeholder="enter email"><br>
+    <input type = "password" name = "user[password]" placeholder="enter password"><br>
+    <input type = "submit", value = "Register User">
 </form>
 
-
-
 <%= erb :'_errors' %>
diff --git a/app/views/users/show.erb b/app/views/users/show.erb
index dc361fb..2465b00 100644
--- a/app/views/users/show.erb
+++ b/app/views/users/show.erb
@@ -1,12 +1,14 @@
 
-<h1>Page showing User info with option to logout or do other things</h1>
+<h1>users show</h1>
 
 <h1><%= @user.username%> </h1>
-
+<h1><%= @user.email%> </h1>
 <form method = "post" action = "/sessions/:id">
-<input type = "hidden" name = "_method" value = "delete">
-<input type = "submit" value = "logout">
+  <input type = "hidden" name = "_method" value = "delete">
+  <input type = "submit" value = "logout">
 </form>
 
+<a href='/users'>show all users</a>
+
+
 
-<a href='/restaurants/new'>DO A THING</a>