Merge branch 'main' into gallery-component

.eslintrc.js

@@ -108,7 +108,12 @@ module.exports = {
     'import/no-duplicates': 'error',
     'import/no-named-default': 'error',
     'import/no-namespace': 'error',
-    'import/no-unassigned-import': 'error',
+    'import/no-unassigned-import': [
+      'error',
+      {
+        allow: ['**/*.css'],
+      },
+    ],
     'import/order': [
       'error',
       {

src/Components/Map/Subcomponents/Controls/LocateControl.tsx

@@ -9,7 +9,6 @@ import { useEffect, useRef, useState } from 'react'
 import { useMap, useMapEvents } from 'react-leaflet'
 // eslint-disable-next-line import/no-unassigned-import
 import 'leaflet.locatecontrol'
-// eslint-disable-next-line import/no-unassigned-import
 import 'leaflet.locatecontrol/dist/L.Control.Locate.css'
 
 // Converts leaflet.locatecontrol to a React Component

src/Components/Map/UtopiaMap.tsx

@@ -6,8 +6,6 @@ import { ContextWrapper } from '#components/AppShell/ContextWrapper'
 import { UtopiaMapInner } from './UtopiaMapInner'
 
 import type { UtopiaMapProps } from '#types/UtopiaMapProps'
-
-// eslint-disable-next-line import/no-unassigned-import
 import 'react-toastify/dist/ReactToastify.css'
 
 function UtopiaMap({

src/Components/Map/UtopiaMapInner.tsx

@@ -8,13 +8,10 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { Children, cloneElement, isValidElement, useEffect, useRef, useState } from 'react'
 import { TileLayer, useMapEvents, GeoJSON, useMap } from 'react-leaflet'
-// eslint-disable-next-line import/no-unassigned-import
 import 'leaflet/dist/leaflet.css'
 import MarkerClusterGroup from 'react-leaflet-cluster'
 import { Outlet, useLocation } from 'react-router-dom'
 import { toast } from 'react-toastify'
-
-// eslint-disable-next-line import/no-unassigned-import
 import './UtopiaMap.css'
 
 import { containsUUID } from '#utils/ContainsUUID'

src/Components/Profile/Subcomponents/AvatarWidget.tsx

@@ -6,7 +6,6 @@ import { useState, useCallback, useRef } from 'react'
 import { ReactCrop, centerCrop, makeAspectCrop } from 'react-image-crop'
 
 import { useAppState } from '#components/AppShell/hooks/useAppState'
-// eslint-disable-next-line import/no-unassigned-import
 import 'react-image-crop/dist/ReactCrop.css'
 import DialogModal from '#components/Templates/DialogModal'
 

src/Components/Profile/Subcomponents/ColorPicker.tsx

@@ -5,7 +5,6 @@
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { HexColorPicker } from 'react-colorful'
 
-// eslint-disable-next-line import/no-unassigned-import
 import './ColorPicker.css'
 import useClickOutside from '#components/Profile/hooks/useClickOutside'
 

src/index.tsx

@@ -1,4 +1,3 @@
-// eslint-disable-next-line import/no-unassigned-import
 import './index.css'
 
 export {