-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feature/mypage/posts' of https://github.com/gaaahee/Bra…
…inPix-front into feature/mypage/posts
- Loading branch information
Showing
44 changed files
with
981 additions
and
179 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| name: Sync Fork With Upstream | ||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
| - develop | ||
|
|
||
| jobs: | ||
| sync: | ||
| if: github.repository == 'BrainPix-front' | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - name: Checkout develop | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| token: ${{secrets.PAT_TOKEN}} | ||
| ref: develop | ||
| persition-credentials: false | ||
|
|
||
| - name: Set up Git | ||
| run: | | ||
| git config user.name minejeong9919 | ||
| git config user.email "[email protected]" | ||
| - name: Add remote-url | ||
| run: | | ||
| git remote add forked-repo https://github.com/minjeong9919/BrainPix-front.git | ||
| - name: Push changes to Forked-reop | ||
| env: | ||
| GITHUB_USERNAME: minjeong9919 | ||
| GITHUB_TOKEN: ${{secrets.PAT_TOKEN}} | ||
| run: | | ||
| git push -f http://$GITHUB_USERNAME:$GITHUB_TOKEN@https://github.com/minjeong9919/BrainPix-front.git develop | ||
| - name: Clean up | ||
| run: | | ||
| git remote remove forked-repo |
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
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
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.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 5 additions & 5 deletions
10
src/components/header/SearchInput.tsx → src/components/common/header/SearchInput.tsx
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
File renamed without changes.
File renamed without changes.
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,68 @@ | ||
| import React from 'react'; | ||
| import styles from './previewThumbnail.module.scss'; | ||
| import Bookmark from '../../assets/icons/bookmark.svg?react'; | ||
|
|
||
| interface PreviewThumbnailProps { | ||
| imageUrl?: string; | ||
| profileImage?: string; | ||
| username?: string; | ||
| description?: string; | ||
| price?: number; | ||
| isBookmarked?: boolean; | ||
| onBookmarkClick?: () => void; | ||
| verified?: boolean; | ||
| } | ||
|
|
||
| const PreviewThumbnail: React.FC<PreviewThumbnailProps> = ({ | ||
| imageUrl = '', | ||
| profileImage = '', | ||
| username = '', | ||
| description = '', | ||
| price = 0, | ||
| isBookmarked = false, | ||
| onBookmarkClick = () => {}, | ||
| verified = false, | ||
| }) => { | ||
| return ( | ||
| <div className={styles.container}> | ||
| <div className={styles.profileSection}> | ||
| <div className={styles.profileImage}> | ||
| <img | ||
| src={profileImage || '/api/placeholder/24/24'} | ||
| alt={username} | ||
| /> | ||
| </div> | ||
| <span>{username}</span> | ||
| {verified && <span className={styles.verifiedBadge}>인증됨</span>} | ||
| </div> | ||
|
|
||
| <div className={styles.thumbnailImage}> | ||
| {imageUrl ? ( | ||
| <img | ||
| src={imageUrl} | ||
| alt={description} | ||
| /> | ||
| ) : ( | ||
| <img | ||
| src='/api/placeholder/312/372' | ||
| alt='placeholder' | ||
| /> | ||
| )} | ||
| </div> | ||
|
|
||
| <div className={styles.contentSection}> | ||
| <p>{description}</p> | ||
| <div className={styles.priceSection}> | ||
| <span>{price?.toLocaleString() ?? 0}원</span> | ||
| <button onClick={onBookmarkClick}> | ||
| <Bookmark | ||
| className={`${styles.bookmarkIcon} ${isBookmarked ? styles.bookmarked : ''}`} | ||
| /> | ||
| </button> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export default PreviewThumbnail; |
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,95 @@ | ||
| .container { | ||
| width: 312px; | ||
| border: 0.5px solid #DBDBDB; | ||
| border-radius: 5px; | ||
| } | ||
|
|
||
| .profileSection { | ||
| display: flex; | ||
| align-items: center; | ||
| gap: 8px; | ||
| padding: 8px; | ||
|
|
||
| & > span { | ||
| font-size: 14px; | ||
| color: #424242; | ||
| } | ||
| } | ||
|
|
||
| .profileImage { | ||
| width: 24px; | ||
| height: 24px; | ||
| border-radius: 50%; | ||
| overflow: hidden; | ||
|
|
||
| & > img { | ||
| width: 100%; | ||
| height: 100%; | ||
| object-fit: cover; | ||
| } | ||
| } | ||
|
|
||
| .verifiedBadge { | ||
| padding: 2px 8px; | ||
| background-color: #006AC6; | ||
| color: white; | ||
| border-radius: 4px; | ||
| font-size: 12px; | ||
| } | ||
|
|
||
| .thumbnailImage { | ||
| width: 312px; | ||
| height: 372px; | ||
| background-color: #DBDBDB; | ||
|
|
||
| & > img { | ||
| width: 100%; | ||
| height: 100%; | ||
| object-fit: cover; | ||
| } | ||
| } | ||
|
|
||
| .contentSection { | ||
| padding: 12px; | ||
| display: flex; | ||
| flex-direction: column; | ||
| gap: 8px; | ||
|
|
||
| & > p { | ||
| font-size: 14px; | ||
| color: #424242; | ||
| } | ||
| } | ||
|
|
||
| .priceSection { | ||
| display: flex; | ||
| justify-content: space-between; | ||
| align-items: center; | ||
|
|
||
| & > span { | ||
| font-weight: 500; | ||
| font-size: 16px; | ||
| color: #424242; | ||
| } | ||
|
|
||
| & > button { | ||
| cursor: pointer; | ||
| background: none; | ||
| border: none; | ||
| padding: 0; | ||
| } | ||
| } | ||
|
|
||
| .bookmarkIcon { | ||
| width: 20px; | ||
| height: 20px; | ||
| color: #757575; | ||
|
|
||
| &.bookmarked { | ||
| fill: #757575; | ||
| } | ||
|
|
||
| &:hover { | ||
| color: #424242; | ||
| } | ||
| } |
File renamed without changes.
Oops, something went wrong.