Browse Source

hooks are now textareas

pull/2522/head
Bernd Storath 4 months ago
parent
commit
51fdea6b4d
  1. 10
      src/app/components/Base/TextArea.vue
  2. 29
      src/app/components/Form/TextArea.vue
  3. 8
      src/app/pages/admin/hooks.vue
  4. 8
      src/app/pages/clients/[id].vue
  5. 6
      src/server/utils/template.ts

10
src/app/components/Base/TextArea.vue

@ -0,0 +1,10 @@
<template>
<textarea
v-model="data"
class="rounded-lg border-2 border-gray-100 text-gray-500 focus:border-red-800 focus:outline-0 focus:ring-0 dark:border-neutral-800 dark:bg-neutral-700 dark:text-neutral-200 dark:placeholder:text-neutral-400"
/>
</template>
<script lang="ts" setup>
const data = defineModel<string>();
</script>

29
src/app/components/Form/TextArea.vue

@ -0,0 +1,29 @@
<template>
<div class="flex items-center">
<FormLabel :for="id">
{{ label }}
</FormLabel>
<BaseTooltip v-if="description" :text="description">
<IconsInfo class="size-4" />
</BaseTooltip>
</div>
<BaseTextArea
:id="id"
v-model.trim="data"
:name="id"
:autocomplete="autocomplete"
:disabled="disabled"
/>
</template>
<script lang="ts" setup>
defineProps<{
id: string;
label: string;
description?: string;
autocomplete?: string;
disabled?: boolean;
}>();
const data = defineModel<string>();
</script>

8
src/app/pages/admin/hooks.vue

@ -2,22 +2,22 @@
<main v-if="data"> <main v-if="data">
<FormElement @submit.prevent="submit"> <FormElement @submit.prevent="submit">
<FormGroup> <FormGroup>
<FormTextField <FormTextArea
id="PreUp" id="PreUp"
v-model="data.preUp" v-model="data.preUp"
:label="$t('hooks.preUp')" :label="$t('hooks.preUp')"
/> />
<FormTextField <FormTextArea
id="PostUp" id="PostUp"
v-model="data.postUp" v-model="data.postUp"
:label="$t('hooks.postUp')" :label="$t('hooks.postUp')"
/> />
<FormTextField <FormTextArea
id="PreDown" id="PreDown"
v-model="data.preDown" v-model="data.preDown"
:label="$t('hooks.preDown')" :label="$t('hooks.preDown')"
/> />
<FormTextField <FormTextArea
id="PostDown" id="PostDown"
v-model="data.postDown" v-model="data.postDown"
:label="$t('hooks.postDown')" :label="$t('hooks.postDown')"

8
src/app/pages/clients/[id].vue

@ -147,25 +147,25 @@
<FormHeading :description="$t('client.hooksDescription')"> <FormHeading :description="$t('client.hooksDescription')">
{{ $t('client.hooks') }} {{ $t('client.hooks') }}
</FormHeading> </FormHeading>
<FormTextField <FormTextArea
id="PreUp" id="PreUp"
v-model="data.preUp" v-model="data.preUp"
:description="$t('client.hooksLeaveEmpty')" :description="$t('client.hooksLeaveEmpty')"
:label="$t('hooks.preUp')" :label="$t('hooks.preUp')"
/> />
<FormTextField <FormTextArea
id="PostUp" id="PostUp"
v-model="data.postUp" v-model="data.postUp"
:description="$t('client.hooksLeaveEmpty')" :description="$t('client.hooksLeaveEmpty')"
:label="$t('hooks.postUp')" :label="$t('hooks.postUp')"
/> />
<FormTextField <FormTextArea
id="PreDown" id="PreDown"
v-model="data.preDown" v-model="data.preDown"
:description="$t('client.hooksLeaveEmpty')" :description="$t('client.hooksLeaveEmpty')"
:label="$t('hooks.preDown')" :label="$t('hooks.preDown')"
/> />
<FormTextField <FormTextArea
id="PostDown" id="PostDown"
v-model="data.postDown" v-model="data.postDown"
:description="$t('client.hooksLeaveEmpty')" :description="$t('client.hooksLeaveEmpty')"

6
src/server/utils/template.ts

@ -9,6 +9,10 @@ export function template(templ: string, values: Record<string, string>) {
}); });
} }
export function removeNewlines(templ: string) {
return templ.replace(/\r\n|\r|\n/g, ' ');
}
/** /**
* Available keys: * Available keys:
* - ipv4Cidr: IPv4 CIDR * - ipv4Cidr: IPv4 CIDR
@ -18,7 +22,7 @@ export function template(templ: string, values: Record<string, string>) {
* - uiPort: UI port number * - uiPort: UI port number
*/ */
export function iptablesTemplate(templ: string, wgInterface: InterfaceType) { export function iptablesTemplate(templ: string, wgInterface: InterfaceType) {
return template(templ, { return template(removeNewlines(templ), {
ipv4Cidr: wgInterface.ipv4Cidr, ipv4Cidr: wgInterface.ipv4Cidr,
ipv6Cidr: wgInterface.ipv6Cidr, ipv6Cidr: wgInterface.ipv6Cidr,
device: wgInterface.device, device: wgInterface.device,

Loading…
Cancel
Save