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

Implement muuri grid system #91

Merged
merged 12 commits into from
Jan 29, 2024
Merged

Conversation

ianmuchyri
Copy link
Contributor

@ianmuchyri ianmuchyri commented Jan 23, 2024

What type of PR is this?

  • Refactor
  • Feature
  • Bug Fix
  • Optimization
  • Documentation Update
  • Dependency Update

What does this do?

Creates a Dashboard canvas grid layout based on the Muuri library. This allows a user to select a widget from a list of available widgets, add some data, and then add it to the canvas. The user can toggle between edit mode and view mode.

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

Have you included tests for your changes?

  • Yes
  • No, and this is why:

Did you document any new/modified functionality?

  • Yes
  • No, and this is why:

Notes

@dborovcanin dborovcanin changed the base branch from main to dashboards January 23, 2024 23:02
@ianmuchyri ianmuchyri marked this pull request as ready for review January 25, 2024 14:31
ui/web/static/css/styles.css Outdated Show resolved Hide resolved
ui/web/template/dashboard.html Outdated Show resolved Hide resolved
move javascript and css to separate files

Signed-off-by: ianmuchyri <[email protected]>
Signed-off-by: ianmuchyri <[email protected]>
Signed-off-by: ianmuchyri <[email protected]>
@dborovcanin dborovcanin merged commit 72bde2a into absmach:dashboards Jan 29, 2024
dborovcanin pushed a commit that referenced this pull request Jan 31, 2024
* implement muuri grid system

Signed-off-by: ianmuchyri <[email protected]>

* enable removal of a widget from the dashboard

Signed-off-by: ianmuchyri <[email protected]>

* add modal for collecting details

Signed-off-by: ianmuchyri <[email protected]>

* add license header

Signed-off-by: ianmuchyri <[email protected]>

* add validation to dashboard endpoint

Signed-off-by: ianmuchyri <[email protected]>

* fix logging.go error

Signed-off-by: ianmuchyri <[email protected]>

* add json object sample

Signed-off-by: ianmuchyri <[email protected]>

* add modals for linechart and gauge

Signed-off-by: ianmuchyri <[email protected]>

* enable edit and disable edit of canvas

Signed-off-by: ianmuchyri <[email protected]>

* move content to separate files

move javascript and css to separate files

Signed-off-by: ianmuchyri <[email protected]>

* remove unused argument

Signed-off-by: ianmuchyri <[email protected]>

* add empty line

Signed-off-by: ianmuchyri <[email protected]>

---------

Signed-off-by: ianmuchyri <[email protected]>
dborovcanin pushed a commit that referenced this pull request Feb 1, 2024
* implement muuri grid system

Signed-off-by: ianmuchyri <[email protected]>

* enable removal of a widget from the dashboard

Signed-off-by: ianmuchyri <[email protected]>

* add modal for collecting details

Signed-off-by: ianmuchyri <[email protected]>

* add license header

Signed-off-by: ianmuchyri <[email protected]>

* add validation to dashboard endpoint

Signed-off-by: ianmuchyri <[email protected]>

* fix logging.go error

Signed-off-by: ianmuchyri <[email protected]>

* add json object sample

Signed-off-by: ianmuchyri <[email protected]>

* add modals for linechart and gauge

Signed-off-by: ianmuchyri <[email protected]>

* enable edit and disable edit of canvas

Signed-off-by: ianmuchyri <[email protected]>

* move content to separate files

move javascript and css to separate files

Signed-off-by: ianmuchyri <[email protected]>

* remove unused argument

Signed-off-by: ianmuchyri <[email protected]>

* add empty line

Signed-off-by: ianmuchyri <[email protected]>

---------

Signed-off-by: ianmuchyri <[email protected]>
dborovcanin pushed a commit that referenced this pull request Feb 1, 2024
* implement muuri grid system

Signed-off-by: ianmuchyri <[email protected]>

* enable removal of a widget from the dashboard

Signed-off-by: ianmuchyri <[email protected]>

* add modal for collecting details

Signed-off-by: ianmuchyri <[email protected]>

* add license header

Signed-off-by: ianmuchyri <[email protected]>

* add validation to dashboard endpoint

Signed-off-by: ianmuchyri <[email protected]>

* fix logging.go error

Signed-off-by: ianmuchyri <[email protected]>

* add json object sample

Signed-off-by: ianmuchyri <[email protected]>

* add modals for linechart and gauge

Signed-off-by: ianmuchyri <[email protected]>

* enable edit and disable edit of canvas

Signed-off-by: ianmuchyri <[email protected]>

* move content to separate files

move javascript and css to separate files

Signed-off-by: ianmuchyri <[email protected]>

* remove unused argument

Signed-off-by: ianmuchyri <[email protected]>

* add empty line

Signed-off-by: ianmuchyri <[email protected]>

---------

Signed-off-by: ianmuchyri <[email protected]>
ianmuchyri added a commit to ianmuchyri/magistrala-ui that referenced this pull request Feb 2, 2024
* implement muuri grid system

Signed-off-by: ianmuchyri <[email protected]>

* enable removal of a widget from the dashboard

Signed-off-by: ianmuchyri <[email protected]>

* add modal for collecting details

Signed-off-by: ianmuchyri <[email protected]>

* add license header

Signed-off-by: ianmuchyri <[email protected]>

* add validation to dashboard endpoint

Signed-off-by: ianmuchyri <[email protected]>

* fix logging.go error

Signed-off-by: ianmuchyri <[email protected]>

* add json object sample

Signed-off-by: ianmuchyri <[email protected]>

* add modals for linechart and gauge

Signed-off-by: ianmuchyri <[email protected]>

* enable edit and disable edit of canvas

Signed-off-by: ianmuchyri <[email protected]>

* move content to separate files

move javascript and css to separate files

Signed-off-by: ianmuchyri <[email protected]>

* remove unused argument

Signed-off-by: ianmuchyri <[email protected]>

* add empty line

Signed-off-by: ianmuchyri <[email protected]>

---------

Signed-off-by: ianmuchyri <[email protected]>
dborovcanin pushed a commit that referenced this pull request Feb 5, 2024
* implement muuri grid system

Signed-off-by: ianmuchyri <[email protected]>

* enable removal of a widget from the dashboard

Signed-off-by: ianmuchyri <[email protected]>

* add modal for collecting details

Signed-off-by: ianmuchyri <[email protected]>

* add license header

Signed-off-by: ianmuchyri <[email protected]>

* add validation to dashboard endpoint

Signed-off-by: ianmuchyri <[email protected]>

* fix logging.go error

Signed-off-by: ianmuchyri <[email protected]>

* add json object sample

Signed-off-by: ianmuchyri <[email protected]>

* add modals for linechart and gauge

Signed-off-by: ianmuchyri <[email protected]>

* enable edit and disable edit of canvas

Signed-off-by: ianmuchyri <[email protected]>

* move content to separate files

move javascript and css to separate files

Signed-off-by: ianmuchyri <[email protected]>

* remove unused argument

Signed-off-by: ianmuchyri <[email protected]>

* add empty line

Signed-off-by: ianmuchyri <[email protected]>

---------

Signed-off-by: ianmuchyri <[email protected]>
dborovcanin pushed a commit that referenced this pull request Feb 5, 2024
* implement muuri grid system

Signed-off-by: ianmuchyri <[email protected]>

* enable removal of a widget from the dashboard

Signed-off-by: ianmuchyri <[email protected]>

* add modal for collecting details

Signed-off-by: ianmuchyri <[email protected]>

* add license header

Signed-off-by: ianmuchyri <[email protected]>

* add validation to dashboard endpoint

Signed-off-by: ianmuchyri <[email protected]>

* fix logging.go error

Signed-off-by: ianmuchyri <[email protected]>

* add json object sample

Signed-off-by: ianmuchyri <[email protected]>

* add modals for linechart and gauge

Signed-off-by: ianmuchyri <[email protected]>

* enable edit and disable edit of canvas

Signed-off-by: ianmuchyri <[email protected]>

* move content to separate files

move javascript and css to separate files

Signed-off-by: ianmuchyri <[email protected]>

* remove unused argument

Signed-off-by: ianmuchyri <[email protected]>

* add empty line

Signed-off-by: ianmuchyri <[email protected]>

---------

Signed-off-by: ianmuchyri <[email protected]>
dborovcanin pushed a commit that referenced this pull request Feb 9, 2024
* implement muuri grid system

Signed-off-by: ianmuchyri <[email protected]>

* enable removal of a widget from the dashboard

Signed-off-by: ianmuchyri <[email protected]>

* add modal for collecting details

Signed-off-by: ianmuchyri <[email protected]>

* add license header

Signed-off-by: ianmuchyri <[email protected]>

* add validation to dashboard endpoint

Signed-off-by: ianmuchyri <[email protected]>

* fix logging.go error

Signed-off-by: ianmuchyri <[email protected]>

* add json object sample

Signed-off-by: ianmuchyri <[email protected]>

* add modals for linechart and gauge

Signed-off-by: ianmuchyri <[email protected]>

* enable edit and disable edit of canvas

Signed-off-by: ianmuchyri <[email protected]>

* move content to separate files

move javascript and css to separate files

Signed-off-by: ianmuchyri <[email protected]>

* remove unused argument

Signed-off-by: ianmuchyri <[email protected]>

* add empty line

Signed-off-by: ianmuchyri <[email protected]>

---------

Signed-off-by: ianmuchyri <[email protected]>
dborovcanin pushed a commit that referenced this pull request Feb 9, 2024
* implement muuri grid system

Signed-off-by: ianmuchyri <[email protected]>

* enable removal of a widget from the dashboard

Signed-off-by: ianmuchyri <[email protected]>

* add modal for collecting details

Signed-off-by: ianmuchyri <[email protected]>

* add license header

Signed-off-by: ianmuchyri <[email protected]>

* add validation to dashboard endpoint

Signed-off-by: ianmuchyri <[email protected]>

* fix logging.go error

Signed-off-by: ianmuchyri <[email protected]>

* add json object sample

Signed-off-by: ianmuchyri <[email protected]>

* add modals for linechart and gauge

Signed-off-by: ianmuchyri <[email protected]>

* enable edit and disable edit of canvas

Signed-off-by: ianmuchyri <[email protected]>

* move content to separate files

move javascript and css to separate files

Signed-off-by: ianmuchyri <[email protected]>

* remove unused argument

Signed-off-by: ianmuchyri <[email protected]>

* add empty line

Signed-off-by: ianmuchyri <[email protected]>

---------

Signed-off-by: ianmuchyri <[email protected]>
dborovcanin pushed a commit that referenced this pull request Feb 9, 2024
* implement muuri grid system

Signed-off-by: ianmuchyri <[email protected]>

* enable removal of a widget from the dashboard

Signed-off-by: ianmuchyri <[email protected]>

* add modal for collecting details

Signed-off-by: ianmuchyri <[email protected]>

* add license header

Signed-off-by: ianmuchyri <[email protected]>

* add validation to dashboard endpoint

Signed-off-by: ianmuchyri <[email protected]>

* fix logging.go error

Signed-off-by: ianmuchyri <[email protected]>

* add json object sample

Signed-off-by: ianmuchyri <[email protected]>

* add modals for linechart and gauge

Signed-off-by: ianmuchyri <[email protected]>

* enable edit and disable edit of canvas

Signed-off-by: ianmuchyri <[email protected]>

* move content to separate files

move javascript and css to separate files

Signed-off-by: ianmuchyri <[email protected]>

* remove unused argument

Signed-off-by: ianmuchyri <[email protected]>

* add empty line

Signed-off-by: ianmuchyri <[email protected]>

---------

Signed-off-by: ianmuchyri <[email protected]>
dborovcanin pushed a commit that referenced this pull request Feb 9, 2024
dborovcanin pushed a commit that referenced this pull request Feb 9, 2024
dborovcanin pushed a commit that referenced this pull request Feb 12, 2024
dborovcanin pushed a commit that referenced this pull request Feb 12, 2024
dborovcanin added a commit that referenced this pull request Feb 15, 2024
* NOISSUE - Add support for dashboards (#91)

Signed-off-by: ianmuchyri <[email protected]>

* NOISSUE - Add placeholder to the canvas with no widget (#127)

* add a widget placeholder to the dashboard

Signed-off-by: ianmuchyri <[email protected]>

* remove vh-50 on nowidgetplaceholder

Signed-off-by: ianmuchyri <[email protected]>

* make add widget add widgets

Signed-off-by: ianmuchyri <[email protected]>

---------

Signed-off-by: ianmuchyri <[email protected]>

* NOISSUE - Fix nowidget placeholder (#150)

* check items length to determine if items present

Signed-off-by: ianmuchyri <[email protected]>

* remove comments

Signed-off-by: ianmuchyri <[email protected]>

* fix lint error

Signed-off-by: ianmuchyri <[email protected]>

---------

Signed-off-by: ianmuchyri <[email protected]>

* NOISSUE - Fix chart CSS (#154)

* fix card css

this will prevent the css from affecting
all card elements that will be added in the future

Signed-off-by: ianmuchyri <[email protected]>

* move styles to the styles file

Signed-off-by: ianmuchyri <[email protected]>

* remove unused parameter in transport.go

Signed-off-by: ianmuchyri <[email protected]>

---------

Signed-off-by: ianmuchyri <[email protected]>

* MG-93 - Add more Apache Echarts (#117)

* add billboard.js files

Signed-off-by: Musilah <[email protected]>

* add multigauge

Signed-off-by: Musilah <[email protected]>

* fix gauge charts

Signed-off-by: Musilah <[email protected]>

* fix: format documents

Signed-off-by: Musilah <[email protected]>

* fix: size issues

Signed-off-by: Musilah <[email protected]>

* capitalise line chart

Signed-off-by: Musilah <[email protected]>

* fix multiple line chart tag

Signed-off-by: Musilah <[email protected]>

* fix resizing

Signed-off-by: Musilah <[email protected]>

* replace bbcharts

Signed-off-by: Musilah <[email protected]>

* fix spelling error

Signed-off-by: Musilah <[email protected]>

---------

Signed-off-by: Musilah <[email protected]>

* MG-111- Modify Chart modals (#123)

* Modify chart modals

Signed-off-by: felix.gateru <[email protected]>

* Add apperance tab to charts

Signed-off-by: felix.gateru <[email protected]>

* Rename form inputs

Signed-off-by: felix.gateru <[email protected]>

* Refactor code

Signed-off-by: felix.gateru <[email protected]>

* Add spacing between nav tab and form

Signed-off-by: felix.gateru <[email protected]>

---------

Signed-off-by: felix.gateru <[email protected]>

* MG-93 - Add bootstraps charts support (#122)

* fix edit widgets

Signed-off-by: Musilah <[email protected]>

* fix save layout

Signed-off-by: Musilah <[email protected]>

* add config

Signed-off-by: Musilah <[email protected]>

* fix all charts addwidget function

Signed-off-by: Musilah <[email protected]>

* fix all charts save

Signed-off-by: Musilah <[email protected]>

* fix resize

Signed-off-by: Musilah <[email protected]>

* fix resizing

Signed-off-by: Musilah <[email protected]>

* fix gauges sizes

Signed-off-by: Musilah <[email protected]>

* fix height issue

Signed-off-by: Musilah <[email protected]>

* remove valueandbarchart

Signed-off-by: Musilah <[email protected]>

---------

Signed-off-by: Musilah <[email protected]>

---------

Signed-off-by: ianmuchyri <[email protected]>
Signed-off-by: Musilah <[email protected]>
Signed-off-by: felix.gateru <[email protected]>
Co-authored-by: Ian Ngethe Muchiri <[email protected]>
Co-authored-by: Nataly Musilah <[email protected]>
Co-authored-by: Felix Gateru <[email protected]>
ianmuchyri added a commit to ianmuchyri/magistrala-ui that referenced this pull request Feb 15, 2024
dborovcanin pushed a commit to ianmuchyri/magistrala-ui that referenced this pull request Feb 19, 2024
dborovcanin pushed a commit that referenced this pull request Feb 19, 2024
* NOISSUE - Add support for dashboards (#91)

Signed-off-by: ianmuchyri <[email protected]>

* NOISSUE - Add placeholder to the canvas with no widget (#127)

* add a widget placeholder to the dashboard

Signed-off-by: ianmuchyri <[email protected]>

* remove vh-50 on nowidgetplaceholder

Signed-off-by: ianmuchyri <[email protected]>

* make add widget add widgets

Signed-off-by: ianmuchyri <[email protected]>

---------

Signed-off-by: ianmuchyri <[email protected]>

* add min-width and height to item-editable

Signed-off-by: ianmuchyri <[email protected]>

* add border to widget

Signed-off-by: ianmuchyri <[email protected]>

* fix user cannot resize chart when on the edge

Signed-off-by: ianmuchyri <[email protected]>

* fix save problem

Signed-off-by: ianmuchyri <[email protected]>

---------

Signed-off-by: ianmuchyri <[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.

2 participants