Merge branch 'develop' into feature/add-dashboard-section

.docker/Dockerfile.dev

@@ -9,6 +9,8 @@ RUN yarn build:dev
 
 
 FROM nginx:latest
+RUN rm /etc/nginx/conf.d/default.conf
+COPY .docker/nginx.conf /etc/nginx/conf.d/
 COPY --from=builder-web /app/build/dist /usr/share/nginx/html
 
 EXPOSE 80

.docker/Dockerfile.prod

@@ -9,6 +9,8 @@ RUN yarn build
 
 
 FROM nginx:latest
+RUN rm /etc/nginx/conf.d/default.conf
+COPY .docker/nginx.conf /etc/nginx/conf.d/
 COPY --from=builder-web /app/build/dist /usr/share/nginx/html
 
 EXPOSE 80

.docker/Dockerfile.stage

@@ -9,6 +9,8 @@ RUN yarn build:stage
 
 
 FROM nginx:latest
+RUN rm /etc/nginx/conf.d/default.conf
+COPY .docker/nginx.conf /etc/nginx/conf.d/
 COPY --from=builder-web /app/build/dist /usr/share/nginx/html
 
 EXPOSE 80

.docker/nginx.conf

@@ -0,0 +1,9 @@
+server {
+    listen       80;
+    listen  [::]:80;
+
+    location / {
+        root   /usr/share/nginx/html;
+        try_files $uri $uri/ /index.html;
+    }
+}

k8s/values/develop.yaml

@@ -5,7 +5,7 @@ deployment:
   image:
     repository: ghcr.io/smartcityflensburg/project-website-dev
     pullPolicy: Always
-    tag: "b3f7098"
+    tag: "11bd2b5"
 ingress:
   enabled: true
   className: "traefik"

src/data/processSteps.tsx → src/data/processSteps.ts

@@ -3,13 +3,13 @@ export const steps = [
         label: "Konzepterstellung",
         shortName: "Konzept",
         isCurrent: false,
-        description: "Occaecat in dolor eiusmod fugiat. Excepteur proident nostrud aliquip esse ut nostrud in ut esse. Proident ut consequat consequat consectetur magna."
+        description: "Duis proident veniam minim et labore sit ex laboris consequat ea mollit et. Aute ut fugiat ex commodo voluptate nulla esse esse adipisicing fugiat aliqua aliquip nisi. Eu adipisicing nulla culpa velit fugiat ipsum nostrud elit et cupidatat voluptate pariatur in. Ut consequat magna quis culpa est magna. Mollit proident nostrud sint labore voluptate ullamco minim magna laborum commodo sint est. Dolor proident mollit nostrud aute elit quis incididunt reprehenderit mollit ea magna commodo reprehenderit exercitation. Elit ipsum voluptate ullamco exercitation ut reprehenderit labore voluptate sint reprehenderit qui. Cillum occaecat aliquip ea quis tempor incididunt ad non."
     },
     {
         label: "MVP (Minimum Valible Product)",
         shortName: "MVP",
         isCurrent: true,
-        description: "Occaecat in dolor eiusmod fugiat. Excepteur proident nostrud aliquip esse ut nostrud in ut esse. Proident ut consequat consequat consectetur magna."
+        description: "Occaecat in dolor Test Test test eiusmod fugiat. Excepteur proident nostrud aliquip esse ut nostrud in ut esse. Proident ut consequat consequat consectetur magna."
     },
     {
         label: "Projektvorstellung 01",

src/tsx/App.tsx

@@ -2,7 +2,7 @@ import { BrowserRouter, Routes, Route } from "react-router-dom";
 import HomePage from "./pages/HomePage";
 import ProjectPage from "./pages/ProjectPage";
 
-export default function App() {
+function App() {
   return (
     <BrowserRouter>
       <Routes>
@@ -14,3 +14,5 @@ export default function App() {
     </BrowserRouter>
   );
 }
+
+export default App;

src/tsx/components/sections/Hero.tsx

@@ -19,7 +19,7 @@ const Hero: React.FC<HeroProps> = ({ headline, description, type }) => {
     }
 
     return (
-        <section className={`relative overflow-x-hidden before:bg-cover before:w-4/5 before:h-full before:absolute before:-right-4 before:-top-16 before:-z-10 before:bg-no-repeat before:bg-left-top sm:before:-right-10 xl:before:bg-contain xl:before:bg-center
+        <section className={`relative overflow-hidden before:bg-cover before:w-4/5 before:h-[100vh] before:max-h-[45rem] before:absolute before:-right-4 before:-top-16 before:-z-10 before:bg-no-repeat sm:before:-right-10 lg:before:max-h-[55rem] xl:before:w-[70rem] xl:before:-right-40 2xl:before:right-[10%] 2xl:before:bg-contain
             ${type === 'project' ? 'before:bg-background-light-dot' : ''}`}
         >
             <div className="py-28 px-4 max-w-208 mx-auto md:px-6 lg:py-36 xl:py-44 xl:max-w-screen-lg">