Update docker minor+patch+digest updates

compose.yml

@@ -48,7 +48,7 @@ services:
 
   tempo:
     <<: *service-base
-    image: grafana/tempo:latest@sha256:5408df706752f99d06ea3d6bafb46629111db1102b917812529734ace54093c5
+    image: grafana/tempo:latest@sha256:2fca20faf6f7a0f085a265352f005fb741e0ae90d7ea16e62814f86b36a908f6
     command: [-config.file=/etc/tempo.yaml]
     volumes:
       - ./telemetry/tempo.yaml:/etc/tempo.yaml

packages/webapp/src/routeTree.gen.ts

@@ -9,118 +9,50 @@
 // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
 
 import { Route as rootRouteImport } from './routes/__root'
-import { Route as PazismemodRouteImport } from './routes/pazismemod'
+import { Route as IndexRouteImport } from './routes/index'
-import { Route as MainRouteImport } from './routes/_main'
-import { Route as PazismemodIndexRouteImport } from './routes/pazismemod.index'
-import { Route as MainIndexRouteImport } from './routes/_main.index'
 
-const PazismemodRoute = PazismemodRouteImport.update({
+const IndexRoute = IndexRouteImport.update({
-  id: '/pazismemod',
-  path: '/pazismemod',
-  getParentRoute: () => rootRouteImport,
-} as any)
-const MainRoute = MainRouteImport.update({
-  id: '/_main',
-  getParentRoute: () => rootRouteImport,
-} as any)
-const PazismemodIndexRoute = PazismemodIndexRouteImport.update({
   id: '/',
   path: '/',
-  getParentRoute: () => PazismemodRoute,
+  getParentRoute: () => rootRouteImport,
-} as any)
-const MainIndexRoute = MainIndexRouteImport.update({
-  id: '/',
-  path: '/',
-  getParentRoute: () => MainRoute,
 } as any)
 
 export interface FileRoutesByFullPath {
-  '/pazismemod': typeof PazismemodRouteWithChildren
+  '/': typeof IndexRoute
-  '/': typeof MainIndexRoute
-  '/pazismemod/': typeof PazismemodIndexRoute
 }
 export interface FileRoutesByTo {
-  '/': typeof MainIndexRoute
+  '/': typeof IndexRoute
-  '/pazismemod': typeof PazismemodIndexRoute
 }
 export interface FileRoutesById {
   __root__: typeof rootRouteImport
-  '/_main': typeof MainRouteWithChildren
+  '/': typeof IndexRoute
-  '/pazismemod': typeof PazismemodRouteWithChildren
-  '/_main/': typeof MainIndexRoute
-  '/pazismemod/': typeof PazismemodIndexRoute
 }
 export interface FileRouteTypes {
   fileRoutesByFullPath: FileRoutesByFullPath
-  fullPaths: '/pazismemod' | '/' | '/pazismemod/'
+  fullPaths: '/'
   fileRoutesByTo: FileRoutesByTo
-  to: '/' | '/pazismemod'
+  to: '/'
-  id: '__root__' | '/_main' | '/pazismemod' | '/_main/' | '/pazismemod/'
+  id: '__root__' | '/'
   fileRoutesById: FileRoutesById
 }
 export interface RootRouteChildren {
-  MainRoute: typeof MainRouteWithChildren
+  IndexRoute: typeof IndexRoute
-  PazismemodRoute: typeof PazismemodRouteWithChildren
 }
 
 declare module '@tanstack/react-router' {
   interface FileRoutesByPath {
-    '/pazismemod': {
+    '/': {
-      id: '/pazismemod'
+      id: '/'
-      path: '/pazismemod'
-      fullPath: '/pazismemod'
-      preLoaderRoute: typeof PazismemodRouteImport
-      parentRoute: typeof rootRouteImport
-    }
-    '/_main': {
-      id: '/_main'
-      path: ''
-      fullPath: ''
-      preLoaderRoute: typeof MainRouteImport
-      parentRoute: typeof rootRouteImport
-    }
-    '/pazismemod/': {
-      id: '/pazismemod/'
-      path: '/'
-      fullPath: '/pazismemod/'
-      preLoaderRoute: typeof PazismemodIndexRouteImport
-      parentRoute: typeof PazismemodRoute
-    }
-    '/_main/': {
-      id: '/_main/'
       path: '/'
       fullPath: '/'
-      preLoaderRoute: typeof MainIndexRouteImport
+      preLoaderRoute: typeof IndexRouteImport
-      parentRoute: typeof MainRoute
+      parentRoute: typeof rootRouteImport
     }
   }
 }
 
-interface MainRouteChildren {
-  MainIndexRoute: typeof MainIndexRoute
-}
-
-const MainRouteChildren: MainRouteChildren = {
-  MainIndexRoute: MainIndexRoute,
-}
-
-const MainRouteWithChildren = MainRoute._addFileChildren(MainRouteChildren)
-
-interface PazismemodRouteChildren {
-  PazismemodIndexRoute: typeof PazismemodIndexRoute
-}
-
-const PazismemodRouteChildren: PazismemodRouteChildren = {
-  PazismemodIndexRoute: PazismemodIndexRoute,
-}
-
-const PazismemodRouteWithChildren = PazismemodRoute._addFileChildren(
-  PazismemodRouteChildren,
-)
-
 const rootRouteChildren: RootRouteChildren = {
-  MainRoute: MainRouteWithChildren,
+  IndexRoute: IndexRoute,
-  PazismemodRoute: PazismemodRouteWithChildren,
 }
 export const routeTree = rootRouteImport
   ._addFileChildren(rootRouteChildren)

packages/webapp/src/routes/__root.tsx

@@ -1,5 +1,12 @@
 import { createRootRoute, Outlet } from "@tanstack/react-router"
 import { TanStackRouterDevtools } from "@tanstack/react-router-devtools"
+import { useTranslation } from "react-i18next"
+import { DiGit } from "react-icons/di"
+import { FaCode } from "react-icons/fa"
+import root from "react-shadow"
+import { Button } from "@/components/ui/button"
+import { Card, CardContent } from "@/components/ui/card"
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"
 
 
 export const Route = createRootRoute({
@@ -7,8 +14,86 @@ export const Route = createRootRoute({
 })
 
 function RootComponent() {
+    const { t, i18n } = useTranslation()
+
     return <>
-        <Outlet />
+        <div className="flex flex-row items-center justify-center gap-2 p-2">
+            <Button
+                variant={i18n.language !== "en" ? "default" : "noShadow"}
+                onClick={() => i18n.changeLanguage("en")}
+            >
+                🇬🇧 English
+            </Button>
+
+            <Button
+                variant={i18n.language !== "fr" ? "default" : "noShadow"}
+                onClick={() => i18n.changeLanguage("fr")}
+            >
+                🇫🇷 Français
+            </Button>
+        </div>
+
+        <div className="container mt-20 mr-auto ml-auto">
+            <div className="mr-auto ml-auto flex w-fit flex-row items-start justify-around gap-10">
+                <root.div>
+                    <link rel="stylesheet" href="/98.css/dist/98.css" />
+
+                    <div className="window" style={{ width: 300 }}>
+                        <div className="title-bar">
+                            <div className="title-bar-text">Julien Valverde</div>
+                        </div>
+                        <div className="window-body">
+                            <p>There's so much room for activities!</p>
+                        </div>
+                    </div>
+                </root.div>
+
+                <div>
+                    <h1>Ingénieur Full Stack &bull; Entrepreneur</h1>
+
+                    <p className="mt-2">
+                        I am passionate about integrating functionality and design in applications to create intuitive, user-friendly experiences.
+                    </p>
+
+                    <div className="flex w-fit flex-row items-center justify-center gap-2 mt-4">
+                        <TooltipProvider>
+                            <Tooltip>
+                                <TooltipTrigger asChild>
+                                    <Button asChild>
+                                        <a href="https://git.valverde.cloud"><DiGit /> {t($ => $.gitRepos.title, { ns: "nav" })}</a>
+                                    </Button>
+                                </TooltipTrigger>
+
+                                <TooltipContent><p>{t($ => $.gitRepos.tooltip, { ns: "nav" })}</p></TooltipContent>
+                            </Tooltip>
+                        </TooltipProvider>
+
+                        <TooltipProvider>
+                            <Tooltip>
+                                <TooltipTrigger asChild>
+                                    <Button asChild>
+                                        <a href="https://git.valverde.cloud/thilawyn/website"><FaCode /> {t($ => $.sourceCode.title, { ns: "nav" })}</a>
+                                    </Button>
+                                </TooltipTrigger>
+
+                                <TooltipContent><p>{t($ => $.sourceCode.tooltip, { ns: "nav" })}</p></TooltipContent>
+                            </Tooltip>
+                        </TooltipProvider>
+
+                        <Button>Resumé</Button>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div className="mx-auto w-[750px] max-w-full px-5 pt-28 pb-10 text-foreground">
+            <Card>
+                <CardContent>
+                    <Outlet />
+                </CardContent>
+            </Card>
+        </div>
+
         <TanStackRouterDevtools />
     </>
 }

packages/webapp/src/routes/_main.tsx

@@ -1,96 +0,0 @@
-import { createFileRoute, Outlet } from "@tanstack/react-router"
-import { useTranslation } from "react-i18next"
-import { DiGit } from "react-icons/di"
-import { FaCode } from "react-icons/fa"
-import root from "react-shadow"
-import { Button } from "@/components/ui/button"
-import { Card, CardContent } from "@/components/ui/card"
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"
-
-
-export const Route = createFileRoute("/_main")({
-    component: SharedLayout,
-})
-
-function SharedLayout() {
-    const { t, i18n } = useTranslation()
-
-    return <>
-        <div className="flex flex-row items-center justify-center gap-2 p-2">
-            <Button
-                variant={i18n.language !== "en" ? "default" : "noShadow"}
-                onClick={() => i18n.changeLanguage("en")}
-            >
-                🇬🇧 English
-            </Button>
-
-            <Button
-                variant={i18n.language !== "fr" ? "default" : "noShadow"}
-                onClick={() => i18n.changeLanguage("fr")}
-            >
-                🇫🇷 Français
-            </Button>
-        </div>
-
-        <div className="container mt-20 mr-auto ml-auto">
-            <div className="mr-auto ml-auto flex w-fit flex-row items-start justify-around gap-10">
-                <root.div>
-                    <link rel="stylesheet" href="/98.css/dist/98.css" />
-
-                    <div className="window" style={{ width: 300 }}>
-                        <div className="title-bar">
-                            <div className="title-bar-text">Julien Valverde</div>
-                        </div>
-                        <div className="window-body">
-                            <p>There's so much room for activities!</p>
-                        </div>
-                    </div>
-                </root.div>
-
-                <div>
-                    <h1>Ingénieur Full Stack &bull; Entrepreneur</h1>
-
-                    <p className="mt-2">
-                        I am passionate about integrating functionality and design in applications to create intuitive, user-friendly experiences.
-                    </p>
-
-                    <div className="mt-4 flex w-fit flex-row items-center justify-center gap-2">
-                        <TooltipProvider>
-                            <Tooltip>
-                                <TooltipTrigger asChild>
-                                    <Button asChild>
-                                        <a href="https://git.valverde.cloud"><DiGit /> {t($ => $.gitRepos.title, { ns: "nav" })}</a>
-                                    </Button>
-                                </TooltipTrigger>
-
-                                <TooltipContent><p>{t($ => $.gitRepos.tooltip, { ns: "nav" })}</p></TooltipContent>
-                            </Tooltip>
-                        </TooltipProvider>
-
-                        <TooltipProvider>
-                            <Tooltip>
-                                <TooltipTrigger asChild>
-                                    <Button asChild>
-                                        <a href="https://git.valverde.cloud/thilawyn/website"><FaCode /> {t($ => $.sourceCode.title, { ns: "nav" })}</a>
-                                    </Button>
-                                </TooltipTrigger>
-
-                                <TooltipContent><p>{t($ => $.sourceCode.tooltip, { ns: "nav" })}</p></TooltipContent>
-                            </Tooltip>
-                        </TooltipProvider>
-
-                        <Button>Resumé</Button>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div className="mx-auto w-[750px] max-w-full px-5 pt-28 pb-10 text-foreground">
-            <Card>
-                <CardContent>
-                    <Outlet />
-                </CardContent>
-            </Card>
-        </div>
-    </>
-}

packages/webapp/src/routes/index.tsx

@@ -1,7 +1,7 @@
 import { createFileRoute } from "@tanstack/react-router"
 
 
-export const Route = createFileRoute("/_main/")({
+export const Route = createFileRoute("/")({
     component: RouteComponent,
 })
 

packages/webapp/src/routes/pazismemod.index.tsx

@@ -1,10 +0,0 @@
-import { createFileRoute } from "@tanstack/react-router"
-
-
-export const Route = createFileRoute("/pazismemod/")({
-    component: RouteComponent,
-})
-
-function RouteComponent() {
-    return null
-}

packages/webapp/src/routes/pazismemod.tsx

@@ -1,10 +0,0 @@
-import { createFileRoute, Outlet } from "@tanstack/react-router"
-
-
-export const Route = createFileRoute("/pazismemod")({
-    component: PazismemodLayout,
-})
-
-function PazismemodLayout() {
-    return <Outlet />
-}