Skip to content

Commit

Permalink
linter order import
Browse files Browse the repository at this point in the history
  • Loading branch information
dodoLaprovence committed Nov 11, 2024
1 parent f441412 commit f30b34b
Show file tree
Hide file tree
Showing 146 changed files with 187 additions and 333 deletions.
3 changes: 0 additions & 3 deletions server/controllers/analytic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,6 @@ analyticController.router.post(
AppDataSource.getRepository(User).createQueryBuilder('user').select('user.firstlogin').where({ id: data.userId }).getRawOne(),
]);

console.log('USER IN CONTROLLER %!!!!!', data.userId);
console.log('USER PHASE IN CONTROLLER %!!!!!', userPhase);

if (sessionCount === 0 && data.event === 'pageview' && data.params?.isInitial) {
const session = new AnalyticSession();
session.id = data.sessionId;
Expand Down
5 changes: 2 additions & 3 deletions src/components/Avatar.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import Link from 'next/link';
import React from 'react';

import PersonIcon from '@mui/icons-material/Person';
import { Avatar, Tooltip } from '@mui/material';
import Link from 'next/link';
import React from 'react';

import { bgPage } from 'src/styles/variables.const';
import PelicoSouriant from 'src/svg/pelico/pelico-souriant.svg';
Expand Down
3 changes: 1 addition & 2 deletions src/components/Base.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react';

import { Box, Grid } from '@mui/material';
import React from 'react';

import { Navigation } from './Navigation';
import { NavigationMobile } from './NavigationMobile';
Expand Down
3 changes: 1 addition & 2 deletions src/components/FinalStep/ImageStepContainer.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { Grid, ButtonBase } from '@mui/material';
import classNames from 'classnames';
import Image from 'next/image';
import router from 'next/router';
import React from 'react';

import { Grid, ButtonBase } from '@mui/material';

import { KeepRatio } from '../KeepRatio';
import { EditButton } from '../buttons/EditButton';
import { bgPage, primaryColor, warningColor } from 'src/styles/variables.const';
Expand Down
3 changes: 1 addition & 2 deletions src/components/H5pOLD.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react';

import CircularProgress from '@mui/material/CircularProgress';
import React from 'react';

import { bgPage } from 'src/styles/variables.const';

Expand Down
7 changes: 3 additions & 4 deletions src/components/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import Link from 'next/link';
import { useRouter } from 'next/router';
import React from 'react';

import SettingsIcon from '@mui/icons-material/Settings';
import { Box } from '@mui/material';
import IconButton from '@mui/material/IconButton';
import Menu from '@mui/material/Menu';
import MenuItem from '@mui/material/MenuItem';
import Link from 'next/link';
import { useRouter } from 'next/router';
import React from 'react';

import AccessControl from './AccessControl';
import { VillageSelect } from './VillageSelect';
Expand Down
3 changes: 1 addition & 2 deletions src/components/LanguageFilter.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React from 'react';

import type { SxProps, Theme } from '@mui/material';
import { Autocomplete, TextField } from '@mui/material';
import React from 'react';

import type { Language } from 'types/language.type';

Expand Down
1 change: 0 additions & 1 deletion src/components/Map/Map.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {} from 'leaflet.fullscreen';
import maplibregl from 'maplibre-gl';
import { useRouter } from 'next/router';
import React from 'react';

// eslint-disable-next-line import/order
import { Tooltip } from '@mui/material';

Expand Down
3 changes: 1 addition & 2 deletions src/components/Modal.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import React from 'react';

import CloseIcon from '@mui/icons-material/Close';
import { CircularProgress } from '@mui/material';
import Box from '@mui/material/Box';
Expand All @@ -12,6 +10,7 @@ import IconButton from '@mui/material/IconButton';
import type { LinearProgressProps } from '@mui/material/LinearProgress';
import LinearProgress from '@mui/material/LinearProgress';
import Typography from '@mui/material/Typography';
import React from 'react';

import { RedButton } from 'src/components/buttons/RedButton';
import { bgPage } from 'src/styles/variables.const';
Expand Down
5 changes: 2 additions & 3 deletions src/components/Navigation.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { Box, Button } from '@mui/material';
import Switch from '@mui/material/Switch';
import Link from 'next/link';
import { useRouter } from 'next/router';
import * as React from 'react';

import { Box, Button } from '@mui/material';
import Switch from '@mui/material/Switch';

import { AvatarImg } from './Avatar';
import { VillageMonde } from './VillageMonde';
import { Modal } from 'src/components/Modal';
Expand Down
3 changes: 1 addition & 2 deletions src/components/NavigationMobile.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import React, { useState } from 'react';

import CloseIcon from '@mui/icons-material/Close';
import MenuIcon from '@mui/icons-material/Menu';
import Box from '@mui/material/Box';
import Divider from '@mui/material/Divider';
import Drawer from '@mui/material/Drawer';
import Grid from '@mui/material/Grid';
import IconButton from '@mui/material/IconButton';
import React, { useState } from 'react';

import { Navigation } from './Navigation';
import ShowFor from './ShowFor';
Expand Down
3 changes: 1 addition & 2 deletions src/components/PageLayout.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react';

import { Box } from '@mui/material';
import React from 'react';

type PageLayoutProps = {
children: React.ReactNode;
Expand Down
3 changes: 1 addition & 2 deletions src/components/PaginationNav/PaginationNav.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React from 'react';

import type { SelectChangeEvent } from '@mui/material';
import { Box, InputLabel, MenuItem, Pagination, Select } from '@mui/material';
import React from 'react';

interface PaginationNavProps {
page: number;
Expand Down
3 changes: 1 addition & 2 deletions src/components/SearchField.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import React from 'react';

import SearchIcon from '@mui/icons-material/Search';
import InputBase from '@mui/material/InputBase';
import type { SxProps, Theme } from '@mui/material/styles';
import { styled } from '@mui/material/styles';
import React from 'react';

const Search = styled('div')(({ theme }) => ({
position: 'relative',
Expand Down
5 changes: 2 additions & 3 deletions src/components/Steps.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { useRouter } from 'next/router';
import React from 'react';

import CheckIcon from '@mui/icons-material/Check';
import { Step, StepConnector, StepLabel, Stepper } from '@mui/material/';
import type { StepIconProps } from '@mui/material/StepIcon';
import { useRouter } from 'next/router';
import React from 'react';

import { ActivityContext } from 'src/contexts/activityContext';
import { primaryColor, primaryColorLight2, successColor, warningColor } from 'src/styles/variables.const';
Expand Down
5 changes: 2 additions & 3 deletions src/components/StepsButtons.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import Link from 'next/link';
import React from 'react';

import ChevronLeftIcon from '@mui/icons-material/ChevronLeft';
import ChevronRightIcon from '@mui/icons-material/ChevronRight';
import { Box, Button } from '@mui/material';
import Link from 'next/link';
import React from 'react';

export interface StepsButtonProps {
prev?: string | (() => void);
Expand Down
7 changes: 3 additions & 4 deletions src/components/SuggestionCarousel/SuggestionCarousel.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import Image from 'next/image';
import Link from 'next/link';
import React from 'react';

import { Button } from '@mui/material';
import Card from '@mui/material/Card';
import Tab from '@mui/material/Tab';
import Tabs from '@mui/material/Tabs';
import Image from 'next/image';
import Link from 'next/link';
import React from 'react';

import { KeepRatio } from 'src/components/KeepRatio';
import { useResizeObserver } from 'src/hooks/useResizeObserver';
Expand Down
3 changes: 1 addition & 2 deletions src/components/VillageMonde.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import * as React from 'react';

import { Typography } from '@mui/material';
import * as React from 'react';

import { Flag } from 'src/components/Flag';
import { ClassroomContext } from 'src/contexts/classroomContext';
Expand Down
3 changes: 1 addition & 2 deletions src/components/VillageSelect.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react';

import { Button, Grid } from '@mui/material';
import React from 'react';

import { UserContext } from 'src/contexts/userContext';
import { VillageContext } from 'src/contexts/villageContext';
Expand Down
5 changes: 2 additions & 3 deletions src/components/WelcomeModal/FirstPhase.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import { useSnackbar } from 'notistack';
import React from 'react';

import KeyboardArrowLeft from '@mui/icons-material/KeyboardArrowLeft';
import KeyboardArrowRight from '@mui/icons-material/KeyboardArrowRight';
import { Checkbox } from '@mui/material';
import Button from '@mui/material/Button';
import MobileStepper from '@mui/material/MobileStepper';
import { useSnackbar } from 'notistack';
import React from 'react';

import { CGU } from 'src/components/CGU';
import { Flag } from 'src/components/Flag';
Expand Down
3 changes: 1 addition & 2 deletions src/components/WelcomeModal/SecondPhase.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import Button from '@mui/material/Button';
import { useSnackbar } from 'notistack';
import React from 'react';

import Button from '@mui/material/Button';

import { Modal } from 'src/components/Modal';
import { UserContext } from 'src/contexts/userContext';
import { VillageContext } from 'src/contexts/villageContext';
Expand Down
3 changes: 1 addition & 2 deletions src/components/WelcomeModal/ThirdPhase.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import Button from '@mui/material/Button';
import { useSnackbar } from 'notistack';
import React from 'react';

import Button from '@mui/material/Button';

import { Modal } from 'src/components/Modal';
import { UserContext } from 'src/contexts/userContext';
import { VillageContext } from 'src/contexts/villageContext';
Expand Down
3 changes: 1 addition & 2 deletions src/components/WorldMap/Popover.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import * as React from 'react';

import Card from '@mui/material/Card';
import * as React from 'react';

import { UserPopover } from './UserPopover';
import type { User } from 'types/user.type';
Expand Down
9 changes: 4 additions & 5 deletions src/components/WorldMap/WorldMap.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
import 'leaflet/dist/leaflet.css';
import 'maplibre-gl/dist/maplibre-gl.css';
import AddIcon from '@mui/icons-material/Add';
import CloseIcon from '@mui/icons-material/Close';
import RemoveIcon from '@mui/icons-material/Remove';
import { Button, ButtonGroup, IconButton, Typography } from '@mui/material';
import L from 'leaflet';
import {} from 'leaflet.fullscreen';
import { useRouter } from 'next/router';
import * as React from 'react';
import ReactDOM from 'react-dom';
import { useQuery } from 'react-query';

import AddIcon from '@mui/icons-material/Add';
import CloseIcon from '@mui/icons-material/Close';
import RemoveIcon from '@mui/icons-material/Remove';
import { Button, ButtonGroup, IconButton, Typography } from '@mui/material';

import type { PopoverData } from './Popover';
import { isUser, Popover } from './Popover';
import { UserPopover } from './UserPopover';
Expand Down
3 changes: 1 addition & 2 deletions src/components/WorldMap/use-full-screen.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import * as React from 'react';

import FullscreenIcon from '@mui/icons-material/Fullscreen';
import FullscreenExitIcon from '@mui/icons-material/FullscreenExit';
import Button from '@mui/material/Button';
import Tooltip from '@mui/material/Tooltip';
import * as React from 'react';

export const useFullScreen = () => {
const containerRef = React.useRef<HTMLDivElement>(null);
Expand Down
3 changes: 1 addition & 2 deletions src/components/accueil/Filters/FilterSelect.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import React from 'react';

import ExpandLessIcon from '@mui/icons-material/ExpandLess';
import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
import Checkbox from '@mui/material/Checkbox';
import ClickAwayListener from '@mui/material/ClickAwayListener';
import FormControlLabel from '@mui/material/FormControlLabel';
import FormGroup from '@mui/material/FormGroup';
import React from 'react';

import { primaryColor } from 'src/styles/variables.const';

Expand Down
3 changes: 1 addition & 2 deletions src/components/accueil/Filters/Filters.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React from 'react';

import { Box } from '@mui/material';
import Checkbox from '@mui/material/Checkbox';
import React from 'react';

import { FilterSelect } from './FilterSelect';
import { Flag } from 'src/components/Flag';
Expand Down
3 changes: 1 addition & 2 deletions src/components/accueil/LastActivities.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react';

import { Button } from '@mui/material';
import React from 'react';

import { CommentIcon } from '../activities/ActivityCard/CommentIcon';
import { icons, DESC } from 'src/components/activities/utils';
Expand Down
3 changes: 1 addition & 2 deletions src/components/accueil/LinkChild.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { Button, TextField } from '@mui/material';
import { useRouter } from 'next/router';
import { useSnackbar } from 'notistack';
import React from 'react';

import { Button, TextField } from '@mui/material';

import { DeleteButton } from '../buttons/DeleteButton';
// import { ClassroomContext } from 'src/contexts/classroomContext';
import { UserContext } from 'src/contexts/userContext';
Expand Down
3 changes: 1 addition & 2 deletions src/components/accueil/NewHome.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { Box, Button, Grid, Typography } from '@mui/material';
import { useRouter } from 'next/router';
import React from 'react';

import { Box, Button, Grid, Typography } from '@mui/material';

import Home from 'src/svg/home.svg';
import Logo from 'src/svg/logo_1village.svg';
import School from 'src/svg/school.svg';
Expand Down
3 changes: 1 addition & 2 deletions src/components/accueil/PelicoProfilNavigation.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react';

import { Avatar, Button } from '@mui/material';
import React from 'react';

import { CommentIcon } from '../activities/ActivityCard/CommentIcon';
import { icons, DESC } from 'src/components/activities/utils';
Expand Down
3 changes: 1 addition & 2 deletions src/components/accueil/RightNavigation.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { Box, Button, Link, Tooltip } from '@mui/material';
import Image from 'next/image';
import { useRouter } from 'next/router';
import type { ReactNode } from 'react';
import React from 'react';

import { Box, Button, Link, Tooltip } from '@mui/material';

import { AvatarImg } from '../Avatar';
import { Flag } from '../Flag';
import { LastActivities } from './LastActivities';
Expand Down
3 changes: 1 addition & 2 deletions src/components/accueil/SubHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { Box, Typography } from '@mui/material';
import { useRouter } from 'next/router';
import React from 'react';

import { Box, Typography } from '@mui/material';

import { VillageContext } from 'src/contexts/villageContext';
import { primaryColor } from 'src/styles/variables.const';
import JumellesLight from 'src/svg/jumelles-light.svg';
Expand Down
3 changes: 1 addition & 2 deletions src/components/accueil/VideoPresentation.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
// import { Button, Link as RegisterLink, NoSsr, Box, TextField, Grid } from '@mui/material';
import { Button, Link as RegisterLink, NoSsr } from '@mui/material';
import Link from 'next/link';
import React from 'react';

import { Button, Link as RegisterLink, NoSsr } from '@mui/material';

import { KeepRatio } from 'src/components/KeepRatio';
import Logo from 'src/svg/logo.svg';
// import PelicoReflechit from 'src/svg/pelico/pelico_reflechit.svg';
Expand Down
3 changes: 1 addition & 2 deletions src/components/accueil/VillageComponent.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React from 'react';

import Card from '@mui/material/Card';
import CardActionArea from '@mui/material/CardActionArea';
import React from 'react';

import { KeepRatio } from 'src/components/KeepRatio';
import Acti1 from 'src/svg/activities/acti1.svg';
Expand Down
3 changes: 1 addition & 2 deletions src/components/activities/ActivityCard/AnthemCard.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { Button } from '@mui/material';
import Link from 'next/link';
import React from 'react';

import { Button } from '@mui/material';

import { CommentIcon } from './CommentIcon';
import type { ActivityCardProps } from './activity-card.types';
import { RedButton } from 'src/components/buttons/RedButton';
Expand Down
Loading

0 comments on commit f30b34b

Please sign in to comment.