diff --git a/package.json b/package.json index dd9ca26..39e55b6 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ }, "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.4.2", + "@fortawesome/free-brands-svg-icons": "^6.4.2", "@fortawesome/pro-regular-svg-icons": "^6.4.2", "@solidjs/meta": "^0.28.6", "@solidjs/router": "^0.8.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 11990d4..7c147d5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,6 +8,9 @@ dependencies: '@fortawesome/fontawesome-svg-core': specifier: ^6.4.2 version: 6.4.2 + '@fortawesome/free-brands-svg-icons': + specifier: ^6.4.2 + version: 6.4.2 '@fortawesome/pro-regular-svg-icons': specifier: ^6.4.2 version: 6.4.2 @@ -1781,6 +1784,14 @@ packages: '@fortawesome/fontawesome-common-types': 6.4.2 dev: false + /@fortawesome/free-brands-svg-icons@6.4.2: + resolution: {integrity: sha512-LKOwJX0I7+mR/cvvf6qIiqcERbdnY+24zgpUSouySml+5w8B4BJOx8EhDR/FTKAu06W12fmUIcv6lzPSwYKGGg==, tarball: https://npm.fontawesome.com/@fortawesome/free-brands-svg-icons/-/6.4.2/free-brands-svg-icons-6.4.2.tgz} + engines: {node: '>=6'} + requiresBuild: true + dependencies: + '@fortawesome/fontawesome-common-types': 6.4.2 + dev: false + /@fortawesome/pro-regular-svg-icons@6.4.2: resolution: {integrity: sha512-e6LJbjPuthsDfskXvsy3kSpz/NFD2FQ0utZHelMwOyjkalPSbM3kyedZ4Vgq3XVTKo6NQd9FtIoHxxmEQHQKRA==, tarball: https://npm.fontawesome.com/@fortawesome/pro-regular-svg-icons/-/6.4.2/pro-regular-svg-icons-6.4.2.tgz} engines: {node: '>=6'} diff --git a/public/images/KS_S22/1.jpg b/public/images/KSS22/1.jpg similarity index 100% rename from public/images/KS_S22/1.jpg rename to public/images/KSS22/1.jpg diff --git a/public/images/KS_S22/2.jpg b/public/images/KSS22/2.jpg similarity index 100% rename from public/images/KS_S22/2.jpg rename to public/images/KSS22/2.jpg diff --git a/public/images/KS_S22/3.jpg b/public/images/KSS22/3.jpg similarity index 100% rename from public/images/KS_S22/3.jpg rename to public/images/KSS22/3.jpg diff --git a/public/images/KS_S22/4.jpg b/public/images/KSS22/4.jpg similarity index 100% rename from public/images/KS_S22/4.jpg rename to public/images/KSS22/4.jpg diff --git a/public/images/KS_S22/BusJump.jpg b/public/images/KSS22/BusJump.jpg similarity index 100% rename from public/images/KS_S22/BusJump.jpg rename to public/images/KSS22/BusJump.jpg diff --git a/public/images/KS_S22/Data-Sheet.jpg b/public/images/KSS22/Data-Sheet.jpg similarity index 100% rename from public/images/KS_S22/Data-Sheet.jpg rename to public/images/KSS22/Data-Sheet.jpg diff --git a/public/images/KS_S22/S22SliderMod.jpg b/public/images/KSS22/S22SliderMod.jpg similarity index 100% rename from public/images/KS_S22/S22SliderMod.jpg rename to public/images/KSS22/S22SliderMod.jpg diff --git a/public/images/KS_S22/S22shutterkode1.jpg b/public/images/KSS22/S22shutterkode1.jpg similarity index 100% rename from public/images/KS_S22/S22shutterkode1.jpg rename to public/images/KSS22/S22shutterkode1.jpg diff --git a/public/images/KS_S22/S22shutterkode2.jpg b/public/images/KSS22/S22shutterkode2.jpg similarity index 100% rename from public/images/KS_S22/S22shutterkode2.jpg rename to public/images/KSS22/S22shutterkode2.jpg diff --git a/public/images/KS_S22/S22shutterkode3.jpg b/public/images/KSS22/S22shutterkode3.jpg similarity index 100% rename from public/images/KS_S22/S22shutterkode3.jpg rename to public/images/KSS22/S22shutterkode3.jpg diff --git a/public/images/KS_S22/S22shutterkode4.jpg b/public/images/KSS22/S22shutterkode4.jpg similarity index 100% rename from public/images/KS_S22/S22shutterkode4.jpg rename to public/images/KSS22/S22shutterkode4.jpg diff --git a/public/images/KS_S22/S22shutterkode5.jpg b/public/images/KSS22/S22shutterkode5.jpg similarity index 100% rename from public/images/KS_S22/S22shutterkode5.jpg rename to public/images/KSS22/S22shutterkode5.jpg diff --git a/public/images/KS_S22/S22shutterkode6.jpg b/public/images/KSS22/S22shutterkode6.jpg similarity index 100% rename from public/images/KS_S22/S22shutterkode6.jpg rename to public/images/KSS22/S22shutterkode6.jpg diff --git a/public/images/KS_S22/V13lq1.jpg b/public/images/KSS22/V13lq1.jpg similarity index 100% rename from public/images/KS_S22/V13lq1.jpg rename to public/images/KSS22/V13lq1.jpg diff --git a/public/images/KS_S22/ks20cover.jpg b/public/images/KSS22/ks20cover.jpg similarity index 100% rename from public/images/KS_S22/ks20cover.jpg rename to public/images/KSS22/ks20cover.jpg diff --git a/public/images/KS_S22/ks20riding.jpg b/public/images/KSS22/ks20riding.jpg similarity index 100% rename from public/images/KS_S22/ks20riding.jpg rename to public/images/KSS22/ks20riding.jpg diff --git a/public/styles/overview.css b/public/styles/overview.css index a31b04f..bb4f695 100644 --- a/public/styles/overview.css +++ b/public/styles/overview.css @@ -35,7 +35,6 @@ background-color: #121629; position: fixed; top: 0; - width: 155px; height: 100%; margin-left: -8px; } diff --git a/src/components/Reference.tsx b/src/components/Reference.tsx index fe7e040..44429f2 100644 --- a/src/components/Reference.tsx +++ b/src/components/Reference.tsx @@ -36,21 +36,24 @@ function R(props: { } }); return ( - - - - - {props.children} - - - - + <> + {" "} + + + + + {props.children} + + + + {" "} + ); } diff --git a/src/components/de/Navbar.tsx b/src/components/de/Navbar.tsx new file mode 100644 index 0000000..756efac --- /dev/null +++ b/src/components/de/Navbar.tsx @@ -0,0 +1,102 @@ +import { + faBookOpen, + faCircleHalfStroke, + faGlobe, + faXmark, +} from "@fortawesome/pro-regular-svg-icons"; +import { createSignal } from "solid-js"; +import { A, useNavigate } from "solid-start"; +import { FontAwesomeIcon } from "../FontAwesomeIcon"; + +export const [lightMode, setLightMode] = createSignal(false); +const [menu, setMenu] = createSignal(false); + +function Navbar() { + const navigate = useNavigate(); + return ( + <> + + +
+ + Start + +
+ + ); +} + +export default Navbar; diff --git a/src/components/en/Navbar.tsx b/src/components/en/Navbar.tsx new file mode 100644 index 0000000..c5f6b4c --- /dev/null +++ b/src/components/en/Navbar.tsx @@ -0,0 +1,102 @@ +import { + faBookOpen, + faCircleHalfStroke, + faGlobe, + faXmark, +} from "@fortawesome/pro-regular-svg-icons"; +import { createSignal } from "solid-js"; +import { A, useNavigate } from "solid-start"; +import { FontAwesomeIcon } from "../FontAwesomeIcon"; + +export const [lightMode, setLightMode] = createSignal(false); +const [menu, setMenu] = createSignal(false); + +function Navbar() { + const navigate = useNavigate(); + return ( + <> + + +
+ + Start + +
+ + ); +} + +export default Navbar; diff --git a/src/root.tsx b/src/root.tsx index 61ef9a1..44750db 100644 --- a/src/root.tsx +++ b/src/root.tsx @@ -2,7 +2,6 @@ import "@fortawesome/fontawesome-svg-core/styles.css"; import { Suspense } from "solid-js"; import { - Body, FileRoutes, Head, Html, @@ -11,11 +10,13 @@ import { Routes, Scripts, Title, + useLocation, } from "solid-start"; export default function Root() { + const location = useLocation(); return ( - + SolidStart - Bare - - - - - - - - + + + + + + ); } diff --git a/src/routes/de/KSS22.tsx b/src/routes/de/KSS22.tsx index 9aa3e4c..f058fe8 100644 --- a/src/routes/de/KSS22.tsx +++ b/src/routes/de/KSS22.tsx @@ -1,9 +1,10 @@ -import { Link, Title, useNavigate } from "solid-start"; +import { Body, Link, Title, useNavigate } from "solid-start"; +import { lightMode } from "~/components/en/Navbar"; function KSS22() { const navigate = useNavigate(); return ( - <> + KS S22 @@ -14,7 +15,7 @@ function KSS22() {
- +
@@ -63,13 +64,13 @@ function KSS22() {
- +
- +
- +
@@ -219,7 +220,7 @@ function KSS22() { - + ); } diff --git a/src/routes/de/index.tsx b/src/routes/de/index.tsx index 80ff099..4a97c24 100644 --- a/src/routes/de/index.tsx +++ b/src/routes/de/index.tsx @@ -1,15 +1,13 @@ -import { - faArrowUpRightFromSquare, - faBookOpen, - faGlobe, -} from "@fortawesome/pro-regular-svg-icons"; -import { A, Link, Title } from "solid-start"; +import { faYoutube } from "@fortawesome/free-brands-svg-icons"; +import { faBookOpen, faGlobe } from "@fortawesome/pro-regular-svg-icons"; +import { A, Body, Link, Title } from "solid-start"; import { FontAwesomeIcon } from "~/components/FontAwesomeIcon"; +import { lightMode } from "~/components/de/Navbar"; -function StartDE() { +function Introduction() { return ( - <> - Start + + Einführung
@@ -64,8 +62,7 @@ function StartDE() {

- Ich will alles darüber lesen! - + Ich will alles darüber lesen!

@@ -73,8 +70,7 @@ function StartDE() {

- Mir reichen Videos - + Mir reichen Videos

@@ -82,13 +78,12 @@ function StartDE() {

- Language - + Switch to English

- + ); } -export default StartDE; +export default Introduction; diff --git a/src/routes/de/manufacturers.tsx b/src/routes/de/manufacturers.tsx index 5cddfe7..51616c8 100644 --- a/src/routes/de/manufacturers.tsx +++ b/src/routes/de/manufacturers.tsx @@ -1,76 +1,13 @@ -import { A } from "@solidjs/router"; -import { Link, Title, useNavigate } from "solid-start"; +import { Body, Link, Title } from "solid-start"; import R from "~/components/Reference"; +import Navbar, { lightMode } from "~/components/de/Navbar"; function Manufacturers() { - const navigate = useNavigate(); return ( - <> + Hersteller - -
- - {/* */} -
- {/* - - */}{" "} - {/* - - */}{" "} - {/* - - */}{" "} - {/* - - */}{" "} - {/* - - */}{" "} - {/* - - */} +
{/* @@ -243,7 +180,7 @@ function Manufacturers() {

- + ); } diff --git a/src/routes/de/overview.tsx b/src/routes/de/overview.tsx index cc9d1d0..8b954d3 100644 --- a/src/routes/de/overview.tsx +++ b/src/routes/de/overview.tsx @@ -1,130 +1,19 @@ -import { A } from "@solidjs/router"; -import { Link, Title, useNavigate } from "solid-start"; +import { Body, Link, Title } from "solid-start"; import DeviceTile from "~/components/DeviceTile"; import R from "~/components/Reference"; +import Navbar, { lightMode } from "~/components/de/Navbar"; function overview() { - const navigate = useNavigate(); return ( - <> + Einführung EUCs - - - -
- - Start - {/* */} -
+
- {/* */} - {/* */} - - {/* */} - {/* */} - - {/* */} - - {/* */} - {/* */} - {/* */}
@@ -444,18 +333,12 @@ function overview() {

Begriffs- und Spezifikations Erklärungen

- {/* */}

Tilt-back: Die Pedale des Geräts neigen sich nach hinten, um den Fahrer abzubremsen. Wird bei niedrigem Akku stand oder zu hoher Beanspruchung benutzt, um die Elektronik zu schützen.

-

Pedal Dip: Die pedale geben nach, das Gerät kann die gefragte Leistung nicht aufrechterhalten und die Pedale neigen @@ -463,13 +346,11 @@ function overview() { Bremsen). In den meisten Fällen kommen die Pedale aber sofort wieder hoch, sodass die Fahrt ungestört weiter gehen kann.

-

Pedal-angle: Winkel in dem die Pedale zum Gerät stehen, von vorne gesehen. Ein steilerer Winkel sorgt für mehr Halt in Kurven, kann aber auch unangenehm werden für längere Fahrten.

-

Spiked-pedals: Spitzen auf den Pedalen, die Schuhen mehr Halt geben. Ähnlich zu Mountainbike Pedalen, sind @@ -482,7 +363,6 @@ function overview() {

-

Pads: aus Plastik oder Schaumstoff bestehende Teile die seitlich am Gerät montiert werden, meist gedruckt aus @@ -495,13 +375,11 @@ function overview() {

-

Power Pads: haben Kontakt an den Waden und dem Schienenbein, dienen zum besseren beschleunigen und bremsen. Essenziell für schwere Geräte mit hohen pedalen.

-

Jump Pads: haben Kontakt mit dem Fuß und der Verse, dienen zum Springen und zur Sicherheit. Im Falle eines unerwarteten @@ -509,14 +387,13 @@ function overview() { Gerät fällt. Allerdings können sie im Falle eines crashes behinderlich sein, da sie ein schnelles absteigen erschweren.

-

Wobbles: beschreibt das unbeabsichtigte Wackeln des Geräts bei höherer Geschwindigkeit. Mehr dazu hier

-
+

Trolley Handle: ein ausfahrbarer Griff zum Schieben des Gerätes, ähnlich wie bei einem Koffer. @@ -991,7 +868,7 @@ function overview() { auch unter kontrolle bekommen. Generell sagen viele, dass es eine{" "} Sache des Trainings und der Erfahrung ist. Auch sind Geräte wie die MSuper-Reihe, RS's und EXN's von Gotway anfälliger als zum - Beispiel das Veteran Sherman oder das KS S22. + Beispiel das Veteran Sherman oder das KS S22.

@@ -1086,11 +963,7 @@ function overview() {
- +

Die Grundlegende Technik kam mit dem @@ -1217,7 +1090,7 @@ function overview() {

@@ -1254,7 +1127,7 @@ function overview() {