Skip to content

Commit

Permalink
Merge branch 'develop' into feature/add-background-to-sections
Browse files Browse the repository at this point in the history
  • Loading branch information
Dorien Grönwald committed Jun 24, 2024
2 parents eca9754 + 2b170c8 commit ab99a1c
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 14 deletions.
2 changes: 1 addition & 1 deletion k8s/values/develop.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ deployment:
image:
repository: ghcr.io/smartcityflensburg/project-website-dev
pullPolicy: Always
tag: "93c5868"
tag: "bc201bc"
ingress:
enabled: true
className: "traefik"
Expand Down
5 changes: 5 additions & 0 deletions src/tsx/pages/ContactPage.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
import { useEffect } from 'react';
import ContactHeroContent from "../components/hero/ContactHeroContent";
import Hero from "../components/sections/Hero";
import Stakeholder from "../components/sections/Stakeholder";

function ContactPage() {
useEffect(() => {
document.title = "Kontakt | Green Ecolution | Smartes Grünflächenmanagement";
}, []);

const heroHeadline = "Noch neugierig?";
const heroDescription = "Eu elit quis eiusmod proident officia aute tempor tempor qui commodo aute qui. Excepteur id ea laboris fugiat dolor exercitation ut pariatur ut commodo non. Eu deserunt laboris dolore elit. Aliquip magna do nostrud velit esse anim do. Dolor culpa duis laboris nisi ea nulla nulla magna"

Expand Down
31 changes: 18 additions & 13 deletions src/tsx/pages/HomePage.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { useEffect } from 'react';
import Contact from "../components/sections/Contact";
import HompageHero from "../components/homepage/HomepageHero";
import HomepageDevider from "../components/homepage/HomepageDevider";
Expand All @@ -7,19 +8,23 @@ import Process from "./../components/sections/Process";
import Stakeholder from "./../components/sections/Stakeholder";

function HomePage() {
return (
<main>
<HompageHero />
<HomepageDevider />
<Introduction />
<Process />
<div className="relative overflow-x-hidden before:bg-cover before:bg-background-light-dot before:w-[90%] before:h-[120vh] before:absolute before:-right-4 before:top-8 before:-z-10 before:bg-no-repeat sm:before:-right-[5%] xl:before:w-[90rem] 2xl:before:right-[10%] 2xl:before:bg-contain 3xl:before:right-[20%]">
<Stakeholder />
<Faq />
</div>
<Contact spacingTop={false}/>
</main>
);
useEffect(() => {
document.title = "Startseite | Green Ecolution | Smartes Grünflächenmanagement";
}, []);

return (
<main>
<HompageHero />
<HomepageDevider />
<Introduction />
<Process />
<div className="relative overflow-hidden before:bg-cover before:bg-background-light-dot before:w-[90%] before:h-[120vh] before:max-w-[60rem] before:absolute before:-right-4 before:top-8 before:-z-10 before:bg-no-repeat sm:before:-right-[5%] 2xl:before:w-[90rem] 2xl:before:max-w-[90rem] 2xl:before:right-[10%] 2xl:before:bg-contain 3xl:before:right-[20%]">
<Stakeholder />
<Faq />
<Contact />
</div>
</main>
);
}

export default HomePage;
5 changes: 5 additions & 0 deletions src/tsx/pages/ProjectPage.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
import { useEffect } from 'react';
import Advantages from "../components/sections/Advantages";
import DashboardPreview from "../components/sections/DashboardPreview";
import Hero from "../components/sections/Hero";
import Contact from "../components/sections/Contact";
import ProjectHeroContent from "../components/hero/ProjectHeroContent";

function ProjectPage() {
useEffect(() => {
document.title = "Projekt | Green Ecolution | Smartes Grünflächenmanagement";
}, []);

const heroHeadline = "Alles wissenswerte über das Projekt";
const heroDescription = "Eu elit quis eiusmod proident officia aute tempor tempor qui commodo aute qui. Excepteur id ea laboris fugiat dolor exercitation ut pariatur ut commodo non. Eu deserunt laboris dolore elit. Aliquip magna do nostrud velit esse anim do. Dolor culpa duis laboris nisi ea nulla nulla magna"

Expand Down

0 comments on commit ab99a1c

Please sign in to comment.