Merge pull request #1 from TUDelft-CITG/align-sites

Align sites

.gitignore

@@ -13,3 +13,15 @@ _site/
 # Ignore folders generated by Bundler
 .bundle/
 vendor/
+
+# copied from PD repo by Robert April 23
+*.gem
+.bundle/
+.jekyll-cache/
+.jekyll-metadata
+.sass-cache/
+Gemfile.lock
+Gemfile-local.lock
+_site/
+node_modules/
+vendor/

Assessment.md

@@ -1,7 +1,7 @@
 ---
 title: Assessment
 layout: default
-nav_order: 3
+nav_order: 6
 ---
 
 # Assesment

Gemfile-local

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+# These are from MUDE/website-23 (builds on TU Delft server)
+# Version spec is removed because dependency with `github-pages` could not be resolved.
+gem "jekyll"
+gem "just-the-docs"
+gem "webrick"
+
+# This is from the Gemfile in this repo
+gem 'github-pages', group: :jekyll_plugins

Materials.md

@@ -1,7 +1,7 @@
 ---
 title: Forms of instruction and materials
 layout: default
-nav_order: 2
+nav_order: 5
 ---
 
 # Forms of instruction

README.md

@@ -1,174 +1,3 @@
-# just-the-docs-template
+# README
 
-This is a *bare-minimum* template to create a [Jekyll] site that:
-
-- uses the [Just the Docs] theme;
-- can be built and published on [GitHub Pages];
-- can be built and previewed locally, and published on other platforms.
-
-More specifically, the created site:
-
-- uses a gem-based approach, i.e. uses a `Gemfile` and loads the `just-the-docs` gem;
-- uses the [GitHub Pages / Actions workflow] to build and publish the site on GitHub Pages.
-
-To get started with creating a site, simply:
-
-1. click "[use this template]" to create a GitHub repository
-2. go to Settings > Pages > Build and deployment > Source, and select GitHub Actions
-
-If you want to maintain your docs in the `docs` directory of an existing project repo, see [Hosting your docs from an existing project repo](#hosting-your-docs-from-an-existing-project-repo).
-
-After completing the creation of your new site on GitHub, update it as needed:
-
-## Replace the content of the template pages
-
-Update the following files to your own content:
-
-- `index.md` (your new home page)
-- `README.md` (information for those who access your site repo on GitHub)
-
-## Changing the version of the theme and/or Jekyll
-
-Simply edit the relevant line(s) in the `Gemfile`.
-
-## Adding a plugin
-
-The Just the Docs theme automatically includes the [`jekyll-seo-tag`] plugin.
-
-To add an extra plugin, you need to add it in the `Gemfile` *and* in `_config.yml`. For example, to add [`jekyll-default-layout`]:
-
-- Add the following to your site's `Gemfile`:
-
-  ```ruby
-  gem "jekyll-default-layout"
-  ```
-
-- And add the following to your site's `_config.yml`:
-
-  ```yaml
-  plugins:
-    - jekyll-default-layout
-  ```
-
-Note: If you are using a Jekyll version less than 3.5.0, use the `gems` key instead of `plugins`.
-
-## Publishing your site on GitHub Pages
-
-1.  If your created site is `YOUR-USERNAME/YOUR-SITE-NAME`, update `_config.yml` to:
-
-    ```yaml
-    title: YOUR TITLE
-    description: YOUR DESCRIPTION
-    theme: just-the-docs
-
-    url: https://YOUR-USERNAME.github.io/YOUR-SITE-NAME
-
-    aux_links: # remove if you don't want this link to appear on your pages
-      Template Repository: https://github.com/YOUR-USERNAME/YOUR-SITE-NAME
-    ```
-
-2.  Push your updated `_config.yml` to your site on GitHub.
-
-3.  In your newly created repo on GitHub:
-    - go to the `Settings` tab -> `Pages` -> `Build and deployment`, then select `Source`: `GitHub Actions`.
-    - if there were any failed Actions, go to the `Actions` tab and click on `Re-run jobs`.
-
-## Building and previewing your site locally
-
-Assuming [Jekyll] and [Bundler] are installed on your computer:
-
-1.  Change your working directory to the root directory of your site.
-
-2.  Run `bundle install`.
-
-3.  Run `bundle exec jekyll serve` to build your site and preview it at `localhost:4000`.
-
-    The built site is stored in the directory `_site`.
-
-## Publishing your built site on a different platform
-
-Just upload all the files in the directory `_site`.
-
-## Customization
-
-You're free to customize sites that you create with this template, however you like!
-
-[Browse our documentation][Just the Docs] to learn more about how to use this theme.
-
-## Hosting your docs from an existing project repo
-
-You might want to maintain your docs in an existing project repo. Instead of creating a new repo using the [just-the-docs template](https://github.com/just-the-docs/just-the-docs-template), you can copy the template files into your existing repo and configure the template's Github Actions workflow to build from a `docs` directory. You can clone the template to your local machine or download the `.zip` file to access the files.
-
-### Copy the template files
-
-1.  Create a `.github/workflows` directory at your project root if your repo doesn't already have one. Copy the `pages.yml` file into this directory. GitHub Actions searches this directory for workflow files.
-
-2.  Create a `docs` directory at your project root and copy all remaining template files into this directory.
-
-### Modify the GitHub Actions workflow
-
-The GitHub Actions workflow that builds and deploys your site to Github Pages is defined by the `pages.yml` file. You'll need to edit this file to that so that your build and deploy steps look to your `docs` directory, rather than the project root.
-
-1.  Set the default `working-directory` param for the build job.
-
-    ```yaml
-    build:
-      runs-on: ubuntu-latest
-      defaults:
-        run:
-          working-directory: docs
-    ```
-
-2.  Set the `working-directory` param for the Setup Ruby step.
-
-    ```yaml
-    - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '3.1'
-          bundler-cache: true
-          cache-version: 0
-          working-directory: '${{ github.workspace }}/docs'
-    ```
-
-3.  Set the path param for the Upload artifact step:
-
-    ```yaml
-    - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
-        with:
-          path: "docs/_site/"
-    ```
-
-4.  Modify the trigger so that only changes within the `docs` directory start the workflow. Otherwise, every change to your project (even those that don't affect the docs) would trigger a new site build and deploy.
-
-    ```yaml
-    on:
-      push:
-        branches:
-          - "main"
-        paths:
-          - "docs/**"
-    ```
-
-## Licensing and Attribution
-
-This repository is licensed under the [MIT License]. You are generally free to reuse or extend upon this code as you see fit; just include the original copy of the license (which is preserved when you "make a template"). While it's not necessary, we'd love to hear from you if you do use this template, and how we can improve it for future use!
-
-The deployment GitHub Actions workflow is heavily based on GitHub's mixed-party [starter workflows]. A copy of their MIT License is available in [actions/starter-workflows].
-
-----
-
-[^1]: [It can take up to 10 minutes for changes to your site to publish after you push the changes to GitHub](https://docs.github.com/en/pages/setting-up-a-github-pages-site-with-jekyll/creating-a-github-pages-site-with-jekyll#creating-your-site).
-
-[Jekyll]: https://jekyllrb.com
-[Just the Docs]: https://just-the-docs.github.io/just-the-docs/
-[GitHub Pages]: https://docs.github.com/en/pages
-[GitHub Pages / Actions workflow]: https://github.blog/changelog/2022-07-27-github-pages-custom-github-actions-workflows-beta/
-[Bundler]: https://bundler.io
-[use this template]: https://github.com/just-the-docs/just-the-docs-template/generate
-[`jekyll-default-layout`]: https://github.com/benbalter/jekyll-default-layout
-[`jekyll-seo-tag`]: https://jekyll.github.io/jekyll-seo-tag
-[MIT License]: https://en.wikipedia.org/wiki/MIT_License
-[starter workflows]: https://github.com/actions/starter-workflows/blob/main/pages/jekyll.yml
-[actions/starter-workflows]: https://github.com/actions/starter-workflows/blob/main/LICENSE
+See [TUDelft-CITG/HOS-prob-design-24](https://github.com/TUDelft-CITG/HOS-prob-design-24).

_announcements/week-0.md

@@ -0,0 +1,11 @@
+---
+title: Getting Started
+week: 0
+date: 2024-04-13
+---
+
+<!-- <a href="" target="_blank">link</a> -->
+<!-- <a href="https://tudelft-citg.github.io/HOS-prob-design/unlisted/assignment.html" target="_blank">Start HW 1</a> -->
+
+_More information coming soon!_
+{: .fs-5 }

_config.yml

@@ -1,18 +1,92 @@
 title: CIEM42X0-CM
-description: computational Modeling for HOS Students
-remote_theme: just-the-docs/[email protected]
-
-url: https://tudelft-citg.github.io/HOS-comp-mod-24
+tagline: CIEM42X0-CM Computational Modelling
+description: Hydraulic and Offshore Structures track, Civil Engineering Program at TU Delft.
+baseurl: '/HOS-comp-mod-24'
+url: https://tudelft-citg.github.io
 
 # Set a path/url to a logo that will be displayed instead of the title
 favicon_ico:: "favicon.ico"
+exclude:
+  [
+    "Gemfile",
+    "Gemfile.lock",
+    "Gemfile-local",
+    "Gemfile-local.lock",
+    "LICENSE",
+    vendor,
+    "README.md",
+    "build-local.sh",
+    "build-page.sh",
+    "_config.yml.bak",
+  ]
 
-aux_links:
-  Finite Element Book : https://teachbooks.tudelft.nl/computational-modelling/intro.html
+# Back to top link
+back_to_top: true
+back_to_top_text: "Back to top"
 
-# Enable or disable the site search
-# Supports true (default) or false
+# Theme settings
+remote_theme: just-the-docs/[email protected]
+color_scheme: light
 search_enabled: true
+heading_anchors: true
+aux_links:
+  CIEM4210:
+    - 'https://brightspace.tudelft.nl/d2l/home/594923'
+  CIEM4220:
+    - 'https://brightspace.tudelft.nl/d2l/home/594925'
+  CIEM4230:
+    - 'https://brightspace.tudelft.nl/d2l/home/594927'
+  PD Website:
+    - 'https://tudelft-citg.github.io/HOS-prob-design-24/'
+  Online Textbook:
+    - 'https://teachbooks.tudelft.nl/computational-modelling/intro.html'
+aux_links_new_tab: true
+footer_content: 'Oriol Colomés &copy; 2024 <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>'
+
+# Collections for website data
+collections:
+  staffers:
+  modules:
+  announcements:
+# Default layouts for each collection type
+defaults:
+  - scope:
+      path: ''
+      type: staffers
+    values:
+      layout: staffer
+      height: 300
+      subpath: '/assets/images/'
+      width: 300
+  - scope:
+      path: ''
+      type: modules
+    values:
+      layout: module
+  - scope:
+      path: ''
+      type: announcements
+    values:
+      layout: announcement
+
+compress_html:
+  clippings: all
+  comments: all
+  endings: all
+  startings: []
+  blanklines: false
+  profile: false
+
+callouts:
+  learningobjectives:
+    title: Learning Objectives
+    color: green
+  content:
+    title: Content
+    color: purple
+  exercises:
+    title: Exercises
+    color: blue
 
 search:
   # Split pages into sections that can be searched individually
@@ -38,21 +112,4 @@ search:
   # Supports true or false (default)
   button: false
   # Focus the search input by pressing `ctrl + focus_shortcut_key` (or `cmd + focus_shortcut_key` on macOS)
-  focus_shortcut_key: 'k'
-
-  # Color scheme supports "light" (default) and "dark"
-color_scheme: light
-
-# Supports true (default) or false
-heading_anchors: true
-
-callouts:
-  learningobjectives:
-    title: Learning Objectives
-    color: green
-  content:
-    title: Content
-    color: purple
-  exercises:
-    title: Exercises
-    color: blue
+  focus_shortcut_key: 'k'

_includes/minutes.liquid

@@ -0,0 +1,20 @@
+{% capture _minutes_workspace %}
+  {% comment %}
+    Return the number of minutes between midnight and the given time string (e.g. '9:30 AM').
+
+    Parameters:
+      `time` (string): the time to convert.
+  {% endcomment %}
+
+  {% assign _time = include.time %}
+  {% assign _hhmm = _time | split: ' ' | first | split: ':' %}
+  {% assign _hours = _hhmm | first | to_integer %}
+  {% assign _minutes = _hhmm | last | to_integer %}
+  {% assign _ampm = _time | split: ' ' | last | upcase %}
+
+  {% if _ampm == 'AM' and _hours == 12 %}
+    {% assign _hours = _hours | minus: 12 %}
+  {% elsif _ampm == 'PM' and _hours != 12 %}
+    {% assign _hours = _hours | plus: 12 %}
+  {% endif %}
+{% endcapture %}{% assign _minutes_workspace = '' %}{{ _hours | times: 60 | plus: _minutes }}

_layouts/announcement.html

@@ -0,0 +1,14 @@
+<div class="announcement">
+  <h2>{{ page.title }}</h2>
+  <span class="announcement-meta">
+    {% if page.date %}
+    {{ page.date | date: '%b %e' }}
+    &middot;
+    {% endif %}
+    {% assign minutes = content | strip_html | number_of_words | divided_by: 180.0 | round %}
+    {{ minutes }} min read
+  </span>
+  <div>
+    {{ content }}
+  </div>
+</div>