From 06aaf0a3e681b24fec0c1a10a173d8346f0b234d Mon Sep 17 00:00:00 2001 From: Jack Reed Date: Sun, 9 Jul 2017 09:09:52 -0400 Subject: [PATCH] add webpack and basic page setup --- Gemfile | 3 +-- Gemfile.lock | 26 ++++++++++++++++--- _config.yml | 18 ++++++++----- package.json | 4 ++- src/_includes/footer.html | 0 src/_includes/head.html | 15 +++++++++++ src/_includes/header.html | 0 src/_includes/navigation.html | 24 +++++++++++++++++ src/_layouts/default.html | 13 +++++++--- src/_layouts/home.html | 9 +++++++ src/_layouts/page.html | 17 ++++++++++++ src/_overview/what-is-iiif.md | 4 +++ .../2017-07-02-welcome-to-jekyll.markdown | 25 ------------------ src/_sass/application.scss | 3 +++ src/about.md | 6 ----- src/assets/main.scss | 9 +++++++ src/index.md | 18 ++++++++++++- src/overview.md | 9 +++++++ yarn.lock | 15 +++++++++++ 19 files changed, 170 insertions(+), 48 deletions(-) create mode 100644 src/_includes/footer.html create mode 100644 src/_includes/head.html create mode 100644 src/_includes/header.html create mode 100644 src/_includes/navigation.html create mode 100644 src/_layouts/home.html create mode 100644 src/_layouts/page.html create mode 100644 src/_overview/what-is-iiif.md delete mode 100644 src/_posts/2017-07-02-welcome-to-jekyll.markdown create mode 100644 src/_sass/application.scss create mode 100644 src/assets/main.scss create mode 100644 src/overview.md diff --git a/Gemfile b/Gemfile index c19d889..cae8c66 100644 --- a/Gemfile +++ b/Gemfile @@ -11,8 +11,7 @@ ruby RUBY_VERSION # Happy Jekylling! gem "jekyll", "3.4.3" -# This is the default theme for new Jekyll sites. You may change this to anything you like. -gem "minima", "~> 2.0" +gem 'jemoji' # If you want to use GitHub Pages, remove the "gem "jekyll"" above and # uncomment the line below. To upgrade, run `bundle update github-pages`. diff --git a/Gemfile.lock b/Gemfile.lock index 9415d57..51ddd11 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,11 +1,21 @@ GEM remote: https://rubygems.org/ specs: + activesupport (4.2.8) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) addressable (2.5.1) public_suffix (~> 2.0, >= 2.0.2) colorator (1.1.0) ffi (1.9.18) forwardable-extended (2.6.0) + gemoji (3.0.0) + html-pipeline (2.5.0) + activesupport (>= 2) + nokogiri (>= 1.4) + i18n (0.8.5) jekyll (3.4.3) addressable (~> 2.4) colorator (~> 1.0) @@ -23,14 +33,21 @@ GEM sass (~> 3.4) jekyll-watch (1.5.0) listen (~> 3.0, < 3.1) + jemoji (0.8.0) + activesupport (~> 4.0) + gemoji (~> 3.0) + html-pipeline (~> 2.2) + jekyll (>= 3.0) kramdown (1.14.0) liquid (3.0.6) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) mercenary (0.3.6) - minima (2.1.1) - jekyll (~> 3.3) + mini_portile2 (2.2.0) + minitest (5.10.2) + nokogiri (1.8.0) + mini_portile2 (~> 2.2.0) pathutil (0.14.0) forwardable-extended (~> 2.6) public_suffix (2.0.5) @@ -40,6 +57,9 @@ GEM rouge (1.11.1) safe_yaml (1.0.4) sass (3.4.24) + thread_safe (0.3.6) + tzinfo (1.2.3) + thread_safe (~> 0.1) PLATFORMS ruby @@ -47,7 +67,7 @@ PLATFORMS DEPENDENCIES jekyll (= 3.4.3) jekyll-feed (~> 0.6) - minima (~> 2.0) + jemoji tzinfo-data RUBY VERSION diff --git a/_config.yml b/_config.yml index 780aeda..6646975 100644 --- a/_config.yml +++ b/_config.yml @@ -13,12 +13,9 @@ # you will see them accessed via {{ site.title }}, {{ site.email }}, and so on. # You can create any custom variable you would like, and they will be accessible # in the templates via {{ site.myvariable }}. -title: Your awesome title -email: your-email@domain.com +title: Learn IIIF description: > # this means to ignore newlines until "baseurl:" - Write an awesome description for your new site here. You can edit this - line in _config.yml. It will appear in your document head meta (for - Google search results) and in your feed.xml site description. + Learn IIIF, a quick way to get up to speed on IIIF. baseurl: "" # the subpath of your site, e.g. /blog url: "" # the base hostname & protocol for your site, e.g. http://example.com twitter_username: jekyllrb @@ -26,9 +23,9 @@ github_username: jekyll # Build settings markdown: kramdown -theme: minima gems: - jekyll-feed + - jemoji keep_files: - assets/javascripts/bundle.js exclude: @@ -37,3 +34,12 @@ exclude: - node_modules destination: public source: src +sass: + load_paths: + - _sass + - node_modules + +collections: + overview: + output: true + permalink: /:collection/:name diff --git a/package.json b/package.json index 646a435..81a5cfe 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,9 @@ }, "author": "", "license": "MIT", - "dependencies": {}, + "dependencies": { + "bootstrap": "4.0.0-alpha.6" + }, "devDependencies": { "babel-core": "^6.25.0", "babel-loader": "^7.1.1", diff --git a/src/_includes/footer.html b/src/_includes/footer.html new file mode 100644 index 0000000..e69de29 diff --git a/src/_includes/head.html b/src/_includes/head.html new file mode 100644 index 0000000..7536889 --- /dev/null +++ b/src/_includes/head.html @@ -0,0 +1,15 @@ + + + + + {% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %} + + + + + + + {% if jekyll.environment == 'production' and site.google_analytics %} + {% include google-analytics.html %} + {% endif %} + diff --git a/src/_includes/header.html b/src/_includes/header.html new file mode 100644 index 0000000..e69de29 diff --git a/src/_includes/navigation.html b/src/_includes/navigation.html new file mode 100644 index 0000000..3675f93 --- /dev/null +++ b/src/_includes/navigation.html @@ -0,0 +1,24 @@ +{{ site.title | escape }} + +{% assign default_paths = site.pages | map: "path" %} +{% assign page_paths = site.header_pages | default: default_paths %} + +{% assign collections = site.collections | where_exp: 'item', 'item.label != "posts"' %} + diff --git a/src/_layouts/default.html b/src/_layouts/default.html index 8f9b7cc..74d8ebd 100644 --- a/src/_layouts/default.html +++ b/src/_layouts/default.html @@ -7,13 +7,18 @@ {% include header.html %} -
-
- {{ content }} +
+
+
+ {% include navigation.html %} +
+
+ {{ content }} +
- {% include footer.html %} + {% include footer.html %} diff --git a/src/_layouts/home.html b/src/_layouts/home.html new file mode 100644 index 0000000..519eebb --- /dev/null +++ b/src/_layouts/home.html @@ -0,0 +1,9 @@ +--- +layout: default +--- + +
+ + {{ content }} + +
diff --git a/src/_layouts/page.html b/src/_layouts/page.html new file mode 100644 index 0000000..642bb66 --- /dev/null +++ b/src/_layouts/page.html @@ -0,0 +1,17 @@ +--- +layout: default +--- +
+
+ +
+

{{ page.title }}

+
+
+
+ +
+
+ {{ content }} +
+
diff --git a/src/_overview/what-is-iiif.md b/src/_overview/what-is-iiif.md new file mode 100644 index 0000000..e8fba25 --- /dev/null +++ b/src/_overview/what-is-iiif.md @@ -0,0 +1,4 @@ +--- +layout: page +title: What is IIIF? +--- diff --git a/src/_posts/2017-07-02-welcome-to-jekyll.markdown b/src/_posts/2017-07-02-welcome-to-jekyll.markdown deleted file mode 100644 index 1e2c86e..0000000 --- a/src/_posts/2017-07-02-welcome-to-jekyll.markdown +++ /dev/null @@ -1,25 +0,0 @@ ---- -layout: post -title: "Welcome to Jekyll!" -date: 2017-07-02 11:34:29 -0400 -categories: jekyll update ---- -You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated. - -To add new posts, simply add a file in the `_posts` directory that follows the convention `YYYY-MM-DD-name-of-post.ext` and includes the necessary front matter. Take a look at the source for this post to get an idea about how it works. - -Jekyll also offers powerful support for code snippets: - -{% highlight ruby %} -def print_hi(name) - puts "Hi, #{name}" -end -print_hi('Tom') -#=> prints 'Hi, Tom' to STDOUT. -{% endhighlight %} - -Check out the [Jekyll docs][jekyll-docs] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll’s GitHub repo][jekyll-gh]. If you have questions, you can ask them on [Jekyll Talk][jekyll-talk]. - -[jekyll-docs]: https://jekyllrb.com/docs/home -[jekyll-gh]: https://github.com/jekyll/jekyll -[jekyll-talk]: https://talk.jekyllrb.com/ diff --git a/src/_sass/application.scss b/src/_sass/application.scss new file mode 100644 index 0000000..c6307fe --- /dev/null +++ b/src/_sass/application.scss @@ -0,0 +1,3 @@ +p { + padding: 10px; +} diff --git a/src/about.md b/src/about.md index d441cde..79f5924 100644 --- a/src/about.md +++ b/src/about.md @@ -7,9 +7,3 @@ permalink: /about/ This is the base Jekyll theme. You can find out more info about customizing your Jekyll theme, as well as basic Jekyll usage documentation at [jekyllrb.com](https://jekyllrb.com/) You can find the source code for the Jekyll new theme at: -{% include icon-github.html username="jekyll" %} / -[minima](https://github.com/jekyll/minima) - -You can find the source code for Jekyll at -{% include icon-github.html username="jekyll" %} / -[jekyll](https://github.com/jekyll/jekyll) diff --git a/src/assets/main.scss b/src/assets/main.scss new file mode 100644 index 0000000..b5c8423 --- /dev/null +++ b/src/assets/main.scss @@ -0,0 +1,9 @@ +--- +# Needed for Jekyll +--- + +// Import Bootstraps + +@import '../../node_modules/bootstrap/scss/bootstrap'; + +@import 'application'; diff --git a/src/index.md b/src/index.md index 1eb5d67..b75aa15 100644 --- a/src/index.md +++ b/src/index.md @@ -2,5 +2,21 @@ # You don't need to edit this file, it's empty on purpose. # Edit theme's home layout instead if you wanna make some changes # See: https://jekyllrb.com/docs/themes/#overriding-theme-defaults -layout: home +layout: page +title: Learn IIIF + --- + +
+ Got 15 minutes? Learn the basics of IIIF +
+ +IIIF (International Image Interoperability Framework) is a set API specifications useful for accessing image on the Web. + +A group of users, software developers, and content providers that make up the IIIF community. Whether you are a scholar looking to use images for your ground breaking research or a dog picture aficionado hoping to share higher quality versions of your images, IIIF can help :smiley_cat: + +
+ + Get Started + +
diff --git a/src/overview.md b/src/overview.md new file mode 100644 index 0000000..2b22126 --- /dev/null +++ b/src/overview.md @@ -0,0 +1,9 @@ +--- +layout: page +title: A Brief Overview +permalink: /overview/ +--- + +IIIF is a series of APIs (application programming interface) that worked together to enable access for images on the Web. What the heck does that mean? + +For one thing, it means that content providers can publish high-resolution images that are quickly viewable at great detail. It also means that IIIF users can read and collaboratively annotate a published books. It means a whole lot of things, and this overview aims to break things down. diff --git a/yarn.lock b/yarn.lock index 51964c0..7c306be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -656,6 +656,13 @@ boom@2.x.x: dependencies: hoek "2.x.x" +bootstrap@4.0.0-alpha.6: + version "4.0.0-alpha.6" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.0.0-alpha.6.tgz#4f54dd33ac0deac3b28407bc2df7ec608869c9c8" + dependencies: + jquery ">=1.9.1" + tether "^1.4.0" + brace-expansion@^1.1.7: version "1.1.8" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292" @@ -1547,6 +1554,10 @@ isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" +jquery@>=1.9.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.2.1.tgz#5c4d9de652af6cd0a770154a631bba12b015c787" + js-tokens@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" @@ -2412,6 +2423,10 @@ tar@^2.2.1: fstream "^1.0.2" inherits "2" +tether@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/tether/-/tether-1.4.0.tgz#0f9fa171f75bf58485d8149e94799d7ae74d1c1a" + timers-browserify@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.2.tgz#ab4883cf597dcd50af211349a00fbca56ac86b86"