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

Reskin | DAO info cards #1581

Merged
merged 23 commits into from
Apr 23, 2024
Merged

Conversation

DarksightKellar
Copy link
Contributor

Addresses #1562 + some refactoring where it made sense to me

I tried not to go wild on the refactoring and it's not a lot tbh, but feel free to push back on any of these updates if they seem problematic to you. I'll push back on the pushback if unconvinced though so full disclosure lol.

I'm gonna try and add comments to this PR on some of the refactor-specific diffs.

Screenshots

Screenshot 2024-04-19 at 18 22 40 Screenshot 2024-04-19 at 18 22 59 Screenshot 2024-04-19 at 18 23 17

Pathetic menu reskin that needs more work. In a separate PR:
Screenshot 2024-04-19 at 18 23 52

import { t } from 'i18next';

interface Props extends ButtonProps {
snapshotURL: string;
}

export default function Snapshot({ snapshotURL, mt }: Props) {
const SnapshotIconSVG = () => (
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This svg can probably instead exist as a replacement to the svg image file I deleted. I tried this because I was not able to modify the icon colour on the <Image>, but I think it's a similar story with this in-line method. Thoughts?

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah this definitely can work but Chakra-UI has a createIcon function that creates a Icon component. This is how all the current Icons coming from the design package are made currently. Check out: https://github.com/decentdao/decent-ui/blob/develop/design/atoms/components/icons/src/FractalBrand.tsx

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah, that's good to know. I'm gonna leave as is in this case, since it's like 90% similar and there's no argument for one over the other (in this case).

Copy link
Contributor

@Da-Colon Da-Colon left a comment

Choose a reason for hiding this comment

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

Looking good, few suggestions and comments

Note: Haven't visually QA yet

src/components/ui/icons/FavoriteIcon.tsx Outdated Show resolved Hide resolved
import { t } from 'i18next';

interface Props extends ButtonProps {
snapshotURL: string;
}

export default function Snapshot({ snapshotURL, mt }: Props) {
const SnapshotIconSVG = () => (
Copy link
Contributor

Choose a reason for hiding this comment

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

Ah this definitely can work but Chakra-UI has a createIcon function that creates a Icon component. This is how all the current Icons coming from the design package are made currently. Check out: https://github.com/decentdao/decent-ui/blob/develop/design/atoms/components/icons/src/FractalBrand.tsx

src/components/pages/DaoDashboard/Info/InfoGovernance.tsx Outdated Show resolved Hide resolved
src/components/pages/DaoDashboard/Info/InfoGovernance.tsx Outdated Show resolved Hide resolved
src/components/ui/menus/ManageDAO/ManageDAOMenu.tsx Outdated Show resolved Hide resolved
src/components/ui/menus/OptionMenu/index.tsx Show resolved Hide resolved
src/components/ui/utils/Sort.tsx Outdated Show resolved Hide resolved
src/components/ui/menus/OptionMenu/OptionsList.tsx Outdated Show resolved Hide resolved
@DarksightKellar DarksightKellar changed the title Reskin/dao info cards Reskin | DAO info cards Apr 22, 2024
@DarksightKellar DarksightKellar linked an issue Apr 22, 2024 that may be closed by this pull request
5 tasks
Copy link

netlify bot commented Apr 22, 2024

Deploy Preview for fractal-dev failed. Why did it fail? →

Name Link
🔨 Latest commit e087af5
🔍 Latest deploy log https://app.netlify.com/sites/fractal-dev/deploys/6627a2e84488320008d57394

@decentdao decentdao deleted a comment from Da-Colon Apr 22, 2024
@adamgall
Copy link
Member

Shoot I did not mean to just delete @Da-Colon 's comment. Gonna put it back, I remember what it was about.

@@ -77,7 +57,6 @@ export default function OptionsList({
{showOptionCount && (
<Text
textStyle="text-base-mono-medium"
Copy link
Member

Choose a reason for hiding this comment

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

Originally a comment from @Da-Colon, which I accidentally deleted:

Don't forget to remove this old textStyle (or something like that).

Then, @DarksightKellar, you "resolved" this comment without doing anything about it.

Do we need to remove it?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes it should be removed. Dunno how that happened tbh. Maybe I accidentally reverted while I was staging. Thanks for catching this!

I'm actually thinking of raising a separate PR to remove ALL (non-reskin) textStyles across the app.

Copy link
Member

@adamgall adamgall left a comment

Choose a reason for hiding this comment

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

Leaving an approval because we just need to play fast and get big bulks of code merged quickly, then worry about the details later.

@Da-Colon Da-Colon dismissed their stale review April 22, 2024 21:29

Let yall handle the approval

@adamgall adamgall merged commit 1f62ff0 into reskin/refactor-root-reskin Apr 23, 2024
3 of 7 checks passed
@adamgall adamgall deleted the reskin/dao-info-cards branch April 23, 2024 15:24
@adamgall adamgall mentioned this pull request Apr 23, 2024
5 tasks
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.

[reskin] DAO Dashboard InfoCards
4 participants