Skip to content
Merged
1 change: 0 additions & 1 deletion Mine/src/components/LLMInputBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ export default function LLMInputBox({ onSend, isPending }: LLMInputBoxProps) {
const handleSend = () => {
const currentText = text.trim()
if (!currentText) return
console.log('์ž…๋ ฅ๋œ ๋‹จ์–ด:', currentText, ' / ๊ธˆ์ง€์–ด์ธ๊ฐ€์š”?:', hasBlockedWord(currentText))
if (hasBlockedWord(currentText)) {
setIsModalOpen(true)
return // ์—ฌ๊ธฐ์„œ ํ•จ์ˆ˜๋ฅผ ๋๋‚ด๋ฒ„๋ ค์„œ ๋ฐฑ์—”๋“œ๋กœ ๋„˜์–ด๊ฐ€์ง€ ์•Š๊ฒŒ ๋ง‰์Šต๋‹ˆ๋‹ค!
Expand Down
8 changes: 5 additions & 3 deletions Mine/src/components/NewMagazineInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default function NewMagazineInput({
value={userMood}
onChange={(e) => onUserMoodChange(e.target.value)}
onKeyDown={handleKeyDown}
placeholder="์›ํ•˜๋Š” ๋ถ„์œ„๊ธฐ๋ฅผ ์ž…๋ ฅํ•ด ์ฃผ์„ธ์š”. ex) ์•Œ๋ก๋‹ฌ๋ก ์•„๊ธฐ์ž๊ธฐํ•œ ๋ถ„์œ„๊ธฐ"
placeholder="๋ฌด๋“œ๋ณด๋“œ์˜ ๋ถ„์œ„๊ธฐ๋ฅผ ์ž…๋ ฅํ•ด ์ฃผ์„ธ์š”. ex) ์•Œ๋ก๋‹ฌ๋ก ์•„๊ธฐ์ž๊ธฐํ•œ ๋ถ„์œ„๊ธฐ"
className="w-full bg-transparent font-regular16 text-gray-100 outline-none placeholder:text-gray-100/40"
/>
</div>
Expand All @@ -60,11 +60,13 @@ export default function NewMagazineInput({
: 'bg-gray-500-op40 shadow-none'
}`}
>
<span className={`whitespace-nowrap font-medium12 ${isTopicValid ? 'text-gray-100' : 'text-gray-100/70'}`}>
<span
className={`whitespace-nowrap font-medium12 ${isTopicValid ? 'text-gray-100' : 'text-gray-100/70'}`}
>
์ž…๋ ฅ
</span>
</button>
</div>
</div>
)
}
}
7 changes: 5 additions & 2 deletions Mine/src/components/settings/SettingsModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export default function SettingsModal({ onClose }: SettingsProps) {
</button>
</div>

<div className="flex-1 py-14 pr-10 overflow-hidden">
<div className="relative flex-1 py-14 pr-10 overflow-hidden">
{activeTab === 'profile' && (
<ProfileSettings
editMode={editMode}
Expand All @@ -107,7 +107,10 @@ export default function SettingsModal({ onClose }: SettingsProps) {
/>
)}
{activeTab === 'interest' && (
<InterestSettings interests={selectedInterests} onChange={setSelectedInterests} />
<div>
<div className="text-gray-300 absolute bottom-3">์ตœ๋Œ€ 3๊ฐœ๊นŒ์ง€ ์„ ํƒํ•  ์ˆ˜ ์žˆ์–ด์š”.</div>
<InterestSettings interests={selectedInterests} onChange={setSelectedInterests} />
</div>
Comment thread
drddyn marked this conversation as resolved.
)}
</div>

Expand Down
2 changes: 1 addition & 1 deletion Mine/src/hooks/usePostAddSection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default function usePostAddSection() {
},
onError: (error) => {
console.log('์„น์…˜ ์ƒ์„ฑ:', error)
alert('์„น์…˜ ์ƒ์„ฑ์— ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค.')
// alert('์„น์…˜ ์ƒ์„ฑ์— ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค.')
},
Comment thread
drddyn marked this conversation as resolved.
})
}
3 changes: 2 additions & 1 deletion Mine/src/hooks/usePostAddSectionInSectionPage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ export default function usePostAddSectionInSectionPage() {
onSuccess: (_, variables) => {
queryClient.invalidateQueries({ queryKey: ['mymagazines', 'section'] })
queryClient.invalidateQueries({ queryKey: ['magazinedetail', variables.magazineId] })
queryClient.invalidateQueries({ queryKey: ['section', variables.magazineId, variables.sectionId] })
},
onError: (error) => {
console.log('์„น์…˜ ์ƒ์„ฑ:', error)
alert('์„น์…˜ ์ƒ์„ฑ์— ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค.')
// alert('์„น์…˜ ์ƒ์„ฑ์— ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค.')
},
Comment thread
drddyn marked this conversation as resolved.
})
}
2 changes: 1 addition & 1 deletion Mine/src/icon/swipe.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions Mine/src/pages/landing/LandingPageFifth.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import landingBg from '../../assets/bg1.png'
import MineLogo from '../../icon/logo_with_title.svg?react'
import Landing1 from '../../assets/landing1.png'
import Swipe from '../../icon/swipe.svg?react'

function EmptyCard({ showButton }: { showButton?: boolean }) {
return (
Expand Down Expand Up @@ -44,6 +45,9 @@ export default function LandingPageFifth() {
<div className="font-regular40 text-gray-100">์ •ํ•ด์ง„ ๋ฐฉ์‹์ด ์•„๋‹Œ</div>
<div className="font-semibold40 text-gray-100">๋‚˜๋งŒ์˜ ๋ฐฉ์‹์œผ๋กœ ์•„์นด์ด๋น™.</div>
</div>
<div className="absolute left-1/2 bottom-8 animate-bounce z-20">
<Swipe className="rotate-270 text-gray-200/20" />
</div>
</div>
)
}
4 changes: 4 additions & 0 deletions Mine/src/pages/landing/LandingPageFirst.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useNavigate } from 'react-router-dom'
import Minelogo from '../../icon/logo_with_title.svg?react'
import landingBg from '../../assets/bg1.png'
import Swipe from '../../icon/swipe.svg?react'

export default function LandingPageFirst() {
const navigate = useNavigate()
Expand Down Expand Up @@ -32,6 +33,9 @@ export default function LandingPageFirst() {
์‹œ์ž‘ํ•˜๊ธฐ
</button>
</div>
<div className="absolute left-1/2 bottom-8 animate-bounce">
<Swipe className="rotate-270 text-gray-200/60" />
</div>
</div>
</div>
)
Expand Down
5 changes: 4 additions & 1 deletion Mine/src/pages/landing/LandingPageSecond.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import landingBg from '../../assets/bg1.png'
import Swipe from '../../icon/swipe.svg?react'

export default function LandingPageSecond() {
return (
<div
className="relative snap-start snap-always h-screen w-full bg-cover overflow-hidden -z-20"
style={{ backgroundImage: `url(${landingBg})` }}
>
{/* <div className="absolute inset-0 bg-black/45 -z-10" /> */}
<div className="flex flex-col gap-54.5 justify-between">
<div className="w-full text-gray-100 font-regular40 pl-20 pt-33.5">
๋‹จ์ˆœํžˆ ์ •๋ณด ํš๋“์„ ์œ„ํ•œ
Expand All @@ -18,6 +18,9 @@ export default function LandingPageSecond() {
<br /> ๊ธฐ๋กํ•˜๊ณ  ์ถ•์ ํ•˜๋Š” ๊ฒฝํ—˜์œผ๋กœ.
</div>
</div>
<div className="absolute left-1/2 bottom-8 animate-bounce">
<Swipe className="rotate-270 text-gray-200/20" />
</div>
</div>
</div>
)
Expand Down
4 changes: 4 additions & 0 deletions Mine/src/pages/landing/LandingPageSixth.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import landing6 from '../../assets/landing06.jpg'
import landing7 from '../../assets/landing07.jpg'
import landing8 from '../../assets/landing08.jpg'
import landing9 from '../../assets/landing09.jpg'
import Swipe from '../../icon/swipe.svg?react'

function LandingCard({ src, label }: { src: string; label?: string }) {
return (
Expand Down Expand Up @@ -44,6 +45,9 @@ export default function LandingPageSixth() {
<LandingCard src={landing9} />
</div>
</div>
<div className="absolute left-1/2 bottom-8 animate-bounce">
<Swipe className="rotate-270 text-gray-200/20" />
</div>
</div>
)
}
4 changes: 4 additions & 0 deletions Mine/src/pages/landing/LandingPageThird.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import landingBg from '../../assets/bg1.png'
import Swipe from '../../icon/swipe.svg?react'

export default function LandingPageThird() {
return (
Expand Down Expand Up @@ -35,6 +36,9 @@ export default function LandingPageThird() {
๋ฐ”๋ž€๋‹ค๋ฉด.
</div>
</div>
<div className="absolute left-1/2 bottom-8 animate-bounce">
<Swipe className="rotate-270 text-gray-200/20" />
</div>
</div>
</div>
)
Expand Down
16 changes: 9 additions & 7 deletions Mine/src/pages/magazine/MagazinePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export default function MagazinePage() {
mode="magazine"
likeCount={data.likeCount} // data(์„น์…˜ ์ƒ์„ธ์ •๋ณด)์—์„œ ๊ฐ€์ ธ์˜จ ํ•˜ํŠธ์ˆ˜ ์ „๋‹ฌ
isLiked={data.isLiked} // ๋‚ด ์ข‹์•„์š” ์ƒํƒœ ์ „๋‹ฌ
isMyMagazine={isMyMagazine}
isMyMagazine={isMyMagazine}
/>
</div>
)}
Expand All @@ -97,12 +97,14 @@ export default function MagazinePage() {
</section>
</div>

<button
onClick={() => setIsScreenSettingsOpen(true)}
className="fixed bottom-4 right-4 z-50 transition-all duration-200 text-gray-100-op40 hover:text-gray-100"
>
<IconWandStars className="w-6 h-6 fill-current" />
</button>
{isMyMagazine && (
<button
onClick={() => setIsScreenSettingsOpen(true)}
className="fixed bottom-4 right-4 z-50 transition-all duration-200 text-gray-100-op40 hover:text-gray-100"
>
<IconWandStars className="w-6 h-6 fill-current" />
</button>
)}
</div>

<ScreenSettingsModal
Expand Down
14 changes: 8 additions & 6 deletions Mine/src/pages/magazine/components/SectionContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,14 @@ export default function SectionContent({ sectionId, magazineId }: SectionContent
/>
))}
</div>
<button
onClick={() => setIsScreenSettingsOpen(true)}
className="fixed bottom-4 right-4 z-50 transition-all duration-200 text-gray-100-op40 hover:text-gray-100"
>
<IconWandStars className="w-6 h-6 **:fill-current" />
</button>
{isMyMagazine && (
<button
onClick={() => setIsScreenSettingsOpen(true)}
className="fixed bottom-4 right-4 z-50 transition-all duration-200 text-gray-100-op40 hover:text-gray-100"
>
<IconWandStars className="w-6 h-6 **:fill-current" />
</button>
)}
</div>
</div>
<ScreenSettingsModal
Expand Down
4 changes: 4 additions & 0 deletions Mine/src/utils/blockedWords.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ export const BLOCKED_WORDS = [
'ํ˜์˜ค',
'์žฅ์• ์ธ๋น„ํ•˜',
'์ธ์ข…์ฐจ๋ณ„',
'์งฑ๊นจ',
'์ชฝ๋ฐ”๋ฆฌ',
'๋ฒ ํŠธ์ฝฉ',
'์„ฑ์ฐจ๋ณ„',
'๋™์„ฑ์• ํ˜์˜ค',
'๋‚˜์น˜',
Expand All @@ -78,6 +81,7 @@ export const BLOCKED_WORDS = [
'๊ฐœ์ƒˆ๋ผ',
'๋ณ‘์‹ ',
'๋ธ…์‹ ',
'ใ…‚ใ……',
'์ง€๋ž„',
'์ข†',
'์กด๋‚˜',
Expand Down
Loading