Merge pull request #3 from enpitut2018/introduce-materialize

Introduce and Apply materialize
enpitut2018 · Jul 25, 2018 · e2adc50 · e2adc50
2 parents 45931f8 + e509eb8
commit e2adc50
Show file tree

Hide file tree

Showing 13 changed files with 70 additions and 77 deletions.
diff --git a/Gemfile b/Gemfile
@@ -37,6 +37,9 @@ gem 'jbuilder', '~> 2.5'
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
 
+gem 'materialize-sass'
+gem 'jquery-rails'
+
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', '>= 1.1.0', require: false
 

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -14,3 +14,5 @@
 //= require activestorage
 //= require turbolinks
 //= require_tree .
+//= require jquery
+//= require materialize-sprockets
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -0,0 +1,2 @@
+@import 'materialize';
+@import "https://fonts.googleapis.com/icon?family=Material+Icons";
diff --git a/app/views/assigns/_form.html.erb b/app/views/assigns/_form.html.erb
@@ -18,7 +18,7 @@
 
   <div class="field">
     <% if user_signed_in? %>
-      <input name="user_id" type="hidden" value=<%= current_user[:id] %>>
+      <input name="assign[user_id]" type="hidden" value=<%= current_user.id %>>
     <% else %>
       <%= form.label :user_id %>
       <%= form.number_field :user_id %>
@@ -31,6 +31,6 @@
   </div>
 
   <div class="actions">
-    <%= form.submit %>
+    <%= form.submit :class=>"waves-effect waves-light btn" %>
   </div>
 <% end %>
diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
@@ -9,8 +9,6 @@
   </div>
 
   <div class="actions">
-    <%= f.submit "Resend confirmation instructions" %>
+    <%= f.submit "Resend confirmation instructions", :class=>"waves-effect waves-light btn" %>
   </div>
 <% end %>
-
-<%= render "devise/shared/links" %>
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
@@ -9,7 +9,7 @@
   </div>
 
   <div class="actions">
-    <%= f.submit "Send me reset password instructions" %>
+    <%= f.submit "Send me reset password instructions", :class=>"waves-effect waves-light btn" %>
   </div>
 <% end %>
 

diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
@@ -16,19 +16,17 @@
   <div class="field">
     <%= f.label :password %>
     <% if @minimum_password_length %>
-    <em>(<%= @minimum_password_length %> characters minimum)</em>
-    <% end %><br />
+    (<%= @minimum_password_length %> characters minimum)
+    <% end %>
     <%= f.password_field :password, autocomplete: "off" %>
   </div>
 
   <div class="field">
     <%= f.label :password_confirmation %><br />
     <%= f.password_field :password_confirmation, autocomplete: "off" %>
   </div>
-  
-   <div class="actions">
-    <%= f.submit "Sign up" %>
+
+  <div class="actions">
+    <%= f.submit "Sign up", :class=>"waves-effect waves-light btn" %>
   </div>
 <% end %>
-
-<%= render "devise/shared/links" %>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
@@ -19,8 +19,6 @@
   <% end -%>
 
   <div class="actions">
-    <%= f.submit "Log in" %>
+    <%= f.submit "Log in", :class=>"waves-effect waves-light btn" %>
   </div>
 <% end %>
-
-<%= render "devise/shared/links" %>
diff --git a/app/views/jobs/_form.html.erb b/app/views/jobs/_form.html.erb
@@ -18,7 +18,7 @@
 
   <div class="field">
     <% if user_signed_in? %>
-      <input name="user_id" type="hidden" value=<%= current_user[:id] %>>
+      <input name="job[user_id]" type="hidden" value=<%= current_user.id %>>
     <% else %>
       <%= form.label :user_id %>
       <%= form.number_field :user_id %>
@@ -31,6 +31,6 @@
   </div>
 
   <div class="actions">
-    <%= form.submit %>
+    <%= form.submit :class=>"waves-effect waves-light btn" %>
   </div>
 <% end %>
diff --git a/app/views/jobs/index.html.erb b/app/views/jobs/index.html.erb
@@ -1,14 +1,3 @@
-<p id="notice"><%= notice %></p>
-
-<% @users.each do |u| %>
-<%= u.id %>
-<%= u.email %>
-<% end %>
-
-<%= link_to 'ログアウト', 'users/sign_out', method: :delete %>
-<%= link_to 'ログイン', 'users/sign_in', method: :get %>
-<%= link_to '登録', 'users/sign_up', method: :get %>
-
 <h1>Jobs</h1>
 
 <table>

diff --git a/app/views/jobs/show.html.erb b/app/views/jobs/show.html.erb
@@ -1,35 +1,39 @@
-<p id="notice"><%= notice %></p>
+<div class="row">
+  <div class="col s12 m6">
+    <div class="card">
+      <div class="card-content">
+        <div class="card-title">
+          <span><%= @job.title %></span>
+          <div class="chip"><%= @job.user_id %></div>
+        </div>
+        <p><%= @job.description%></p>
+      </div>
+      <div class="card-action">
+        <%= link_to 'Edit', edit_job_path(@job) %>
+        <%= link_to 'Back', jobs_path %>
+      </div>
+    </div>
+  </div>
+</div>
 
-<p>
-  <strong>Title:</strong>
-  <%= @job.title %>
-</p>
-
-<p>
-  <strong>User:</strong>
-  <%= @job.user_id %>
-</p>
-
-<p>
-  <strong>description:</strong>
-  <%= @job.description %>
-</p>
-
-<%= link_to 'Edit', edit_job_path(@job) %> |
-<%= link_to 'Back', jobs_path %>
-
-<% if current_user.id == @job.user_id %>
+<% if current_user.id == @job.user_id.to_s %>
   <%= button_to "問い合わせ一覧", worker_list_job_path(@job), method: :get %>
 <% else %>
   <%= form_tag({ :controller => 'jobs', :action => 'create_message'},{ :method => :post}) do %>
+    <%= label "Message", :message %>
     <%= text_field_tag :message %>
     <%= hidden_field_tag :from_id, current_user.id %>
     <%= hidden_field_tag :to_id, @employer.id %>
-    <%= submit_tag "送信" %>
-    <% @chat_list.each do |chat| %>
-      <br>
-      <%= chat.from_id %>
-      <%= chat.message %>
-    <% end %>
+    <%= submit_tag "Send", :class=>"waves-effect waves-light btn" %>
+    <br />
+    <ul class="collection">
+    </li>
+      <% @chat_list.each do |chat| %>
+        <li class="collection-item">
+          <span class="title"><%= chat.created_at %></span>
+          <p><%= chat.message %></p>
+        </li>
+      <% end %>
+    </ul>
   <% end %>
-<% end %>
+<% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -1,21 +1,35 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>TsukubaScourcing</title>
+    <title>TsukubaSourcing</title>
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
 
-    <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
+    <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
   </head>
 
   <body>
+  <nav>
+    <div class="nav-wrapper">
+      <a href="#" class="brand-logo">Tsukuba Sourcing</a>
+      <ul id="nav-mobile" class="right hide-on-med-and-down">
+        <li><a href="/jobs">Jobs</a></li>
+        <li><a href="/jobs/new">Add Job</a></li>
+        <% if user_signed_in? %>
+          <li><a href="#"><%= current_user[:name] %></a></li>
+          <li><a href="/users/sign_out">Sign Out</a></li>
+        <% else %>
+          <li><a href="/users/sign_up">Sign Up</a></li>
+          <li><a href="/users/sign_in">Sign In</a></li>
+        <% end %>
+      </ul>
+    </div>
+  </nav>
+  <div class="container">
     <p class="notice"><%= notice %></p>
     <p class="alert"><%= alert %></p>
-    <% if user_signed_in? %>
-      <p>user: <%= current_user[:name] %></p>
-      <a href="/users/sign_out">sign out</a>
-    <% end %>
     <%= yield %>
+  </div>
   </body>
 </html>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		@import 'materialize';
		@import "https://fonts.googleapis.com/icon?family=Material+Icons";