diff --git a/.DS_Store b/.DS_Store index 1f6973b..a2ff93b 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/app/views/.DS_Store b/app/views/.DS_Store index b282a06..f3625e8 100644 Binary files a/app/views/.DS_Store and b/app/views/.DS_Store differ diff --git a/app/views/homepage/.DS_Store b/app/views/homepage/.DS_Store new file mode 100644 index 0000000..e037a2e Binary files /dev/null and b/app/views/homepage/.DS_Store differ diff --git a/app/views/homepage/index.html.erb b/app/views/homepage/index.html.erb index e83922e..ae2ee15 100644 --- a/app/views/homepage/index.html.erb +++ b/app/views/homepage/index.html.erb @@ -1,5 +1,5 @@ - +

Are you game?

Welcome to Restaurant Bingo, the game where you eat your way to success!

diff --git a/app/views/sessions/.DS_Store b/app/views/sessions/.DS_Store index a5b3d37..4a11386 100644 Binary files a/app/views/sessions/.DS_Store and b/app/views/sessions/.DS_Store differ diff --git a/app/views/sessions/_loginpartial.html.erb b/app/views/sessions/_loginpartial.html.erb new file mode 100644 index 0000000..c985025 --- /dev/null +++ b/app/views/sessions/_loginpartial.html.erb @@ -0,0 +1,27 @@ +
+ <% if flash[:alert] %> +

+ <%= flash[:alert] %>

+ <% end %> + + <%= form_tag do %> +
+ Please Log In +
+ + <%= text_field_tag :username, params[:username] %> +
+ +
+ + <%= password_field_tag :password, params[:password] %> +
+ +
+ <%= submit_tag "Login" %> +
+ +
+ + <% end %> +
\ No newline at end of file diff --git a/app/views/users/.DS_Store b/app/views/users/.DS_Store index 0da7d7e..c585f54 100644 Binary files a/app/views/users/.DS_Store and b/app/views/users/.DS_Store differ diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 9e8488e..f3b6114 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -7,7 +7,7 @@ Lastname Username Timestamp - Hash password + @@ -20,7 +20,7 @@ <%= user.lastname %> <%= user.username %> <%= user.timestamp %> - <%= user.hash_password %> + <%= link_to 'Show', user %> <%= link_to 'Edit', edit_user_path(user) %> <%= link_to 'Destroy', user, :confirm => 'Are you sure?', :method => :delete %> diff --git a/db/.DS_Store b/db/.DS_Store index 4993841..f2bab61 100644 Binary files a/db/.DS_Store and b/db/.DS_Store differ