diff --git a/.env.example b/.env.example index 6968694..2e232dd 100644 --- a/.env.example +++ b/.env.example @@ -76,7 +76,7 @@ RSD_AUTH_COUPLE_PROVIDERS=ORCID # SURFCONEXT - TEST ENVIRONMENT # consumed by: authentication, frontend/utils/loginHelpers -SURFCONEXT_CLIENT_ID=www.research-software.nl +SURFCONEXT_CLIENT_ID=kin-rpd-demo-test.com # consumed by: authentication, frontend/utils/loginHelpers SURFCONEXT_REDIRECT=http://localhost/auth/login/surfconext # consumed by: authentication, frontend/utils/loginHelpers diff --git a/frontend/__tests__/OrganisationPage.test.tsx b/frontend/__tests__/OrganisationPage.test.tsx index 2948a24..d8d0812 100644 --- a/frontend/__tests__/OrganisationPage.test.tsx +++ b/frontend/__tests__/OrganisationPage.test.tsx @@ -105,32 +105,33 @@ describe('pages/organisations/[...slug].tsx', () => { // screen.debug(aboutPage) }) - it('renders organisation software page as default when organisation.description=null', async () => { - // not a maintainer - public page - mockIsMaintainerOfOrganisation.mockResolvedValueOnce(false) - // when no about page content, software is default landing page - mockProps.organisation.description = null - mockProps.tab = null - // mockProps.tab = 'software' - // mock software list response - mockSoftwareForOrganisation.mockResolvedValue({ - status: 206, - count: mockSoftware.length, - data: mockSoftware as any - }) - render( - - - - ) - // wait loader to be removed - // await waitForElementToBeRemoved(screen.getByRole('progressbar')) - // we need to await for all events to run - const software = await screen.findAllByTestId('software-grid-card') - expect(software.length).toEqual(mockSoftware.length) - // validate api call - TODO! FIGURE WHY IS CALLED TWICE!!! - expect(mockSoftwareForOrganisation).toBeCalledTimes(1) - }) + // disable software option, 2024-07-02 + // it('renders organisation software page as default when organisation.description=null', async () => { + // // not a maintainer - public page + // mockIsMaintainerOfOrganisation.mockResolvedValueOnce(false) + // // when no about page content, software is default landing page + // mockProps.organisation.description = null + // mockProps.tab = null + // // mockProps.tab = 'software' + // // mock software list response + // mockSoftwareForOrganisation.mockResolvedValue({ + // status: 206, + // count: mockSoftware.length, + // data: mockSoftware as any + // }) + // render( + // + // + // + // ) + // // wait loader to be removed + // // await waitForElementToBeRemoved(screen.getByRole('progressbar')) + // // we need to await for all events to run + // const software = await screen.findAllByTestId('software-grid-card') + // expect(software.length).toEqual(mockSoftware.length) + // // validate api call - TODO! FIGURE WHY IS CALLED TWICE!!! + // expect(mockSoftwareForOrganisation).toBeCalledTimes(1) + // }) it('renders organisation projects page when page=projects', async () => { // not a maintainer - public page diff --git a/frontend/__tests__/UserPages.test.tsx b/frontend/__tests__/UserPages.test.tsx index 3111ff2..4aaef4d 100644 --- a/frontend/__tests__/UserPages.test.tsx +++ b/frontend/__tests__/UserPages.test.tsx @@ -73,7 +73,8 @@ describe('pages/user/[section].tsx', () => { ) const navItems = screen.getAllByTestId('user-nav-item') - expect(navItems.length).toEqual(5) + // KIN-RPD has 4 items + expect(navItems.length).toEqual(4) }) it('renders user settings section', async() => { diff --git a/frontend/auth/locationCookie.test.ts b/frontend/auth/locationCookie.test.ts index f9d9f23..8994af2 100644 --- a/frontend/auth/locationCookie.test.ts +++ b/frontend/auth/locationCookie.test.ts @@ -47,10 +47,10 @@ it('ignores these paths', () => { }) }) -it('when root write cookie to redirect to software', () => { +it('when root write cookie to redirect to projects', () => { // should ignore this path window.location.pathname = '/' - const expectedCookie = 'rsd_pathname=http://localhost/software?order=mention_cnt;path=/auth;SameSite=None;Secure' + const expectedCookie = 'rsd_pathname=http://localhost/projects?order=mention_cnt;path=/auth;SameSite=None;Secure' document.cookie = '' // call function saveLocationCookie() diff --git a/frontend/auth/locationCookie.ts b/frontend/auth/locationCookie.ts index af8ac87..387dcdc 100644 --- a/frontend/auth/locationCookie.ts +++ b/frontend/auth/locationCookie.ts @@ -13,7 +13,7 @@ export function saveLocationCookie() { if (typeof location == 'undefined') return // for specific routes switch (location.pathname.toLowerCase()) { - // ingnore these paths + // ignore these paths case '/auth': case '/login': case '/logout': @@ -21,13 +21,13 @@ export function saveLocationCookie() { case '/login/failed': break case '/': - // root is send to /software - document.cookie = `rsd_pathname=${location.href}software?order=mention_cnt;path=/auth;SameSite=None;Secure` + // root is send to /projects + document.cookie = `rsd_pathname=${location.href}projects?order=mention_cnt;path=/auth;SameSite=None;Secure` break default: // write simple browser cookie // auth module use this cookie to redirect - // after succefull authentications + // after successful authentications document.cookie = `rsd_pathname=${location.href};path=/auth;SameSite=None;Secure` } } diff --git a/frontend/components/AppHeader/AddMenu.test.tsx b/frontend/components/AppHeader/AddMenu.test.tsx index 282c5e4..824244b 100644 --- a/frontend/components/AppHeader/AddMenu.test.tsx +++ b/frontend/components/AppHeader/AddMenu.test.tsx @@ -22,7 +22,7 @@ it('should have AddMenu options',async()=>{ fireEvent.click(menuButton as HTMLElement) // select all menu options const menuOptions = screen.queryAllByTestId('add-menu-option') - // assert only 2 items - expect(menuOptions.length).toEqual(2) + // assert only 1 item + expect(menuOptions.length).toEqual(1) // screen.debug() }) diff --git a/frontend/components/AppHeader/AddMenu.tsx b/frontend/components/AppHeader/AddMenu.tsx index 3ba4728..7e9c717 100644 --- a/frontend/components/AppHeader/AddMenu.tsx +++ b/frontend/components/AppHeader/AddMenu.tsx @@ -75,12 +75,13 @@ export default function AddMenu() { // disable adding styles to body (overflow:hidden & padding-right) disableScrollLock={disable} > - handleClose('/software/add')}> + {/* disable software option, 2024-07-02 */} + {/* handleClose('/software/add')}> New Software - + */} handleClose('/projects/add')}> diff --git a/frontend/components/GlobalSearchAutocomplete/GlobalsSearchAutocomplete.test.tsx b/frontend/components/GlobalSearchAutocomplete/GlobalsSearchAutocomplete.test.tsx index 1488ada..eba9a87 100644 --- a/frontend/components/GlobalSearchAutocomplete/GlobalsSearchAutocomplete.test.tsx +++ b/frontend/components/GlobalSearchAutocomplete/GlobalsSearchAutocomplete.test.tsx @@ -39,7 +39,7 @@ it('shows 3 navigation option on focus', async () => { }) it('calls search api on input', async () => { - const expectedUrl = '/api/v1/rpc/global_search?query=Search text&limit=30&order=rank.asc,index_found.asc' + const expectedUrl = '/api/v1/rpc/global_search?query=Search text&source=in.("projects","organisations")&limit=30&order=rank.asc,index_found.asc' const expectPayload = { 'headers': { 'Content-Type': 'application/json' diff --git a/frontend/components/GlobalSearchAutocomplete/globalSearchAutocomplete.api.ts b/frontend/components/GlobalSearchAutocomplete/globalSearchAutocomplete.api.ts index 4e7ce38..a081c37 100644 --- a/frontend/components/GlobalSearchAutocomplete/globalSearchAutocomplete.api.ts +++ b/frontend/components/GlobalSearchAutocomplete/globalSearchAutocomplete.api.ts @@ -6,7 +6,7 @@ // SPDX-License-Identifier: Apache-2.0 import logger from '~/utils/logger' -import {createJsonHeaders} from '~/utils/fetchHelpers' +import {createJsonHeaders, getBaseUrl} from '~/utils/fetchHelpers' import {sortBySearchFor} from '~/utils/sortFn' export type GlobalSearchResults = { @@ -24,9 +24,10 @@ export type GlobalSearchResults = { */ export async function getGlobalSearch(searchText: string, token: string,) { try { + // disable software search, 2024-07-02 // call the function query - const query = `rpc/global_search?query=${searchText}&limit=30&order=rank.asc,index_found.asc` - let url = `/api/v1/${query}` + const query = `query=${searchText}&source=in.("projects","organisations")&limit=30&order=rank.asc,index_found.asc` + let url = `${getBaseUrl()}/rpc/global_search?${query}` const resp = await fetch(url, { method: 'GET', diff --git a/frontend/components/admin/AdminNav.tsx b/frontend/components/admin/AdminNav.tsx index 55acaf5..8e6be0b 100644 --- a/frontend/components/admin/AdminNav.tsx +++ b/frontend/components/admin/AdminNav.tsx @@ -38,12 +38,13 @@ export const adminPages = { icon: , path: '/admin/public-pages', }, - softwareHighlights:{ - title: 'Software highlights', - subtitle: '', - icon: , - path: '/admin/software-highlights', - }, + // disable software option, 2024-07-02 + // softwareHighlights:{ + // title: 'Software highlights', + // subtitle: '', + // icon: , + // path: '/admin/software-highlights', + // }, orcid:{ title: 'ORCID users', subtitle: '', @@ -68,24 +69,26 @@ export const adminPages = { icon: , path: '/admin/organisations', }, - communities: { - title: 'Communities', - subtitle: '', - icon: , - path: '/admin/communities', - }, + // disable software option, 2024-07-02 + // communities: { + // title: 'Communities', + // subtitle: '', + // icon: , + // path: '/admin/communities', + // }, keywords:{ title: 'Keywords', subtitle: '', icon: , path: '/admin/keywords', }, - categories:{ - title: 'Categories', - subtitle: '', - icon: , - path: '/admin/categories', - }, + // disable software option, 2024-07-02 + // categories:{ + // title: 'Categories', + // subtitle: '', + // icon: , + // path: '/admin/categories', + // }, mentions: { title: 'Mentions', subtitle: '', diff --git a/frontend/components/feedback/FeedbackPanelButton.tsx b/frontend/components/feedback/FeedbackPanelButton.tsx index 5b4ae85..b2562cd 100644 --- a/frontend/components/feedback/FeedbackPanelButton.tsx +++ b/frontend/components/feedback/FeedbackPanelButton.tsx @@ -50,9 +50,9 @@ export default function FeedbackPanelButton({feedback_email, issues_page_url, cl function mailBody(): string | undefined { if (typeof location === 'undefined') return - return encodeURIComponent(`Hi RSD Team, + return encodeURIComponent(`Hi Team, -I would like to give some feedback about the RSD for the browser ${browserNameAndVersion()} on the page ${location.href}: +I would like to give some feedback about the KIN-RPD for the browser ${browserNameAndVersion()} on the page ${location.href}: --- ${text} --- diff --git a/frontend/components/organisation/apiOrganisations.ts b/frontend/components/organisation/apiOrganisations.ts index f039158..5339d12 100644 --- a/frontend/components/organisation/apiOrganisations.ts +++ b/frontend/components/organisation/apiOrganisations.ts @@ -21,10 +21,11 @@ import {baseQueryString, paginationUrlParams} from '~/utils/postgrestUrl' export function organisationListUrl({search, rows = 12, page = 0}: { search: string | undefined, rows: number, page: number }) { - // NOTE 1! selectList need to include all colums used in filtering + // NOTE 1! selectList need to include all columns used in filtering // NOTE 2! ensure selectList uses identical props as defined in OrganisationList type + // NOTE 3! for KIN we use order on project const selectList = 'id,parent,name,short_description,country,website,is_tenant,rsd_path,logo_id,software_cnt,project_cnt,score' - let url = `${getBaseUrl()}/rpc/organisations_overview?parent=is.null&score=gt.0&order=is_tenant.desc,score.desc.nullslast,name.asc&select=${selectList}` + let url = `${getBaseUrl()}/rpc/organisations_overview?parent=is.null&score=gt.0&order=project_cnt.desc.nullslast,name.asc&select=${selectList}` // add search params if (search) { url += `&or=(name.ilike.*${search}*, website.ilike.*${search}*)` diff --git a/frontend/components/organisation/overview/card/OrganisationCard.tsx b/frontend/components/organisation/overview/card/OrganisationCard.tsx index e0fb7f4..b9ab210 100644 --- a/frontend/components/organisation/overview/card/OrganisationCard.tsx +++ b/frontend/components/organisation/overview/card/OrganisationCard.tsx @@ -34,7 +34,8 @@ export default function OrganisationCard({organisation}: { organisation: Organis
@@ -61,12 +62,13 @@ export default function OrganisationCard({organisation}: { organisation: Organis software_cnt={organisation.software_cnt} project_cnt={organisation.project_cnt} /> + {/* disable tenant for KIN-RPD instance, 2024-07-02 */} {/* if is not tenant we render empty placeholder */} - {organisation.is_tenant === false ? + {/* {organisation.is_tenant === false ?
 
: - } + } */}
diff --git a/frontend/components/organisation/overview/card/OrganisationCardMetrics.tsx b/frontend/components/organisation/overview/card/OrganisationCardMetrics.tsx index 27622a8..0505875 100644 --- a/frontend/components/organisation/overview/card/OrganisationCardMetrics.tsx +++ b/frontend/components/organisation/overview/card/OrganisationCardMetrics.tsx @@ -11,15 +11,15 @@ type OrganisationMetricsProps = { export default function OrganisationCardMetrics({software_cnt,project_cnt}:OrganisationMetricsProps) { return ( <> - {/* Counter */} -
+ {/* Counter disable software option, 2024-07-02 */} + {/*
{software_cnt ?? 0}
software
package{software_cnt === 1 ? '' : 's'}
-
+
*/} {/* Counter */}
diff --git a/frontend/components/organisation/tabs/OrganisationTabItems.tsx b/frontend/components/organisation/tabs/OrganisationTabItems.tsx index 79ed70e..e671c93 100644 --- a/frontend/components/organisation/tabs/OrganisationTabItems.tsx +++ b/frontend/components/organisation/tabs/OrganisationTabItems.tsx @@ -36,12 +36,13 @@ export type OrganisationTabProps = { * NOTE! When changing the tab options also update * TabContent.tsx file to load proper component. */ -export const organistionTabItems:OrganisationTabProps = { +export const organisationTabItems:OrganisationTabProps = { + // disable software option, 2024-07-02 software: { id:'software', label:({software_cnt})=>`Software (${software_cnt ?? 0})`, icon: , - isVisible: (props) => true, + isVisible: (props) => false, }, projects:{ id:'projects', @@ -49,11 +50,12 @@ export const organistionTabItems:OrganisationTabProps = { icon: , isVisible: (props) => true, }, + // disable releases option, 2024-07-02 releases: { id:'releases', label:({release_cnt})=>`Releases (${release_cnt ?? 0})`, icon: , - isVisible: (props) => true, + isVisible: (props) => false, }, units:{ id:'units', diff --git a/frontend/components/organisation/tabs/OrganisationTabs.tsx b/frontend/components/organisation/tabs/OrganisationTabs.tsx index 07cd2fe..8fe8b2f 100644 --- a/frontend/components/organisation/tabs/OrganisationTabs.tsx +++ b/frontend/components/organisation/tabs/OrganisationTabs.tsx @@ -7,12 +7,12 @@ import Tab from '@mui/material/Tab' import Tabs from '@mui/material/Tabs' import {useRouter} from 'next/router' -import {TabKey, organistionTabItems} from './OrganisationTabItems' +import {TabKey, organisationTabItems} from './OrganisationTabItems' import useOrganisationContext from '../context/useOrganisationContext' import useSelectedTab from './useSelectedTab' // extract tab items (object keys) -const tabItems = Object.keys(organistionTabItems) as TabKey[] +const tabItems = Object.keys(organisationTabItems) as TabKey[] export default function OrganisationTabs({tab_id}:{tab_id:TabKey|null}) { const router = useRouter() @@ -48,7 +48,7 @@ export default function OrganisationTabs({tab_id}:{tab_id:TabKey|null}) { aria-label="organisation tabs" > {tabItems.map(key => { - const item = organistionTabItems[key] + const item = organisationTabItems[key] if (item.isVisible({ isMaintainer, software_cnt, diff --git a/frontend/components/organisation/tabs/TabContent.tsx b/frontend/components/organisation/tabs/TabContent.tsx index bd61d3b..69f5601 100644 --- a/frontend/components/organisation/tabs/TabContent.tsx +++ b/frontend/components/organisation/tabs/TabContent.tsx @@ -39,18 +39,23 @@ export default function TabContent({tab_id}: TabContentProps) { switch (select_tab) { case 'about': return + // IGNORE software and use projects + // disable software option, 2024-07-02 + case 'software': case 'projects': return case 'releases': return case 'settings': return - case 'software': - return + // disable software option, 2024-07-02 + // case 'software': + // return case 'units': return default: logger(`Unknown tab_id ${tab_id}...returning default software tab`,'warn') - return + // projects as default option, 2024-07-02 + return } } diff --git a/frontend/components/organisation/tabs/useSelectedTab.tsx b/frontend/components/organisation/tabs/useSelectedTab.tsx index f395b08..d32b502 100644 --- a/frontend/components/organisation/tabs/useSelectedTab.tsx +++ b/frontend/components/organisation/tabs/useSelectedTab.tsx @@ -3,22 +3,22 @@ // // SPDX-License-Identifier: Apache-2.0 -import {TabKey, organistionTabItems} from './OrganisationTabItems' +import {TabKey, organisationTabItems} from './OrganisationTabItems' import useOrganisationContext from '../context/useOrganisationContext' // extract tab items (object keys) -// const tabItems = Object.keys(organistionTabItems) as TabKey[] +// const tabItems = Object.keys(organisationTabItems) as TabKey[] export default function useSelectedTab(tab_id: TabKey|null) { const {description, isMaintainer} = useOrganisationContext() - // default tab is software - let selected:TabKey = 'software' + // default tab is projects + let selected:TabKey = 'projects' // if tab provided use it - if (tab_id !== null && organistionTabItems.hasOwnProperty(tab_id) === true) { + if (tab_id !== null && organisationTabItems.hasOwnProperty(tab_id) === true) { selected = tab_id - } else if (organistionTabItems['about'].isVisible({description,isMaintainer})===true) { + } else if (organisationTabItems['about'].isVisible({description,isMaintainer})===true) { // if tab is not provided and there is description // the default tab is about selected = 'about' diff --git a/frontend/components/projects/edit/editProjectPages.tsx b/frontend/components/projects/edit/editProjectPages.tsx index b470513..98d875d 100644 --- a/frontend/components/projects/edit/editProjectPages.tsx +++ b/frontend/components/projects/edit/editProjectPages.tsx @@ -12,7 +12,7 @@ import FeedIcon from '@mui/icons-material/Feed' import TeamsIcon from '@mui/icons-material/Groups' import BusinessIcon from '@mui/icons-material/Business' import PersonAddIcon from '@mui/icons-material/PersonAdd' -import TerminalIcon from '@mui/icons-material/Terminal' +// import TerminalIcon from '@mui/icons-material/Terminal' import ContentLoader from '~/components/layout/ContentLoader' import JoinInnerIcon from '@mui/icons-material/JoinInner' import AddCommentIcon from '@mui/icons-material/AddComment' @@ -33,9 +33,10 @@ const ProjectMentions = dynamic(() => import('./mentions'),{ const RelatedProjects = dynamic(() => import('./related-projects'),{ loading: ()=> }) -const RelatedSoftware = dynamic(() => import('./related-software'),{ - loading: ()=> -}) +// disable software option, 2024-07-02 +// const RelatedSoftware = dynamic(() => import('./related-software'),{ +// loading: ()=> +// }) const ProjectMaintainers = dynamic(() => import('./maintainers'),{ loading: ()=> }) @@ -84,13 +85,14 @@ export const editProjectPage: EditProjectPageProps[] = [ render: () => , status: '' }, - { - id: 'related-software', - label: 'Related software', - icon: , - render: () => , - status: '' - }, + // disable software option, 2024-07-02 + // { + // id: 'related-software', + // label: 'Related software', + // icon: , + // render: () => , + // status: '' + // }, { id: 'maintainers', label: 'Maintainers', diff --git a/frontend/components/user/UserNavItems.tsx b/frontend/components/user/UserNavItems.tsx index fe55298..e1e1fc3 100644 --- a/frontend/components/user/UserNavItems.tsx +++ b/frontend/components/user/UserNavItems.tsx @@ -56,41 +56,44 @@ export type UserMenuProps = { showSearch: boolean } -export const userMenu:UserMenuProps[] = [{ - id:'software', - label:({software_cnt})=>`Software (${software_cnt ?? 0})`, - icon: , - status: 'Software you maintain', - showSearch: true -},{ - id:'projects', - label: ({project_cnt})=>`Projects (${project_cnt ?? 0})`, - icon: , - status: 'Projects you maintain', - showSearch: true -},{ - id:'organisations', - label: ({organisation_cnt})=>`Organisations (${organisation_cnt ?? 0})`, - icon: , - status: 'Organisations you maintain', - showSearch: true -},{ - id:'communities', - label: ({community_cnt})=>`Communities (${community_cnt ?? 0})`, - icon: , - status: 'Communities you maintain', - showSearch: true -},{ - id:'project-quality', - label: () => 'Project metadata overview', - icon: , - status: 'Overview of the completeness of project pages you maintain', - showSearch: false -},{ - id:'settings', - label: () => 'Settings', - icon: , - status: 'Your profile settings', - showSearch: false -}, +export const userMenu:UserMenuProps[] = [ +// disable software option, 2024-07-02 +// { +// id:'software', +// label:({software_cnt})=>`Software (${software_cnt ?? 0})`, +// icon: , +// status: 'Software you maintain', +// showSearch: true +// }, + { + id:'projects', + label: ({project_cnt})=>`Projects (${project_cnt ?? 0})`, + icon: , + status: 'Projects you maintain', + showSearch: true + },{ + id:'organisations', + label: ({organisation_cnt})=>`Organisations (${organisation_cnt ?? 0})`, + icon: , + status: 'Organisations you maintain', + showSearch: true + },{ + id:'communities', + label: ({community_cnt})=>`Communities (${community_cnt ?? 0})`, + icon: , + status: 'Communities you maintain', + showSearch: true + },{ + id:'project-quality', + label: () => 'Project metadata overview', + icon: , + status: 'Overview of the completeness of project pages you maintain', + showSearch: false + },{ + id:'settings', + label: () => 'Settings', + icon: , + status: 'Your profile settings', + showSearch: false + }, ] diff --git a/frontend/pages/organisations/index.tsx b/frontend/pages/organisations/index.tsx index e00a070..2c40f9e 100644 --- a/frontend/pages/organisations/index.tsx +++ b/frontend/pages/organisations/index.tsx @@ -14,7 +14,6 @@ import Pagination from '@mui/material/Pagination' import PaginationItem from '@mui/material/PaginationItem' import {app} from '~/config/app' -import {useUserSettings} from '~/config/UserSettingsContext' import PageTitle from '~/components/layout/PageTitle' import Searchbox from '~/components/form/Searchbox' import {OrganisationList} from '~/types/Organisation' @@ -24,7 +23,7 @@ import {getOrganisationsList} from '~/components/organisation/apiOrganisations' import PageMeta from '~/components/seo/PageMeta' import AppFooter from '~/components/AppFooter' import AppHeader from '~/components/AppHeader' -import {getUserSettings, setDocumentCookie} from '~/utils/userSettings' +import {getUserSettings} from '~/utils/userSettings' import useSearchParams from '~/components/search/useSearchParams' import OrganisationGrid from '~/components/organisation/overview/OrganisationGrid' import PageBackground from '~/components/layout/PageBackground' diff --git a/frontend/pages/projects/[slug]/index.tsx b/frontend/pages/projects/[slug]/index.tsx index d4cdef4..39c3af3 100644 --- a/frontend/pages/projects/[slug]/index.tsx +++ b/frontend/pages/projects/[slug]/index.tsx @@ -54,6 +54,7 @@ export interface ProjectPageProps extends ScriptProps{ output: MentionItemProps[], impact: MentionItemProps[], team: Person[], + // disable software option, 2024-07-02 relatedSoftware: SoftwareOverviewItemProps[], relatedProjects: RelatedProject[] } @@ -169,7 +170,8 @@ export async function getServerSideProps(context:any) { output, impact, team, - relatedSoftware, + // disable software option, 2024-07-02 + // relatedSoftware, relatedProjects, links, isMaintainer @@ -182,7 +184,8 @@ export async function getServerSideProps(context:any) { // Impact getImpactByProject({project: project.id, token}), getTeamForProject({project: project.id, token}), - getRelatedSoftwareForProject({project: project.id, token, frontend: false}), + // disable software option, 2024-07-02 + // getRelatedSoftwareForProject({project: project.id, token, frontend: false}), getRelatedProjectsForProject({project: project.id, token, frontend: false}), getLinksForProject({project: project.id, token, frontend: false}), isMaintainerOfProject({slug, account:userInfo?.account, token, frontend: false}), @@ -202,7 +205,8 @@ export async function getServerSideProps(context:any) { output, impact, team, - relatedSoftware, + // disable software option, 2024-07-02 + relatedSoftware:[], relatedProjects, links }, diff --git a/frontend/public/data/settings.json b/frontend/public/data/settings.json index 61d2d0a..947446f 100644 --- a/frontend/public/data/settings.json +++ b/frontend/public/data/settings.json @@ -1,7 +1,6 @@ { "host": { "name": "kin-rpd", - "email": "rsd@esciencecenter.nl", "emailHeaders": [], "logo_url": "/images/logo-KIN.svg", "website": "https://hetkin.nl", @@ -48,7 +47,7 @@ "colors": { "base-100": "#fff", "base-200": "#eeeeee", - "base-300": "#e1eee5", + "base-300": "#e5e3e3", "base-400": "#bdbdbd", "base-500": "#9e9e9e", "base-600": "#3f7f94", @@ -56,14 +55,14 @@ "base-800": "#386f82", "base-900": "#306070", "base-content": "#306070", - "base-content-secondary": "rgba(34,36,37,0.7)", + "base-content-secondary": "rgba(48,96,112,0.7)", "base-content-disabled": "rgba(34,36,37,0.45)", "primary": "#01A2D6", "primary-content": "#fff", "secondary": "#306070", "secondary-content": "#fff", - "accent": "#71AD93", - "accent-content": "#fff", + "accent": "#a3ccb9", + "accent-content": "#306070", "error": "#8A1D12", "error-content": "#fff", "warning": "#ed6c02", @@ -93,7 +92,7 @@ "colors": { "base-100": "#306070", "base-200": "#56956a", - "base-300": "#4d855e", + "base-300": "#e1eee5", "base-400": "#757575", "base-500": "#9e9e9e", "base-600": "#bdbdbd",