From e6cf427b3138ab72cfa6acce9dfc45a577a98e28 Mon Sep 17 00:00:00 2001 From: nanophate Date: Mon, 30 May 2016 17:09:53 +0900 Subject: [PATCH 01/13] Create new widget for grid layout --- app/models/coder_dojo_list_widget.rb | 2 ++ app/views/coder_dojo_list_widget/details.html.erb | 4 ++++ app/views/coder_dojo_list_widget/show.html.erb | 1 + app/views/coder_dojo_list_widget/thumbnail.html.erb | 1 + app/views/footer_widget/show.html.erb | 2 +- 5 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 app/models/coder_dojo_list_widget.rb create mode 100644 app/views/coder_dojo_list_widget/details.html.erb create mode 100644 app/views/coder_dojo_list_widget/show.html.erb create mode 100644 app/views/coder_dojo_list_widget/thumbnail.html.erb diff --git a/app/models/coder_dojo_list_widget.rb b/app/models/coder_dojo_list_widget.rb new file mode 100644 index 000000000..d091961bd --- /dev/null +++ b/app/models/coder_dojo_list_widget.rb @@ -0,0 +1,2 @@ +class CoderDojoListWidget < Widget +end diff --git a/app/views/coder_dojo_list_widget/details.html.erb b/app/views/coder_dojo_list_widget/details.html.erb new file mode 100644 index 000000000..1855248fc --- /dev/null +++ b/app/views/coder_dojo_list_widget/details.html.erb @@ -0,0 +1,4 @@ +<%= scrivito_medium_dialog do %> + <%= scrivito_details_for CoderDojoListWidget.description_for_editor do %> + <% end %> +<% end %> diff --git a/app/views/coder_dojo_list_widget/show.html.erb b/app/views/coder_dojo_list_widget/show.html.erb new file mode 100644 index 000000000..682286a47 --- /dev/null +++ b/app/views/coder_dojo_list_widget/show.html.erb @@ -0,0 +1 @@ +This is the show view of the <%= CoderDojoListWidget.description_for_editor %>. diff --git a/app/views/coder_dojo_list_widget/thumbnail.html.erb b/app/views/coder_dojo_list_widget/thumbnail.html.erb new file mode 100644 index 000000000..e161995b3 --- /dev/null +++ b/app/views/coder_dojo_list_widget/thumbnail.html.erb @@ -0,0 +1 @@ +<%= scrivito_thumbnail CoderDojoListWidget.description_for_editor %> diff --git a/app/views/footer_widget/show.html.erb b/app/views/footer_widget/show.html.erb index 6d1d66f36..b3880d407 100644 --- a/app/views/footer_widget/show.html.erb +++ b/app/views/footer_widget/show.html.erb @@ -1,7 +1,7 @@
<%= scrivito_tag :h5, widget, :headline, class:'cover-text-white', style:'padding-top:20px;' %> - <%= scrivito_tag :p, widget, :paragraph, class:'cover-text-white', style:'padding-bottom:60; padding-top:20px;' %> + <%= scrivito_tag :div, widget, :paragraph, class:'cover-text-white', style:'padding-bottom:60; padding-top:20px;' %>
From dd9996c75c2e8dc13598b06c84fe31a7ea444470 Mon Sep 17 00:00:00 2001 From: nanophate Date: Mon, 30 May 2016 17:33:58 +0900 Subject: [PATCH 02/13] Update auto PR generator --- .github/PULL_REQUEST_TEMPLATE.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 9c9a7b048..e47635dad 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -8,10 +8,3 @@ ooをできるようにする / oo機能をリファクタリングする / oo - [ ] ooの機能を実装 - [ ] ooのリファクタリング -ちなみにTASKリストの書き方はこんな感じ - -``` -- [ ] ooのテストを実装 -- [ ] ooの機能を実装 -- [ ] ooのリファクタリング -``` From fc3ee6f42e21e3869c9ba80a9b14d97e884617db Mon Sep 17 00:00:00 2001 From: nanophate Date: Mon, 30 May 2016 18:08:09 +0900 Subject: [PATCH 03/13] Add attribute to enable custom edit --- app/models/coder_dojo_list_widget.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/models/coder_dojo_list_widget.rb b/app/models/coder_dojo_list_widget.rb index d091961bd..8f57870c1 100644 --- a/app/models/coder_dojo_list_widget.rb +++ b/app/models/coder_dojo_list_widget.rb @@ -1,2 +1,6 @@ class CoderDojoListWidget < Widget + attribute :image, :reference + attribute :headline, :html + attribute :tag, :string + attribute :caption, :string end From cba12b1c27ed0d0684c2fc4ec492bc650f0660c3 Mon Sep 17 00:00:00 2001 From: nanophate Date: Mon, 30 May 2016 18:12:48 +0900 Subject: [PATCH 04/13] Add html layout to enable visualization --- app/views/coder_dojo_list_widget/show.html.erb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/views/coder_dojo_list_widget/show.html.erb b/app/views/coder_dojo_list_widget/show.html.erb index 682286a47..0492db586 100644 --- a/app/views/coder_dojo_list_widget/show.html.erb +++ b/app/views/coder_dojo_list_widget/show.html.erb @@ -1 +1,8 @@ -This is the show view of the <%= CoderDojoListWidget.description_for_editor %>. +
+
+ <%= scrivito_image_tag widget, :image, class:'image-responsive'%> + <%= scrivito_tag :h1, widget, :headline, data: {newlines: false} %> + <%= scrivito_tag :p, widget, :tag, class:'cover-text-white'%> + <%= scrivito_tag :p, widget, :caption, class:'cover-text-white'%> +
+
\ No newline at end of file From 10a6b55b771502f12cd86f172eb76649d66fb54c Mon Sep 17 00:00:00 2001 From: nanophate Date: Mon, 30 May 2016 18:28:09 +0900 Subject: [PATCH 05/13] Close #10 enabled stable implement of color --- app/models/footer_widget.rb | 2 +- app/views/footer_widget/show.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/footer_widget.rb b/app/models/footer_widget.rb index 29b47d57a..ebd9525e3 100644 --- a/app/models/footer_widget.rb +++ b/app/models/footer_widget.rb @@ -1,4 +1,4 @@ class FooterWidget < Widget attribute :headline, :html - attribute :paragraph, :html + attribute :line, :html end diff --git a/app/views/footer_widget/show.html.erb b/app/views/footer_widget/show.html.erb index b3880d407..68c435b96 100644 --- a/app/views/footer_widget/show.html.erb +++ b/app/views/footer_widget/show.html.erb @@ -1,7 +1,7 @@
<%= scrivito_tag :h5, widget, :headline, class:'cover-text-white', style:'padding-top:20px;' %> - <%= scrivito_tag :div, widget, :paragraph, class:'cover-text-white', style:'padding-bottom:60; padding-top:20px;' %> + <%= scrivito_tag :div, widget, :line, class:'cover-text-white', style:'padding-bottom:60; padding-top:20px;' %>
From 03795866ccc0af551cbd7b32f7552ee09cad7de0 Mon Sep 17 00:00:00 2001 From: nanophate Date: Mon, 6 Jun 2016 16:11:14 +0900 Subject: [PATCH 06/13] Add database with necessary storage --- app/models/coder_dojo.rb | 2 ++ .../20160606065215_create_coder_dojos.rb | 17 +++++++++++ db/schema.rb | 30 +++++++++++++++++++ test/fixtures/coder_dojos.yml | 23 ++++++++++++++ test/models/coder_dojo_test.rb | 7 +++++ 5 files changed, 79 insertions(+) create mode 100644 app/models/coder_dojo.rb create mode 100644 db/migrate/20160606065215_create_coder_dojos.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/coder_dojos.yml create mode 100644 test/models/coder_dojo_test.rb diff --git a/app/models/coder_dojo.rb b/app/models/coder_dojo.rb new file mode 100644 index 000000000..283c34e1a --- /dev/null +++ b/app/models/coder_dojo.rb @@ -0,0 +1,2 @@ +class CoderDojo < ActiveRecord::Base +end diff --git a/db/migrate/20160606065215_create_coder_dojos.rb b/db/migrate/20160606065215_create_coder_dojos.rb new file mode 100644 index 000000000..73b84d4ec --- /dev/null +++ b/db/migrate/20160606065215_create_coder_dojos.rb @@ -0,0 +1,17 @@ +class CreateCoderDojos < ActiveRecord::Migration + def change + create_table :coder_dojos do |t| + t.string :name + t.string :course + t.string :caption + t.string :venue + t.integer :region + t.string :logo_image_url + t.string :redirect_url + t.string :user_name + t.string :email + + t.timestamps null: false + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..334a1d311 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,30 @@ +# encoding: UTF-8 +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 20160606065215) do + + create_table "coder_dojos", force: :cascade do |t| + t.string "name" + t.string "course" + t.string "caption" + t.string "venue" + t.integer "region" + t.string "logo_image_url" + t.string "redirect_url" + t.string "user_name" + t.string "email" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/fixtures/coder_dojos.yml b/test/fixtures/coder_dojos.yml new file mode 100644 index 000000000..cbcf239db --- /dev/null +++ b/test/fixtures/coder_dojos.yml @@ -0,0 +1,23 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + course: MyString + caption: MyString + venue: MyString + region: 1 + logo_image_url: MyString + redirect_url: MyString + user_name: MyString + email: MyString + +two: + name: MyString + course: MyString + caption: MyString + venue: MyString + region: 1 + logo_image_url: MyString + redirect_url: MyString + user_name: MyString + email: MyString diff --git a/test/models/coder_dojo_test.rb b/test/models/coder_dojo_test.rb new file mode 100644 index 000000000..3f541ce95 --- /dev/null +++ b/test/models/coder_dojo_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class CoderDojoTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end From f637ae829efe7a5b24ec7e04410df3ee1164149f Mon Sep 17 00:00:00 2001 From: nanophate Date: Tue, 14 Jun 2016 19:38:31 +0900 Subject: [PATCH 07/13] Add test for coder dojo model --- .rbenv-version | 1 + app/models/coder_dojo.rb | 1 + test/models/coder_dojo_test.rb | 24 +++++++++++++++++++++--- 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 .rbenv-version diff --git a/.rbenv-version b/.rbenv-version new file mode 100644 index 000000000..2bf1c1ccf --- /dev/null +++ b/.rbenv-version @@ -0,0 +1 @@ +2.3.1 diff --git a/app/models/coder_dojo.rb b/app/models/coder_dojo.rb index 283c34e1a..0dff03527 100644 --- a/app/models/coder_dojo.rb +++ b/app/models/coder_dojo.rb @@ -1,2 +1,3 @@ class CoderDojo < ActiveRecord::Base + validates :name, presence: true end diff --git a/test/models/coder_dojo_test.rb b/test/models/coder_dojo_test.rb index 3f541ce95..5bbb39d49 100644 --- a/test/models/coder_dojo_test.rb +++ b/test/models/coder_dojo_test.rb @@ -1,7 +1,25 @@ require 'test_helper' class CoderDojoTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end + def setup + @dojo = CoderDojo.new(name: "Example User", + course: "scratch", + caption: "Weekly Event", + venue: "okinawa", + region: '47', + logo_image_url: "https://www.example.com/logo.png", + redirect_url: "https://www.facebook.com", + user_name: "example", + email: "user@example.com") + end + + test "should be valid" do + assert @dojo.valid? + end + + test "name should be present" do + @dojo.name = " " + assert_not @dojo.valid? + end + end From 7395a3ca54e80638fdf233ad47158f1503322bae Mon Sep 17 00:00:00 2001 From: nanophate Date: Tue, 14 Jun 2016 19:55:35 +0900 Subject: [PATCH 08/13] Add test for each col --- app/models/coder_dojo.rb | 10 +++++- test/models/coder_dojo_test.rb | 57 +++++++++++++++++++++++++++------- 2 files changed, 55 insertions(+), 12 deletions(-) diff --git a/app/models/coder_dojo.rb b/app/models/coder_dojo.rb index 0dff03527..89ae35483 100644 --- a/app/models/coder_dojo.rb +++ b/app/models/coder_dojo.rb @@ -1,3 +1,11 @@ class CoderDojo < ActiveRecord::Base - validates :name, presence: true + validates :name, presence: true + validates :course, presence: true + validates :caption, presence: true + validates :venue, presence: true + validates :region, presence: true + validates :logo_image_url, presence: true + validates :redirect_url, presence: true + validates :user_name, presence: true + validates :email, presence: true end diff --git a/test/models/coder_dojo_test.rb b/test/models/coder_dojo_test.rb index 5bbb39d49..168aa6540 100644 --- a/test/models/coder_dojo_test.rb +++ b/test/models/coder_dojo_test.rb @@ -3,23 +3,58 @@ class CoderDojoTest < ActiveSupport::TestCase def setup @dojo = CoderDojo.new(name: "Example User", - course: "scratch", - caption: "Weekly Event", - venue: "okinawa", - region: '47', - logo_image_url: "https://www.example.com/logo.png", - redirect_url: "https://www.facebook.com", - user_name: "example", - email: "user@example.com") + course: "scratch", + caption: "Weekly Event", + venue: "okinawa", + region: '47', + logo_image_url: "https://www.example.com/logo.png", + redirect_url: "https://www.facebook.com", + user_name: "example", + email: "user@example.com") end test "should be valid" do - assert @dojo.valid? + assert @dojo.valid? end - test "name should be present" do - @dojo.name = " " + test "name should be present" do + @dojo.name = " " assert_not @dojo.valid? end + test "course should be present" do + @dojo.course = " " + assert_not @dojo.valid? + end + + test "caption should be present" do + @dojo.caption = " " + assert_not @dojo.valid? + end + + test "venue should be present" do + @dojo.venue = " " + assert_not @dojo.valid? + end + + test "region should be present" do + @dojo.region = ' ' + assert_not @dojo.valid? + end + + test "logo should be present" do + @dojo.logo_image_url = " " + assert_not @dojo.valid? + end + + test "dojo url should be present" do + @dojo.redirect_url = " " + assert_not @dojo.valid? + end + + test "user name should be present" do + @dojo.user_name = " " + assert_not @dojo.valid? + end + end From 0f36abfbf0d5b24d42d5bd93eb4cb6c5037ae4d8 Mon Sep 17 00:00:00 2001 From: nanophate Date: Tue, 14 Jun 2016 20:17:55 +0900 Subject: [PATCH 09/13] Add test model with limitation --- app/models/coder_dojo.rb | 10 +++++----- test/models/coder_dojo_test.rb | 13 +++++++++---- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/app/models/coder_dojo.rb b/app/models/coder_dojo.rb index 89ae35483..e92077e93 100644 --- a/app/models/coder_dojo.rb +++ b/app/models/coder_dojo.rb @@ -1,11 +1,11 @@ class CoderDojo < ActiveRecord::Base - validates :name, presence: true - validates :course, presence: true - validates :caption, presence: true + validates :name, presence: true, length: { maximum: 50 } + validates :course, presence: true, length: { maximum: 25 } + validates :caption, presence: true, length: { maximum: 60 } validates :venue, presence: true validates :region, presence: true validates :logo_image_url, presence: true validates :redirect_url, presence: true - validates :user_name, presence: true - validates :email, presence: true + validates :user_name, presence: true, length: { maximum: 50 } + validates :email, presence: true, length: { maximum: 255 } end diff --git a/test/models/coder_dojo_test.rb b/test/models/coder_dojo_test.rb index 168aa6540..53ec92d26 100644 --- a/test/models/coder_dojo_test.rb +++ b/test/models/coder_dojo_test.rb @@ -18,17 +18,17 @@ def setup end test "name should be present" do - @dojo.name = " " + @dojo.name = "c" * 51 assert_not @dojo.valid? end test "course should be present" do - @dojo.course = " " + @dojo.course = "c" * 244 + "@example.com" assert_not @dojo.valid? end test "caption should be present" do - @dojo.caption = " " + @dojo.caption = "c " * 60 assert_not @dojo.valid? end @@ -53,8 +53,13 @@ def setup end test "user name should be present" do - @dojo.user_name = " " + @dojo.user_name = "c" * 51 assert_not @dojo.valid? end + + test "user email should be present" do + @dojo.email = "c" * 244 + "@example.com" + assert_not @dojo.valid? + end end From ac43e0acb2075a9352ef9e3fe230496d0c162447 Mon Sep 17 00:00:00 2001 From: nanophate Date: Wed, 15 Jun 2016 10:17:33 +0900 Subject: [PATCH 10/13] Fix spacing issue in coderdojo app/model --- app/models/coder_dojo.rb | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/app/models/coder_dojo.rb b/app/models/coder_dojo.rb index e92077e93..e69de29bb 100644 --- a/app/models/coder_dojo.rb +++ b/app/models/coder_dojo.rb @@ -1,11 +0,0 @@ -class CoderDojo < ActiveRecord::Base - validates :name, presence: true, length: { maximum: 50 } - validates :course, presence: true, length: { maximum: 25 } - validates :caption, presence: true, length: { maximum: 60 } - validates :venue, presence: true - validates :region, presence: true - validates :logo_image_url, presence: true - validates :redirect_url, presence: true - validates :user_name, presence: true, length: { maximum: 50 } - validates :email, presence: true, length: { maximum: 255 } -end From 7c1c02e1e12b0ee0a2d8f188914309fb11e7609f Mon Sep 17 00:00:00 2001 From: nanophate Date: Wed, 15 Jun 2016 10:19:59 +0900 Subject: [PATCH 11/13] Fix conflict with sublime due to unrefreshed session and clean spacaing --- app/models/coder_dojo.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/models/coder_dojo.rb b/app/models/coder_dojo.rb index e69de29bb..dabc00068 100644 --- a/app/models/coder_dojo.rb +++ b/app/models/coder_dojo.rb @@ -0,0 +1,11 @@ +class CoderDojo < ActiveRecord::Base + validates :name, presence: true, length: { maximum: 50 } + validates :course, presence: true, length: { maximum: 25 } + validates :caption, presence: true, length: { maximum: 60 } + validates :venue, presence: true + validates :region, presence: true + validates :logo_image_url, presence: true + validates :redirect_url, presence: true + validates :user_name, presence: true, length: { maximum: 50 } + validates :email, presence: true, length: { maximum: 255 } +end \ No newline at end of file From 40b4eeb415c84908a0f2a52ab2583a37e1ead9f6 Mon Sep 17 00:00:00 2001 From: nanophate Date: Fri, 17 Jun 2016 17:08:22 +0900 Subject: [PATCH 12/13] Add form to gather informtaion --- app/views/coder_dojo_list_widget/show.html.erb | 2 +- config/routes.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/coder_dojo_list_widget/show.html.erb b/app/views/coder_dojo_list_widget/show.html.erb index 0492db586..de2cf8465 100644 --- a/app/views/coder_dojo_list_widget/show.html.erb +++ b/app/views/coder_dojo_list_widget/show.html.erb @@ -1,6 +1,6 @@
- <%= scrivito_image_tag widget, :image, class:'image-responsive'%> + <%= scrivito_image_tag widget, :image, class:'image-responsive center-block clearfix'%> <%= scrivito_tag :h1, widget, :headline, data: {newlines: false} %> <%= scrivito_tag :p, widget, :tag, class:'cover-text-white'%> <%= scrivito_tag :p, widget, :caption, class:'cover-text-white'%> diff --git a/config/routes.rb b/config/routes.rb index 779609d99..3d6ef9b59 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -59,4 +59,5 @@ scrivito_route '/', using: 'homepage' scrivito_route '(/)(*slug-):id', using: 'slug_id' scrivito_route '/*permalink', using: 'permalink', format: false + end From 777fbb80cd01742c01f9238c289e9d351b564355 Mon Sep 17 00:00:00 2001 From: nanophate Date: Sun, 9 Oct 2016 17:47:51 +0900 Subject: [PATCH 13/13] Updated .gitignore file --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4469af545..25b5985a1 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,9 @@ # or operating system, you probably want to add a global ignore instead: # git config --global core.excludesfile '~/.gitignore_global' -# Ignore bundler config. +# Ignore bundler config & bundler gems /.bundle +vendor/bundle # Ignore the default SQLite database. /db/*.sqlite3