Fix: solidjs update, language routes, big screen layout shifts

This commit is contained in:
aronmal 2024-02-28 16:48:19 +01:00
parent 2c9d4cb57e
commit 66fa95bb33
Signed by: aronmal
GPG key ID: 816B7707426FC612
11 changed files with 339 additions and 334 deletions

View file

@ -9,10 +9,10 @@
}, },
"type": "module", "type": "module",
"devDependencies": { "devDependencies": {
"@types/node": "^20.11.20", "@types/node": "^20.11.21",
"@typescript-eslint/parser": "^7.0.2", "@typescript-eslint/parser": "^7.1.0",
"esbuild": "^0.20.1", "esbuild": "^0.20.1",
"eslint": "^8.56.0", "eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0", "eslint-config-prettier": "^9.1.0",
"eslint-plugin-solid": "^0.13.1", "eslint-plugin-solid": "^0.13.1",
"prettier": "^3.2.5", "prettier": "^3.2.5",
@ -25,10 +25,10 @@
"@fortawesome/pro-regular-svg-icons": "^6.5.1", "@fortawesome/pro-regular-svg-icons": "^6.5.1",
"@solidjs/meta": "^0.29.3", "@solidjs/meta": "^0.29.3",
"@solidjs/router": "^0.12.4", "@solidjs/router": "^0.12.4",
"@solidjs/start": "^0.5.10", "@solidjs/start": "^0.6.0",
"sass": "^1.71.1", "sass": "^1.71.1",
"solid-js": "^1.8.15", "solid-js": "^1.8.15",
"vinxi": "^0.3.3" "vinxi": "^0.3.4"
}, },
"engines": { "engines": {
"node": ">=18" "node": ">=18"

567
pnpm-lock.yaml generated

File diff suppressed because it is too large Load diff

View file

@ -3,38 +3,38 @@
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"> <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url> <url>
<loc>https://jg-eucs.com/en</loc> <loc>https://jg-eucs.com/en</loc>
<lastmod>2023-11-03</lastmod> <lastmod>2024-02-28</lastmod>
</url> </url>
<url> <url>
<loc>https://jg-eucs.com/en/KSS22</loc> <loc>https://jg-eucs.com/en/KSS22</loc>
<lastmod>2023-11-03</lastmod> <lastmod>2024-02-28</lastmod>
</url> </url>
<url> <url>
<loc>https://jg-eucs.com/en/manufacturers</loc> <loc>https://jg-eucs.com/en/manufacturers</loc>
<lastmod>2023-11-03</lastmod> <lastmod>2024-02-28</lastmod>
</url> </url>
<url> <url>
<loc>https://jg-eucs.com/en/overview</loc> <loc>https://jg-eucs.com/en/overview</loc>
<lastmod>2023-11-03</lastmod> <lastmod>2024-02-28</lastmod>
</url> </url>
<url> <url>
<loc>https://jg-eucs.com/de</loc> <loc>https://jg-eucs.com/de</loc>
<lastmod>2023-11-03</lastmod> <lastmod>2024-02-28</lastmod>
</url> </url>
<url> <url>
<loc>https://jg-eucs.com/de/imprint</loc> <loc>https://jg-eucs.com/de/imprint</loc>
<lastmod>2023-11-03</lastmod> <lastmod>2024-02-28</lastmod>
</url> </url>
<url> <url>
<loc>https://jg-eucs.com/de/KSS22</loc> <loc>https://jg-eucs.com/de/KSS22</loc>
<lastmod>2023-11-03</lastmod> <lastmod>2024-02-28</lastmod>
</url> </url>
<url> <url>
<loc>https://jg-eucs.com/de/manufacturers</loc> <loc>https://jg-eucs.com/de/manufacturers</loc>
<lastmod>2023-11-03</lastmod> <lastmod>2024-02-28</lastmod>
</url> </url>
<url> <url>
<loc>https://jg-eucs.com/de/overview</loc> <loc>https://jg-eucs.com/de/overview</loc>
<lastmod>2023-11-03</lastmod> <lastmod>2024-02-28</lastmod>
</url> </url>
</urlset> </urlset>

View file

@ -59,7 +59,7 @@ function Navbar() {
return ( return (
<> <>
<div id="navbar" style={{ visibility: menu() ? "visible" : "hidden" }}> <div id="navbar" style={{ visibility: menu() ? "visible" : "hidden" }}>
<a href="/de/"> <a href="/de">
<FontAwesomeIcon icon={faBookOpen} /> Einführung <FontAwesomeIcon icon={faBookOpen} /> Einführung
</a> </a>

View file

@ -59,7 +59,7 @@ function Navbar() {
return ( return (
<> <>
<div id="navbar" style={{ visibility: menu() ? "visible" : "hidden" }}> <div id="navbar" style={{ visibility: menu() ? "visible" : "hidden" }}>
<a href="/en/"> <a href="/en">
<FontAwesomeIcon icon={faBookOpen} /> Introduction <FontAwesomeIcon icon={faBookOpen} /> Introduction
</a> </a>

View file

@ -1,19 +1,29 @@
import { StartServer, createHandler } from "@solidjs/start/server"; import { StartServer, createHandler } from "@solidjs/start/server";
import { getRequestEvent } from "solid-js/web";
export default createHandler(() => ( export default createHandler(() => (
<StartServer <StartServer
document={({ assets, children, scripts }) => ( document={({ assets, children, scripts }) => {
<html lang="en"> const event = getRequestEvent();
<head> const pathname = event?.request.url
<meta charset="utf-8" /> ? new URL(event?.request.url).pathname
<meta name="viewport" content="width=device-width, initial-scale=1" /> : "/";
{assets} return (
</head> <html lang={pathname.startsWith("/de") ? "de" : "en"}>
<body id="app"> <head>
{children} <meta charset="utf-8" />
{scripts} <meta
</body> name="viewport"
</html> content="width=device-width, initial-scale=1"
)} />
{assets}
</head>
<body id="app">
{children}
{scripts}
</body>
</html>
);
}}
/> />
)); ));

View file

@ -66,7 +66,7 @@ function Introduction() {
</div> </div>
</a> </a>
<a href="/en/"> <a href="/en">
<div id="MoreButton"> <div id="MoreButton">
<p> <p>
Switch to English <FontAwesomeIcon icon={faGlobe} /> Switch to English <FontAwesomeIcon icon={faGlobe} />

View file

@ -68,7 +68,7 @@ function Introduction() {
</div> </div>
</a> </a>
<a href="/de/"> <a href="/de">
<div id="MoreButton"> <div id="MoreButton">
<p> <p>
Wechsel zu Deutsch <FontAwesomeIcon icon={faGlobe} /> Wechsel zu Deutsch <FontAwesomeIcon icon={faGlobe} />

View file

@ -6,7 +6,7 @@ export default function Home() {
const navigate = useNavigate(); const navigate = useNavigate();
createEffect(() => { createEffect(() => {
const isGerman = navigator.language.startsWith("de"); const isGerman = navigator.language.startsWith("de");
navigate(isGerman ? "/de/" : "/en/"); navigate(isGerman ? "/de" : "/en");
}); });
return <Title>Language detection...</Title>; return <Title>Language detection...</Title>;
} }

View file

@ -177,36 +177,4 @@
grid-template-columns: repeat(2, 1fr); grid-template-columns: repeat(2, 1fr);
gap: 2rem; gap: 2rem;
} }
@media (max-width: 767px) /*unter handy größe*/ {
.righties {
width: 100%;
&:hover {
width: 100%;
}
}
}
/*@media screen and (min-width:1200px) {.raster {width: calc(100%/6);}}
@media screen and (min-width:1500px) {.raster {width: calc(100%/8);}}*/
@media screen and (min-width: 1900px) /*HD Fullscreen only*/ {
.lefties {
display: block;
width: 27%;
}
.righties {
width: 27%;
}
}
@media screen and (min-width: 2250px) /*ab 2000px nicht weiter skalieren*/ {
* {
width: 1950px;
margin-left: auto;
margin-right: auto;
}
}
} }