diff --git a/src/App/Timelines.css b/src/App/Timelines.css index a9f3fdcb890ef09a6a0a5d6612ac01a7e8e91d9b..a4b20704fbd4878abb6d05a977fda599805db591 100644 --- a/src/App/Timelines.css +++ b/src/App/Timelines.css @@ -421,4 +421,9 @@ justify-content: center; /* Horizontale Zentrierung */ .fillup-wrapper{ display: flex; +} + + +.timeline-item figcaption{ + background-color: white !important; } \ No newline at end of file diff --git a/src/components/Graph.tsx b/src/components/Graph.tsx index e8c9bc7c2a6b258223d448519e9615555692fed2..76685112606211c697e53303f8965f5031b4f684 100644 --- a/src/components/Graph.tsx +++ b/src/components/Graph.tsx @@ -1,7 +1,7 @@ import { Pie } from 'react-chartjs-2'; import React from 'react'; import { Bar } from 'react-chartjs-2'; -import { Chart as ChartJS, Tooltip, Legend,ArcElement, BarElement, CategoryScale, LinearScale, Title, RadialLinearScale, plugins } from 'chart.js'; +import { Chart as ChartJS, Tooltip, Legend,ArcElement, BarElement, CategoryScale, LinearScale, Title, RadialLinearScale } from 'chart.js'; const backgroundcolorscale = [ 'rgba(133, 15, 120, 0.2)', diff --git a/src/components/Photo-grid.tsx b/src/components/Photo-grid.tsx index bcb58b64f62380155ed9a0638a2e88a090781428..5fc7b2d7c3623da8460737851781aff8f131b8e1 100644 --- a/src/components/Photo-grid.tsx +++ b/src/components/Photo-grid.tsx @@ -18,21 +18,11 @@ const images = [ {src:"https://static.igem.wiki/teams/5247/photos/meetup/wageningen.jpeg", width: 320, height: 212, tabs: ""}, {src:"https://static.igem.wiki/teams/5247/photos/meetup/aachen.jpeg", width: 320, height: 212, tabs: ""}, {src:"https://static.igem.wiki/teams/5247/photos/meetup/orgateam.jpeg", width: 320, height: 212, tabs: ""}, - {src:"https://static.igem.wiki/teams/5247/photos/meetup/orgateam.jpeg", width: 320, height: 212, tabs: ""}, - {src:"https://static.igem.wiki/teams/5247/photos/meetup/badges.jpeg", width: 320, height: 212, tabs: ""}, - {src:"https://static.igem.wiki/teams/5247/photos/meetup/joern.jpeg", width: 320, height: 212, tabs: ""}, - {src:"https://static.igem.wiki/teams/5247/photos/meetup/chekin.jpeg", width: 320, height: 212, tabs: ""}, - {src:"https://static.igem.wiki/teams/5247/photos/meetup/sinan.jpeg", width: 320, height: 212, tabs: ""}, - {src:"https://static.igem.wiki/teams/5247/photos/meetup/party.jpeg", width: 320, height: 212}, - {src:"https://static.igem.wiki/teams/5247/photos/meetup/orgateam.jpeg", width: 320, height: 212}, - {src:"https://static.igem.wiki/teams/5247/photos/meetup/orgateam.jpeg", width: 320, height: 212}, - {src:"https://static.igem.wiki/teams/5247/photos/meetup/orgateam.jpeg", width: 320, height: 212}, - {src:"https://static.igem.wiki/teams/5247/photos/meetup/orgateam.jpeg", width: 320, height: 212}, - {src:"https://static.igem.wiki/teams/5247/photos/meetup/orgateam.jpeg", width: 320, height: 212}, -] +] +/* {src:"", width: 320, height: 212}, */ export default function BFHGallery(){ let rows = [] diff --git a/src/contents/notebook.tsx b/src/contents/notebook.tsx index 532087f757558b9c1358ba94e95beedf609810e5..cd065a926fb6923dd263db1db52eb1abe5fce08f 100644 --- a/src/contents/notebook.tsx +++ b/src/contents/notebook.tsx @@ -1,26 +1,46 @@ -import H4 from "../components/Headings"; +import H2 from "../components/Headings"; import { useTabNavigation } from "../utils/TabNavigation"; export function Notebook() { useTabNavigation(); return ( <div> - <H4 text="Lab journals"/> - <div className="row align-items-center"> + <H2 text="Lab journals and Protocol collection"/> + <div className='row'> <div className="col"> <figure> - <img src="https://static.igem.wiki/teams/5247/photos/for-wiki-texts/meth-patch-clamp/bild-meth-patch-clamp.png" alt="Text test"/> - <figcaption><b>Figure 1.</b> Text test</figcaption> + <img src="https://static.igem.wiki/teams/5247/lab-journals/titelseite-lab-book-1-proof-of-concept-pe.webp"/> </figure> </div> <div className="col"> <figure> - <img src="https://static.igem.wiki/teams/5247/photos/for-wiki-texts/meth-patch-clamp/bild-meth-patch-clamp.png" alt="Text2"/> - <figcaption><b>Figure 2.</b> Text2</figcaption> + <img src="https://static.igem.wiki/teams/5247/lab-journals/titelseite-lab-book-2-engineering-pe.webp"/> </figure> </div> </div> + <div className='row'> + <div className="col"> + <figure> + <img src="https://static.igem.wiki/teams/5247/lab-journals/titelseite-lab-book-3-primary-cell-culture.webp"/> + </figure> + </div> + <div className="col"> + <figure> + <img src="https://static.igem.wiki/teams/5247/lab-journals/titelseite-lab-book-4-lnp.webp"/> + </figure> + </div> + </div> + <div className='row'> + <div className="col"> + <figure> + <img src="https://static.igem.wiki/teams/5247/lab-journals/titelseite-lab-book-5-downstream.webp"/> + </figure> + </div> + <div className="col"> + <img src="https://static.igem.wiki/teams/5247/lab-journals/titelseite-lab-book-sop.webp"/> + </div> + </div> </div> ); diff --git a/src/pages.ts b/src/pages.ts index 822450206c20259377fce911d735734598714163..39c6df2cd558109071ca196c37f99b0981dde99e 100644 --- a/src/pages.ts +++ b/src/pages.ts @@ -232,6 +232,7 @@ const Pages: (Page | Folder)[] = [ ]; export const NavPages: (Page | PageRef | Folder)[] = [ + { name: "Home", title: "Bielefeld CeBiTec", @@ -240,6 +241,41 @@ export const NavPages: (Page | PageRef | Folder)[] = [ header: HOMEH, navlist: NoSidebar, }, + { + name: "Highlights", + folder: [ + { + name: "Project Description", + title: "Project Description", + path: "/description?scrollTo=Abstract" + }, + { + name: "Engineering", + title: "Engineering", + path: "/engineering" + }, + { + name: "Experiments", + title: "Experiments", + path: "/experiments?tab=heading" + }, + { + name: "Results", + title: "Results", + path: "/results?scrollTo=experimental-design" + }, + { + name: "Parts", + title: "Parts", + path: "/parts?scrollTo=Parts Collection2H" + }, + { + name: "Judging", + title: "Judging", + path: "/judging?scrollTo=OverviewH" + }, + ] + }, { name: "Team", folder: [