Skip to content

Commit

Permalink
Merge pull request #41 from SmartCityFlensburg/feature/add-project-page
Browse files Browse the repository at this point in the history
feat: add project page
  • Loading branch information
choffmann authored Jun 14, 2024
2 parents 90bd930 + ca51257 commit 11bd2b5
Show file tree
Hide file tree
Showing 25 changed files with 374 additions and 426 deletions.
2 changes: 2 additions & 0 deletions .docker/Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions .docker/Dockerfile.prod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions .docker/Dockerfile.stage
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions .docker/nginx.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
server {
listen 80;
listen [::]:80;

location / {
root /usr/share/nginx/html;
try_files $uri $uri/ /index.html;
}
}
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@
"dependencies": {
"@splidejs/react-splide": "^0.7.12",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react-dom": "^18.2.0",
"react-router-dom": "^6.23.1"
},
"devDependencies": {
"@types/react": "^18.2.66",
"@types/react-dom": "^18.2.22",
"@types/react-router-dom": "^5.3.3",
"@typescript-eslint/eslint-plugin": "^7.2.0",
"@typescript-eslint/parser": "^7.2.0",
"@vitejs/plugin-react": "^4.2.1",
Expand Down
3 changes: 3 additions & 0 deletions public/assets/svg/background/general-light-dot.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 32 additions & 0 deletions src/data/processSteps.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
export const steps = [
{
label: "Konzepterstellung",
shortName: "Konzept",
isCurrent: false,
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 Test Test test eiusmod fugiat. Excepteur proident nostrud aliquip esse ut nostrud in ut esse. Proident ut consequat consequat consectetur magna."
},
{
label: "Projektvorstellung 01",
shortName: "Vorstellung 01",
isCurrent: false,
description: "Occaecat in dolor eiusmod fugiat. Excepteur proident nostrud aliquip esse ut nostrud in ut esse. Proident ut consequat consequat consectetur magna."
},
{
label: "Projektvorstellung 02",
shortName: "Vorstellung 02",
isCurrent: false,
description: "Occaecat in dolor eiusmod fugiat. Excepteur proident nostrud aliquip esse ut nostrud in ut esse. Proident ut consequat consequat consectetur magna."
},
{
label: "Finale Vorstellung",
shortName: "Finalisierung",
isCurrent: false,
description: "Occaecat in dolor eiusmod fugiat. Excepteur proident nostrud aliquip esse ut nostrud in ut esse. Proident ut consequat consequat consectetur magna."
},
];
2 changes: 0 additions & 2 deletions src/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ import './css/site.css'
ReactDOM.createRoot(document.getElementById('root')!).render(
<React.StrictMode>
<Header />
<main>
<App />
</main>
<Footer />
</React.StrictMode>,
)
21 changes: 11 additions & 10 deletions src/tsx/App.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
import Faq from "./components/sections/Faq";
import Introduction from "./components/sections/Introduction";
import Process from "./components/sections/Process";
import Stakeholder from "./components/sections/Stakeholder";
import { BrowserRouter, Routes, Route } from "react-router-dom";
import HomePage from "./pages/HomePage";
import ProjectPage from "./pages/ProjectPage";

function App() {
return (
<div>
<Introduction />
<Process />
<Stakeholder />
<Faq />
</div>
<BrowserRouter>
<Routes>
<Route path="/">
<Route index element={<HomePage />} />
<Route path="projekt" element={<ProjectPage />} />
</Route>
</Routes>
</BrowserRouter>
);
}

Expand Down
239 changes: 0 additions & 239 deletions src/tsx/FakeProgress.tsx

This file was deleted.

20 changes: 10 additions & 10 deletions src/tsx/components/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ interface ButtonProps {
}

const Button: React.FC<ButtonProps> = ({ href, children, ariaLabel, isExternalLink = false }) => {
return (
<a
href={href}
aria-label={ariaLabel}
target={isExternalLink ? '_blank' : '_self'}
className="flex items-center justify-center gap-x-4 rounded-2xl w-max font-semibold px-5 py-2 bg-transparent border border-white text-white group transition-color ease-in-out duration-300 hover:bg-green-light-900 hover:border-green-light-900"
>
{children}
</a>
);
return (
<a
href={href}
aria-label={ariaLabel}
target={isExternalLink ? '_blank' : '_self'}
className="flex items-center justify-center gap-x-4 rounded-2xl w-max font-semibold px-5 py-2 bg-transparent border border-white text-white group transition-color ease-in-out duration-300 hover:bg-green-light-900 hover:border-green-light-900"
>
{children}
</a>
);
};

export default Button;
Loading

0 comments on commit 11bd2b5

Please sign in to comment.