Infra-Mirrors/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-08-11 07:50:36 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into mqtt

Browse source 
# Conflicts:
#	package-lock.json
#	server/database.js
This commit is contained in:
Louis Lam 2022-01-13 11:09:16 +08:00
commit 076d6bdbb6
83 changed files with 4004 additions and 1222 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/pages/EditMonitor.vue
View file

@ -106,7 +106,7 @@
:close-on-select="true"
:clear-on-select="false"
:preserve-search="false"
placeholder="Pick a RR-Type..."
:placeholder="$t('Pick a RR-Type...')"
:preselect-first="false"
:max-height="500"
:taggable="false"
@ -220,7 +220,7 @@
:close-on-select="false"
:clear-on-select="false"
:preserve-search="true"
placeholder="Pick Accepted Status Codes..."
:placeholder="$t('Pick Accepted Status Codes...')"
:preselect-first="false"
:max-height="600"
:taggable="true"
@ -237,7 +237,7 @@
</div>
<div class="mt-5 mb-1">
<button class="btn btn-primary" type="submit" :disabled="processing">{{ $t("Save") }}</button>
<button id="monitor-submit-btn" class="btn btn-primary" type="submit" :disabled="processing">{{ $t("Save") }}</button>
</div>
</div>
@ -258,7 +258,7 @@
<a href="#" @click="$refs.notificationDialog.show(notification.id)">{{ $t("Edit") }}</a>
</label>
<span v-if="notification.isDefault == true" class="badge bg-primary ms-2">Default</span>
<span v-if="notification.isDefault == true" class="badge bg-primary ms-2">{{ $t("Default") }}</span>
</div>
<button class="btn btn-primary me-2" type="button" @click="$refs.notificationDialog.show()">
@ -308,6 +308,19 @@
<label for="headers" class="form-label">{{ $t("Headers") }}</label>
<textarea id="headers" v-model="monitor.headers" class="form-control" :placeholder="headersPlaceholder"></textarea>
</div>
<!-- HTTP Basic Auth -->
<h4 class="mt-5 mb-2">{{ $t("HTTP Basic Auth") }}</h4>
<div class="my-3">
<label for="basicauth" class="form-label">{{ $t("Username") }}</label>
<input id="basicauth-user" v-model="monitor.basic_auth_user" type="text" class="form-control" :placeholder="$t('Username')">
</div>
<div class="my-3">
<label for="basicauth" class="form-label">{{ $t("Password") }}</label>
<input id="basicauth-pass" v-model="monitor.basic_auth_pass" type="password" autocomplete="new-password" class="form-control" :placeholder="$t('Password')">
</div>
</template>
</div>
</div>
@ -383,17 +396,17 @@ export default {
},
bodyPlaceholder() {
return `Example:
return this.$t("Example:", [`
{
"key": "value"
}`;
}`]);
},
headersPlaceholder() {
return `Example:
return this.$t("Example:", [`
{
"HeaderName": "HeaderValue"
}`;
}`]);
}
},