Skip to content

Commit d7b347c

Browse files
chicacochicaco
committed
Merge commit '509c3b4006464bd3066768c184bd3cf52bf2c796' into mod_dojo_event_services_upsert
2 parents e67a2fa + 509c3b4 commit d7b347c

28 files changed

+277
-113
lines changed

‎.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.0
1+
2.6.2

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:2.6.0
1+
FROM ruby:2.6.2
22

33
ENV LANG C.UTF-8
44

‎Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source 'https://rubygems.org'
2-
ruby '2.6.0'
2+
ruby '2.6.2'
33

44
gem 'rails', '~> 5.1.6'
55
gem 'pg'

‎Gemfile.lock

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (5.1.6.1)
5-
actionpack (= 5.1.6.1)
4+
actioncable (5.1.6.2)
5+
actionpack (= 5.1.6.2)
66
nio4r (~> 2.0)
77
websocket-driver (~> 0.6.1)
8-
actionmailer (5.1.6.1)
9-
actionpack (= 5.1.6.1)
10-
actionview (= 5.1.6.1)
11-
activejob (= 5.1.6.1)
8+
actionmailer (5.1.6.2)
9+
actionpack (= 5.1.6.2)
10+
actionview (= 5.1.6.2)
11+
activejob (= 5.1.6.2)
1212
mail (~> 2.5, >= 2.5.4)
1313
rails-dom-testing (~> 2.0)
14-
actionpack (5.1.6.1)
15-
actionview (= 5.1.6.1)
16-
activesupport (= 5.1.6.1)
14+
actionpack (5.1.6.2)
15+
actionview (= 5.1.6.2)
16+
activesupport (= 5.1.6.2)
1717
rack (~> 2.0)
1818
rack-test (>= 0.6.3)
1919
rails-dom-testing (~> 2.0)
2020
rails-html-sanitizer (~> 1.0, >= 1.0.2)
21-
actionview (5.1.6.1)
22-
activesupport (= 5.1.6.1)
21+
actionview (5.1.6.2)
22+
activesupport (= 5.1.6.2)
2323
builder (~> 3.1)
2424
erubi (~> 1.4)
2525
rails-dom-testing (~> 2.0)
2626
rails-html-sanitizer (~> 1.0, >= 1.0.3)
27-
activejob (5.1.6.1)
28-
activesupport (= 5.1.6.1)
27+
activejob (5.1.6.2)
28+
activesupport (= 5.1.6.2)
2929
globalid (>= 0.3.6)
30-
activemodel (5.1.6.1)
31-
activesupport (= 5.1.6.1)
32-
activerecord (5.1.6.1)
33-
activemodel (= 5.1.6.1)
34-
activesupport (= 5.1.6.1)
30+
activemodel (5.1.6.2)
31+
activesupport (= 5.1.6.2)
32+
activerecord (5.1.6.2)
33+
activemodel (= 5.1.6.2)
34+
activesupport (= 5.1.6.2)
3535
arel (~> 8.0)
36-
activesupport (5.1.6.1)
36+
activesupport (5.1.6.2)
3737
concurrent-ruby (~> 1.0, >= 1.0.2)
3838
i18n (>= 0.7, < 2)
3939
minitest (~> 5.1)
@@ -70,7 +70,7 @@ GEM
7070
coffee-script-source
7171
execjs
7272
coffee-script-source (1.12.2)
73-
concurrent-ruby (1.1.4)
73+
concurrent-ruby (1.1.5)
7474
connection_pool (2.2.2)
7575
crass (1.0.4)
7676
debug_inspector (0.0.3)
@@ -105,7 +105,7 @@ GEM
105105
multi_json (~> 1.0)
106106
net-http-persistent (>= 2.7)
107107
net-http-pipeline
108-
globalid (0.4.1)
108+
globalid (0.4.2)
109109
activesupport (>= 4.2.0)
110110
google-api-client (0.25.0)
111111
addressable (~> 2.5, >= 2.5.1)
@@ -229,17 +229,17 @@ GEM
229229
rack-user_agent (0.5.2)
230230
rack (>= 1.5)
231231
woothee (>= 1.0.0)
232-
rails (5.1.6.1)
233-
actioncable (= 5.1.6.1)
234-
actionmailer (= 5.1.6.1)
235-
actionpack (= 5.1.6.1)
236-
actionview (= 5.1.6.1)
237-
activejob (= 5.1.6.1)
238-
activemodel (= 5.1.6.1)
239-
activerecord (= 5.1.6.1)
240-
activesupport (= 5.1.6.1)
232+
rails (5.1.6.2)
233+
actioncable (= 5.1.6.2)
234+
actionmailer (= 5.1.6.2)
235+
actionpack (= 5.1.6.2)
236+
actionview (= 5.1.6.2)
237+
activejob (= 5.1.6.2)
238+
activemodel (= 5.1.6.2)
239+
activerecord (= 5.1.6.2)
240+
activesupport (= 5.1.6.2)
241241
bundler (>= 1.3.0)
242-
railties (= 5.1.6.1)
242+
railties (= 5.1.6.2)
243243
sprockets-rails (>= 2.0.0)
244244
rails-controller-testing (1.0.4)
245245
actionpack (>= 5.0.1.x)
@@ -250,9 +250,9 @@ GEM
250250
nokogiri (>= 1.6)
251251
rails-html-sanitizer (1.0.4)
252252
loofah (~> 2.2, >= 2.2.2)
253-
railties (5.1.6.1)
254-
actionpack (= 5.1.6.1)
255-
activesupport (= 5.1.6.1)
253+
railties (5.1.6.2)
254+
actionpack (= 5.1.6.2)
255+
activesupport (= 5.1.6.2)
256256
method_source
257257
rake (>= 0.8.7)
258258
thor (>= 0.18.1, < 2.0)
@@ -443,7 +443,7 @@ DEPENDENCIES
443443
web-console
444444

445445
RUBY VERSION
446-
ruby 2.6.0p0
446+
ruby 2.6.2p47
447447

448448
BUNDLED WITH
449449
1.17.2

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ So, this application can be used and modified under the MIT License! 🆗
125125

126126
### The MIT License (MIT)
127127

128-
Copyright &copy; 2012-2018 [CoderDojo Japan](https://coderdojo.jp/)
128+
Copyright &copy; 2012-2019 [CoderDojo Japan Association](https://coderdojo.jp/)
129129

130130
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
131131

‎app/assets/images/logos/algolia.png

4.6 KB
Loading

‎app/assets/images/logos/algolia.svg

Lines changed: 1 addition & 0 deletions
Loading

‎app/assets/stylesheets/clean-blog.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,9 @@ hr.small {
8383
}
8484
.navbar-custom .nav li a {
8585
color: white;
86-
padding: 20px;
86+
padding: 20px 0px;
87+
padding-right: 20px;
88+
padding-left: 5px;
8789
}
8890
.navbar-custom .nav li a:hover,
8991
.navbar-custom .nav li a:focus {

‎app/assets/stylesheets/custom.scss

Lines changed: 52 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,64 @@
11
@import "bootstrap-sprockets";
22
@import "bootstrap";
33

4-
// Customized by YassLab
4+
// Customized by YassLab team
55

6-
/*改行位置の調整*/
7-
.ignore-pc{
8-
display:none;
9-
}
10-
.ignore-sp{
11-
display:inline;
12-
}
6+
/* DocSearch by Algolia */
7+
.search {
8+
padding-top: 17px;
9+
padding-left: 15px;
10+
padding-right: 20px;
11+
padding-bottom: 10px;
12+
}
13+
#searchbox {
14+
padding-left: 5px;
15+
font-size: 90%;
16+
}
17+
.algolia-autocomplete {
18+
/* Main dropdown wrapper */
19+
// max-width: 100px;
20+
}
21+
.algolia-autocomplete .ds-dropdown-menu {
22+
// width: 200px;
23+
}
24+
.algolia-autocomplete .algolia-docsearch-suggestion--category-header {
25+
/* Main category (eg. Getting Started) */
26+
// color: darkgray;
27+
// border: 1px solid gray;
28+
}
29+
.algolia-autocomplete .algolia-docsearch-suggestion--subcategory-column {
30+
/* Category (eg. Downloads) */
31+
// color: gray;
32+
}
33+
.algolia-autocomplete .algolia-docsearch-suggestion--title {
34+
/* Title (eg. Bootstrap CDN) */
35+
// font-weight: bold;
36+
// color: black;
37+
}
38+
.algolia-autocomplete .algolia-docsearch-suggestion--text {
39+
/* Description description (eg. Bootstrap currently works...) */
40+
// font-size: 0.8rem;
41+
// color: gray;
42+
}
43+
.algolia-autocomplete .algolia-docsearch-suggestion--highlight {
44+
/* Highlighted text */
45+
// color: blue;
46+
}
47+
48+
/* 改行位置の調整 */
49+
.ignore-pc{
50+
display:none;
51+
}
52+
.ignore-sp{
53+
display:inline;
54+
}
1355

1456
@media screen and (max-width: 640px) {
1557
.ignore-pc{
16-
display:inline;
58+
display:inline;
1759
}
1860
.ignore-sp{
19-
display:none;
61+
display:none;
2062
}
2163
}
2264

‎app/controllers/podcasts_controller.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ def index
44
@desc = 'Highlight people around CoderDojo communities by Podcast 📻✨'
55
@episodes = Podcast.all.sort_by{|episode| episode.filename.rjust(3, '0')}
66
@url = request.url
7+
@next_live_date = ENV['NEXT_LIVE_DATE'] || '未定'
78
end
89

910
def show

‎app/controllers/sotechsha_overview_page_controller.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
class SotechshaOverviewPageController < CmsController
22
def index
3+
34
@sts_posts = BlogPostPage.where(:_permalink, :starts_with,
45
'sotechsha/').order(created: :asc)
56
end

‎app/views/home/show.html.haml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
%p
4444
%a{:href => "http://www.coderdojo-kashiwa.com/"} CoderDojo Kashiwa
4545
が制作した動画です。道場の雰囲気が伝われば幸いです ;)
46-
= render partial: 'shared/sns'
46+
= render partial: 'shared/social_buttons'
4747

4848
/
4949
%section#events.detail-introduction.text-center

‎app/views/layouts/application.html.haml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,27 @@
5454
/[if lt IE 9]
5555
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
5656
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
57+
58+
/ at the end of the HEAD
59+
%link{:href => "https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css", :rel => "stylesheet"}/
60+
5761
%body
5862
- flash.each do |message_type, message|
5963
%div{:class => "alert alert-#{message_type}"}= message
6064
= yield
6165
= scrivito_body_tags if using_scrivito?
6266
= render 'shared/footer'
67+
/ at the end of the BODY
68+
%script{:src => "https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js",
69+
:type => "text/javascript"}
70+
:javascript
71+
docsearch({
72+
apiKey: '315da3c406c3fa374a0696590f4821a3',
73+
indexName: 'coderdojo',
74+
inputSelector: '#searchbox',
75+
debug: false // Set debug to true if you want to inspect the dropdown
76+
});
77+
6378
#fb-root
6479
:javascript
6580
(function(d, s, id) {

‎app/views/plain_page/index.html.haml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
/ Collect the nav links, forms, and other content for toggling
1414
#bs-example-navbar-collapse-1.collapse.navbar-collapse
1515
%ul.nav.navbar-nav.navbar-right
16+
/ DocSearch: https://github.com/algolia/docsearch-configs/blob/master/configs/coderdojo.json
17+
%li.search
18+
%input#searchbox{ :placeholder => "🔍 検索", :type => "text" }
19+
#hits
20+
#pagination
1621
%li
1722
%a{:href => "#README"} はじめに
1823
%li

‎app/views/podcasts/index.html.erb

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,29 @@
66

77
<div class="container" style="line-height: 2.2em;">
88
<section class="keiyaku" style="padding: 50px 0px 0px 0px;">
9-
<h1 style="text-align: center;"><%= @title %></h2>
10-
<p style="text-align: center; padding-bottom: 50px;"><%= @desc %></p>
9+
<h1 style="text-align: center;"><%= @title %></h1>
10+
<p style="text-align: center; padding-bottom: 100px;"><%= @desc %></p>
11+
12+
<h3 id="live" style="text-align: center; padding-bottom: 10px;">🎙 次回ライブ配信: <br class="ignore-pc"><%= @next_live_date %></h3>
13+
<iframe src="https://mixlr.com/users/6058871/embed"
14+
width="100%" height="180px" scrolling="no"
15+
frameborder="no" marginheight="0" marginwidth="0"></iframe>
16+
17+
<p style="text-align: center; padding-top: 10px; padding-bottom: 100px;">
18+
<a href="https://twitter.com/intent/tweet?button_hashtag=DojoCast"
19+
class="twitter-hashtag-button" data-size="large" data-lang="ja"
20+
data-text="" data-show-count="false">#DojoCast でツイートする</a>
21+
<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
22+
</p>
23+
24+
<h3 id="episodes" style="text-align: center; padding-bottom: 10px;">📻 これまでの収録</h3>
1125
<ul style="font-size: 120%">
1226
<% @episodes.each do |episode| %>
1327
<li><%= link_to episode.title, episode.url %></li>
1428
<% end %>
1529
</ul>
1630
</section>
1731
<section class="introduction text-center list" style="margin-bottom: 30px;">
18-
<%= render 'shared/sns' %>
32+
<%= render 'shared/social_buttons' %>
1933
</section>
2034
</div>

‎app/views/podcasts/show.html.erb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<% end %>
2121
</p>
2222
<p class="nav toc" >
23-
<a href="/podcasts/">目次へ戻る</a></p>
23+
<a href="/podcasts">目次へ戻る</a></p>
2424
<p class="nav next">
2525
<% if @episode.exists?(offset: +1) %>
2626
<a href="/podcasts/<%= @filename.to_i + 1 %>">next &rarr;</a>
@@ -40,15 +40,17 @@
4040
</audio>
4141
</div>
4242
</div>
43-
<div style="text-align: right; margin-bottom: -25px;"><a href="/podcasts/<%= @filename %>.mp3">Download mp3</a></div>
43+
<div style="text-align: right; margin-bottom: -25px;">
44+
<a href="/podcasts/<%= @filename %>.mp3">Download mp3</a>
45+
</div>
4446
</section>
4547
<br />
4648

4749
<%= raw @content %>
4850
</section>
4951

5052
<section class="introduction text-center list">
51-
<%= render 'shared/sns' %>
53+
<%= render 'shared/social_buttons' %>
5254
</section>
5355
</div>
5456

‎app/views/shared/_partners.haml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626

2727
%li= link_to image_tag('logos/code-for-everyone.png', alt: 'みんなのコード', style: 'margin-top: 10px', data: { toggle: 'tooltip', placement: 'bottom' }, title: '学校との連携支援'), 'https://code.or.jp/'
2828
%li= link_to image_tag('logos/techsoup-japan.png', alt: 'TechSoup Japan', style: 'margin-top: 10px', data: { toggle: 'tooltip', placement: 'bottom' }, title: 'G Suite などの寄贈申請の支援'), 'https://www.techsoupjapan.org/'
29-
29+
30+
%li= link_to image_tag('logos/algolia.png', alt: 'Algolia', style: 'margin-top: 5px', data: { toggle: 'tooltip', placement: 'bottom' }, title: '検索エンジン DocSearch の提供'), 'https://www.algolia.com/'
31+
3032
%p{:style => "margin-top: 50px;"}
3133
法人向けパートナーシップの
3234
%br.ignore-pc<>

‎app/views/shared/_sns.html.haml

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)