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

feat: fix icons on PopupMain and convert to tailwind #108

Merged
merged 8 commits into from
Feb 26, 2024

Conversation

DhruvArora-03
Copy link
Member

@DhruvArora-03 DhruvArora-03 commented Feb 25, 2024

switched to using material symbol icons

the old version relied on Fa icons that we no longer use, so I replaced it with references to our material symbol icons

also went ahead and converted styling to tailwind

@@ -50,7 +53,7 @@ export default function PopupMain() {
style={{ backgroundColor: '#bf5700', borderRadius: '8px', padding: '8px' }}
onClick={handleOpenCalendar}
>
<FaCalendarAlt color='white' />
<CalendarIcon color='white' />
Copy link
Member

Choose a reason for hiding this comment

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

Replace color= prop with className="text-white"

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed!

@@ -62,7 +65,7 @@ export default function PopupMain() {
}}
onClick={handleOpenOptions}
>
<FaCog color='#C05621' />
<SettingsIcon color='#C05621' />
Copy link
Member

Choose a reason for hiding this comment

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

Replace the color prop here as well with a text- class, however what is the color supposed to be? Let's replace this with the propor theme color.

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed

@@ -10,9 +10,12 @@ import { handleOpenCalendar } from '@views/components/injected/CourseCatalogInje
import useSchedules from '@views/hooks/useSchedules';
import { openTabFromContentScript } from '@views/lib/openNewTabFromContentScript';
import React from 'react';
import { FaCalendarAlt, FaCog, FaRedo } from 'react-icons/fa'; // Added FaRedo for the refresh icon
import { TestColors } from 'src/stories/components/PopupCourseBlock.stories';
Copy link
Collaborator

Choose a reason for hiding this comment

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

It's not a good practice to import things from Storybook files. I would recommend extracting this as a common resource.

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed

@@ -50,7 +53,7 @@ export default function PopupMain() {
style={{ backgroundColor: '#bf5700', borderRadius: '8px', padding: '8px' }}
Copy link
Collaborator

Choose a reason for hiding this comment

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

Use UnoCSS here.

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed

@DhruvArora-03 DhruvArora-03 changed the title feat: fix icons on PopupMain feat: fix icons on PopupMain and convert to tailwind Feb 25, 2024
Copy link
Collaborator

@doprz doprz left a comment

Choose a reason for hiding this comment

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

Great job! Left a small comment that should be addressed before I can approve the PR.

src/views/components/PopupMain.tsx Outdated Show resolved Hide resolved
@doprz doprz self-requested a review February 25, 2024 16:56
Copy link
Collaborator

@doprz doprz left a comment

Choose a reason for hiding this comment

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

Approved. Let's wait until @Razboy20 reviews one last time before merging.

@doprz doprz dismissed Razboy20’s stale review February 26, 2024 22:19

Requested PR changes were addressed.

@doprz doprz merged commit 9ccc43c into hackathon Feb 26, 2024
7 of 9 checks passed
@doprz doprz deleted the dhruv/fix-popup-main-icons branch February 26, 2024 22:19
doprz added a commit that referenced this pull request Mar 6, 2024
* feat: fix icons on PopupMain

* fix: use text-white

* fix: move TestColors

* fix: convert to tailwind

* fix: finish moving TestColors out

* chore: add path alias

* chore: lint PR

* feat: create storybook.ts and move tailwindColorways there

---------

Co-authored-by: doprz <[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.

3 participants