Update form for Privacy-Policy

Author: Yuma Soga

app/assets/javascripts/application.js

@@ -15,5 +15,5 @@
 //= require jquery3
 //= require toastr
 //= require popper
-//= require bootstrap-sprockets
+//= require bootstrap
 //= require_tree .

app/assets/javascripts/tool-tips.coffee

@@ -0,0 +1,2 @@
+$ ->
+  $('[data-toggle="tooltip"]').tooltip()

app/assets/stylesheets/bootstrap-creative/_other-sections.scss

@@ -14,3 +14,6 @@
     vertical-align: top;
   }
 }
+#supporters.bg-dark{
+  background-color: $gray-100 !important;
+}

app/controllers/application_controller.rb

@@ -18,7 +18,8 @@ def put_ver_link
         { url: "#{root_url}pages", text: "ページ一覧" },
         { url: "#{root_url}regulation", text: "会則" },
         { url:  "#{root_url}visit-interview", text: "見学・取材について" },
-        { url:  "#{root_url}f-and-q", text: "よくある質問 (F&Q)"}
+        { url:  "#{root_url}f-and-q", text: "よくある質問 (F&Q)"},
+        { url: "#{root_url}privacy-policy", text: "Privacy Policy（個人情報保護方針）"}
       ]
     end
 end

app/controllers/staticpages_controller.rb

@@ -29,6 +29,6 @@ def contact_form_send
 
   private
     def contact_form_params
-      params.require(:contact_form).permit(:name, :email, :subject, :body)
+      params.require(:contact_form).permit(:name, :email, :subject, :body, :agreement_privacy_policy)
     end
 end

app/models/contact_form.rb

@@ -3,14 +3,16 @@ class ContactForm
   include ActiveModel::Attributes
   #include ActiveModel::Callbacks
 
-  attr_accessor :name, :email, :subject, :body
+  attr_accessor :name, :email, :subject, :body, :agreement_privacy_policy
   define_model_callbacks :save
 
   validates :name, presence: true
   validates :email, presence: true
   validates :subject, presence: true
   validates :body, presence: true
+  validates :agreement_privacy_policy, presence: true
 
+  validates_acceptance_of :agreement_privacy_policy, allow_nil: false
   def save
     run_callbacks :save do
       return false if invalid?

app/views/pages/show.html.haml

@@ -2,10 +2,8 @@
 - provide(:desc, @page.description)
 - provide(:url, request.url)
 
-.headings.page-title.m-3.p-2
+.headings.page-title.m-2.p-2
   %h1= @page.title
-
   %p= @page.description
-%br/
 .content.m-3.p-2
   = raw @content

app/views/staticpages/_form.html.haml

@@ -1,6 +1,9 @@
 = simple_form_for @contact_form, :html => { :class => 'form-horizontal' }, :url => { :action => 'contact_form_send'} do |f|
-  = f.input :name, as: :string, placeholder: 'お名前'
-  = f.input :email, as: :string, placeholder: 'メールアドレス'
-  = f.input :subject, as: :string, placeholder: '件名'
-  = f.input :body, as: :text, placeholder: '本文を入力してください。', :input_html => { :rows => 5 }
+  = f.input :name, as: :string, placeholder: 'お名前', error: 'この項目は空白にできません。', label: false
+  = f.input :email, as: :string, placeholder: 'メールアドレス', error: 'この項目は空白にできません。', label: false
+  = f.input :subject, as: :string, placeholder: '件名', error: 'この項目は空白にできません。', label: false
+  = f.input :body, as: :text, placeholder: '本文を入力してください。', :input_html => { :rows => 5 }, label: false,
+    error: 'この項目は空白にできません。'
+  = f.input :agreement_privacy_policy, as: :boolean, checked: false, error: '個人情報保護方針へのご同意をお願いします。',
+    label: link_to('個人情報保護方針', "#{root_url}privacy-policy", target: "_blank") + " に同意する。"
   = f.submit '送信', :class => 'btn btn-primary'

app/views/staticpages/contact.html.haml

@@ -10,3 +10,5 @@
     .row
       .col-lg-8.mx-auto.mw-100
         = render 'form'
+        %br/
+        = link_to 'トップページへ戻る', root_url

app/views/staticpages/index.html.haml

@@ -158,76 +158,40 @@
       .col-lg-3.col-md-6.text-center
         .service-box.mt-5.mx-auto
           %img.mb-3.sr-icons.img-fluid{:alt => "Scratch Cat", :src => "#{asset_path "index/scratch-cat.png"}"}/
-          %h3.mb-3 Scratch
+          %h4.mb-3 Scratch
       .col-lg-3.col-md-6.text-center
         .service-box.mt-5.mx-auto
           %img.mb-3.sr-icons.img-fluid{:alt => "Java Logo", :src => "#{asset_path "index/java-original.png"}"}/
-          %h3.mb-3 Java
+          %h4.mb-3 Java
       .col-lg-3.col-md-6.text-center
         .service-box.mt-5.mx-auto
           %img.mb-3.sr-icons.img-fluid{:alt => "Web系言語", :src => "#{asset_path "index/web-lang.png"}"}/
-          %h3.mb-3 HTML/CSS/JavaScript
+          %h4.mb-3 HTML/CSS/JavaScript
       .col-lg-3.col-md-6.text-center
         .service-box.mt-5.mx-auto
           %img.mb-3.sr-icons.img-fluid{:alt => "Ruby (on Rails)", :src => "#{asset_path "index/ruby-original.png"}"}/
-          %h3.mb-3 Ruby(on Rails)
--# %section#portfolio.p-0
--#   .container-fluid.p-0
--#     .row.no-gutters.popup-gallery
--#       .col-lg-4.col-sm-6
--#         %a.portfolio-box{:href => "img/portfolio/fullsize/1.jpg"}
--#           %img.img-fluid{:alt => "", :src => "img/portfolio/thumbnails/1.jpg"}/
--#           .portfolio-box-caption
--#             .portfolio-box-caption-content
--#               .project-category.text-faded
--#                 Category
--#               .project-name
--#                 Project Name
--#       .col-lg-4.col-sm-6
--#         %a.portfolio-box{:href => "img/portfolio/fullsize/2.jpg"}
--#           %img.img-fluid{:alt => "", :src => "img/portfolio/thumbnails/2.jpg"}/
--#           .portfolio-box-caption
--#             .portfolio-box-caption-content
--#               .project-category.text-faded
--#                 Category
--#               .project-name
--#                 Project Name
--#       .col-lg-4.col-sm-6
--#         %a.portfolio-box{:href => "img/portfolio/fullsize/3.jpg"}
--#           %img.img-fluid{:alt => "", :src => "img/portfolio/thumbnails/3.jpg"}/
--#           .portfolio-box-caption
--#             .portfolio-box-caption-content
--#               .project-category.text-faded
--#                 Category
--#               .project-name
--#                 Project Name
--#       .col-lg-4.col-sm-6
--#         %a.portfolio-box{:href => "img/portfolio/fullsize/4.jpg"}
--#           %img.img-fluid{:alt => "", :src => "img/portfolio/thumbnails/4.jpg"}/
--#           .portfolio-box-caption
--#             .portfolio-box-caption-content
--#               .project-category.text-faded
--#                 Category
--#               .project-name
--#                 Project Name
--#       .col-lg-4.col-sm-6
--#         %a.portfolio-box{:href => "img/portfolio/fullsize/5.jpg"}
--#           %img.img-fluid{:alt => "", :src => "img/portfolio/thumbnails/5.jpg"}/
--#           .portfolio-box-caption
--#             .portfolio-box-caption-content
--#               .project-category.text-faded
--#                 Category
--#               .project-name
--#                 Project Name
--#       .col-lg-4.col-sm-6
--#         %a.portfolio-box{:href => "img/portfolio/fullsize/6.jpg"}
--#           %img.img-fluid{:alt => "", :src => "img/portfolio/thumbnails/6.jpg"}/
--#           .portfolio-box-caption
--#             .portfolio-box-caption-content
--#               .project-category.text-faded
--#                 Category
--#               .project-name
--#                 Project Name
+          %h4.mb-3 Ruby(on Rails)
+%section#supporters.bg-dark
+  .container
+    .row
+      .col-lg-12.text-center
+        %h2.section-heading Supporters
+        %h6.section-heading.text-fade CoderDojo 岡山 岡南 の活動はこれらのサポータの皆様によって成り立っています！
+        %hr.my-4/
+  .container
+    .row
+      .col-lg-3.col-md-6.text-center.mx-auto
+        .service-box.mt-5.mx-auto
+          %img.mb-3.sr-icons.img-fluid{:alt => "Non Logo", :src => "#{asset_path "index/supporter/non-logo.png"}"}(data-toggle="tooltip" data-placement="top" title="サーバー・ドメインなどの提供")/
+          %h4.mb-3 リムゲイト株式会社 様
+      .col-lg-3.col-md-6.text-center.mx-auto
+        .service-box.mt-5.mx-auto
+          %img.mb-3.sr-icons.img-fluid{:alt => "ESA", :src => "#{asset_path "index/supporter/esa.png"}"}(data-toggle="tooltip" data-placement="top" title="ドキュメント共有サービスの提供")/
+          %h4.mb-3 ESA.IO 様
+      .col-lg-3.col-md-6.text-center.mx-auto
+        .service-box.mt-5.mx-auto
+          %img.mb-3.sr-icons.img-fluid{:alt => "さくらインターネット", :src => "#{asset_path "index/supporter/sakura-internet.png"}"}(data-toggle="tooltip" data-placement="top" title="「さくらのクラウド」の無償提供")/
+          %h4.mb-3 SAKURA INTERNET INC. 様
 %section#contact
   .container
     .row

config/application.rb

@@ -12,7 +12,7 @@ class Application < Rails::Application
     config.load_defaults 5.1
 
     config.autoload_paths += %W(#{config.root}/lib)
-    config.autoload_paths += Dir["#{config.root}/lib/**/"] 
+    config.autoload_paths += Dir["#{config.root}/lib/**/"]
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers

config/initializers/simple_form.rb

@@ -110,7 +110,7 @@
   # config.item_wrapper_class = nil
 
   # How the label text should be generated altogether with the required text.
-  # config.label_text = lambda { |label, required, explicit_label| "#{required} #{label}" }
+  config.label_text = lambda { |label, required, explicit_label| "#{required} #{label}" }
 
   # You can define the class to use on all labels. Default is nil.
   # config.label_class = nil