20200312

app/views/layouts/application.html.erb

@@ -21,18 +21,23 @@
           <li class="nav-item">
             <a class="nav-link" href="#"><li><%= link_to 'Home', root_path %></li></a>
           </li>
+          <% if !user_signed_in? %>
             <li class="nav-item">
               <a class="nav-link" href="#"><li><%= link_to 'Log In', new_user_session_path %></li></a>
             </li>
             <li class="nav-item">
               <a class="nav-link" href="#"><li><%= link_to 'Sign Up', new_user_registration_path %></li></a>
             </li>
+          <% end %>
           <li class="nav-item">
             <a class="nav-link" href="#"><li><%= link_to 'Profile', edit_user_registration_path %></li></a>
           </li>
+
+          <% if user_signed_in? %>
             <li class="nav-item">
               <a class="nav-link" href="#"><li><%= link_to 'Log out', destroy_user_session_path, method: :delete %></li></a>
             </li>
+          <% end %>
           <li class="nav-item">
             <a class="nav-link" href="#"><li><%= link_to 'Favorites'%></li></a>
           </li>
@@ -43,6 +48,20 @@
       </div>
       </nav>
 
+      <% if user_signed_in? %>
+          <ul class="nav-item">
+            <label><%= current_user.email %></label>
+          </ul>
+       <% end %>
+
+
+    <% if flash[:notice] %>
+      <p class="alert"><%= flash[:notice] %></p>
+    <% end %>
+    <% if flash[:alert] %>
+      <p class="alert"><%= flash[:alert] %></p>
+    <% end %>
+
       <%= yield %>
 
       <footer class="page-footer">

config/routes.rb

 Rails.application.routes.draw do
 
-  get 'industries/index'
-  get 'cities/index'
-  get '/detail/:id', to: 'jobs#show'
-  get '/joblist', to: 'jobs#index'
-  get '/citylist', to: 'cities#index'
-  get '/industrylist', to: 'industries#index'
-  get '/jobsearch' => 'jobs#search', as: :job_search
+  get 'detail/:id', to: 'jobs#show'
+  get 'jobs', to: 'jobs#index'
+  get 'cities', to: 'cities#index'
+  get 'industries', to: 'industries#index'
+  get 'jobs/search' => 'jobs#search', as: :job_search
 
   devise_for :users
 

config/setting.yml

+defaults: &defaults
+  ga_tracking_id: 'UA-2260154-19'
+  cookies:
+    expiration_time: 90
+
+  inquiry:
+    account_test:
+      name_words:
+        - 'じげん'
+        - '次元'
+        - 'jigexn'
+        - 'zigexn'
+        - 'zigen'
+        - 'ジゲン'
+      mail_word: zigexn
+      ips:
+        - 118.69.34.46
+        - 14.161.45.187
+        - 39.110.206.184
+        - 39.110.241.117
+  mailer:
+    inquiry:
+      bcc:
+        - 'p-kuruma-ex+dev@zigexn.vn'
+
+  er: 220
+
+development:
+  <<: *defaults
+  web_url: 'localhost:3000'
+  kuruma_host: 'http://kuruma-ex.dev'
+
+test:
+  <<: *defaults
+  web_url: 'localhost:3000'
+  chukosya_host: 'http://staging.chukosya-ex.jp'
+
+staging:
+  <<: *defaults
+  web_url: 'kuruma-ex-stg.zigexn.vn'
+  chukosya_host: 'http://staging.chukosya-ex.jp'
+
+production:
+  <<: *defaults
+  web_url: 'kuruma-ex.jp'