-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #41 from softeerbootcamp4th/feature/20-fastChargeI…
…nteraction [feat] 고속충전 인터랙션 추가 (resolve #20)
- Loading branch information
Showing
19 changed files
with
376 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| import style from "./batteryStyle.module.css"; | ||
|
|
||
| function getBatteryColor(progress) { | ||
| if (progress <= 50 / 330) return "bg-red-500"; | ||
| if (progress <= 190 / 330) return "bg-yellow-400"; | ||
| return "bg-blue-400"; | ||
| } | ||
|
|
||
| function BatteryProgressBar({ progress }) { | ||
| const batteryColor = getBatteryColor(progress); | ||
| const batteryDynamicStyle = { | ||
| "--progress": progress, | ||
| }; | ||
|
|
||
| return ( | ||
| <div className="w-full h-full relative flex" style={batteryDynamicStyle}> | ||
| <div | ||
| className={`${batteryColor} ${style.left} h-full shrink-0 rounded-l-[20px]`} | ||
| ></div> | ||
| <div | ||
| className={`${batteryColor} ${style.bar} h-full shrink-0 relative -left-1`} | ||
| ></div> | ||
| <div | ||
| className={`${batteryColor} ${style.right} h-full shrink-0 relative -left-2 rounded-r-[20px]`} | ||
| ></div> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| export default BatteryProgressBar; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| import { useImperativeHandle } from "react"; | ||
| import BatteryProgressBar from "./BatteryProgressBar.jsx"; | ||
| import orderIcon from "@/assets/property2.svg"; | ||
| import dialSvg from "./timer.svg"; | ||
| import useDialDrag from "./useDialDrag.js"; | ||
|
|
||
| const MAX_MINUTE = 30; | ||
|
|
||
| function getProgress(angle) { | ||
| const rawProgress = -angle / (Math.PI * 2); | ||
| if (rawProgress < 0) return 0; | ||
| if (rawProgress > 1) return 1; | ||
| return rawProgress; | ||
| } | ||
|
|
||
| function FastChargeInteraction({ interactCallback, $ref }) { | ||
| const { | ||
| angle, | ||
| style: dialStyle, | ||
| ref: dialRef, | ||
| onPointerStart, | ||
| resetAngle, | ||
| } = useDialDrag(0); | ||
|
|
||
| useImperativeHandle( | ||
| $ref, | ||
| () => ({ | ||
| reset() { | ||
| resetAngle(); | ||
| }, | ||
| }), | ||
| [resetAngle], | ||
| ); | ||
| const progress = getProgress(angle); | ||
|
|
||
| return ( | ||
| <article className="bg-black relative w-full h-full overflow-hidden flex items-center flex-col"> | ||
| <div className="w-full max-w-[1200px] px-10 lg:px-20 flex gap-2 items-start mt-16 lg:mt-[6.25rem] "> | ||
| <img src={orderIcon} alt="2" /> | ||
| <div className="flex flex-col gap-3.5 font-bold"> | ||
| <h3 className="text-neutral-400 text-title-m md:text-title-l"> | ||
| 불편함 없이, 더 빠르게 | ||
| </h3> | ||
| <p className="text-white text-body-m md:text-body-l"> | ||
| The new IONIQ 5의 배터리를 충전하는 데 얼마만큼의 시간이 걸릴까요? | ||
| </p> | ||
| <p className="text-neutral-200 text-body-s"> | ||
| 다이얼을 돌려 충전에 필요한 시간을 확인해보세요! | ||
| </p> | ||
| </div> | ||
| </div> | ||
| <div className="absolute top-[clamp(240px,40%,384px)] w-72 md:w-96 h-32 border-solid border-2 border-neutral-600 rounded-[30px] p-3.5"> | ||
| <div className="absolute w-5 h-9 bg-neutral-600 right-[-1.25rem] top-[2.875rem] rounded-r-md"></div> | ||
| <BatteryProgressBar progress={progress} /> | ||
| </div> | ||
| <div className="absolute bottom-0 size-72 md:size-[448px] lg:size-[562px] translate-y-[40%] md:translate-y-1/2 flex justify-center"> | ||
| <img | ||
| src={dialSvg} | ||
| alt="다이얼" | ||
| className="w-full h-full absolute left-0 top-0 cursor-pointer touch-none" | ||
| style={dialStyle} | ||
| ref={dialRef} | ||
| onPointerDown={(e) => { | ||
| onPointerStart(e); | ||
| interactCallback?.(); | ||
| }} | ||
| draggable="false" | ||
| /> | ||
| <p className="text-white absolute bottom-[calc(50%+48px)] md:bottom-[calc(50%+94px)] lg:bottom-[calc(50%+140px)] text-title-s pointer-events-none"> | ||
| <span className="text-head-m md:text-head-l lg:text-[4.375rem] mr-1.5 lg:mr-2.5"> | ||
| {Math.round(progress * MAX_MINUTE)} | ||
| </span> | ||
| 분 | ||
| </p> | ||
| </div> | ||
| </article> | ||
| ); | ||
| } | ||
|
|
||
| export default FastChargeInteraction; |
Oops, something went wrong.