Skip to content

Commit

Permalink
bugs fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
kami2016 committed Jul 1, 2024
1 parent fbc7c43 commit 86f5d41
Show file tree
Hide file tree
Showing 33 changed files with 337 additions and 196 deletions.
89 changes: 89 additions & 0 deletions dist/assets/index.7c1d2f30.js

Large diffs are not rendered by default.

89 changes: 0 additions & 89 deletions dist/assets/index.fe006c94.js

This file was deleted.

2 changes: 1 addition & 1 deletion dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<title>Buero Vatter</title>


<script type="module" crossorigin src="/bv2024_frontend/assets/index.fe006c94.js"></script>
<script type="module" crossorigin src="/bv2024_frontend/assets/index.7c1d2f30.js"></script>
<link rel="stylesheet" href="/bv2024_frontend/assets/index.b4cff134.css">
</head>
<body>
Expand Down
4 changes: 4 additions & 0 deletions src/assets/imgs/symbols/arrow-left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/assets/imgs/symbols/arrow-right.png
Binary file not shown.
4 changes: 4 additions & 0 deletions src/assets/imgs/symbols/arrow-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/imgs/symbols/undo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions src/assets/styles/global_styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ body {
box-shadow: rgba(0, 0, 0, 0.25) 0px 4px 4px;
font-family: 'Barlow Condensed', sans-serif;
font-size: 24px;
font-weight: 500;
font-weight: 600;
border: #fff;
max-width: 350px;
width: 100%;
Expand All @@ -191,6 +191,7 @@ body {
text-align: center;
color: #000000;
justify-content: center;
text-transform: capitalize;
line-height: 30px;
border-radius: 0;
transition-property: background-color;
Expand Down Expand Up @@ -229,7 +230,7 @@ input#titleName {
font-family: 'Karla', sans-serif;
font-weight: 400;
color: #525151;
width: 85%;
width: 83%;
}

input#titleName:focus {
Expand Down
8 changes: 3 additions & 5 deletions src/components/SelectedProjectList.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Container from "react-bootstrap/Container";
import Row from "react-bootstrap/Row";
import { Link } from "react-router-dom";
import { deUmlaut } from "../utils/helpers";
import symbol_arrowright from "../assets/imgs/symbols/arrow-right.png";
import symbol_arrowright from "../assets/imgs/symbols/arrow-right.svg";
import styles from "./selectedprojectlist.module.css";
const SelectedProjectList = (prop) => {
const title = deUmlaut(prop.detail.title.rendered);
Expand All @@ -16,10 +16,8 @@ const SelectedProjectList = (prop) => {
state={prop.detail}
to={`/Projekte/Projekt/${title}`}
>
<div
className={`d-flex justify-content-between ${styles.selected_projects_list}`}
>
<ul>
<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>
Expand Down
4 changes: 2 additions & 2 deletions src/components/selectedprojectlist.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
color: #C00000;
}

.selected_projects_list {
/* .selected_projects_list {
min-height: 40px;
}
} */

.selected_projects_list_link {
color: #000000;
Expand Down
55 changes: 40 additions & 15 deletions src/pages/Contact/Contact.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,28 @@ import Container from "react-bootstrap/Container";
import Row from "react-bootstrap/Row";
import Col from "react-bootstrap/Col";
import location from "../../assets/imgs/map.png";
import { Link } from "react-router-dom";
import styles from "./contact.module.css";
import { useQuery } from "@tanstack/react-query";
import fetchData from "../../utils/fetchData";
import Spinner from "../Others/Spinner";
import { useNavigate } from "react-router-dom";
import DOMPurify from "dompurify";

const Contact = () => {
const navigate = useNavigate();
//29060 is id of post
const addr_intro = useQuery(
["Wegbeschreibung", "pages/29060", ""],
fetchData,
);
//29064 is id of media
const media = useQuery(["staff_pic", `media`, 29064], fetchData);
if (media.isLoading || addr_intro.isLoading) {
return <Spinner></Spinner>;
}
if (media.isError || addr_intro.isError) {
navigate("/NotMatch404");
}
return (
<div>
<Container className="categoryTitle">KONTAKT</Container>
Expand All @@ -24,10 +43,17 @@ const Contact = () => {
</div>
<br></br>
<div className={`${styles.contact_info}`}>
<a href={`tel:+41 31 312 65 75`}>+41 31 312 65 75</a>
<a
href={`tel:+41 31 312 65 75`}
className={` ${styles.tel_info} `}
>
+41 31 312 65 75
</a>
</div>
<br></br>
<div className={`${styles.contact_info}`}>
<div
className={`${styles.contact_info} ${styles.text_underline}`}
>
<a href={`mailto:[email protected]`}>[email protected]</a>
</div>
<br></br>
Expand All @@ -42,9 +68,12 @@ const Contact = () => {
</a>
</Col>
<Col>
<Link to="" className={`${styles.addr_info}`}>
<a
href={media.data.source_url}
className={`${styles.addr_info}`}
>
Printable Map
</Link>
</a>
</Col>
</Row>
</div>
Expand All @@ -56,18 +85,14 @@ const Contact = () => {
</Row>

<div className={`${styles.contact_addr_title}`}>
{/* TODO: get text below from restapi*/}
Wegbeschreibung ab Bahnhof Bern
</div>
<p className={`${styles.contact_addr_detail}`}>
{/* TODO: get text below from restapi*/}
Bus Nr. 12 Richtung Zentrum Paul Klee benützen, bis Haltestelle
Nydegg. <br></br>
In Fahrtrichtung einige Meter weiter gehen, vor der Nydeggbrücke
rechts via Nydeggtreppe in die Gerberngasse, dort rechts. Die Nr. 27
befindet sich ca. 300 m weiter auf der linken Seite. <br></br>
Der Eingang befindet sich an der Frontseite, gegenüber dem Brunnen.
</p>
<p
className={`${styles.contact_addr_detail}`}
dangerouslySetInnerHTML={{
__html: DOMPurify.sanitize(addr_intro.data.content.rendered),
}}
></p>
<br />
</Container>
</div>
Expand Down
10 changes: 10 additions & 0 deletions src/pages/Contact/contact.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,16 @@
font-weight: 400;
}

.tel_info {}

a:link.tel_info {
color: black;
}

a:link:hover.tel_info {
color: #C00000;
}

.text_underline {
color: #C00000;
text-decoration: underline;
Expand Down
27 changes: 19 additions & 8 deletions src/pages/Home/Home.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import { useQuery } from "@tanstack/react-query";
import fetchData from "../../utils/fetchData";
import DOMPurify from "dompurify";
import Spinner from "../Others/Spinner";
import symbol_goto from "../../assets/imgs/symbols/arrow-right.png";
import symbol_goto from "../../assets/imgs/symbols/arrow-right.svg";
import styles from "./home.module.css";
const Home = () => {
const navigate = useNavigate();

const services = useQuery(["services", "dienstleistungen", ""], fetchData);

//28911 is id of post
const landing_intro = useQuery(
["landingIntro", "pages/28911", ""],
fetchData,
Expand Down Expand Up @@ -40,12 +40,23 @@ const Home = () => {
<NewsComp></NewsComp>
</Container>

<Container>
<Link to="/Projekte/laufend" className={`${styles.current_projects}`}>
<span>
Laufende Projekte
<img src={symbol_goto} alt="Laufende Projekte" height="24px"></img>
</span>
<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}`}>
Laufende Projekte
</span>
<img src={symbol_goto} alt="Laufende Projekte" height="28px"></img>
</button>
</Link>
</Container>
</div>
Expand Down
3 changes: 2 additions & 1 deletion src/pages/Home/NewsComp.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { useNavigate } from "react-router-dom";
import { useQuery } from "@tanstack/react-query";
import fetchData from "../../utils/fetchData";
import styles from "./newscomp.module.css";
import { formatDate } from "../../utils/helpers";
const NewsComp = () => {
const navigate = useNavigate();

Expand All @@ -21,7 +22,7 @@ const NewsComp = () => {
<div key={artikel.id}>
<div className={`${styles.news_title}`}>{artikel.title.rendered}</div>
<div className={`${styles.news_date}`}>
{artikel.date.slice(0, 10)}
{formatDate(artikel.date.slice(0, 10))}
</div>
<div
className={`${styles.news_content}`}
Expand Down
17 changes: 13 additions & 4 deletions src/pages/Home/home.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,23 @@
text-align: left;
}

.current_projects {
.laufend_project_btn {
border: 2px solid transparent;
background-color: white;
}

.laufend_project_btn:hover {
border-bottom: 2px solid #C00000;
}

.laufend_project_btn_text {
font-family: 'Barlow Condensed', sans-serif;
font-size: 24px;
font-weight: 600;
display: flex;
justify-content: end;
margin-bottom: 40px;
color: #C00000;
vertical-align: middle;
padding-right: 5px;
margin-bottom: 40px;
}

/* .link_to_current_projects {
Expand Down
10 changes: 1 addition & 9 deletions src/pages/Home/servicetab.module.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.home_service_content {
margin-top: 20px;
/* margin-top: 20px; */
}

.home_service_box {
Expand All @@ -11,12 +11,4 @@
.home_service_row {
padding-bottom: 20px;
--bs-gutter-x: 2.5rem;
}

@media (min-width:768px) and (width:991.98px) {
.home_service_box {
margin-bottom: 20px;
}


}
6 changes: 3 additions & 3 deletions src/pages/Others/DataProtection.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const DateProtection = () => {
Schweiz
<br></br>
<span className={`${styles.email_data_protection}`}>E-Mail</span>:
[email protected]
<a href={`mailto:[email protected]`}>[email protected]</a>
<br></br> <br></br>
<div className={`${styles.title_data_protection}`}>
Vertretungsberechtigte Person
Expand All @@ -40,9 +40,9 @@ const DateProtection = () => {
</div>
Christian Rüefli
<br></br>
Tel +(0)31 312 65 75
Tel +31 312 65 75
<br></br>
[email protected]
<a href={`mailto:[email protected]`}>[email protected]</a>
<br></br> <br></br>
<div className={`${styles.title_data_protection}`}>Allgemein</div>
Gestützt auf Artikel 13 der Schweizerischen Bundesverfassung und die
Expand Down
4 changes: 2 additions & 2 deletions src/pages/Others/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const Header = () => {
expand="lg"
className="fixed-top bg-white navbar-light flex-nowrap"
>
<Container className="align-items-end">
<Container className="align-items-end p-0">
<Navbar.Brand id="logo_nav_container">
<Link to="/" className="navbar-brand">
<img
Expand Down Expand Up @@ -56,7 +56,7 @@ const Header = () => {
<Offcanvas.Title id="offcanvasNavbar-expand-lg"></Offcanvas.Title>
</Offcanvas.Header>
<Offcanvas.Body className="justify-content-end mb-2">
<Nav className="navbar_column nav-item">
<Nav className="navbar_column nav-item">
<NavLink
reloaddocument="true"
className="nav-link"
Expand Down
8 changes: 5 additions & 3 deletions src/pages/Others/Imprint.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@ const Imprint = () => {
<div className={`${styles.contact_info}`}>Gerberngasse 27</div>
<div className={`${styles.contact_info}`}>CH-3011 Bern</div>
<br></br>
<div className={`${styles.contact_info}`}>Tel +41(0)31 312 65 75</div>
<div className={`${styles.contact_info}`}>+41 31 312 65 75</div>
<br></br>
<div className={`${styles.contact_info} ${styles.email_link}`}>
[email protected]
<div
className={`${styles.contact_info} ${styles.text_underline} ${styles.email_link}`}
>
<a href={`mailto:[email protected]`}>[email protected]</a>
</div>
</Container>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Others/TitlePictureComp.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const TitlePictureComp = ({ page }) => {
}}
>
<div className={`${styles.caption}`}>
<div>{msg}</div>
<div className=" fluid container p-0 ">{msg}</div>
</div>
</div>
);
Expand Down
6 changes: 6 additions & 0 deletions src/pages/Others/titlepicturecomp.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,10 @@
font-weight: 600;
height: 45px;
padding-right: 0.5em;
}

@media (max-width:340px) {
.caption {
padding-right: 5px;
}
}
2 changes: 1 addition & 1 deletion src/pages/Projects/Project.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Row from "react-bootstrap/Row";
import Col from "react-bootstrap/Col";
import laufendpic from "../../assets/imgs/symbols/laufend.png";
import fertigpic from "../../assets/imgs/symbols/finished.png";
import arrowrightpic from "../../assets/imgs/symbols/arrow-right.png";
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";
Expand Down
Loading

0 comments on commit 86f5d41

Please sign in to comment.