use vite assets

Benefactorum · Nov 4, 2024 · a71532f · a71532f
1 parent f5a11d4
commit a71532f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/app/frontend/Layout.tsx b/app/frontend/Layout.tsx
@@ -1,6 +1,3 @@
-import { Head } from "@inertiajs/react";
-import Logo from "/assets/logo.svg";
-
 import Header from "./components/Header";
 import { ReactNode } from "react";
 
@@ -12,13 +9,6 @@ type LayoutProps = {
 export default function Layout({ children, flash }: LayoutProps) {
   return (
     <>
-      <Head>
-        <meta
-          head-key="description"
-          name="description"
-          content="Benefactorum, association de bienfaiteurs est un site agrégeant toutes les associations d'intérêt général françaises."
-        />
-      </Head>
       <Header />
       <main>
         {flash?.notice && (

diff --git a/public/icon.svg → app/frontend/assets/logo.svg b/public/icon.svg → app/frontend/assets/logo.svg
diff --git a/app/frontend/components/Header.tsx b/app/frontend/components/Header.tsx
@@ -1,5 +1,6 @@
 import { Link } from "@inertiajs/react";
 import { useState } from "react";
+
 import {
   NavigationMenu,
   NavigationMenuItem,
@@ -8,6 +9,7 @@ import {
 } from "@/components/ui/navigation-menu";
 import { buttonVariants } from "@/components/ui/button";
 
+import Logo from "/assets/logo.svg";
 import SearchIcon from "/assets/icons/search.svg";
 import FistIcon from "/assets/icons/fist.svg";
 import LogInIcon from "/assets/icons/login.svg";
@@ -19,7 +21,7 @@ export default function Header() {
     <header className="bg-white py-2">
       <div className="2xl:container 2xl:mx-auto flex items-center px-4 justify-between">
         <Link href="/" className="flex gap-2 items-center">
-          <img className="h-12" src="icon.svg" alt="logo de Benefactorum" />
+          <img className="h-12" src={Logo} alt="logo de Benefactorum" />
           <div className="text-right">
             <h1 className="text-3xl font-bold leading-none">Benefactorum</h1>
             <h2 className="text-sm leading-none text-slate-600">

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -4,10 +4,16 @@
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="mobile-web-app-capable" content="yes">
+    <meta
+      head-key="description"
+      name="description"
+      content="Benefactorum, association de bienfaiteurs est un site agrégeant toutes les associations d'intérêt général françaises."
+    >
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
 
-    <link rel="icon" href="/icon.svg" type="image/svg+xml">
+    <!-- Favicon -->
+    <link rel="icon" href="<%= vite_asset_path('assets/logo.svg') %>" type="image/svg+xml">
 
     <%# Enable PWA manifest for installable apps (make sure to enable in config/routes.rb too!) %>
     <%#= tag.link rel: "manifest", href: pwa_manifest_path(format: :json) %>