Skip to content

GitLab

Commit 613e7bcd authored by janis.streib's avatar janis.streib 🦉
Browse files

UPD: bump

parent f5d6acdd
Pipeline #130007 passed with stages
in 4 minutes and 34 seconds
Hide whitespace changes
Inline Side-by-side
frontend/package-lock.json
View file @ 613e7bcd
......@@ -19,9 +19,11 @@
"axios": "^0.21.1",
"bootstrap": "^4.5.3",
"bootstrap-vue": "^2.19.0",
"core-js": "^3.8.3",
"http-proxy-middleware": "^1.0.6",
"i": "^0.3.6",
"ipaddr.js": "^2.0.0",
"joi": "^17.3.0",
"jquery": "^3.5.1",
"leaflet": "^1.7.1",
"node-sass": "^5.0.0",
......@@ -1572,6 +1574,29 @@
"node": ">=8"
}
},
"node_modules/@sideway/address": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.0.tgz",
"integrity": "sha512-wAH/JYRXeIFQRsxerIuLjgUu2Xszam+O5xKeatJ4oudShOOirfmsQ1D6LL54XOU2tizpCYku+s1wmU0SYdpoSA==",
"dependencies": {
"@hapi/hoek": "^9.0.0"
}
},
"node_modules/@sideway/address/node_modules/@hapi/hoek": {
"version": "9.1.1",
"resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.1.1.tgz",
"integrity": "sha512-CAEbWH7OIur6jEOzaai83jq3FmKmv4PmX1JYfs9IrYcGEVI/lyL1EXJGCj7eFVJ0bg5QR8LMxBlEtA+xKiLpFw=="
},
"node_modules/@sideway/formula": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.0.tgz",
"integrity": "sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg=="
},
"node_modules/@sideway/pinpoint": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
"integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ=="
},
"node_modules/@soda/friendly-errors-webpack-plugin": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.0.tgz",
......@@ -9792,6 +9817,31 @@
"node": ">=8"
}
},
"node_modules/joi": {
"version": "17.3.0",
"resolved": "https://registry.npmjs.org/joi/-/joi-17.3.0.tgz",
"integrity": "sha512-Qh5gdU6niuYbUIUV5ejbsMiiFmBdw8Kcp8Buj2JntszCkCfxJ9Cz76OtHxOZMPXrt5810iDIXs+n1nNVoquHgg==",
"dependencies": {
"@hapi/hoek": "^9.0.0",
"@hapi/topo": "^5.0.0",
"@sideway/address": "^4.1.0",
"@sideway/formula": "^3.0.0",
"@sideway/pinpoint": "^2.0.0"
}
},
"node_modules/joi/node_modules/@hapi/hoek": {
"version": "9.1.1",
"resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.1.1.tgz",
"integrity": "sha512-CAEbWH7OIur6jEOzaai83jq3FmKmv4PmX1JYfs9IrYcGEVI/lyL1EXJGCj7eFVJ0bg5QR8LMxBlEtA+xKiLpFw=="
},
"node_modules/joi/node_modules/@hapi/topo": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.0.0.tgz",
"integrity": "sha512-tFJlT47db0kMqVm3H4nQYgn6Pwg10GTZHb1pwmSiv1K4ks6drQOtfEF5ZnPjkvC+y4/bUPHK+bc87QvLcL+WMw==",
"dependencies": {
"@hapi/hoek": "^9.0.0"
}
},
"node_modules/jquery": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
......@@ -22354,6 +22404,31 @@
}
}
},
"@sideway/address": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.0.tgz",
"integrity": "sha512-wAH/JYRXeIFQRsxerIuLjgUu2Xszam+O5xKeatJ4oudShOOirfmsQ1D6LL54XOU2tizpCYku+s1wmU0SYdpoSA==",
"requires": {
"@hapi/hoek": "^9.0.0"
},
"dependencies": {
"@hapi/hoek": {
"version": "9.1.1",
"resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.1.1.tgz",
"integrity": "sha512-CAEbWH7OIur6jEOzaai83jq3FmKmv4PmX1JYfs9IrYcGEVI/lyL1EXJGCj7eFVJ0bg5QR8LMxBlEtA+xKiLpFw=="
}
}
},
"@sideway/formula": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.0.tgz",
"integrity": "sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg=="
},
"@sideway/pinpoint": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
"integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ=="
},
"@soda/friendly-errors-webpack-plugin": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.0.tgz",
......@@ -28916,6 +28991,33 @@
}
}
},
"joi": {
"version": "17.3.0",
"resolved": "https://registry.npmjs.org/joi/-/joi-17.3.0.tgz",
"integrity": "sha512-Qh5gdU6niuYbUIUV5ejbsMiiFmBdw8Kcp8Buj2JntszCkCfxJ9Cz76OtHxOZMPXrt5810iDIXs+n1nNVoquHgg==",
"requires": {
"@hapi/hoek": "^9.0.0",
"@hapi/topo": "^5.0.0",
"@sideway/address": "^4.1.0",
"@sideway/formula": "^3.0.0",
"@sideway/pinpoint": "^2.0.0"
},
"dependencies": {
"@hapi/hoek": {
"version": "9.1.1",
"resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.1.1.tgz",
"integrity": "sha512-CAEbWH7OIur6jEOzaai83jq3FmKmv4PmX1JYfs9IrYcGEVI/lyL1EXJGCj7eFVJ0bg5QR8LMxBlEtA+xKiLpFw=="
},
"@hapi/topo": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.0.0.tgz",
"integrity": "sha512-tFJlT47db0kMqVm3H4nQYgn6Pwg10GTZHb1pwmSiv1K4ks6drQOtfEF5ZnPjkvC+y4/bUPHK+bc87QvLcL+WMw==",
"requires": {
"@hapi/hoek": "^9.0.0"
}
}
}
},
"jquery": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
frontend/package.json
View file @ 613e7bcd
......@@ -19,9 +19,11 @@
"axios": "^0.21.1",
"bootstrap": "^4.5.3",
"bootstrap-vue": "^2.19.0",
"core-js": "^3.8.3",
"http-proxy-middleware": "^1.0.6",
"i": "^0.3.6",
"ipaddr.js": "^2.0.0",
"joi": "^17.3.0",
"jquery": "^3.5.1",
"leaflet": "^1.7.1",
"node-sass": "^5.0.0",
......
frontend/src/components/BCDList.vue
View file @ 613e7bcd
......@@ -2,9 +2,12 @@
<div class="bcd_overview">
<Loading :data="[bcds, ous]">
<FilterInput v-model="filter"></FilterInput>
<b-pagination v-if="bcds && bcds.length > per_page && filter === ''" :total-rows="bcds.length" :per-page="per_page" v-model="current_page" align="center"></b-pagination>
<b-pagination v-if="bcds && bcds.length > per_page && filter === ''" :total-rows="bcds.length"
:per-page="per_page" v-model="current_page" align="center"></b-pagination>
<b-card no-body class="shadow">
<b-table responsive :filter="filter" :per-page="filter === '' ? per_page : null" :current-page="filter === '' ? current_page : null" :fields="bcd_list_fields" :busy="bcds === null" :items="bcds"
<b-table responsive :filter="filter" :per-page="filter === '' ? per_page : null"
:current-page="filter === '' ? current_page : null" :fields="bcd_list_fields" :busy="bcds === null"
:items="bcds"
:sort-compare="sortBCDOverview" :sort-by="sort_by">
<template v-slot:cell(name)="data">
<b-link class="nowrap" :to="'bcds/'+data.value"><b>{{ data.value }}</b></b-link>
......@@ -19,14 +22,14 @@
<div v-for="subnet in bcd2subnets[data.item.name]"
:key="subnet.cidr" class="same-height">
<b-progress style="height: 1.5rem; margin-bottom: 1rem;"
v-if="isIPv4(subnet.cidr)"
show-progress :max="IPAddressCount(subnet.cidr)">
v-if="isIPv4(subnet.cidr)"
show-progress :max="IPAddressCount(subnet.cidr)">
<b-progress-bar
:label="usagePercentage(subnet) +'%'"
:variant="progressVariant(usagePercentage(subnet))"
:value="subnet.dns_addr_rr_count"></b-progress-bar>
</b-progress>
<p v-else class="text-center"> <i>N/A</i> </p>
<p v-else class="text-center"><i>N/A</i></p>
</div>
</template>
<template v-slot:cell(adresses)="data">
......@@ -36,7 +39,9 @@
</div>
</template>
<template v-slot:cell(ou_short_name)="data">
<span :title="ous_by_short_name[data.item.ou_short_name].name" class="nowrap">{{ data.item.ou_short_name }}</span>
<span :title="ous_by_short_name[data.item.ou_short_name].name" class="nowrap">{{
data.item.ou_short_name
}}</span>
</template>
<template v-slot:cell(vlans)="data">
<ul>
......@@ -52,7 +57,8 @@
class="font-italic text-center mb-3">
Keine BCDs vorhanden
</div>
<b-pagination v-if="bcds && bcds.length > per_page && filter === ''" :total-rows="bcds.length" :per-page="per_page" v-model="current_page" align="center"></b-pagination>
<b-pagination v-if="bcds && bcds.length > per_page && filter === ''" :total-rows="bcds.length"
:per-page="per_page" v-model="current_page" align="center"></b-pagination>
</b-card>
</Loading>
</div>
......@@ -210,5 +216,4 @@ export default {
</script>
<style scoped>
</style>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Imprint