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

Facilitator_mx Theme: New look task-card #2626

Merged
merged 12 commits into from
Jan 14, 2025
Merged

Conversation

FaithDaka
Copy link
Collaborator

PR Checklist

  • PR title descriptive (can be used in release notes)

Description

  • Added variant, block-button for the task card. Task Card
  • Styling according to plh-facilitator-mx theme

Git Issues

Closes #2573

Screenshots

inProgress vs notStarted

@FaithDaka FaithDaka linked an issue Dec 15, 2024 that may be closed by this pull request
@FaithDaka FaithDaka requested a review from jfmcquade December 15, 2024 05:17
@FaithDaka FaithDaka self-assigned this Dec 15, 2024
@FaithDaka
Copy link
Collaborator Author

@jfmcquade I made changes to the debug/config.ts file in order to add the plh-facilitator-mx theme but I don't have write access to the debug workspace so I will need your help with that configuration.

@jfmcquade
Copy link
Collaborator

@jfmcquade I made changes to the debug/config.ts file in order to add the plh-facilitator-mx theme but I don't have write access to the debug workspace so I will need your help with that configuration.

This was already included (see https://github.com/IDEMSInternational/app-debug-content/blob/main/config.ts), but I don't think you will have been shown how to update the deployment content (including config file) to reflect the main content branch.
It should update if you run yarn workflow deployment set debug and agree to override any local changes (the pending changes can always be synced from Google Drive again). If that doesn't do it, you can manually pull by running yarn workflow repo open to open the local content repo folder in a new VSCode window, and then run git checkout main and git pull from that folder.

I've also given you write permissions on the debug repo, your invite is pending acceptance.

Copy link
Collaborator

@jfmcquade jfmcquade left a comment

Choose a reason for hiding this comment

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

The styling looks good. See my inline comments, including a blocking one about replacing the current plh_facilitator_mx theme.

I also think that in the component demo template, as the block button variant is included as an example, it should be made clear that the variant is only styled for the plh_facilitator_mx theme, e.g. in the title above the variant demo.

@ChrisMarsh82 I think this needs some changes before it can be merged, but the core styling/functionality should be there, so you could merge this feature branch into working branch. Note that @FaithDaka has set up an alternative plh_facilitator_mx theme at src/theme/themes/plh_facilitator_mx/_index.scss, where she's applied the same changes of the primary/secondary source theme colours as you did.

@jfmcquade jfmcquade self-requested a review January 7, 2025 15:33
@jfmcquade
Copy link
Collaborator

After discussion with @ChrisMarsh82 we agreed that it makes sense to overwrite the pre-existing plh_facilitator_mx theme with the updated one in this PR, as opposed to keeping both.

@ChrisMarsh82, could you give a quick functional check of this PR to make sure that the component is behaving as expected for you?

@FaithDaka, I've cleaned up the code in the task card component template somewhat, essentially in your refactoring to use the modern Angular @if syntax, you'd left in the <ng-tempalte> blocks, which are no longer necessary. Have a look at 65cb42a#diff-122995a1ed907cfd136db6c8aacdd6c45d1a1c474d894d6846b656673a36c06a and make sure it looks right to you

Copy link
Collaborator

@jfmcquade jfmcquade left a comment

Choose a reason for hiding this comment

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

@ChrisMarsh82 are you happy for this to be merged? I think you've been working from this feature branch anyway

@jfmcquade jfmcquade merged commit fd03a27 into master Jan 14, 2025
6 checks passed
@jfmcquade jfmcquade deleted the feature-new-look-task_card branch January 14, 2025 09:40
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.

[FEATURE] New look task_card
2 participants