Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Remi-Gau authored Sep 17, 2021
2 parents 232bc42 + 3fdca1b commit 20741e2
Show file tree
Hide file tree
Showing 37 changed files with 520 additions and 428 deletions.
18 changes: 9 additions & 9 deletions .github/ISSUE_TEMPLATE/project-submission-template.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ assignees: ''

<!-- Guidelines
We are very excited to meet you at Brainhack Global 2020 🎉. To submit a project, you need to be an attendee to one of the Brainhack Global 2020 events listed on the [Brainhack Global 2020 webpage](https://brainhack.org/global2020/events/). Please, register for the event that is most suitable to your location, time zone, interest, and/or project prior to submitting one. Thank you!
We are very excited to meet you at Brainhack Global 2021 🎉. To submit a project, you need to be an attendee to one of the Brainhack Global 2021 events listed on the [Brainhack Global 2021 webpage](https://brainhack.org/global2021/events/). Please, register for the event that is most suitable to your location, time zone, interest, and/or project prior to submitting one. Thank you!
We have prepared a checklist to help with your project submission. Here is how to proceed:
Before filling in any part please check items in the checklist below as you go through them.
Once you are done (at least all 'required' items must be provided), please delete the "Guidelines" section, submit your issue and add a comment saying 'Hi @Brainhack-Global/project-monitors: my project is ready!'
Thank you!
After the issue is submitted, we will assign a 'project monitor' from the event location that you are registered with to review your submission. Once the submission is approved by the 'project monitor', they will add the label 'Project is ready' and it will appear on [Brainhack Global 2020 Projects](https://brainhack.org/global2020/projects) page with a separate project dedicated webpage.
After the issue is submitted, we will assign a 'project monitor' from the event location that you are registered with to review your submission. Once the submission is approved by the 'project monitor', they will add the label 'Project is ready' and it will appear on [Brainhack Global 2021 Projects](https://brainhack.org/global2021/projects) page with a separate project dedicated webpage.
Note that you can always update your issue which will also change your page on the website accordingly.
Expand All @@ -34,8 +34,8 @@ If at any time you need help from us or anything is unclear, please add a commen
**Project collaborators:**
<!-- Add full names (and Twitter handles if possible) of any person contributing to the project. Try to follow the [all-contributors specification](https://github.com/all-contributors/all-contributors). Contributions of any kind are welcome! -->

**Registered Brainhack Global 2020 Event:**
<!-- Specify the city and country of the Brainhack Global 2020 event that you
**Registered Brainhack Global 2021 Event:**
<!-- Specify the city and country of the Brainhack Global 2021 event that you
registered for. If your local event has a special name or topic (e.g. Brainhack
London - Clinical Neuroanatomy), please do specify that as well to help us
distinguish between potential events in the same city. -->
Expand All @@ -54,7 +54,7 @@ Where to find key resources; -->
**Link to project repository/sources:**
<!-- Add a link to the project’s GitHub repo or website. -->

**Goals for Brainhack Global 2020:**
**Goals for Brainhack Global 2021:**
<!-- Add a list of milestones or deliverables that you expect to achieve during the event. Try to provide goals of varying complexity for contributors with different sets of skills. -->

**Good first issues:**
Expand Down Expand Up @@ -138,17 +138,17 @@ behavioral, DWI, ECG, ECOG, EEG, eye_tracking, fMRI, fNIRS, MEG, MRI, PET, TDCS,
*Once the issue is submitted, please check items in this list as you add under ‘Additional project info’*

- [ ] Link to your project: could be a code repository, a shared document, etc.
- [ ] Goals for Brainhack Global 2020: describe what you want to achieve during this brainhack.
- [ ] Goals for Brainhack Global 2021: describe what you want to achieve during this brainhack.
- [ ] Flesh out at least 2 “good first issues”: those are tasks that do not require any prior knowledge about your project, could be defined as issues in a GitHub repository, or in a shared document.
- [ ] Skills: list skills that would be particularly suitable for your project. We ask you to include at least one non-coding skill. Use the issue labels for this purpose.
- [ ] Chat channel: A link to a chat channel that will be used during the Brainhack Global 2020 event. This can be an existing channel or a new one. We recommend using the [Brainhack space on Mattermost](https://mattermost.brainhack.org/).
<!-- [ ] Video channel: A link to a video channel that will be used during the Brainhack Global 2020 Brainhack. This can be an existing channel or a new one. For instance a [Jitsi meet room](https://meet.jit.si/). **Please, do not make the video channel public in here**: post a message in your chat channel and pin it so that it remains private, you do not get undesired content, and contributors can still have access to it..-->
- [ ] Chat channel: A link to a chat channel that will be used during the Brainhack Global 2021 event. This can be an existing channel or a new one. We recommend using the [Brainhack space on Mattermost](https://mattermost.brainhack.org/).
<!-- [ ] Video channel: A link to a video channel that will be used during the Brainhack Global 2021 Brainhack. This can be an existing channel or a new one. For instance a [Jitsi meet room](https://meet.jit.si/). **Please, do not make the video channel public in here**: post a message in your chat channel and pin it so that it remains private, you do not get undesired content, and contributors can still have access to it..-->

Optionally, you can also include information about:

- [ ] Number of participants required.
- [ ] Twitter-sized summary of your project pitch.
- [ ] Provide an image of your project for the Brainhack Global 2020 website.
- [ ] Provide an image of your project for the Brainhack Global 2021 website.
<!-- You can put an image anywhere in this issue and it will be used to build your project page on the website. -->

We would like to think about how you will credit and onboard new members to your project. If you’d like to share your thoughts with future project participants, you can include information about:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hugo-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
deploy:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ jobs:
# File with label/regex match dictionary
configuration-path: .github/labeler.yml
# The issues opened before this date will be ignored
not-before: 2020-10-29T00:00:00Z
not-before: 2021-10-29T00:00:00Z
# This can be increased if the dictionary undergoes a breaking change
enable-versioned-regex: 0
3 changes: 1 addition & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ See the instruction related to the operatiing system you are using on the
3. Run the site locally

```
hugo server
hugo server -D
```

issue_to_pages
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020 Brainhack
Copyright (c) 2021 Brainhack

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
28 changes: 24 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,32 @@
# Brainhack Global 2020
# Welcome to the Brainhack Global 2021 repository.

This is where you will find all the files and actions regarding
the [Brainhack Global 2021 website](https://brainhack.org/global2021/)
which is developed together with the Brainhack community.

Welcome to the Brainhack Global 2021 repository. This is where you will find all the files and actions regarding the [Brainhack Global 2021 website](https://brainhack.org/global2021/) which is developed together with the Brainhack community. If you would like to participate to the conversations or help us, please come and join us on the Brainhack Mattermost channel [#BHG2021 Tools Working Group](https://mattermost.brainhack.org/brainhack/channels/brainhack_global-logistics).
---

If you would like to participate to the conversations or help us,
please come and join us on the Brainhack Mattermost channel
[#BHG2021 logistics](https://mattermost.brainhack.org/brainhack/channels/brainhack_global-logistics).

This repository is also where you will be submitting project issues if you would like run throughout Brainhack Global 2021. Before submitting your project issue, please register with the one of the events listed at our [website](https://brainhack.org/global2021/events/) and read through the [guideline](https://brainhack.org/global2021/projects/) to learn more information about project submission.
---

If you would like to hear, say and participate in discussions about the Brainhack, please join our [Brainhack community forum](https://mattermost.brainhack.org/brainhack/) and [Brainhack Global communication channel](https://mattermost.brainhack.org/brainhack/channels/brainhack-global)
This repository is also where you will be submitting project issues if you would like run throughout Brainhack Global 2021.

Before submitting your project issue, please register with the one of the events listed
at our [website](https://brainhack.org/global2021/events/)
and read through the [guideline](https://brainhack.org/global2021/projects/)
to learn more information about project submission.

---

If you would like to hear, say and participate in discussions about the Brainhack,
please join our [Brainhack community forum](https://mattermost.brainhack.org/brainhack/)
and [Brainhack Global communication channel](https://mattermost.brainhack.org/brainhack/channels/brainhack-global)

---

We wish you an amazing Brainhack Global 2021 experience throughout your participation! :tada:


2 changes: 1 addition & 1 deletion assets/scss/custom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@

// /* Default icon URLs */
// .leaflet-default-icon-path {
// background-image: url(../../global2020/img/marker-icon.png);
// background-image: url(../../global2021/img/marker-icon.png);
// }


Expand Down
3 changes: 0 additions & 3 deletions config.toml

This file was deleted.

6 changes: 3 additions & 3 deletions config/_default/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
# Each configuration section is defined by a name in square brackets (e.g. `[outputs]`).

# Title of your site
title = "Brainhack Global 2020"
title = "Brainhack Global 2021"

# The URL of your site.
# End your URL with a `/` trailing slash, e.g. `https://example.com/`.
baseurl = "https://www.brainhack.org/global2020/"
baseurl = "https://www.brainhack.org/global2021/"

# Enter a copyright notice to display in the site footer.
# To display a copyright symbol, type `&copy;`. For current year, type `{year}`.
copyright = "&copy; Brainhack Global 2020"
copyright = "&copy; Brainhack Global 2021"

############################
## Advanced options below ##
Expand Down
16 changes: 8 additions & 8 deletions config/_default/menus.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@
[[main]]
pre = "<i class='fas fa-brain'></i>"
name = "&nbsp; Home"
url = "../global2020/"
url = "../global2021/"
weight = 10

[[main]]
pre = "<i class='fas fa-search-location'></i>"
name = "&nbsp; Events"
url = "../global2020/events/"
# "https://brainhack.org/global2020/events"
url = "../global2021/events/"
# "https://brainhack.org/global2021/events"
weight = 20
# identifier = "event"

# [[main]]
# name = "View 2020 Events"
# name = "View 2021 Events"
# url = "/events#talk_list"
# weight = 20
# parent = "event"
Expand All @@ -33,7 +33,7 @@
[[main]]
pre = "<i class='fas fa-laptop'></i>"
name = "&nbsp; Projects"
url = "../global2020/projects/"
url = "../global2021/projects/"
weight = 30

[[main]]
Expand All @@ -45,19 +45,19 @@
[[main]]
# pre = "<i class='fas fa-users'></i>"
name = "Team"
url = "../global2020/#team"
url = "../global2021/#team"
weight = 50

[[main]]
# pre = "<i class='fas fa-envelope-square'></i>"
name = "Contact"
url = "../global2020/#contact"
url = "../global2021/#contact"
weight = 60

[[main]]
# pre = "<i class='fas fa-question-circle'></i>"
name = "FAQ"
url = "../global2020/faq/"
url = "../global2021/faq/"
weight = 70
# identifier = "faq"

Expand Down
2 changes: 1 addition & 1 deletion config/_default/params.toml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ privacy_pack = false

# Enable visitors to edit pages?
# `repo` defines the repository URL. `editable` defines which page types can be edited.
edit_page = {repo_url = "https://github.com/brainhackorg/global2020", content_dir = "content", repo_branch = "master", editable = {docs = true, page = true, post = true}}
edit_page = {repo_url = "https://github.com/brainhackorg/global2021", content_dir = "content", repo_branch = "master", editable = {docs = true, page = true, post = true}}

# Show related content at the bottom of pages?
show_related = {docs = true, page = true, post = true, project = true, publication = true, talk = true}
Expand Down
26 changes: 14 additions & 12 deletions content/authors/Isil-Poyraz-Bilgin/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,34 @@ title: "Isil Poyraz Bilgin"

# Username (this should match the folder name and the name on publications)
authors:
- "Isil Poyraz Bilgin"
- "Isil Poyraz Bilgin"
github: complexbrains
# Is this the primary user of the site?
superuser: false

# Role/position (e.g., Professor of Artificial Intelligence) & Organizations/Affiliations
position: "PhD Researcher at the Department of Biomedical Engineering, University of Reading, Reading, United Kingdom"
position:
"PhD Researcher at the Department of Biomedical Engineering, University of
Reading, Reading, United Kingdom"

# Social/Academic Networking
# For available icons, see: https://sourcethemes.com/academic/docs/page-builder/#icons
# For an email link, use "fas" icon pack, "envelope" icon, and a link in the
# form "mailto:[email protected]" or "#contact" for contact widget.
social:
- icon: envelope
icon_pack: fas
link: "mailto:[email protected]" # For a direct email link, use "mailto:[email protected]".
- icon: twitter
icon_pack: fab
link: https://twitter.com/complexbrains
- icon: github
icon_pack: fab
link: https://github.com/complexbrains
- icon: envelope
icon_pack: fas
link: "mailto:[email protected]" # For a direct email link, use "mailto:[email protected]".
- icon: twitter
icon_pack: fab
link: https://twitter.com/complexbrains
- icon: github
icon_pack: fab
link: https://github.com/complexbrains

# Organizational groups that you belong to (for People widget)
# Set this to `[]` or comment out if you are not using People widget.
user_groups:
- Brainhack Global Organizing Committee
- Brainhack Global Organizing Committee
# - Volunteers
---
22 changes: 11 additions & 11 deletions content/authors/Jon-Haitz-Legarreta-Gorrono/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title: "Jon Haitz Legarreta Gorroño"

# Username (this should match the folder name and the name on publications)
authors:
- "Jon Haitz Legarreta Gorroño"
- "Jon Haitz Legarreta Gorroño"
github: jhlegarreta
# Is this the primary user of the site?
superuser: false
Expand All @@ -17,19 +17,19 @@ position: "PhD Student at Université de Sherbrooke, Québec, Canada"
# For an email link, use "fas" icon pack, "envelope" icon, and a link in the
# form "mailto:[email protected]" or "#contact" for contact widget.
social:
- icon: envelope
icon_pack: fas
link: "mailto:[email protected]" # For a direct email link, use "mailto:[email protected]".
#- icon: twitter
# icon_pack: fab
# link: https://twitter.com/YOURUSERNAME
- icon: github
icon_pack: fab
link: https://github.com/jhlegarreta
- icon: envelope
icon_pack: fas
link: "mailto:[email protected]" # For a direct email link, use "mailto:[email protected]".
#- icon: twitter
# icon_pack: fab
# link: https://twitter.com/YOURUSERNAME
- icon: github
icon_pack: fab
link: https://github.com/jhlegarreta

# Organizational groups that you belong to (for People widget)
# Set this to `[]` or comment out if you are not using People widget.
user_groups:
- Brainhack Global Organizing Committee
- Brainhack Global Organizing Committee
# - Volunteers
---
22 changes: 11 additions & 11 deletions content/authors/firstname-lastname/_index_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title: "surname name"

# Username (this should match the folder name and the name on publications)
authors:
- "surname name"
- "surname name"
github: github_username
# Is this the primary user of the site?
superuser: false
Expand All @@ -17,19 +17,19 @@ position: "PhD Researcher at the university of open science"
# For an email link, use "fas" icon pack, "envelope" icon, and a link in the
# form "mailto:[email protected]" or "#contact" for contact widget.
social:
- icon: envelope
icon_pack: fas
link: "mailto:[email protected]" # For a direct email link, use "mailto:[email protected]".
- icon: twitter
icon_pack: fab
link: https://twitter.com/twitter_handle
- icon: github
icon_pack: fab
link: https://github.com/github_username
- icon: envelope
icon_pack: fas
link: "mailto:[email protected]" # For a direct email link, use "mailto:[email protected]".
- icon: twitter
icon_pack: fab
link: https://twitter.com/twitter_handle
- icon: github
icon_pack: fab
link: https://github.com/github_username

# Organizational groups that you belong to (for People widget)
# Set this to `[]` or comment out if you are not using People widget.
user_groups:
- Brainhack Global Organizing Committee
- Brainhack Global Organizing Committee
# - Volunteers
---
19 changes: 8 additions & 11 deletions content/code-of-conduct/alert.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ headless: true
# Order that this section appears on the page.
weight: 5

title:
title:
subtitle:

design:
Expand All @@ -24,19 +24,16 @@ design:
image_position: center
image_size: cover
text_color_light: true

spacing:
padding: ["5rem", "0", "5rem", "0"]
---

{{% callout note %}}

{{% alert note %}}
The official Brainhack Code of Conduct is available at [brainhack.org/code-of-conduct](https://brainhack.org/code-of-conduct). Please refer to this [link](https://brainhack.org/code-of-conduct) if you landed here to read the Code of Conduct.
{{% /alert %}}


<!-- {{% alert note %}}
The Brainhack Code of Conduct is currently under review by the community. In the meantime, you can read the most recent version below. If you would like to comment on it, please refer to [the working document](https://docs.google.com/document/d/11aE6vv67i9pzOUN7DTypqiAVUutXAijP7_jZTURHhAM/edit).
{{% /alert %}} -->
The official Brainhack Code of Conduct is available at
[brainhack.org/code-of-conduct](https://brainhack.org/code-of-conduct). Please
refer to this [link](https://brainhack.org/code-of-conduct) if you landed here
to read the Code of Conduct.

<!-- Photo by Sharon McCutcheon from Pexels -->
{{% /callout %}}
Loading

0 comments on commit 20741e2

Please sign in to comment.