Create teams controller and adjust navbar

canan8 · May 16, 2020 · a951380 · a951380
1 parent d916dca
commit a951380
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 19 deletions.
diff --git a/app/assets/stylesheets/teams.scss b/app/assets/stylesheets/teams.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the teams controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: https://sass-lang.com/
diff --git a/app/controllers/teams_controller.rb b/app/controllers/teams_controller.rb
@@ -0,0 +1,5 @@
+class TeamsController < ApplicationController
+  def index
+    @teams = Team.all
+  end
+end
diff --git a/app/helpers/teams_helper.rb b/app/helpers/teams_helper.rb
@@ -0,0 +1,2 @@
+module TeamsHelper
+end
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
@@ -16,10 +16,10 @@ require('jquery')
 //
 // const images = require.context('../images', true)
 // const imagePath = (name) => images(name, true)
+// $( document ).ready(function() {
+//   $('.ui.dropdown').dropdown();
+// });
 
-$(document).on('turbolinks:load', function() {
-  $('.item').click(function(e) {
-    $('.active').removeClass('active');
-    $(this).addClass('active');
-});
+$(document).on('turbolinks:load', function () {
+  // $('.ui.dropdown').dropdown(); use this later on @canan
 })
diff --git a/app/views/layouts/_navigation.html.erb b/app/views/layouts/_navigation.html.erb
@@ -1,13 +1,14 @@
-<div class="ui inverted segment">
-  <div class="ui inverted secondary pointing menu">
-    <a class="active item">
-      Home
-    </a>
-    <a class="item">
-      Teams
-    </a>
-    <a class="item">
-      Account
-    </a>
+<%= link_to 'Pretro', root_path, class: 'item' %>
+<%= link_to 'Home', root_path, class: 'item' %>
+<%= link_to 'Teams', teams_path, class: 'item' %>
+<div class="right menu">
+  <div class="ui simple dropdown item" id="dropdown">
+    Account <i class="dropdown icon"></i>
+    <div class="menu">
+      <%= link_to 'Profile', root_path, class: 'item' %>
+      <%= link_to 'Settings', root_path, class: 'item' %>
+      <div class="divider"></div>
+      <%= link_to 'Log out', root_path, class: 'item' %>
+    </div>
   </div>
 </div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -10,9 +10,11 @@
   </head>
 
   <body>
-    <div class="ui container">
-      <%= render 'layouts/navigation' %>
-      <%= yield %>
+    <div class="ui inverted menu">
+      <div class="ui container">
+        <%= render 'layouts/navigation'%>
+      </div>
     </div>
+    <%= yield %>
   </body>
 </html>
diff --git a/app/views/teams/index.html.erb b/app/views/teams/index.html.erb
@@ -0,0 +1,5 @@
+<% @teams.each do |team| %>
+<ul>
+  <li> <%= team.name %> </li>
+</ul>
+<% end %>
diff --git a/config/routes.rb b/config/routes.rb
@@ -2,4 +2,5 @@
   devise_for :users
   resources :users, only: [:show, :index]
   root 'welcome#index'
+  get 'teams', to: 'teams#index'
 end
diff --git a/test/controllers/teams_controller_test.rb b/test/controllers/teams_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class TeamsControllerTest < ActionDispatch::IntegrationTest
+  # test "the truth" do
+  #   assert true
+  # end
+end