Skip to content

Commit

Permalink
Merge pull request #239 from Hexastack/238-issue-widget-imports-order
Browse files Browse the repository at this point in the history
fix(widget): eslint imports order
  • Loading branch information
marrouchi authored Oct 18, 2024
2 parents 96fe7fa + 318cc29 commit 08b1dea
Show file tree
Hide file tree
Showing 17 changed files with 57 additions and 40 deletions.
3 changes: 2 additions & 1 deletion widget/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
"unknown", // <- unknown
"index", // <- index imports
"internal", // <- Absolute imports
["sibling", "parent"] // <- Relative imports, the sibling and parent types they can be mingled together
"parent", // <- Relative imports, the sibling and parent types they can be mingled together
"sibling"
],
"newlines-between": "always",
"alphabetize": {
Expand Down
3 changes: 2 additions & 1 deletion widget/src/components/ChatHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@

import { FC, PropsWithChildren } from 'react';

import CloseIcon from './icons/CloseIcon';
import { useColors } from '../providers/ColorProvider';
import { useSettings } from '../providers/SettingsProvider';
import { useWidget } from '../providers/WidgetProvider';

import CloseIcon from './icons/CloseIcon';
import './ChatHeader.scss';

type ChatHeaderProps = PropsWithChildren;
Expand Down
5 changes: 3 additions & 2 deletions widget/src/components/ChatWindow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@

import React, { PropsWithChildren } from 'react';

import { useChat } from '../providers/ChatProvider';
import { useWidget } from '../providers/WidgetProvider';

import ChatHeader from './ChatHeader';
import ConnectionLost from './ConnectionLost';
import Messages from './Messages';
import UserInput from './UserInput';
import Webview from './Webview';
import { useChat } from '../providers/ChatProvider';
import { useWidget } from '../providers/WidgetProvider';
import './ChatWindow.scss';

type ChatWindowProps = PropsWithChildren<{
Expand Down
5 changes: 3 additions & 2 deletions widget/src/components/ConnectionLost.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@

import React from 'react';

import ConnectionIcon from './icons/ConnectionIcon';
import LoadingIcon from './icons/LoadingIcon';
import { useTranslation } from '../hooks/useTranslation';
import { useChat } from '../providers/ChatProvider';
import { useColors } from '../providers/ColorProvider';

import ConnectionIcon from './icons/ConnectionIcon';
import LoadingIcon from './icons/LoadingIcon';
import './ConnectionLost.scss';

const ConnectionLost: React.FC = () => {
Expand Down
7 changes: 4 additions & 3 deletions widget/src/components/Launcher.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@

import React, { PropsWithChildren } from 'react';

import ChatWindow from './ChatWindow';
import CloseIcon from './icons/CloseIcon';
import OpenIcon from './icons/OpenIcon';
import { useChat } from '../providers/ChatProvider';
import { useColors } from '../providers/ColorProvider';
import { useSocketLifecycle } from '../providers/SocketProvider';
import { useWidget, WidgetContextType } from '../providers/WidgetProvider';

import ChatWindow from './ChatWindow';
import CloseIcon from './icons/CloseIcon';
import OpenIcon from './icons/OpenIcon';
import './Launcher.scss';

type LauncherProps = PropsWithChildren<{
Expand Down
7 changes: 4 additions & 3 deletions widget/src/components/Message.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ import 'dayjs/locale/fr';
import relativeTime from 'dayjs/plugin/relativeTime';
import React, { PropsWithChildren, useState } from 'react';

import { useChat } from '../providers/ChatProvider';
import { useColors } from '../providers/ColorProvider';
import { TMessage } from '../types/message.types';

import ChatIcon from './icons/ChatIcon';
import ButtonsMessage from './messages/ButtonMessage';
import CarouselMessage from './messages/CarouselMessage';
Expand All @@ -20,9 +24,6 @@ import GeolocationMessage from './messages/GeolocationMessage';
import ListMessage from './messages/ListMessage';
import TextMessage from './messages/TextMessage';
import MessageStatus from './MessageStatus';
import { useChat } from '../providers/ChatProvider';
import { useColors } from '../providers/ColorProvider';
import { TMessage } from '../types/message.types';
import './Message.scss';

dayjs.extend(relativeTime);
Expand Down
3 changes: 2 additions & 1 deletion widget/src/components/MessageStatus.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@

import React from 'react';

import CheckIcon from './icons/CheckIcon';
import { useColors } from '../providers/ColorProvider';
import { TMessage } from '../types/message.types';

import CheckIcon from './icons/CheckIcon';
import './MessageStatus.scss';

interface MessageStatusProps {
Expand Down
7 changes: 4 additions & 3 deletions widget/src/components/Messages.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@

import React, { PropsWithChildren, useEffect, useRef, useState } from "react";

import Message from "./Message";
import TypingMessage from "./messages/TypingMessage";
import { useChat } from "../providers/ChatProvider";
import { useColors } from "../providers/ColorProvider";
import { useWidget } from "../providers/WidgetProvider";
import "./Messages.scss";
import { TMessage } from "../types/message.types";

import Message from "./Message";
import "./Messages.scss";
import TypingMessage from "./messages/TypingMessage";

type MessagesProps = PropsWithChildren<{
Avatar?: () => JSX.Element;
}>;
Expand Down
13 changes: 7 additions & 6 deletions widget/src/components/UserInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@

import React, { useEffect, useRef, useState } from 'react';

import { useTranslation } from '../hooks/useTranslation';
import { useChat } from '../providers/ChatProvider';
import { useColors } from '../providers/ColorProvider';
import { useSettings } from '../providers/SettingsProvider';
import { TOutgoingMessageType } from '../types/message.types';
import { OutgoingMessageState } from '../types/state.types';

import EmojiButton from './buttons/EmojiButton';
import FileButton from './buttons/FileButton';
import LocationButton from './buttons/LocationButton';
Expand All @@ -16,12 +23,6 @@ import SendButton from './buttons/SendButton';
import CloseIcon from './icons/CloseIcon';
import FileInputIcon from './icons/FileInputIcon';
import Suggestions from './Suggestions';
import { useTranslation } from '../hooks/useTranslation';
import { useChat } from '../providers/ChatProvider';
import { useColors } from '../providers/ColorProvider';
import { useSettings } from '../providers/SettingsProvider';
import { TOutgoingMessageType } from '../types/message.types';
import { OutgoingMessageState } from '../types/state.types';

import './UserInput.scss';

Expand Down
3 changes: 2 additions & 1 deletion widget/src/components/Webview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@

import React, { useEffect, useState } from 'react';

import BackIcon from './icons/BackIcon';
import { useTranslation } from '../hooks/useTranslation';
import { useChat } from '../providers/ChatProvider';
import { useColors } from '../providers/ColorProvider';

import BackIcon from './icons/BackIcon';
import './Webview.scss';

const Webview: React.FC = () => {
Expand Down
17 changes: 9 additions & 8 deletions widget/src/components/messages/CarouselMessage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/

import React, { useState } from 'react';
import React, { useState } from "react";

import ButtonsMessage from './ButtonMessage';
import { useColors } from '../../providers/ColorProvider';
import { TButton, Direction, TMessage } from '../../types/message.types';
import './CarouselMessage.scss';
import { processContent } from '../../utils/text';
import { useColors } from "../../providers/ColorProvider";
import { Direction, TButton, TMessage } from "../../types/message.types";
import { processContent } from "../../utils/text";

import ButtonsMessage from "./ButtonMessage";
import "./CarouselMessage.scss";

interface Element {
title: string;
Expand Down Expand Up @@ -73,13 +74,13 @@ const CarouselMessage: React.FC<CarouselMessageProps> = ({
const items = messageCarousel.data.elements;
const goToPrevious = () => {
setActiveIndex(
(prevIndex) => (prevIndex + items.length - 1) % items.length,
(prevIndex) => (prevIndex + items.length - 1) % items.length
);
};
const goToNext = () => {
setActiveIndex((prevIndex) => (prevIndex + 1) % items.length);
};
const colors = allColors[messageCarousel.direction || 'received'];
const colors = allColors[messageCarousel.direction || "received"];

return (
<div
Expand Down
3 changes: 2 additions & 1 deletion widget/src/components/messages/ListMessage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@

import React from 'react';

import ButtonsMessage from './ButtonMessage';
import { useColors } from '../../providers/ColorProvider';
import { TMessage } from '../../types/message.types';

import ButtonsMessage from './ButtonMessage';

import './ListMessage.scss';

interface ListMessageProps {
Expand Down
9 changes: 5 additions & 4 deletions widget/src/providers/ChatProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ import React, {
useState,
} from 'react';

import { useConfig } from './ConfigProvider';
import { useSettings } from './SettingsProvider';
import { useSocket, useSubscribe } from './SocketProvider';
import { useWidget } from './WidgetProvider';
import { StdEventType } from '../types/chat-io-messages.types';
import {
Direction,
Expand All @@ -33,6 +29,11 @@ import {
} from '../types/message.types';
import { ConnectionState, OutgoingMessageState } from '../types/state.types';

import { useConfig } from './ConfigProvider';
import { useSettings } from './SettingsProvider';
import { useSocket, useSubscribe } from './SocketProvider';
import { useWidget } from './WidgetProvider';

interface Participant {
id: string;
name: string;
Expand Down
3 changes: 2 additions & 1 deletion widget/src/providers/ColorProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@

import React, { createContext, ReactNode, useContext } from 'react';

import { useSettings } from './SettingsProvider';
import colors from '../constants/colors';
import { ColorState } from '../types/colors.types';

import { useSettings } from './SettingsProvider';

const initialState: ColorState = colors['orange'];
const ColorContext = createContext<{
colors: ColorState;
Expand Down
3 changes: 2 additions & 1 deletion widget/src/providers/SettingsProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ import React, {
useState,
} from 'react';

import { useSubscribe } from './SocketProvider';
import { useTranslation } from '../hooks/useTranslation';
import { IMenuNode } from '../types/menu.type';
import { SessionStorage } from '../utils/sessionStorage';

import { useSubscribe } from './SocketProvider';

type ChannelSettings = {
menu: IMenuNode[];
secret: string;
Expand Down
3 changes: 2 additions & 1 deletion widget/src/providers/SocketProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ import {
useRef,
} from 'react';

import { useConfig } from './ConfigProvider';
import { getSocketIoClient, SocketIoClient } from '../utils/SocketIoClient';

import { useConfig } from './ConfigProvider';

interface socketContext {
socket: SocketIoClient;
}
Expand Down
3 changes: 2 additions & 1 deletion widget/src/providers/TranslationProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@

import React, { createContext, useContext, useState, ReactNode } from 'react';

import { useConfig } from './ConfigProvider';
import { translations } from '../translations';

import { useConfig } from './ConfigProvider';

type Language = keyof typeof translations;

interface TranslationContextProps {
Expand Down

0 comments on commit 08b1dea

Please sign in to comment.