Skip to content

Commit

Permalink
fix routes and configure logout button
Browse files Browse the repository at this point in the history
  • Loading branch information
gabrielgomeso committed Apr 3, 2024
1 parent 541fa63 commit 41694ed
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 43 deletions.
2 changes: 1 addition & 1 deletion app/controllers/books_controller.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class BooksController < ApplicationController
before_action :authenticate_user!
before_action :authenticate_user!, except: [:index, :show]

def index
@books = Book.all
Expand Down
76 changes: 42 additions & 34 deletions app/views/layouts/_navbar.html.erb
Original file line number Diff line number Diff line change
@@ -1,41 +1,49 @@
<nav class="navbar is-transparent container is-max-desktop mb-5" data-controller="navbar">
<div class="navbar-brand">
<a class="navbar-item" href="/">
<img src="<%= asset_path('alexandria.svg') %>" class="p-1" style="max-height: 5rem;" alt="Logo de Alexandria, formado por três silhouetas da estátua O Pensador, uma maior que a outra, cada uma em um tom mais claro do preto para o cinza">
<h1 class="p-2" style="font-family: 'TacOne Regular'; font-size: 2rem; letter-spacing: 2px;">ALEXANDRIA</h1>
</a>
<div class="navbar-burger mt-5" data-action="click->navbar#toggle">
<span></span>
<span></span>
<span></span>
</div>
</div>

<div class="navbar-menu" data-navbar-target="menu">
<div class="navbar-start">
<a class="navbar-item" href="/">
Início
</a>
<a class="navbar-item" href="/books">
Catálogo
</a>
<nav class="navbar is-transparent mb-5 has-background-grey-lighter" data-controller="navbar">
<div class="container is-max-desktop">
<div class="navbar-brand">
<a class="navbar-item" href="/">
Assinatura
</a>
<a class="navbar-item" href="/books/new">
Adicionar livro
<img src="<%= asset_path('alexandria.svg') %>" class="p-1" style="max-height: 5rem;" alt="Logo de Alexandria, formado por três silhouetas da estátua O Pensador, uma maior que a outra, cada uma em um tom mais claro do preto para o cinza">
<h1 class="p-2" style="font-family: 'TacOne Regular'; font-size: 2rem; letter-spacing: 2px;">ALEXANDRIA</h1>
</a>
<div class="navbar-burger mt-5" data-action="click->navbar#toggle">
<span></span>
<span></span>
<span></span>
</div>
</div>

<div class="navbar-end">
<div class="navbar-item">
<div class="field is-grouped">
<p class="control">
<%= link_to 'Entrar', new_user_session_path, class: "bd-tw-button button" %>
</p>
<p class="control">
<%= link_to 'Criar conta', new_user_registration_path, class: "button is-primary" %>
</p>
<div class="navbar-menu" data-navbar-target="menu">
<div class="navbar-start">
<a class="navbar-item" href="/">
Início
</a>
<a class="navbar-item" href="/books">
Catálogo
</a>
<a class="navbar-item" href="/">
Assinatura
</a>
<a class="navbar-item" href="/books/new">
Adicionar livro
</a>
</div>

<div class="navbar-end">
<div class="navbar-item">
<div class="field is-grouped">
<% if user_signed_in? %>
<p class="control">
<%= link_to 'Sair', destroy_user_session_path, class: "button is-danger" %>
</p>
<% else %>
<p class="control">
<%= link_to 'Entrar', new_user_session_path, class: "bd-tw-button button" %>
</p>
<p class="control">
<%= link_to 'Criar conta', new_user_registration_path, class: "button is-primary" %>
</p>
<% end %>
</div>
</div>
</div>
</div>
Expand Down
9 changes: 6 additions & 3 deletions app/views/welcome/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
<h1 class="title is-6">Hello, Rails!</h1>
<p class="subtitle">Find me in app/views/welcome/index.html.erb</p>
<h1>Falta arrumar o botão de sair qnd estiver logado, bloquear criação de livros para quem não é admin</h1>
<ul>

<li>Falta adicionar role de admin no User e bloquear adição de livro se o user não for admin</li>
<li>Adicionar perfil e informações do perfil no User</li>
<li>Adicionar tabela de estante, cada user tem uma estante, onde vai ficar registrado qnd os livros vão ser emprestados</li>
</ul>
2 changes: 1 addition & 1 deletion config/initializers/devise.rb
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@
# config.navigational_formats = ['*/*', :html, :turbo_stream]

# The default HTTP method used to sign out a resource. Default is :delete.
config.sign_out_via = :delete
config.sign_out_via = :destroy

# ==> OmniAuth
# Add a new OmniAuth provider. Check the wiki for more information on setting
Expand Down
9 changes: 5 additions & 4 deletions config/routes.rb
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
Rails.application.routes.draw do
devise_for :users, controllers: {
sessions: 'users/sessions'
}
devise_for :users

devise_scope :user do
get '/users/sign_out' => 'devise/sessions#destroy'
end

get 'welcome/index'
get "up" => "rails/health#show", as: :rails_health_check
resources :books


root 'welcome#index'
end

0 comments on commit 41694ed

Please sign in to comment.