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

UI/icons consistent #99

Merged
merged 19 commits into from
Feb 12, 2025
Merged

UI/icons consistent #99

merged 19 commits into from
Feb 12, 2025

Conversation

rosannamilner
Copy link
Collaborator

@rosannamilner rosannamilner commented Feb 5, 2025

Closes #76

Added lots of icons! Let me know what you think

  • finished adding to myorganisation page and newly added to navbar
  • added button look to logout on navbar

Notes

  • still working out how to add the Search and Clear icon correctly
    • the change in search_bar.html is indentation and comments for the search and clear icons
  • I'm not sure how to add icons to the survey (svelte) buttons but I can look into this more deeply if wanted

manage
profile
myorganisation
myorganisation-projects
myorganisation-surveys-configure

@f-allian f-allian requested a review from twinkarma February 5, 2025 10:54
Copy link
Member

@f-allian f-allian left a comment

Choose a reason for hiding this comment

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

@rosannamilner Thanks Rosanna. I'm a big fan of the icons, but I've requested a review from @twinkarma too to get his opinion.

Also, could you please merge the latest dev into this branch / resolve the conflicts before merging into dev?

Copy link
Contributor

@twinkarma twinkarma left a comment

Choose a reason for hiding this comment

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

Looks really good, thanks!

@rosannamilner
Copy link
Collaborator Author

Added logout icon too

logout-icon

@rosannamilner
Copy link
Collaborator Author

Worked out how to add icons to search bar
searchbar

@twinkarma
Copy link
Contributor

@rosannamilner are you happy for this to be merged?

@rosannamilner
Copy link
Collaborator Author

@rosannamilner are you happy for this to be merged?

Yes, thanks Twin.

However, the buttons inside the survey (svelte files) haven't had logos added to them as I'm still working that out, not being familiar to svelte. In base.html they're added like this below, how would I add boxicons package to svelte?

        <link href="https://cdn.jsdelivr.net/npm/[email protected]/css/boxicons.min.css" rel="stylesheet">

I can see in assets/sort-survey-configurator/src/lib/components/input/SectionComponent.svelte it has imports as javascript and it's this button I would like to change L167

        {#if editable}
            <button class="btn btn-primary" onclick={addField}><i class="bx bxs-plus" alt=""></i> Add field</button>
        {/if}

@twinkarma
Copy link
Contributor

twinkarma commented Feb 12, 2025

Boxicon package has already been included both on the main site (in base.html) or in the test harness (in /assets/sort-survey-configurator/index.html).

You might not be seeing an update when viewing the site itself as when you make a change in the sort-survey-configurator project you need to go in to the folder /assets/sort-survey-configurator and run npm run build, this builds the javascript files into the the /static/js/sort-ui folder which is then picked up by the django site (see the bottom of survey_configure.html template).

Sorry it's a bit convoluted at the moment, I'll be looking into how we can streamline the build process (or at least document it better) soon!

@rosannamilner
Copy link
Collaborator Author

rosannamilner commented Feb 12, 2025

Boxicon package has already been included both on the main site (in base.html) or in the test harness (in /assets/sort-survey-configurator/index.html).

You might not be seeing an update when viewing the site itself as when you make a change in the sort-survey-configurator project you need to go in to the folder /assets/sort-survey-configurator and run npm run build, this builds the javascript files into the the /static/js/sort-ui folder which is then picked up by the django site (see the bottom of survey_configure.html template).

Sorry it's a bit convoluted at the moment, I'll be looking into how we can streamline the build process (or at least document it better) soon!

Ah ok I see great, thanks! I'll aim to add them later and let you know when this PR is fully ready

@rosannamilner
Copy link
Collaborator Author

I have run out of time before the feedback session tomorrow to do much more but the internal survey buttons have been given icons now:

configure-buttons

  • anything inside an input form I will need to look into further
    • missing qr_code button icons and configure survey submit button

buttons

So this PR is ready @twinkarma for now if you're happy with these few missing icons!

@twinkarma
Copy link
Contributor

It's looking really good, I think we'll be ok missing a few icons. Thanks so much @rosannamilner!

@twinkarma twinkarma merged commit 8e9a571 into dev Feb 12, 2025
@rosannamilner rosannamilner deleted the ui/icons-consistent branch February 18, 2025 08:36
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