From 128f9512f2725edb2b0166965069826df28b788b Mon Sep 17 00:00:00 2001 From: Mirjam Pfeiffer <47319502+biumiamy@users.noreply.github.com> Date: Thu, 31 Oct 2024 15:07:00 +0100 Subject: [PATCH 1/5] bluesky svg adding bluesky svg file for the footer bar of social media --- src/assets/images/bluesky.svg | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/assets/images/bluesky.svg diff --git a/src/assets/images/bluesky.svg b/src/assets/images/bluesky.svg new file mode 100644 index 00000000..49607d09 --- /dev/null +++ b/src/assets/images/bluesky.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + From 4c00970475ba40f86071496836b4d546460cac89 Mon Sep 17 00:00:00 2001 From: Mirjam Pfeiffer <47319502+biumiamy@users.noreply.github.com> Date: Thu, 31 Oct 2024 15:08:58 +0100 Subject: [PATCH 2/5] Update Footer.js replaced Twitter with Bluesky --- src/components/Footer/Footer.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/Footer/Footer.js b/src/components/Footer/Footer.js index dec878de..1b917c6a 100644 --- a/src/components/Footer/Footer.js +++ b/src/components/Footer/Footer.js @@ -16,9 +16,10 @@ import { ReviewPolicy, FaqRoute } from '../../constants' -import { Twitter, Facebook, GitHub } from 'react-feather' +import { Facebook, GitHub } from 'react-feather' import DeGruyterLogo from '../../assets/images/Verlag_Walter_de_Gruyter_Logo_Oldenbourg.svg' import UniluLogo from '../../assets/images/unilu-c2dh-logo.svg' +import BlueskyIcon from '../../assets/icons/bluesky.svg' import '../../styles/components/Footer.scss' @@ -80,8 +81,8 @@ const Footer = ({ hideOnRoutes=[]}) => {
- - @{process.env.REACT_APP_TWITTER} + + @jdighist.bsky.social
·
From a090d16810bc8aef0806d8d80370f2119d13c41f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Reis?= Date: Thu, 31 Oct 2024 16:14:41 +0100 Subject: [PATCH 3/5] issue #660: Adaptation to enable article displayed in V3 --- src/pages/ArticleViewer.js | 1 + src/pages/NotebookViewer.js | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/ArticleViewer.js b/src/pages/ArticleViewer.js index 7a773ead..56aa1a6d 100644 --- a/src/pages/ArticleViewer.js +++ b/src/pages/ArticleViewer.js @@ -129,6 +129,7 @@ const ArticleViewer = ({ doi={article.doi} issue={article.issue} bibjson={article.citation} + parserVersion={parseInt(article.data.parserVersion) || 2} isJavascriptTrusted match={{ params: { diff --git a/src/pages/NotebookViewer.js b/src/pages/NotebookViewer.js index c1975245..1d32ac26 100644 --- a/src/pages/NotebookViewer.js +++ b/src/pages/NotebookViewer.js @@ -44,9 +44,10 @@ const NotebookViewer = ({ bibjson, pid, isJavascriptTrusted, + parserVersion = 2 }) => { const [{ [ArticleVersionQueryParam]: version }] = useQueryParams({ - [ArticleVersionQueryParam]: withDefault(NumberParam, 2), + [ArticleVersionQueryParam]: withDefault(NumberParam, parserVersion), }) const ArticleComponent = version === 3 ? ArticleV3 : version === 2 ? ArticleV2 : Article const setLoadingProgress = usePropsStore((state) => state.setLoadingProgress) From 60d3804b93b40e1b1cc163f6b06344993780e2e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Reis?= Date: Thu, 31 Oct 2024 17:27:12 +0100 Subject: [PATCH 4/5] issue #579: Fix the display of the bluesky icon --- .env | 1 + src/components/Footer/Footer.js | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.env b/.env index d1731bed..0f4cc0e4 100644 --- a/.env +++ b/.env @@ -7,6 +7,7 @@ REACT_APP_TAG_EDITORIAL=editorial REACT_APP_ENABLE_AUTH_0=false REACT_APP_TWITTER=Journal_DigHist REACT_APP_FACEBOOK=journalofdigitalhistory +REACT_APP_BLUESKY=jdighist.bsky.social REACT_APP_THEBE_TOKEN=******** REACT_APP_THEBE_DEV_BINDER=false REACT_APP_THEBE_JUPYTER_URL=http://localhost:8888 diff --git a/src/components/Footer/Footer.js b/src/components/Footer/Footer.js index 1b917c6a..667b2d0b 100644 --- a/src/components/Footer/Footer.js +++ b/src/components/Footer/Footer.js @@ -19,7 +19,7 @@ import { import { Facebook, GitHub } from 'react-feather' import DeGruyterLogo from '../../assets/images/Verlag_Walter_de_Gruyter_Logo_Oldenbourg.svg' import UniluLogo from '../../assets/images/unilu-c2dh-logo.svg' -import BlueskyIcon from '../../assets/icons/bluesky.svg' +import { ReactComponent as BlueskyIcon } from '../../assets/images/bluesky.svg'; import '../../styles/components/Footer.scss' @@ -81,8 +81,8 @@ const Footer = ({ hideOnRoutes=[]}) => {
- - @jdighist.bsky.social + + @{process.env.REACT_APP_BLUESKY}
·
From c5b02adfe81fcc7c07aeb96e25451ea9d42dd95d Mon Sep 17 00:00:00 2001 From: eliselavy Date: Thu, 31 Oct 2024 18:43:48 +0100 Subject: [PATCH 5/5] increment version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a35942ec..d9dcd782 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jdh", - "version": "5.0.1", + "version": "5.0.2", "private": true, "dependencies": { "@auth0/auth0-react": "^1.1.0",