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

NOISSUE - Add Country, City, Service and Version filters to the UI #20

Merged
merged 18 commits into from
Aug 8, 2023

Conversation

Musilah
Copy link
Contributor

@Musilah Musilah commented Aug 2, 2023

What does this do?

Add Country, City, Service and Version filters to the UI
image

Which issue(s) does this PR fix/relate to?

https://github.com/ultravioletrs/issues/issues/266

List any changes that modify/break current functionality

None

Have you included tests for your changes?

No

Did you document any new/modified functionality?

No

Notes

web/template/index.html Outdated Show resolved Hide resolved
web/template/index.html Outdated Show resolved Hide resolved
web/template/index.html Outdated Show resolved Hide resolved
web/template/index.html Outdated Show resolved Hide resolved
web/template/index.html Outdated Show resolved Hide resolved
web/template/index.html Outdated Show resolved Hide resolved
@Musilah
Copy link
Contributor Author

Musilah commented Aug 2, 2023

i have resolved the changes

web/template/index.html Outdated Show resolved Hide resolved
@Musilah Musilah marked this pull request as ready for review August 2, 2023 20:09
@drasko
Copy link
Contributor

drasko commented Aug 2, 2023

@SammyOina please review

Copy link
Contributor

@SammyOina SammyOina left a comment

Choose a reason for hiding this comment

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

Country filters work ok, but the originating issue requires applying the other filters as well. We might have to merge #21 and #22 so this can be updated

web/template/index.html Outdated Show resolved Hide resolved
web/template/index.html Outdated Show resolved Hide resolved
web/template/index.html Outdated Show resolved Hide resolved
web/template/index.html Outdated Show resolved Hide resolved
web/template/index.html Outdated Show resolved Hide resolved
service.go Show resolved Hide resolved
service.go Outdated Show resolved Hide resolved
web/template/index.html Outdated Show resolved Hide resolved
Copy link
Contributor

@SammyOina SammyOina left a comment

Choose a reason for hiding this comment

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

image
add padding to these, it would also be great to include an image of the ui changes in the PR description

@ianmuchyri
Copy link

This PR contains commits that have been merged already. Rebase correctly.

@Musilah Musilah changed the title NOISSUE-Add Country filters to the UI NOISSUE-Add Country and City filters to the UI Aug 3, 2023
@SammyOina
Copy link
Contributor

for the filters button, I'd suggest keeping it minimal hovering on the right side right: 10px; of the map with an icon like this <span class="glyphicon glyphicon-filter"></span> and no text.

@drasko drasko changed the title NOISSUE-Add Country and City filters to the UI NOISSUE - Add Country and City filters to the UI Aug 3, 2023
Musilah added 7 commits August 4, 2023 09:36
Signed-off-by: Musilah <[email protected]>
Signed-off-by: Musilah <[email protected]>
Signed-off-by: Musilah <[email protected]>
Signed-off-by: Musilah <[email protected]>
Signed-off-by: Musilah <[email protected]>
Signed-off-by: Musilah <[email protected]>
timescale/timescale.go Outdated Show resolved Hide resolved
service.go Outdated Show resolved Hide resolved
service.go Outdated Show resolved Hide resolved
service.go Outdated Show resolved Hide resolved
service.go Outdated Show resolved Hide resolved
service.go Outdated Show resolved Hide resolved
service.go Outdated Show resolved Hide resolved
timescale/timescale.go Outdated Show resolved Hide resolved
timescale/timescale.go Outdated Show resolved Hide resolved
timescale/timescale.go Outdated Show resolved Hide resolved
timescale/timescale.go Outdated Show resolved Hide resolved
telemetry.go Outdated Show resolved Hide resolved
service.go Outdated Show resolved Hide resolved
@SammyOina
Copy link
Contributor

Make this list to appear clickable, currently one wouldn't think it is since the cursor is an input cursor, change it to a pointer cursor image

You can do that by adding the following CSS after this line

https://github.com/mainflux/callhome/blob/1a73c9a16c2ddd1e7a4a98b196a647585664973d/web/static/style.css#L54

.list-group { cursor: pointer; }

out of the scope of this PR

@ianmuchyri
Copy link

Make this list to appear clickable, currently one wouldn't think it is since the cursor is an input cursor, change it to a pointer cursor image
You can do that by adding the following CSS after this line
https://github.com/mainflux/callhome/blob/1a73c9a16c2ddd1e7a4a98b196a647585664973d/web/static/style.css#L54

.list-group { cursor: pointer; }

out of the scope of this PR

removed it and added it as an issue

Signed-off-by: Musilah <[email protected]>
service.go Outdated Show resolved Hide resolved
Signed-off-by: Musilah <[email protected]>
Musilah added 4 commits August 4, 2023 17:57
Signed-off-by: Musilah <[email protected]>
Signed-off-by: Musilah <[email protected]>
@Musilah Musilah changed the title NOISSUE - Add Country and City filters to the UI NOISSUE - Add Country, City, Service and Version filters to the UI Aug 6, 2023
api/endpoint.go Outdated Show resolved Hide resolved
api/responses.go Outdated Show resolved Hide resolved
service.go Outdated Show resolved Hide resolved
telemetry.go Outdated Show resolved Hide resolved
web/template/index.html Outdated Show resolved Hide resolved
web/template/index.html Outdated Show resolved Hide resolved
web/static/style.css Outdated Show resolved Hide resolved
web/static/style.css Outdated Show resolved Hide resolved
web/static/style.css Outdated Show resolved Hide resolved
web/template/index.html Outdated Show resolved Hide resolved
web/template/index.html Show resolved Hide resolved
telemetry.go Outdated Show resolved Hide resolved
timescale/mocks/mocks.go Outdated Show resolved Hide resolved
timescale/tracing/tracing.go Outdated Show resolved Hide resolved
timescale/timescale.go Show resolved Hide resolved
api/responses.go Show resolved Hide resolved
web/static/style.css Outdated Show resolved Hide resolved
web/template/index.html Show resolved Hide resolved
web/template/index.html Outdated Show resolved Hide resolved
Musilah added 2 commits August 7, 2023 17:02
Signed-off-by: Musilah <[email protected]>
Signed-off-by: Musilah <[email protected]>
web/template/index.html Outdated Show resolved Hide resolved
Signed-off-by: Musilah <[email protected]>
web/template/index.html Outdated Show resolved Hide resolved
web/static/style.css Outdated Show resolved Hide resolved
Signed-off-by: Musilah <[email protected]>
@drasko drasko merged commit 8ae1608 into absmach:main Aug 8, 2023
2 checks passed
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.

4 participants