Skip to content

Commit 3d13832

Browse files
apply alphabetic, explicit import sorting
1 parent 60cb8ef commit 3d13832

29 files changed

+101
-98
lines changed

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
"[python]": {
2424
"editor.defaultFormatter": "charliermarsh.ruff"
2525
},
26+
"editor.codeActionsOnSave": {
27+
"source.organizeImports": "explicit"
28+
},
2629
"python.analysis.autoImportCompletions": true,
2730
"python.testing.pytestArgs": ["tests"],
2831
"python.testing.unittestEnabled": false,

web_client/src/App.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1+
import { useEffect } from 'react';
12
import Modal from 'react-modal';
23
import { Navigate, Route, Routes, useNavigate } from 'react-router-dom';
34
import { ToastContainer } from 'react-toastify';
5+
import { useIssues } from './api/options.ts';
46
import AvailableBottles from './components/bottle/AvailableBottles.tsx';
57
import BottleList from './components/bottle/BottleList.tsx';
68
import CocktailList from './components/cocktail/CocktailList.tsx';
79
import GettingConfiguration from './components/common/GettingConfiguration.tsx';
810
import { MakerPasswordProtected, MasterPasswordProtected } from './components/common/ProtectedRoute.tsx';
911
import Header from './components/Header.tsx';
1012
import IngredientList from './components/ingredient/IngredientList.tsx';
13+
import IssuePage from './components/IssuePage.tsx';
1114
import AddonManager from './components/options/AddonManager.tsx';
1215
import CalibrationWindow from './components/options/CalibrationWindow.tsx';
1316
import ConfigWindow from './components/options/ConfigWindow.tsx';
1417
import DataWindow from './components/options/DataWindow.tsx';
1518
import LogWindow from './components/options/LogWindow.tsx';
1619
import OptionWindow from './components/options/OptionWindow.tsx';
20+
import TimeManager from './components/options/TimeManager.tsx';
1721
import WifiManager from './components/options/WifiManager.tsx';
1822
import RecipeList from './components/recipe/RecipeList.tsx';
1923
import { useConfig } from './ConfigProvider.tsx';
2024
import useAxiosInterceptors from './hooks/useAxiosInterceptors.ts';
21-
import { useIssues } from './api/options.ts';
22-
import { useEffect } from 'react';
23-
import IssuePage from './components/IssuePage.tsx';
24-
import TimeManager from './components/options/TimeManager.tsx';
2525
import { hastNotIgnoredStartupIssues } from './utils.tsx';
2626

2727
Modal.setAppElement('#root');

web_client/src/AuthProvider.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { createContext, useState, useContext, useEffect, useMemo } from 'react';
1+
import React, { createContext, useContext, useEffect, useMemo, useState } from 'react';
22
import { useLocation } from 'react-router-dom';
33
import { useConfig } from './ConfigProvider';
44

web_client/src/ConfigProvider.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import React, { createContext, useState, useEffect, useContext, useMemo } from 'react';
1+
import React, { createContext, useContext, useEffect, useMemo, useState } from 'react';
2+
import { useTranslation } from 'react-i18next';
23
import { getConfigValues } from './api/options';
34
import { DefinedConfigData } from './types/models';
4-
import { useTranslation } from 'react-i18next';
55

66
interface IConfig {
77
config: DefinedConfigData;

web_client/src/CustomColorProvider.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import React, { createContext, useState, useEffect, useContext, useMemo } from 'react';
2-
import { CustomColors } from './types/models';
1+
import React, { createContext, useContext, useEffect, useMemo, useState } from 'react';
32
import { useConfig } from './ConfigProvider';
3+
import { CustomColors } from './types/models';
44

55
interface ICustomColor {
66
customColors: CustomColors;

web_client/src/api/bottles.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Bottle } from '../types/models';
21
import { useQuery, UseQueryResult } from 'react-query';
2+
import { Bottle } from '../types/models';
33
import { axiosInstance } from './common';
44

55
const bottle_url = '/bottles';

web_client/src/api/options.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import { useQuery, UseQueryResult } from 'react-query';
2-
import { axiosInstance } from './common';
32
import {
4-
ConsumeData,
5-
LogData,
3+
AddonData,
64
ConfigData,
75
ConfigDataWithUiInfo,
8-
AddonData,
9-
WifiData,
6+
ConsumeData,
107
DefinedConfigData,
118
IssueData,
9+
LogData,
10+
WifiData,
1211
} from '../types/models';
12+
import { axiosInstance } from './common';
1313

1414
const options_url = '/options';
1515

web_client/src/components/bottle/AvailableBottles.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import React, { useEffect, useState } from 'react';
2-
import { postAvailableIngredients, useAvailableIngredients, useIngredients } from '../../api/ingredients';
3-
import { Ingredient } from '../../types/models';
4-
import ListView from './ListView';
2+
import { useTranslation } from 'react-i18next';
3+
import { FaMinusCircle, FaPlusCircle } from 'react-icons/fa';
54
import { useNavigate } from 'react-router-dom';
6-
import { FaPlusCircle, FaMinusCircle } from 'react-icons/fa';
75
import { toast } from 'react-toastify';
6+
import { postAvailableIngredients, useAvailableIngredients, useIngredients } from '../../api/ingredients';
7+
import { Ingredient } from '../../types/models';
88
import ErrorComponent from '../common/ErrorComponent';
99
import LoadingData from '../common/LoadingData';
10-
import { useTranslation } from 'react-i18next';
10+
import ListView from './ListView';
1111

1212
const AvailableBottles: React.FC = () => {
1313
const { data: ingredients, error: ingredientsError, isLoading: ingredientsLoading } = useIngredients();

web_client/src/components/bottle/BottleComponent.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import React, { useState } from 'react';
2-
import { Bottle, Ingredient } from '../../types/models';
3-
import { updateBottle } from '../../api/bottles';
4-
import ProgressBar from '../common/ProgressBar';
5-
import Modal from 'react-modal';
2+
import { useTranslation } from 'react-i18next';
63
import { AiOutlineCloseCircle } from 'react-icons/ai';
7-
import { errorToast, executeAndShow } from '../../utils';
84
import { FaMinus, FaPlus } from 'react-icons/fa6';
9-
import { useTranslation } from 'react-i18next';
5+
import Modal from 'react-modal';
6+
import { updateBottle } from '../../api/bottles';
7+
import { Bottle, Ingredient } from '../../types/models';
8+
import { errorToast, executeAndShow } from '../../utils';
9+
import ProgressBar from '../common/ProgressBar';
1010

1111
interface BottleProps {
1212
bottle: Bottle;

web_client/src/components/bottle/BottleList.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import React, { useEffect, useState } from 'react';
2+
import { useTranslation } from 'react-i18next';
3+
import { useNavigate } from 'react-router-dom';
24
import { refillBottle, useBottles } from '../../api/bottles';
35
import { useIngredients } from '../../api/ingredients';
4-
import BottleComponent from './BottleComponent';
56
import { Ingredient } from '../../types/models';
6-
import { useNavigate } from 'react-router-dom';
77
import { executeAndShow } from '../../utils';
8-
import LoadingData from '../common/LoadingData';
98
import ErrorComponent from '../common/ErrorComponent';
10-
import { useTranslation } from 'react-i18next';
9+
import LoadingData from '../common/LoadingData';
10+
import BottleComponent from './BottleComponent';
1111

1212
const BottleList: React.FC = () => {
1313
const {

0 commit comments

Comments
 (0)