Merge pull request #1506 from coderdojo-japan/remove-scrivito

CMS のコンフィグなどの特有なファイルなどを削除したい

Author: nanophate

.env.sample

@@ -2,8 +2,3 @@ DATABASE_USER=postgres
 DATABASE_PASSWORD=password
 DATABASE_HOST=db
 DATABASE_PORT=5432
-
-SCRIVITO_TENANT=
-SCRIVITO_API_KEY=
-SCRIVITO_EMAIL=test@example.com
-SCRIVITO_PASSWORD=testpassword

.github/workflows/test.yml

@@ -45,23 +45,8 @@ jobs:
           bundle exec rails db:create
           bundle exec rails db:setup
 
-      - name: 🔧 Test with/without Scrivito
-        env:
-          SCRIVITO_EMAIL:    test@example.com
-          SCRIVITO_PASSWORD: testpassword
-          SCRIVITO_TENANT:   ${{ secrets.SCRIVITO_TENANT }}
-          SCRIVITO_API_KEY:  ${{ secrets.SCRIVITO_API_KEY }}
-        run: |
-          if [ '${{ github.actor }}' == *'dependabot'* ]; then
-            echo 'Run test without Scrivito with PR by Dependabot'
-            bundle exec rspec spec --tag ~@scrivito
-          elif [ '${{ github.event.pull_request.head.repo.full_name }}' != '${{ github.repository }}' ]; then
-            echo 'Run test without Scrivito with PR by ${{ github.actor }}'
-            bundle exec rspec spec --tag ~@scrivito
-          else
-            echo 'Run test with Scrivito by organization members'
-            bundle exec rspec spec
-          fi
+      - name: 🔧 Test
+        run: bundle exec rspec spec
 
   deploy:
     needs: test

Gemfile

@@ -8,10 +8,6 @@ gem 'pg'
 gem 'dumper'
 gem 'bootsnap'
 
-gem 'scrivito', '~> 1.17'
-gem 'scrivito_section_widgets'
-gem 'scrivito_teaser_widget'
-
 gem 'coffee-rails'
 gem 'jbuilder'
 gem 'jquery-rails'

Gemfile.lock

@@ -92,7 +92,6 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.1.10)
-    connection_pool (2.2.5)
     crass (1.0.6)
     debug_inspector (1.1.0)
     declarative (0.0.20)
@@ -177,9 +176,6 @@ GEM
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
     httpclient (2.8.3)
-    hyp_diff (0.0.6)
-      diff-lcs (>= 1.2, < 2.0)
-      nokogiri (>= 1.6, < 2.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     jbuilder (2.11.2)
@@ -189,8 +185,6 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (6.0.1)
-      railties (>= 3.2.16)
     json (2.5.1)
     jwt (2.2.3)
     koala (3.0.0)
@@ -351,37 +345,6 @@ GEM
       tilt (>= 1.1, < 3)
     sassc (2.4.0)
       ffi (~> 1.9)
-    scrivito (1.17.0)
-      scrivito_content_browser (= 1.17.0)
-      scrivito_editors (= 1.17.0)
-      scrivito_sdk (= 1.17.0)
-      scrivito_ui (= 1.17.0)
-    scrivito_content_browser (1.17.0)
-      railties
-      scrivito_sdk (= 1.17.0)
-    scrivito_editors (1.17.0)
-      jquery-ui-rails (>= 5.0.0, < 7.0.0)
-      railties
-      scrivito_content_browser (= 1.17.0)
-      scrivito_sdk (= 1.17.0)
-    scrivito_sdk (1.17.0)
-      addressable (~> 2.3)
-      connection_pool (~> 2.2)
-      diff-lcs (~> 1.3)
-      hyp_diff (~> 0.0.4)
-      jbuilder (~> 2.10)
-      jquery-rails (~> 4.1)
-      json (>= 2.0.0)
-      memoist (>= 0.12.0)
-      multipart-post (~> 2.0)
-      nokogiri (~> 1.7)
-      rails (~> 5.2.0)
-    scrivito_section_widgets (1.1.2)
-      scrivito
-    scrivito_teaser_widget (0.1.2)
-      scrivito
-    scrivito_ui (1.17.0)
-      railties
     secure_headers (6.3.2)
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
@@ -487,9 +450,6 @@ DEPENDENCIES
   rspec-retry
   ruby-mp3info
   sass-rails (>= 5)
-  scrivito (~> 1.17)
-  scrivito_section_widgets
-  scrivito_teaser_widget
   secure_headers
   selenium-webdriver
   simple_grid_rails

NOTICE.md

@@ -18,4 +18,3 @@ See [Gemfile](https://github.com/coderdojo-japan/coderdojo.jp/blob/master/Gemfil
 - [coderdojo-tokyo/web](https://github.com/coderdojo-tokyo/web)
 - [Twitter Bootstrap](http://getbootstrap.com/)
 - [Clean Blog](https://startbootstrap.com/template-overviews/clean-blog/)
-

README.md

@@ -85,8 +85,7 @@ https://speakerdeck.com/yasulab/case-study-rails-cms-for-coderdojo
 - [Ruby](https://www.ruby-lang.org/ja/)
 - [Ruby on Rails](http://rubyonrails.org/)
 - [PostgreSQL](https://www.postgresql.jp/)
-- [Scrivito](https://scrivito.com/)
-  - (:warning: *NOTE: Scrivito チームと相談し、今後別の仕組みに置き換わる予定です*)
+
 
 セットアップ方法の方法は次の通りです。
 

app.json

@@ -6,13 +6,13 @@
   "repository": "https://github.com/coderdojo-japan/coderdojo.jp",
   "logo": "https://coderdojo.jp/logo.png",
   "addons": [
-    "logentries",
+    "logtail",
     "heroku-postgresql",
     "scheduler"
   ],
   "environments": {
     "review": {
-      "addons": ["heroku-postgresql:hobby-dev"]
+      "addons": ["heroku-postgresql:mini"]
     }
   },
   "buildpacks": [
@@ -32,5 +32,5 @@
   "scripts": {
       "postdeploy": "bundle exec rails db:schema:load && bundle exec rails db:seed && bundle exec rails dojos:update_db_by_yaml && bundle exec rails dojo_event_services:upsert && bundle exec rails assets:precompile RAILS_ENV=staging"
   },
-  "stack": "heroku-18"
+  "stack": "heroku-20"
 }

app/assets/javascripts/application.js

@@ -12,9 +12,6 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require scrivito
-//= require scrivito_section_widgets
-//= require scrivito
 //= require bootstrap-sprockets
 //= require highcharts/highcharts
 //= require highcharts/highcharts-more

app/assets/stylesheets/application.scss

@@ -12,6 +12,5 @@
  *
  *= require_self
  *= require_directory .
- *= require scrivito_section_widgets
  *= require font-awesome
  */

app/assets/stylesheets/sessions.scss

@@ -2,12 +2,9 @@ class ApplicationController < ActionController::Base
   #http_basic_authenticate_with name: ENV['BASIC_AUTH_NAME'],
   #                         password: ENV['BASIC_AUTH_PASSWORD'] if Rails.env.staging?
 
-  before_action :store_location , unless: :login_page_access?
-
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
-  include SessionsHelper
 
   before_action :set_request_variant
 
@@ -16,19 +13,10 @@ class ApplicationController < ActionController::Base
     rescue_from Exception,                      with: :render_500
     rescue_from ActiveRecord::RecordNotFound,   with: :render_404
     rescue_from ActionController::RoutingError, with: :render_404
-    rescue_from Scrivito::ResourceNotFound,     with: :render_404
   end
 
   private
 
-  def store_location
-    session[:original_url] = request.original_url
-  end
-
-  def login_page_access?
-    %w(login_page sessions).include? self.controller_name
-  end
-
   def set_request_variant
     request.variant = request.device_variant
   end

app/assets/stylesheets/sotechsha.scss

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 module ApplicationHelper
   def full_title(page_title)
-    page_title = @obj.display_title if page_title.empty? && @obj && !@obj.permalink.nil?
     if page_title.empty?
       "CoderDojo Japan - 子どものためのプログラミング道場" # Default title
     else
@@ -10,9 +9,6 @@ def full_title(page_title)
   end
 
   def full_url(page_url)
-    # When URL is composed by Scrivito
-    return "https://coderdojo.jp/#{@obj.permalink}" if @obj && !@obj.permalink.nil?
-
     # When URL is composed by Rails
     if page_url.empty?
       # Set og:url with request param
@@ -27,8 +23,6 @@ def full_url(page_url)
   end
 
   def full_description(description)
-    description = kata_description if @obj && @obj.permalink == "kata"
-
     # Default description
     # Outdated: "CoderDojo は子どものためのプログラミング道場です。全国に#{Dojo.active_dojos_count}ヶ所以上あり、世界では#{Dojo::NUM_OF_COUNTRIES}ヶ国・#{Dojo::NUM_OF_WORLD_DOJOS}ヶ所で開催されています。"
     if description.empty?
@@ -55,10 +49,6 @@ def kata_description
     "道場で役立つ資料やコンテスト情報、立ち上げ方や各種支援をまとめています。"
   end
 
-  def using_scrivito?
-    !@obj.nil?
-  end
-
   def is_kata?
     request.path.starts_with? "/kata"
   end