Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🚚 Restructure components #379

Merged
merged 1 commit into from
Oct 8, 2022
Merged

🚚 Restructure components #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/components/Message.tsx → src/components/message/Message.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React, { FC, useCallback, useState } from 'react'
import { Card, Icon, Image } from 'semantic-ui-react'
import Moment from 'react-moment'
import { Message as MessageType } from '../api/Message'
import { Message as MessageType } from '../../api/Message'
import Lightbox from 'react-image-lightbox'
import 'react-image-lightbox/style.css'
import { replaceMagic } from '../lib/helper'
import { replaceMagic } from '../../lib/helper'
import MessageModalDelete from './MessageModalDelete'
import MessageMap from './MessageMap'
import { Ticker } from '../api/Ticker'
import { Ticker } from '../../api/Ticker'

interface Props {
message: MessageType
Expand Down
6 changes: 3 additions & 3 deletions src/components/MessageAttachmentsButton.tsx → ...ents/message/MessageAttachmentsButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, { createRef, FC, useCallback } from 'react'
import { Button } from 'semantic-ui-react'
import { Ticker } from '../api/Ticker'
import { useUploadApi, Upload } from '../api/Upload'
import useAuth from './useAuth'
import { Ticker } from '../../api/Ticker'
import { useUploadApi, Upload } from '../../api/Upload'
import useAuth from '../useAuth'

interface Props {
ticker: Ticker
Expand Down
2 changes: 1 addition & 1 deletion src/components/MessageAttachmentsPreview.tsx → ...nts/message/MessageAttachmentsPreview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { FC, useCallback } from 'react'
import { Button, ButtonProps, Image } from 'semantic-ui-react'
import { Upload } from '../api/Upload'
import { Upload } from '../../api/Upload'

interface Props {
attachments: Upload[]
Expand Down
8 changes: 4 additions & 4 deletions src/components/MessageForm.tsx → src/components/message/MessageForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ import React, {
useEffect,
useState,
} from 'react'
import { useMessageApi } from '../api/Message'
import { useMessageApi } from '../../api/Message'
import {
Button,
Form,
Message as Error,
TextAreaProps,
} from 'semantic-ui-react'
import { Ticker } from '../api/Ticker'
import { Ticker } from '../../api/Ticker'
import { SubmitHandler, useForm } from 'react-hook-form'
import { useQueryClient } from '@tanstack/react-query'
import MessageFormCounter from './MessageFormCounter'
import useAuth from './useAuth'
import { Upload } from '../api/Upload'
import useAuth from '../useAuth'
import { Upload } from '../../api/Upload'
import MessageAttachmentsButton from './MessageAttachmentsButton'
import MessageAttachmentsPreview from './MessageAttachmentsPreview'
import MessageMapModal from './MessageMapModal'
Expand Down
0 src/components/MessageFormCounter.tsx → ...components/message/MessageFormCounter.tsx
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions src/components/MessageList.tsx → src/components/message/MessageList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React, { FC } from 'react'
import { Dimmer, Feed, Loader } from 'semantic-ui-react'
import { Ticker } from '../api/Ticker'
import { useMessageApi } from '../api/Message'
import Message from '../components/Message'
import { Ticker } from '../../api/Ticker'
import { useMessageApi } from '../../api/Message'
import Message from './Message'
import { useQuery } from '@tanstack/react-query'
import useAuth from './useAuth'
import useAuth from '../useAuth'

interface Props {
ticker: Ticker
Expand Down
4 changes: 2 additions & 2 deletions src/components/MessageMap.tsx → src/components/message/MessageMap.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { latLng } from 'leaflet'
import React, { FC } from 'react'
import { GeoJSON, MapContainer, TileLayer } from 'react-leaflet'
import { Message } from '../api/Message'
import { Ticker } from '../api/Ticker'
import { Message } from '../../api/Message'
import { Ticker } from '../../api/Ticker'

interface Props {
message: Message
Expand Down
2 changes: 1 addition & 1 deletion src/components/MessageMapModal.tsx → src/components/message/MessageMapModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { FeatureGroup, GeoJSON, MapContainer, TileLayer } from 'react-leaflet'
import { EditControl } from 'react-leaflet-draw'
import { Button, Modal } from 'semantic-ui-react'
import { FeatureCollection, Geometry } from 'geojson'
import { Ticker } from '../api/Ticker'
import { Ticker } from '../../api/Ticker'

interface Props {
callback: (features: FeatureCollection<Geometry, any>) => void
Expand Down
4 changes: 2 additions & 2 deletions src/components/MessageModalDelete.tsx → ...components/message/MessageModalDelete.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, { FC, useCallback, useState } from 'react'
import { useQueryClient } from '@tanstack/react-query'
import { Confirm } from 'semantic-ui-react'
import { Message, useMessageApi } from '../api/Message'
import useAuth from './useAuth'
import { Message, useMessageApi } from '../../api/Message'
import useAuth from '../useAuth'

interface Props {
message: Message
Expand Down
0 src/components/Clock.tsx → src/components/navigation/Clock.tsx
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions src/views/Navigation.tsx → src/components/navigation/Navigation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React, { FC, useCallback } from 'react'
import { Container, Dropdown, Image, Menu } from 'semantic-ui-react'
import Clock from '../components/Clock'
import logo from '../assets/logo.png'
import Clock from './Clock'
import logo from '../../assets/logo.png'
import { useNavigate, useLocation } from 'react-router-dom'
import useAuth from '../components/useAuth'
import useAuth from '../useAuth'

const Navigation: FC = () => {
const { user, logout } = useAuth()
Expand Down
6 changes: 3 additions & 3 deletions src/components/InactiveSettingsCard.tsx → ...ponents/settings/InactiveSettingsCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import {
List,
Loader,
} from 'semantic-ui-react'
import { useSettingsApi } from '../api/Settings'
import ErrorView from '../views/ErrorView'
import { useSettingsApi } from '../../api/Settings'
import ErrorView from '../../views/ErrorView'
import InactiveSettingsModalForm from './InactiveSettingsModalForm'
import useAuth from './useAuth'
import useAuth from '../useAuth'

const InactiveSettingsCard: FC = () => {
const { token } = useAuth()
Expand Down
4 changes: 2 additions & 2 deletions src/components/InactiveSettingsForm.tsx → ...ponents/settings/InactiveSettingsForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import {
InputOnChangeData,
TextAreaProps,
} from 'semantic-ui-react'
import { InactiveSetting, Setting, useSettingsApi } from '../api/Settings'
import useAuth from './useAuth'
import { InactiveSetting, Setting, useSettingsApi } from '../../api/Settings'
import useAuth from '../useAuth'

interface Props {
setting: Setting<InactiveSetting>
Expand Down
2 changes: 1 addition & 1 deletion src/components/InactiveSettingsModalForm.tsx → ...ts/settings/InactiveSettingsModalForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { FC, useCallback, useState } from 'react'
import { Button, Header, Modal } from 'semantic-ui-react'
import { InactiveSetting, Setting } from '../api/Settings'
import { InactiveSetting, Setting } from '../../api/Settings'
import InactiveSettingsForm from './InactiveSettingsForm'

interface Props {
Expand Down
6 changes: 3 additions & 3 deletions src/components/RefreshIntervalCard.tsx → ...mponents/settings/RefreshIntervalCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React, { FC } from 'react'
import { useQuery } from '@tanstack/react-query'
import { Button, Card, Dimmer, Icon, List, Loader } from 'semantic-ui-react'
import { useSettingsApi } from '../api/Settings'
import ErrorView from '../views/ErrorView'
import { useSettingsApi } from '../../api/Settings'
import ErrorView from '../../views/ErrorView'
import RefreshIntervalModalForm from './RefreshIntervalModalForm'
import useAuth from './useAuth'
import useAuth from '../useAuth'

const RefreshIntervalCard: FC = () => {
const { token } = useAuth()
Expand Down
4 changes: 2 additions & 2 deletions src/components/RefreshIntervalForm.tsx → ...mponents/settings/RefreshIntervalForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import React, { FC, FormEvent, useCallback, useEffect } from 'react'
import { SubmitHandler, useForm } from 'react-hook-form'
import { useQueryClient } from '@tanstack/react-query'
import { Form, InputOnChangeData } from 'semantic-ui-react'
import { Setting, useSettingsApi } from '../api/Settings'
import useAuth from './useAuth'
import { Setting, useSettingsApi } from '../../api/Settings'
import useAuth from '../useAuth'

interface Props {
setting: Setting<string>
Expand Down
2 changes: 1 addition & 1 deletion src/components/RefreshIntervalModalForm.tsx → ...nts/settings/RefreshIntervalModalForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { FC, useCallback, useState } from 'react'
import { Button, Header, Modal } from 'semantic-ui-react'
import { Setting } from '../api/Settings'
import { Setting } from '../../api/Settings'
import RefreshIntervalForm from './RefreshIntervalForm'

interface Props {
Expand Down
0 src/components/LocationSearch.tsx → src/components/ticker/LocationSearch.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/components/TelegramCard.tsx → src/components/ticker/TelegramCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { FC } from 'react'
import { Button, Card, Container, Icon } from 'semantic-ui-react'
import { Ticker } from '../api/Ticker'
import { Ticker } from '../../api/Ticker'
import TelegramModalForm from './TelegramModalForm'

interface Props {
Expand Down
4 changes: 2 additions & 2 deletions src/components/TelegramForm.tsx → src/components/ticker/TelegramForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import {
InputOnChangeData,
Message,
} from 'semantic-ui-react'
import { Ticker, useTickerApi } from '../api/Ticker'
import useAuth from './useAuth'
import { Ticker, useTickerApi } from '../../api/Ticker'
import useAuth from '../useAuth'

interface Props {
callback: () => void
Expand Down
2 changes: 1 addition & 1 deletion src/components/TelegramModalForm.tsx → src/components/ticker/TelegramModalForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { FC, useCallback, useState } from 'react'
import { Button, Modal } from 'semantic-ui-react'
import { Ticker } from '../api/Ticker'
import { Ticker } from '../../api/Ticker'
import TelegramForm from './TelegramForm'

interface Props {
Expand Down
20 changes: 10 additions & 10 deletions src/components/Ticker.tsx → src/components/ticker/Ticker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import React, { FC } from 'react'
import { Button, Grid, Header } from 'semantic-ui-react'
import { Ticker as Model } from '../api/Ticker'
import MessageForm from '../components/MessageForm'
import TickerCard from '../components/TickerCard'
import MessageList from '../components/MessageList'
import useAuth from '../components/useAuth'
import TickerUsersCard from '../components/TickerUserCard'
import TickerResetModal from '../components/TickerResetModal'
import TwitterCard from '../components/TwitterCard'
import TelegramCard from '../components/TelegramCard'
import useFeature from './useFeature'
import { Ticker as Model } from '../../api/Ticker'
import MessageForm from '../message/MessageForm'
import TickerCard from './TickerCard'
import MessageList from '../message/MessageList'
import useAuth from '../useAuth'
import TickerUsersCard from './TickerUserCard'
import TickerResetModal from './TickerResetModal'
import TwitterCard from './TwitterCard'
import TelegramCard from './TelegramCard'
import useFeature from '../useFeature'

interface Props {
ticker: Model
Expand Down
2 changes: 1 addition & 1 deletion src/components/TickerCard.tsx → src/components/ticker/TickerCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { FC } from 'react'
import { Button, Card, Icon, Label } from 'semantic-ui-react'
import ReactMarkdown from 'react-markdown'
import TickerModalForm from './TickerModalForm'
import { Ticker } from '../api/Ticker'
import { Ticker } from '../../api/Ticker'

interface Props {
ticker: Ticker
Expand Down
4 changes: 2 additions & 2 deletions src/components/TickerForm.tsx → src/components/ticker/TickerForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ import {
Message,
TextAreaProps,
} from 'semantic-ui-react'
import { Ticker, useTickerApi } from '../api/Ticker'
import { Ticker, useTickerApi } from '../../api/Ticker'
import { SubmitHandler, useForm } from 'react-hook-form'
import { useQueryClient } from '@tanstack/react-query'
import useAuth from './useAuth'
import useAuth from '../useAuth'
import LocationSearch, { Result } from './LocationSearch'
import { MapContainer, Marker, TileLayer } from 'react-leaflet'

Expand Down
4 changes: 2 additions & 2 deletions src/components/TickerList.tsx → src/components/ticker/TickerList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React, { FC } from 'react'
import { Ticker } from '../api/Ticker'
import { Ticker } from '../../api/Ticker'
import { Button, Table } from 'semantic-ui-react'
import TickerModalForm from './TickerModalForm'
import TickerListItems from './TickerListItems'
import useAuth from './useAuth'
import useAuth from '../useAuth'

interface Props {
tickers: Ticker[]
Expand Down
4 changes: 2 additions & 2 deletions src/components/TickerListItem.tsx → src/components/ticker/TickerListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React, { FC, useCallback } from 'react'
import { useNavigate } from 'react-router'
import { Button, Icon, Table } from 'semantic-ui-react'
import { Ticker } from '../api/Ticker'
import { Ticker } from '../../api/Ticker'
import TickerModalDelete from './TickerModalDelete'
import TickerModalForm from './TickerModalForm'
import useAuth from './useAuth'
import useAuth from '../useAuth'

interface Props {
ticker: Ticker
Expand Down
2 changes: 1 addition & 1 deletion src/components/TickerListItems.tsx → src/components/ticker/TickerListItems.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { FC } from 'react'
import { Table } from 'semantic-ui-react'
import { Ticker } from '../api/Ticker'
import { Ticker } from '../../api/Ticker'
import TickerListItem from './TickerListItem'

interface Props {
Expand Down
4 changes: 2 additions & 2 deletions src/components/TickerModalDelete.tsx → src/components/ticker/TickerModalDelete.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, { FC, useCallback, useState } from 'react'
import { useQueryClient } from '@tanstack/react-query'
import { Confirm } from 'semantic-ui-react'
import { Ticker, useTickerApi } from '../api/Ticker'
import useAuth from './useAuth'
import { Ticker, useTickerApi } from '../../api/Ticker'
import useAuth from '../useAuth'

interface Props {
ticker: Ticker
Expand Down
2 changes: 1 addition & 1 deletion src/components/TickerModalForm.tsx → src/components/ticker/TickerModalForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { FC, useCallback, useState } from 'react'
import { Button, Header, Modal } from 'semantic-ui-react'
import { Ticker } from '../api/Ticker'
import { Ticker } from '../../api/Ticker'
import TickerForm from './TickerForm'

interface Props {
Expand Down
4 changes: 2 additions & 2 deletions src/components/TickerResetModal.tsx → src/components/ticker/TickerResetModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { FC, useCallback, useState } from 'react'
import { Button, Modal } from 'semantic-ui-react'
import { Ticker, useTickerApi } from '../api/Ticker'
import useAuth from './useAuth'
import { Ticker, useTickerApi } from '../../api/Ticker'
import useAuth from '../useAuth'
import { useQueryClient } from '@tanstack/react-query'

interface Props {
Expand Down
6 changes: 3 additions & 3 deletions src/components/TickerUserAddForm.tsx → src/components/ticker/TickerUserAddForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import React, { FC, useCallback, useEffect } from 'react'
import { SubmitHandler, useForm } from 'react-hook-form'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { Dropdown, DropdownProps, Form } from 'semantic-ui-react'
import { Ticker, useTickerApi } from '../api/Ticker'
import { User, useUserApi } from '../api/User'
import useAuth from './useAuth'
import { Ticker, useTickerApi } from '../../api/Ticker'
import { User, useUserApi } from '../../api/User'
import useAuth from '../useAuth'

interface Props {
ticker: Ticker
Expand Down
4 changes: 2 additions & 2 deletions src/components/TickerUserCard.tsx → src/components/ticker/TickerUserCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React, { FC } from 'react'
import { useQuery } from '@tanstack/react-query'
import { Button, Card, Dimmer, Loader } from 'semantic-ui-react'
import { Ticker, useTickerApi } from '../api/Ticker'
import { Ticker, useTickerApi } from '../../api/Ticker'
import TickerUserList from './TickerUserList'
import TickerUserModalAdd from './TickerUserModalAdd'
import useAuth from './useAuth'
import useAuth from '../useAuth'

interface Props {
ticker: Ticker
Expand Down
4 changes: 2 additions & 2 deletions src/components/TickerUserList.tsx → src/components/ticker/TickerUserList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { FC } from 'react'
import { List } from 'semantic-ui-react'
import { Ticker } from '../api/Ticker'
import { User } from '../api/User'
import { Ticker } from '../../api/Ticker'
import { User } from '../../api/User'
import TickerUsersListItem from './TickerUserListItem'

interface Props {
Expand Down
4 changes: 2 additions & 2 deletions src/components/TickerUserListItem.tsx → src/components/ticker/TickerUserListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { FC } from 'react'
import { Button, List } from 'semantic-ui-react'
import { Ticker } from '../api/Ticker'
import { User } from '../api/User'
import { Ticker } from '../../api/Ticker'
import { User } from '../../api/User'
import TickerUserModalDelete from './TickerUserModalDelete'

interface Props {
Expand Down
4 changes: 2 additions & 2 deletions src/components/TickerUserModalAdd.tsx → src/components/ticker/TickerUserModalAdd.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { FC, useCallback, useState } from 'react'
import { Button, Modal } from 'semantic-ui-react'
import { Ticker } from '../api/Ticker'
import { User } from '../api/User'
import { Ticker } from '../../api/Ticker'
import { User } from '../../api/User'
import TickerUserAddForm from './TickerUserAddForm'

interface Props {
Expand Down
6 changes: 3 additions & 3 deletions src/components/TickerUserModalDelete.tsx → ...mponents/ticker/TickerUserModalDelete.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React, { FC, useCallback, useState } from 'react'
import { useQueryClient } from '@tanstack/react-query'
import { Confirm } from 'semantic-ui-react'
import { Ticker, useTickerApi } from '../api/Ticker'
import { User } from '../api/User'
import useAuth from './useAuth'
import { Ticker, useTickerApi } from '../../api/Ticker'
import { User } from '../../api/User'
import useAuth from '../useAuth'

interface Props {
ticker: Ticker
Expand Down
Loading