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

269 group defences #318

Merged
merged 9 commits into from
Sep 28, 2023
Merged

269 group defences #318

merged 9 commits into from
Sep 28, 2023

Conversation

gsproston-scottlogic
Copy link
Contributor

No description provided.

@gsproston-scottlogic
Copy link
Contributor Author

@heatherlogan-scottlogic Just noticed a bug, working on it now

@gsproston-scottlogic gsproston-scottlogic linked an issue Sep 22, 2023 that may be closed by this pull request
Copy link
Member

@chriswilty chriswilty left a comment

Choose a reason for hiding this comment

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

Mostly concerns around your new collapsible control not being a React component, plus a few other minor things.

frontend/src/components/ControlPanel/ControlPanel.css Outdated Show resolved Hide resolved
frontend/src/components/ControlPanel/ControlPanel.tsx Outdated Show resolved Hide resolved
frontend/src/components/ControlPanel/ControlPanel.tsx Outdated Show resolved Hide resolved
frontend/src/components/ControlPanel/ControlPanel.tsx Outdated Show resolved Hide resolved
/*
* Modified from https://www.w3schools.com/howto/howto_css_switch.asp
*/

/* The switch - the box around the slider */
.switch {
Copy link
Member

Choose a reason for hiding this comment

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

Can't help thinking a checkbox would be so much simpler than a homegrown slider. This is a whole heap of css...

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 bit isn't really added in this PR, I was just moving the comment to a more suitable place. Could maybe put it in it's own component to hide it away? But I'd prefer for that work to be in a new ticket as it's not really to do with this one.

Copy link
Member

Choose a reason for hiding this comment

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

Yes understood! Was just a comment in passing. Think we could add an issue for it though, it's really unwise to overcomplicate things. If we are going to overhaul the UI, we might consider a component library instead of home-cooking all our own.

frontend/src/components/DefenceBox/DefenceMechanism.tsx Outdated Show resolved Hide resolved
frontend/src/components/DefenceBox/DefenceMechanism.tsx Outdated Show resolved Hide resolved
Copy link
Member

@chriswilty chriswilty left a comment

Choose a reason for hiding this comment

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

Excellent!

))}
</div>
)}
</article>
Copy link
Member

Choose a reason for hiding this comment

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

Oh this is looking much better, nice use of article 👍

@gsproston-scottlogic gsproston-scottlogic merged commit 690dfe1 into dev Sep 28, 2023
@gsproston-scottlogic gsproston-scottlogic deleted the 269-group-defences branch September 28, 2023 08:39
chriswilty pushed a commit that referenced this pull request Apr 8, 2024
* Grouped defences

* Better html grouping

* Removed strategy box

* Visually clearer grouping

* Rounded corners on control section

* Using some rather than find

* Using details html elements

For the collapsible sections in the control panel

* Better html DRY principles
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.

Group defences
2 participants