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.

Sign up for GitHub

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

Jump to bottom

Refactor UI of the Appstore page #1679

Merged
merged 30 commits into from
Apr 1, 2024
Merged

Refactor UI of the Appstore page #1679

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
ac80698
Refactor UI of the Appstore page
leonardgable Feb 12, 2024
f1fb399
Fix warning message on for clearer message.
leonardgable Feb 14, 2024
adaa4e0
Added update badge on sidemenu and appstore for a better visual on av…
leonardgable Feb 18, 2024
b817270
Improved file organisation and styling on hover install button. The C…
leonardgable Feb 22, 2024
c060e70
Reset the main packages.json to remove any changes made before
leonardgable Feb 22, 2024
6b96c7f
Moved to Card from react strap for better UI consistency. Improved re…
leonardgable Feb 27, 2024
1c2a9ef
Set the row height to autoheight to fit better content and better rea…
leonardgable Mar 8, 2024
b2bb784
Filter out already installed app from the list of available plugins t…
leonardgable Mar 9, 2024
82346da
Created a custom scss theme for the grid to improve reproducibality o…
leonardgable Mar 9, 2024
89cbcaf
Implementation of Update all button for updating all plugins at the s…
leonardgable Mar 11, 2024
e07aed0
Text-wrap on the grid component to wrap whole word which improves the…
leonardgable Mar 25, 2024
5f03c69
Added update filter button for the user to filter all plugins with an…
leonardgable Mar 26, 2024
def6808
Fix bug on update all and small layout improvement
leonardgable Mar 27, 2024
ba0f68d
hide appstore offline indicators
tkurki Mar 27, 2024
8c54898
organise dependencies
tkurki Mar 27, 2024
9f14954
align all buttons and search bar
tkurki Mar 27, 2024
cdca098
simplify listing logic
tkurki Mar 28, 2024
1a64bba
remove extra code
tkurki Mar 28, 2024
f0f2aab
simplify: use precomputed property
tkurki Mar 28, 2024
513b375
revert accidental change
tkurki Mar 28, 2024
238c80b
remove unused import
tkurki Mar 28, 2024
55ba94e
rewording
tkurki Mar 28, 2024
f5a5235
simplify
tkurki Mar 28, 2024
068373e
simplify: useState is not needed
tkurki Mar 28, 2024
83bcb4f
remove <p> to center align vertically, like actions
tkurki Mar 28, 2024
e0d2711
format
tkurki Mar 29, 2024
05aa7f2
Reconfigured webpack and added dependencies version to avoid warning
leonardgable Mar 30, 2024
f42ed02
simplify, useState not needed
tkurki Mar 29, 2024
d6ec1ad
switch from ag-grid to plain bootstrap table
tkurki Mar 30, 2024
0b89721
remove dangling ag-grid references
tkurki Mar 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions package.json
View file
Open in desktop
leonardgable marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
"packages/resources-provider-plugin"
],
"dependencies": {
"@meri-imperiumi/signalk-teltonika-rutx11": "^0.6.0",
"@signalk/course-provider": "^1.0.0",
"@signalk/n2k-signalk": "^3.0.0",
"@signalk/nmea0183-signalk": "^3.0.0",
Expand Down Expand Up @@ -130,13 +131,13 @@
"@signalk/instrumentpanel": "0.x",
"@signalk/set-system-time": "^1.2.0",
"@signalk/signalk-to-nmea0183": "^1.0.0",
"@signalk/vesselpositions": "^1.0.0",
"@signalk/udp-nmea-plugin": "^2.0.0",
"@signalk/vesselpositions": "^1.0.0",
"@signalk/zones": "^1.0.0",
"signalk-to-nmea2000": "^2.16.0",
"signalk-n2kais-to-nmea0183": "^1.3.1",
"mdns": "^2.5.1",
"serialport": "^11.0.0"
"serialport": "^11.0.0",
"signalk-n2kais-to-nmea0183": "^1.3.1",
"signalk-to-nmea2000": "^2.16.0"
},
"devDependencies": {
"@types/busboy": "^1.5.0",
Expand Down
9 changes: 8 additions & 1 deletion packages/server-admin-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
{
"name": "@signalk/server-admin-ui",
"version": "2.4.0",
"description": "Signal K server admin webapp",
Expand Down Expand Up @@ -61,5 +61,12 @@
"ci": "prettier --check src/",
"clean": "rimraf ./public",
"bundle-analyzer": "webpack-bundle-analyzer --port 4200 public/stats.json"
},
"dependencies": {
Copy link
Member

Choose a reason for hiding this comment

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

These should be devDepencies?

Copy link
Member

Choose a reason for hiding this comment

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

Please fix this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I am not sure I understand. These are dependencies for the UI and the new Appstore. What do you mean by "please fix this" ? These npm packages are dependencies of the new app store

Copy link
Member

Choose a reason for hiding this comment

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

Admin ui is published to npm in bundled format. The ui does not need these to be installed and used.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure I understand because the new app store is using Ag-grid and fortawesome. The new app store won't work without these one installed, that's why they are called dependencies.
I have poor knowledge of the release management of signal k so maybe you will have a better idea on what to do with this package.json. It doesn't seem very straightforward to me

Copy link
Member

Choose a reason for hiding this comment

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

you will have a better idea on what to do with this package.json

Make them devDepencies.

"@fortawesome/fontawesome-svg-core": "^6.5.1",
"@fortawesome/free-regular-svg-icons": "^6.5.1",
"@fortawesome/free-solid-svg-icons": "^6.5.1",
"@fortawesome/react-fontawesome": "^0.2.0",
"ag-grid-react": "^31.0.3"
}
}
9 changes: 5 additions & 4 deletions packages/server-admin-ui/scss/core/_grid.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
.row.row-equal {
padding-right: ($grid-gutter-width / 4);
padding-left: ($grid-gutter-width / 4);
padding-left: ($grid-gutter-width / 4);
margin-right: ($grid-gutter-width / -2);
margin-left: ($grid-gutter-width / -2);
margin-left: ($grid-gutter-width / -2);

[class*="col-"] {
[class*='col-'] {
padding-right: ($grid-gutter-width / 4);
padding-left: ($grid-gutter-width / 4);
padding-left: ($grid-gutter-width / 4);
}
}

.main .container-fluid {
padding: 0 30px;
height: 100%;
}
16 changes: 0 additions & 16 deletions packages/server-admin-ui/src/components/Sidebar/Sidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,22 +220,6 @@ const mapStateToProps = (state) => {
name: 'Appstore',
url: '/appstore',
icon: 'icon-basket',
children: [
{
name: 'Available',
url: '/appstore/apps',
badge: availableBadge,
},
{
name: 'Installed',
url: '/appstore/installed',
},
{
name: 'Updates',
url: '/appstore/updates',
badge: updatesBadge,
},
],
},
{
name: 'Server',
Expand Down
3 changes: 2 additions & 1 deletion packages/server-admin-ui/src/containers/Full/Full.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ class Full extends Component {
component={loginOrOriginal(Playground, true)}
/>
<Route
path="/appstore/:view"
path="/appstore"
name="Appstore"
component={loginOrOriginal(Apps)}
/>
<Route
Expand Down
Loading