Skip to content

Commit

Permalink
folder structure re-organized
Browse files Browse the repository at this point in the history
  • Loading branch information
kami2016 committed May 27, 2024
1 parent b73f251 commit dd33d09
Show file tree
Hide file tree
Showing 132 changed files with 142 additions and 107 deletions.
22 changes: 3 additions & 19 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,13 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />

<title>Buero Vatter</title>
<link rel="stylesheet" href="./css/bootstrap.min.css" />
<link rel="stylesheet" href="./css/styles.css" />
<!-- TODO: font related links (will be replaced by local font files) -->
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=Barlow+Condensed:wght@300;400;500;600&family=Karla&display=swap"
rel="stylesheet"
/>
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=Barlow+Condensed:wght@500&family=Karla&display=swap"
rel="stylesheet"
/>
<link rel="stylesheet" href="./src/assets/styles/bootstrap.min.css" />
<link rel="stylesheet" href="./src/assets/styles/global_styles.css" />
</head>
<body>
<!-- landing page news -->
<div id="root"></div>
<script type="module" src="./js/App.jsx"></script>
<script type="module" src="./src/App.jsx"></script>
</body>
</html>
26 changes: 13 additions & 13 deletions js/App.jsx → src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import { createRoot } from "react-dom/client";
import { HashRouter, Routes, Route } from "react-router-dom";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import Home from "./Home";
import Services from "./Services";
import Staffs from "./Staffs";
import StaffDetail from "./StaffDetail";
import Topics from "./Topics";
import Projects from "./Projects";
import Contact from "./Contact";
import NoMatch404 from "./NoMatch404";
import Imprint from "./Imprint";
import DataProtection from "./DataProtection";
import Header from "./Header";
import Footer from "./Footer";
import ProjectDetail from "./ProjectDetail";
import Home from "./pages/Home/Home";
import Services from "./pages/Services/Services";
import Staffs from "./pages/Staffs/Staffs";
import StaffDetail from "./pages/Staffs/StaffDetail";
import Topics from "./pages/Topics/Topics";
import Projects from "./pages/Projects/Projects";
import Contact from "./pages/Contact/Contact";
import NoMatch404 from "./pages/Others/NoMatch404";
import Imprint from "./pages/Others/Imprint";
import DataProtection from "./pages/Others/DataProtection";
import Header from "./pages/Others/Header";
import Footer from "./pages/Others/Footer";
import ProjectDetail from "./pages/Projects/ProjectDetail";
const queryClient = new QueryClient({
defautlOptions: {
queries: {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
67 changes: 59 additions & 8 deletions css/styles.css → src/assets/styles/global_styles.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,62 @@
body {
overflow: scroll;
overflow-x: hidden;
/* || General styles */

/* || Typography */
/*Font 1 : Barlow Condensed*/
/* Regular Weight */
@font-face {
font-family: "Barlow Condensed";
src: url("../fonts/Barlow_Condensed/BarlowCondensed-Regular.ttf");
font-weight: 400;
}

/* SemiBold (600) Weight */
@font-face {
font-family: "Barlow Condensed";
src: url("../fonts/Barlow_Condensed/BarlowCondensed-SemiBold.ttf");
font-weight: 600;
}

/* Medium Weight */
@font-face {
font-family: 'Barlow Condensed';
src: local('Barlow Condensed'), url();
font-family: "Barlow Condensed";
src: url("../fonts/Barlow_Condensed/BarlowCondensed-Medium.ttf");
font-weight: 500;
}

/* Light Weight */
@font-face {
font-family: "Barlow Condensed";
src: url("../fonts/Barlow_Condensed/BarlowCondensed-Light.ttf");
font-weight: 300;
}


/*Font 2 : Karla */
/* Regular Weight */
@font-face {
font-family: "Karla";
src: url("../fonts/Karla/static/Karla-Regular.ttf");
font-weight: 400;
}

/* Medium Weight */
@font-face {
font-family: "Karla";
src: url("../fonts/Karla/static/Karla-Medium.ttf");
font-weight: 500;
}


/* Light Weight */
@font-face {
font-family: "Karla";
src: url("../fonts/Karla/static/Karla-Light.ttf");
font-weight: 300;
}

body {
overflow: scroll;
overflow-x: hidden;
}

#root {
Expand Down Expand Up @@ -750,7 +801,7 @@ a#download_list {
color: #fff;
font-family: 'Barlow Condensed', sans-serif;
font-size: 32px;
font-weight: 800;
font-weight: 600;
height: 45px;
}

Expand Down Expand Up @@ -780,13 +831,13 @@ a#download_list {
#newsdate {
font-family: 'Barlow Condensed', sans-serif;
font-size: 20px;
font-weight: 400;
font-weight: 500;
}

#newscontent {
font-family: 'Karla', sans-serif;
font-size: 20px;
font-weight: 300;
font-weight: 400;
}

hr {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import Container from "react-bootstrap/Container";
import Row from "react-bootstrap/Row";
import { Link } from "react-router-dom";
import { deUmlaut } from "./helpers";
import symbol_arrowright from "../imgs/symbols/arrow-right.png";
import { deUmlaut } from "../utils/helpers";
import symbol_arrowright from "../assets/imgs/symbols/arrow-right.png";
const SelectedProjectList = (prop) => {
const title = deUmlaut(prop.detail.title.rendered);

Expand Down
2 changes: 1 addition & 1 deletion js/Contact.jsx → src/pages/Contact/Contact.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Container from "react-bootstrap/Container";
import Row from "react-bootstrap/Row";
import Col from "react-bootstrap/Col";
import location from "../imgs/map.png";
import location from "../../assets/imgs/map.png";
import { Link } from "react-router-dom";
const Contact = () => {
return (
Expand Down
8 changes: 4 additions & 4 deletions js/Home.jsx → src/pages/Home/Home.jsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import NewsComp from "./NewsComp";
import Container from "react-bootstrap/Container";
import ServicePicComp from "./ServicePicComp";
import ServicePicComp from "../Services/ServicePicComp";
import Row from "react-bootstrap/Row";
import Col from "react-bootstrap/Col";
import { Link, useNavigate } from "react-router-dom";
import { useQuery } from "@tanstack/react-query";
import fetchData from "./fetchData";
import fetchData from "../../utils/fetchData";
import DOMPurify from "dompurify";
import Spinner from "./Spinner";
import symbol_goto from "../imgs/symbols/arrow-right.png";
import Spinner from "../Others/Spinner";
import symbol_goto from "../../assets/imgs/symbols/arrow-right.png";
const Home = () => {
const navigate = useNavigate();

Expand Down
4 changes: 2 additions & 2 deletions js/NewsComp.jsx → src/pages/Home/NewsComp.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import DOMPurify from "dompurify";
import Spinner from "./Spinner";
import Spinner from "../Others/Spinner";
import { useNavigate } from "react-router-dom";
import { useQuery } from "@tanstack/react-query";
import fetchData from "./fetchData";
import fetchData from "../../utils/fetchData";
const NewsComp = () => {
const navigate = useNavigate();

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion js/Footer.jsx → src/pages/Others/Footer.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { React } from "react";
import { Link } from "react-router-dom";
import Container from "react-bootstrap/Container";
import linkedin_logo from "../imgs/logos/linkedin_logo_l.png";
import linkedin_logo from "../../assets/imgs/logos/linkedin_logo_l.png";
const Footer = () => {
return (
<Container fluid className="border-top footer ">
Expand Down
6 changes: 3 additions & 3 deletions js/Header.jsx → src/pages/Others/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import Nav from "react-bootstrap/Nav";
import { NavLink, Link, useLocation } from "react-router-dom";
import Button from "react-bootstrap/Button";
import Modal from "react-bootstrap/Modal";
import TitlePictureComp from "./TitlePictureComp";
import TitlePictureComp from "../Others/TitlePictureComp";

import Container from "react-bootstrap/Container";
import logopic from "../imgs/logos/BV_logo.png";
import sidelogpic from "../imgs/logos/side_logo.png";
import logopic from "../../assets/imgs/logos/BV_logo.png";
import sidelogpic from "../../assets/imgs/logos/side_logo.png";

const Header = () => {
const location = useLocation();
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import hometitle_pic from "../imgs/titlephoto/Home.png";
import servicestitle_pic from "../imgs/titlephoto/Dienstleistungen.png";
import contacttitle_pic from "../imgs/titlephoto/Kontakt.png";
import staffstitle_pic from "../imgs/titlephoto/Mitarbeitende.png";
import notmatch404_pic from "../imgs/titlephoto/NotMatch404.png";
import projects_pic from "../imgs/titlephoto/Projekte.png";
import project_pic from "../imgs/titlephoto/Projekt.png";
import topics_pic from "../imgs/titlephoto/Themen.png";
import hometitle_pic from "../../assets/imgs/titlephoto/Home.png";
import servicestitle_pic from "../../assets/imgs/titlephoto/Dienstleistungen.png";
import contacttitle_pic from "../../assets/imgs/titlephoto/Kontakt.png";
import staffstitle_pic from "../../assets/imgs/titlephoto/Mitarbeitende.png";
import notmatch404_pic from "../../assets/imgs/titlephoto/NotMatch404.png";
import projects_pic from "../../assets/imgs/titlephoto/Projekte.png";
import project_pic from "../../assets/imgs/titlephoto/Projekt.png";
import topics_pic from "../../assets/imgs/titlephoto/Themen.png";
const TitlePictureComp = ({ page }) => {
let titlePic = page.split("/", 1)[0];
let urlbase = hometitle_pic;
Expand Down
6 changes: 3 additions & 3 deletions js/DownloadPDF.jsx → src/pages/Projects/DownloadPDF.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { useQuery } from "@tanstack/react-query";
import { useNavigate } from "react-router-dom";
import Spinner from "./Spinner";
import Spinner from "../Others/Spinner";
import Row from "react-bootstrap/Row";
import fetchData from "./fetchData";
import fetchData from "../../utils/fetchData";
import DOMPurify from "dompurify";
import download_symbol from "../imgs/symbols/download.png";
import download_symbol from "../../assets/imgs/symbols/download.png";
const DownloadPDF = (prop) => {
console.log(prop.prop);
const navigate = useNavigate();
Expand Down
10 changes: 5 additions & 5 deletions js/PaginationComp.jsx → src/pages/Projects/PaginationComp.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import styles from "../css/projects.module.css";
import gostartpic from "../imgs/symbols/go-start.png";
import goendpic from "../imgs/symbols/go-end.png";
import lastpagepic from "../imgs/symbols/lastpage.png";
import nextpagepic from "../imgs/symbols/nextpage.png";
import styles from "./projects.module.css";
import gostartpic from "../../assets/imgs/symbols/go-start.png";
import goendpic from "../../assets/imgs/symbols/go-end.png";
import lastpagepic from "../../assets/imgs/symbols/lastpage.png";
import nextpagepic from "../../assets/imgs/symbols/nextpage.png";

const PaginationComp = ({
pageCount,
Expand Down
8 changes: 4 additions & 4 deletions js/Project.jsx → src/pages/Projects/Project.jsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import Container from "react-bootstrap/Container";
import Row from "react-bootstrap/Row";
import Col from "react-bootstrap/Col";
import laufendpic from "../imgs/symbols/laufend.png";
import fertigpic from "../imgs/symbols/finished.png";
import arrowrightpic from "../imgs/symbols/arrow-right.png";
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 { Link } from "react-router-dom";
import { deUmlaut } from "./helpers";
import { deUmlaut } from "../../utils/helpers";
const Project = (prop) => {
const title = deUmlaut(prop.title);
console.log(prop);
Expand Down
File renamed without changes.
10 changes: 5 additions & 5 deletions js/Projects.jsx → src/pages/Projects/Projects.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ import Container from "react-bootstrap/Container";
import Row from "react-bootstrap/Row";
import Col from "react-bootstrap/Col";
import { useQuery } from "@tanstack/react-query";
import fetchData from "./fetchData";
import fetchData from "../../utils/fetchData";
import { useNavigate, useParams, useSearchParams } from "react-router-dom";
import Results from "./Results";
import { useState } from "react";
import ErrorBoundary from "./ErrorBoundary";
import ErrorBoundary from "../../utils/ErrorBoundary";
import {
getistLaufendId,
filteredData,
filterIstLaufendProjects,
} from "./helpers";
import styles from "../css/projects.module.css";
} from "../../utils/helpers";
import styles from "./projects.module.css";

import Spinner from "./Spinner";
import Spinner from "../Others/Spinner";
import SelectComp from "./SelectComp";
import SearchInputComp from "./SearchInputComp";
const Projects = () => {
Expand Down
2 changes: 1 addition & 1 deletion js/Results.jsx → src/pages/Projects/Results.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Project from "./Project";
import styles from "../css/projects.module.css";
import styles from "./projects.module.css";
import { useState, useEffect } from "react";
import PaginationComp from "./PaginationComp";

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion js/SelectComp.jsx → src/pages/Projects/SelectComp.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable jsx-a11y/no-noninteractive-tabindex */
import { useEffect, useState } from "react";
import styles from "../css/select.module.css";
import styles from "./select.module.css";
const SelectComp = ({
isPreSelected,
value,
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import SelectedProjectList from "./SelectedProjectList";
import fetchData from "./fetchData";
import SelectedProjectList from "../../components/SelectedProjectList";
import fetchData from "../../utils/fetchData";
import { useQuery } from "@tanstack/react-query";
import Spinner from "./Spinner";
import Spinner from "../Others/Spinner";
import { useNavigate } from "react-router-dom";

const SelectedProject4ServicePage = ({ service, isshownid }) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useFetchMedia } from "./useFetchMedia";
import { useFetchMedia } from "../../utils/useFetchMedia";
const ServicePicComp = ({ imgid, picName }) => {
const media = useFetchMedia(imgid, "imgs/category/forschung.png");

Expand Down
6 changes: 3 additions & 3 deletions js/Services.jsx → src/pages/Services/Services.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import Nav from "react-bootstrap/Nav";
import SelectedProject4ServicePage from "./SelectedProject4ServicePage";
import ShowServiceInfo from "./ShowServiceInfo";
import { useQuery } from "@tanstack/react-query";
import fetchData from "./fetchData";
import fetchData from "../../utils/fetchData";
import { useNavigate, useLocation } from "react-router-dom";
import { useState } from "react";
import { projectIdFetching } from "./helpers";
import Spinner from "./Spinner";
import { projectIdFetching } from "../../utils/helpers";
import Spinner from "../Others/Spinner";

// const btn_active = {
// background: "#C00000",
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Container from "react-bootstrap/Container";
import Row from "react-bootstrap/Row";
import DOMPurify from "dompurify";
import download_symbol from "../imgs/symbols/download.png";
import download_symbol from "../../assets/imgs/symbols/download.png";
const PublicationsList = ({ prop }) => {
return (
<div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import SelectedProjectList from "./SelectedProjectList";
import SelectedProjectList from "../../components/SelectedProjectList";
import { useQuery } from "@tanstack/react-query";
import fetchData from "./fetchData";
import Spinner from "./Spinner";
import fetchData from "../../utils/fetchData";
import Spinner from "../Others/Spinner";
import { useNavigate } from "react-router-dom";

const SelectedProject4StaffDetailRight = ({ person }) => {
Expand Down
Loading

0 comments on commit dd33d09

Please sign in to comment.