From 296f39557adb0636fbab76ea72e76ddf4b950d0b Mon Sep 17 00:00:00 2001 From: Liliana Sanfilippo <liliana.sanfilippo@uni-bielefeld.de> Date: Wed, 25 Sep 2024 19:04:46 +0200 Subject: [PATCH] kaya --- src/App/App.css | 2 +- src/components/BFH-Timeline.tsx | 11 ++++------- src/data/hptimelinedata.tsx | 28 ++++++++++++++++++++++++++-- 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/src/App/App.css b/src/App/App.css index 4f65c5a6..fb8992cf 100644 --- a/src/App/App.css +++ b/src/App/App.css @@ -75,7 +75,7 @@ html{ } .scrolllink span{ - color: var(--background) !important; + color: var(--accen-secondary) !important; } .small-row{ diff --git a/src/components/BFH-Timeline.tsx b/src/components/BFH-Timeline.tsx index 766ec0a7..11c3c8a6 100644 --- a/src/components/BFH-Timeline.tsx +++ b/src/components/BFH-Timeline.tsx @@ -1,6 +1,6 @@ import { NoButtTimelineItem, PanelTimelineItem, TimelineItemPic, TimelineItemTwoPic } from "./VerticalTimeline"; import SimpleSlider from "./Slider"; -import { SupScrollLink } from "./ScrollLink"; +import { ScrollLink, SupScrollLink } from "./ScrollLink"; export function BFHTimeline () { return( @@ -196,10 +196,7 @@ export function BFHTimeline () { </div> <span> - </span> - <div id="teampres" style={{display: "none"}}> - So much more - </div> + </span> </NoButtTimelineItem> <NoButtTimelineItem url="https://static.igem.wiki/teams/5247/placeholders/placehilderperson.jpeg" @@ -208,8 +205,8 @@ export function BFHTimeline () { color='var(--accent-primary)' > - <h5>Poster Exhibition Booth </h5> - [Link virtual exhibition] + <h5>Poster Exhibition Booth</h5> + <p> Visit the <ScrollLink label="Virtual Poster Exhibition" targetId="BFH European MeetUp4H" />!</p> <div className="col bfh-slider"> <SimpleSlider> <img className="" src="https://static.igem.wiki/teams/5247/photos/meetup/exhibition/posterexhibition-plasmid-factory.webp"/> diff --git a/src/data/hptimelinedata.tsx b/src/data/hptimelinedata.tsx index 2eacaa65..97baa7c1 100644 --- a/src/data/hptimelinedata.tsx +++ b/src/data/hptimelinedata.tsx @@ -28,8 +28,32 @@ export interface TimelineDatenpunkt { references?: Array<React.ReactNode>; /* Muss HTML Code sein - Liliana erstellt den aus Bib dateien */ interview?: React.ReactNode; } +export interface TimelineDatenpunktZwei { + title?: string; /* Prof. , Dr., ... */ + vorname: string; + nachnname: string; + pictureurl: string; + tag: StakeholderTag; + heading: string; + interviewtabid: string; + type: TypeTag; /* nur falls es ein meta tag ist */ + affiliation?: string; + job?: string; + cardtext: string; + language?: Language; + quote: string; + quoteVorname?: string; /* Wenn die quote nicht von der Person ist über die der Text ist */ + quoteNachname?: string; + text: Array<string> | Array<React.ReactNode>; + pictureurl_interview?: string; /* Picture that goes into the paragraph "Insights" */ + pictureurl_aim?: string; /* Picture that goes into the paragraph "Aim of contact" */ + pictureurl_implementation?: string; /* Picture that goes into the paragraph "Implementation" */ + more_pictures?: Array<string> ; + references?: Array<React.ReactNode>; /* Muss HTML Code sein - Liliana erstellt den aus Bib dateien */ + interview?: React.ReactNode; +} type StakeholderTag = 'Industry' | 'Academia' | 'Patient' | 'Medical Professional' | 'Milestone' | 'Other'; -type TypeTag = 'meta' ; +type TypeTag = 'meta' | 'kaya' ; type Language = 'en' | 'de'; const pics: { [key: string]: string } = { @@ -68,7 +92,7 @@ const pics: { [key: string]: string } = { Fehlende Infos einfach leer lassen und keine Dummy-Texte einfügen! */ -export const timelinedata: Array<TimelineDatenpunkt> = [ +export const timelinedata: Array<TimelineDatenpunkt> | Array<TimelineDatenpunktZwei> = [ { vorname: "Building the team", nachnname: "", -- GitLab