Skip to content

Commit

Permalink
bugs fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
kami2016 committed Jul 2, 2024
1 parent f7b937f commit 29ebbbd
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 40 deletions.

Large diffs are not rendered by default.

40 changes: 20 additions & 20 deletions dist/assets/index.e2077773.js → dist/assets/index.cfb00b33.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<title>Buero Vatter</title>


<script type="module" crossorigin src="/bv2024_frontend/assets/index.e2077773.js"></script>
<link rel="stylesheet" href="/bv2024_frontend/assets/index.6c7059f1.css">
<script type="module" crossorigin src="/bv2024_frontend/assets/index.cfb00b33.js"></script>
<link rel="stylesheet" href="/bv2024_frontend/assets/index.ce5442da.css">
</head>
<body>
<!-- landing page news -->
Expand Down
16 changes: 11 additions & 5 deletions src/components/SelectedProjectList.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,29 @@ import { Link } from "react-router-dom";
import { deUmlaut } from "../utils/helpers";
import symbol_arrowright from "../assets/imgs/symbols/arrow-right.svg";
import styles from "./selectedprojectlist.module.css";
import DOMPurify from "dompurify";

const SelectedProjectList = (prop) => {
const title = deUmlaut(prop.detail.title.rendered);

return (
<div>
<Container className={`${styles.project_list}`}>
<Row className={`${styles.project_row}`}>
<Link
className={`${styles.selected_projects_list_link}`}
state={prop.detail}
to={`/Projekte/Projekt/${title}`}
to={`/Projekte/Projekt/${prop.detail.slug}`}
>
<div className={`d-flex justify-content-between`}>
<ul className="mb-0">
<li className={`${styles.text_break}`}>
{prop.detail.title.rendered} ({prop.detail.acf.Jahr})
</li>
<li
className={`${styles.text_break}`}
dangerouslySetInnerHTML={{
__html: DOMPurify.sanitize(
`${prop.detail.title.rendered} (${prop.detail.acf.Jahr})`,
),
}}
></li>
</ul>
<img
src={symbol_arrowright}
Expand Down
9 changes: 0 additions & 9 deletions src/pages/Home/Home.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,6 @@ const Home = () => {
</Container>

<Container className="text-end">
{/* <span className={`${styles.current_projects}`}>
<Link to="/Projekte/laufend">
<span className={`${styles.laufend_project_btn_text}`}>
Laufende Projekte
</span>
<img src={symbol_goto} alt="Laufende Projekte" height="28px"></img>
</Link>
</span> */}

<Link to="/Projekte/laufend">
<button className={`${styles.laufend_project_btn}`}>
<span className={`${styles.laufend_project_btn_text}`}>
Expand Down
7 changes: 6 additions & 1 deletion src/pages/Home/NewsComp.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ const NewsComp = () => {
<div id="landing_news">
{news.data.map((artikel) => (
<div key={artikel.id}>
<div className={`${styles.news_title}`}>{artikel.title.rendered}</div>
<div
className={`${styles.news_title}`}
dangerouslySetInnerHTML={{
__html: DOMPurify.sanitize(artikel.title.rendered),
}}
></div>
<div className={`${styles.news_date}`}>
{formatDate(artikel.date.slice(0, 10))}
</div>
Expand Down
10 changes: 8 additions & 2 deletions src/pages/Projects/Project.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import arrowrightpic from "../../assets/imgs/symbols/arrow-right.svg";
import { Link } from "react-router-dom";
import { deUmlaut } from "../../utils/helpers";
import styles from "./projects.module.css";
import DOMPurify from "dompurify";

const Project = (prop) => {
const title = deUmlaut(prop.title);
Expand Down Expand Up @@ -36,11 +37,16 @@ const Project = (prop) => {

<Link
className={`${styles.project_list_btn}`}
to={`/Projekte/Projekt/${title}`}
to={`/Projekte/Projekt/${prop.detail.slug}`}
state={prop.detail}
>
<div className="d-flex justify-content-between">
<div className={`${styles.list_title}`}>{prop.title}</div>
<div
className={`${styles.list_title}`}
dangerouslySetInnerHTML={{
__html: DOMPurify.sanitize(prop.title),
}}
></div>

<img
className={`${styles.project_list_arrow}`}
Expand Down
1 change: 1 addition & 0 deletions src/pages/Staffs/Staffs.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const Staffs = () => {
if (staffs.isError || staff_intro.isError) {
navigate("/NotMatch404");
}

return (
<div>
<Container className="categoryTitle">ÜBER UNS</Container>
Expand Down

0 comments on commit 29ebbbd

Please sign in to comment.