Skip to content

Commit

Permalink
rethink cards. fix #113 (#115)
Browse files Browse the repository at this point in the history
* Update global team

* #88 fix paginator arrows

* make wrap better

* style pagination arrows

* split blog and news. fix #106

* trigger build

* cleanup and test preview

* lock ccontent/news to global team

* start new bloglist cards

* start new bloglist cards. preview

* cleanup baseof preview

* preview

* simplify hero

* setting up new grids

* new image hover grid

* move post to blog

* post to blog. preview

* renew global team page. preview

* test new meetup logic

* make sure things are ignored, preview

* fix hover-4 ubtitle

* fix ssafeHTML

* rescale hovergrids, preview

* fix fint sizing. preview

* preview, more merge issues

* new directory cards

* preview. max width for full-width div

* reorg work

* new directory cards

* update node, preview

* apply unique ID to cards

* preview, fix list.js
localhost ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBY0G/NytH1SqW2hPC4cRGxWGUgro3Nb1a8kSFj+CNTOmN1r8Ff23pKuK6yjRe1qnm6CWEi3VyxVSMD+x8eRNXs=

* redo directory for cards

* fix #107

* fix arrays and small photo credit

* fix twitter shortcodes

* Better banner hero

* revert blogs image

* preview, update hugo version

Co-authored-by: GitHub Actions <[email protected]>
Co-authored-by: benubah <[email protected]>
  • Loading branch information
3 people authored Dec 15, 2022
1 parent 60ca7d5 commit 2d49298
Show file tree
Hide file tree
Showing 152 changed files with 1,085 additions and 1,117 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
^~/\.rladies_meetup_token\.rds$
2 changes: 1 addition & 1 deletion .Rprofile
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ options(
blogdown.ext = ".Rmd",
blogdown.subdir = "post",
blogdown.title_case = TRUE,
blogdown.hugo.version = "0.88.1"
blogdown.hugo.version = "0.101.0"
)
11 changes: 6 additions & 5 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/themes/ @website
/scripts/ @website
LICENCE.md @website
/themes/ @website
/static/robots.txt @website
/themes/ @website
/scripts/ @website
LICENCE.md @website
/themes/ @website
/static/robots.txt @website
/content/news @global
/themes/hugo-rladies/i18n/
26 changes: 18 additions & 8 deletions .github/workflows/build_site.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ on:
branches:
- main

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
vars:
name: Get job variables
Expand All @@ -19,7 +23,7 @@ jobs:
hugo_vr: ${{ steps.hugo_vr.outputs.value }}
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}

Expand All @@ -42,7 +46,7 @@ jobs:
runs-on: macOS-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 2

Expand All @@ -57,7 +61,6 @@ jobs:
echo "No jsons commited/changed"
echo "::set-output name=run_validation::false"
fi
- name: Setup R
if: steps.check_files.outputs.run_validation == 'true'
uses: r-lib/actions/setup-r@v2
Expand Down Expand Up @@ -85,7 +88,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Setup Hugo
uses: peaceiris/actions-hugo@v2
Expand All @@ -103,26 +106,33 @@ jobs:
run: Rscript scripts/missing_translations.R

- name: Site data - Get directory data
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: rladies/directory
ssh-key: ${{ secrets.DIRECTORY_DEPLOY_SECRET}}
path: dir

- name: Site data - Meetup
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: rladies/meetup_archive
ssh-key: ${{ secrets.MEETUP_ARCHIVE_KEY}}
path: mtp

- name: Site data - Get blogs list
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: rladies/awesome-rladies-blogs
ssh-key: ${{ secrets.RLADIES_BLOGS_KEY}}
path: rblogs

- name: Site data - Get meetup data
uses: actions/checkout@v3
with:
repository: rladies/meetup_archive
ssh-key: ${{ secrets.MEETUP_ARCHIVE_KEY}}
path: meetup_archive

- name: Site data - clean cloned repos
run: |
mv rblogs/blogs data/rblogs
Expand Down
12 changes: 3 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@
/build/
/resources/_gen/
.hugo_build.lock

# Executable may be added to repository
hugo.exe
hugo.darwin
hugo.linux

### R ###
# History files
.Rhistory
Expand All @@ -20,27 +18,21 @@ hugo.linux
.RData
# User-specific files
.Ruserdata

# Output files from R CMD check
/*.Rcheck/
# RStudio files
.Rproj.user/

# knitr and R markdown default cache directories
*_cache/
/cache/

# Temporary files created by R markdown
*.utf8.md
*.knit.md

# End of https://www.gitignore.io/api/r,hugo
# Meetupr auth
**/*.httr-oauth$

# stupid mac hidden files
**/.DS_Store

# html rendered content
content/*/*html
content/*/*/*html
Expand All @@ -50,11 +42,13 @@ README.html
# should never be commited
data/directory/
static/images/directory/
data/rblogs

# npm
node_modules/
package-lock.json
.meetup_token.rds

# workflow tmp file
tmp*
~/Library/Application Support/meetupr/meetupr-token.rds
/var/folders/ws/1mjqfpsj3kv_b_z2091qkm600000gq/T//Rtmp4EPJ8U/fileecc479130cbd.rds
2 changes: 1 addition & 1 deletion config/_default/menu/menu.en.toml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,6 @@

[[main]]
name = "Blog"
url = "/post"
url = "/blog"
weight = 5

2 changes: 1 addition & 1 deletion config/_default/menu/menu.es.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,6 @@

[[main]]
name = "Blog"
url = "/post"
url = "/blog"
weight = 5

2 changes: 1 addition & 1 deletion config/_default/menu/menu.fr.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,6 @@

[[main]]
name = "Blog"
url = "/post"
url = "/blog"
weight = 5

2 changes: 1 addition & 1 deletion config/_default/menu/menu.pt.toml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,6 @@

[[main]]
name = "Blog"
url = "/post"
url = "/blog"
weight = 5

Binary file removed content/about-us/global-team/img/placeholder.png
Binary file not shown.
3 changes: 1 addition & 2 deletions content/activities/rladies-blogs/index.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ type: "rladies-blogs"

Curated list of awesome blogs by R-Ladies, inspired by

{{< twitter 1362021673239785473 >}}

{{< twitter id="1362021673239785473" user="RLadiesGlobal" >}}
File renamed without changes.
4 changes: 4 additions & 0 deletions content/blog/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
title: "Blog posts"
type: post
---
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,4 @@ Let's keep working on a safe community for everyone!

+ 2019-04-16, Julia Silge - [Writing a letter to DataCamp ](https://juliasilge.com/blog/datacamp-misconduct/)

`{{% tweet "1116743032492253185" %}}`{=html}
`{{% tweet user="EngelhardtCR" id="1116743032492253185" %}}`{=html}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 4 additions & 0 deletions content/news/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
title: "News from the Global Team"
type: post
---
12 changes: 8 additions & 4 deletions data/blogs_mock/drmowinckels.io.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@
"url": "https://drmowinckels.io",
"photo_url": "https://rladies.org/wp-content/uploads/connections-images/athanasia-mo-mowinckel/Athanasia.Mowinckel.2_square.png",
"description": "Personal website and blog about R and neuromaging in R.",
"authors": [
{
"authors": [{
"name": "Athanasia Mo Mowinckel",
"social_media": [{
"twitter": "DrMowinckels",
"github": "Athanasiamo"
}]
},
{
"name": "Maëlle Salmon",
"social_media": [{
"twitter": "ma_salmon"
}]
}
]
}]
}
57 changes: 27 additions & 30 deletions data/directory_mock/23u5y2o.json
Original file line number Diff line number Diff line change
@@ -1,31 +1,28 @@
{
"name": "Athanasia Mo Mowinckel",
"honorific": "PhD",
"categories": ["Speaker", "Norway"],
"title": "Staff researcher - Center for Lifespan Changes in Brain and Cognition, Dept. of Psychology",
"organization": "University of Oslo",
"department": "",
"notes": "",
"photo_url": "https://rladies.org/wp-content/uploads/connections-images/athanasia-mo-mowinckel/Athanasia.Mowinckel.2_square.png",
"logo_url": "",
"location": [
{
"city": "Oslo",
"country": "Norway"
}
],
"social_media": [
{
"twitter": "DrMowinckels",
"github": "Athanasiamo"
}
],
"interests": ["Statistics", "Bayesian Statistics", "Neuroimaging", "Data Visualisation", "Cognitive Psychology"],
"contact_method": ["Twitter"],
"activities": [
{
"r_groups": ["R-Ladies Oslo"],
"r_packages": ["ggseg", "ggsegExtra", "ggseg3d"]
}
]
}
"name": "Athanasia Mo Mowinckel",
"honorific": "PhD",
"categories": ["Speaker", "Norway"],
"location": {
"city": "Oslo",
"country": "Norway"
},
"social_media": {
"twitter": "DrMowinckels",
"github": "Athanasiamo"
},
"interests": ["Statistics", "Bayesian Statistics", "Neuroimaging", "Data Visualisation", "Cognitive Psychology"],
"contact_method": ["Twitter"],
"activities": {
"r_groups": ["R-Ladies Oslo"],
"r_packages": ["ggseg", "ggsegExtra", "ggseg3d"]
},
"work": {
"title": "Staff researcher",
"organisation": "University of Oslo",
"department": "Center for Lifespan Changes in Brain and Cognition, Dept. of Psychology"
},
"photo": {
"url": "https://rladies.org/wp-content/uploads/connections-images/athanasia-mo-mowinckel/Athanasia.Mowinckel.2_square.png",
"credit": "Tron Tronsdal"
}
}
40 changes: 14 additions & 26 deletions data/directory_mock/2o3y207.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,15 @@
{
"name": "Jane Doe",
"honorific": "",
"categories": [],
"title": "Data afficionado",
"organization": "",
"department": "",
"notes": "",
"photo_url": "",
"logo_url": "",
"location": [
{"city": "Honolulu",
"state": "Hawaii",
"country": "USA"
}
],
"social_media": [
{}
],
"interests": [],
"contact_method": [],
"activities": [
{}
],
"last_updated": "2021-01-01"
}

"name": "Jane Doe",
"location": {
"city": "Honolulu",
"state": "Hawaii",
"country": "USA"
},
"social_media": {},
"activities": {},
"last_updated": "2021-01-01",
"work": {
"title": "Data afficionado"
},
"photo": {}
}
39 changes: 14 additions & 25 deletions data/directory_mock/2o3y207_1.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,15 @@
{
"name": "Yara Doe",
"honorific": "MD",
"categories": [],
"title": "Data scientist",
"organization": "",
"department": "",
"notes": "",
"photo_url": "",
"logo_url": "",
"location": [
{"city": "Stockholm",
"country": "Sweden"
}
],
"social_media": [
{}
],
"interests": [],
"contact_method": [],
"activities": [
{}
],
"last_updated": "2021-01-01"
}

"name": "Yara Doe",
"honorific": "MD",
"location": {
"city": "Stockholm",
"country": "Sweden"
},
"social_media": {},
"activities": {},
"last_updated": "2021-01-01",
"work": {
"title": "Data scientist"
},
"photo": {}
}
Loading

0 comments on commit 2d49298

Please sign in to comment.