Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Video Library] Begin import of Gallantries video library to GTN (WIP) #4966

Merged
merged 96 commits into from
Jun 14, 2024
Merged
Show file tree
Hide file tree
Changes from 95 commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
d8b9587
add recordings dropdown include
shiltemann May 24, 2024
d2df700
replace recordings from video library to GTN
shiltemann May 24, 2024
d24d6f8
replace recordings from video library to GTN
shiltemann May 24, 2024
1e45905
add information about recordings of slides
shiltemann May 24, 2024
133aebe
add example import of video library metadata
shiltemann May 24, 2024
b6111f7
add recordings dropdown to cover slides
shiltemann May 24, 2024
2fe27dc
add video length, type
shiltemann May 24, 2024
5a2851b
fix buggy rendering
shiltemann May 24, 2024
13fa34f
formatting
shiltemann May 24, 2024
8f9b17c
remove video library resource include
shiltemann May 24, 2024
1aa8cfd
remove obsolete video library code
shiltemann May 24, 2024
3490ef0
automated import of video library
shiltemann May 29, 2024
30acc07
manual import of remaining videos
shiltemann May 29, 2024
4889eb4
manual import of remaining videos
shiltemann May 29, 2024
cfc5be5
save the list of unimported videos until we decide how to handle them
shiltemann May 29, 2024
4740524
add schema for recordings
shiltemann May 29, 2024
d095e41
make txt file so its not included in linting
shiltemann May 29, 2024
2d3bf80
add schema for recordings
shiltemann May 29, 2024
bccd779
start recordings page
shiltemann May 31, 2024
4004e64
support checking if url exist
shiltemann May 31, 2024
fc52d8e
support recordings page
shiltemann May 31, 2024
9af1858
allow specifying custom size of video
shiltemann May 31, 2024
16a6659
layout for recordings metadata
shiltemann May 31, 2024
091b132
update recordings metadata
shiltemann May 31, 2024
cc3d8f5
video page styling
shiltemann May 31, 2024
8b1e96a
import contributors from video library
shiltemann May 31, 2024
d37ab79
put orgs in alphabetical order
shiltemann May 31, 2024
3d1b077
add logos
shiltemann May 31, 2024
86b30e0
import (some) affiliation from video library
shiltemann May 31, 2024
0f2ee57
add keys to schema
shiltemann May 31, 2024
26f0714
fix recordings metadata issues
shiltemann May 31, 2024
adedea3
fix
shiltemann May 31, 2024
753a3ef
fix case of no recordings
shiltemann Jun 3, 2024
97559fc
add recordings folder to all tutorials
shiltemann Jun 3, 2024
e440865
Merge branch 'main' into video-library
shiltemann Jun 5, 2024
0a031e3
test if variable is set
shiltemann Jun 11, 2024
36932af
link to recordings page rather than directly to youtube
shiltemann Jun 11, 2024
e4ca2a0
tweak layout of recordings
shiltemann Jun 11, 2024
6072196
disable debug statement
shiltemann Jun 11, 2024
fc8ab5b
add lecture recordings to page
shiltemann Jun 12, 2024
b8e6736
set archive url to first one after recording.
shiltemann Jun 12, 2024
4c166ce
update links to tutorials
shiltemann Jun 12, 2024
b1d70f6
fix dates
shiltemann Jun 12, 2024
bc5ff69
add FAQs for recording and submitting videos
shiltemann Jun 12, 2024
d949d0e
add button to FAQ
shiltemann Jun 12, 2024
ba7e224
add latest video from @pvanheus
shiltemann Jun 12, 2024
bcd146e
Merge branch 'main' into video-library
shiltemann Jun 12, 2024
980f07e
fix links and heading levels
shiltemann Jun 12, 2024
47d17f0
adjust heading levels
shiltemann Jun 12, 2024
cace333
try adding index to url
shiltemann Jun 12, 2024
c776e30
fix image lihnks
shiltemann Jun 12, 2024
f74eccf
make figure optional
shiltemann Jun 12, 2024
1a8a3cb
embed videos without figure border, fix contributor counts
shiltemann Jun 12, 2024
c5edbea
add video recording logo
shiltemann Jun 12, 2024
aa8b9c5
add logo
shiltemann Jun 12, 2024
0f7a6b1
fix recordings list
shiltemann Jun 12, 2024
ffa24e7
add id in html for htmlproofer
shiltemann Jun 12, 2024
476a532
fix archive link for lecture recordings
shiltemann Jun 12, 2024
373a350
layout tweaks
shiltemann Jun 12, 2024
b685a1e
Merge branch 'main' into video-library
shiltemann Jun 12, 2024
c593ed3
add caching
hexylena Jun 12, 2024
514b810
new roles
hexylena Jun 12, 2024
10903f1
new sections
hexylena Jun 12, 2024
a501693
new data
hexylena Jun 12, 2024
e22b4bf
working contribution data
hexylena Jun 12, 2024
7c069f9
add llink to GTN GH
shiltemann Jun 13, 2024
93152e5
Merge branch 'main' into video-library
shiltemann Jun 13, 2024
f29203a
add link to submission form
shiltemann Jun 13, 2024
b453ff6
move date of news post
shiltemann Jun 13, 2024
90fc303
add script to add recordings to material metadata
shiltemann Jun 13, 2024
f72b0de
support checking if recording was already added previously
shiltemann Jun 13, 2024
2c94fc9
add bot-timestamp key to schema
shiltemann Jun 13, 2024
e197087
output variable to check if anything changed, for github actions
shiltemann Jun 13, 2024
c5dbec0
add action for importing recordings from Google form
shiltemann Jun 13, 2024
ed81e04
add news post
shiltemann Jun 13, 2024
116dc95
add to news
shiltemann Jun 13, 2024
c91fdf3
Merge branch 'main' into video-library
shiltemann Jun 13, 2024
ff1abed
add recordings folder to new tutorial
shiltemann Jun 13, 2024
102f96f
fix key
shiltemann Jun 13, 2024
8032621
tweak PR checklist
shiltemann Jun 13, 2024
0a0404a
sort videos on dropdown
shiltemann Jun 13, 2024
650e2f3
add a note about submitting videos on time
shiltemann Jun 13, 2024
7a670c6
allow us to skip testing rows
hexylena Jun 14, 2024
9995d10
Handle null refs
hexylena Jun 14, 2024
2da7d43
Replace files on disk with a generator
hexylena Jun 14, 2024
16ee538
two more safeguards
hexylena Jun 14, 2024
3de01ea
handle playlists
hexylena Jun 14, 2024
3f41198
remove ink / add license
hexylena Jun 14, 2024
6fb64c4
handle @ ing p/f/o
hexylena Jun 14, 2024
2a4fbd7
new stats
hexylena Jun 14, 2024
2e55d3a
update blogpost, small fixes
hexylena Jun 14, 2024
193a4fe
Replace news post cover pic
hexylena Jun 14, 2024
9c8e8dc
Handle slides with recordings
hexylena Jun 14, 2024
0fd745c
some more infra credits
hexylena Jun 14, 2024
c1e68f3
generate all of them anyway
hexylena Jun 14, 2024
0d30927
add missing image
hexylena Jun 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ jobs:
npm install
make rebuild-search-index ACTIVATE_ENV=pwd
cat metadata/swagger.yaml | python bin/yaml2json.py > api/swagger.json
curl --retry 5 https://gallantries.github.io/video-library/api/videos.json > metadata/video-library.json
curl --retry 5 https://gallantries.github.io/video-library/api/sessions.json > metadata/session-library.json
rdoc bin _plugins/ --output gtn_rdoc

- name: Build Site
Expand Down
48 changes: 43 additions & 5 deletions .github/workflows/google-form.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "[Cron] Update news from Google Form"
name: "[Cron] Update news and recordings from Google Form"
on:
workflow_dispatch:
schedule:
Expand Down Expand Up @@ -35,19 +35,57 @@ jobs:
bundle pristine ffi
# END Dependencies

- name: Update google news
- name: Update news from Google Form
id: generate
run: |
echo "new_ids=$(bundle exec ruby bin/google-form-news.rb)" >> $GITHUB_OUTPUT

- name: Create Pull Request
- name: Create Pull Request for News
# If it's not a Pull Request then commit any changes as a new PR.
if: |
github.event_name != 'pull_request' &&
steps.generate.outputs.new_ids != '0'
uses: peter-evans/create-pull-request@v3
with:
title: Import news posts from Google Form
commit-message: Import news posts from Google Form
branch-suffix: timestamp
commit-message: New News Post!
title: "[Google Form] New News Post!"
add-paths: news/_posts/

- name: Update recordings from Google Form
id: recordings
run: |
echo "new_recordings=$(bundle exec ruby bin/google-form-recordings.rb)" >> $GITHUB_OUTPUT

- name: Create Pull Request for Recordings
# If it's not a Pull Request then commit any changes as a new PR.
if: |
github.event_name != 'pull_request' &&
steps.generate.outputs.new_recordings == 'true'
uses: peter-evans/create-pull-request@v3
with:
title: "[Google Form] New Recording Submission!"
branch-suffix: timestamp
commit-message: add new recording from Google Form submission
add-paths: topics/
committer: "Saskia Hiltemann <[email protected]>"
author: "Saskia Hiltemann <[email protected]>"
body: |
New recording submitted!

**Submission Process checklist**
- [x] **Instructor** Record video
- [x] **Instructor** Submit video via form
- [x] **GTN** Pull request made by bot
- [ ] **GTN** Check if adjustments to PR are necessary
- [ ] Check [Submissions Form](https://docs.google.com/spreadsheets/d/1iXjLlMEH5QMAMyUMHi1c_Lb7OiJhL_9hgJrtAsBoZ-Y/edit?usp=sharing)
- [ ] New contributors need to be added?
- [ ] **GTN** Upload video to [GalaxyProject YouTube](https://www.youtube.com/c/galaxyproject)
- [ ] **GTN** Add youtube video id to PR after upload
- [ ] **GTN** Put Autogenerated captions in Google Doc ([folder](https://drive.google.com/drive/folders/1liyqDQDbxMNXvpQIaqFmoE2fB2aJIH9N?usp=drive_link))
- [ ] **Instructor** Fix autogenerated captions, comment here when done
- [ ] **GTN** Upload fixed captions to YouTube
- [ ] **GTN** Add the people who did the captioning to this PR
- [ ] **GTN** Merge PR!


2 changes: 0 additions & 2 deletions .github/workflows/monthly-release-backfill.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ jobs:
npm install
make rebuild-search-index ACTIVATE_ENV=pwd
cat metadata/swagger.yaml | python bin/yaml2json.py > api/swagger.json
curl --retry 5 https://gallantries.github.io/video-library/api/videos.json > metadata/video-library.json
curl --retry 5 https://gallantries.github.io/video-library/api/sessions.json > metadata/session-library.json
JEKYLL_ENV=production bundle exec jekyll build --strict_front_matter -d _site/training-material
env:
SOURCE_TAG: ${{ github.event.inputs.selected_tag }}
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/monthly-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ jobs:
npm install
make rebuild-search-index ACTIVATE_ENV=pwd
cat metadata/swagger.yaml | ruby bin/yaml2json.rb > api/swagger.json
curl --retry 5 https://gallantries.github.io/video-library/api/videos.json > metadata/video-library.json
curl --retry 5 https://gallantries.github.io/video-library/api/sessions.json > metadata/session-library.json
JEKYLL_ENV=production bundle exec jekyll build --strict_front_matter -d _site/training-material
env:
SOURCE_TAG: ${{ env.release_tag }}
Expand Down
62 changes: 62 additions & 0 deletions CONTRIBUTORS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ contributor2:
halloffame: "no"
joined: 2020-06

# dummy contributor for video library
awspolly:
halloffame: "no"
joined: 2024-05
name: Automated Text-to-Speech

# our real contributors <3 (please add yourself in alphabetical order)

a-asai:
Expand Down Expand Up @@ -143,6 +149,12 @@ andreasrichter:
github: false
joined: 2017-09

andrewr:
name: Andrew Rajczewski
affiliations:
- minnesotauni
joined: 2024-05

annatrigos:
name: Anna Trigos
github: false
Expand Down Expand Up @@ -675,6 +687,10 @@ EngyNasr:
- uni-freiburg
- elixir-europe

ennovytje:
name: Yvonne Hiltemann
joined: 2024-05

ecoissac:
github: false
name: Eric Coissac
Expand Down Expand Up @@ -715,10 +731,15 @@ cumbof:
orcid: 0000-0003-2920-5838
joined: 2018-02


fidelram:
name: Fidel Ramirez
joined: 2017-09

FilipposZ:
name: Filippos Zacharopoulos
joined: 2024-05

foellmelanie:
name: Melanie Föll
email: [email protected]
Expand Down Expand Up @@ -1263,6 +1284,12 @@ lleroi:
orcid: 0000-0003-3748-4179
joined: 2021-11

LonsBio:
name: Andrew Lonsdale
joined: 2024-05
affiliations:
- petermac

loraine-gueguen:
name: Loraine Guéguen
joined: 2017-09
Expand All @@ -1280,6 +1307,12 @@ kkamieniecka:
affiliations:
- elixir-europe

ksuderman:
name: Keith Suderman
joined: 2024-05
affiliations:
- johnshopkins

poterlowicz-lab:
name: Krzysztof Poterlowicz
twitter: bioinfbrad
Expand All @@ -1306,6 +1339,12 @@ mjostaszewski:
affiliations:
- elixir-europe

MariaTsayo:
name: Maria Tsagiopoulou
joined: 2024-05
affiliations:
- inab-certh

mariipia10:
name: Maria Pia
joined: 2021-10
Expand Down Expand Up @@ -1779,6 +1818,12 @@ proccaserra:
affiliations:
- elixir-europe

prodromus:
name: Jonathan Trow
joined: 2024-05
affiliations:
- ncbi

ptsefton:
name: Peter Sefton
orcid: 0000-0002-3545-944X
Expand Down Expand Up @@ -1854,6 +1899,16 @@ rlibouba:
- eurosciencegateway
- elixir-europe

rwinand:
name: Raf Winand
joined: 2024-05
affiliations:
- sciensano

s3by01:
name: Sébastien Fouilloux
joined: 2024-05

samanthaanjei:
name: Samantha Anjei
joined: 2022-04
Expand Down Expand Up @@ -2286,6 +2341,13 @@ yvanlebras:
- fnso2019
- elixir-europe

yvesvdb:
name: Yves Vandenbrouck
joined: 2024-05
affiliations:
- ifb


SNG888:
name: Sandra Ng
email: [email protected]
Expand Down
44 changes: 38 additions & 6 deletions ORGANISATIONS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,11 @@ ifb:
avatar: "/training-material/shared/images/ifb.png"
github: false

inab-certh:
name: INAB|CERTH
url: "https://www.inab.certh.gr/"
avatar: "/training-material/shared/images/inab-certh.png"

irccs:
name: IRCCS Ospedale San Raffaele
url: "https://www.hsr.it/"
Expand All @@ -100,19 +105,36 @@ jetstream2:
avatar: https://jetstream-cloud.org/images/home/jetstream-2.png
github: false

johnshopkins:
name: Johns Hopkins University
url: "https://www.jhu.edu/"
avatar: "/training-material/shared/images/hopkins.png"
github: false

linq:
name: LINQ
description: LINQ management GmbH
link: "https://linq-management.com/"
avatar: "/training-material/shared/images/linq.jpg"
github: false

minnesotauni:
name: University of Minnesota
url: "https://twin-cities.umn.edu/"
avatar: "/training-material/shared/images/minnesotauni.png"
github: false

MPIIE:
name: Max Planck Institute of Immunology and Epigenetics
url: https://www.ie-freiburg.mpg.de
avatar: https://raw.githubusercontent.com/bgruening/presentations/master/shared/resources/img/14_MPI_IE_logo_mit_180.gif
github: false

ncbi:
name: National Center for Biotechnology Information
url: "https://www.ncbi.nlm.nih.gov/"
avatar: "/training-material/shared/images/ncbi.png"

panacea:
name: PanACEA
description: Pan-African Consortium for the Evaluation of Antituberculosis Antibiotics
Expand All @@ -127,6 +149,11 @@ pangens:
avatar: "/training-material/shared/images/pangens.jpg"
github: false

petermac:
name: Peter MacCallum Cancer Centre
url: "https://www.petermac.org/"
avatar: "/training-material/shared/images/petermac.png"

pndb:
name: Pôle National de Données de Biodiversité
url: https://www.pndb.fr/
Expand Down Expand Up @@ -157,18 +184,24 @@ san-raffaele-uni:
avatar: "/training-material/shared/images/uni_san_raffaele.svg"
github: false

tb-capt:
name: TB-CAPT
url: https://www.tb-capt.org/
avatar: "/training-material/shared/images/tb_capt.svg"
github: false
sciensano:
name: Sciensano
url: "https://www.sciensano.be"
avatar: "/training-material/shared/images/sciensano.jpg"
github: false

swiss-tph:
name: Swiss Tropical and Public Health Institute
url: https://www.swisstph.ch/en/
avatar: "/training-material/shared/images/swiss-tph.png"
github: false

tb-capt:
name: TB-CAPT
url: https://www.tb-capt.org/
avatar: "/training-material/shared/images/tb_capt.svg"
github: false

uga:
name: Université Grenoble-Alpes
url: https://www.univ-grenoble-alpes.fr/
Expand All @@ -194,4 +227,3 @@ vib:
github: false



10 changes: 9 additions & 1 deletion _includes/contributor-human-icons.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,15 @@
{% elsif include.activity == "funding" %}
<abbr title="These individuals or organisations provided funding support for the development of this resource">💵</abbr>
{% elsif include.activity == "maintainer" %}
<abbr title="These individuals or organisations are responsible for maintaining this resource">🧑‍🏫</abbr>
<abbr title="These individuals or organisations are responsible for maintaining this resource">⚒</abbr>
{% elsif include.activity == "captioner" %}
<abbr title="These individuals or organisations are responsible for hand curating the captions of a video">💬</abbr>
{% elsif include.activity == "speaker" %}
<abbr title="These individuals produced a video recording of a training material">🗣</abbr>
{% elsif include.activity == "organisers" %}
<abbr title="These individuals or organisations were responsible for organising an event">🎪</abbr>
{% elsif include.activity == "instructors" %}
<abbr title="These individuals taught at an event">🧑‍🏫</abbr>
{% else %}
{{ include.activity }}
{% endif %}
Loading
Loading