Skip to content

Commit

Permalink
Merge branch 'main' into feature/admin
Browse files Browse the repository at this point in the history
  • Loading branch information
sunglitter committed Dec 3, 2024
2 parents e52cc29 + 4e56784 commit 1ded966
Show file tree
Hide file tree
Showing 36 changed files with 5 additions and 3,938 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
.env.development.local
.env.test.local
.env.production.local

/dist
npm-debug.log*
yarn-debug.log*
yarn-error.log*
Expand Down
3,886 changes: 0 additions & 3,886 deletions dist/assets/index-DCOypNyb.js

This file was deleted.

Binary file removed dist/favicon.ico
Binary file not shown.
Binary file removed dist/images/bell.png
Binary file not shown.
Binary file removed dist/images/chat.png
Binary file not shown.
Binary file removed dist/images/chatlist.png
Binary file not shown.
Binary file removed dist/images/chatlist_on.png
Binary file not shown.
Binary file removed dist/images/check.png
Binary file not shown.
Binary file removed dist/images/comment.png
Binary file not shown.
Binary file removed dist/images/location.png
Binary file not shown.
Binary file removed dist/images/location_on.png
Binary file not shown.
Binary file removed dist/images/myposts.png
Binary file not shown.
Binary file removed dist/images/myposts_on.png
Binary file not shown.
Binary file removed dist/images/mypostscheck.png
Binary file not shown.
Binary file removed dist/images/mypostscheck_on.png
Binary file not shown.
Binary file removed dist/images/notification.png
Binary file not shown.
Binary file removed dist/images/notification_on.png
Binary file not shown.
Binary file removed dist/images/orderlist.png
Binary file not shown.
Binary file removed dist/images/orderlist_on.png
Binary file not shown.
Binary file removed dist/images/origin.png
Binary file not shown.
Binary file removed dist/images/qricon.png
Binary file not shown.
Binary file removed dist/images/refund.png
Binary file not shown.
Binary file removed dist/images/refund_on.png
Binary file not shown.
Binary file removed dist/images/search.png
Binary file not shown.
Binary file removed dist/images/setting.png
Binary file not shown.
Binary file removed dist/images/setting_on.png
Binary file not shown.
Binary file removed dist/images/wish.png
Binary file not shown.
Binary file removed dist/images/wish_on.png
Binary file not shown.
Binary file removed dist/images/wishlist.png
Diff not rendered.
Binary file removed dist/images/wishlist_on.png
Diff not rendered.
21 changes: 0 additions & 21 deletions dist/index.html

This file was deleted.

Binary file removed dist/logo192.png
Diff not rendered.
Binary file removed dist/logo512.png
Diff not rendered.
25 changes: 0 additions & 25 deletions dist/manifest.json

This file was deleted.

3 changes: 0 additions & 3 deletions dist/robots.txt

This file was deleted.

6 changes: 4 additions & 2 deletions src/components/pages/ProductDetailPage/ProductDetail.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import React, { useEffect, useState } from 'react';
import { Link, useParams } from 'react-router-dom';
import styled from 'styled-components';
import { addWishList } from './api/wishApi';

import StarRating from '../../common/StarRating';
import { addComment } from './api/commentApi';

import { submitOrder } from './api/submitApi';
import { products } from '../../../mocks/products';
import { addComment } from './api/CommentApi';
import { addWishList } from './api/WishApi';
// import { QueryHandler, useProductQuery } from '../../../hooks/useGetProduct';

const ProductDetail: React.FC = () => {
Expand Down

0 comments on commit 1ded966

Please sign in to comment.