Commit 1de4d68a by tady

welcome controller, header nag style

parent c2bc335f
class HomeController < ApplicationController
class WelcomeController < ApplicationController
skip_before_action :require_login
def top
if user_signed_in?
redirect_to flow_path, status: 301
else
render template: 'home/login'
render template: 'welcome/login'
end
end
end
......@@ -11,7 +11,7 @@ html lang="ja"
= csrf_meta_tags
body class="rails-#{params[:controller]}-#{params[:action]}"
= render partial: 'partials/header_notifications'
- if params[:controller] != 'home'
- if params[:controller] != 'welcome'
= render partial: 'partials/app_header'
.container.container-main
= yield
......
......@@ -18,12 +18,25 @@ nav.navbar.navbar-default.navbar-fixed-top role="navigation"
a href=flow_path title="Frow"
| Flow
= form_tag(destroy_user_session_path, :method => :delete, class: 'navbar-form navbar-right') do
= submit_tag 'SignOut', class: 'btn btn-default'
.navbar-right
a.btn.btn-primary.navbar-btn href=new_post_path
| Post&nbsp;&nbsp;
span.glyphicon.glyphicon-pencil
img height="25" src=current_user.image_url width="25" /
= current_user.name
ul.nav.navbar-nav.navbar-right
li
form
a.btn.btn-primary.navbar-btn href=new_post_path
| Post&nbsp;&nbsp;
span.glyphicon.glyphicon-pencil
li.dropdown
a.dropdown-toggle data-toggle="dropdown"
= 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
/! view:stock/show
.row
h1
| Stock
small - 保存・蓄積された記事
#sidebar.col-xs-6.col-md-4 role="navigation"
#tab-tree.tab-pane
- cache('tag-tree', :expires_in => 1.hour) do
.list-group
= Tag.posts_exist.decorate.tree_view
.col-xs-12.col-sm-6.col-md-8
#list_post
p#posts-placeholder style="color:#aaa;font-size:30px" &lt;-- Select a post...
/! view:home/login
/! view:welcome/login
.login
.container.marketing
.row style=("margin-top: 40px")
......
Rendezvous::Application.routes.draw do
post 'apis/markdown_preview'
post 'apis/file_receiver'
post 'apis/markdown_preview'
post 'apis/file_receiver'
root 'home#top', as: 'root'
root 'welcome#top', as: 'root'
get 'stock' => 'stock#show', as: 'stock'
get 'flow' => 'flow#show', as: 'flow'
get 'search' => 'search#show', as: 'search'
get 'stock' => 'stock#show', as: 'stock'
get 'flow' => 'flow#show', as: 'flow'
get 'search' => 'search#show', as: 'search'
get 'posts/:id/fork' => 'posts#fork', as: 'fork_post'
post 'posts/:id/mail' => 'posts#mail', as: 'mail_post'
......
......@@ -3,12 +3,12 @@ Feature: アクセス制限
Scenario: 非ログイン --> TOPページ
When visit '/'
Then response code is 200
Then response includes '<!--view:home/login-->'
Then response includes '<!--view:welcome/login-->'
Scenario: 非ログイン --> postsページ
When visit '/posts'
Then response code is 200
Then response includes '<!--view:home/login-->'
Then response includes '<!--view:welcome/login-->'
# Scenario: 禁止ユーザーログイン --> TOPページ
# Given login via google with 'taro@example.com'
......@@ -19,23 +19,23 @@ Feature: アクセス制限
# Given login via google with 'taro@example.com'
# When visit '/posts'
# Then response code is 200
# Then response includes '<!--view:home/login-->'
# Then response includes '<!--view:welcome/login-->'
Scenario: ログイン --> TOPページ
Given login
When visit '/'
Then response code is 200
Then response includes '<!--view:post/index-->'
Then response includes '<!--view:flow/show-->'
Scenario: ログイン --> postsページ
Scenario: ログイン --> flowページ
Given login
When visit '/posts'
When visit '/flow'
Then response code is 200
Then response includes '<!--view:post/index-->'
Then response includes '<!--view:flow/show-->'
Scenario: ログイン --> ログアウト
Given login
When logout
Then response code is 200
Then response includes '<!--view:home/login-->'
Then response includes '<!--view:welcome/login-->'
require 'spec_helper'
describe HomeController do
describe WelcomeController do
describe "GET 'top'" do
it 'should be successful' do
......@@ -21,8 +21,8 @@ describe HomeController do
it 'should be successful' do
get :top
expect(subject).to redirect_to controller: 'posts',
action: 'index'
expect(subject).to redirect_to controller: 'flow',
action: 'show'
end
it 'should find the right user' do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment