Skip to content

Added admin login and edit profile functionality #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Galiant merged 1 commit into from
Apr 20, 2018
Merged

Added admin login and edit profile functionality #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/views/items/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<a href = "/cart/<%= item.id %>" class = "button">Add to cart</a>
<%= link_to 'Show', item, :class => "button", :role => "button" %>

<% if user_signed_in? %>
<% if session[:login] == 1 %>
<%= link_to 'Edit', edit_item_path(item), :class => "button", :role => "button" %>
<%= link_to 'Destroy', item, method: :delete, data: { confirm: 'Are you sure?' }, :class => "button", :role => "button" %></td>
<% end %>
Expand Down
9 changes: 8 additions & 1 deletion app/views/layouts/_header.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,19 @@
<li><%= link_to "Cart", cart_path %></li>

<% if user_signed_in? %>
<li><a href="#">Hi <%= current_user.email %></a></li>
<li><%= link_to 'Edit Profile', edit_user_registration_path %></li>
<li><%= link_to 'Sign Out', destroy_user_session_path, :method =>:delete %></li>
<% else %>
<li><%= link_to 'Register', new_user_registration_path %></li>
<li><%= link_to 'Sign In', new_user_session_path %></li>
<% end %>

<% if session[:login] == 1 %>
<li><%= link_to "Admin Logout", logout_path %></li>
<% else %>
<li><%= link_to "Admin Login", login_path %></li>
<% end %>




Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Gamestore</title>
<title>GameLand</title>
<%= csrf_meta_tags %>

<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
Expand Down
Binary file modified db/development.sqlite3
View file
Open in desktop
Binary file not shown.