Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Passage à vite #621

Merged
merged 16 commits into from
Jan 31, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ [email protected]
# Proxy sortant pour les requetes http (dont vers l'API)
HTTP_PROXY=
HTTPS_PROXY=
NO_PROXY=localhost

# id du processus d'intégration en base
API_ENTREPOT_PROC_INT_VECT_FILES_DB=
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,8 @@ yarn-error.log
###> vincentlanglet/twig-cs-fixer ###
/.twig-cs-fixer.cache
###< vincentlanglet/twig-cs-fixer ###

###> pentatrion/vite-bundle ###
/node_modules/
/public/build/
###< pentatrion/vite-bundle ###
108 changes: 74 additions & 34 deletions assets/data/actualites.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions assets/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import React from "react";
import ReactDOM from "react-dom/client";
// import { mountStoreDevtool } from "simple-zustand-devtools";

import App from "./App";
import App from "@/App";
// import { useApiEspaceCoStore } from "./stores/ApiEspaceCoStore";
// import { useAuthStore } from "./stores/AuthStore";
// import { useSnackbarStore } from "./stores/SnackbarStore";

import "ol/ol.css";

// en prod
if ((document.getElementById("root") as HTMLDivElement)?.dataset?.appEnv?.toLowerCase() === "prod") {
if (import.meta.env?.APP_ENV?.toLowerCase() === "prod") {
disableReactDevTools();
}
// en dev/qualif
Expand Down
2 changes: 1 addition & 1 deletion assets/modules/Routing.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Routing from "../../vendor/friendsofsymfony/jsrouting-bundle/Resources";
import Routing from "../../vendor/friendsofsymfony/jsrouting-bundle/Resources/js/router";
import routes from "../../var/cache/fosRoutes.json";
Routing.setRoutingData(routes);

Expand Down
2 changes: 0 additions & 2 deletions assets/modules/Translator.ts

This file was deleted.

12 changes: 6 additions & 6 deletions assets/pages/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ import CallOut from "@codegouvfr/react-dsfr/CallOut";
import Tile from "@codegouvfr/react-dsfr/Tile";
import { useEffect } from "react";

import AppLayout from "../components/Layout/AppLayout";
import SymfonyRouting from "../modules/Routing";
import { catalogueUrl, routes, useRoute } from "../router/router";
import { useAuthStore } from "../stores/AuthStore";
import AppLayout from "@/components/Layout/AppLayout";
import SymfonyRouting from "@/modules/Routing";
import { catalogueUrl, routes, useRoute } from "@/router/router";
import { useAuthStore } from "@/stores/AuthStore";

import "../sass/pages/home.scss";
import "@/sass/pages/home.scss";

import homeImgUrl from "@/img/home/home.png";
import dataVisuSvgUrl from "@codegouvfr/react-dsfr/dsfr/artwork/pictograms/digital/data-visualization.svg";
import humanCoopSvgUrl from "@codegouvfr/react-dsfr/dsfr/artwork/pictograms/environment/human-cooperation.svg";
import locationFranceSvgUrl from "@codegouvfr/react-dsfr/dsfr/artwork/pictograms/map/location-france.svg";
import mapSvgUrl from "@codegouvfr/react-dsfr/dsfr/artwork/pictograms/map/map.svg";
import systemSvgUrl from "@codegouvfr/react-dsfr/dsfr/artwork/pictograms/system/system.svg";
import homeImgUrl from "../img/home/home.png";

const Home = () => {
const { params } = useRoute();
Expand Down
10 changes: 5 additions & 5 deletions assets/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ import { format as datefnsFormat } from "date-fns-tz";
import { fr } from "date-fns/locale";

// Themes et mot cles INSPIRE
import inspireKeywords from "./data/thematic-inspire.json";
import inspireKeywords from "@/data/thematic-inspire.json";

// charsets
import charsets from "./data/charset_list.json";
import charsets from "@/data/charset_list.json";

// Langues iso639-2
// https://github.com/haliaeetus/iso-639/blob/master/data/iso_639-2.json
import langs from "./data/iso_639-2.json";
import { OfferingTypeEnum } from "./@types/app";
import { BoundingBox } from "./@types/entrepot";
import langs from "@/data/iso_639-2.json";
import { OfferingTypeEnum } from "@/@types/app";
import { BoundingBox } from "@/@types/entrepot";

export type LanguageType = {
language: string;
Expand Down
2 changes: 2 additions & 0 deletions assets/vite-env.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/// <reference types="vite/client" />
/// <reference types="vite/types/importMeta.d.ts" />
1 change: 1 addition & 0 deletions compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ services:
- host.docker.internal:host-gateway
ports:
- "9092:8000"
- "5173:5173"
networks:
- web_dev
restart: unless-stopped
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"cweagans/composer-patches": "^1.7",
"friendsofsymfony/jsrouting-bundle": "^3.2",
"knpuniversity/oauth2-client-bundle": "^2.14",
"pentatrion/vite-bundle": "^7.0",
"phpdocumentor/reflection-docblock": "^5.3",
"phpstan/phpdoc-parser": "^1.28",
"stevenmaguire/oauth2-keycloak": "^5.0",
Expand Down Expand Up @@ -38,7 +39,6 @@
"symfony/uid": "6.4.*",
"symfony/validator": "6.4.*",
"symfony/web-link": "6.4.*",
"symfony/webpack-encore-bundle": "^2.0",
"symfony/yaml": "6.4.*",
"twig/extra-bundle": "^2.12|^3.0",
"twig/intl-extra": "^3.6",
Expand Down
Loading