-
+
+
+
+
+
+
-
+
+
+
+
+
- <% if current_user %>
- <% if (current_user.role_id == 1) %>
- <%= link_to "Albums", albums_path%>
- <%= link_to "
- <% else %>
- <%= link_to "Álbums", albums_path%>
- <%= link_to "Playlist", playlists_path%>
- <%= link_to "Favoritos", favoritesongs_path%>
- <%= link_to "
- <% end %>
+ <% if current_user %>
+ <% if (current_user.role_id == 1) %>
+ <%= link_to "Álbuns", albums_path%>
+ <%= link_to "
<% else %>
- Registrar Logar <%= link_to "Álbuns", albums_path %>
+ <%= link_to "Playlists", playlists_path%>
+ <%= link_to "Favoritos", favoritesongs_path%>
+ <%= link_to "
<% end %>
+ <% else %>
+ Registrar Log in
-
-
+
+
+
+
+
+
-
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index f39cad9..56bf746 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -2,16 +2,26 @@
AmadeusProjeto
+
<%= csrf_meta_tags %>
<%= csp_meta_tag %>
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
+ <%= javascript_include_tag 'application.js', "https://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js" %>
+
+
+ <% #NAVBAR SEM FUNDO NA HOMEPAGE %>
+ <% if content_for? :nav %>
+ <%= content_for :nav %>
+ <% else %>
<%= render 'layouts/navbar' %>
- <%= yield %>
+ <% end %>
+
+ <%= yield %>
diff --git a/app/views/layouts/cards/_edu.html.erb b/app/views/layouts/cards/_edu.html.erb
new file mode 100644
index 0000000..f709e7e
--- /dev/null
+++ b/app/views/layouts/cards/_edu.html.erb
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
Eduardo Marques
+
Olá! Sou um estudante de graduação da Universidade de Brasília, colecionador de jogos e programador nas horas vagas.
+
+
+
+
+
diff --git a/app/views/layouts/cards/_kayran.html.erb b/app/views/layouts/cards/_kayran.html.erb
new file mode 100644
index 0000000..07227ee
--- /dev/null
+++ b/app/views/layouts/cards/_kayran.html.erb
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
Kayran Vieira
+
Criado em um laboratório na URSS por Rasputin, eu sou um homem com o objetivo não só de defender a fé católica, mas também de programar no tempo livre.
+
+
+
+
+
+
diff --git a/app/views/layouts/cards/_pedro.html.erb b/app/views/layouts/cards/_pedro.html.erb
new file mode 100644
index 0000000..22eb47f
--- /dev/null
+++ b/app/views/layouts/cards/_pedro.html.erb
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
Pedro Venzi
+
Bom dia! Sim, bom dia. Sou calouro de Engenharia de Computação na Universidade de Brasília e estou dando meus primeiros passos no mundo da programação.
+ Fora isso, invisto meu tempo em um trompete e em um jogo chamando Counter-Strike .
+
+
+
+
+
diff --git a/app/views/playlists/index.html.erb b/app/views/playlists/index.html.erb
index 4bef19f..3f6909a 100644
--- a/app/views/playlists/index.html.erb
+++ b/app/views/playlists/index.html.erb
@@ -16,7 +16,7 @@
Editar
-
<%= link_to 'Remover', playlist_path(playlist), method: 'delete', data: { confirm: 'Você tem certeza?' }, :class=>'btn btn-outline-dark btn-lg' %>
+
<%= link_to 'Remover', delete_playlist_path(playlist), method: 'delete', data: { confirm: 'Você tem certeza?' }, :class=>'btn btn-outline-dark btn-lg' %>
<% end %>
diff --git a/app/views/songs/index.html.erb b/app/views/songs/index.html.erb
index 139bfe2..119c468 100644
--- a/app/views/songs/index.html.erb
+++ b/app/views/songs/index.html.erb
@@ -23,7 +23,7 @@
<% if @current_user.role_id == 2 %>
<% if @favorites.where(song: song).present? %>
- <%= link_to "
+ <%= link_to "
<% else %>
<%= link_to "
<% end %>
diff --git a/app/views/songs/show.html.erb b/app/views/songs/show.html.erb
index 53e145e..5a5a943 100644
--- a/app/views/songs/show.html.erb
+++ b/app/views/songs/show.html.erb
@@ -7,7 +7,7 @@
<% if @current_user.artist.id == @song.album.artist.id %>
<%= button_to "Todas as músicas", songs_path, method: :get, :class=> "btn btn-outline-dark" %>
<%= button_to "Editar música", edit_song_path(@song), method: :get, :class=> "btn btn-outline-dark" %>
- <%= button_to 'remover música', song_path(@song), method: 'delete', data: { confirm: 'Você tem certeza?' }, :class=> "btn btn-outline-dark" %>
+ <%= button_to 'remover música', delete_song_path(@song), method: 'delete', data: { confirm: 'Você tem certeza?' }, :class=> "btn btn-outline-dark" %>
<% end %>
<% end %>
diff --git a/config/routes.rb b/config/routes.rb
index 2197e98..43f7577 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,20 +1,75 @@
Rails.application.routes.draw do
# For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
root "application#homepage"
- resources :songs
- resources :albums
- resources :favoritesongs
+
+ # resources :songs
+ scope 'songs' do
+ get '/new', to: 'songs#new', as: :new_song
+ post '/new', to: 'songs#create'
+ get '/show/:id', to: 'songs#show', as: :song
+ get '/', to: 'songs#index', as: :songs
+ get '/edit/:id', to: 'songs#edit', as: :edit_song
+ patch '/edit/:id', to: 'songs#update'
+ delete '/delete/:id', to: 'songs#destroy', as: :delete_song
+ end
+
+ # resources :albums
+ scope 'albums' do
+ get '/new', to: 'albums#new', as: :new_album
+ post '/new', to: 'albums#create'
+ get '/show/:id', to: 'albums#show', as: :album
+ get '/', to: 'albums#index', as: :albums
+ get '/edit/:id', to: 'albums#edit', as: :edit_album
+ patch '/edit/:id', to: 'albums#update'
+ delete '/delete/:id', to: 'albums#destroy', as: :delete_album
+ end
+
+ # resources :favoritesongs
+ scope 'favoritesongs' do
+ get '/new', to: 'favoritesongs#new', as: :new_favoritesong
+ post '/new', to: 'favoritesongs#create'
+ get '/show/:id', to: 'favoritesongs#show', as: :favoritesong
+ get '/', to: 'favoritesongs#index', as: :favoritesongs
+ get '/edit/:id', to: 'favoritesongs#edit', as: :edit_favoritesong
+ patch '/edit/:id', to: 'favoritesongs#update'
+ delete '/delete/:id', to: 'favoritesongs#destroy', as: :delete_favoritesong
+ end
+
resources :songplaylists, only: [:new, :create, :destroy]
- resources :playlists
+ # scope 'songplaylists' do
+ # get '/new', to: 'favoritesongs#new', as: :new_songplaylist
+ # post '/new', to: 'favoritesongs#create', as: :songplaylists
+ # delete '/delete/:id', to: 'favoritesongs#destroy', as: :delete_songplaylist
+ # end
+
+ # resources :playlists
+ scope 'playlists' do
+ get '/new', to: 'playlists#new', as: :new_playlist
+ post '/new', to: 'playlists#create'
+ get '/show/:id', to: 'playlists#show', as: :playlist
+ get '/', to: 'playlists#index', as: :playlists
+ get '/edit/:id', to: 'playlists#edit', as: :edit_playlist
+ patch '/edit/:id', to: 'playlists#update'
+ delete '/delete/:id', to: 'playlists#destroy', as: :delete_playlist
+ end
+ # Login
scope 'users' do
get 'novo_usuario', to: 'users#new', as: :new_user
post 'novo_usuario', to: 'users#create'
end
+ # Register
scope 'auth' do
get 'login', to: 'sessions#new', as: :login
post 'login', to: 'sessions#create'
delete 'logout', to: 'sessions#destroy', as: :logout
end
end
+
+# Mensagem para erros '-'
+
+# match '/401', to: 'errors#unauthorized', via: :all, as: :error_401
+# match '/404', to: 'errors#not_found', via: :all, as: :error_404
+# match '/422', to: 'errors#unprocessable_entity', via: :all, as: :error_422
+# match '/500', to: 'errors#internal_server_error', via: :all, as: :error_500
\ No newline at end of file
- 
- 
- 
- 
- 
-