diff --git a/front/package.json b/front/package.json
index 706a554..6a3e368 100644
--- a/front/package.json
+++ b/front/package.json
@@ -29,11 +29,9 @@
"*.{ts,tsx,js,jsx,json}": "prettier --write"
},
"dependencies": {
- "@chakra-ui/anatomy": "2.3.4",
"@chakra-ui/cli": "3.3.1",
"@chakra-ui/react": "3.3.1",
"@emotion/react": "11.14.0",
- "@emotion/styled": "11.14.0",
"allotment": "1.20.2",
"css-mediaquery": "0.1.2",
"dayjs": "1.11.13",
diff --git a/front/pnpm-lock.yaml b/front/pnpm-lock.yaml
index 63d780a..5a43b9b 100644
--- a/front/pnpm-lock.yaml
+++ b/front/pnpm-lock.yaml
@@ -8,9 +8,6 @@ importers:
.:
dependencies:
- '@chakra-ui/anatomy':
- specifier: 2.3.4
- version: 2.3.4
'@chakra-ui/cli':
specifier: 3.3.1
version: 3.3.1(@chakra-ui/react@3.3.1(@emotion/react@11.14.0(@types/react@18.3.8)(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
@@ -20,9 +17,6 @@ importers:
'@emotion/react':
specifier: 11.14.0
version: 11.14.0(@types/react@18.3.8)(react@18.3.1)
- '@emotion/styled':
- specifier: 11.14.0
- version: 11.14.0(@emotion/react@11.14.0(@types/react@18.3.8)(react@18.3.1))(@types/react@18.3.8)(react@18.3.1)
allotment:
specifier: 1.20.2
version: 1.20.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -378,9 +372,6 @@ packages:
'@bcoe/v8-coverage@0.2.3':
resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
- '@chakra-ui/anatomy@2.3.4':
- resolution: {integrity: sha512-fFIYN7L276gw0Q7/ikMMlZxP7mvnjRaWJ7f3Jsf9VtDOi6eAYIBRrhQe6+SZ0PGmoOkRaBc7gSE5oeIbgFFyrw==}
-
'@chakra-ui/cli@3.3.1':
resolution: {integrity: sha512-TTpGVT4RuajxzYjMP95Ba3HU052cmdrYgru77ZGD+IDb/HLATjpXNViFAn1R+ITMCxa4v0zqYEWLY9Ex2L090A==}
hasBin: true
@@ -444,16 +435,6 @@ packages:
'@emotion/sheet@1.4.0':
resolution: {integrity: sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==}
- '@emotion/styled@11.14.0':
- resolution: {integrity: sha512-XxfOnXFffatap2IyCeJyNov3kiDQWoR08gPUQxvbL7fxKryGBKUZUkG6Hz48DZwVrJSVh9sJboyV1Ds4OW6SgA==}
- peerDependencies:
- '@emotion/react': ^11.0.0-rc.0
- '@types/react': '*'
- react: '>=16.8.0'
- peerDependenciesMeta:
- '@types/react':
- optional: true
-
'@emotion/unitless@0.10.0':
resolution: {integrity: sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg==}
@@ -5469,8 +5450,6 @@ snapshots:
'@bcoe/v8-coverage@0.2.3': {}
- '@chakra-ui/anatomy@2.3.4': {}
-
'@chakra-ui/cli@3.3.1(@chakra-ui/react@3.3.1(@emotion/react@11.14.0(@types/react@18.3.8)(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))':
dependencies:
'@chakra-ui/react': 3.3.1(@emotion/react@11.14.0(@types/react@18.3.8)(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -5595,21 +5574,6 @@ snapshots:
'@emotion/sheet@1.4.0': {}
- '@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@18.3.8)(react@18.3.1))(@types/react@18.3.8)(react@18.3.1)':
- dependencies:
- '@babel/runtime': 7.24.7
- '@emotion/babel-plugin': 11.13.5
- '@emotion/is-prop-valid': 1.3.1
- '@emotion/react': 11.14.0(@types/react@18.3.8)(react@18.3.1)
- '@emotion/serialize': 1.3.3
- '@emotion/use-insertion-effect-with-fallbacks': 1.2.0(react@18.3.1)
- '@emotion/utils': 1.4.2
- react: 18.3.1
- optionalDependencies:
- '@types/react': 18.3.8
- transitivePeerDependencies:
- - supports-color
-
'@emotion/unitless@0.10.0': {}
'@emotion/use-insertion-effect-with-fallbacks@1.2.0(react@18.3.1)':
diff --git a/front/src/App.tsx b/front/src/App.tsx
index 4c119c0..efb8056 100644
--- a/front/src/App.tsx
+++ b/front/src/App.tsx
@@ -56,6 +56,7 @@ const AppEnvHint = () => {
return (
<>
{
insetEnd="0"
h="2px"
bg="warning.400"
- as="button"
cursor="pointer"
data-test-id="devtools"
onClick={dialog.onOpen}
@@ -84,7 +84,7 @@ const AppEnvHint = () => {
>
{envName.join(' : ')}
-
+
Outils développeurs
diff --git a/front/src/components/TopBar/TopBar.tsx b/front/src/components/TopBar/TopBar.tsx
index 4527a82..91a392b 100644
--- a/front/src/components/TopBar/TopBar.tsx
+++ b/front/src/components/TopBar/TopBar.tsx
@@ -38,7 +38,14 @@ import { Button } from '../ui/themed';
export const TOP_BAR_HEIGHT = '50px';
export const BUTTON_TOP_BAR_PROPERTY = {
- theme: '@menu',
+ bg: 'back.100',
+ color: 'brand.900',
+ borderRadius: 0,
+ border: 0,
+ _hover: { background: 'back.300' },
+ _focus: { border: 'none' },
+ fontSize: '20px',
+ textTransform: 'uppercase',
height: TOP_BAR_HEIGHT,
};
@@ -143,7 +150,7 @@ export const TopBar = ({ title, children }: TopBarProps) => {
{
data={dataAlbum?.covers}
size={BASE_WRAP_ICON_SIZE}
flex={1}
- // TODO: iconEmpty={LuDisc3}
+ iconEmpty={}
/>
{
overflowX="hidden"
flex={1}
>
- {
// noOfLines={[1, 2]}
>
{dataAlbum?.name}
-
-
+ {
// noOfLines={1}
>
{countTracksOfAnAlbum} track{countTracksOfAnAlbum >= 1 && 's'}
-
+
);
diff --git a/front/src/components/contextMenu/ContextMenu.tsx b/front/src/components/contextMenu/ContextMenu.tsx
index 482c365..76a24ae 100644
--- a/front/src/components/contextMenu/ContextMenu.tsx
+++ b/front/src/components/contextMenu/ContextMenu.tsx
@@ -1,12 +1,9 @@
import { useState } from 'react';
-import {
- IconButton,
-} from '@chakra-ui/react';
import { LuMenu } from 'react-icons/lu';
import { MenuContent, MenuItem, MenuRoot, MenuTrigger } from '../ui/menu';
-import { Button } from '../ui/themed';
-import { customVariant } from '@/theme/recipes/button';
+import { Button } from '../ui/button';
+
export type MenuElement = {
name: string;
@@ -17,21 +14,6 @@ export type ContextMenuProps = {
elements?: MenuElement[];
};
-const theme = {
- plop: {
- bg: { _light: 'red', _dark: 'brand.300', _pink: "orange" },
- _hover: { bg: { _light: 'green', _dark: 'brand.400', _pink: "black" } },
- // bg: { _light: 'brand.600', _dark: 'brand.300' },
- // _hover: { bg: { _light: 'brand.700', _dark: 'brand.400' } },
- /*
- bgActive: { _light: 'brand.600', _dark: 'brand.300' },
- color: { _light: 'white', _dark: 'brand.900' },
- colorHover: { _light: 'brand.800', _dark: 'brand.100' },
- boxShadowHover: 'outline-over'
- */
- }
-};
-
export const ContextMenu = ({ elements }: ContextMenuProps) => {
if (!elements) {
return <>>;
@@ -40,9 +22,11 @@ export const ContextMenu = ({ elements }: ContextMenuProps) => {
{/* This is very stupid, we need to set as span to prevent a button in button... WTF */}
-
+
diff --git a/front/src/components/form/FormCovers.tsx b/front/src/components/form/FormCovers.tsx
index 547e12a..254efcc 100644
--- a/front/src/components/form/FormCovers.tsx
+++ b/front/src/components/form/FormCovers.tsx
@@ -104,14 +104,13 @@ export const CenterIcon = ({
return (
+ >{IconEl}
);
};
@@ -150,14 +149,13 @@ export const FormCovers = ({
onRemove && onRemove(index)}
- />
+ >
diff --git a/front/src/components/popup/AlbumEditPopUp.tsx b/front/src/components/popup/AlbumEditPopUp.tsx
index 1ba321d..c0ddd3f 100644
--- a/front/src/components/popup/AlbumEditPopUp.tsx
+++ b/front/src/components/popup/AlbumEditPopUp.tsx
@@ -25,7 +25,8 @@ import { useServiceContext } from '@/service/ServiceContext';
import { useCountTracksWithAlbumId } from '@/service/Track';
import { isNullOrUndefined } from '@/utils/validator';
import { DialogBody, DialogContent, DialogFooter, DialogHeader, DialogRoot } from '@/components/ui/dialog';
-import { Button } from '../ui/themed';
+import { Button } from '../ui/button';
+
export type AlbumEditPopUpProps = {};
@@ -168,7 +169,9 @@ export const AlbumEditPopUp = ({ }: AlbumEditPopUpProps) => {