adding the reusable sidebar #411
Open
Conversation
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
|
@Dprof-in-tech seems like it is not finished yet? or can I review already? |
|
Please give me a couple of minutes so I can push the remaining updates .
I’ll send you a telegram dm once I do that.
…On Fri, Dec 20, 2024 at 8:48 PM whateverfw ***@***.***> wrote:
@Dprof-in-tech <https://github.com/Dprof-in-tech> seems like it is not
finished yet? or can I review already?
—
Reply to this email directly, view it on GitHub
<#411 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/A3W3TPL4OXVBVTIFTM62TTT2GRYBLAVCNFSM6AAAAABT5CIQVOVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDKNJXGYZDONZUHA>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
whateverfw
requested changes
Dec 21, 2024
There was a problem hiding this comment.
@Dprof-in-tech Please resolve comments
Also sync with main. Notice that there were changes to folder structure and file's locations. Please merge it to your branch and make sure your changes is not overriden and applied correctly
| <div className="tab-indicator-container"> | ||
| <div className={`tab-indicator ${isCollateralActive ? 'collateral' : 'borrow'}`} /> | ||
| <div className="dashboard"> | ||
| <Sidebar title={'Dashboard'} items={dashboardItems} className="sidebar-docs-sticky" /> |
There was a problem hiding this comment.
dashboard should not have title (just like in figma)
| @@ -89,7 +91,8 @@ const Documentation = () => { | |||
|
|
|||
| return ( | |||
| <div className="documentation-page"> | |||
| <TableOfContents tabelTitle={"Table Of Content"} defaultActiveId={"introduction"} headerHeight={80} items={tableOfContents} /> | |||
| {/* <TableOfContents tabelTitle={"Table Of Content"} defaultActiveId={"introduction"} headerHeight={80} items={tableOfContents} /> */} | |||
There was a problem hiding this comment.
please remove commented parts
There was a problem hiding this comment.
item's color do not match figma, should be #83919F in default state and #F0F0F0 in active state
also please make sure left padding and vertical padding between items are according to figma
| return ( | ||
| <div className="layout"> | ||
| <aside className="sidebar"> | ||
| {/* <aside className="sidebar"> |
| id: 'home', | ||
| name: 'Home', | ||
| link: '/', | ||
| icon: '•' |
There was a problem hiding this comment.
Also, title styles do not match Figma
| @@ -12,9 +13,10 @@ const Documentation = () => { | |||
|
|
|||
|
|
|||
| const tableOfContents = [ | |||
There was a problem hiding this comment.
- Icorrect title styles
- no icons near the items and seems like sub-items do not work correctly
- when clicking
OverviewI can't select any other item anymore - when I click getting started, all items below is highlighted, also those items can't be directly selected
|
I’m on it chief
…On Sat, Dec 21, 2024 at 9:29 AM whateverfw ***@***.***> wrote:
***@***.**** requested changes on this pull request.
@Dprof-in-tech <https://github.com/Dprof-in-tech> Please resolve comments
Also sync with main. Notice that there were changes to folder structure
and file's locations. Please merge it to your branch and make sure your
changes is not overriden and applied correctly
------------------------------
In frontend/src/pages/spotnet/dashboard/Dashboard.jsx
<#411 (comment)>:
> - <span className="tab-title">Collateral & Earnings</span>
- </button>
-
- <div className="tab-divider" />
-
- <button
- onClick={() => setIsCollateralActive(false)}
- className={`tab ${!isCollateralActive ? 'active borrow' : ''}`}
- >
- <BorrowIcon className="tab-icon" />
- <span className="tab-title">Borrow</span>
- </button>
- <div className="tab-indicator-container">
- <div className={`tab-indicator ${isCollateralActive ? 'collateral' : 'borrow'}`} />
+ <div className="dashboard">
+ <Sidebar title={'Dashboard'} items={dashboardItems} className="sidebar-docs-sticky" />
dashboard should not have title (just like in figma)
------------------------------
In frontend/src/pages/spotnet/documentation/Documentation.jsx
<#411 (comment)>:
> @@ -89,7 +91,8 @@ const Documentation = () => {
return (
<div className="documentation-page">
- <TableOfContents tabelTitle={"Table Of Content"} defaultActiveId={"introduction"} headerHeight={80} items={tableOfContents} />
+ {/* <TableOfContents tabelTitle={"Table Of Content"} defaultActiveId={"introduction"} headerHeight={80} items={tableOfContents} /> */}
please remove commented parts
------------------------------
On frontend/src/components/ui/Components/Sidebar/Sidebar.css
<#411 (comment)>:
item's color do not match figma, should be #83919F in default state and
#F0F0F0 in active state
also please make sure left padding and vertical padding between items are
according to figma
------------------------------
In frontend/src/pages/vault/VaultLayout.jsx
<#411 (comment)>:
> return (
<div className="layout">
- <aside className="sidebar">
+ {/* <aside className="sidebar">
remove commented code
------------------------------
In frontend/src/pages/vault/VaultLayout.jsx
<#411 (comment)>:
>
export function VaultLayout({ children }) {
+ const vaultItems = [
+ {
+ id: 'home',
+ name: 'Home',
+ link: '/',
+ icon: '•'
image.png (view on web)
<https://github.com/user-attachments/assets/419c609d-e1ab-4f8a-8a55-4ee2beb0d143>
Also, title styles do not match Figma
------------------------------
In frontend/src/pages/spotnet/documentation/Documentation.jsx
<#411 (comment)>:
> @@ -12,9 +13,10 @@ const Documentation = () => {
const tableOfContents = [
image.png (view on web)
<https://github.com/user-attachments/assets/57a86e8f-a9a2-46cc-ab51-ee9ee9e20df7>
- Icorrect title styles
- no icons near the items and seems like sub-items do not work
correctly
- when clicking Overview I can't select any other item anymore
- when I click getting started, all items below is highlighted, also
those items can't be directly selected
—
Reply to this email directly, view it on GitHub
<#411 (review)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/A3W3TPM656XLU74MYFZXL5L2GURE7AVCNFSM6AAAAABT5CIQVOVHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMZDKMJYGYYTAMBXHE>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
|
@Dprof-in-tech Please, resolve conflict |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
closes #407