From 1c5b3cb10d474d0821eeb5b6774c409e515f0a99 Mon Sep 17 00:00:00 2001 From: AnaTofuZ Date: Wed, 28 Feb 2018 09:51:20 +0900 Subject: [PATCH 01/22] add notes `order` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix #268 > 今回のマージでorder 周りの設定手順が変わったと思うので、docs/how-to-add-dojo.md のドキュメントにも反映しておくと良いかも > cf. #267 `order`はnameから取っている為、市町村と同じDojo名だと省略可能な旨を追記 した --- docs/how-to-add-dojo.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/how-to-add-dojo.md b/docs/how-to-add-dojo.md index 6bb98e27f..7a7368ab1 100644 --- a/docs/how-to-add-dojo.md +++ b/docs/how-to-add-dojo.md @@ -11,7 +11,6 @@ ```yaml - created_at: '2016-12-19' - order: '473251' name: 嘉手納 (沖縄) prefecture_id: 47 logo: "/img/dojos/kadena.png" @@ -28,7 +27,7 @@ | Dojoカラム | フォーム | |:-----------------|:------------------:| | `created_at` | タイムスタンプ | -| `order` | [全国地方公共団体コード] (https://docs.google.com/spreadsheets/d/1b2XZxifpP8GSASvP9sPq1BYwsCH6Y_FHSkol_nfaGxw/edit#gid=1813423171) | +| `order` [^1] | [全国地方公共団体コード](https://docs.google.com/spreadsheets/d/1b2XZxifpP8GSASvP9sPq1BYwsCH6Y_FHSkol_nfaGxw/edit#gid=1813423171) | |`name` | 正式名称 | | `prefecture_id` | `db/seeds.rb` の該当番号 | |`logo` | `public/` のDojo画像パス | @@ -36,6 +35,8 @@ | `description` |フォーム `Dojoの開催場所と開催頻度について教えてください` | |`tags` | フォーム `Dojo で対応可能な技術を教えてください (最大5つまで)`| +[^1]: `order`の値はDojoの名称が公共団体名になっている場合は省略可能です。Dojo名が市町村以外の名称になっている場合のみ入力をする必要があります。 + - ここまで記述した後に `be rails dojos:update_db_by_yaml` を実行しdbに新規Dojoを反映する - その後 `be rails dojos:migrate_adding_id_to_yaml`  を実行し、yamlにidが動的に付けられた事を確認する From b75746d508388cbf6421e378088ff99083334b40 Mon Sep 17 00:00:00 2001 From: AnaTofuZ Date: Wed, 28 Feb 2018 09:56:33 +0900 Subject: [PATCH 02/22] modofied `orde` notes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 脚注がGithubだと展開されない為別途記述した --- docs/how-to-add-dojo.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/how-to-add-dojo.md b/docs/how-to-add-dojo.md index 7a7368ab1..922b9d61c 100644 --- a/docs/how-to-add-dojo.md +++ b/docs/how-to-add-dojo.md @@ -35,7 +35,13 @@ | `description` |フォーム `Dojoの開催場所と開催頻度について教えてください` | |`tags` | フォーム `Dojo で対応可能な技術を教えてください (最大5つまで)`| -[^1]: `order`の値はDojoの名称が公共団体名になっている場合は省略可能です。Dojo名が市町村以外の名称になっている場合のみ入力をする必要があります。 + +### `order` の値について + +[^1]: `order`の値はDojoの名称が公共団体名になっている場合は省略可能です。 +- `order`の値はDojoの名称が公共団体名になっている場合は省略可能です。 +- Dojo名が市町村以外の名称になっている場合のみ入力をする必要があります。 + - ex. 嘉手納は嘉手納市がある為省略可能 - ここまで記述した後に `be rails dojos:update_db_by_yaml` を実行しdbに新規Dojoを反映する From 9c1212a5f904397524ae105830576430797bdb55 Mon Sep 17 00:00:00 2001 From: AnaTofuZ Date: Wed, 28 Feb 2018 10:14:43 +0900 Subject: [PATCH 03/22] update_date_dojo.md --- docs/how-to-add-dojo.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/how-to-add-dojo.md b/docs/how-to-add-dojo.md index 922b9d61c..11de2725b 100644 --- a/docs/how-to-add-dojo.md +++ b/docs/how-to-add-dojo.md @@ -1,6 +1,6 @@ # 新規Dojoの追加方法 -新規Dojoから申請が来た場合の手順書( 2018/02/26現在) +新規Dojoから申請が来た場合の手順書( 2018/02/28現在) ## Dojo DBの追加手順 From c02f95c1f923349e9c405835d0270d2575686aaf Mon Sep 17 00:00:00 2001 From: AnaTofuZ Date: Wed, 28 Feb 2018 10:32:24 +0900 Subject: [PATCH 04/22] touch events.html.haml and add static_pages_controller_spec test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `/events`を作りたい為、雛形hamlファイルとコントローラー 及び適切に`/events` が表示できるかのテストコードを追加した。 --- app/controllers/static_pages_controller.rb | 9 +++++++++ app/views/static_pages/events.html.haml | 19 +++++++++++++++++++ config/routes.rb | 1 + .../static_pages_controller_spec.rb | 7 +++++++ 4 files changed, 36 insertions(+) create mode 100644 app/views/static_pages/events.html.haml diff --git a/app/controllers/static_pages_controller.rb b/app/controllers/static_pages_controller.rb index e59d786a3..4ff391fc8 100644 --- a/app/controllers/static_pages_controller.rb +++ b/app/controllers/static_pages_controller.rb @@ -34,6 +34,15 @@ def stats end end + def events + @url = request.url + @regions_and_dojos = Dojo.eager_load(:prefecture).default_order.group_by { |dojo| dojo.prefecture.region } + @events = Dojo.where(evented_at: + Time.zone.now..Time.zone.now.end_of_year) + #@hoge = Statistics::Aggregation.new(from: Time.current.strftime('%Y'),to:Time.current.strftime('%Y')).run + end + + def letsencrypt if params[:id] == ENV['LETSENCRYPT_REQUEST'] render text: ENV['LETSENCRYPT_RESPONSE'] diff --git a/app/views/static_pages/events.html.haml b/app/views/static_pages/events.html.haml new file mode 100644 index 000000000..4fc52b9da --- /dev/null +++ b/app/views/static_pages/events.html.haml @@ -0,0 +1,19 @@ +- provide(:url, @url) +- provide(:title, 'イベント情報') +- provide(:meta_description, '近日開催される CoderDojo の情報をまとめています。') +%section.cover + = image_tag "coderdojo-stats_cover.png", class: "cursor-default" +%section#dojos.dojos.text-center + %bpr + %h1 イベント情報 + %p 本ページでは近日開催される CoderDojo の情報をまとめています。 + CoderDojo の活動状況を把握する際などにご活用ください。 + + + %h3 関連リンク + %ul{:style => "list-style: none; margin-left: -40px;"} + %li + %a{:href => "https://docs.google.com/spreadsheets/d/17-M-qv5c0MdE_ZIFk566I2CGCIDHFkQwXWiunDXCGVw/edit#gid=354377216"} 日本の CoderDojo (zen登録済) - Google Spreadsheet + %li + %a{:href => "https://github.com/coderdojo-japan/coderdojo.jp/issues/258"} 直近の CoderDojo 開催情報を表示したい issue 258 +%br/ diff --git a/config/routes.rb b/config/routes.rb index d85abd06b..cd6811ee0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -10,6 +10,7 @@ # Static Pages root "static_pages#home" get "/stats", to: 'static_pages#stats' + get "/events", to: 'static_pages#events' # Redirects get "/releases/2016/12/12/new-backend", to: redirect('/news/2016/12/12/new-backend') diff --git a/spec/controllers/static_pages_controller_spec.rb b/spec/controllers/static_pages_controller_spec.rb index 550145558..1b2e2b75a 100644 --- a/spec/controllers/static_pages_controller_spec.rb +++ b/spec/controllers/static_pages_controller_spec.rb @@ -9,4 +9,11 @@ end end + describe "GET #events" do + it "returns http success" do + get :events + expect(response).to have_http_status(:success) + end + end + end From 8880b6256c0338629cfc2f4473720ee8bbae5f1a Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Thu, 1 Mar 2018 21:52:14 +0900 Subject: [PATCH 05/22] =?UTF-8?q?Add=20IslayTouch=20to=20=E6=B0=B4?= =?UTF-8?q?=E6=88=B8/=E3=81=B2=E3=81=9F=E3=81=A1=E3=81=AA=E3=81=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/dojos.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/db/dojos.yaml b/db/dojos.yaml index 592495480..4b2de56f7 100644 --- a/db/dojos.yaml +++ b/db/dojos.yaml @@ -171,6 +171,7 @@ description: 茨城県ひたちなか市で毎月開催 tags: - Scratch + - IslayTouch - id: 65 created_at: '2017-01-03' order: '082015' @@ -181,6 +182,7 @@ description: 茨城県水戸市で毎月開催 tags: - Scratch + - IslayTouch - id: 8 created_at: '2016-07-12' order: '082244' From e29b99f73a766930c3055eb4dc7032ada6f86693 Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Fri, 2 Mar 2018 10:50:27 +0900 Subject: [PATCH 06/22] Update order column in yaml maigration task --- lib/tasks/dojos.rake | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/tasks/dojos.rake b/lib/tasks/dojos.rake index 2ec7ee164..8abe8fada 100644 --- a/lib/tasks/dojos.rake +++ b/lib/tasks/dojos.rake @@ -77,6 +77,7 @@ namespace :dojos do d = Dojo.find_by(name: dojo['name']) new_dojo = {} new_dojo['id'] = d.id + new_dojo['order'] = d.order new_dojo.merge!(dojo) new_dojo end From c214365419d595e4b9311629399ad58578a0f54d Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Fri, 2 Mar 2018 10:50:45 +0900 Subject: [PATCH 07/22] Tweak layout of code in yaml migration --- lib/tasks/dojos.rake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/tasks/dojos.rake b/lib/tasks/dojos.rake index 8abe8fada..69314415d 100644 --- a/lib/tasks/dojos.rake +++ b/lib/tasks/dojos.rake @@ -75,8 +75,8 @@ namespace :dojos do dojos.map! do |dojo| d = Dojo.find_by(name: dojo['name']) - new_dojo = {} - new_dojo['id'] = d.id + new_dojo = {} + new_dojo['id'] = d.id new_dojo['order'] = d.order new_dojo.merge!(dojo) new_dojo From cea0909e8c69ea4a12c56753c0e9805e4141f866 Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Fri, 2 Mar 2018 10:59:25 +0900 Subject: [PATCH 08/22] Change order of columns due to updating yaml migration task --- db/dojos.yaml | 248 +++++++++++++++++++++++++------------------------- 1 file changed, 124 insertions(+), 124 deletions(-) diff --git a/db/dojos.yaml b/db/dojos.yaml index 4b2de56f7..e6e955774 100644 --- a/db/dojos.yaml +++ b/db/dojos.yaml @@ -1,7 +1,7 @@ --- - id: 64 - created_at: '2016-09-26' order: '011002' + created_at: '2016-09-26' name: 札幌 (北海道) prefecture_id: 1 url: http://www.coderdojo-sapporo.jp/ @@ -13,8 +13,8 @@ - ラズベリーパイ - 電子工作 - id: 104 - created_at: '2016-09-26' order: '011002' + created_at: '2016-09-26' name: 札幌東 (北海道) prefecture_id: 1 url: https://coderdojo-sapporo-east.blogspot.jp/ @@ -26,8 +26,8 @@ - Python - Unity - id: 100 - created_at: '2017-09-20' order: '012319' + created_at: '2017-09-20' name: 恵庭 (北海道) prefecture_id: 1 url: https://www.facebook.com/CoderDojoEniwa/ @@ -38,8 +38,8 @@ - Webサイト - Python - id: 109 - created_at: '2017-09-25' order: '032166' + created_at: '2017-09-25' name: 滝沢 (東北) prefecture_id: 3 url: https://www.facebook.com/CoderDojoTakizawa/ @@ -50,8 +50,8 @@ - micro:bit - ラズベリーパイ - id: 107 - created_at: '2017-06-20' order: '032069' + created_at: '2017-06-20' name: きたかみ (東北) prefecture_id: 3 url: https://coderdojo.waraukado.jp/ @@ -61,8 +61,8 @@ - Scratch - Webサイト - id: 3 - created_at: '2014-01-23' order: '041009' + created_at: '2014-01-23' name: 泉 (東北) prefecture_id: 4 url: https://www.facebook.com/CoderdojoIzumi @@ -71,8 +71,8 @@ tags: - Scratch - id: 90 - created_at: '2017-07-01' order: '041009' + created_at: '2017-07-01' name: 愛子 (東北) prefecture_id: 4 url: https://www.facebook.com/CoderDojo-Ayashi-277617015979351/ @@ -83,8 +83,8 @@ - Webサイト - ゲーム - id: 85 - created_at: '2017-03-27' order: '042072' + created_at: '2017-03-27' name: 名取 (東北) prefecture_id: 4 url: https://www.facebook.com/CoderDojo-Natori-1379707208756830 @@ -95,8 +95,8 @@ - Webサイト - ゲーム - id: 4 - created_at: '2016-04-25' order: '042129' + created_at: '2016-04-25' name: 登米 (東北) prefecture_id: 4 logo: "/img/dojos/japan.png" @@ -107,8 +107,8 @@ - 3Dプリンタ - 3DCAD - id: 59 - created_at: '2016-10-06' order: '044458' + created_at: '2016-10-06' name: 中新田 (東北) prefecture_id: 4 logo: "/img/dojos/nakaniida.png" @@ -120,8 +120,8 @@ - Minecraft - Arduino - id: 75 - created_at: '2017-04-03' order: '052019' + created_at: '2017-04-03' name: 秋田 (東北) prefecture_id: 5 url: https://coderdojo.akita.work/ @@ -134,8 +134,8 @@ - Swift - Android - id: 74 - created_at: '2017-03-28' order: '062014' + created_at: '2017-03-28' name: 山形 (東北) prefecture_id: 6 logo: "/img/dojos/yamagata.png" @@ -148,8 +148,8 @@ - ロボット - AI - id: 79 - created_at: '2017-03-29' order: '072028' + created_at: '2017-03-29' name: 会津 (東北) prefecture_id: 7 logo: "/img/dojos/aizu.png" @@ -162,8 +162,8 @@ - Java - Webサイト - id: 73 - created_at: '2017-03-28' order: '082210' + created_at: '2017-03-28' name: ひたちなか (関東) prefecture_id: 8 logo: "/img/dojos/hitachinaka.png" @@ -173,8 +173,8 @@ - Scratch - IslayTouch - id: 65 - created_at: '2017-01-03' order: '082015' + created_at: '2017-01-03' name: 水戸 (関東) prefecture_id: 8 logo: "/img/dojos/mito.png" @@ -184,8 +184,8 @@ - Scratch - IslayTouch - id: 8 - created_at: '2016-07-12' order: '082244' + created_at: '2016-07-12' name: 守谷 (関東) prefecture_id: 8 logo: "/img/dojos/moriya.jpg" @@ -196,8 +196,8 @@ - IoT - 電子工作 - id: 89 - created_at: '2017-06-21' order: '092142' + created_at: '2017-06-21' name: さくら (関東) prefecture_id: 9 logo: "/img/dojos/sakura.png" @@ -210,8 +210,8 @@ - PHP - CSS - id: 7 - created_at: '2016-10-17' order: '102016' + created_at: '2016-10-17' name: 前橋 (関東) prefecture_id: 10 logo: "/img/dojos/maebashi.png" @@ -223,8 +223,8 @@ - ラズベリーパイ - ゲーム - id: 9 - created_at: '2014-05-26' order: '111007' + created_at: '2014-05-26' name: さいたま (関東) prefecture_id: 11 url: http://coderdojo-saitama.com/ @@ -235,8 +235,8 @@ - Webサイト - アプリ - id: 12 - created_at: '2015-12-01' order: '112089' + created_at: '2015-12-01' name: 所沢 (関東) prefecture_id: 11 url: https://www.facebook.com/CoderDojoTokorozawa/ @@ -245,8 +245,8 @@ tags: - Scratch - id: 77 - created_at: '2017-03-14' order: '112089' + created_at: '2017-03-14' name: 小手指 (関東) prefecture_id: 11 url: https://coderdojokotesashi.github.io/ @@ -255,8 +255,8 @@ tags: - Scratch - id: 11 - created_at: '2015-05-13' order: '112097' + created_at: '2015-05-13' name: 飯能 (関東) prefecture_id: 11 url: https://www.facebook.com/CoderDojoHanno @@ -265,8 +265,8 @@ tags: - Scratch - id: 10 - created_at: '2012-07-02' order: '112305' + created_at: '2012-07-02' name: ひばりヶ丘 (関東) prefecture_id: 11 url: http://coderdojo.hanare-hibari.info/ @@ -278,8 +278,8 @@ - 8x9Craft - Unity - id: 22 - created_at: '2013-07-30' order: '121002' + created_at: '2013-07-30' name: 千葉 (関東) prefecture_id: 12 logo: "/img/dojos/chiba.png" @@ -292,8 +292,8 @@ - Ruby - Minecraft - id: 25 - created_at: '2016-04-27' order: '121002' + created_at: '2016-04-27' name: 若葉 (関東) prefecture_id: 12 logo: "/img/dojos/wakaba.png" @@ -302,8 +302,8 @@ tags: - Scratch - id: 60 - created_at: '2016-12-15' order: '122033' + created_at: '2016-12-15' name: 市川 (関東) prefecture_id: 12 logo: "/img/dojos/ichikawa.jpg" @@ -315,8 +315,8 @@ - Python - WordPress - id: 82 - created_at: '2017-03-28' order: '122033' + created_at: '2017-03-28' name: 市川真間 (関東) prefecture_id: 12 logo: "/img/dojos/ichikawa-mama.jpg" @@ -325,8 +325,8 @@ tags: - Scratch - id: 86 - created_at: '2017-05-16' order: '122041' + created_at: '2017-05-16' name: 船橋@凛童舎 (関東) prefecture_id: 12 logo: "/img/dojos/funabashi.jpg" @@ -335,8 +335,8 @@ tags: - Scratch - id: 83 - created_at: '2017-04-27' order: '122068' + created_at: '2017-04-27' name: 木更津 (関東) prefecture_id: 12 logo: "/img/dojos/kisarazu.png" @@ -347,8 +347,8 @@ - Webサイト - Java - id: 114 - created_at: '2017-09-06' order: '122076' + created_at: '2017-09-06' name: 松戸 (関東) prefecture_id: 12 logo: "/img/dojos/japan.png" @@ -357,8 +357,8 @@ tags: - Scratch - id: 20 - created_at: '2016-11-08' order: '122084' + created_at: '2016-11-08' name: 野田 (関東) prefecture_id: 12 logo: "/img/dojos/japan.png" @@ -367,8 +367,8 @@ tags: - Scratch - id: 23 - created_at: '2014-09-22' order: '122173' + created_at: '2014-09-22' name: 柏 (関東) prefecture_id: 12 url: http://www.coderdojo-kashiwa.com/ @@ -377,8 +377,8 @@ tags: - Scratch - id: 125 - created_at: '2018-01-27' order: '122173' + created_at: '2018-01-27' name: 柏沼南 (関東) prefecture_id: 12 url: https://www.facebook.com/CoderDojoKashiwaShounan/ @@ -387,8 +387,8 @@ tags: - Scratch - id: 112 - created_at: '2017-09-26' order: '122173' + created_at: '2017-09-26' name: 南柏 (関東) prefecture_id: 12 url: http://www.coderdojo-kashiwa.com/dojo/minamikashiwa/ @@ -397,8 +397,8 @@ tags: - Scratch - id: 24 - created_at: '2016-04-27' order: '122203' + created_at: '2016-04-27' name: 流山 (関東) prefecture_id: 12 logo: "/img/dojos/japan.png" @@ -407,8 +407,8 @@ tags: - Scratch - id: 21 - created_at: '2016-11-08' order: '122271' + created_at: '2016-11-08' name: 浦安 (関東) prefecture_id: 12 logo: "/img/dojos/urayasu.png" @@ -420,8 +420,8 @@ - PHP - Ruby - id: 121 - created_at: '2017-11-28' order: '131016' + created_at: '2017-11-28' name: 御茶ノ水 (関東) prefecture_id: 13 logo: "/img/dojos/ochanomizu.jpg" @@ -432,8 +432,8 @@ - Viscuit - Webサイト - id: 97 - created_at: '2017-08-16' order: '131016' + created_at: '2017-08-16' name: 秋葉原 (関東) prefecture_id: 13 logo: "/img/dojos/japan.png" @@ -442,8 +442,8 @@ tags: - Scratch - id: 58 - created_at: '2017-09-26' order: '131041' + created_at: '2017-09-26' name: 高田馬場 (関東) prefecture_id: 13 logo: "/img/dojos/takadanobaba.jpg" @@ -454,8 +454,8 @@ - ラズベリーパイ - Ruby - id: 69 - created_at: '2017-01-23' order: '131041' + created_at: '2017-01-23' name: 西新宿 (関東) prefecture_id: 13 logo: "/img/dojos/nishishinjuku.png" @@ -464,8 +464,8 @@ tags: - Scratch - id: 17 - created_at: '2012-03-12' order: '131121' + created_at: '2012-03-12' name: 下北沢 (関東) prefecture_id: 13 url: https://coderdojo-tokyo.connpass.com/ @@ -476,8 +476,8 @@ - Webサイト - ゲーム - id: 19 - created_at: '2016-09-27' order: '131130' + created_at: '2016-09-27' name: 渋谷 (関東) prefecture_id: 13 logo: "/img/dojos/japan.png" @@ -486,8 +486,8 @@ tags: - Scratch - id: 15 - created_at: '2016-07-20' order: '131148' + created_at: '2016-07-20' name: 中野 (関東) prefecture_id: 13 logo: "/img/dojos/nakano.png" @@ -499,8 +499,8 @@ - JavaScript - Arduino - id: 16 - created_at: '2016-09-09' order: '131156' + created_at: '2016-09-09' name: すぎなみ (関東) prefecture_id: 13 logo: "/img/dojos/suginami.png" @@ -513,8 +513,8 @@ - JavaScript - Processing - id: 123 - created_at: '2018-01-25' order: '131164' + created_at: '2018-01-25' name: 池袋 (関東) prefecture_id: 13 logo: "/img/dojos/ikebukuro.jpeg" @@ -526,8 +526,8 @@ - Webサイト - Java - id: 130 - created_at: '2018-02-21' order: '131172' + created_at: '2018-02-21' name: 赤羽 (関東) prefecture_id: 13 logo: "/img/dojos/akabane.png" @@ -536,8 +536,8 @@ tags: - Scratch - id: 14 - created_at: '2015-06-22' order: '132012' + created_at: '2015-06-22' name: 八王子 (関東) prefecture_id: 13 url: http://coderdojo.code4hachioji.org/ @@ -548,8 +548,8 @@ - Webサイト - PHP - id: 117 - created_at: '2017-11-18' order: '132021' + created_at: '2017-11-18' name: 立川 (関東) prefecture_id: 13 url: https://coderdojotachikawa.github.io/ @@ -561,8 +561,8 @@ - ラズベリーパイ - Arduino - id: 105 - created_at: '2017-09-06' order: '132039' + created_at: '2017-09-06' name: 吉祥寺 (関東) prefecture_id: 13 logo: "/img/dojos/kichijoji.png" @@ -573,8 +573,8 @@ - Studuino - Java - id: 18 - created_at: '2016-09-05' order: '132080' + created_at: '2016-09-05' name: 調布 (関東) prefecture_id: 13 logo: "/img/dojos/chofu.jpg" @@ -587,8 +587,8 @@ - Ruby - ラズベリーパイ - id: 13 - created_at: '2014-05-21' order: '132110' + created_at: '2014-05-21' name: 小平 (関東) prefecture_id: 13 url: http://coderdojo-kodaira.github.io/ @@ -600,8 +600,8 @@ - CS Unplugged - マルチメディア - id: 70 - created_at: '2017-01-30' order: '141020' + created_at: '2017-01-30' name: 横浜 (関東) prefecture_id: 14 logo: "/img/dojos/japan.png" @@ -610,8 +610,8 @@ tags: - Scratch - id: 126 - created_at: '2018-02-02' order: '141038' + created_at: '2018-02-02' name: 戸部 (関東) prefecture_id: 14 logo: "/img/dojos/japan.png" @@ -620,8 +620,8 @@ tags: - Scratch - id: 68 - created_at: '2017-01-09' order: '141097' + created_at: '2017-01-09' name: 新羽 (関東) prefecture_id: 14 logo: "/img/dojos/nippa.png" @@ -630,8 +630,8 @@ tags: - Scratch - id: 76 - created_at: '2017-04-03' order: '141135' + created_at: '2017-04-03' name: 長津田 (関東) prefecture_id: 14 logo: "/img/dojos/nagatsuta.png" @@ -642,8 +642,8 @@ - Minecraft - Hour of Code - id: 26 - created_at: '2016-12-14' order: '142051' + created_at: '2016-12-14' name: 藤沢 (関東) prefecture_id: 14 logo: "/img/dojos/fujisawa.png" @@ -654,8 +654,8 @@ - Viscuit - Webサイト - id: 91 - created_at: '2017-06-26' order: '142158' + created_at: '2017-06-26' name: 海老名 (関東) prefecture_id: 14 logo: "/img/dojos/ebina.png" @@ -664,8 +664,8 @@ tags: - Scratch - id: 5 - created_at: '2015-09-16' order: '151009' + created_at: '2015-09-16' name: 新潟 (中部) prefecture_id: 15 logo: "/img/dojos/japan.png" @@ -676,8 +676,8 @@ - Minecraft - Arduino - id: 127 - created_at: '2018-02-17' order: '152064' + created_at: '2018-02-17' name: 新発田 (中部) prefecture_id: 15 logo: "/img/dojos/japan.png" @@ -690,8 +690,8 @@ - Python - JavaScript - id: 6 - created_at: '2016-11-24' order: '172014' + created_at: '2016-11-24' name: 金沢 (中部) prefecture_id: 17 logo: "/img/dojos/japan.png" @@ -701,8 +701,8 @@ - JavaScript - HackforPlay - id: 28 - created_at: '2013-08-14' order: '182010' + created_at: '2013-08-14' name: 福井 (中部) prefecture_id: 18 url: http://coderdojo.cowbell.jp/ @@ -712,8 +712,8 @@ - Scratch - Webサイト - id: 88 - created_at: '2017-05-29' order: '192015' + created_at: '2017-05-29' name: 甲府 (中部) prefecture_id: 19 url: https://www.facebook.com/coderdojo.kofu/ @@ -725,8 +725,8 @@ - ラズベリーパイ - LEGO Mindstorms - id: 94 - created_at: '2017-02-20' order: '202061' + created_at: '2017-02-20' name: 諏訪湖 (中部) prefecture_id: 20 url: https://www.facebook.com/CoderDojo%E8%AB%8F%E8%A8%AA%E6%B9%96-104207190171589/ @@ -737,8 +737,8 @@ - ラズベリーパイ - Arduino - id: 27 - created_at: '2012-11-08' order: '202151' + created_at: '2012-11-08' name: 塩尻 (中部) prefecture_id: 20 url: http://coderdojo.shiojiri-osslabo.com/ @@ -748,8 +748,8 @@ - Scratch - Ruby - id: 87 - created_at: '2017-05-11' order: '202207' + created_at: '2017-05-11' name: 安曇野 (中部) prefecture_id: 20 url: https://www.facebook.com/CoderDojoAzumino/ @@ -761,8 +761,8 @@ - ラズベリーパイ - Arduino - id: 96 - created_at: '2017-09-26' order: '212211' + created_at: '2017-09-26' name: 海津 (中部) prefecture_id: 21 logo: "/img/dojos/japan.png" @@ -771,8 +771,8 @@ tags: - Scratch - id: 98 - created_at: '2016-02-25' order: '221309' + created_at: '2016-02-25' name: 浜松 (中部) prefecture_id: 22 logo: "/img/dojos/hamamatsu.png" @@ -783,8 +783,8 @@ - Webサイト - Minecraft - id: 129 - created_at: '2018-02-18' order: '222038' + created_at: '2018-02-18' name: 三島・沼津 (中部) prefecture_id: 22 logo: "/img/dojos/mishima-numazu.png" @@ -795,8 +795,8 @@ - Webサイト - Minecraft - id: 31 - created_at: '2014-10-20' order: '231002' + created_at: '2014-10-20' name: 名古屋 (中部) prefecture_id: 23 logo: "/img/dojos/japan.png" @@ -805,8 +805,8 @@ tags: - Scratch - id: 32 - created_at: '2014-12-08' order: '231002' + created_at: '2014-12-08' name: 天白 (中部) prefecture_id: 23 logo: "/img/dojos/tempaku.png" @@ -817,8 +817,8 @@ - Webサイト - 電子工作 - id: 30 - created_at: '2016-06-03' order: '232017' + created_at: '2016-06-03' name: 豊橋 (中部) prefecture_id: 23 logo: "/img/dojos/toyohashi.png" @@ -829,8 +829,8 @@ - アプリ開発 - ラズベリーパイ - id: 118 - created_at: '2017-11-13' order: '232122' + created_at: '2017-11-13' name: 安城 (中部) prefecture_id: 23 logo: "/img/dojos/anjo.png" @@ -839,8 +839,8 @@ tags: - Scratch - id: 84 - created_at: '2017-05-16' order: '232211' + created_at: '2017-05-16' name: 新城 (中部) prefecture_id: 23 logo: "/img/dojos/japan.png" @@ -851,8 +851,8 @@ - Webサイト - ラズベリーパイ - id: 71 - created_at: '2017-02-17' order: '232289' + created_at: '2017-02-17' name: 尾張 (中部) prefecture_id: 23 logo: "/img/dojos/owari.svg" @@ -861,8 +861,8 @@ tags: - Scratch - id: 33 - created_at: '2016-08-12' order: '234249' + created_at: '2016-08-12' name: 大治 (中部) prefecture_id: 23 logo: "/img/dojos/japan.png" @@ -871,8 +871,8 @@ tags: - Scratch - id: 62 - created_at: '2016-12-22' order: '242039' + created_at: '2016-12-22' name: 伊勢 (近畿) prefecture_id: 24 logo: "/img/dojos/ise.png" @@ -883,8 +883,8 @@ - LEGO - LabVIEW - id: 37 - created_at: '2015-09-16' order: '252018' + created_at: '2015-09-16' name: 大津 (近畿) prefecture_id: 25 logo: "/img/dojos/otsu.png" @@ -893,8 +893,8 @@ tags: - Scratch - id: 39 - created_at: '2016-03-01' order: '261009' + created_at: '2016-03-01' name: 京都伏見 (近畿) prefecture_id: 26 logo: "/img/dojos/japan.png" @@ -906,8 +906,8 @@ - Java - JavaScript - id: 34 - created_at: '2014-10-14' order: '261009' + created_at: '2014-10-14' name: 長岡京 (近畿) prefecture_id: 26 url: https://coderdojo-nagaokakyo.doorkeeper.jp/ @@ -916,8 +916,8 @@ tags: - Scratch - id: 42 - created_at: '2014-02-11' order: '271004' + created_at: '2014-02-11' name: 西宮・梅田 (近畿) prefecture_id: 27 url: http://coderdojo-nishinomiya.info/ @@ -928,8 +928,8 @@ - Webサイト - 電子工作 - id: 43 - created_at: '2016-09-27' order: '271004' + created_at: '2016-09-27' name: なんば (近畿) prefecture_id: 27 logo: "/img/dojos/japan.png" @@ -942,8 +942,8 @@ - Ruby - Java - id: 44 - created_at: '2016-08-15' order: '271004' + created_at: '2016-08-15' name: 本町 (近畿) prefecture_id: 27 logo: "/img/dojos/hommachi.png" @@ -955,8 +955,8 @@ - mruby - 電子工作 - id: 116 - created_at: '2017-11-02' order: '271004' + created_at: '2017-11-02' name: 阿倍野 (近畿) prefecture_id: 27 logo: "/img/dojos/abeno.png" @@ -967,8 +967,8 @@ - 電子工作 - Minecraft - id: 45 - created_at: '2016-07-13' order: '271004' + created_at: '2016-07-13' name: 西成 (近畿) prefecture_id: 27 logo: "/img/dojos/nishinari.jpg" @@ -978,8 +978,8 @@ - Scratch - ラズベリーパイ - id: 46 - created_at: '2016-03-22' order: '271403' + created_at: '2016-03-22' name: 堺 (近畿) prefecture_id: 27 logo: "/img/dojos/sakai.png" @@ -990,8 +990,8 @@ - PHP - Java - id: 66 - created_at: '2017-01-04' order: '272078' + created_at: '2017-01-04' name: 高槻 (近畿) prefecture_id: 27 logo: "/img/dojos/takatsuki.png" @@ -1000,8 +1000,8 @@ tags: - Scratch - id: 40 - created_at: '2016-05-18' order: '272108' + created_at: '2016-05-18' name: 枚方 (近畿) prefecture_id: 27 logo: "/img/dojos/hirakata.png" @@ -1012,8 +1012,8 @@ - Webサイト - アプリ開発 - id: 108 - created_at: '2017-09-06' order: '272205' + created_at: '2017-09-06' name: みのお (近畿) prefecture_id: 27 logo: "/img/dojos/minoh.png" @@ -1022,8 +1022,8 @@ tags: - Scratch - id: 41 - created_at: '2016-09-01' order: '272272' + created_at: '2016-09-01' name: 東大阪 (近畿) prefecture_id: 27 logo: "/img/dojos/higasi-osaka.png" @@ -1035,8 +1035,8 @@ - Android - 電子工作 - id: 101 - created_at: '2017-08-03' order: '272124' + created_at: '2017-08-03' name: 八尾 (近畿) prefecture_id: 27 logo: "/img/dojos/yao.png" @@ -1048,8 +1048,8 @@ - Android - 電子工作 - id: 72 - created_at: '2017-02-19' order: '272141' + created_at: '2017-02-19' name: 富田林 (近畿) prefecture_id: 27 logo: "/img/dojos/japan.png" @@ -1061,8 +1061,8 @@ - Android - Java - id: 110 - created_at: '2017-05-26' order: '272281' + created_at: '2017-05-26' name: せんなん (近畿) prefecture_id: 27 logo: "/img/dojos/japan.png" @@ -1071,8 +1071,8 @@ tags: - Scratch - id: 124 - created_at: '2018-01-26' order: '281018' + created_at: '2018-01-26' name: 灘 (近畿) prefecture_id: 28 logo: "/img/dojos/nada.png" @@ -1084,8 +1084,8 @@ - C - Java - id: 119 - created_at: '2017-11-08' order: '281069' + created_at: '2017-11-08' name: 西神戸 (近畿) prefecture_id: 28 logo: "/img/dojos/nishi-kobe.png" @@ -1097,8 +1097,8 @@ - PHP - Java - id: 67 - created_at: '2016-09-12' order: '281093' + created_at: '2016-09-12' name: 北神戸 (近畿) prefecture_id: 28 logo: "/img/dojos/kitakobe.png" @@ -1110,8 +1110,8 @@ - Arduino - 電子工作 - id: 48 - created_at: '2016-09-28' order: '281107' + created_at: '2016-09-28' name: 神戸 (近畿) prefecture_id: 28 logo: "/img/dojos/kobe.png" @@ -1121,8 +1121,8 @@ - Scratch - JavaScript - id: 50 - created_at: '2016-03-22' order: '282014' + created_at: '2016-03-22' name: 姫路 (近畿) prefecture_id: 28 logo: "/img/dojos/himeji.png" @@ -1133,8 +1133,8 @@ - ラズベリーパイ - Webサイト - id: 49 - created_at: '2016-04-04' order: '282031' + created_at: '2016-04-04' name: 明石 (近畿) prefecture_id: 28 logo: "/img/dojos/akashi.png" @@ -1145,8 +1145,8 @@ - Webサイト - Arduino - id: 35 - created_at: '2014-10-26' order: '292010' + created_at: '2014-10-26' name: 奈良 (近畿) prefecture_id: 29 url: http://coderdojo-nara-ikoma.github.io/ @@ -1157,8 +1157,8 @@ - Webサイト - C# - id: 36 - created_at: '2016-04-25' order: '292095' + created_at: '2016-04-25' name: 生駒 (近畿) prefecture_id: 29 logo: "/img/dojos/ikoma.png" @@ -1169,8 +1169,8 @@ - Webサイト - C# - id: 128 - created_at: '2018-02-18' order: '293431' + created_at: '2018-02-18' name: 三郷 (近畿) prefecture_id: 29 logo: "/img/dojos/sango.png" @@ -1179,8 +1179,8 @@ tags: - Scratch - id: 47 - created_at: '2016-11-01' order: '302015' + created_at: '2016-11-01' name: 和歌山 (近畿) prefecture_id: 30 logo: "/img/dojos/wakayama.png" @@ -1189,8 +1189,8 @@ tags: - Scratch - id: 99 - created_at: '2017-09-06' order: '302066' + created_at: '2017-09-06' name: 南紀田辺 (近畿) prefecture_id: 30 url: https://coderdojo-nanki-tanabe.jimdo.com/ @@ -1201,8 +1201,8 @@ - ScratchJr - ラズベリーパイ - id: 38 - created_at: '2012-11-08' order: '302074' + created_at: '2012-11-08' name: 熊野 (近畿) prefecture_id: 30 url: https://www.facebook.com/coderdojo.kumano @@ -1213,8 +1213,8 @@ - Webサイト - アプリ - id: 115 - created_at: '2017-08-16' order: '313866' + created_at: '2017-08-16' name: 大山 (中国) prefecture_id: 31 logo: "/img/dojos/japan.png" @@ -1226,8 +1226,8 @@ - Swift - ラズベリーパイ - id: 131 - created_at: '2018-02-22' order: '312011' + created_at: '2018-02-22' name: 鳥取 (中国) prefecture_id: 31 logo: "/img/dojos/tottori.png" @@ -1237,8 +1237,8 @@ - Scratch - Ruby - id: 78 - created_at: '2017-03-10' order: '325058' + created_at: '2017-03-10' name: 吉賀 (中国) prefecture_id: 32 logo: "/img/dojos/yoshika.png" @@ -1250,8 +1250,8 @@ - PHP - Ruby - id: 81 - created_at: '2017-03-20' order: '331007' + created_at: '2017-03-20' name: 岡山 岡南 (中国) prefecture_id: 33 logo: "/img/dojos/okayama.png" @@ -1264,8 +1264,8 @@ - Webアプリ開発 - Java - id: 52 - created_at: '2016-05-04' order: '341002' + created_at: '2016-05-04' name: 紙屋町 (中国) prefecture_id: 34 logo: "/img/dojos/hiroshima.jpg" @@ -1276,8 +1276,8 @@ - Webサイト - PHP - id: 53 - created_at: '2016-09-29' order: '341002' + created_at: '2016-09-29' name: 五日市 (中国) prefecture_id: 34 logo: "/img/dojos/itsukaichi.png" @@ -1288,8 +1288,8 @@ - enchant.js - Unity - id: 51 - created_at: '2016-06-01' order: '342076' + created_at: '2016-06-01' name: 福山 (中国) prefecture_id: 34 logo: "/img/dojos/fukuyama.png" @@ -1298,8 +1298,8 @@ tags: - Scratch - id: 92 - created_at: '2017-06-19' order: '352101' + created_at: '2017-06-19' name: 光 (中国) prefecture_id: 35 logo: "/img/dojos/hikari.png" @@ -1311,8 +1311,8 @@ - PHP - アプリ開発 - id: 103 - created_at: '2017-10-02' order: '362018' + created_at: '2017-10-02' name: 徳島 (四国) prefecture_id: 36 logo: "/img/dojos/tokushima.png" @@ -1325,8 +1325,8 @@ - PHP - Python - id: 111 - created_at: '2017-09-26' order: '362085' + created_at: '2017-09-26' name: 三好 (四国) prefecture_id: 36 logo: "/img/dojos/miyoshi.png" @@ -1335,8 +1335,8 @@ tags: - Minecraft - id: 102 - created_at: '2017-09-18' order: '401307' + created_at: '2017-09-18' name: 福岡 (九州) prefecture_id: 40 logo: "/img/dojos/fukuoka.png" @@ -1347,8 +1347,8 @@ - Webサイト - JavaScript - id: 113 - created_at: '2017-10-06' order: '401307' + created_at: '2017-10-06' name: ももち (九州) prefecture_id: 40 logo: "/img/dojos/momochi.png" @@ -1357,8 +1357,8 @@ tags: - Scratch - id: 54 - created_at: '2016-10-06' order: '402036' + created_at: '2016-10-06' name: 久留米 (九州) prefecture_id: 40 logo: "/img/dojos/kurume.png" @@ -1371,8 +1371,8 @@ - LEGO - Minecraft - id: 122 - created_at: '2017-12-15' order: '413411' + created_at: '2017-12-15' name: 基山 (九州) prefecture_id: 41 logo: "/img/dojos/japan.png" @@ -1385,8 +1385,8 @@ - ラズベリーパイ - Minecraft - id: 120 - created_at: '2017-11-14' order: '422011' + created_at: '2017-11-14' name: 長崎 (九州) prefecture_id: 42 logo: "/img/dojos/japan.png" @@ -1395,8 +1395,8 @@ tags: - Scratch - id: 55 - created_at: '2016-09-15' order: '454419' + created_at: '2016-09-15' name: 宮崎 (九州) prefecture_id: 45 logo: "/img/dojos/miyazaki.png" @@ -1408,8 +1408,8 @@ - Python - ラズベリーパイ - id: 61 - created_at: '2012-07-09' order: '472018' + created_at: '2012-07-09' name: 那覇 (沖縄) prefecture_id: 47 logo: "/img/dojos/okinawa.png" @@ -1418,8 +1418,8 @@ tags: - Scratch - id: 106 - created_at: '2017-09-20' order: '472051' + created_at: '2017-09-20' name: 宜野湾 (沖縄) prefecture_id: 47 logo: "/img/dojos/ginowan.png" @@ -1432,8 +1432,8 @@ - Java - Swift - id: 56 - created_at: '2016-11-02' order: '472140' + created_at: '2016-11-02' name: 宮古島 (沖縄) prefecture_id: 47 logo: "/img/dojos/miyakojima.jpg" @@ -1443,8 +1443,8 @@ - Scratch - Webサイト - id: 57 - created_at: '2016-12-19' order: '473251' + created_at: '2016-12-19' name: 嘉手納 (沖縄) prefecture_id: 47 logo: "/img/dojos/kadena.png" From e14ede1b3f4e0d95ead4187ab3d2d8460aa1d3bc Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Fri, 2 Mar 2018 11:06:10 +0900 Subject: [PATCH 09/22] =?UTF-8?q?:new:=20Add=20CoderDojo=20=E6=B4=A5?= =?UTF-8?q?=E5=B1=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/dojos.yaml | 14 ++++++++++++++ public/img/dojos/tuyama.png | Bin 0 -> 2910 bytes 2 files changed, 14 insertions(+) create mode 100644 public/img/dojos/tuyama.png diff --git a/db/dojos.yaml b/db/dojos.yaml index e6e955774..9c8c9e88e 100644 --- a/db/dojos.yaml +++ b/db/dojos.yaml @@ -1263,6 +1263,20 @@ - C# - Webアプリ開発 - Java +- id: 132 + order: '332038' + created_at: '2018-02-28' + name: 津山 (中国) + prefecture_id: 33 + logo: "/img/dojos/tuyama.png" + url: https://www.facebook.com/CoderDojoTsuyama/ + description: 岡山県津山市で毎月開催 + tags: + - Scratch + - C + - PHP + - Arduino + - 電子工作 - id: 52 order: '341002' created_at: '2016-05-04' diff --git a/public/img/dojos/tuyama.png b/public/img/dojos/tuyama.png new file mode 100644 index 0000000000000000000000000000000000000000..417685389b956ae59487a4c48ad6d8e5344d4941 GIT binary patch literal 2910 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 IM6N<$f;;Pvu>b%7 literal 0 HcmV?d00001 From 226f174c4ccde4c270737d4bc968f5832101b316 Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Fri, 2 Mar 2018 11:27:21 +0900 Subject: [PATCH 10/22] Add static number of dojos to flush meta tags in DB --- app/helpers/application_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index a508c66cc..d5faaf2ba 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -21,7 +21,7 @@ def full_url(page_url) def meta_description(description) description = kata_description if @obj && @obj.permalink == "kata" if description.empty? - "CoderDojo は子どものためのプログラミング道場です。2011年にアイルランドで始まり、全国では#{Dojo::NUM_OF_JAPAN_DOJOS}ヶ所以上、世界では#{Dojo::NUM_OF_COUNTRIES}ヶ国・#{Dojo::NUM_OF_WHOLE_DOJOS}ヶ所で開催されています。" # Default description + "CoderDojo は子どものためのプログラミング道場です。2011年にアイルランドで始まり、全国では125ヶ所以上、世界では#{Dojo::NUM_OF_COUNTRIES}ヶ国・#{Dojo::NUM_OF_WHOLE_DOJOS}ヶ所で開催されています。" # Default description else description end From b23815b56350dc10309c2d0a721031e9e357d58d Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Fri, 2 Mar 2018 11:27:53 +0900 Subject: [PATCH 11/22] Revert to show number of dojos dynamically --- app/helpers/application_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index d5faaf2ba..a508c66cc 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -21,7 +21,7 @@ def full_url(page_url) def meta_description(description) description = kata_description if @obj && @obj.permalink == "kata" if description.empty? - "CoderDojo は子どものためのプログラミング道場です。2011年にアイルランドで始まり、全国では125ヶ所以上、世界では#{Dojo::NUM_OF_COUNTRIES}ヶ国・#{Dojo::NUM_OF_WHOLE_DOJOS}ヶ所で開催されています。" # Default description + "CoderDojo は子どものためのプログラミング道場です。2011年にアイルランドで始まり、全国では#{Dojo::NUM_OF_JAPAN_DOJOS}ヶ所以上、世界では#{Dojo::NUM_OF_COUNTRIES}ヶ国・#{Dojo::NUM_OF_WHOLE_DOJOS}ヶ所で開催されています。" # Default description else description end From fa396c11380490ad28c9eb9d231723bb0a3bfc01 Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Fri, 2 Mar 2018 11:42:12 +0900 Subject: [PATCH 12/22] Add new lines and shorten link to README --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 74fe4be03..f316a24cb 100644 --- a/README.md +++ b/README.md @@ -34,13 +34,14 @@ https://coderdojo.jp/docs にあるドキュメントの編集方法も同様で [Kata](https://coderdojo.jp/kata) や [Sotechsha](https://coderdojo.jp/sotechsha) などのいくつかのページは、[Scrivito](https://scrivito.com/) と呼ばれる CMS (コンテンツ管理サービス) で運営しています。背景や使用例については次のスライドをご参照ください。 -CoderDojo を支える Rails CMS の活用事例 - Speaker Deck +CoderDojo を支える Rails CMS の活用事例 - Speaker Deck https://speakerdeck.com/yasulab/case-study-rails-cms-for-coderdojo 編集方法については下記の手順書をご参考にしてください。 -記事の編集手順書 - Google Drive -https://docs.google.com/document/d/1Va1tImybdArVHAoLgqv035OXeUd0P8MB98hCiUyG5z4/edit?usp=sharing +記事の編集手順書 - Google Drive +http://bit.ly/coderdojo-kata-edit + 編集用のユーザーアカウントを発行したい場合は [@yasulab](https://twitter.com/yasulab) までお問い合わせください。 From e2f3d32173de75d7efe74a2c25e1d8ee16a23229 Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Fri, 2 Mar 2018 11:54:33 +0900 Subject: [PATCH 13/22] Update how to add dojo document --- docs/how-to-add-dojo.md | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/docs/how-to-add-dojo.md b/docs/how-to-add-dojo.md index 11de2725b..4c0be7d43 100644 --- a/docs/how-to-add-dojo.md +++ b/docs/how-to-add-dojo.md @@ -27,7 +27,7 @@ | Dojoカラム | フォーム | |:-----------------|:------------------:| | `created_at` | タイムスタンプ | -| `order` [^1] | [全国地方公共団体コード](https://docs.google.com/spreadsheets/d/1b2XZxifpP8GSASvP9sPq1BYwsCH6Y_FHSkol_nfaGxw/edit#gid=1813423171) | +| `order` (*1) | [全国地方公共団体コード](http://www.soumu.go.jp/denshijiti/code.html) | |`name` | 正式名称 | | `prefecture_id` | `db/seeds.rb` の該当番号 | |`logo` | `public/` のDojo画像パス | @@ -35,17 +35,19 @@ | `description` |フォーム `Dojoの開催場所と開催頻度について教えてください` | |`tags` | フォーム `Dojo で対応可能な技術を教えてください (最大5つまで)`| +`id`, `created_at`, `updated_at` はRailsがデフォルトで提供するカラムです。詳細はRailsガイドの[Active Recordの基礎](https://railsguides.jp/active_record_basics.html#%E3%82%B9%E3%82%AD%E3%83%BC%E3%83%9E%E3%81%AE%E3%83%AB%E3%83%BC%E3%83%AB)をご参照ください。 -### `order` の値について +### *1 `order` の値について -[^1]: `order`の値はDojoの名称が公共団体名になっている場合は省略可能です。 -- `order`の値はDojoの名称が公共団体名になっている場合は省略可能です。 -- Dojo名が市町村以外の名称になっている場合のみ入力をする必要があります。 - - ex. 嘉手納は嘉手納市がある為省略可能 +- `order` には総務省が定める[全国地方公共団体コード](http://www.soumu.go.jp/denshijiti/code.html)を値を入力します +- `order` の値は、Dojoの名称が公共団体名になっている場合に省略可能です ([#228](https://github.com/coderdojo-japan/coderdojo.jp/issues/228)) +- Dojo名が市町村以外の名称になっている場合のみ入力をする必要があります + - 例: `CoderDojo 嘉手納` は `嘉手納` 市がある為、自動的に紐付け可能 (省略可能) +yaml ファイルに各項目を追記したら、`$ bundle exec rails dojos:update_db_by_yaml` を実行してDBに新規Dojo情報を反映します。その後 `$ bundle exec rails dojos:migrate_adding_id_to_yaml` を実行します。 + +yamlファイルにidおよびorderが動的に更新されたことを確認できたら `Add CoderDojo [Dojo名]` でコミットをします。 -- ここまで記述した後に `be rails dojos:update_db_by_yaml` を実行しdbに新規Dojoを反映する -- その後 `be rails dojos:migrate_adding_id_to_yaml`  を実行し、yamlにidが動的に付けられた事を確認する ### 関連Issue From 8ba4ed8df913028953e2ba66646624bac2351a0f Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Fri, 2 Mar 2018 11:56:52 +0900 Subject: [PATCH 14/22] Add example of adding dojo --- docs/how-to-add-dojo.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/how-to-add-dojo.md b/docs/how-to-add-dojo.md index 4c0be7d43..19197ec9b 100644 --- a/docs/how-to-add-dojo.md +++ b/docs/how-to-add-dojo.md @@ -37,17 +37,18 @@ `id`, `created_at`, `updated_at` はRailsがデフォルトで提供するカラムです。詳細はRailsガイドの[Active Recordの基礎](https://railsguides.jp/active_record_basics.html#%E3%82%B9%E3%82%AD%E3%83%BC%E3%83%9E%E3%81%AE%E3%83%AB%E3%83%BC%E3%83%AB)をご参照ください。 -### *1 `order` の値について +### (*1) `order` の値について - `order` には総務省が定める[全国地方公共団体コード](http://www.soumu.go.jp/denshijiti/code.html)を値を入力します - `order` の値は、Dojoの名称が公共団体名になっている場合に省略可能です ([#228](https://github.com/coderdojo-japan/coderdojo.jp/issues/228)) - Dojo名が市町村以外の名称になっている場合のみ入力をする必要があります - - 例: `CoderDojo 嘉手納` は `嘉手納` 市がある為、自動的に紐付け可能 (省略可能) + - 例: `CoderDojo 嘉手納` は `嘉手納` 市がある為、自動的に紐付けできます (省略可能) yaml ファイルに各項目を追記したら、`$ bundle exec rails dojos:update_db_by_yaml` を実行してDBに新規Dojo情報を反映します。その後 `$ bundle exec rails dojos:migrate_adding_id_to_yaml` を実行します。 yamlファイルにidおよびorderが動的に更新されたことを確認できたら `Add CoderDojo [Dojo名]` でコミットをします。 +コミットおよびPRの例: https://github.com/coderdojo-japan/coderdojo.jp/pull/274 ### 関連Issue From 5f88a07c8fc359053be056d908d41dc028930e77 Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Fri, 2 Mar 2018 12:55:51 +0900 Subject: [PATCH 15/22] Add Japanese message when failed to detect city code --- lib/tasks/dojos.rake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/tasks/dojos.rake b/lib/tasks/dojos.rake index 69314415d..95aba39d4 100644 --- a/lib/tasks/dojos.rake +++ b/lib/tasks/dojos.rake @@ -51,7 +51,11 @@ namespace :dojos do if /(?.+)\s\(.+\)/ =~ pre_city table = CSV.table(Rails.root.join('db','city_code.csv')) row = table.find{ |r| r[:city].to_s.start_with?(city)} - row ? row[:order] : raise("Not found order by #{pre_city}") + row ? row[:order] : raise("Failed to detect city code by #{pre_city} +order値の自動設定ができませんでした。お手数ですが下記URLを参考に該当する全国地方公共団体コードをorder値にご入力ください。 +http://www.soumu.go.jp/denshijiti/code.html + +") else raise("It is not valid data for #{pre_city}") end From 477f973d6361e7f155701080a21b21725e4d1ccd Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Fri, 2 Mar 2018 12:59:07 +0900 Subject: [PATCH 16/22] =?UTF-8?q?Add=20CoderDojo=20=E7=94=B2=E6=96=90?= =?UTF-8?q?=E7=AB=9C=E7=8E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/dojos.yaml | 13 +++++++++++++ public/img/dojos/kairyuo.png | Bin 0 -> 9112 bytes 2 files changed, 13 insertions(+) create mode 100644 public/img/dojos/kairyuo.png diff --git a/db/dojos.yaml b/db/dojos.yaml index 9c8c9e88e..b9bf18614 100644 --- a/db/dojos.yaml +++ b/db/dojos.yaml @@ -724,6 +724,19 @@ - Hour of Code - ラズベリーパイ - LEGO Mindstorms +- id: 133 + order: '192104' + created_at: '2018-03-02' + name: 甲斐竜王 (中部) + prefecture_id: 19 + url: https://www.facebook.com/CoderDojo%E7%94%B2%E6%96%90%E7%AB%9C%E7%8E%8B-181532029243337/ + logo: "/img/dojos/kairyuo.png" + description: 山梨県甲斐市で毎月開催 + tags: + - Hour of Code + - Scratch + - Webサイト + - グラフィックデザイン - id: 94 order: '202061' created_at: '2017-02-20' diff --git a/public/img/dojos/kairyuo.png b/public/img/dojos/kairyuo.png new file mode 100644 index 0000000000000000000000000000000000000000..4d4d2716d5043c440d1ffc4eee64b00cfe61ece2 GIT binary patch literal 9112 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 Whi+jSiwQsg0000 Date: Mon, 5 Mar 2018 11:02:18 +0900 Subject: [PATCH 17/22] modofied namespace statiscs/providers/ to providers/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit statiscs/providersにはDojoのイベントAPIにアクセスする為の実装がある. 直近のイベント情報を取得する際も、APIアクセスが必要となる為この資産を使いたい。 > statistics 系の資源を使いつつ、直近情報を入手する実装がやっぱり良さそう > ネームスペースが気持ち悪いと思うので、Statisticsの外に出してしまうと良いかもしれないですねぇ。 そこで名前空間をstatiscs/providersからprovidersに変更した --- lib/{statistics => }/providers.rb | 0 lib/{statistics => }/providers/connpass.rb | 0 lib/{statistics => }/providers/doorkeeper.rb | 0 lib/{statistics => }/providers/facebook.rb | 0 lib/{statistics => }/providers/static_yaml.rb | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename lib/{statistics => }/providers.rb (100%) rename lib/{statistics => }/providers/connpass.rb (100%) rename lib/{statistics => }/providers/doorkeeper.rb (100%) rename lib/{statistics => }/providers/facebook.rb (100%) rename lib/{statistics => }/providers/static_yaml.rb (100%) diff --git a/lib/statistics/providers.rb b/lib/providers.rb similarity index 100% rename from lib/statistics/providers.rb rename to lib/providers.rb diff --git a/lib/statistics/providers/connpass.rb b/lib/providers/connpass.rb similarity index 100% rename from lib/statistics/providers/connpass.rb rename to lib/providers/connpass.rb diff --git a/lib/statistics/providers/doorkeeper.rb b/lib/providers/doorkeeper.rb similarity index 100% rename from lib/statistics/providers/doorkeeper.rb rename to lib/providers/doorkeeper.rb diff --git a/lib/statistics/providers/facebook.rb b/lib/providers/facebook.rb similarity index 100% rename from lib/statistics/providers/facebook.rb rename to lib/providers/facebook.rb diff --git a/lib/statistics/providers/static_yaml.rb b/lib/providers/static_yaml.rb similarity index 100% rename from lib/statistics/providers/static_yaml.rb rename to lib/providers/static_yaml.rb From 1a03b3ca909ebb3d05be8c9c6154d23302d9b048 Mon Sep 17 00:00:00 2001 From: AnaTofuZ Date: Mon, 5 Mar 2018 11:06:35 +0900 Subject: [PATCH 18/22] remove module Statistics namespace for lib/providers/*.rb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 先程のcommitでnamespaceの変更を行った為、Statisticsの名前空間を削除した --- lib/providers.rb | 5 +---- lib/providers/connpass.rb | 4 +--- lib/providers/doorkeeper.rb | 4 +--- lib/providers/facebook.rb | 4 +--- lib/providers/static_yaml.rb | 4 +--- 5 files changed, 5 insertions(+), 16 deletions(-) diff --git a/lib/providers.rb b/lib/providers.rb index 7f5069eef..203e62902 100644 --- a/lib/providers.rb +++ b/lib/providers.rb @@ -1,7 +1,4 @@ -module Statistics - module Providers - end -end +module Providers ;end require_relative 'providers/connpass' require_relative 'providers/doorkeeper' diff --git a/lib/providers/connpass.rb b/lib/providers/connpass.rb index 9689ad425..fbbdf73f9 100644 --- a/lib/providers/connpass.rb +++ b/lib/providers/connpass.rb @@ -1,5 +1,4 @@ -module Statistics - module Providers +module Providers class Connpass ENDPOINT = 'https://connpass.com/api/v1'.freeze @@ -38,5 +37,4 @@ def fetch_events(series_id:, yyyymm: nil, yyyymmdd: nil) events end end - end end diff --git a/lib/providers/doorkeeper.rb b/lib/providers/doorkeeper.rb index 557dea9dc..3b058489d 100644 --- a/lib/providers/doorkeeper.rb +++ b/lib/providers/doorkeeper.rb @@ -1,5 +1,4 @@ -module Statistics - module Providers +module Providers class Doorkeeper ENDPOINT = 'https://api.doorkeeper.jp'.freeze @@ -47,5 +46,4 @@ def fetch_events(group_id:, since_at: @default_since, until_at: @default_until) end end end - end end diff --git a/lib/providers/facebook.rb b/lib/providers/facebook.rb index e7b2eb7b2..d7b7b8761 100644 --- a/lib/providers/facebook.rb +++ b/lib/providers/facebook.rb @@ -1,5 +1,4 @@ -module Statistics - module Providers +module Providers class Facebook class_attribute :access_token @@ -30,5 +29,4 @@ def fetch_events(group_id:, since_at: nil, until_at: nil) events end end - end end diff --git a/lib/providers/static_yaml.rb b/lib/providers/static_yaml.rb index 6c496a3d2..9411205ab 100644 --- a/lib/providers/static_yaml.rb +++ b/lib/providers/static_yaml.rb @@ -1,5 +1,4 @@ -module Statistics - module Providers +module Providers class StaticYaml YAML_FILE = Rails.root.join('db', 'static_event_histories.yaml') @@ -7,5 +6,4 @@ def fetch_events YAML.load_file(YAML_FILE) || [] end end - end end From 4b8f227d002ae0fffd3fd8326ca2e4e48964f92c Mon Sep 17 00:00:00 2001 From: AnaTofuZ Date: Mon, 5 Mar 2018 11:09:59 +0900 Subject: [PATCH 19/22] =?UTF-8?q?lib/statistics.rb=E3=81=A7=E3=81=AE=20`pr?= =?UTF-8?q?oviders`=20=E3=81=AE=E5=90=8D=E5=89=8D=E7=A9=BA=E9=96=93?= =?UTF-8?q?=E3=81=8B=E3=82=89statistics=E3=82=92=E5=A4=96=E3=81=97?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `providers` の名前空間を`statistics` から外した為、require_relativeのパ スを修正した --- lib/statistics.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/statistics.rb b/lib/statistics.rb index e543557ac..ef5cc7288 100644 --- a/lib/statistics.rb +++ b/lib/statistics.rb @@ -1,6 +1,6 @@ module Statistics; end require_relative 'statistics/client' -require_relative 'statistics/providers' require_relative 'statistics/tasks' require_relative 'statistics/aggregation' +require_relative 'providers' From ec1f07be33cc150c5a7695326fe8251e9918415c Mon Sep 17 00:00:00 2001 From: AnaTofuZ Date: Mon, 5 Mar 2018 11:11:56 +0900 Subject: [PATCH 20/22] =?UTF-8?q?=E5=90=8D=E5=89=8D=E7=A9=BA=E9=96=93?= =?UTF-8?q?=E3=81=AE=E5=A4=89=E6=9B=B4=E3=81=AB=E4=BC=B4=E3=81=86lib/tasks?= =?UTF-8?q?/statistics.rake=E3=81=A7=E3=81=AEStatistics::Providers?= =?UTF-8?q?=E3=81=AE=E5=90=8D=E5=89=8D=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Statistics::ProvidersからProvides::に名前空間を修正した為 使用しているrakeファイルの名前空間を修正した --- lib/tasks/statistics.rake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/tasks/statistics.rake b/lib/tasks/statistics.rake index b1611aded..1bf4f75f7 100644 --- a/lib/tasks/statistics.rake +++ b/lib/tasks/statistics.rake @@ -3,7 +3,7 @@ require_relative '../statistics.rb' namespace :statistics do desc '月次/週次のイベント履歴を集計します' task :aggregation, [:from, :to] => :environment do |tasks, args| - Statistics::Providers::Facebook.access_token = Koala::Facebook::OAuth.new(ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']).get_app_access_token + Providers::Facebook.access_token = Koala::Facebook::OAuth.new(ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']).get_app_access_token Statistics::Aggregation.new(args).run end @@ -14,9 +14,9 @@ namespace :statistics do require 'pp' puts 'Searching Connpass' - pp Statistics::Providers::Connpass.new.search(keyword: args[:keyword]) + pp Providers::Connpass.new.search(keyword: args[:keyword]) puts 'Searching Doorkeeper' - pp Statistics::Providers::Doorkeeper.new.search(keyword: args[:keyword]) + pp Providers::Doorkeeper.new.search(keyword: args[:keyword]) end end From 1e412e47470d2fe0b4a66b6aa9eac61ea33f4e81 Mon Sep 17 00:00:00 2001 From: AnaTofuZ Date: Mon, 5 Mar 2018 11:19:26 +0900 Subject: [PATCH 21/22] git mv spec/lib/statistics/providers -> spec/lib/providers/* --- spec/lib/{statistics => }/providers/connpass_spec.rb | 0 spec/lib/{statistics => }/providers/doorkeeper_spec.rb | 0 spec/lib/{statistics => }/providers/facebook_spec.rb | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename spec/lib/{statistics => }/providers/connpass_spec.rb (100%) rename spec/lib/{statistics => }/providers/doorkeeper_spec.rb (100%) rename spec/lib/{statistics => }/providers/facebook_spec.rb (100%) diff --git a/spec/lib/statistics/providers/connpass_spec.rb b/spec/lib/providers/connpass_spec.rb similarity index 100% rename from spec/lib/statistics/providers/connpass_spec.rb rename to spec/lib/providers/connpass_spec.rb diff --git a/spec/lib/statistics/providers/doorkeeper_spec.rb b/spec/lib/providers/doorkeeper_spec.rb similarity index 100% rename from spec/lib/statistics/providers/doorkeeper_spec.rb rename to spec/lib/providers/doorkeeper_spec.rb diff --git a/spec/lib/statistics/providers/facebook_spec.rb b/spec/lib/providers/facebook_spec.rb similarity index 100% rename from spec/lib/statistics/providers/facebook_spec.rb rename to spec/lib/providers/facebook_spec.rb From 47218988f9c65d1e77d632ab233a0573c70d0399 Mon Sep 17 00:00:00 2001 From: AnaTofuZ Date: Mon, 5 Mar 2018 11:21:57 +0900 Subject: [PATCH 22/22] =?UTF-8?q?spec/lib/providers*=20=E3=81=A7=E3=81=AE?= =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E5=AF=BE=E8=B1=A1=E3=81=AE=E5=90=8D?= =?UTF-8?q?=E5=89=8D=E7=A9=BA=E9=96=93=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit テストコードが`Statistics::Providers` を参照していた為、`Statistics` 名 前空間を外した --- spec/lib/providers/connpass_spec.rb | 4 ++-- spec/lib/providers/doorkeeper_spec.rb | 4 ++-- spec/lib/providers/facebook_spec.rb | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spec/lib/providers/connpass_spec.rb b/spec/lib/providers/connpass_spec.rb index 6dace0f18..f0e9dad55 100644 --- a/spec/lib/providers/connpass_spec.rb +++ b/spec/lib/providers/connpass_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' -require 'statistics' +require 'providers' -RSpec.describe Statistics::Providers::Connpass do +RSpec.describe Providers::Connpass do include_context 'Use stubs for Connpass' describe '#search' do diff --git a/spec/lib/providers/doorkeeper_spec.rb b/spec/lib/providers/doorkeeper_spec.rb index f53bce364..eebe8a60d 100644 --- a/spec/lib/providers/doorkeeper_spec.rb +++ b/spec/lib/providers/doorkeeper_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' -require 'statistics' +require 'providers' -RSpec.describe Statistics::Providers::Doorkeeper do +RSpec.describe Providers::Doorkeeper do include_context 'Use stubs for Doorkeeper' describe '#search' do diff --git a/spec/lib/providers/facebook_spec.rb b/spec/lib/providers/facebook_spec.rb index 9ab64af3f..29fd19454 100644 --- a/spec/lib/providers/facebook_spec.rb +++ b/spec/lib/providers/facebook_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' -require 'statistics' +require 'providers' -RSpec.describe Statistics::Providers::Facebook do +RSpec.describe Providers::Facebook do include_context 'Use stubs for Facebook' describe '#fetch_events' do