welcome controller, header nag style

app/controllers/home_controller.rb → app/controllers/welcome_controller.rb

-class HomeController < ApplicationController
+class WelcomeController < ApplicationController
   skip_before_action :require_login
   skip_before_action :require_login
 
 
   def top
   def top
     if user_signed_in?
     if user_signed_in?
       redirect_to flow_path, status: 301
       redirect_to flow_path, status: 301
     else
     else
-      render template: 'home/login'
+      render template: 'welcome/login'
     end
     end
   end
   end
 end
 end

app/helpers/home_helper.rb

-module HomeHelper
-end

app/views/layouts/application.html.slim

@@ -11,7 +11,7 @@ html lang="ja"
     = csrf_meta_tags
     = csrf_meta_tags
   body class="rails-#{params[:controller]}-#{params[:action]}"
   body class="rails-#{params[:controller]}-#{params[:action]}"
     = render partial: 'partials/header_notifications'
     = render partial: 'partials/header_notifications'
-    - if params[:controller] != 'home'
+    - if params[:controller] != 'welcome'
       = render partial: 'partials/app_header'
       = render partial: 'partials/app_header'
     .container.container-main
     .container.container-main
       = yield
       = yield

app/views/partials/_app_header.html.slim

@@ -18,12 +18,25 @@ nav.navbar.navbar-default.navbar-fixed-top role="navigation"
           a href=flow_path title="Frow"
           a href=flow_path title="Frow"
             | Flow
             | Flow
 
 
-      = form_tag(destroy_user_session_path, :method => :delete, class: 'navbar-form navbar-right') do
-        = submit_tag 'SignOut', class: 'btn btn-default'
-      .navbar-right
+
+      ul.nav.navbar-nav.navbar-right
+        li
+          form
             a.btn.btn-primary.navbar-btn href=new_post_path
             a.btn.btn-primary.navbar-btn href=new_post_path
               | Post  
               | Post  
               span.glyphicon.glyphicon-pencil
               span.glyphicon.glyphicon-pencil
-        img height="25" src=current_user.image_url width="25" /
+        li.dropdown
+          a.dropdown-toggle data-toggle="dropdown"
             = current_user.name
             = current_user.name
+            img src=current_user.image_url width="20" height="20"/
+            b.caret
+          ul.dropdown-menu
+            li
+              a Account (todo)
+            li
+              a Settings (todo)
+            li.divider
+            li
+              a href=destroy_user_session_path data-method="delete" rel="nofollow" SignOut
+
 
 

app/views/stock/show.html.slim

 /! view:stock/show
 /! view:stock/show
 .row
 .row
+
+  h1
+    | Stock
+    small  - 保存・蓄積された記事
+
   #sidebar.col-xs-6.col-md-4 role="navigation"
   #sidebar.col-xs-6.col-md-4 role="navigation"
     #tab-tree.tab-pane
     #tab-tree.tab-pane
       - cache('tag-tree', :expires_in => 1.hour) do
       - cache('tag-tree', :expires_in => 1.hour) do
         .list-group
         .list-group
           = Tag.posts_exist.decorate.tree_view
           = Tag.posts_exist.decorate.tree_view
+
   .col-xs-12.col-sm-6.col-md-8
   .col-xs-12.col-sm-6.col-md-8
     #list_post
     #list_post
       p#posts-placeholder style="color:#aaa;font-size:30px"  <-- Select a post...
       p#posts-placeholder style="color:#aaa;font-size:30px"  <-- Select a post...

app/views/home/login.html.slim → app/views/welcome/login.html.slim

-/! view:home/login
+/! view:welcome/login
 .login
 .login
   .container.marketing
   .container.marketing
     .row style=("margin-top: 40px")
     .row style=("margin-top: 40px")

config/routes.rb

@@ -3,7 +3,7 @@ Rendezvous::Application.routes.draw do
   post   'apis/markdown_preview'
   post   'apis/markdown_preview'
   post   'apis/file_receiver'
   post   'apis/file_receiver'
 
 
-  root   'home#top', as: 'root'
+  root   'welcome#top', as: 'root'
 
 
   get    'stock' => 'stock#show', as: 'stock'
   get    'stock' => 'stock#show', as: 'stock'
   get    'flow'  => 'flow#show',  as: 'flow'
   get    'flow'  => 'flow#show',  as: 'flow'

spec/acceptance/access.feature

@@ -3,12 +3,12 @@ Feature: アクセス制限
   Scenario: 非ログイン --> TOPページ
   Scenario: 非ログイン --> TOPページ
     When visit '/'
     When visit '/'
     Then response code is 200
     Then response code is 200
-    Then response includes '<!--view:home/login-->'
+    Then response includes '<!--view:welcome/login-->'
 
 
   Scenario: 非ログイン --> postsページ
   Scenario: 非ログイン --> postsページ
     When visit '/posts'
     When visit '/posts'
     Then response code is 200
     Then response code is 200
-    Then response includes '<!--view:home/login-->'
+    Then response includes '<!--view:welcome/login-->'
 
 
   # Scenario: 禁止ユーザーログイン --> TOPページ
   # Scenario: 禁止ユーザーログイン --> TOPページ
   #   Given login via google with 'taro@example.com'
   #   Given login via google with 'taro@example.com'
@@ -19,23 +19,23 @@ Feature: アクセス制限
   #   Given login via google with 'taro@example.com'
   #   Given login via google with 'taro@example.com'
   #   When visit '/posts'
   #   When visit '/posts'
   #   Then response code is 200
   #   Then response code is 200
-  #   Then response includes '<!--view:home/login-->'
+  #   Then response includes '<!--view:welcome/login-->'
 
 
   Scenario: ログイン --> TOPページ
   Scenario: ログイン --> TOPページ
     Given login
     Given login
     When visit '/'
     When visit '/'
     Then response code is 200
     Then response code is 200
-    Then response includes '<!--view:post/index-->'
+    Then response includes '<!--view:flow/show-->'
 
 
-  Scenario: ログイン --> postsページ
+  Scenario: ログイン --> flowページ
     Given login
     Given login
-    When visit '/posts'
+    When visit '/flow'
     Then response code is 200
     Then response code is 200
-    Then response includes '<!--view:post/index-->'
+    Then response includes '<!--view:flow/show-->'
 
 
   Scenario: ログイン --> ログアウト
   Scenario: ログイン --> ログアウト
     Given login
     Given login
     When logout
     When logout
     Then response code is 200
     Then response code is 200
-    Then response includes '<!--view:home/login-->'
+    Then response includes '<!--view:welcome/login-->'
 
 

spec/controllers/home_controller_spec.rb → spec/controllers/welcome_controller_spec.rb

 require 'spec_helper'
 require 'spec_helper'
 
 
-describe HomeController do
+describe WelcomeController do
 
 
   describe "GET 'top'" do
   describe "GET 'top'" do
     it 'should be successful' do
     it 'should be successful' do
@@ -21,8 +21,8 @@ describe HomeController do
 
 
       it 'should be successful' do
       it 'should be successful' do
         get :top
         get :top
-        expect(subject).to redirect_to controller: 'posts',
-                                       action: 'index'
+        expect(subject).to redirect_to controller: 'flow',
+                                       action: 'show'
       end
       end
 
 
       it 'should find the right user' do
       it 'should find the right user' do