Skip to content

Commit f380096

Browse files
authored
Merge pull request #135 from Podo-Store/dev
Dev
2 parents 756148c + 204b574 commit f380096

File tree

15 files changed

+126
-24
lines changed

15 files changed

+126
-24
lines changed
Lines changed: 4 additions & 0 deletions
Loading
Lines changed: 4 additions & 0 deletions
Loading

src/components/auth/Box.css

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/components/auth/Box.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from "react";
2-
import "./Box.css";
2+
import "./Box.scss";
33

44
const Box = ({ children }) => {
55
return (

src/components/auth/Box.scss

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
@use "./../../styles/_responsive.scss" as r;
2+
3+
.Box {
4+
display: flex;
5+
justify-content: center;
6+
7+
position: relative;
8+
}
9+
10+
.Box .Box-wrap {
11+
display: flex;
12+
flex-direction: column;
13+
align-items: center;
14+
15+
width: 500px;
16+
@include r.media-mobile {
17+
width: calc(100vw - 30px);
18+
}
19+
& {
20+
flex-shrink: 0;
21+
22+
border-radius: 30px;
23+
border: 3px solid var(--Main, #6a39c0);
24+
box-sizing: border-box;
25+
}
26+
}
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
.__floating-btn__ {
2+
position: fixed;
3+
bottom: 50px;
4+
right: 50px;
5+
6+
padding: 0;
7+
8+
width: 40px;
9+
height: 40px;
10+
11+
background-color: #fff;
12+
border: none;
13+
border-radius: 50%;
14+
box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.25);
15+
16+
cursor: pointer;
17+
18+
z-index: 10;
19+
20+
transition: background-color 0.125s ease;
21+
}
22+
23+
.__floating-btn__:active {
24+
background-color: var(--purple-purple-4-main, #6a39c0);
25+
}
26+
27+
.__floating-btn__ img {
28+
transform: translateY(1px);
29+
}
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
import { useState } from "react";
2+
3+
import floatingBlack from "../../assets/image/button/floatingBlack.svg";
4+
import floatingWhite from "../../assets/image/button/floatingWhite.svg";
5+
6+
import "./FloatingBtn.css";
7+
8+
const FloatingBtn = ({ ...props }) => {
9+
const [active, setActive] = useState(false);
10+
11+
return (
12+
<button
13+
className="__floating-btn__ f-center"
14+
onClick={() =>
15+
window.scrollTo({
16+
top: 0,
17+
left: 0,
18+
behavior: "smooth",
19+
})
20+
}
21+
onMouseDown={() => setActive(true)}
22+
onMouseUp={() => setActive(false)}
23+
onMouseLeave={() => setActive(false)}
24+
{...props}
25+
>
26+
<img src={!active ? floatingBlack : floatingWhite} alt="^" />
27+
</button>
28+
);
29+
};
30+
31+
export default FloatingBtn;

src/components/list/AllListContent.jsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import PartialLoading from "../loading/PartialLoading";
22

33
import sparkles from "../../assets/image/post/list/sparkles.svg";
4+
import FloatingBtn from "../button/FloatingBtn";
45

56
/**
67
* 더보기 클릭 시 무한 스크롤로 노출되는 작품 리스트
@@ -12,6 +13,8 @@ import sparkles from "../../assets/image/post/list/sparkles.svg";
1213
const AllListContent = ({ playType, plays, renderListThumbnail, isLoading, observerTarget }) => {
1314
return (
1415
<div className="work-list">
16+
<FloatingBtn />
17+
1518
<div className="j-content-between work-list-title">
1619
<div className="a-items-center" id="title">
1720
<img src={sparkles} alt="sparkles"></img>

src/pages/MainVer2.jsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from "react";
22
import { useNavigate } from "react-router-dom";
33

4+
import FloatingBtn from "@/components/button/FloatingBtn";
45
import ImageBtn from "../components/button/ImageBtn";
56
import Page4Button from "../components/button/landing/Page4Button";
67
import Page3 from "@/components/landing/Page3";
@@ -27,6 +28,8 @@ const MainVer2 = () => {
2728

2829
return (
2930
<div className="main-ver2">
31+
<FloatingBtn />
32+
3033
<div>
3134
<div className="page1 f-dir-column j-content-between">
3235
<div className="title-wrap f-dir-column p-relative">

src/pages/auth/SignUpDefault.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { SignUp1, SignUp2, SignUp3, SignUp4 } from "../../components/auth/signUp
99

1010
import { SERVER_URL } from "../../constants/ServerURL";
1111

12-
import "./SignUpDefault.css";
12+
import "./SignUpDefault.scss";
1313
import "../../components/auth/signUp/ErrorMessages/AuthErrorMessages.css";
1414
import "../../styles/text.css";
1515
import "../../styles/utilities.css";

0 commit comments

Comments
 (0)