Merge branch 'develop' into dependabot/npm_and_yarn/json5-1.0.2

CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.3.9](https://github.com/clm-roig/suivie/compare/v0.3.8...v0.3.9) (2023-12-08)
+
+
+### Bug Fixes
+
+* **trackerCard:** move drag icon to the center of the card ([070a3fa](https://github.com/clm-roig/suivie/commit/070a3fa0a3587af183f917a0f47b08227ddbe975))
+
+### [0.3.8](https://github.com/clm-roig/suivie/compare/v0.3.7...v0.3.8) (2023-10-01)
+
+
+### Bug Fixes
+
+* **badge:** fix badges shields issue (https://github.com/badges/shields/issues/8671) ([f7b9932](https://github.com/clm-roig/suivie/commit/f7b993292cb0a6bb1a4d110cb0829e31e110da77))
+* **dnd:** allow drag n drop only if using the handler ([681dae4](https://github.com/clm-roig/suivie/commit/681dae4f9c9e621cfb76285d716dbcceca1bbe2d))
+
 ### [0.3.7](https://github.com/clm-roig/suivie/compare/v0.3.5...v0.3.7) (2022-10-19)
 
 

README.md

@@ -7,7 +7,7 @@
   </i></p>
 
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/9f4ce0a620d94a07aad5190f009b9b79)](https://www.codacy.com/gh/Clm-Roig/suivie/dashboard?utm_source=github.com&utm_medium=referral&utm_content=Clm-Roig/suivie&utm_campaign=Badge_Grade)
-![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/clm-roig/suivie/Build%20&%20test/develop)
+![GitHub Workflow Status (branch)](https://img.shields.io/github/actions/workflow/status/clm-roig/suivie/build_test.yml?branch=develop)
 [![cypress](https://img.shields.io/endpoint?url=https://dashboard.cypress.io/badge/detailed/i4ns1y&style=flat&logo=cypress)](https://dashboard.cypress.io/projects/i4ns1y/runs)
 [![GitHub tag](https://img.shields.io/github/tag/clm-roig/suivie?include_prereleases=&sort=semver&color=blue)](https://github.com/clm-roig/suivie/releases/)
 [![code style: prettier](https://img.shields.io/badge/code_style-prettier-yellow.svg)](https://github.com/prettier/prettier)

package.json

@@ -1,7 +1,7 @@
 {
   "name": "suivie",
   "homepage": "https://clm-roig.github.io/suivie",
-  "version": "0.3.7",
+  "version": "0.3.9",
   "private": true,
   "jest": {},
   "dependencies": {

src/components/TrackerCard/TrackerCardHeader.tsx

@@ -130,11 +130,11 @@ const TrackerCardHeader: FC<Props> = ({ dragControls, tracker, ...cardHeaderProp
         }
         title={
           <Stack direction="row" alignItems="center" gap={1}>
+            <Typography variant="h5">{name}</Typography>
             <StyledDragIndicator
               sx={{ fontSize: 18 }}
               onPointerDown={(e) => dragControls.start(e)}
             />
-            <Typography variant="h5">{name}</Typography>
           </Stack>
         }
         subheader={

src/config/Constants.ts

@@ -5,10 +5,6 @@ export const JSON_DATA_EXTENSION = '.sv.json'; // SuiVie json
 export const PAYPAL_DONATE_URL =
   'https://www.paypal.com/donate/?business=UF2GH7ZPMLES8&no_recurring=0&item_name=Chaque+don+me+permet+de+continuer+%C3%A0+d%C3%A9velopper+et+%C3%A0+am%C3%A9liorer+l%27application+SuiVie%2C+merci+%21+%3A%29&currency_code=EUR';
 
-export const BUG_REPORT_FORM_URL = 'https://framaforms.org/suivie-rapport-de-bug-1656787432';
-export const IMPROVEMENT_SUGGESTION_FORM_URL =
-  'https://framaforms.org/suivie-suggestion-damelioration-1657039112';
-
 export const DEFAULT_COMPLETION_NAME = 'fois';
 export const APP_NAME = 'SuiVie';
 

src/pages/About/About.tsx

@@ -1,17 +1,12 @@
 import GitHubIcon from '@mui/icons-material/GitHub';
 import PaletteIcon from '@mui/icons-material/Palette';
 import VolunteerActivismIcon from '@mui/icons-material/VolunteerActivism';
-import { Box, Button, Divider, Link, Stack, Typography } from '@mui/material';
+import { Box, Button, Link, Stack, Typography } from '@mui/material';
 import { Link as RouterLink } from 'react-router-dom';
 
 import DefaultPageLayout from '../../components/DefaultPageLayout/DefaultPageLayout';
 import ExternalLink from '../../components/ExternalLink/ExternalLink';
-import {
-  APP_NAME,
-  BUG_REPORT_FORM_URL,
-  IMPROVEMENT_SUGGESTION_FORM_URL,
-  PAYPAL_DONATE_URL
-} from '../../config/Constants';
+import { APP_NAME, PAYPAL_DONATE_URL } from '../../config/Constants';
 import PackageVersion from './PackageVersion';
 
 function About() {
@@ -53,38 +48,6 @@ function About() {
             </Link>
           </Stack>
         </Box>
-
-        <Divider sx={{ my: 2 }} />
-
-        <Box>
-          <Typography variant="h2" gutterBottom>
-            Suggérer une amélioration
-          </Typography>
-          <iframe src={IMPROVEMENT_SUGGESTION_FORM_URL} width="100%" height="600"></iframe>
-          <Typography>
-            {
-              "Si le formulaire n'apparaît pas ci-dessus, vous pouvez le remplir en suivant ce lien : "
-            }
-            <ExternalLink href={IMPROVEMENT_SUGGESTION_FORM_URL}>
-              {"SuiVie - Suggestion d'amélioration"}
-            </ExternalLink>
-          </Typography>
-        </Box>
-
-        <Divider sx={{ my: 2 }} />
-
-        <Box>
-          <Typography variant="h2" gutterBottom>
-            Signaler un bug
-          </Typography>
-          <iframe src={BUG_REPORT_FORM_URL} width="100%" height="600"></iframe>
-          <Typography>
-            {
-              "Si le formulaire n'apparaît pas ci-dessus, vous pouvez le remplir en suivant ce lien : "
-            }
-            <ExternalLink href={BUG_REPORT_FORM_URL}>SuiVie - Rapport de bug</ExternalLink>
-          </Typography>
-        </Box>
       </DefaultPageLayout>
       <PackageVersion style={{ bottom: 0, right: 0, position: 'fixed' }} />
     </>

src/pages/Trackers/Trackers.tsx

@@ -1,8 +1,8 @@
 import BallotIcon from '@mui/icons-material/Ballot';
-import BugReportIcon from '@mui/icons-material/BugReport';
 import CheckIcon from '@mui/icons-material/Check';
 import CloseIcon from '@mui/icons-material/Close';
 import MoreVertIcon from '@mui/icons-material/MoreVert';
+import TimelineIcon from '@mui/icons-material/Timeline';
 import ViewListIcon from '@mui/icons-material/ViewList';
 import VisibilityOffIcon from '@mui/icons-material/VisibilityOff';
 import {
@@ -23,7 +23,6 @@ import TabPanel from '../../components/TabPanel/TabPanel';
 import AddTrackerCard from '../../components/TrackerCardList/AddTrackerCard';
 import DateSelector from '../../components/TrackerCardList/DaySelector';
 import TrackerCardList from '../../components/TrackerCardList/TrackerCardList';
-import { BUG_REPORT_FORM_URL } from '../../config/Constants';
 import { useAppDispatch, useAppSelector } from '../../hooks/redux';
 import {
   selectHiddenTrackers,
@@ -56,9 +55,9 @@ function Trackers() {
       onClick: () => navigate('/trackers/manage')
     },
     {
-      icon: <BugReportIcon />,
-      name: 'Signaler un bug',
-      onClick: () => window.open(BUG_REPORT_FORM_URL, '_blank')
+      icon: <TimelineIcon />,
+      name: 'Statistiques',
+      onClick: () => navigate('/stats')
     }
   ];
 
@@ -77,7 +76,7 @@ function Trackers() {
         <DateSelector date={selectedDate} setDate={handleSetDate} />
 
         {doneTrackers.length + hiddenTrackers.length + todoTrackers.length === 0 && (
-          <Typography align="center">{'Aucun tracker pour ce jour-ci.'}</Typography>
+          <Typography align="center">Aucun tracker pour ce jour-ci.</Typography>
         )}
 
         <Tabs