From 5bb57cbd40b47a4f4c39f39382d834cd31ae2ba4 Mon Sep 17 00:00:00 2001 From: ekachxaidze98 <65679299+ekachxaidze98@users.noreply.github.com> Date: Tue, 28 Nov 2023 12:53:13 +0400 Subject: [PATCH 1/5] CORE-4730 new section (#1026) --- components/testimonial/testimonial.jsx | 10 +- .../testimonial/testimonial.module.scss | 4 + data/home.yml | 85 +++++++++ pages/index.jsx | 43 ++++- pages/index.module.scss | 58 ++++++ public/images/logos/chica.svg | 7 + public/images/logos/coar.svg | 43 +++++ public/images/logos/coarUser.png | Bin 0 -> 4679 bytes public/images/logos/imperial.svg | 16 ++ public/images/logos/losAlamos.svg | 180 ++++++++++++++++++ public/images/logos/researchInovation.svg | 60 ++++++ public/images/logos/sparc.png | Bin 0 -> 4512 bytes public/images/logos/stAndrews.svg | 91 +++++++++ public/images/people/kathleen.svg | 52 +++++ 14 files changed, 647 insertions(+), 2 deletions(-) create mode 100644 public/images/logos/chica.svg create mode 100644 public/images/logos/coar.svg create mode 100644 public/images/logos/coarUser.png create mode 100644 public/images/logos/imperial.svg create mode 100644 public/images/logos/losAlamos.svg create mode 100644 public/images/logos/researchInovation.svg create mode 100644 public/images/logos/sparc.png create mode 100644 public/images/logos/stAndrews.svg create mode 100644 public/images/people/kathleen.svg diff --git a/components/testimonial/testimonial.jsx b/components/testimonial/testimonial.jsx index 6144004dd..a7c18714f 100644 --- a/components/testimonial/testimonial.jsx +++ b/components/testimonial/testimonial.jsx @@ -1,4 +1,5 @@ import React from 'react' +import { classNames } from '@oacore/design/lib/utils' import { Content } from '../content' import Markdown from '../markdown' @@ -10,6 +11,7 @@ const Testimonial = ({ author, organization = {}, className = '', + roleHighlite, ...restProps }) => (
{author.name} {author.role && ( -

{author.role}

+

+ {author.role} +

)} diff --git a/components/testimonial/testimonial.module.scss b/components/testimonial/testimonial.module.scss index e71da803b..dcb31f332 100644 --- a/components/testimonial/testimonial.module.scss +++ b/components/testimonial/testimonial.module.scss @@ -30,6 +30,10 @@ $testimonial-logo-height: 3rem !default; color: $gray-700; } +.role-highlite { + color: $orange-dark; +} + .testimonial-author-avatar { position: absolute; left: 0; diff --git a/data/home.yml b/data/home.yml index a4e473498..45aa23d81 100644 --- a/data/home.yml +++ b/data/home.yml @@ -130,6 +130,91 @@ partnerProjects: # author: Gareth Malcolm, Content Partner Manager at Turnitin - logo: /images/partners/ukri.png - logo: /images/partners/ukcorr.png +users: + - title: | + **Companies** using CORE + testimonial: + id: gareth-malcolm + content: | + *Our partnership with CORE will provide Turnitin with vast amounts of metadata and full + texts that we can utilise in our plagiarism detection software.* + author: + name: Gareth Malcolm + role: Content Partner Manager at Turnitin + picture: /images/people/Gareth_Malcolm.jpeg + userList: + items: + - img: /images/logos/nvidia.svg + alt: "nvidia" + - img: /images/logos/anthropic.svg + alt: "anthropic" + - img: /images/logos/grammarly.svg + alt: "grammarly" + - img: /images/logos/lean.svg + alt: "lean" + - img: /images/logos/naver.svg + alt: "naver" + action: + caption: Show all + url: '/about/endorsements' + - title: | + **Academic** institution using CORE + testimonial: + id: kathleen-shearer + content: | + *CORE has significantly assisted the academic institutions participating in our global network with their key mission, which is their scientific content exposure. In addition, CORE has helped our content administrators to showcase the real benefits of repositories via its added value services.* + author: + name: Kathleen Shearer + role: Executive Director of the Confederation of Open Access Repositories (COAR) + picture: /images/people/kathleen.svg + userList: + items: + - img: /images/membership/cambridge.svg + alt: "cambridge" + - img: /images/membership/oxford.svg + alt: "oxford" + full: true + - img: /images/logos/chica.svg + alt: "chica" + - img: /images/logos/stAndrews.svg + alt: "andrews" + - img: /images/logos/imperial.svg + alt: "imperial" + full: true + action: + caption: Show all + url: '/about/endorsements' + - title: | + **Partner** projects + testimonial: + id: ben-johnson + content: | + *Aggregation plays an increasingly essential role in maximising the + long-term benefits of open access, helping to turn the promise of a + 'research commons' into a reality. The aggregation services that CORE + provides therefore make a very valuable contribution to the evolving + open access environment in the UK.* + author: + name: Ben Johnson + role: Research Policy Adviser + picture: /images/people/johnson.jpg + userList: + items: + - img: /images/logos/coar.svg + alt: "coar" + - img: /images/logos/sparc.png + alt: "sparc" + full: true + - img: /images/logos/researchInovation.svg + alt: "researchInovation" + - img: /images/logos/losAlamos.svg + alt: "losAlamos" + - img: /images/logos/jisc.svg + alt: "jisc" + background: true + action: + caption: Show all + url: '/about/endorsements' covid-19-notice: | Stay up to date with the latest Open Access research diff --git a/pages/index.jsx b/pages/index.jsx index bdc0dd1aa..88369340b 100644 --- a/pages/index.jsx +++ b/pages/index.jsx @@ -3,6 +3,7 @@ import { Carousel, Button, Card } from '@oacore/design/lib' import { classNames } from '@oacore/design/lib/utils' import styles from './index.module.scss' +import Testimonial from '../components/testimonial' import { Section, @@ -18,7 +19,7 @@ import { Layout, SearchForm, } from 'design-v2/components' -import { Page } from 'components' +import { Markdown, Page } from 'components' import page from 'data/home.yml' const Hero = ({ @@ -203,6 +204,46 @@ const IndexPage = () => { +
+ {page.users.map((item) => ( +
+
+ + {item.title} + +
+ +
+
+
+
+ {item.userList.items.map((slide) => ( + logo + ))} +
+ +
+
+ ))} +
) } diff --git a/pages/index.module.scss b/pages/index.module.scss index 442d61893..187710850 100644 --- a/pages/index.module.scss +++ b/pages/index.module.scss @@ -208,3 +208,61 @@ } } } + +.main-item { + background: #f5f5f5; + padding: var(--page-padding-y) var(--page-padding-x); + margin: 34px 0; + .testimonial-wrapper { + display: flex; + justify-content: space-between; + gap: 35px; + margin-bottom: 24px; + .testimonial-item { + width: 75%; + } + .testimonial-title { + width: 25%; + color: #212121; + font-size: 32px; + font-style: normal; + font-weight: 500; + line-height: 130%; + cursor: unset; + &:hover { + text-decoration: none; + } + } + } +} + +.carousel-wrapper { + display: flex; + flex-direction: column; + .carousel-items { + display: flex; + justify-content: space-between; + gap: 35px; + } + .carousel-item { + border: 1px solid #b75400; + width: 212px; + height: 104px; + padding: 16px; + background: #fff; + } + .carousel-item-unset { + padding: 0; + } + .background { + background: #e85e13; + } + .link-wrapper { + display: flex; + justify-content: flex-end; + margin-top: 24px; + .link { + padding: 8px 16px; + } + } +} diff --git a/public/images/logos/chica.svg b/public/images/logos/chica.svg new file mode 100644 index 000000000..d63bca586 --- /dev/null +++ b/public/images/logos/chica.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/public/images/logos/coar.svg b/public/images/logos/coar.svg new file mode 100644 index 000000000..5bc839b80 --- /dev/null +++ b/public/images/logos/coar.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/images/logos/coarUser.png b/public/images/logos/coarUser.png new file mode 100644 index 0000000000000000000000000000000000000000..8d618a85a0d93de4407e275833ce9fb7e6cadba1 GIT binary patch literal 4679 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 JPDHLkV1k@|=@$S1 literal 0 HcmV?d00001 diff --git a/public/images/logos/imperial.svg b/public/images/logos/imperial.svg new file mode 100644 index 000000000..061a7e221 --- /dev/null +++ b/public/images/logos/imperial.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/public/images/logos/losAlamos.svg b/public/images/logos/losAlamos.svg new file mode 100644 index 000000000..e3893f328 --- /dev/null +++ b/public/images/logos/losAlamos.svg @@ -0,0 +1,180 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/images/logos/researchInovation.svg b/public/images/logos/researchInovation.svg new file mode 100644 index 000000000..897ac7d2c --- /dev/null +++ b/public/images/logos/researchInovation.svg @@ -0,0 +1,60 @@ + + + + + + + + diff --git a/public/images/logos/sparc.png b/public/images/logos/sparc.png new file mode 100644 index 0000000000000000000000000000000000000000..b0e2aae3712eadfd536ca39efabfc3087eb5b9ac GIT binary patch literal 4512 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 EA2qU|M*si- literal 0 HcmV?d00001 diff --git a/public/images/logos/stAndrews.svg b/public/images/logos/stAndrews.svg new file mode 100644 index 000000000..bfb767abc --- /dev/null +++ b/public/images/logos/stAndrews.svg @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/images/people/kathleen.svg b/public/images/people/kathleen.svg new file mode 100644 index 000000000..7c0f8f7e0 --- /dev/null +++ b/public/images/people/kathleen.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 0b7bce8aa69592c28deb5377d7309a7138102794 Mon Sep 17 00:00:00 2001 From: ekachxaidze98 <65679299+ekachxaidze98@users.noreply.github.com> Date: Thu, 18 Jan 2024 13:54:26 +0400 Subject: [PATCH 2/5] Core 4784 UI docs page (#1075) * CORE-4784: create dropdown * CORE-4784: docs update * merge master --- components/docs-select/index.jsx | 58 ++ components/docs-select/styles.module.scss | 35 + components/layout/layout.jsx | 8 +- package-lock.json | 12 +- public/images/dropArrow.svg | 6 + report.20230517.140705.4715.0.001.json | 643 ------------------ .../data-providers-guide/index.jsx | 81 +-- .../data-providers-guide/styles.module.scss | 29 +- .../membership-documentation/index.jsx | 80 +-- .../styles.module.scss | 29 +- 10 files changed, 249 insertions(+), 732 deletions(-) create mode 100644 components/docs-select/index.jsx create mode 100644 components/docs-select/styles.module.scss create mode 100644 public/images/dropArrow.svg delete mode 100644 report.20230517.140705.4715.0.001.json diff --git a/components/docs-select/index.jsx b/components/docs-select/index.jsx new file mode 100644 index 000000000..7a8dc176e --- /dev/null +++ b/components/docs-select/index.jsx @@ -0,0 +1,58 @@ +import React, { useEffect, useRef, useState } from 'react' + +import styles from './styles.module.scss' +import arrow from '../../public/images/dropArrow.svg' + +const DocumentSelect = ({ list, handleSelect, selectedOption }) => { + const [showOptions, setShowOptions] = useState(false) + const dropdownRef = useRef(null) + + const onSelectOptionClick = (option) => { + handleSelect(option) + setShowOptions(false) + } + + const handleClickOutside = (event) => { + if (dropdownRef.current && !dropdownRef.current.contains(event.target)) + setShowOptions(false) + } + + useEffect(() => { + document.addEventListener('click', handleClickOutside) + + return () => { + document.removeEventListener('click', handleClickOutside) + } + }, []) + + return ( +
+ {/* eslint-disable-next-line max-len */} + {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions */} +
setShowOptions(!showOptions)} + className={styles.documentSelectLabel} + > + {selectedOption} + +
+ {showOptions && ( +
    + {list.map((option) => ( + // eslint-disable-next-line max-len + // eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-noninteractive-element-interactions +
  • onSelectOptionClick(option)} + > + {option} +
    • + ))} +
+ )} +
+ ) +} + +export default DocumentSelect diff --git a/components/docs-select/styles.module.scss b/components/docs-select/styles.module.scss new file mode 100644 index 000000000..698d92ca9 --- /dev/null +++ b/components/docs-select/styles.module.scss @@ -0,0 +1,35 @@ +.document-select { + position: relative; +} + +.document-select-label { + color: #212121; + font-size: 18px; + font-style: normal; + font-weight: 500; + line-height: 130%; + letter-spacing: 0.036px; + padding: 0 35px; +} + +.arrow { + margin-left: 30px; +} + +.document-dropdown { + width: 100%; + position: absolute; + top: 45px; + background: #fff; + border-radius: 0 0 2px 2px; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05), 0 1px 2px rgba(0, 0, 0, 0.25); +} + +.document-item { + padding: 10px 30px; + cursor: pointer; +} + +.document-item:hover { + background: #eee; +} diff --git a/components/layout/layout.jsx b/components/layout/layout.jsx index 67b4b1f84..b93dd3c74 100644 --- a/components/layout/layout.jsx +++ b/components/layout/layout.jsx @@ -1,10 +1,12 @@ import React, { useCallback } from 'react' import { Header, Footer } from '@oacore/design' +import { useRouter } from 'next/router' import Head from './head' import SkipToContent from '../skip-to-content' const Layout = ({ title, description, children, onNavigate }) => { + const router = useRouter() const handleHeaderClick = useCallback( (event) => { const linkElement = event.target.closest('a') @@ -22,8 +24,10 @@ const Layout = ({ title, description, children, onNavigate }) => {
+ ))} + + + + ) } export default MembershipPageTemplate diff --git a/templates/membership/styles.module.scss b/templates/membership/styles.module.scss index 027c4ee65..f6652c3f9 100644 --- a/templates/membership/styles.module.scss +++ b/templates/membership/styles.module.scss @@ -6,6 +6,14 @@ $breakpoint-sm: 800px; $breakpoint-md: 1130px; $breakpoint-lg: 1415px; +.layout-wrapper { + padding: var(--page-padding-y) var(--page-padding-x) 0 var(--page-padding-x); +} + +.layout-mini-wrapper { + padding: 0 var(--page-padding-x) var(--page-padding-y) var(--page-padding-x); +} + .nav-wrapper { display: flex; gap: 24px; @@ -446,3 +454,76 @@ $breakpoint-lg: 1415px; margin: 0 20px; } } + +.institution-benefit-wrapper { + background: #f5f5f5; + .institution-benefit-inner-wrapper { + padding: var(--page-padding-y) var(--page-padding-x); + display: flex; + flex-wrap: wrap; + width: 100%; + } +} + +.title-wrapper { + display: flex; + justify-content: center; + align-items: center; + flex: 0 0 50%; + box-sizing: border-box; + padding: 10px; + color: #212121; + font-size: 48px; + font-style: normal; + font-weight: 500; + line-height: 78px; + .main-title { + font-weight: 700; + } + a { + color: #b75400; + } +} + +.item-main-wrapper { + flex: 0 0 50%; + box-sizing: border-box; + background: #fff; + .item-wrapper { + padding: 16px; + .item-title { + color: #000; + font-size: 24px; + font-style: normal; + font-weight: 700; + line-height: 32px; + letter-spacing: 0.036px; + } + .item-description { + color: #000; + font-size: 16px; + font-style: normal; + font-weight: 400; + line-height: 24px; + letter-spacing: 0.026px; + } + } + .footer { + display: flex; + justify-content: space-between; + align-items: center; + padding: 16px; + border-top: 1px solid #e0e0e0; + .user-wrapper { + display: flex; + justify-content: space-between; + align-items: center; + .user-img { + margin-right: 14px; + } + .user { + margin-bottom: 6px; + } + } + } +} From ea64064a4a767719d977181617b1b44fc2bd48a7 Mon Sep 17 00:00:00 2001 From: ekachxaidze98 <65679299+ekachxaidze98@users.noreply.github.com> Date: Wed, 24 Jan 2024 17:49:14 +0400 Subject: [PATCH 4/5] bold issue (#1093) --- data/dataProviders.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/dataProviders.yml b/data/dataProviders.yml index fb980d4a6..795efa4f0 100644 --- a/data/dataProviders.yml +++ b/data/dataProviders.yml @@ -64,7 +64,7 @@ navItems: - item: 4.3 Claiming access to the CORE Dashboard (Recommended) href: "#dashboard" - item: | - **5. How does CORE process data supplied by Data Providers ** + **5. How does CORE process data supplied by Data Providers** href: "#process" - item: | **6. Further reading** From 6689e8eecd0437ae149da2e6b0efefb68ea58dc8 Mon Sep 17 00:00:00 2001 From: Eka Date: Wed, 6 Mar 2024 16:47:58 +0400 Subject: [PATCH 5/5] CORE: exclud ids --- templates/governance/supporters/index.jsx | 25 ++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/templates/governance/supporters/index.jsx b/templates/governance/supporters/index.jsx index 11eb304a7..dfee8afb2 100644 --- a/templates/governance/supporters/index.jsx +++ b/templates/governance/supporters/index.jsx @@ -26,18 +26,26 @@ const Card = ({ plan }) => ( ) +const excludedIds = [ + 3463, 183, 2145, 1248, 660, 222, 14373, 3559, 21117, 292, 14567, 2812, 196, + 3581, 197, 12800, 14335, 1249, 2313, 21853, 15201, 1012, 158, +] + const GovernanceSupportersPageTemplate = ({ members, page }) => { const [searchValue, setSearchValue] = useState('') - const [displayedItems, setDisplayedItems] = useState(50) - const maxItems = members.length + const [displayedItems, setDisplayedItems] = useState(30) const handleSearch = (event) => { const { value } = event.target setSearchValue(value) } - const filteredMembers = members.filter((member) => - member.organisation_name.toLowerCase().includes(searchValue.toLowerCase()) + const filteredMembers = members.filter( + (member) => + member.organisation_name + .toLowerCase() + .includes(searchValue.toLowerCase()) && + !excludedIds.includes(member.repo_id) ) const sortedMembers = [...filteredMembers].sort((a, b) => @@ -168,14 +176,17 @@ const GovernanceSupportersPageTemplate = ({ members, page }) => {

- Showing 1 - {Math.min(displayedItems, maxItems)} + Showing 1 -{' '} + {Math.min(displayedItems, filteredMembers.length)}