Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/TEAM-TATTOUR/tattour-client
Browse files Browse the repository at this point in the history 
 into Refactor/#590-list-page
  • Loading branch information
@lydiacho
lydiacho committed Feb 15, 2024
2 parents 4fe0a3b + fd7538c commit ead94e9
Show file tree
Hide file tree
Showing 4 changed files with 382 additions and 55 deletions.
296 changes: 296 additions & 0 deletions src/assets/video/tattour_loading.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,296 @@
{
"v": "5.5.5",
"fr": 25,
"ip": 0,
"op": 75,
"w": 300,
"h": 150,
"nm": "Loading-2",
"ddd": 0,
"assets": [],
"layers": [
{
"ddd": 0,
"ind": 1,
"ty": 4,
"nm": "icon 2",
"sr": 1,
"ks": {
"o": { "a": 0, "k": 100, "ix": 11 },
"r": {
"a": 1,
"k": [
{
"i": { "x": [0.667], "y": [1] },
"o": { "x": [0.333], "y": [0] },
"t": 39,
"s": [-90]
},
{ "t": 79, "s": [270] }
],
"ix": 10
},
"p": { "a": 0, "k": [150, 75, 0], "ix": 2 },
"a": { "a": 0, "k": [53, 53, 0], "ix": 1 },
"s": { "a": 0, "k": [100, 100, 100], "ix": 6 }
},
"ao": 0,
"shapes": [
{
"ty": "gr",
"it": [
{
"ind": 0,
"ty": "sh",
"ix": 1,
"ks": {
"a": 0,
"k": {
"i": [
[0, -15.464],
[15.464, 0],
[0, 15.464],
[-15.464, 0]
],
"o": [
[0, 15.464],
[-15.464, 0],
[0, -15.464],
[15.464, 0]
],
"v": [
[28, 0],
[0, 28],
[-28, 0],
[0, -28]
],
"c": true
},
"ix": 2
},
"nm": "Path 1",
"mn": "ADBE Vector Shape - Group",
"hd": false
},
{
"ty": "st",
"c": {
"a": 0,
"k": [1, 0.21568627450980393, 0.403921568627451, 1],
"ix": 3
},
"o": { "a": 0, "k": 100, "ix": 4 },
"w": { "a": 0, "k": 10, "ix": 5 },
"lc": 2,
"lj": 1,
"ml": 10,
"bm": 0,
"nm": "Stroke 1",
"mn": "ADBE Vector Graphic - Stroke",
"hd": false
},
{
"ty": "tr",
"p": { "a": 0, "k": [53, 53], "ix": 2 },
"a": { "a": 0, "k": [0, 0], "ix": 1 },
"s": { "a": 0, "k": [100, 100], "ix": 3 },
"r": { "a": 0, "k": 0, "ix": 6 },
"o": { "a": 0, "k": 100, "ix": 7 },
"sk": { "a": 0, "k": 0, "ix": 4 },
"sa": { "a": 0, "k": 0, "ix": 5 },
"nm": "Transform"
}
],
"nm": "Group 1",
"np": 2,
"cix": 2,
"bm": 0,
"ix": 1,
"mn": "ADBE Vector Group",
"hd": false
},
{
"ty": "tm",
"s": {
"a": 1,
"k": [
{
"i": { "x": [0.667], "y": [1] },
"o": { "x": [0.333], "y": [0] },
"t": 51,
"s": [0]
},
{ "t": 79, "s": [100] }
],
"ix": 1
},
"e": {
"a": 1,
"k": [
{
"i": { "x": [0.667], "y": [1] },
"o": { "x": [0.333], "y": [0] },
"t": 39,
"s": [0]
},
{ "t": 64, "s": [100] }
],
"ix": 2
},
"o": { "a": 0, "k": 0, "ix": 3 },
"m": 1,
"ix": 2,
"nm": "Trim Paths 1",
"mn": "ADBE Vector Filter - Trim",
"hd": false
}
],
"ip": 39,
"op": 79,
"st": 39,
"bm": 0
},
{
"ddd": 0,
"ind": 2,
"ty": 4,
"nm": "icon",
"sr": 1,
"ks": {
"o": { "a": 0, "k": 100, "ix": 11 },
"r": {
"a": 1,
"k": [
{
"i": { "x": [0.667], "y": [1] },
"o": { "x": [0.333], "y": [0] },
"t": 0,
"s": [-90]
},
{ "t": 40, "s": [270] }
],
"ix": 10
},
"p": { "a": 0, "k": [150, 75, 0], "ix": 2 },
"a": { "a": 0, "k": [53, 53, 0], "ix": 1 },
"s": { "a": 0, "k": [100, 100, 100], "ix": 6 }
},
"ao": 0,
"shapes": [
{
"ty": "gr",
"it": [
{
"ind": 0,
"ty": "sh",
"ix": 1,
"ks": {
"a": 0,
"k": {
"i": [
[0, -15.464],
[15.464, 0],
[0, 15.464],
[-15.464, 0]
],
"o": [
[0, 15.464],
[-15.464, 0],
[0, -15.464],
[15.464, 0]
],
"v": [
[28, 0],
[0, 28],
[-28, 0],
[0, -28]
],
"c": true
},
"ix": 2
},
"nm": "Path 1",
"mn": "ADBE Vector Shape - Group",
"hd": false
},
{
"ty": "st",
"c": {
"a": 0,
"k": [1, 0.21568627450980393, 0.403921568627451, 1],
"ix": 3
},
"o": { "a": 0, "k": 100, "ix": 4 },
"w": { "a": 0, "k": 10, "ix": 5 },
"lc": 2,
"lj": 1,
"ml": 10,
"bm": 0,
"nm": "Stroke 1",
"mn": "ADBE Vector Graphic - Stroke",
"hd": false
},
{
"ty": "tr",
"p": { "a": 0, "k": [53, 53], "ix": 2 },
"a": { "a": 0, "k": [0, 0], "ix": 1 },
"s": { "a": 0, "k": [100, 100], "ix": 3 },
"r": { "a": 0, "k": 0, "ix": 6 },
"o": { "a": 0, "k": 100, "ix": 7 },
"sk": { "a": 0, "k": 0, "ix": 4 },
"sa": { "a": 0, "k": 0, "ix": 5 },
"nm": "Transform"
}
],
"nm": "Group 1",
"np": 2,
"cix": 2,
"bm": 0,
"ix": 1,
"mn": "ADBE Vector Group",
"hd": false
},
{
"ty": "tm",
"s": {
"a": 1,
"k": [
{
"i": { "x": [0.667], "y": [1] },
"o": { "x": [0.333], "y": [0] },
"t": 12,
"s": [0]
},
{ "t": 40, "s": [100] }
],
"ix": 1
},
"e": {
"a": 1,
"k": [
{
"i": { "x": [0.667], "y": [1] },
"o": { "x": [0.333], "y": [0] },
"t": 0,
"s": [0]
},
{ "t": 25, "s": [100] }
],
"ix": 2
},
"o": { "a": 0, "k": 0, "ix": 3 },
"m": 1,
"ix": 2,
"nm": "Trim Paths 1",
"mn": "ADBE Vector Filter - Trim",
"hd": false
}
],
"ip": 0,
"op": 40,
"st": 0,
"bm": 0
}
],
"markers": []
}
11 changes: 8 additions & 3 deletions src/components/Detail/DetailCarousel.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,23 @@ import { LabelCustomSmall } from '../../assets/icon';

// 테스트 이미지

const DetailCarousel = ({ isCustom, images }: { isCustom: boolean; images: string[] }) => {
const DetailCarousel = ({ isCustom, image }: { isCustom: boolean; image: string }) => {
return (
<St.Wrapper>
{isCustom && <LabelCustomSmall />}
<Swiper modules={[Pagination]} pagination={{ clickable: true }} slidesPerView={1} loop={true}>
{images.map((src, idx) => (
{/* {image.map((src, idx) => (
<SwiperSlide key={idx}>
<St.Card>
<img src={src} />
</St.Card>
</SwiperSlide>
))}
))} */}
<SwiperSlide>
<St.Card>
<img src={image} />
</St.Card>
</SwiperSlide>
</Swiper>
</St.Wrapper>
);
Expand Down
Loading

0 comments on commit ead94e9

Please sign in to comment.