Skip to content

Commit

Permalink
Revert "Added team data"
Browse files Browse the repository at this point in the history
  • Loading branch information
styrix560 authored Oct 29, 2024
1 parent a541fa7 commit 495ffc8
Show file tree
Hide file tree
Showing 27 changed files with 50 additions and 172 deletions.
79 changes: 0 additions & 79 deletions src/assets/data/team.json

This file was deleted.

Binary file removed src/assets/img/team.webp
Binary file not shown.
Binary file removed src/assets/img/team/Benjamin Frost.webp
Binary file not shown.
Binary file removed src/assets/img/team/Doreen Kappler.webp
Binary file not shown.
Binary file removed src/assets/img/team/Dr. Olaf Kappler.webp
Binary file not shown.
Binary file removed src/assets/img/team/Elisa Boose.webp
Binary file not shown.
Binary file removed src/assets/img/team/Glenn Skrzypczak.webp
Binary file not shown.
Binary file removed src/assets/img/team/Joachim Schiller.webp
Binary file not shown.
Binary file removed src/assets/img/team/Jonas Wanke.webp
Binary file not shown.
Binary file removed src/assets/img/team/Justin Konratt.webp
Binary file not shown.
Binary file removed src/assets/img/team/Kai Redmann.webp
Binary file not shown.
Binary file removed src/assets/img/team/Lukas Fischer.webp
Binary file not shown.
Binary file removed src/assets/img/team/Michael Boose.webp
Binary file not shown.
Binary file removed src/assets/img/team/Thomas Steinfeld.webp
Binary file not shown.
13 changes: 3 additions & 10 deletions src/components/Header.astro
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const skills = [
{
name: t({
de: "Web-Entwicklung",
en: "Web Technologies",
en: "Web Technologies"
}),
href: getRelativeLocaleUrl(lang, "web-technologies"),
},
Expand All @@ -46,27 +46,20 @@ const skills = [
</a>
<div class="ml-10 hidden space-x-8 lg:block">
<a
href={getRelativeLocaleUrl(lang, "/")}
href={getRelativeLocaleUrl(lang)}
class="text-base font-medium text-white hover:text-gray-100"
>
{t({ de: "Startseite", en: "Home" })}
</a>
</div>

<div class="ml-10 hidden lg:block">
<SkillsDropdown
client:load
title={t({ de: "Unsere Disziplinen", en: "Our Skills" })}
skills={skills}
/>
</div>
<div class="ml-10 hidden space-x-8 lg:block">
<a
href={getRelativeLocaleUrl(lang, "/our-team")}
class="text-base font-medium text-white hover:text-gray-100"
>
{t({ de: "Unser Team", en: "Our Team" })}
</a>
</div>
</div>
<LanguageDropdown
client:load
Expand Down
4 changes: 2 additions & 2 deletions src/components/Hero.astro
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import HeroBgImage from "~/assets/img/hero-bg.jpg";
interface Props {
title: string;
subtitle?: string;
subtitle: string;
img?: ImageMetadata;
size?: "md" | "lg";
}
Expand All @@ -27,7 +27,7 @@ const { title, subtitle, img = HeroBgImage, size = "lg" } = Astro.props;
class={clsx(
"relative mx-auto max-w-7xl px-4 text-center sm:px-6 lg:px-8",
{ "py-8 sm:py-16 md:py-32": size === "md" },
{ "py-16 sm:py-32 md:py-64": size === "lg" }
{ "py-16 sm:py-32 md:py-64": size === "lg" },
)}
>
<h1
Expand Down
43 changes: 17 additions & 26 deletions src/components/team/Person.astro
Original file line number Diff line number Diff line change
@@ -1,36 +1,27 @@
---
import { getLangFromUrl, useTranslations } from "~/i18n/utils";
import { PersonImage } from "./PersonImage";
import type { Language } from "~/i18n";
import type { ComponentProps } from "astro/types";
import SocialMediaList from "./SocialMediaList.astro";
interface Props {
type Props = ComponentProps<typeof SocialMediaList> & {
name: string;
lastRole: Record<Language, string>;
img?: string;
skill?: Record<Language, string>;
hasMultipleRoles?: boolean;
}
img: string;
info?: string;
};
const { name, img, lastRole, skill, hasMultipleRoles = false } = Astro.props;
const lang = getLangFromUrl(Astro.url);
const t = useTranslations(lang);
const { name, img, info, links = [] } = Astro.props;
---

<div class="space-y-6">
<PersonImage img={img} />
<div class="text-md text-center font-light">
<h3 class="mb-1 text-lg font-medium">{name}</h3>
<div>
<p class="inline-block">
{t(lastRole)}
</p>
<p class="inline-block">
{hasMultipleRoles && t({ de: "und mehr", en: "and more" })}
</p>
<img
class="mx-auto h-40 w-40 rounded-full object-cover shadow-lg xl:h-56 xl:w-56"
src={img}
alt=""
/>
<div class="space-y-2">
<div class="space-y-1 text-lg font-medium leading-6">
<h3>{name}</h3>
{info && <p class="text-wsg-orange-500">{info}</p>}
</div>
<p>
{skill || <br />}
</p>
<SocialMediaList links={links} />
</div>
</div>
18 changes: 0 additions & 18 deletions src/components/team/PersonImage.tsx

This file was deleted.

39 changes: 19 additions & 20 deletions src/components/team/Team.astro
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
---
import type { ComponentProps } from "astro/types";
import Person from "./Person.astro";
import team from "~/assets/data/team.json";
interface Props {
members: ComponentProps<typeof Person>[];
}
const { members } = Astro.props;
---

<div class="bg-white py-16">
<div
class="mx-8 grid grid-cols-2 gap-y-16 md:mx-24 md:grid-cols-3 lg:grid-cols-4"
>
{
team
.sort((first, second) => first["name"].localeCompare(second["name"]))
.map((member) => (
<Person
name={member["name"]}
img={member["img"]}
lastRole={member["lastRole"]}
skill={member["skill"]}
hasMultipleRoles={member["hasMultipleRoles"]}
/>
))
}
</div>
</div>
<ul
role="list"
class="mx-auto space-y-16 sm:grid sm:grid-cols-2 sm:gap-16 sm:space-y-0 lg:max-w-5xl lg:grid-cols-3"
>
{
members.map((member) => (
<li>
<Person {...member} />
</li>
))
}
</ul>
3 changes: 3 additions & 0 deletions src/layouts/SkillPage.astro
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import HeadedSection from "~/components/sections/HeadedSection.astro";
import WavedSection from "~/components/sections/WavedSection.astro";
import SkillInformation from "~/components/skill/SkillInformation.astro";
import SkillRoadmap from "~/components/skill/SkillRoadmap.astro";
import type Person from "~/components/team/Person.astro";
import TimeLine from "~/components/timeline/TimeLine.astro";
import { getLangFromUrl, useTranslations } from "~/i18n";
import Layout from "./Layout.astro";
Expand All @@ -17,6 +18,7 @@ interface Props {
skillInformation: ComponentProps<typeof SkillInformation>;
img: ImageMetadata;
contact: string;
nationalTeam: ComponentProps<typeof Person>[];
timelineEntries: ComponentProps<typeof TimeLine>["entries"];
additionalLinks: ComponentProps<typeof LinkCard>[];
}
Expand All @@ -26,6 +28,7 @@ const {
skillDescription,
skillInformation,
img,
nationalTeam,
timelineEntries,
additionalLinks,
contact,
Expand Down
17 changes: 0 additions & 17 deletions src/pages/[lang]/our-team.astro

This file was deleted.

1 change: 1 addition & 0 deletions src/pages/en/it-software-solutions-for-business.astro
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const historyData = historyJson[lang]["skill09"];
}}
img={Skill09Image}
contact="mailto:[email protected]"
nationalTeam={[]}
timelineEntries={Object.values(historyData)}
additionalLinks={[
{
Expand Down
1 change: 1 addition & 0 deletions src/pages/en/mobile-applications-development.astro
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const historyData = historyJson[lang]["skill08"];
}}
img={Skill08Image}
contact="mailto:[email protected]"
nationalTeam={[]}
timelineEntries={Object.values(historyData)}
additionalLinks={[
{
Expand Down
1 change: 1 addition & 0 deletions src/pages/en/web-technologies.astro
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const historyData = historyJson[lang]["skill17"];
}}
img={Skill09Image}
contact="mailto:[email protected]"
nationalTeam={[]}
timelineEntries={Object.values(historyData)}
additionalLinks={[
{
Expand Down
1 change: 1 addition & 0 deletions src/pages/it-software-solutions-for-business.astro
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const historyData = historyJson[lang]["skill09"];
}}
img={Skill09Image}
contact="mailto:[email protected]"
nationalTeam={[]}
timelineEntries={Object.values(historyData)}
additionalLinks={[
{
Expand Down
1 change: 1 addition & 0 deletions src/pages/mobile-applications-development.astro
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const historyData = historyJson[lang]["skill08"];
}}
img={Skill08Image}
contact="mailto:[email protected]"
nationalTeam={[]}
timelineEntries={Object.values(historyData)}
additionalLinks={[
{
Expand Down
1 change: 1 addition & 0 deletions src/pages/web-technologies.astro
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const historyData = historyJson[lang]["skill17"];
}}
img={Skill09Image}
contact="mailto:[email protected]"
nationalTeam={[]}
timelineEntries={Object.values(historyData)}
additionalLinks={[
{
Expand Down

0 comments on commit 495ffc8

Please sign in to comment.