Skip to content

Commit 8199403

Browse files
authored
Merge pull request #159 from BenJetson/develop
Deploy Jekyll changes to production
2 parents 09bc934 + cc11322 commit 8199403

20 files changed

+536
-165
lines changed

.github/workflows/jekyll.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Setup Ruby
2828
uses: ruby/setup-ruby@v1
2929
with:
30-
ruby-version: 2.5
30+
ruby-version: 2.7
3131

3232
- uses: actions/cache@v1
3333
with:

Gemfile.lock

+59-79
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (6.0.4.4)
4+
activesupport (6.0.6)
55
concurrent-ruby (~> 1.0, >= 1.0.2)
66
i18n (>= 0.7, < 2)
77
minitest (~> 5.1)
88
tzinfo (~> 1.1)
99
zeitwerk (~> 2.2, >= 2.2.2)
10-
addressable (2.8.0)
11-
public_suffix (>= 2.0.2, < 5.0)
12-
backports (3.21.0)
10+
addressable (2.8.1)
11+
public_suffix (>= 2.0.2, < 6.0)
1312
coffee-script (2.4.1)
1413
coffee-script-source
1514
execjs
1615
coffee-script-source (1.11.1)
1716
colorator (1.1.0)
18-
commonmarker (0.17.13)
19-
ruby-enum (~> 0.5)
20-
concurrent-ruby (1.1.9)
21-
dnsruby (1.61.7)
17+
commonmarker (0.23.5)
18+
concurrent-ruby (1.1.10)
19+
dnsruby (1.61.9)
2220
simpleidn (~> 0.1)
2321
em-websocket (0.5.3)
2422
eventmachine (>= 0.12.9)
@@ -27,34 +25,19 @@ GEM
2725
ffi (>= 1.15.0)
2826
eventmachine (1.2.7)
2927
execjs (2.8.1)
30-
faraday (1.8.0)
31-
faraday-em_http (~> 1.0)
32-
faraday-em_synchrony (~> 1.0)
33-
faraday-excon (~> 1.1)
34-
faraday-httpclient (~> 1.0.1)
35-
faraday-net_http (~> 1.0)
36-
faraday-net_http_persistent (~> 1.1)
37-
faraday-patron (~> 1.0)
38-
faraday-rack (~> 1.0)
39-
multipart-post (>= 1.2, < 3)
28+
faraday (2.5.2)
29+
faraday-net_http (>= 2.0, < 3.1)
4030
ruby2_keywords (>= 0.0.4)
41-
faraday-em_http (1.0.0)
42-
faraday-em_synchrony (1.0.0)
43-
faraday-excon (1.1.0)
44-
faraday-httpclient (1.0.1)
45-
faraday-net_http (1.0.1)
46-
faraday-net_http_persistent (1.2.0)
47-
faraday-patron (1.0.0)
48-
faraday-rack (1.0.0)
49-
ffi (1.15.4)
31+
faraday-net_http (3.0.0)
32+
ffi (1.15.5)
5033
forwardable-extended (2.6.0)
5134
gemoji (3.0.1)
52-
github-pages (223)
35+
github-pages (227)
5336
github-pages-health-check (= 1.17.9)
54-
jekyll (= 3.9.0)
37+
jekyll (= 3.9.2)
5538
jekyll-avatar (= 0.7.0)
5639
jekyll-coffeescript (= 1.1.1)
57-
jekyll-commonmark-ghpages (= 0.1.6)
40+
jekyll-commonmark-ghpages (= 0.2.0)
5841
jekyll-default-layout (= 0.1.4)
5942
jekyll-feed (= 0.15.1)
6043
jekyll-gist (= 1.5.0)
@@ -68,7 +51,7 @@ GEM
6851
jekyll-relative-links (= 0.6.1)
6952
jekyll-remote-theme (= 0.4.3)
7053
jekyll-sass-converter (= 1.5.2)
71-
jekyll-seo-tag (= 2.7.1)
54+
jekyll-seo-tag (= 2.8.0)
7255
jekyll-sitemap (= 1.4.0)
7356
jekyll-swiss (= 1.0.0)
7457
jekyll-theme-architect (= 0.2.0)
@@ -86,12 +69,12 @@ GEM
8669
jekyll-theme-time-machine (= 0.2.0)
8770
jekyll-titles-from-headings (= 0.5.3)
8871
jemoji (= 0.12.0)
89-
kramdown (= 2.3.1)
72+
kramdown (= 2.3.2)
9073
kramdown-parser-gfm (= 1.1.0)
9174
liquid (= 4.0.3)
9275
mercenary (~> 0.3)
9376
minima (= 2.5.1)
94-
nokogiri (>= 1.12.5, < 2.0)
77+
nokogiri (>= 1.13.6, < 2.0)
9578
rouge (= 3.26.0)
9679
terminal-table (~> 1.4)
9780
github-pages-health-check (1.17.9)
@@ -100,13 +83,13 @@ GEM
10083
octokit (~> 4.0)
10184
public_suffix (>= 3.0, < 5.0)
10285
typhoeus (~> 1.3)
103-
html-pipeline (2.14.0)
86+
html-pipeline (2.14.2)
10487
activesupport (>= 2)
10588
nokogiri (>= 1.4)
10689
http_parser.rb (0.8.0)
10790
i18n (0.9.5)
10891
concurrent-ruby (~> 1.0)
109-
jekyll (3.9.0)
92+
jekyll (3.9.2)
11093
addressable (~> 2.4)
11194
colorator (~> 1.0)
11295
em-websocket (~> 0.5)
@@ -119,21 +102,21 @@ GEM
119102
pathutil (~> 0.9)
120103
rouge (>= 1.7, < 4)
121104
safe_yaml (~> 1.0)
122-
jekyll-admin (0.11.0)
105+
jekyll-admin (0.11.1)
123106
jekyll (>= 3.7, < 5.0)
124-
sinatra (~> 1.4)
125-
sinatra-contrib (~> 1.4)
107+
sinatra (>= 1.4)
108+
sinatra-contrib (>= 1.4)
126109
jekyll-avatar (0.7.0)
127110
jekyll (>= 3.0, < 5.0)
128111
jekyll-coffeescript (1.1.1)
129112
coffee-script (~> 2.2)
130113
coffee-script-source (~> 1.11.1)
131-
jekyll-commonmark (1.3.1)
132-
commonmarker (~> 0.14)
133-
jekyll (>= 3.7, < 5.0)
134-
jekyll-commonmark-ghpages (0.1.6)
135-
commonmarker (~> 0.17.6)
136-
jekyll-commonmark (~> 1.2)
114+
jekyll-commonmark (1.4.0)
115+
commonmarker (~> 0.22)
116+
jekyll-commonmark-ghpages (0.2.0)
117+
commonmarker (~> 0.23.4)
118+
jekyll (~> 3.9.0)
119+
jekyll-commonmark (~> 1.4.0)
137120
rouge (>= 2.0, < 4.0)
138121
jekyll-default-layout (0.1.4)
139122
jekyll (~> 3.0)
@@ -165,7 +148,7 @@ GEM
165148
rubyzip (>= 1.3.0, < 3.0)
166149
jekyll-sass-converter (1.5.2)
167150
sass (~> 3.4)
168-
jekyll-seo-tag (2.7.1)
151+
jekyll-seo-tag (2.8.0)
169152
jekyll (>= 3.8, < 5.0)
170153
jekyll-sitemap (1.4.0)
171154
jekyll (>= 3.7, < 5.0)
@@ -218,45 +201,42 @@ GEM
218201
gemoji (~> 3.0)
219202
html-pipeline (~> 2.2)
220203
jekyll (>= 3.0, < 5.0)
221-
kramdown (2.3.1)
204+
kramdown (2.3.2)
222205
rexml
223206
kramdown-parser-gfm (1.1.0)
224207
kramdown (~> 2.0)
225208
liquid (4.0.3)
226-
listen (3.7.0)
209+
listen (3.7.1)
227210
rb-fsevent (~> 0.10, >= 0.10.3)
228211
rb-inotify (~> 0.9, >= 0.9.10)
229212
mercenary (0.3.6)
230-
mini_portile2 (2.6.1)
213+
mini_portile2 (2.8.0)
231214
minima (2.5.1)
232215
jekyll (>= 3.5, < 5.0)
233216
jekyll-feed (~> 0.9)
234217
jekyll-seo-tag (~> 2.1)
235-
minitest (5.15.0)
218+
minitest (5.16.3)
236219
multi_json (1.15.0)
237-
multipart-post (2.1.1)
238-
nokogiri (1.12.5)
239-
mini_portile2 (~> 2.6.1)
220+
mustermann (2.0.2)
221+
ruby2_keywords (~> 0.0.1)
222+
nokogiri (1.13.8)
223+
mini_portile2 (~> 2.8.0)
240224
racc (~> 1.4)
241-
octokit (4.21.0)
242-
faraday (>= 0.9)
243-
sawyer (~> 0.8.0, >= 0.5.3)
225+
octokit (4.25.1)
226+
faraday (>= 1, < 3)
227+
sawyer (~> 0.9)
244228
pathutil (0.16.2)
245229
forwardable-extended (~> 2.6)
246-
public_suffix (4.0.6)
230+
public_suffix (4.0.7)
247231
racc (1.6.0)
248-
rack (1.6.13)
249-
rack-protection (1.5.5)
232+
rack (2.2.4)
233+
rack-protection (2.2.2)
250234
rack
251-
rack-test (1.1.0)
252-
rack (>= 1.0, < 3)
253-
rb-fsevent (0.11.0)
235+
rb-fsevent (0.11.2)
254236
rb-inotify (0.10.1)
255237
ffi (~> 1.0)
256238
rexml (3.2.5)
257239
rouge (3.26.0)
258-
ruby-enum (0.9.0)
259-
i18n
260240
ruby2_keywords (0.0.5)
261241
rubyzip (2.3.2)
262242
safe_yaml (1.0.5)
@@ -265,35 +245,35 @@ GEM
265245
sass-listen (4.0.0)
266246
rb-fsevent (~> 0.9, >= 0.9.4)
267247
rb-inotify (~> 0.9, >= 0.9.7)
268-
sawyer (0.8.2)
248+
sawyer (0.9.2)
269249
addressable (>= 2.3.5)
270-
faraday (> 0.8, < 2.0)
250+
faraday (>= 0.17.3, < 3)
271251
simpleidn (0.2.1)
272252
unf (~> 0.1.4)
273-
sinatra (1.4.8)
274-
rack (~> 1.5)
275-
rack-protection (~> 1.4)
276-
tilt (>= 1.3, < 3)
277-
sinatra-contrib (1.4.7)
278-
backports (>= 2.0)
253+
sinatra (2.2.2)
254+
mustermann (~> 2.0)
255+
rack (~> 2.2)
256+
rack-protection (= 2.2.2)
257+
tilt (~> 2.0)
258+
sinatra-contrib (2.2.2)
279259
multi_json
280-
rack-protection
281-
rack-test
282-
sinatra (~> 1.4.0)
283-
tilt (>= 1.3, < 3)
260+
mustermann (~> 2.0)
261+
rack-protection (= 2.2.2)
262+
sinatra (= 2.2.2)
263+
tilt (~> 2.0)
284264
terminal-table (1.8.0)
285265
unicode-display_width (~> 1.1, >= 1.1.1)
286266
thread_safe (0.3.6)
287-
tilt (2.0.10)
267+
tilt (2.0.11)
288268
typhoeus (1.4.0)
289269
ethon (>= 0.9.0)
290-
tzinfo (1.2.9)
270+
tzinfo (1.2.10)
291271
thread_safe (~> 0.1)
292272
unf (0.1.4)
293273
unf_ext
294-
unf_ext (0.0.8)
274+
unf_ext (0.0.8.2)
295275
unicode-display_width (1.8.0)
296-
zeitwerk (2.5.2)
276+
zeitwerk (2.6.0)
297277

298278
PLATFORMS
299279
ruby

_config.yml

+4
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ social_urls:
2727
# Build settings
2828
tier: prod
2929
recaptcha_site_id: 6LfaaLQZAAAAAFqauKWQA3LRGVvHvnl-JJ99tEJI
30+
contact_form_id: WzEyMCwxMTEsMTEzLDExNCwxMDAsMTE4LDExOSwxMTJd
3031
timezone: America/New_York
3132
remoteURL: "https://www.bengodfrey.net"
3233
markdown: kramdown
@@ -41,6 +42,8 @@ permalink: /blog/:year/:month/:day-:title
4142
# Blog settings
4243
paginate: 6
4344
paginate_path: "/blog/page:num/"
45+
jekyll-mentions:
46+
base-url: https://www.github.com/
4447

4548
# Counter settings
4649
counter:
@@ -56,6 +59,7 @@ plugins:
5659
- jekyll-default-layout
5760
- jekyll-gist
5861
- jekyll-github-metadata
62+
- jekyll-mentions
5963
- jekyll-optional-front-matter
6064
- jekyll-paginate
6165
- jekyll-readme-index

_config_dev.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ strict_front_matter: true
1818

1919
# Use reCAPTCHA testing key for local development. See also:
2020
# https://developers.google.com/recaptcha/docs/faq#id-like-to-run-automated-tests-with-recaptcha.-what-should-i-do
21-
recaptcha_site_id: 6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI
21+
recaptcha_site_id: 6Leg5fwhAAAAAEt01he0_xfyIF59TeK3NYR5PrCA
22+
23+
# Development contact form.
24+
contact_form_id: WzEwOSwxMjEsMTIxLDExMSwxMTksMTIyLDEwNiwxMTJd
2225

2326
# Plugins used for the development server.
2427
# WARNING: any plugins enabled in _config.yml should also appear here!
@@ -29,6 +32,7 @@ plugins:
2932
- jekyll-default-layout
3033
- jekyll-gist
3134
- jekyll-github-metadata
35+
- jekyll-mentions
3236
- jekyll-optional-front-matter
3337
- jekyll-paginate
3438
- jekyll-readme-index

_config_qa.yml

+7
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,10 @@
77

88
tier: qa
99
url: https://qa.bengodfrey.net
10+
11+
# Development contact form.
12+
contact_form_id: WzEwOSwxMjEsMTIxLDExMSwxMTksMTIyLDEwNiwxMTJd
13+
14+
# Use reCAPTCHA testing key for local development. See also:
15+
# https://developers.google.com/recaptcha/docs/faq#id-like-to-run-automated-tests-with-recaptcha.-what-should-i-do
16+
recaptcha_site_id: 6Leg5fwhAAAAAEt01he0_xfyIF59TeK3NYR5PrCA

_layouts/project.html

+10-5
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,14 @@
66
<div class="row">
77
<div class="col-md-4 p-3">
88
<div class="card project-header">
9+
<img
10+
src="{{page.photo}}"
11+
class="card-img-top"
12+
alt="{{page.photo-alt}}"
13+
/>
914
<div class="card-body">
1015
<h1>{{page.title}}</h1>
11-
<p class="card-description">{{page.description}}</p>
16+
<div class="card-text">{{page.description | markdownify}}</div>
1217
<p class="card-text">
1318
<small class="text-muted">{{ page.date | date: '%B %Y' }}</small>
1419
</p>
@@ -72,10 +77,10 @@ <h1>{{page.title}}</h1>
7277
<div class="mb-3 d-none d-md-block"></div>
7378
<h2 id="more">About This Project</h2>
7479
<div class="usercontent">{{page.content}}</div>
80+
81+
<div class="mt-5 pt-5 border-5 border-top">
82+
{% include comments.html %}
83+
</div>
7584
</div>
7685
</div>
77-
<div class="row">
78-
<div class="col-md-4 p-3"></div>
79-
<div class="col-md-8 p-3">{% include comments.html %}</div>
80-
</div>
8186
</div>

_projects/canvas-announcements.md

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
title: Canvas Announcement Reader
3+
date: 2020-09-03
4+
description: >-
5+
Uses the Canvas API to mark all announcements as read.
6+
7+
username: BenJetson
8+
repo: canvas-announcement-reader
9+
10+
issues: true
11+
wiki: false
12+
13+
# featured: false
14+
# rank: 0
15+
16+
photo: https://live.staticflickr.com/65535/51267083096_6e12bd44e6.jpg
17+
photo-alt: Canvas Logo next to Mute Icon
18+
---

0 commit comments

Comments
 (0)