Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"octref.vetur",
"shenjiaolong.vue-helper",
"streetsidesoftware.code-spell-checker"
]
}
Expand Down
2 changes: 1 addition & 1 deletion build-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ buildah add "${container}" ui/dist /ui
# Setup the entrypoint, ask to reserve one TCP port with the label and set a rootless container
buildah config --entrypoint=/ \
--label="org.nethserver.max-per-node=1" \
--label="org.nethserver.min-core=3.6.0-0" \
--label="org.nethserver.min-core=3.20.1" \
--label="org.nethserver.volumes=dovecot-data" \
--label="org.nethserver.images=$(printf "${repobase}/mail-%s:${IMAGETAG:-latest} " \
dovecot \
Expand Down
2 changes: 1 addition & 1 deletion tests/15__ui.robot
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
*** Settings ***
Library Browser

*** Variables ***
${ADMIN_USER} admin
Expand All @@ -20,6 +19,7 @@ Login to cluster-admin

Take screenshots
[Tags] ui
Import Library Browser
New Browser chromium headless=True
New Context ignoreHTTPSErrors=True
Login to cluster-admin
Expand Down
2 changes: 1 addition & 1 deletion ui/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports = {
parser: "@babel/eslint-parser",
},
rules: {
"no-console": process.env.NODE_ENV === "production" ? "warn" : "off",
"no-console": "off",
"no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off",
},
};
20 changes: 10 additions & 10 deletions ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,37 +12,37 @@
"dependencies": {
"@carbon/icons-vue": "^10.37.0",
"@carbon/vue": "^2.40.0",
"@nethserver/ns8-ui-lib": "^1.3.1",
"@nethserver/ns8-ui-lib": "^2.0.0",
"await-to-js": "^3.0.0",
"axios": "^0.32.0",
"axios": "^1.18.1",
"carbon-components": "^10.41.0",
"core-js": "^3.6.5",
"lottie-web-vue": "^1.2.0",
"sass": "^1.34.1",
"vue": "^2.6.11",
"vue": "^2.7.0",
"vue-axios": "^3.2.4",
"vue-date-fns": "^2.0.1",
"vue-i18n": "^8.24.4",
"vue-infinite-loading": "^2.4.5",
"vue-loader": "^15.10.0",
"vue-router": "^3.2.0",
"vue2-debounce": "^1.0.1",
"vuex": "^3.4.0"
},
"devDependencies": {
"@babel/eslint-parser": "^7.11.0",
"@vue/cli-plugin-babel": "~4.5.0",
"@vue/cli-plugin-eslint": "~4.5.0",
"@vue/cli-plugin-router": "~4.5.0",
"@vue/cli-plugin-vuex": "~4.5.0",
"@vue/cli-service": "~4.5.0",
"@vue/cli-plugin-babel": "~4.5.18",
"@vue/cli-plugin-eslint": "~4.5.18",
"@vue/cli-plugin-router": "~4.5.18",
"@vue/cli-plugin-vuex": "~4.5.18",
"@vue/cli-service": "~4.5.18",
"@vue/eslint-config-prettier": "^6.0.0",
"eslint": "^6.7.2",
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-vue": "^6.2.2",
"mark.js": "^8.11.1",
"prettier": "^2.2.1",
"sass-loader": "^10.1.1",
"vue-template-compiler": "^2.6.11"
"sass-loader": "^10.1.1"
},
"resolutions": {
"@babel/traverse": "7.29.7"
Expand Down
Binary file modified ui/src/assets/module_default_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 1 addition & 7 deletions ui/src/components/AppMobileSideMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,7 @@
<transition name="slide-menu">
<div
v-if="isMenuShown"
class="
mobile-side-menu
cv-side-nav
bx--side-nav bx--side-nav__navigation
bx--side-nav--expanded
app-side-nav
"
class="mobile-side-menu cv-side-nav bx--side-nav bx--side-nav__navigation bx--side-nav--expanded app-side-nav"
>
<AppSideMenuContent />
</div>
Expand Down
4 changes: 3 additions & 1 deletion ui/src/views/Status.vue
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,9 @@
:totalFileCountLabel="core.$t('backup.total_file_count')"
:backupDisabledLabel="core.$t('common.disabled')"
:showMoreLabel="core.$t('common.show_more')"
:multipleUncertainStatusLabel="core.$t('backup.some_backups_failed_or_are_pending')"
:multipleUncertainStatusLabel="
core.$t('backup.some_backups_failed_or_are_pending')
"
:moduleId="instanceName"
:moduleUiName="instanceLabel"
:repositories="backupRepositories"
Expand Down
4 changes: 3 additions & 1 deletion ui/src/views/settings/SettingsMailboxes.vue
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,9 @@
<NsTextInput
v-show="spamFolder.enabled"
v-model.trim="spamFolder.name"
:placeholder="$t('settings_mailboxes.junk_folder_placeholder')"
:placeholder="
$t('settings_mailboxes.junk_folder_placeholder')
"
:label="$t('settings_mailboxes.junk_folder_name')"
:invalid-message="$t(error.spam_folder)"
:disabled="loading.setMailboxSettings"
Expand Down
12 changes: 10 additions & 2 deletions ui/vue.config.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
module.exports = {
css: {
loaderOptions: {
sass: {
sassOptions: {
silenceDeprecations: ["import", "global-builtin", "color-functions", "if-function", "legacy-js-api"],
},
},
},
},
publicPath: "./",
configureWebpack: {
optimization: {
splitChunks: {
minSize: 10000,
maxSize: 250000,
maxSize: 500000,
},
},
},
Expand Down
Loading
Loading