Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
pantaflex44 committed Jan 8, 2025
2 parents 07f0711 + 6d6e2e3 commit 99df2c8
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 207 deletions.
2 changes: 0 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
VITE_APP_MODE="development"

VITE_APP_WIZARD="true"

VITE_APP_BASE="/"
VITE_APP_LOCALE="fr-FR"
VITE_APP_LOCALES="fr-FR,en-US"
Expand Down
2 changes: 0 additions & 2 deletions .env.ghpages
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
VITE_APP_MODE="production"

VITE_APP_WIZARD="false"

VITE_APP_BASE="/Tiquettes/"
VITE_APP_LOCALE="fr-FR"
VITE_APP_LOCALES="fr-FR,en-US"
Expand Down
2 changes: 0 additions & 2 deletions .env.web
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
VITE_APP_MODE="production"

VITE_APP_WIZARD="false"

VITE_APP_BASE="/app/"
VITE_APP_LOCALE="fr-FR"
VITE_APP_LOCALES="fr-FR,en-US"
Expand Down
18 changes: 18 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,24 @@
});
</script>

<!-- Matomo -->
<script>
var _paq = window._paq = window._paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function () {
var u = "//www.tiquettes.fr/analytics/";
_paq.push(['setTrackerUrl', u + 'matomo.php']);
_paq.push(['setSiteId', '1']);
var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
g.async = true;
g.src = u + 'matomo.js';
s.parentNode.insertBefore(g, s);
})();
</script>
<!-- End Matomo Code -->

<link rel="preload" as="image" href="./swb_alim.svg"/>
<link rel="preload" as="image" href="./swb_alim_eco.svg"/>
<link rel="preload" as="image" href="./swb_alim_ht.svg"/>
Expand Down
12 changes: 0 additions & 12 deletions src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ import NewProjectEditor from "./NewProjectEditor.jsx";
import SummaryTab from "./SummaryTab.jsx";
import SchemaTab from "./SchemaTab.jsx";
import WelcomePopup from "./WelcomePopup.jsx";
import Models from "./Models.jsx";

function App() {
const importRef = useRef();
Expand All @@ -65,7 +64,6 @@ function App() {
const [clipboard, setClipboard] = useState(null);
const [monitorOpened, setMonitorOpened] = useState(false);
const [welcome, setWelcome] = useState(false);
const [wizard, setWizard] = useState(false);

const UIFrozen = useMemo(() => clipboard !== null, [clipboard]);

Expand Down Expand Up @@ -94,7 +92,6 @@ function App() {
const rowsMax = parseInt(import.meta.env.VITE_ROWS_MAX);
const heightMin = parseInt(import.meta.env.VITE_HEIGHT_MIN);
const heightMax = parseInt(import.meta.env.VITE_HEIGHT_MAX);
const wizardAllowed = (import.meta.env.VITE_APP_WIZARD ?? '').trim().toLowerCase() === 'true';

const defaultModule = useMemo(() => ({
id: '',
Expand Down Expand Up @@ -1572,15 +1569,6 @@ function App() {
importProjectChooseFile();
setWelcome(false);
}}
onWizard={() => {
setWizard(true);
setWelcome(false);
}}
wizardAllowed={wizardAllowed}
/>}

{wizard && <Models
onCancel={() => setWizard(false)}
/>}

</div>
Expand Down
87 changes: 0 additions & 87 deletions src/Models.jsx

This file was deleted.

14 changes: 0 additions & 14 deletions src/WelcomePopup.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ export default function WelcomePopup({
onCancel,
onNewProject,
onImportProject,
onWizard,
wizardAllowed = false
}) {
return <Popup
title={"Bienvenue sur Tiquettes"}
Expand All @@ -51,18 +49,6 @@ export default function WelcomePopup({
</div>
</div>
</li>
{wizardAllowed && (
<li onClick={() => {
onWizard();
}}>
<img src={modelsIcon} width={48} height={48} alt="Models"/>
<div className="bigList-content">
<div className="bigList-content_title">Modèle par référence</div>
<div className="bigList-content_description">Pour vous aider à concevoir votre projet, Tiquettes vous propose des modèles de tableaux pré-conçus.
</div>
</div>
</li>
)}
<li onClick={() => {
onImportProject();
}}>
Expand Down
88 changes: 0 additions & 88 deletions src/models.css

This file was deleted.

0 comments on commit 99df2c8

Please sign in to comment.