Skip to content

Commit 6099a81

Browse files
Resolved Loading bar spinner and removed warnings (#478)
* Removed Mutation and added fixes • Fixed Warnings • Removed Mutation • Fixed Table loadings in Inventories and LEDs * Removed loading animations for tables * Removed unused code - Removed unused code in styling * Updated Docs - Updated Docs files. * Removed load-build - Removed load-build.sh * Updated Readme - Updated README.md --------- Co-authored-by: tiwari-nishant <[email protected]>
1 parent 2eeae63 commit 6099a81

File tree

66 files changed

+208
-231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+208
-231
lines changed

.env.ibm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# NODE_ENV=production
21
VITE_CUSTOM_ENV=production
32
VITE_APP_ENV_NAME=ibm
43
VITE_APP_COMPANY_NAME="IBM"

.env.intel

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# NODE_ENV=production
21
VITE_CUSTOM_ENV=production
32
VITE_APP_ENV_NAME="intel"
43
VITE_APP_COMPANY_NAME="intel"
@@ -10,7 +9,7 @@ VITE_APP_VIRTUAL_MEDIA_LIST_ENABLED="true"
109
VITE_APP_EVENT_LOGS_DELETE_BUTTON_DISABLED="true"
1110
VITE_APP_EVENT_LOGS_TOGGLE_BUTTON_DISABLED="true"
1211
VITE_APP_FAN_DATA_FROM_THERMAL_SUBSYSTEM="true"
13-
CUSTOM_STYLES="true"
14-
CUSTOM_APP_NAV="true"
15-
CUSTOM_STORE="true"
16-
CUSTOM_ROUTER="true"
12+
VITE_CUSTOM_STYLES="true"
13+
VITE_CUSTOM_APP_NAV="true"
14+
VITE_CUSTOM_STORE="true"
15+
VITE_CUSTOM_ROUTER="true"

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<!-- Work Requird -->
21
# webui-vue
32

43
webui-vue is a web-based user interface for the OpenBMC firmware stack built on
@@ -49,7 +48,7 @@ roadmap
4948

5049

5150
## Documentation
52-
The documentation for coding standards and components is located in the `docs` directory. It is created using the [VuePress](https://vuepress.vuejs.org/) static site generator. Information about how to write documentation can be found on the [VuePress website](https://vuepress.vuejs.org/).
51+
The documentation for coding standards and components is located in the `docs` directory. It is created using the [VitePress](https://vitepress.dev/guide/using-vue) static site generator. Information about how to write documentation can be found on the [VitePress website](https://vitepress.dev/guide/using-vue).
5352

5453
## Recommended IDE Setup
5554

docs/.vitepress/styles/palette.styl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
// VuePress Theme overrides
1+
// VitePress Theme overrides
22
// Change content to be left aligned
33
.theme-default-content:not(.custom),
44
.page-nav
55
max-width 72ch
66
margin 0
77
padding 2rem
88

9-
// Overide default margins for p tags
10-
// VuePress is nesting li content in p tags
9+
// Override default margins for p tags
10+
// VitePress is nesting li content in p tags
1111
// unless they are nested li elements creating
1212
// inconsistent margins between different lists
1313
li p

docs/customization/build.md

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,46 +14,47 @@ modifications to the Web UI.
1414
## Setup
1515

1616
1. Create a `.env.<ENV_NAME>` file in the project root
17-
2. Add `NODE_ENV=production` key value pair in the file
18-
3. Add `VUE_APP_ENV_NAME` key with the value set to the new environment name
17+
2. Add `VITE_CUSTOM_ENV=production` key value pair in the file
18+
3. Add `VITE_APP_ENV_NAME` key with the value set to the new environment name
1919

2020
Example `.env.ibm`:
2121

2222
```
23-
NODE_ENV=production
24-
VUE_APP_ENV_NAME=ibm
23+
VITE_CUSTOM_ENV=production
24+
VITE_APP_ENV_NAME=ibm
2525
```
2626

2727
## Store
2828

2929
:::tip
30-
[Vuex store modules](https://vuex.vuejs.org/guide/modules.html) contain the
30+
[Pinia store core concepts](https://pinia.vuejs.org/core-concepts/) contain the
3131
application's API calls.
3232
:::
3333

34-
1. If making customizations to the default store, add `CUSTOM_STORE=true` key
34+
1. If making customizations to the default store, add `VITE_CUSTOM_STORE=true` key
3535
value pair to the new .env file.
3636
2. Create a `<ENV_NAME>.js` file in `src/env/store`
3737
:::danger
38-
The filename needs to match the `VUE_APP_ENV_NAME` value defined in the
38+
The filename needs to match the `VITE_APP_ENV_NAME` value defined in the
3939
.env file. The store import in `src/main.js` will resolve to this new
4040
file.
4141
:::
4242
3. Import the base store
4343
4. Import environment specific store modules
44-
5. Use the [Vuex](https://vuex.vuejs.org/api/#registermodule) `registerModule`
45-
and `unregisterModule` instance methods to add/remove store modules
44+
5. Assign the Objects required to the base store.
4645
6. Add default export
4746

4847
Example `src/env/store/ibm.js`:
4948

5049
```
51-
import store from '@/store; //@ aliases to src directory
52-
import HmcStore from './Hmc/HmcStore';
50+
import stores from '@/store; //@ aliases to src directory
51+
import DumpsStore from '../../store/modules/Logs/DumpsStore.js';
5352
54-
store.registerModule('hmc', HmcStore);
53+
Object.assign(stores, {
54+
DumpsStore: DumpsStore,
55+
});
5556
56-
export default store;
57+
export default stores;
5758
```
5859

5960
## Router
@@ -63,11 +64,11 @@ export default store;
6364
accessible in the UI.
6465
:::
6566

66-
1. If making customizations to the default router, add `CUSTOM_ROUTER=true` key
67+
1. If making customizations to the default router, add `VITE_CUSTOM_ROUTER=true` key
6768
value pair to the new .env file.
6869
2. Create a `<ENV_NAME>.js` file in `src/env/router`
6970
:::danger
70-
The filename needs to match the `VUE_APP_ENV_NAME` value defined in the
71+
The filename needs to match the `VITE_APP_ENV_NAME` value defined in the
7172
.env file. The routes import in `src/router/index.js` will resolve to this
7273
new file.
7374
:::
@@ -86,17 +87,17 @@ application routes which is not always the same as what is visible in the app
8687
navigation. This configuration will make customizations to the rendered markup
8788
in src/components/AppNavigation/AppNavigation.vue.
8889

89-
1. If making customizations to the app navigation, add `CUSTOM_APP_NAV=true` key
90+
1. If making customizations to the app navigation, add `VITE_CUSTOM_APP_NAV=true` key
9091
value pair to the new .env file.
9192
2. Create a `<ENV_NAME>.js` file in `src/env/components/AppNavigation`
9293
:::danger
93-
The filename needs to match the `VUE_APP_ENV_NAME` value defined in the
94-
.env file. The AppNavigationMixin import in
94+
The filename needs to match the `VITE_APP_ENV_NAME` value defined in the
95+
.env file. The AppNavigationData import in
9596
`src/components/AppNavigation/AppNavigation.vue` will resolve to this new
9697
file.
9798
:::
9899
3. Your custom mixin should follow a very similar structure to the default
99-
AppNavigationMixin.js file. It should include a data property named
100+
AppNavigationData.js file. It should include a data property named
100101
`navigationItems` that should be an array of of navigation objects. Each
101102
navigation object should have an `id` and `label` property defined.
102103
Optionally it can include `icon`, `route`, or `children` properties.
@@ -109,11 +110,11 @@ in src/components/AppNavigation/AppNavigation.vue.
109110
allows for easy visual customizations.
110111
:::
111112

112-
1. If making customizations to the default styles, add `CUSTOM_STYLES=true` key
113+
1. If making customizations to the default styles, add `VITE_CUSTOM_STYLES=true` key
113114
value pair to the new .env file.
114115
2. Create a `_<ENV_NAME>.scss` partial in `src/env/assets/styles`
115116
:::danger
116-
The filename needs to match the `VUE_APP_ENV_NAME` value defined in the
117+
The filename needs to match the `VITE_APP_ENV_NAME` value defined in the
117118
.env file. The webpack sass loader will attempt to import a file with this
118119
name.
119120
:::
@@ -136,8 +137,8 @@ $success: lime;
136137

137138
## Local development
138139

139-
1. Add the same `VUE_APP_ENV_NAME` key value pair to your
140-
`env.development.local` file.
140+
1. Add the same `VITE_APP_ENV_NAME` key value pair to your
141+
`env.local` file.
141142
2. Use serve script
142143
```
143144
npm run serve
@@ -158,5 +159,5 @@ npm run build -- --mode ibm
158159
pass env variable directly to script
159160

160161
```
161-
VUE_APP_ENV_NAME=ibm npm run build
162+
VITE_APP_ENV_NAME=ibm npm run build
162163
```

docs/customization/index.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -182,33 +182,33 @@ set color highlights for some pseudo-elements like `: hover`.
182182
// This function is usually used to get a lighter
183183
// theme variant color to use as a background color
184184
@function theme-color-light($variant) {
185-
@return theme-color-level($variant, -11.3);
185+
@return color-level($variant, -11.3);
186186
}
187187

188188
@function theme-color-dark($variant) {
189-
@return theme-color-level($variant, 2);
189+
@return color-level($variant, 2);
190190
}
191191
```
192192

193193
##### Examples
194194

195195
```scss{8-10,16}
196196
.b-table-sort-icon-left {
197-
background-position: left calc(1.5rem / 2) center !important;
198-
padding-left: calc(1.2rem + 0.65em) !important;
199-
&:focus {
200-
outline: none;
201-
box-shadow: inset 0 0 0 2px theme-color('primary') !important;
202-
}
203-
&:hover {
204-
background-color: theme-color-dark('light');
205-
}
197+
background-position: left calc(1.5rem / 2) center !important;
198+
padding-left: calc(1.2rem + 0.65em) !important;
199+
&:focus {
200+
outline: none;
201+
box-shadow: inset 0 0 0 2px $primary !important;
202+
}
203+
&:hover {
204+
background-color: theme-color-dark($light);
205+
}
206206
}
207207
208208
&.alert-info {
209-
border-left-color: theme-color("info");
210-
background-color: theme-color-light("info");
211-
fill: theme-color("info");
209+
border-left-color: $info;
210+
background-color: theme-color-light($info);
211+
fill: $info;
212212
}
213213
```
214214

docs/customization/theme.md

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Theme customization
22
Customization of the application requires knowledge of Sass and CSS. It also
3-
will require becoming familiar with the Bootstrap and Bootstrap-Vue component
3+
will require becoming familiar with the Bootstrap and Bootstrap-vue-next component
44
libraries. This section outlines the global options and variables that can be
55
removed or updated to meet organizational brand guidelines.
66

@@ -11,11 +11,6 @@ application navigation, and theming.
1111

1212
[Read more in the Build Customization section](/customization/build)
1313

14-
<!-- ### Configuring environment specific builds
15-
The complete instructions can be found in the `env` directory in a file called
16-
env.md or by viewing the [Configuring environment specific builds
17-
page](./env.md) -->
18-
1914
## Bootstrap Sass Options
2015
The Bootstrap Sass options are global styling toggles. The naming convention for
2116
these built-in variables is `enabled-*`.
@@ -37,7 +32,7 @@ some custom forms for validation states.
3732

3833
## Bootstrap Sass Variables
3934
These are global variables that Bootstrap defines in the
40-
`/node_modules/bootstrap/scss/variables.scss` helper file. Adding a variable
35+
`/node_modules/bootstrap/scss/_variables.scss` helper file. Adding a variable
4136
listed in this file to the `/src/assets/styles/bmc/helpers/_variables.scss` file
4237
will override the Bootstrap defined value.
4338

@@ -163,18 +158,18 @@ gray variable values.
163158
[Learn more about Bootstrap
164159
colors](https://getbootstrap.com/docs/4.0/getting-started/theming/#color)
165160

166-
### Bootstrap Color Functions
161+
<!-- ### Bootstrap Color Functions
167162
- `color('<color map key>)`
168163
- `theme-color('<theme color map key>)`
169-
- `gray('<gray color palette key'>)`
164+
- `gray('<gray color palette key'>)` -->
170165

171166

172167
#### Example
173168
```SCSS
174169
.some-selector {
175170
color: color("blue");
176171
background: theme-color("light");
177-
border: 1px solid gray("900")
172+
border: 1px solid $gray-900;
178173
}
179174
```
180175

src/assets/styles/_obmc-custom.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
@import './bootstrap';
33

44
// Custom BMC styles
5-
// @import "./bmc/helpers";
65
@import './bmc/custom';

src/assets/styles/bmc/custom/_bootstrap-grid.scss

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
.container-xl {
2-
// Fluid layout container class sets 100%
3-
// width until xl breakpoint. Once a max-width
4-
// is set, setting the left margin to 0 is needed
5-
// so the content doesn't center align
6-
// https://bootstrap-vue.org/docs/components/layout#fluid-width-container
72
margin-left: 0;
83
}
94

src/assets/styles/bmc/custom/_tables.scss

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@use 'sass:math';
2-
// @import "/node_modules/bootstrap/scss/variables";
32
.b-table-sticky-header {
43
max-height: 75vh;
54
min-height: 100px;
@@ -14,17 +13,6 @@
1413
left: -3px !important;
1514
top: 38% !important;
1615
}
17-
// svg {
18-
// background-position: left calc(1.5rem / 2) center !important;
19-
// padding-left: calc(1.2rem + 0.65em) !important;
20-
// &:focus {
21-
// outline: none;
22-
// box-shadow: inset 0 0 0 2px $primary !important;
23-
// }
24-
// &:hover {
25-
// background-color: $light;
26-
// }
27-
// }
2816
vertical-align: middle;
2917
border-top: 1px solid $gray-300;
3018
border-bottom: 1px solid $gray-300;
@@ -132,17 +120,6 @@
132120
padding-left: calc(50px + (#{$table-cell-padding-y} * 2));
133121
padding-right: calc(50px + (#{$table-cell-padding-y} * 2));
134122
}
135-
// dl {
136-
// margin: 0;
137-
// }
138-
// dt {
139-
// float: left;
140-
// clear: left;
141-
// margin-right: math.div($spacer, 2);
142-
// }
143-
// dd {
144-
// line-height: 1.2;
145-
// }
146123
}
147124

148125
.table-row-expand {

0 commit comments

Comments
 (0)