Skip to content

Commit

Permalink
Merge pull request #72 from softeerbootcamp4th/hotfix/updateChore
Browse files Browse the repository at this point in the history
[Hotfix] 폴더 구조 수정 및 이벤트 기간 설정에 따른 콘텐츠 텍스트 수정, 숨캐찾 게임내의 사진 에러 수정
  • Loading branch information
minani-0621 authored Aug 25, 2024
2 parents 6465409 + 515dfca commit 3f461e4
Show file tree
Hide file tree
Showing 12 changed files with 15 additions and 16 deletions.
6 changes: 3 additions & 3 deletions Caecae/src/components/FindingGame/FindingGame.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import HintSpot from "./Hint/HintSpot.tsx";
import SmileBadge from "../common/SmileBadge/index.tsx";
import { createStory } from "../../shared/Hyundux-saga/Story.tsx";
import useSaga from "../../shared/Hyundux-saga/useSaga.tsx";
import { getFindGameStory } from "../../stories/FindGame/getFindingGame.tsx";
import { getFindGameAnswerStory } from "../../stories/FindGame/getFindGameIsAnswer.tsx";
import { getFindGameHintStory } from "../../stories/FindGame/getFindGameHint.tsx";
import { getFindGameStory } from "../../stories/FindingGame/getFindingGame.tsx";
import { getFindGameAnswerStory } from "../../stories/FindingGame/getFindGameIsAnswer.tsx";
import { getFindGameHintStory } from "../../stories/FindingGame/getFindGameHint.tsx";

const FindingGame = () => {
const state = useExistState(initFindingGameState);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const PictureGameBoard = ({
<img
src={imageURL}
alt="Finding Picture"
className="absolute inset-0 h-full object-cover z-10 object-left"
className="absolute inset-0 w-full object-fit z-10 object-left"
/>
</div>
</div>
Expand Down
3 changes: 1 addition & 2 deletions Caecae/src/features/EventInfoLanding/EventInfoTitle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ const EventInfoTitle = () => {
</span>
</p>
<p className="text-[36px] text-white">
{/* 추후에 날짜는 어드민에서 지정한 날로 동적 출력해야 함 */}
07.18.&nbsp;&nbsp;⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯&nbsp;&nbsp;07.25.
08.26&nbsp;&nbsp;⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯&nbsp;&nbsp;09.01
</p>
<h1 className="text-[96px] text-white mt-10 font-bold">
"너의 능력을 보여줘"
Expand Down
4 changes: 2 additions & 2 deletions Caecae/src/features/FindingGameLanding/OpenEvent.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { forwardRef, ReactElement, useEffect, useState } from "react";
import SmileBadge from "../../components/common/SmileBadge/index";
import { Link } from "../../shared/Hyunouter";
import getFindingGameStartTime from "../../stories/FindGame/getFindingGameStartTime";
import getFindingGameStartTime from "../../stories/FindingGame/getFindingGameStartTime";

// props 타입 정의
interface OpenEventProps {}
Expand Down Expand Up @@ -61,7 +61,7 @@ const OpenEvent = forwardRef<HTMLDivElement, OpenEventProps>((props, ref) => {
if (eventStatus == "none") {
data = {
badgeTitle: "이벤트 오픈 예정",
title: "7월 15일 오후 3시 15분",
title: "9월 1일 오후 3시 15분",
mainContent: (
<>
<img
Expand Down
8 changes: 4 additions & 4 deletions Caecae/src/jobs/FindingGame/FindingGameWork.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import {
_Position,
GetFindFAmeIsAnswerBodyParameter,
getFindGameIsAnswerDTO,
} from "../../stories/FindGame/getFindGameIsAnswer";
import { FindGame } from "../../stories/FindGame/getFindingGame";
} from "../../stories/FindingGame/getFindGameIsAnswer";
import { FindGame } from "../../stories/FindingGame/getFindingGame";
import Response from "../../utils/Response";

import { CorrectAnswer } from "../../stories/FindGame/getFindGameIsAnswer";
import { CorrectAnswer } from "../../stories/FindingGame/getFindGameIsAnswer";
import { SagaActionPayload } from "../../shared/Hyundux-saga/Saga";
import { GetFindGameHintDTO } from "../../stories/FindGame/getFindGameHint";
import { GetFindGameHintDTO } from "../../stories/FindingGame/getFindGameHint";

const WORK_NAME = "FindingGame";

Expand Down
2 changes: 1 addition & 1 deletion Caecae/src/pages/FindingGame/Enter/SuccessEnterContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const SuccessEnterContent = () => {
<div className="flex flex-col justify-center items-center pt-20 pb-20">
<p className="text-4xl font-black mb-3">응모 완료!</p>
<span className="text-center">
쿠폰은 7월 29일에 순차적으로 지급될 예정입니다.
쿠폰은 9월 9일에 순차적으로 지급될 예정입니다.
<br />
참여해주셔서 감사합니다.
</span>
Expand Down
2 changes: 1 addition & 1 deletion Caecae/src/pages/RacingGame/Enter/SelectCustom.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useState } from "react";
import { action } from "../../../jobs/Overlay/OverlayWork";
import { setRacingGameOption } from "../../../stories/getRacingGameOption";
import { setRacingGameOption } from "../../../stories/RacingGame/getRacingGameOption";
import { store } from "../../../shared/Hyundux";

interface Option {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import huynxios from "../shared/Hyunxios";
import Response from "../utils/Response";
import huynxios from "../../shared/Hyunxios";
import Response from "../../utils/Response";

export interface GetRacingGameOptionBodyParameter {
phone: string;
Expand Down

0 comments on commit 3f461e4

Please sign in to comment.