Skip to content

Commit

Permalink
πŸ’„ design : loading λ””μžμΈ λ³€κ²½
Browse files Browse the repository at this point in the history
  • Loading branch information
dongree committed Dec 4, 2024
1 parent f7c4bc1 commit 8f58092
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 17 deletions.
26 changes: 26 additions & 0 deletions FE/src/components/Loading.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
export default function Loading() {
return (
<div
role='status'
className='flex items-center justify-center w-full h-full'
>
<svg
aria-hidden='true'
className='w-8 h-8 text-gray-200 animate-spin fill-blue-600 dark:text-gray-600'
viewBox='0 0 100 101'
fill='none'
xmlns='http://www.w3.org/2000/svg'
>
<path
d='M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z'
fill='currentColor'
/>
<path
d='M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z'
fill='currentFill'
/>
</svg>
<span className='sr-only'>Loading...</span>
</div>
);
}
7 changes: 2 additions & 5 deletions FE/src/components/StockIndex/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,18 @@ import { Card } from './Card.tsx';
import { useQuery } from '@tanstack/react-query';

export default function StockIndex() {
const { data, isLoading, isError } = useQuery({
const { data } = useQuery({
queryKey: ['StockIndex'],
queryFn: () => getStockIndex(),
staleTime: 1000,
cacheTime: 60000,
suspense: true,
});

if (isLoading) return <div>Loading...</div>;
if (isError) return <div>Error loading data</div>;

const { KOSPI, KOSDAQ, KOSPI200, KSQ150 } = data;

return (
<div className='my-2 flex w-full items-center justify-between gap-2'>
<div className='flex items-center justify-between w-full gap-2 my-2'>
<Card name='μ½”μŠ€ν”Ό' id='KOSPI' initialData={KOSPI} />
<Card name='μ½”μŠ€λ‹₯' id='KOSDAQ' initialData={KOSDAQ} />
<Card name='μ½”μŠ€ν”Ό200' id='KOSPI200' initialData={KOSPI200} />
Expand Down
3 changes: 2 additions & 1 deletion FE/src/components/StocksDetail/PriceSection/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { getTradeHistory } from 'service/tradeHistory.ts';
import { socket } from 'utils/socket.ts';
import { DailyPriceDataType, PriceDataType } from './type.ts';
import { PriceSectionViewType } from 'types.ts';
import Loading from 'components/Loading.tsx';

export default function PriceSection() {
const { id } = useParams();
Expand Down Expand Up @@ -109,7 +110,7 @@ export default function PriceSection() {
<tbody>
{isLoading ? (
<tr>
<td>Loading...</td>
<Loading />
</tr>
) : !tradeData ? (
<tr>
Expand Down
12 changes: 5 additions & 7 deletions FE/src/components/StocksDetail/TradeSection/BuySection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import useAuthStore from 'store/useAuthStore.ts';
import { useQuery } from '@tanstack/react-query';
import { getCash } from 'service/assets';
import TradeAlertModal from './TradeAlertModal';
import Loading from 'components/Loading';

type BuySectionProps = {
code: string;
Expand All @@ -23,11 +24,9 @@ type BuySectionProps = {
export default function BuySection({ code, detailInfo }: BuySectionProps) {
const { stck_prpr, stck_mxpr, stck_llam, hts_kor_isnm } = detailInfo;

const { data, isLoading, isError } = useQuery(
['detail', 'cash'],
() => getCash(),
{ staleTime: 1000 },
);
const { data, isLoading } = useQuery(['detail', 'cash'], () => getCash(), {
staleTime: 1000,
});

const [currPrice, setCurrPrice] = useState<string>(stck_prpr);
const { isLogin } = useAuthStore();
Expand Down Expand Up @@ -57,9 +56,8 @@ export default function BuySection({ code, detailInfo }: BuySectionProps) {
setCount(+s);
}, []);

if (isLoading) return <div>loading</div>;
if (isLoading) return <Loading />;
if (!data) return <div>No data</div>;
if (isError) return <div>error</div>;

const handlePriceInputBlur = (e: FocusEvent<HTMLInputElement>) => {
const n = +e.target.value.replace(/,/g, '');
Expand Down
6 changes: 3 additions & 3 deletions FE/src/components/StocksDetail/TradeSection/SellSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import useAuthStore from 'store/useAuthStore.ts';
import useTradeAlertModalStore from 'store/useTradeAlertModalStore';
import { calcYield, isNumericString } from 'utils/common';
import TradeAlertModal from './TradeAlertModal';
import Loading from 'components/Loading';

type SellSectionProps = {
code: string;
Expand All @@ -25,7 +26,7 @@ type SellSectionProps = {
export default function SellSection({ code, detailInfo }: SellSectionProps) {
const { stck_prpr, stck_mxpr, stck_llam, hts_kor_isnm } = detailInfo;

const { data, isLoading, isError } = useQuery(
const { data, isLoading } = useQuery(
['detail', 'sellPosiible', code],
() => getSellInfo(code),
{ staleTime: 1000 },
Expand Down Expand Up @@ -58,9 +59,8 @@ export default function SellSection({ code, detailInfo }: SellSectionProps) {
setCount(+s);
}, []);

if (isLoading) return <div>loading</div>;
if (isLoading) return <Loading />;
if (!data) return <div>No data</div>;
if (isError) return <div>error</div>;

const quantity = data.quantity;
const avg_price = Math.floor(data.avg_price);
Expand Down
3 changes: 2 additions & 1 deletion FE/src/page/StocksDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { getStocksByCode } from 'service/stocks';
import { Helmet } from 'react-helmet-async';
import { Suspense } from 'react';
import ChartSkeleton from 'components/StocksDetail/ChartSkeleton.tsx';
import Loading from 'components/Loading';

export default function StocksDetail() {
const params = useParams();
Expand All @@ -20,7 +21,7 @@ export default function StocksDetail() {
);

if (!code) return <div>Non code</div>;
if (isLoading) return <div>Loading...</div>;
if (isLoading) return <Loading />;
if (!data) return <div>Non data</div>;

return (
Expand Down

0 comments on commit 8f58092

Please sign in to comment.