Merge pull request #1 from coderdojo-japan/master

最新の更新をマージ

Author: Yuma Soga

.gitignore

@@ -27,3 +27,6 @@ public/assets/*
 .zshenv
 .bash-profile
 .zshrc
+
+# rspec
+spec/examples.txt

.travis.yml

@@ -11,12 +11,16 @@ deploy:
     master: coderdojo-japan
   run:
       - "bundle exec rails db:migrate"
+      - "bundle exec rails db:seed"
       - "bundle exec rails dojos:update_db_by_yaml"
+      - "bundle exec rails dojo_event_services:upsert"
 cache:
   - bundler
 script:
   - bundle exec rake db:migrate --trace
-  - bundle exec rake
+  - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bundle exec rspec spec; fi
+  - if [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ "$TRAVIS_PULL_REQUEST_SLUG" = "coderdojo-japan/coderdojo.jp" ]; then bundle exec rspec spec; fi
+  - if [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ "$TRAVIS_PULL_REQUEST_SLUG" != "coderdojo-japan/coderdojo.jp" ]; then bundle exec rspec spec --tag ~@scrivito; fi
 env:
   global:
     - TZ='Asia/Tokyo'

CODE_OF_CONDUCT.md

@@ -4,9 +4,9 @@ CoderDojo Japan team is committed to fostering a welcoming community.
 
 **Our Code of Conduct can be found here**:
 
-https://coderdojo.jp/docs/code_of_conduct
+https://coderdojo.jp/docs/code-of-conduct
 
 For a history of updates, see the page history here:
 
-https://github.com/coderdojo-japan/coderdojo.jp/commits/master/db/docs/code_of_conduct.md
+https://github.com/coderdojo-japan/coderdojo.jp/commits/master/db/docs/code-of-conduct.md
 

Gemfile

@@ -16,6 +16,7 @@ gem "bootstrap-sass"
 gem 'sass-rails'
 gem 'uglifier'
 gem 'font-awesome-rails'
+gem 'haml-rails'
 
 # For redirection
 gem 'rack-host-redirect'
@@ -31,6 +32,14 @@ gem 'faraday'
 # https://github.com/bundler/bundler/issues/5332
 gem 'faraday_middleware', '0.10'
 
+gem 'koala'
+
+gem 'rack-user_agent'
+
+gem 'rack-attack'
+
+gem 'google_drive'
+
 group :development do
   gem 'web-console'
   gem 'spring'
@@ -40,6 +49,9 @@ end
 group :development, :test do
   gem 'sqlite3'
   gem 'pry-rails'
+  gem 'pry-byebug'
+  gem 'pry-doc'
+  gem 'pry-stack_explorer'
   gem 'rake'
   gem 'travis'
   gem 'minitest-retry'

Gemfile.lock

@@ -45,10 +45,13 @@ GEM
       execjs
     backports (3.10.3)
     bindex (0.5.0)
+    binding_of_caller (0.7.3)
+      debug_inspector (>= 0.0.1)
     bootstrap-sass (3.3.7)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
     builder (3.2.3)
+    byebug (9.1.0)
     capybara (2.15.4)
       addressable
       mini_mime (>= 0.1.3)
@@ -69,8 +72,12 @@ GEM
     concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
     crass (1.0.2)
+    debug_inspector (0.0.3)
+    declarative (0.0.10)
+    declarative-option (0.1.0)
     diff-lcs (1.3)
     erubi (1.7.0)
+    erubis (2.7.0)
     ethon (0.11.0)
       ffi (>= 1.3.0)
     execjs (2.7.0)
@@ -90,7 +97,41 @@ GEM
       net-http-pipeline
     globalid (0.4.1)
       activesupport (>= 4.2.0)
+    google-api-client (0.13.6)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (~> 0.5)
+      httpclient (>= 2.8.1, < 3.0)
+      mime-types (~> 3.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.0)
+    google_drive (2.1.8)
+      google-api-client (>= 0.11.0, < 0.14.0)
+      googleauth (>= 0.5.0, < 1.0.0)
+      nokogiri (>= 1.5.3, < 2.0.0)
+    googleauth (0.5.1)
+      faraday (~> 0.9)
+      jwt (~> 1.4)
+      logging (~> 2.0)
+      memoist (~> 0.12)
+      multi_json (~> 1.11)
+      os (~> 0.9)
+      signet (~> 0.7)
+    haml (5.0.4)
+      temple (>= 0.8.0)
+      tilt
+    haml-rails (1.0.0)
+      actionpack (>= 4.0.1)
+      activesupport (>= 4.0.1)
+      haml (>= 4.0.6, < 6.0)
+      html2haml (>= 1.0.1)
+      railties (>= 4.0.1)
     highline (1.7.8)
+    html2haml (2.2.0)
+      erubis (~> 2.7.0)
+      haml (>= 4.0, < 6)
+      nokogiri (>= 1.6.0)
+      ruby_parser (~> 3.5)
+    httpclient (2.8.3)
     hyp_diff (0.0.5)
       diff-lcs (~> 1.2, >= 1.2.5)
       nokogiri (~> 1.6, >= 1.6.5)
@@ -106,13 +147,22 @@ GEM
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
     json (2.1.0)
+    jwt (1.5.6)
+    koala (3.0.0)
+      addressable
+      faraday
+      json (>= 1.8)
     kramdown (1.15.0)
     launchy (2.4.3)
       addressable (~> 2.3)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
+    little-plugger (1.1.4)
+    logging (2.2.2)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
     loofah (2.1.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -136,21 +186,36 @@ GEM
     nio4r (2.1.0)
     nokogiri (1.8.1)
       mini_portile2 (~> 2.3.0)
+    os (0.9.6)
     pg (0.21.0)
     pry (0.11.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
+    pry-byebug (3.5.0)
+      byebug (~> 9.1)
+      pry (~> 0.10)
+    pry-doc (0.11.1)
+      pry (~> 0.9)
+      yard (~> 0.9)
     pry-rails (0.3.6)
       pry (>= 0.10.4)
+    pry-stack_explorer (0.4.9.2)
+      binding_of_caller (>= 0.7)
+      pry (>= 0.9.11)
     public_suffix (3.0.0)
     pusher-client (0.6.2)
       json
       websocket (~> 1.0)
     rack (2.0.3)
+    rack-attack (5.0.1)
+      rack
     rack-host-redirect (1.3.0)
       rack
     rack-test (0.7.0)
       rack (>= 1.0, < 3)
+    rack-user_agent (0.5.2)
+      rack (>= 1.5)
+      woothee (>= 1.0.0)
     rails (5.1.4)
       actioncable (= 5.1.4)
       actionmailer (= 5.1.4)
@@ -182,6 +247,11 @@ GEM
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
+    representable (3.0.4)
+      declarative (< 0.1.0)
+      declarative-option (< 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.1)
     rspec-core (3.7.0)
       rspec-support (~> 3.7.0)
     rspec-expectations (3.7.0)
@@ -202,6 +272,8 @@ GEM
       rspec-core (~> 3.3)
     rspec-support (3.7.0)
     ruby_dep (1.5.0)
+    ruby_parser (3.10.1)
+      sexp_processor (~> 4.9)
     rubyzip (1.2.1)
     sass (3.5.3)
       sass-listen (~> 4.0.0)
@@ -251,6 +323,12 @@ GEM
     selenium-webdriver (3.6.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
+    sexp_processor (4.10.0)
+    signet (0.8.1)
+      addressable (~> 2.3)
+      faraday (~> 0.9)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
     simple_grid_rails (0.1.0)
     spring (2.0.2)
       activesupport (>= 4.2)
@@ -262,6 +340,7 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
+    temple (0.8.0)
     thor (0.20.0)
     thread_safe (0.3.6)
     tilt (2.0.8)
@@ -278,6 +357,7 @@ GEM
       ethon (>= 0.8.0)
     tzinfo (1.2.4)
       thread_safe (~> 0.1)
+    uber (0.1.0)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
     useragent (0.16.8)
@@ -290,8 +370,10 @@ GEM
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
+    woothee (1.7.0)
     xpath (2.1.0)
       nokogiri (~> 1.3)
+    yard (0.9.12)
 
 PLATFORMS
   ruby
@@ -303,14 +385,22 @@ DEPENDENCIES
   faraday
   faraday_middleware (= 0.10)
   font-awesome-rails
+  google_drive
+  haml-rails
   jbuilder
   jquery-rails
+  koala
   kramdown
   listen
   minitest-retry
   pg
+  pry-byebug
+  pry-doc
   pry-rails
+  pry-stack_explorer
+  rack-attack
   rack-host-redirect
+  rack-user_agent
   rails (= 5.1.4)
   rails-controller-testing
   rake

NOTICE.md

@@ -4,7 +4,8 @@ Thanks for their great works! 😆
 ## Ruby Gems
 
 We use so many gems including dependencies.   
-See `Gemfile` or `Gemfile.lock` for details.
+See [Gemfile](https://github.com/coderdojo-japan/coderdojo.jp/blob/master/Gemfile) or
+[Gemfile.lock](https://github.com/coderdojo-japan/coderdojo.jp/blob/master/Gemfile.lock) for details.
 
 ## Services
 

README.md

@@ -24,12 +24,7 @@ Fulfill the requirements, setup by following the instructions, and send a pull r
 ### Setup 
 
 1. Fork and clone this repository.
-1. `$ bundle install --without production`
-1. `$ bundle exec rails db:migrate`
-1. `$ bundle exec rails dojos:update_db_by_yaml`
-1. `$ bundle exec rails dojo_event_services:upsert`
-1. `$ bundle exec rails test`
-1. `$ rails server`
+1. `$ bin/setup`
 1. Access to [localhost:3000](http://localhost:3000).
 
 If you successfully set up, you can see the same page as [coderdojo.jp](http://coderdojo.jp).

app/assets/images/coderdojo-stats_cover.png

@@ -0,0 +1,5 @@
+$ ->
+  $('.collapse').on 'shown.bs.collapse', ->
+    $(this).parent().find(".fa-chevron-right").removeClass("fa-chevron-right").addClass("fa-chevron-down")
+  $('.collapse').on 'hidden.bs.collapse', ->
+    $(this).parent().find(".fa-chevron-down").removeClass("fa-chevron-down").addClass("fa-chevron-right")

app/assets/images/logos/esa.png

@@ -72,8 +72,8 @@ h2{
     margin: 0 !important;
 }
 
-// Sponsor section
-.sponsors_logo {
+// Partner section
+.partners_logo {
   ul{
     padding-left: 0px;
   }
@@ -260,7 +260,8 @@ a {
 }
 
 .title, body > footer a:hover {
-    color: #fff
+    color: #fff;
+    text-decoration: none
 }
 
 .title{
@@ -478,3 +479,7 @@ a {
   width: 90%;
   display: inline-block
 }
+
+#accordion a:hover {
+  text-decoration: none;
+}

app/assets/images/logos/hay-kaikei.png

@@ -22,16 +22,16 @@
 }
 .keiyaku > p {
   counter-increment: keiyaku-paragraph;
-  text-indent: 1em;
+  text-indent: 0em;
   padding-left: 1em;
   line-height: 1.7em;
 }
 .keiyaku > h1 + p,
 .keiyaku > h2 + p,
 .keiyaku > hr + p,
 .keiyaku > p:first-of-type {
-  text-indent: 0;
-  padding-left: 0;
+  text-indent:  0em;
+  padding-left: 1em;
 }
 .keiyaku > p::before {
   //content: counter(keiyaku-paragraph) " ";

app/assets/images/logos/mitou-foundation.png

@@ -6,6 +6,8 @@ class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
   include SessionsHelper
 
+  before_action :set_request_variant
+
   private
 
     def store_location
@@ -16,4 +18,7 @@ def login_page_access?
       %w(login_page sessions).include? self.controller_name
     end
 
+  def set_request_variant
+    request.variant = request.device_variant
+  end
 end

app/assets/images/logos/mitou-foundation.pxm

@@ -1,4 +1,4 @@
-class BlogPostPageController < ScrivitoController
+class BlogPostPageController < CmsController
 
   def index
     if @obj.permalink.to_s.include?("sotechsha/")

app/assets/images/logos/sakura-internet.png

@@ -0,0 +1,3 @@
+class CmsController < ApplicationController
+  include Scrivito::ControllerActions
+end

app/assets/images/logos/yasslab.png

@@ -7,7 +7,7 @@ def index
 
   def show
     @doc = Document.new(params[:id])
-    redirect_to scrivito_path(Obj.root) if not @doc.exists?
+    redirect_to root_url unless @doc.exists?
     @content = Kramdown::Document.new(@doc.content, input: 'GFM').to_html
     @url     = request.url
   end