-
Notifications
You must be signed in to change notification settings - Fork 1
[feat] add sidebar dashboards #18
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weβll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
8a6f373
π style: sidebar dashboard active style
devmanta 05f682b
π style: add sidebar dashboard style
devmanta 0d3bbc0
π style: add sidebar dashboard gap and title style
devmanta a091022
π style: modify sidebar border
devmanta 5acef90
π©Ή style: roll back for sidebar border
devmanta 6bcbf5d
β¨ feat: add sidebar dashboard pagination
devmanta e3c3a2d
π style: add sidebar pagniation arrow css
devmanta bb9eabc
β¨ feat: add navigation on logo
devmanta b376394
β¨ feat: add header myInfo menu
devmanta 2566702
β»οΈ refactor: extract user type
devmanta 01d73cf
β»οΈ refactor: remove DashboardList function
devmanta File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -5,7 +5,6 @@ | |
|
|
||
| .sideBarWrapper { | ||
| border-right: 1px solid var(--gray-300); | ||
| padding: 22px; | ||
| } | ||
|
|
||
| .mainWrapper { | ||
|
|
||
This file contains hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -37,4 +37,6 @@ button { | |
| a { | ||
| text-decoration: none; | ||
| color: inherit; | ||
| display: inherit; | ||
| width: inherit; | ||
| } | ||
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| 'use client'; | ||
|
|
||
| import type { User } from '@/app/(with-header-sidebar)/mydashboard/_types/user'; | ||
| import type { User } from '@/types/user'; | ||
| import Image from 'next/image'; | ||
| import useWindowSize from '@/app/(with-header-sidebar)/mydashboard/_hooks/useWindowSize'; | ||
| import { useState, useEffect } from 'react'; | ||
|
|
@@ -11,9 +11,9 @@ const user: User = { | |
| id: 1, | ||
| email: '[email protected]', | ||
| nickname: 'heejin', | ||
| // profileImageUrl: | ||
| // 'https://sprint-fe-project.s3.ap-northeast-2.amazonaws.com/taskify/profile_image/10-1_4804_1731757528194.jpeg', | ||
| profileImageUrl: null, | ||
| profileImageUrl: | ||
| 'https://sprint-fe-project.s3.ap-northeast-2.amazonaws.com/taskify/profile_image/10-1_4804_1731757528194.jpeg', | ||
| // profileImageUrl: null, | ||
| createdAt: '2024-11-15T14:29:07.482Z', | ||
| }; | ||
|
|
||
|
|
@@ -37,16 +37,16 @@ export default function UserInfo() { | |
|
|
||
| return ( | ||
| <> | ||
| {profileImageUrl ? ( | ||
| <Image | ||
| src={profileImageUrl} | ||
| alt="νλ‘ν μ΄λ―Έμ§" | ||
| width={30} | ||
| height={30} | ||
| className={styles.image} | ||
| /> | ||
| ) : ( | ||
| <div className={styles.userInfo}> | ||
| <div className={styles.userInfo}> | ||
| {profileImageUrl ? ( | ||
| <Image | ||
| src={profileImageUrl} | ||
| alt="νλ‘ν μ΄λ―Έμ§" | ||
| width={30} | ||
| height={30} | ||
| className={styles.image} | ||
| /> | ||
| ) : ( | ||
| <div | ||
| style={{ | ||
| backgroundColor: colors.randomColor, | ||
|
|
@@ -56,9 +56,9 @@ export default function UserInfo() { | |
| > | ||
| <span>{email[0].toUpperCase()}</span> | ||
| </div> | ||
| {!isMobile && <span className={styles.nickname}>{nickname}</span>} | ||
| </div> | ||
| )} | ||
| )} | ||
| <span className={styles.nickname}>{nickname}</span> | ||
| </div> | ||
| </> | ||
| ); | ||
| } | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
| @@ -1,10 +1,94 @@ | ||
| .dashBoards { | ||
| .dashboards { | ||
| width: 100%; | ||
| display: flex; | ||
| flex-direction: column; | ||
| justify-content: center; | ||
| gap: 6px; | ||
| } | ||
|
|
||
| .active { | ||
| color: salmon; | ||
| border-radius: 4px; | ||
| background: var(--violet-light); | ||
| } | ||
|
|
||
| .titleContainer { | ||
| display: flex; | ||
| justify-content: center; | ||
| align-items: center; | ||
| padding: 16px; | ||
| } | ||
|
|
||
| .dot { | ||
| width: 8px; | ||
| height: 8px; | ||
| border-radius: 999px; | ||
| } | ||
|
|
||
| .title, | ||
| .crown { | ||
| display: none; | ||
| color: var(--gray-500); | ||
| font-size: 18px; | ||
| font-weight: 500; | ||
| } | ||
|
|
||
| .arrowLeft, | ||
| .arrowRight { | ||
| border: 1px solid var(--gray-300); | ||
| border-right: none; | ||
| border-radius: 0; | ||
| background: var(--white); | ||
| height: 35px; | ||
| } | ||
|
|
||
| .arrowRight { | ||
| border-top: none; | ||
| } | ||
|
|
||
| .arrowLeft:disabled, | ||
| .arrowRight:disabled { | ||
| background: var(--white); | ||
| } | ||
|
|
||
| @media screen and (min-width: 768px) { | ||
| .dashboardsWrapper { | ||
| margin-top: 10px; | ||
| display: flex; | ||
| flex-direction: column; | ||
| gap: 15px; | ||
| } | ||
|
|
||
| .title, | ||
| .crown { | ||
| display: inline; | ||
| } | ||
|
|
||
| .crown { | ||
| margin-left: -8px; | ||
| } | ||
|
|
||
| .titleContainer { | ||
| justify-content: flex-start; | ||
| gap: 16px; | ||
| padding: 8px 10px; | ||
| } | ||
|
|
||
| .arrowWrapper { | ||
| margin-top: 20px; | ||
| } | ||
|
|
||
| .arrowLeft, | ||
| .arrowRight { | ||
| border: 1px solid var(--gray-300); | ||
| width: 40px; | ||
| height: 40px; | ||
| } | ||
|
|
||
| .arrowLeft { | ||
| border-radius: 4px 0px 0px 4px; | ||
| } | ||
|
|
||
| .arrowRight { | ||
| border-radius: 0px 4px 4px 0px; | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
μ΄κ±°.. Linkμ¬μ© μ active μΆκ°ν λ λ΄λ§λλ‘ css ν΄λμ€κ° μΆκ°κ° μλλλΌκ΅¬μ..
λλΆλͺ ν μΆκ°λ₯Όνλλ° λ₯μ€νΈκ° Link λ§μ΄νΈν λ λ λ°λ‘ μ²λ¦¬λ₯Ό νλκ²κ°μλ° ν΄λμ€κ° μ μ©μ΄μλΌμγ
μ΄λ°μμΌλ‘ μΆκ°νλ©΄ aaa μλ μ΄λ»κ² ν΄λ μ μ©μ΄μλλλ°... λ λ°λ‘ legacybasis?μΈμ§λ¨Όμ§ μμ± μΆκ°νκ³ μμμμλ‘ aνκ·Έ λ£κ³ ν΄λ μλκ³ .. css λͺ¨λμμμλ νκ·Έμ νμλ μλκ°μ§κ³ κ·Έκ²λ μ μ©μλκ³ ...
κ²°κ΅.. resetμΌλ‘ μμ
aνκ·Έλ displayλ witdh λΆλͺ¨κΊΌ css μμλ°κ² μΆκ°νμ΅λλ€
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
className={link ${isActive ? styles.active : styles.aaa}}μ¬κΈ°μ link μ λ λνλ μ μΈκ°μ???
<li></li>νκ·Έλ‘ κ°μΈμ Έμλλ° μ¬κΈ°μ μ€νμΌμ μ μ©νλ©΄ λμ§μμκΉμ???κ·Έλ¦¬κ³ μλ§
<li>νκ·Έ μμ λ©΄ Link μ€νμΌ μ μ μ© λ κ² κ°μ΅λλ€.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@najitwo μ κ° νκ³ μΆμλκ² κ²°κ΅ aνκ·Έλ₯Ό display blockμ²λΌ μ 체 widthλ₯Ό λ¨Ήλ건λ°
liμ μ€νμΌ μ μ©ν΄λ κ·Έ μμμΈ aνκ·Έλ inline μ€νμΌμ΄λΌ μ 체 widthλ₯Ό μλ¨ΉλλΌκ΅¬μπ«