Skip to content
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

Add progress bar to ds #1787

Merged
merged 2 commits into from
Aug 1, 2024
Merged

Conversation

kalashshah
Copy link
Member

Pull Request Template

Ticket Number

Description

Problem/Feature:

  • Add progress bar to the ds
  • New feature

Checklist

  • Quick PR: Is this a quick PR? Can be approved before finishing a coffee.
    • Quick PR label added
  • Not Merge Ready: Is this PR dependent on some other PR/tasks and not ready to be merged right now.
    • DO NOT Merge PR label added

Frontend Guidelines

Build & Testing

  • No errors in the build terminal
  • Engineer has tested the changes on their local environment
  • Engineer has tested the changes on deploy preview

Screenshots/Video with Explanation

Screen.Recording.2024-08-01.at.1.11.29.PM.mov

Review & Approvals

  • Self-review completed
  • Code review by at least one other engineer
  • Documentation updates if applicable

Notes

Copy link

github-actions bot commented Aug 1, 2024

  1. In the import statement at the end of the file, the module path should start with ./ for local imports, like './ProgressBar', './ProgressBar.utils', './ProgressBar.types'.
  2. In the file, there seems to be a mix of importing types and actual components from the './ProgressBar' file. Make sure to import types separately in a different way, like import type { ProgressBarProps } from './ProgressBar.types';.
  3. There is a typo in the export statement for ToggleSwitch should be 'ToggleSwitch' instead of 'toggleSwtich'.
  4. In the ProgressBar component definition, the prop progress has the correct type, but max should also be annotated with the type number.
  5. The StyledProgressBar component is accessing the percentage width based on progress and max, but it's missing a check to avoid dividing by zero when max is 0.
  6. The ProgressBarProps type definition should include a description for each prop for better documentation.
  7. The comment in the ProgressBar component definition mentions 'width' for the StyledProgressBar, but the CSS property actually being set is 'height'.
  8. It seems the export * from './ProgressBar'; and subsequent lines are redundant because everything from './ProgressBar' is already being exported earlier.
  9. The import statements for semantic related files at the bottom of the file seem a bit exhaustive. Consider finding a better organization or grouping mechanism for these imports.

All other parts of the code appear to be in good order.

Therefore - All looks good.

Copy link

github-actions bot commented Aug 1, 2024

PR Preview Action v1.4.7
Preview removed because the pull request was closed.
2024-08-01 16:36 UTC

aria-valuenow={progress}
{...rest}
>
<StyledProgressBar {...{ progress, max }} />
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<StyledProgressBar {...{ progress, max }} />
<StyledProgressBar width={`${getProgressWidthPercentage(progress, max)}%`} />

border-radius: var(--radius-xxs, 8px);
background-color: var(--components-progress-bar-background-progress);
height: 100%;
width: ${({ progress, max }) => `${getProgressWidthPercentage(progress, max)}%`};
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
width: ${({ progress, max }) => `${getProgressWidthPercentage(progress, max)}%`};
width: ${({ width }) => width};

import type { ProgressBarProps } from './ProgressBar.types';
import { getProgressWidthPercentage } from './ProgressBar.utils';

const StyledProgressBarContainer = styled.div<Omit<ProgressBarProps, 'progress' | 'max'>>`
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const StyledProgressBarContainer = styled.div<Omit<ProgressBarProps, 'progress' | 'max'>>`
const StyledProgressBarContainer = styled.div<{css?: FlattenSimpleInterpolation}>`

${({ css }) => css || ''}
`;

const StyledProgressBar = styled.div<ProgressBarProps>`
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const StyledProgressBar = styled.div<ProgressBarProps>`
const StyledProgressBar = styled.div<{width:string}>`

@@ -0,0 +1,6 @@
import { colorBrands } from '../colors/colors.brands';

export const progressBarSemantics = {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Screenshot 2024-08-01 at 2 43 34 PM

The semantics doesn't matches figma.

Comment on lines 4 to 5
'background-default': { light: colorBrands['neutral-100'], dark: colorBrands['neutral-800'] },
'background-progress': { light: colorBrands['primary-600'], dark: colorBrands['primary-500'] },
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
'background-default': { light: colorBrands['neutral-100'], dark: colorBrands['neutral-800'] },
'background-progress': { light: colorBrands['primary-600'], dark: colorBrands['primary-500'] },
'background-default': { light: surfaceSemantics['secondary'].light, dark: surfaceSemantics['secondary'].dark },
'background-progress': { light: surfaceSemantics['brand-medium'].light, dark: surfaceSemantics['brand-medium'].dark },

Copy link

github-actions bot commented Aug 1, 2024

  • In the code snippet, the import statement for Tooltip in the export section is incorrect. It should import Tooltip, but it currently imports tooltip.

  • The import statement for ToggleButton should import from toggleSwitch, but there is a typo (toggleSwtich).

  • In the ProgressBar component, there is a syntax error in the way the width is calculated:

    <StyledProgressBar width={`${getProgressWidthPercentage(progress, max)}%`} />
  • There is an unused import for ProgressBarProps in the file.

  • The naming convention for files importing and exporting components should be consistent for readability.

  • The export statements for the ProgressBar related files at the bottom of the file seem redundant.

Apart from these points, the logic and structure of the code look good.

All looks good.

@rohitmalhotra1420 rohitmalhotra1420 merged commit a1d331b into main Aug 1, 2024
2 checks passed
corlard3y pushed a commit that referenced this pull request Aug 1, 2024
* feat: add progress bar to ds

* chore: update progress bar according to review
rohitmalhotra1420 added a commit that referenced this pull request Sep 30, 2024
* added loading colour

* add icon

* add components

* update styles

* update mobile view

* update titles

* change button labels

* update multiplier

* update useDailyRewards hook

* update unlock profile modal changes

* update usedailyrewards hook

* fix isLoading onclick

* update locked status/ rewards ui

* update new users status

* add skeleton loader

* comment out stake push activities

* update skeleton loader

* update locked icon

* format text

* feat: add alert ds component (#1781)

* feat: add alert ds component

* chore: update alert ds acc to review

* chore: update component acc to review

* update alert for error messages

* update indexes

* Update Dashboard.tsx

* remove unusued

* fixed review comments

* Update Button.tsx

* update completed state

* fixed the spinner and button

* fixed the spinner and button

* Added spinner component (#1783)

* added spinner component

* added review changes

* added correct variants

* added the review comments

* added the review comments

* Add progress bar to ds (#1787)

* feat: add progress bar to ds

* chore: update progress bar according to review

* add loading state

* update locked status

* update isLocked

* update loading state

* remove disabled state from button

* update locked divider

* update error message

* fix icons and illustrations

* update naming and imports

* update reward activites hook

* update type

* add types

* resolve conments

* update box

* update text changes

* update text

* update points real time

* update mutiplier conditions in bonus

* update gap

* update padding referal section

* adjust daily section ui

* update stake array

* update stake api

* update rewards verification hook

* fix: yield farming layouts and resize buttons to take full width (#1793)

* Add support for erc1155 (#1794)

* chore: add support for erc1155

* chore: update uiweb version to include erc1155 support

* Replaced older tab implementation in trending channels with the new tab block component (#1800)

* added

* moved function to utils

* tab changes

* reverted rewards tab change

* Update Dashboard.utils.ts

* Opt-In Dropdown for dashboard (#1802)

* Opt-In Dropdown for dashboard

* Fixed the comments and issues

* Fixed the context issue

* DS-Dapp Notification Component  (#1801)

* add in-app semantics and block files

* update notification component

* add localstorage identifier

* update library

* add duration option

* resolve comments

* update comment fixes

* fix comments

* testing notification

* update notification component

---------

Co-authored-by: rohitmalhotra1420 <[email protected]>

* DApp-1804 tag component added in blocks (#1805)

* tag in progress

* implemented tag component

* Tag component implemented in blocks

* update hook and export component

* update code

* add componentdid mount flow

* update mount logic

* fix stake font size

* fix conflicts

* Fixed create channel ui , fixed message for unlock profile, removed governance from sidebar (#1817)

* fixed minor ui issues

* fixed minor ui issues

* fixed minor ui issues

* fixed select text color

* fixed select text color

* fixed select text color

* fixed chain issue

* fixed send notif delegate issue (#1822)

* fixed send notif delegate issue

* Fixed the send notification button on the navigation for delegatee list

* added fixes for alias

* added fixes for alias

* fixed review comment

---------

Co-authored-by: abhishek-01k <[email protected]>

* DApp-1799 blocks/table (#1824)

* table in progress

* in progress

* in progress

* table complete

* fixed header route +  reverted changes

* added alignment support

* set debug to false

* fix comments

* export type and fix issues

* update rewards notification

* fix loading state

* add activit days

* update locked status

* updates test whitelist file for nft claims

* fixed smart contract for alpha nft

* update reset time

* refactor code

* update fixes

* stake push

* update types

* update yarn.lock

* update icons

* update icons batch 2

* sort stake section

* add local storage key

* update hasEnded and has text

* fixed channel notifications (#1852)

* added the new monotone icons (#1857)

* added support for icons in tag components (#1853)

* update stat in yield farming data store (#1859)

* update refetch leaderboard

* fix double text issue - media query

* update icon

* hide notifs

* update font sizes

* fix invalid verification proof issue

* remove console

* update success flow

* fixes done

* removed the png file

* lock file fixed

* remove isActive Account in auth hook

---------

Co-authored-by: Monalisha Mishra <[email protected]>
Co-authored-by: rohitmalhotra1420 <[email protected]>
Co-authored-by: Kalash Shah <[email protected]>
Co-authored-by: Monalisha Mishra <[email protected]>
Co-authored-by: Abhishek <[email protected]>
Co-authored-by: abhishek-01k <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants