Removed external katas

devscola · Feb 4, 2018 · 3480f53 · 3480f53
1 parent c8daa43
commit 3480f53
Show file tree

Hide file tree

Showing 162 changed files with 6 additions and 636 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/.rspec b/.rspec
diff --git a/.travis.yml b/.travis.yml
diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,8 @@
 FROM ruby:2.4.0
 RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs
-RUN mkdir /myapp
+
 WORKDIR /myapp
-ADD Gemfile /myapp/Gemfile
-ADD Gemfile.lock /myapp/Gemfile.lock
-RUN gem install bundler --pre
+ADD . /myapp
+
+RUN gem install bundler
 RUN bundle install
-ADD . /myapp
diff --git a/Gemfile b/Gemfile
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -240,4 +240,4 @@ RUBY VERSION
    ruby 2.4.0p0
 
 BUNDLED WITH
-   1.16.0
+   1.16.1
diff --git a/README.md b/README.md
diff --git a/Rakefile b/Rakefile
diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
diff --git a/app/assets/images/.keep b/app/assets/images/.keep
diff --git a/app/assets/images/default_belt.jpg b/app/assets/images/default_belt.jpg
diff --git a/app/assets/images/logo_katayuno.ico b/app/assets/images/logo_katayuno.ico
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
diff --git a/app/assets/javascripts/belts.coffee b/app/assets/javascripts/belts.coffee
diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js
diff --git a/app/assets/javascripts/channels/.keep b/app/assets/javascripts/channels/.keep
diff --git a/app/assets/javascripts/examples.coffee b/app/assets/javascripts/examples.coffee
diff --git a/app/assets/javascripts/external_examples.coffee b/app/assets/javascripts/external_examples.coffee
diff --git a/app/assets/javascripts/external_katas.coffee b/app/assets/javascripts/external_katas.coffee
diff --git a/app/assets/javascripts/katas.coffee b/app/assets/javascripts/katas.coffee
diff --git a/app/assets/javascripts/ping.coffee b/app/assets/javascripts/ping.coffee
diff --git a/app/assets/javascripts/users.coffee b/app/assets/javascripts/users.coffee
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
diff --git a/app/assets/stylesheets/belts.scss b/app/assets/stylesheets/belts.scss
diff --git a/app/assets/stylesheets/examples.scss b/app/assets/stylesheets/examples.scss
diff --git a/app/assets/stylesheets/external_examples.scss b/app/assets/stylesheets/external_examples.scss
diff --git a/app/assets/stylesheets/external_katas.scss b/app/assets/stylesheets/external_katas.scss
diff --git a/app/assets/stylesheets/katas.scss b/app/assets/stylesheets/katas.scss
diff --git a/app/assets/stylesheets/ping.scss b/app/assets/stylesheets/ping.scss
diff --git a/app/assets/stylesheets/users.scss b/app/assets/stylesheets/users.scss
diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb
diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
diff --git a/app/controllers/belts_controller.rb b/app/controllers/belts_controller.rb
diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep
diff --git a/app/controllers/examples_controller.rb b/app/controllers/examples_controller.rb
diff --git a/app/controllers/external_examples_controller.rb b/app/controllers/external_examples_controller.rb
diff --git a/app/controllers/external_katas_controller.rb b/app/controllers/external_katas_controller.rb
diff --git a/app/controllers/katas_controller.rb b/app/controllers/katas_controller.rb
@@ -4,7 +4,6 @@ class KatasController < ApplicationController
 
   def index
     @katas = Kata.all
-    @external_katas = ExternalKata.all
   end
 
   def show

diff --git a/app/controllers/ping_controller.rb b/app/controllers/ping_controller.rb
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
diff --git a/app/helpers/belts_helper.rb b/app/helpers/belts_helper.rb
diff --git a/app/helpers/examples_helper.rb b/app/helpers/examples_helper.rb
diff --git a/app/helpers/external_examples_helper.rb b/app/helpers/external_examples_helper.rb
diff --git a/app/helpers/external_katas_helper.rb b/app/helpers/external_katas_helper.rb
diff --git a/app/helpers/katas_helper.rb b/app/helpers/katas_helper.rb
@@ -1,32 +1,6 @@
 module KatasHelper
   NO_LINK = ''
 
-  def external_examples_button(id)
-    text = t(:examples)
-    link_to(text, external_examples_path(id), {class: "btn btn-primary"})
-  end
-
-  def edit_external_kata_button(id)
-    text = 'mode_edit'
-    return link_to(text, edit_external_kata_path(id), {class: "material-icons"}) if admin_signed_in?
-
-    NO_LINK
-  end
-
-  def add_external_kata_button
-    text = t(:add_external_kata)
-    return link_to(text, new_external_kata_path, {class: "btn btn-primary"}) if admin_signed_in?
-
-    NO_LINK
-  end
-
-  def delete_external_kata_button(id)
-    text = 'delete'
-    return link_to(text, external_kata_path(id), { method: :delete, class: "material-icons", id: 'delete', data: {confirm: "Are you sure?"}}) if admin_signed_in?
-
-    NO_LINK
-  end
-
   def delete_belt_button(id)
     text = 'delete'
     return link_to(text, delete_belt_path(id), { method: :delete, class: "material-icons", id: 'delete', data: {confirm: "Are you sure?"}}) if admin_signed_in?

diff --git a/app/helpers/ping_helper.rb b/app/helpers/ping_helper.rb
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
diff --git a/app/models/belt.rb b/app/models/belt.rb
diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep
diff --git a/app/models/example.rb b/app/models/example.rb
diff --git a/app/models/external_example.rb b/app/models/external_example.rb
diff --git a/app/models/external_kata.rb b/app/models/external_kata.rb
diff --git a/app/models/kata.rb b/app/models/kata.rb
diff --git a/app/models/user.rb b/app/models/user.rb
diff --git a/app/views/belts/edit.html.erb b/app/views/belts/edit.html.erb
diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb
diff --git a/app/views/devise/mailer/email_changed.html.erb b/app/views/devise/mailer/email_changed.html.erb
diff --git a/app/views/devise/mailer/password_change.html.erb b/app/views/devise/mailer/password_change.html.erb
diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb
diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
diff --git a/app/views/devise/shared/_links.html.erb b/app/views/devise/shared/_links.html.erb
diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb
diff --git a/app/views/examples/edit.html.erb b/app/views/examples/edit.html.erb
diff --git a/app/views/examples/index.html.erb b/app/views/examples/index.html.erb
diff --git a/app/views/external_examples/edit.html.erb b/app/views/external_examples/edit.html.erb
diff --git a/app/views/external_examples/index.html.erb b/app/views/external_examples/index.html.erb
diff --git a/app/views/external_katas/_form.html.erb b/app/views/external_katas/_form.html.erb
diff --git a/app/views/external_katas/edit.html.erb b/app/views/external_katas/edit.html.erb
diff --git a/app/views/external_katas/new.html.erb b/app/views/external_katas/new.html.erb
diff --git a/app/views/katas/_external_katas_links.html.erb b/app/views/katas/_external_katas_links.html.erb
diff --git a/app/views/katas/_form.html.erb b/app/views/katas/_form.html.erb
diff --git a/app/views/katas/_katas_links.html.erb b/app/views/katas/_katas_links.html.erb
diff --git a/app/views/katas/_new_belt.html.erb b/app/views/katas/_new_belt.html.erb
diff --git a/app/views/katas/edit.html.erb b/app/views/katas/edit.html.erb
diff --git a/app/views/katas/index.html.erb b/app/views/katas/index.html.erb
@@ -20,12 +20,10 @@
           <p>
             <ul>
               <%= render 'katas_links', note: @katas %>
-              <%= render 'external_katas_links', note: @external_katas %>
             </lu>
           </p>
           <p>
             <%= add_kata_button %>
-            <%= add_external_kata_button %>
           </p>
         </p>
       </div>

diff --git a/app/views/katas/new.html.erb b/app/views/katas/new.html.erb
diff --git a/app/views/katas/show.html.erb b/app/views/katas/show.html.erb
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
diff --git a/config.ru b/config.ru
diff --git a/config/application.rb b/config/application.rb
diff --git a/config/boot.rb b/config/boot.rb
diff --git a/config/cable.yml b/config/cable.yml
diff --git a/config/database.yml b/config/database.yml
diff --git a/config/environment.rb b/config/environment.rb
diff --git a/config/environments/development.rb b/config/environments/development.rb
diff --git a/config/environments/production.rb b/config/environments/production.rb
diff --git a/config/environments/test.rb b/config/environments/test.rb
diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -24,7 +24,6 @@ en:
   edit_example: 'Edit Example'
   my_examples: 'My Examples'
   home: 'Home'
-  add_external_kata: 'Add external Kata'
   add_kata_url: 'Add kata from URL'
   save: 'Save'
   new_kata: 'New Kata'

diff --git a/config/puma.rb b/config/puma.rb
diff --git a/config/routes.rb b/config/routes.rb
@@ -20,13 +20,5 @@
   get '/examples/edit/:id' => 'examples#edit', as: :edit_example
   patch '/examples/update/:id' => 'examples#update', as: :update_example
 
-  resources :external_katas
-
-  get '/external_examples/:kata_id' => 'external_examples#index', as: :external_examples
-  post '/external_examples/create/:id' => 'external_examples#create', as: :external_example
-  delete '/external_examples/delete/:id/:kata_id' => 'external_examples#destroy', as: :delete_external_example
-  get '/external_examples/edit/:id' => 'external_examples#edit', as: :edit_external_example
-  patch '/external_examples/update/:id' => 'external_examples#update', as: :update_external_example
-
   post '/ping' => 'ping#ping', as: :ping
 end
diff --git a/config/secrets.yml b/config/secrets.yml
diff --git a/config/spring.rb b/config/spring.rb
diff --git a/db/migrate/20171104095005_create_katas.rb b/db/migrate/20171104095005_create_katas.rb
diff --git a/db/migrate/20171106100426_devise_create_users.rb b/db/migrate/20171106100426_devise_create_users.rb
diff --git a/db/migrate/20171106162401_add_admin_to_users.rb b/db/migrate/20171106162401_add_admin_to_users.rb
diff --git a/db/migrate/20171114185245_create_belts.rb b/db/migrate/20171114185245_create_belts.rb
diff --git a/db/migrate/20171116172525_add_kata_to_belt.rb b/db/migrate/20171116172525_add_kata_to_belt.rb
diff --git a/db/migrate/20171118193929_create_examples.rb b/db/migrate/20171118193929_create_examples.rb
diff --git a/db/migrate/20171125183735_add_user_to_example.rb b/db/migrate/20171125183735_add_user_to_example.rb
diff --git a/db/migrate/20171201152640_add_image_to_belt.rb b/db/migrate/20171201152640_add_image_to_belt.rb
diff --git a/db/migrate/20171201170740_create_external_katas.rb b/db/migrate/20171201170740_create_external_katas.rb
diff --git a/db/migrate/20171205204613_create_external_examples.rb b/db/migrate/20171205204613_create_external_examples.rb
diff --git a/db/migrate/20171205205327_add_kata_to_external_example.rb b/db/migrate/20171205205327_add_kata_to_external_example.rb
-Original file line number
+Diff line change
@@ Expand Up / @@ -240,4 +240,4 @@ RUBY VERSION @@
        ruby 2.4.0p0
     BUNDLED WITH
-.16.0
+.16.1