From 7e5f2355fa1381148e2665e3a2713c78359251c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gintautas=20Jurgelevi=C4=8Dius?= <gintautas@igem.org>
Date: Thu, 19 May 2022 14:24:12 +0000
Subject: [PATCH 1/2] Remove TeamsList things that are left
---
package.json | 2 +-
.../prebuilt/TeamsList/TeamsListBody.tsx | 68 +++++++++----------
src/components/prebuilt/TeamsList/index.ts | 2 +-
stories/prebuilt/TeamsList.stories.tsx | 34 +++++-----
4 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/package.json b/package.json
index b334eff6..3b8dd2c9 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "version": "0.6.3",
+ "version": "0.6.4",
"name": "@igem/ui-components",
"description": "NPM module for all React components used in iGEM websites.",
"license": "MIT",
diff --git a/src/components/prebuilt/TeamsList/TeamsListBody.tsx b/src/components/prebuilt/TeamsList/TeamsListBody.tsx
index d673b0d3..4612ce6c 100644
--- a/src/components/prebuilt/TeamsList/TeamsListBody.tsx
+++ b/src/components/prebuilt/TeamsList/TeamsListBody.tsx
@@ -1,34 +1,34 @@
-import React, { MutableRefObject } from 'react'
-import { Column, Row } from 'react-table'
-import { Team, teamTableColumns } from './utils'
-import { Table } from '../../dataDisplay/Table'
-
-export interface TeamListBodyProps {
- tableInstance: MutableRefObject<any>
- actionColumn?: Column<any>
- teams: Team[]
- onRowClick?: (row: Row) => void
-}
-
-export const TeamsListBody = ({ teams, tableInstance, actionColumn, onRowClick }: TeamListBodyProps): JSX.Element => {
- return (
- <div className='ii-teams-list__body'>
- {teams.length > 0
- ? (
- <Table
- columns={actionColumn !== undefined ? [actionColumn, ...teamTableColumns] : teamTableColumns}
- onRowClick={onRowClick}
- data={teams}
- isMultiline={false}
- ref={tableInstance}
- renderPagination={teams.length > 10}
- initialPageSize={10}
- withNumbering
- />
- )
- : (
- <p className='ii-py-5 ii-text-center'>Currently there are no teams available.</p>
- )}
- </div>
- )
-}
+// import React, { MutableRefObject } from 'react'
+// import { Column, Row } from 'react-table'
+// import { Team, teamTableColumns } from './utils'
+// import { Table } from '../../dataDisplay/Table'
+//
+// export interface TeamListBodyProps {
+// tableInstance: MutableRefObject<any>
+// actionColumn?: Column<any>
+// teams: Team[]
+// onRowClick?: (row: Row) => void
+// }
+//
+// export const TeamsListBody = ({ teams, tableInstance, actionColumn, onRowClick }: TeamListBodyProps): JSX.Element => {
+// return (
+// <div className='ii-teams-list__body'>
+// {teams.length > 0
+// ? (
+// <Table
+// columns={actionColumn !== undefined ? [actionColumn, ...teamTableColumns] : teamTableColumns}
+// onRowClick={onRowClick}
+// data={teams}
+// isMultiline={false}
+// ref={tableInstance}
+// renderPagination={teams.length > 10}
+// initialPageSize={10}
+// withNumbering
+// />
+// )
+// : (
+// <p className='ii-py-5 ii-text-center'>Currently there are no teams available.</p>
+// )}
+// </div>
+// )
+// }
diff --git a/src/components/prebuilt/TeamsList/index.ts b/src/components/prebuilt/TeamsList/index.ts
index 686aff24..7ff1d2a4 100644
--- a/src/components/prebuilt/TeamsList/index.ts
+++ b/src/components/prebuilt/TeamsList/index.ts
@@ -1 +1 @@
-export * from './TeamsList'
+// export * from './TeamsList'
diff --git a/stories/prebuilt/TeamsList.stories.tsx b/stories/prebuilt/TeamsList.stories.tsx
index 1a53f2ff..4e6fafc8 100644
--- a/stories/prebuilt/TeamsList.stories.tsx
+++ b/stories/prebuilt/TeamsList.stories.tsx
@@ -1,17 +1,17 @@
-import React from 'react'
-import { ComponentStory } from '@storybook/react'
-import { TeamsList } from 'index'
-import { storyFolder } from './story.utils'
-
-export default {
- title: `${storyFolder}TeamsList`,
- component: TeamsList,
- args: {
- apiBase: process.env.REACT_APP_API_ENDPOINT
- }
-}
-
-export const Default: ComponentStory<typeof TeamsList> = (props: any) => <TeamsList {...props} />
-Default.args = {
- apiBase: process.env.REACT_APP_API_ENDPOINT
-}
+// import React from 'react'
+// import { ComponentStory } from '@storybook/react'
+// import { TeamsList } from 'index'
+// import { storyFolder } from './story.utils'
+//
+// export default {
+// title: `${storyFolder}TeamsList`,
+// component: TeamsList,
+// args: {
+// apiBase: process.env.REACT_APP_API_ENDPOINT
+// }
+// }
+//
+// export const Default: ComponentStory<typeof TeamsList> = (props: any) => <TeamsList {...props} />
+// Default.args = {
+// apiBase: process.env.REACT_APP_API_ENDPOINT
+// }
--
GitLab
From d13d1cfcf65779011fdebe407733502dea6f5c31 Mon Sep 17 00:00:00 2001
From: Fabio M <fabio@igem.org>
Date: Thu, 19 May 2022 14:56:28 +0000
Subject: [PATCH 2/2] Update Footer
---
.../pageGeneral/Footer/Footer.utils.ts | 66 ++++++++-----------
1 file changed, 29 insertions(+), 37 deletions(-)
diff --git a/src/components/pageGeneral/Footer/Footer.utils.ts b/src/components/pageGeneral/Footer/Footer.utils.ts
index 9d1f473b..478d0c1a 100644
--- a/src/components/pageGeneral/Footer/Footer.utils.ts
+++ b/src/components/pageGeneral/Footer/Footer.utils.ts
@@ -46,12 +46,12 @@ export const footerLinks = [
link: 'https://igem.org',
items: [
{
- title: 'Old Website',
- link: 'https://old.igem.org'
+ title: 'Our Vision',
+ link: 'https://igem.org/about-us/our-vision'
},
{
- title: 'Our Vision',
- link: 'https://igem.org/Vision'
+ title: 'Sponsorship',
+ link: 'https://igem.org/patronage/sponsorship'
},
{
title: 'iGEM Blog',
@@ -63,7 +63,7 @@ export const footerLinks = [
},
{
title: 'News',
- link: 'https://igem.org/News'
+ link: 'https://old.igem.org/News'
},
{
title: 'Jobs',
@@ -77,7 +77,7 @@ export const footerLinks = [
items: [
{
title: 'Timeline',
- link: 'https://igem.org/Timeline'
+ link: 'https://old.igem.org/Timeline'
},
{
title: 'Previous Year',
@@ -93,7 +93,7 @@ export const footerLinks = [
},
{
title: '2021 Results',
- link: 'https://jamboree.igem.org/results'
+ link: 'https://jamboree.igem.org/2021/results'
}
]
},
@@ -103,7 +103,7 @@ export const footerLinks = [
items: [
{
title: 'Team List',
- link: 'https://igem.org/Team_List'
+ link: 'https://old.igem.org/Team_List'
},
{
title: 'Project Videos',
@@ -134,14 +134,6 @@ export const footerLinks = [
{
title: 'Ambassadors',
link: 'https://community.igem.org/ambassador-program/'
- },
- {
- title: 'Networks',
- link: 'https://community.igem.org/'
- },
- {
- title: 'Initiatives',
- link: 'https://community.igem.org/'
}
]
},
@@ -150,28 +142,28 @@ export const footerLinks = [
link: 'https://technology.igem.org/',
items: [
{
- title: 'About',
- link: 'https://igem.org/Registry'
+ title: 'Registry',
+ link: 'https://technology.igem.org/registry'
},
{
- title: 'Parts Registry',
- link: 'https://parts.igem.org/'
+ title: 'Distribution',
+ link: 'https://technology.igem.org/distribution'
},
{
- title: 'Distribution Kits',
- link: 'https://parts.igem.org/assembly/libraries.cgi'
+ title: 'Assembly',
+ link: 'https://technology.igem.org/assembly'
},
{
title: 'Team Parts',
- link: 'https://igem.org/Team_Parts?year=2021'
+ link: 'https://old.igem.org/Team_Parts?year=2021'
},
{
- title: 'Engineering Hub',
- link: 'https://2021.igem.org/Engineering'
+ title: 'Engineering Resources',
+ link: 'https://technology.igem.org/engineering/introduction'
},
{
title: 'Engineering Webinars',
- link: 'https://2021.igem.org/Engineering/Webinars'
+ link: 'https://technology.igem.org/engineering/webinars'
}
]
},
@@ -180,16 +172,16 @@ export const footerLinks = [
link: 'https://responsibility.igem.org/',
items: [
{
- title: 'Safety & Security at iGEM',
- link: 'https://igem.org/Safety'
+ title: 'Safety Policies',
+ link: 'https://responsibility.igem.org/safety-policies/introduction'
},
{
- title: 'Human Practices at iGEM',
- link: 'https://igem.org/Human_Practices'
+ title: 'Human Practices',
+ link: 'https://responsibility.igem.org/human-practices/what-is-human-practices'
},
{
- title: 'Safety Hub',
- link: 'https://2021.igem.org/Safety'
+ title: 'Responsible Design',
+ link: 'https://responsibility.igem.org/guidance/responsible-design'
},
{
title: 'Human Practices Hub',
@@ -225,11 +217,11 @@ export const footerLinks = [
},
{
title: 'Design League',
- link: 'https://igem.org/Designleague'
+ link: 'https://leagues.igem.org/design'
},
{
title: 'Indian League',
- link: 'https://igem.org/Indian-League'
+ link: 'https://leagues.igem.org/indian'
},
{
title: 'iGEM Academy',
@@ -243,15 +235,15 @@ export const footerLinks = [
items: [
{
title: '2021 Recap',
- link: 'https://jamboree.igem.org/recap'
+ link: 'https://jamboree.igem.org/2021/recap'
},
{
title: '2021 Startup Showcase',
- link: 'https://jamboree.igem.org/epic'
+ link: 'https://jamboree.igem.org/2021/epic'
},
{
title: '2021 Meetups',
- link: 'https://jamboree.igem.org/meetups'
+ link: 'https://jamboree.igem.org/2021/meetups'
}
]
}
--
GitLab