Skip to content

Commit

Permalink
Merge pull request #35 from dnd-side-project/develop
Browse files Browse the repository at this point in the history
test : Release-drafter 테스트
  • Loading branch information
guesung committed Aug 25, 2023
2 parents 6260543 + 3a96692 commit 52e18d4
Show file tree
Hide file tree
Showing 23 changed files with 137 additions and 13 deletions.
40 changes: 40 additions & 0 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name-template: "v$RESOLVED_VERSION 🌈" ## 릴리즈 제목
tag-template: "v$RESOLVED_VERSION" ## 태그
categories:
- title: "🚀 Features"
labels:
- "Bookmark 🔖"
- "✨ Feat"
- "PoseFeed 🧩"
- "PosePick 🃏"
- "PoseTalk 💬"
- "💄 Style"
- title: "🐛 Bug Fixes"
labels:
- "🛠 Fix"
- title: "🧰 Maintenance"
labels:
- "♻️ Refactor"
change-template: "- $TITLE @$AUTHOR (#$NUMBER)"
change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
version-resolver:
major:
labels:
- "major"
minor:
labels:
- "minor"
patch:
labels:
- "patch"
default: patch
template: | # 릴리즈 내용
## Changes (v$RESOLVED_VERSION)
$CHANGES
## Previos Tag
$PREVIOUS_TAG
## Contributors
$CONTRIBUTORS
20 changes: 20 additions & 0 deletions .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Release Drafter

on:
push:
branches:
- main

permissions:
contents: read

jobs:
update_release_draft:
permissions:
contents: write
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: release-drafter/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Binary file added public/images/main_star.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Binary file modified public/pwa-icons/icon-128x128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/pwa-icons/icon-144x144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/pwa-icons/icon-152x152.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/pwa-icons/icon-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/pwa-icons/icon-384x384.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/pwa-icons/icon-48x48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/pwa-icons/icon-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/pwa-icons/icon-72x72.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/pwa-icons/icon-96x96.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 6 additions & 1 deletion src/app/(Main)/components/MainHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
import Image from 'next/image';
import Link from 'next/link';

import Tab from './Tab';
import { Header } from '@/components/Header';

export default function MainHeader() {
return (
<Header
leftNode={<h4>PosePicker</h4>}
leftNode={
<Link href="/pick">
<h4>PosePicker</h4>
</Link>
}
rightNode={<Image src="/icons/menu.svg" width={24} height={24} alt="24" />}
headerDownNode={<Tab />}
className="px-20"
Expand Down
32 changes: 30 additions & 2 deletions src/app/(Main)/feed/components/Photo.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
'use client';
import Image from 'next/image';
import Link from 'next/link';

import { Popup } from '@/components/Modal';
import { useOverlay } from '@/components/Overlay/useOverlay';
import { ICON } from '@/constants/icon';

interface Photo {
Expand All @@ -10,14 +13,39 @@ interface Photo {
}

export default function Photo({ imageKey, source, id }: Photo) {
const { open } = useOverlay();
return (
<Link href={`detail/${id}`}>
<div className={`relative z-0 mb-16 inline-block h-fit w-full rounded-8`}>
{imageKey && (
<>
<img src={imageKey} alt={source} className="rounded-8" />
<Image
src={imageKey}
alt={source || ''}
width={200}
height={100}
className="rounded-8"
/>
<div className="absolute bottom-6 right-6 h-36 w-36 rounded-24 bg-white bg-opacity-30 p-6">
<Image src={ICON.bookmark.empty} width={24} height={24} alt="🔖" />
<Image
src={ICON.bookmark.empty}
width={24}
height={24}
alt="🔖"
onClick={(e) => {
e.preventDefault();
open(({ exit }) => (
<Popup
onClick={exit}
className="cursor-pointer rounded-8"
onCloseOutside={exit}
>
<p>해당 기능은 아직 준비중이에요!</p>
<p> 업데이트를 기대해 주세요.</p>
</Popup>
));
}}
/>
</div>
</>
)}
Expand Down
Binary file modified src/app/favicon.ico
Binary file not shown.
2 changes: 1 addition & 1 deletion src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import type { Metadata } from 'next';

const DEFAULT_OG_TITLE = 'PosePicker';
const DEFAULT_OG_DESC = '포토부스에서 고민하는 당신을 위한 포즈 추천';
const DEFAULT_OG_IMAGE = '/images/main.png';
const DEFAULT_OG_IMAGE = '/images/main_star.png';

export const metadata: Metadata = {
metadataBase: new URL(BASE_SITE_URL),
Expand Down
17 changes: 13 additions & 4 deletions src/components/Modal/Modal.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
import ModalWrapper from './PortalWrapper';
import { StrictPropsWithChildren } from '@/types';

interface PopupProps {
interface PopupProps extends React.HTMLAttributes<HTMLTableSectionElement> {
className?: string;
onCloseOutside?: () => void;
}

export default function Popup({ className, children }: StrictPropsWithChildren<PopupProps>) {
export default function Popup({
className,
children,
onCloseOutside,
...props
}: StrictPropsWithChildren<PopupProps>) {
return (
<ModalWrapper>
<section className={`flex flex-col items-center bg-white px-16 py-12 ${className}`}>
<ModalWrapper onClick={onCloseOutside}>
<section
className={`flex flex-col items-center bg-white px-16 py-12 ${className}`}
{...props}
>
{children}
</section>
</ModalWrapper>
Expand Down
4 changes: 3 additions & 1 deletion src/components/Modal/PortalWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { useOnClickOutside } from '@/hooks/useOnClickOutside';

import type { StrictPropsWithChildren } from '@/types';

interface PortalWrapperProps {
interface PortalWrapperProps extends React.HTMLAttributes<HTMLDivElement> {
onClose?: () => void;
isBackGroundBlur?: boolean;
className?: string;
Expand All @@ -18,6 +18,7 @@ export default function PortalWrapper({
children,
isBackGroundBlur = true,
className,
...props
}: StrictPropsWithChildren<PortalWrapperProps>) {
const portalRef = useRef<HTMLDivElement>(null);

Expand All @@ -35,6 +36,7 @@ export default function PortalWrapper({
},
className
)}
{...props}
>
{children}
</div>
Expand Down
10 changes: 8 additions & 2 deletions src/components/Overlay/useOverlay.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ let elementId = 1;

interface Options {
exitOnUnmount?: boolean;
delay?: number;
}

export function useOverlay({ exitOnUnmount = true }: Options = {}) {
export function useOverlay({ exitOnUnmount = true, delay }: Options = {}) {
const context = useContext(OverlayContext);

if (context == null) {
Expand Down Expand Up @@ -44,6 +45,11 @@ export function useOverlay({ exitOnUnmount = true }: Options = {}) {
}}
/>
);
if (!delay) return;
const timer = setTimeout(() => {
unmount(id);
}, delay);
return () => clearTimeout(timer);
},
close: () => {
overlayRef.current?.close();
Expand All @@ -52,6 +58,6 @@ export function useOverlay({ exitOnUnmount = true }: Options = {}) {
unmount(id);
},
}),
[id, mount, unmount]
[delay, id, mount, unmount]
);
}
13 changes: 13 additions & 0 deletions src/components/WaitingToast/WaitingToast.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
interface WaitingToastProps {
onClose: () => void;
}
export default function WaitingToast({ onClose }: WaitingToastProps) {
return (
<div
onClick={onClose}
className="inset-x-0 mx-auto max-w-390 cursor-pointer rounded-4 bg-zinc-900 bg-opacity-80 px-36 py-12 text-white"
>
해당 기능은 준비 중입니다. 조금만 기다려 주세요!
</div>
);
}
1 change: 1 addition & 0 deletions src/components/WaitingToast/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default as WaitingToast } from './WaitingToast';
4 changes: 2 additions & 2 deletions src/hooks/useKakaoShare.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ export default function useKakaoShare() {
kakao.Link.sendDefault({
objectType: 'feed',
content: {
title: '포즈를 뽑아봐 !',
description: '당신에게 어울리는 포즈를 추천해드립니다.',
title: 'PosePicker',
description: '포토부스에서 고민하는 당신을 위한 포즈 추천',
imageUrl:
'https://github.com/gloddy-dev/gloddy-client/assets/62178788/a145c7ca-b487-4b2a-9913-cc1589e44f91',
link: {
Expand Down

0 comments on commit 52e18d4

Please sign in to comment.