Skip to content
Snippets Groups Projects
Commit 566038f9 authored by Liliana Sanfilippo's avatar Liliana Sanfilippo
Browse files

header vereinzelt

parent d31dfefa
No related branches found
No related tags found
No related merge requests found
Pipeline #390904 failed
Showing with 244 additions and 34 deletions
...@@ -3,7 +3,6 @@ import "./App.scss"; ...@@ -3,7 +3,6 @@ import "./App.scss";
import "bootstrap/dist/css/bootstrap.min.css"; import "bootstrap/dist/css/bootstrap.min.css";
import { Route, Routes } from "react-router-dom"; import { Route, Routes } from "react-router-dom";
import { Footer } from "../components/Footer.tsx"; import { Footer } from "../components/Footer.tsx";
import { Header } from "../components/Header.tsx";
import { NotFound } from "../components/NotFound.tsx"; import { NotFound } from "../components/NotFound.tsx";
import { Navbar } from "../components/Navbar.tsx"; import { Navbar } from "../components/Navbar.tsx";
import { getPathMapping } from "../utils/getPathMapping.ts"; import { getPathMapping } from "../utils/getPathMapping.ts";
...@@ -38,13 +37,14 @@ const App = () => { ...@@ -38,13 +37,14 @@ const App = () => {
{/* Header and PageContent */} {/* Header and PageContent */}
<Routes> <Routes>
{Object.entries(pathMapping).map( {Object.entries(pathMapping).map(
([path, {title, lead, component: Component}]) => ( ([path, {component: Component, header: Head}]) => (
<Route <Route
key={path} key={path}
path={path} path={path}
element={ element={
<> <>
{/* <Header title={title || ""} lead={lead || ""} /> */} <Head/>
{/* <Header title={title || ""} lead={lead || ""}/> */}
{/* Page content */} {/* Page content */}
<div className="container-fluid"> <div className="container-fluid">
<div className="row "> <div className="row ">
...@@ -80,10 +80,7 @@ const App = () => { ...@@ -80,10 +80,7 @@ const App = () => {
path="*" path="*"
element={ element={
<> <>
<Header
title="Not Found"
lead="The requested URL was not found on this server."
/>
<NotFound /> <NotFound />
</> </>
} }
......
import { H1 } from './headings.tsx'; /* import { H1 } from './headings.tsx'; */
interface HeaderProps { /* interface HeaderProps {
title: string; title: string;
lead: string; lead: string;
} } */
export function Header({ title, lead }: HeaderProps) { export function Header(/* { title, lead }: HeaderProps */) {
return ( return (
<header className="py-5 mb-5"> <header className="py-5 mb-5">
<div className="container h-100"> <div className="container h-100">
<div className="row h-100 align-items-center"> <div className="row h-100 align-items-center">
<div className="col-lg-12"> <div className="col-lg-12">
<H1 text={title}></H1> {/* <H1 text={title}></H1> */}
<p className="lead mb-5">{lead}</p> {/* <p className="lead mb-5">{lead}</p> */}
</div> </div>
</div> </div>
</div> </div>
......
...@@ -2,6 +2,7 @@ import { MyTimeline } from "../components/My-Timeline"; ...@@ -2,6 +2,7 @@ import { MyTimeline } from "../components/My-Timeline";
import BFHGallery from "../components/photo-grid"; import BFHGallery from "../components/photo-grid";
import BFHpdf from "../components/pdfs"; import BFHpdf from "../components/pdfs";
import { H2} from "../components/headings"; import { H2} from "../components/headings";
import { Header } from "../components/Header";
export function Bfh() { export function Bfh() {
......
...@@ -29,5 +29,18 @@ export * from "./sustainable.tsx"; */ ...@@ -29,5 +29,18 @@ export * from "./sustainable.tsx"; */
export * from "./Bfh.tsx"; export * from "./Bfh.tsx";
export * from "./wiki.tsx"; export * from "./wiki.tsx";
export * from "./impressum.tsx"; export * from "./impressum.tsx";
export * from "../headers/bhf-h.tsx"
export * from "../headers/attribution-h.tsx"
export * from "../headers/cont-h.tsx"
export * from "../headers/desc-h.tsx"
export * from "../headers/home-h.tsx"
export * from "../headers/exp-h.tsx"
export * from "../headers/hp-h.tsx"
export * from "../headers/imp-h.tsx"
export * from "../headers/note-h.tsx"
export * from "../headers/res-h.tsx"
export * from "../headers/safe-h.tsx"
export * from "../headers/team-h.tsx"
export * from "../headers/wiki-h.tsx"
export function ATTH() {
return (
<>
<div className="row">
<div className="col">
</div>
</div>
<div className="row">
</div>
</>
);
}
\ No newline at end of file
export function BFHH() {
return (
<>
<div className="row">
<div className="col">
</div>
</div>
<div className="row">
</div>
</>
);
}
\ No newline at end of file
export function CONTH() {
return (
<>
<div className="row">
<div className="col">
</div>
</div>
<div className="row">
</div>
</>
);
}
\ No newline at end of file
export function DESCH() {
return (
<>
<div className="row">
<div className="col">
</div>
</div>
<div className="row">
</div>
</>
);
}
\ No newline at end of file
export function EXPH() {
return (
<>
<div className="row">
<div className="col">
</div>
</div>
<div className="row">
</div>
</>
);
}
\ No newline at end of file
export function HOMEH() {
return (
<>
<div className="row">
<div className="col">
</div>
</div>
<div className="row">
</div>
</>
);
}
\ No newline at end of file
export function HPH() {
return (
<>
<div className="row">
<div className="col">
</div>
</div>
<div className="row">
</div>
</>
);
}
\ No newline at end of file
export function IMPH() {
return (
<>
<div className="row">
<div className="col">
</div>
</div>
<div className="row">
</div>
</>
);
}
\ No newline at end of file
export function NOTEH() {
return (
<>
<div className="row">
<div className="col">
</div>
</div>
<div className="row">
</div>
</>
);
}
\ No newline at end of file
export function RESH() {
return (
<>
<div className="row">
<div className="col">
</div>
</div>
<div className="row">
</div>
</>
);
}
\ No newline at end of file
export function SAFEH() {
return (
<>
<div className="row">
<div className="col">
</div>
</div>
<div className="row">
</div>
</>
);
}
\ No newline at end of file
export function TEAMH() {
return (
<>
<div className="row">
<div className="col">
</div>
</div>
<div className="row">
</div>
</>
);
}
\ No newline at end of file
export function WIKIH() {
return (
<>
<div className="row">
<div className="col">
</div>
</div>
<div className="row">
</div>
</>
);
}
\ No newline at end of file
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
Impressum Impressum
} from "./contents"; } from "./contents";
import { BFHH, HOMEH, HPH, RESH, ATTH, CONTH, DESCH, EXPH, IMPH, NOTEH, SAFEH, TEAMH, WIKIH } from "./contents";
interface Base { interface Base {
name: string | undefined; name: string | undefined;
} }
...@@ -30,7 +32,7 @@ class Page implements Base { ...@@ -30,7 +32,7 @@ class Page implements Base {
title: string | undefined; title: string | undefined;
path: string | undefined; path: string | undefined;
component: React.FC | undefined; component: React.FC | undefined;
lead: string | undefined; header!: React.FC;
navlist: Array<string> | undefined; navlist: Array<string> | undefined;
} }
...@@ -40,7 +42,7 @@ const Pages: (Page | Folder)[] = [ ...@@ -40,7 +42,7 @@ const Pages: (Page | Folder)[] = [
title: "Bielefeld CeBiTec", title: "Bielefeld CeBiTec",
path: "/", path: "/",
component: Home, component: Home,
lead: "Precision with every breath", header: HOMEH,
navlist: [""], navlist: [""],
}, },
{ {
...@@ -51,7 +53,7 @@ const Pages: (Page | Folder)[] = [ ...@@ -51,7 +53,7 @@ const Pages: (Page | Folder)[] = [
title: "Team", title: "Team",
path: "/team", path: "/team",
component: Team, component: Team,
lead: "On this page you can introduce your team members, instructors, and advisors.", header: TEAMH,
navlist: [""], navlist: [""],
}, },
{ {
...@@ -59,15 +61,15 @@ const Pages: (Page | Folder)[] = [ ...@@ -59,15 +61,15 @@ const Pages: (Page | Folder)[] = [
title: "Attributions", title: "Attributions",
path: "/attributions", path: "/attributions",
component: Attributions, component: Attributions,
lead: "In the iGEM Competition, we celebrate student effort and achievement. The Attributions form helps the judges differentiate between what students accomplished from how their external collaborators supported them. Therefore, teams must clearly explain on the standard Project Attributions form what work they have conducted by themselves and what has been done by others.", header: ATTH,
navlist: [""], navlist: [""],
}, },
{ {
name: "Impressum", name: "Impressum",
title: "Impressum", title: "Impressum",
path: "/impressum", path: "/impressum",
component: Impressum, component: Impressum,
lead: "In the iGEM Competition, we celebrate student effort and achievement. The Attributions form helps the judges differentiate between what students accomplished from how their external collaborators supported them. Therefore, teams must clearly explain on the standard Project Attributions form what work they have conducted by themselves and what has been done by others.", header: IMPH,
navlist: [""], navlist: [""],
}, },
], ],
...@@ -80,7 +82,7 @@ const Pages: (Page | Folder)[] = [ ...@@ -80,7 +82,7 @@ const Pages: (Page | Folder)[] = [
title: "Contribution", title: "Contribution",
path: "/contribution", path: "/contribution",
component: Contribution, component: Contribution,
lead: "Make a useful contribution for future iGEM teams. Use this page to document that contribution.", header: CONTH,
navlist: [""], navlist: [""],
}, },
{ {
...@@ -88,7 +90,7 @@ const Pages: (Page | Folder)[] = [ ...@@ -88,7 +90,7 @@ const Pages: (Page | Folder)[] = [
title: "Project Description", title: "Project Description",
path: "/description", path: "/description",
component: Description, component: Description,
lead: "", header: DESCH,
navlist: ["Abstract", "Cystic Fibrosis", "Our motivation", "Approach", "Delivery", "Our vision", "References"] navlist: ["Abstract", "Cystic Fibrosis", "Our motivation", "Approach", "Delivery", "Our vision", "References"]
}, },
/* { /* {
...@@ -96,7 +98,7 @@ const Pages: (Page | Folder)[] = [ ...@@ -96,7 +98,7 @@ const Pages: (Page | Folder)[] = [
title: "Engineering Success", title: "Engineering Success",
path: "/engineering", path: "/engineering",
component: Engineering, component: Engineering,
lead: "Demonstrate engineering success in a technical aspect of your project by going through at least one iteration of the engineering design cycle. This achievement should be distinct from your Contribution for Bronze.", header: "Demonstrate engineering success in a technical aspect of your project by going through at least one iteration of the engineering design cycle. This achievement should be distinct from your Contribution for Bronze.",
navlist: [""], navlist: [""],
}, */ }, */
{ {
...@@ -104,7 +106,7 @@ const Pages: (Page | Folder)[] = [ ...@@ -104,7 +106,7 @@ const Pages: (Page | Folder)[] = [
title: "Experiments", title: "Experiments",
path: "/experiments", path: "/experiments",
component: Experiments, component: Experiments,
lead: "Describe the research, experiments, and protocols you used in your iGEM project.", header: EXPH,
navlist: [""], navlist: [""],
}, },
{ {
...@@ -112,7 +114,7 @@ const Pages: (Page | Folder)[] = [ ...@@ -112,7 +114,7 @@ const Pages: (Page | Folder)[] = [
title: "Notebook", title: "Notebook",
path: "/notebook", path: "/notebook",
component: Notebook, component: Notebook,
lead: "Document the dates you worked on your project. This should be a detailed account of the work done each day for your project.", header: NOTEH,
navlist: [""], navlist: [""],
}, },
{ {
...@@ -120,7 +122,7 @@ const Pages: (Page | Folder)[] = [ ...@@ -120,7 +122,7 @@ const Pages: (Page | Folder)[] = [
title: "Results", title: "Results",
path: "/results", path: "/results",
component: Results, component: Results,
lead: "You can describe the results of your project and your future plans here.", header: RESH,
navlist: [""], navlist: [""],
}, },
], ],
...@@ -130,7 +132,7 @@ const Pages: (Page | Folder)[] = [ ...@@ -130,7 +132,7 @@ const Pages: (Page | Folder)[] = [
title: "Safety", title: "Safety",
path: "/safety", path: "/safety",
component: Safety, component: Safety,
lead: "Describe all the safety issues of your project.", header: SAFEH,
navlist: [""], navlist: [""],
}, },
{ {
...@@ -138,8 +140,8 @@ const Pages: (Page | Folder)[] = [ ...@@ -138,8 +140,8 @@ const Pages: (Page | Folder)[] = [
title: "Human Practices", title: "Human Practices",
path: "/human-practices", path: "/human-practices",
component: HumanPractices, component: HumanPractices,
lead: "We ask every team to think deeply and creatively about whether their project is responsible and good for the world. Consider how the world affects your work and how your work affects the world.", header: HPH,
navlist: [""], navlist: [""],
}, },
/* { /* {
name: "Awards", name: "Awards",
...@@ -150,7 +152,7 @@ const Pages: (Page | Folder)[] = [ ...@@ -150,7 +152,7 @@ const Pages: (Page | Folder)[] = [
title: "Sustainable Development Goals", title: "Sustainable Development Goals",
path: "/sustainable", path: "/sustainable",
component: Sustainable, component: Sustainable,
lead: "Describe how you have evaluated your project ideas against one or more of the SDGs.", header: "Describe how you have evaluated your project ideas against one or more of the SDGs.",
navlist: [""], navlist: [""],
}, },
], ],
...@@ -163,7 +165,7 @@ const Pages: (Page | Folder)[] = [ ...@@ -163,7 +165,7 @@ const Pages: (Page | Folder)[] = [
title: "BFH European MeetUp", title: "BFH European MeetUp",
path: "/bfh", path: "/bfh",
component: Bfh, component: Bfh,
lead: "MeetUp", header: BFHH,
navlist: [], navlist: [],
}, },
{ {
...@@ -171,7 +173,7 @@ const Pages: (Page | Folder)[] = [ ...@@ -171,7 +173,7 @@ const Pages: (Page | Folder)[] = [
title: "wiki", title: "wiki",
path: "/wiki", path: "/wiki",
component: Wiki, component: Wiki,
lead: "Wiki", header: WIKIH,
navlist: [""], navlist: [""],
}, },
] ]
......
...@@ -6,7 +6,7 @@ export const getPathMapping = () => { ...@@ -6,7 +6,7 @@ export const getPathMapping = () => {
name: string | undefined; name: string | undefined;
title: string | undefined; title: string | undefined;
component: React.FC; component: React.FC;
lead: string | undefined; header: React.FC;
navlist: Array<string> | undefined; navlist: Array<string> | undefined;
}; };
}>((map, item) => { }>((map, item) => {
...@@ -15,7 +15,7 @@ export const getPathMapping = () => { ...@@ -15,7 +15,7 @@ export const getPathMapping = () => {
name: item.name, name: item.name,
title: item.title, title: item.title,
component: item.component, component: item.component,
lead: item.lead, header: item.header,
navlist: item.navlist, navlist: item.navlist,
}; };
} else if ("folder" in item && item.folder) { } else if ("folder" in item && item.folder) {
...@@ -25,7 +25,7 @@ export const getPathMapping = () => { ...@@ -25,7 +25,7 @@ export const getPathMapping = () => {
name: page.name, name: page.name,
title: page.title, title: page.title,
component: page.component, component: page.component,
lead: page.lead, header: page.header,
navlist: page.navlist, navlist: page.navlist,
}; };
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment