From bbca5e93f70f13bf323e885a4dc7ac212f9b09de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dorien=20Gr=C3=B6nwald?= Date: Fri, 14 Jun 2024 09:24:14 +0200 Subject: [PATCH 1/3] fix: implement feedback --- src/data/{processSteps.tsx => processSteps.ts} | 4 ++-- src/tsx/App.tsx | 4 +++- src/tsx/components/Hero.tsx | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) rename src/data/{processSteps.tsx => processSteps.ts} (55%) diff --git a/src/data/processSteps.tsx b/src/data/processSteps.ts similarity index 55% rename from src/data/processSteps.tsx rename to src/data/processSteps.ts index 784a651..25e8610 100644 --- a/src/data/processSteps.tsx +++ b/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", diff --git a/src/tsx/App.tsx b/src/tsx/App.tsx index 7bc7562..58e83cb 100644 --- a/src/tsx/App.tsx +++ b/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 ( @@ -14,3 +14,5 @@ export default function App() { ); } + +export default App; diff --git a/src/tsx/components/Hero.tsx b/src/tsx/components/Hero.tsx index 69a960f..e07db8a 100644 --- a/src/tsx/components/Hero.tsx +++ b/src/tsx/components/Hero.tsx @@ -19,7 +19,7 @@ const Hero: React.FC = ({ headline, description, type }) => { } return ( -
From ca512573f53c128dca2a5143709af8b2bb41f621 Mon Sep 17 00:00:00 2001 From: Cedrik Hoffmann Date: Fri, 14 Jun 2024 13:29:10 +0200 Subject: [PATCH 2/3] ci: fix subpath in nginx --- .docker/Dockerfile.dev | 2 ++ .docker/Dockerfile.prod | 2 ++ .docker/Dockerfile.stage | 2 ++ .docker/nginx.conf | 9 +++++++++ 4 files changed, 15 insertions(+) create mode 100644 .docker/nginx.conf diff --git a/.docker/Dockerfile.dev b/.docker/Dockerfile.dev index 278f1c9..baa0853 100644 --- a/.docker/Dockerfile.dev +++ b/.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 diff --git a/.docker/Dockerfile.prod b/.docker/Dockerfile.prod index 8ecb330..afa2219 100644 --- a/.docker/Dockerfile.prod +++ b/.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 diff --git a/.docker/Dockerfile.stage b/.docker/Dockerfile.stage index 92723fc..6df8617 100644 --- a/.docker/Dockerfile.stage +++ b/.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 diff --git a/.docker/nginx.conf b/.docker/nginx.conf new file mode 100644 index 0000000..06f4b36 --- /dev/null +++ b/.docker/nginx.conf @@ -0,0 +1,9 @@ +server { + listen 80; + listen [::]:80; + + location / { + root /usr/share/nginx/html; + try_files $uri $uri/ /index.html; + } +} From 85a9c006690ca2aaec62e2cc2f93700e3e60d904 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 14 Jun 2024 11:36:11 +0000 Subject: [PATCH 3/3] Update dev image to commit 11bd2b5 --- k8s/values/develop.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/values/develop.yaml b/k8s/values/develop.yaml index 89aebe3..e53e8ff 100644 --- a/k8s/values/develop.yaml +++ b/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"