github
/
nginxconfig.io
mirror of https://github.com/digitalocean/nginxconfig.io
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrade to Vue 3 (#331) 

* Dependency updates

* Upgrade to Vue 3 (WIP)

* Fix reactivity of imported domains (the object gets replaced by a proxy)

* Cleaner access of proxy for domain imports

* Remove upgrade note about reactivity issue

* Fix locale switching

* Remove upgrade note about language issue

* Patch Vue 3 issues with pretty-checkbox-vue

* Remove upgrade note about checkbox issue

* Fix extra slot for checkboxes and radios

* Set checkmark as default for extra slot

* Use patched pretty-checkbox-vue from do-vue

* Fix removing domains

* Switch to main do-vue/do-bulma
pull/342/head
Matt Cowley 2022-03-21 22:51:21 +00:00 committed by GitHub
parent 28993820eb
commit ebca910786
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 1944 additions and 5512 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7168
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

26
package.json
View File

@ -46,8 +46,8 @@
"dependencies": {
"clipboard": "^2.0.10",
"clone": "^2.1.2",
"do-bulma": "git+https://github.com/do-community/do-bulma.git",
"do-vue": "git+https://github.com/do-community/do-vue.git",
"do-bulma": "github:do-community/do-bulma",
"do-vue": "github:do-community/do-vue",
"escape-html": "^1.0.3",
"files-diff": "0.0.6",
"json-to-pretty-yaml": "^1.2.2",
@ -56,9 +56,9 @@
"prismjs": "^1.27.0",
"qs": "^6.10.3",
"simple-js-sha2-256": "^1.0.7",
"vue": "^2.6.14",
"vue-i18n": "^8.27.0",
"vue-select": "^3.16.0",
"vue": "^3.2.31",
"vue-i18n": "^9.1.9",
"vue-select": "^4.0.0-beta.2",
"webpack-require-from": "^1.8.6"
},
"devDependencies": {
@ -66,22 +66,22 @@
"@babel/plugin-proposal-class-properties": "^7.16.7",
"@babel/plugin-transform-runtime": "^7.17.0",
"@babel/preset-env": "^7.16.11",
"@babel/runtime": "^7.17.0",
"@vue/cli-service": "^5.0.0-rc.2",
"@babel/runtime": "^7.17.2",
"@vue/cli-service": "^5.0.1",
"ajv": "^8.10.0",
"chalk": "^5.0.0",
"copyfiles": "^2.4.1",
"core-js": "^3.21.0",
"core-js": "^3.21.1",
"duplicate-package-checker-webpack-plugin": "^3.0.0",
"eslint": "^8.8.0",
"eslint": "^8.9.0",
"eslint-plugin-vue": "^8.4.1",
"esm": "^3.2.25",
"jest": "^27.4.7",
"jest": "^27.5.1",
"node-fetch": "^3.2.0",
"postcss": "^8.4.6",
"sass": "^1.49.7",
"sass-loader": "^11.1.1",
"stylelint": "^14.3.0",
"sass": "^1.49.8",
"sass-loader": "^12.6.0",
"stylelint": "^14.5.1",
"stylelint-config-standard-scss": "^3.0.0",
"stylelint-order": "^5.0.0",
"vue-template-compiler": "^2.6.14",

9
src/nginxconfig/i18n/setup.js
View File

@ -24,12 +24,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
import Vue from 'vue';
import VueI18n from 'vue-i18n';
import { createI18n } from 'vue-i18n';
import { defaultPack, defaultPackData, toSep, availablePacks } from '../util/language_packs';
Vue.use(VueI18n);
// Load in the full default pack
const i18nPacks = {};
i18nPacks[defaultPack] = defaultPackData;
@ -57,7 +54,7 @@ export const getI18n = async () => {
}
// Store and return the i18n instance with the loaded packs
i18n = new VueI18n({
i18n = createI18n({
locale: defaultPack,
fallbackLocale: defaultPack,
messages: i18nPacks,
@ -88,5 +85,5 @@ export const setLanguagePack = async pack => {
// Load the pack if not already loaded, and set it as active
await loadLanguagePack(pack);
i18n.locale = pack;
i18n.global.locale = pack;
};

10
src/nginxconfig/mount.js
View File

@ -26,16 +26,14 @@ THE SOFTWARE.
// Load in the app
import './scss/style.scss';
import Vue from 'vue';
import { createApp } from 'vue';
import './util/prism_bundle';
import { getI18n } from './i18n/setup';
import App from './templates/app';
// Load the i18n languages and run the app
getI18n().then(i18n => {
new Vue({
i18n,
render: h => h(App),
}).$mount('#app');
const app = createApp(App);
app.use(i18n);
app.mount('#app');
});

36
src/nginxconfig/templates/app.vue
View File

@ -79,14 +79,13 @@ THE SOFTWARE.
</ul>
</div>
<template v-for="data in activeDomains">
<Domain
:key="data[1]"
:ref="`domain-${data[1]}`"
:data="data[0]"
:style="{ display: data[1] === active ? undefined : 'none' }"
></Domain>
</template>
<Domain
v-for="data in activeDomains"
:key="data[1]"
:ref="`domain-${data[1]}`"
:data="data[0]"
:style="{ display: data[1] === active ? undefined : 'none' }"
></Domain>
<h2>{{ $t('templates.app.globalConfig') }}</h2>
<Global :data="global"></Global>
@ -100,16 +99,15 @@ THE SOFTWARE.
<div :class="`column ${splitColumn ? 'is-half' : 'is-full'} is-full-touch`">
<h2>{{ $t('templates.app.configFiles') }}</h2>
<div ref="files" class="columns is-multiline files">
<template v-for="confContents in confFilesOutput">
<component
:is="getPrismComponent(confContents[0])"
:key="confContents[2]"
:name="confContents[0]"
:conf="confContents[1]"
:half="Object.keys(confFilesOutput).length > 1 && !splitColumn"
@copied="codeCopiedEvent(confContents[3])"
></component>
</template>
<component
v-for="confContents in confFilesOutput"
:is="getPrismComponent(confContents[0])"
:key="confContents[2]"
:name="confContents[0]"
:conf="confContents[1]"
:half="Object.keys(confFilesOutput).length > 1 && !splitColumn"
@copied="codeCopiedEvent(confContents[3])"
></component>
</div>
</div>
</div>
@ -317,7 +315,7 @@ THE SOFTWARE.
},
remove(index) {
const name = this.$data.domains[index].server.domain.computed;
this.$set(this.$data.domains, index, null);
this.$data.domains[index] = null;
if (this.$data.active === index) this.$data.active = this.$data.domains.findIndex(d => d !== null);
// Analytics

12
src/nginxconfig/templates/domain_sections/https.vue
View File

@ -35,7 +35,6 @@ THE SOFTWARE.
<div :class="`control${httpsChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="https" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.domainSections.https.enableEncryptedSslConnection') }}
</PrettyCheck>
</div>
@ -53,7 +52,6 @@ THE SOFTWARE.
<div :class="`control${http2Changed ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="http2" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.domainSections.https.enableHttp2Connections') }}
</PrettyCheck>
</div>
@ -71,7 +69,6 @@ THE SOFTWARE.
<div :class="`control${http3Changed ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="http3" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.domainSections.https.enableHttp3Connections') }}
</PrettyCheck>
</div>
@ -107,7 +104,6 @@ THE SOFTWARE.
<div :class="`control${forceHttpsChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="forceHttps" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
(http://{{ $parent.$props.data.server.domain.computed }}
<i class="fas fa-long-arrow-alt-right"></i>
https://{{ $parent.$props.data.server.domain.computed }})
@ -127,7 +123,6 @@ THE SOFTWARE.
<div :class="`control${hstsChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="hsts" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.domainSections.https.enableStrictTransportSecurity') }}
</PrettyCheck>
</div>
@ -136,7 +131,6 @@ THE SOFTWARE.
<div v-if="hstsSubdomainsEnabled" :class="`control${hstsSubdomainsChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="hstsSubdomains" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.domainSections.https.enableIncludeSubDomains') }}
</PrettyCheck>
</div>
@ -145,7 +139,6 @@ THE SOFTWARE.
<div v-if="hstsPreloadEnabled" :class="`control${hstsPreloadChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="hstsPreload" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.domainSections.https.enablePreload') }}
</PrettyCheck>
</div>
@ -166,7 +159,6 @@ THE SOFTWARE.
>
<div class="radio">
<PrettyRadio v-model="certType" :value="value" class="p-default p-round p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t(name) }}
</PrettyRadio>
</div>
@ -232,11 +224,11 @@ THE SOFTWARE.
</template>
<script>
import PrettyCheck from 'pretty-checkbox-vue/check';
import PrettyRadio from 'pretty-checkbox-vue/radio';
import ExternalLink from 'do-vue/src/templates/external_link';
import delegatedFromDefaults from '../../util/delegated_from_defaults';
import computedFromDefaults from '../../util/computed_from_defaults';
import PrettyCheck from '../inputs/checkbox';
import PrettyRadio from '../inputs/radio';
const defaults = {
https: {

6
src/nginxconfig/templates/domain_sections/logging.vue
View File

@ -1,5 +1,5 @@
<!--
Copyright 2020 DigitalOcean
Copyright 2022 DigitalOcean
This code is licensed under the MIT License.
You may obtain a copy of the License at
@ -35,7 +35,6 @@ THE SOFTWARE.
<div :class="`control${accessLogChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="accessLog" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.domainSections.logging.enableForThisDomain') }}
</PrettyCheck>
</div>
@ -53,7 +52,6 @@ THE SOFTWARE.
<div :class="`control${errorLogChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="errorLog" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.domainSections.logging.enableForThisDomain') }}
</PrettyCheck>
</div>
@ -65,9 +63,9 @@ THE SOFTWARE.
</template>
<script>
import PrettyCheck from 'pretty-checkbox-vue/check';
import delegatedFromDefaults from '../../util/delegated_from_defaults';
import computedFromDefaults from '../../util/computed_from_defaults';
import PrettyCheck from '../inputs/checkbox';
const defaults = {
accessLog: {

7
src/nginxconfig/templates/domain_sections/php.vue
View File

@ -56,7 +56,6 @@ THE SOFTWARE.
<div :class="`control${phpChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="php" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.domainSections.php.enablePhp') }}
</PrettyCheck>
</div>
@ -126,7 +125,6 @@ THE SOFTWARE.
<div :class="`control${wordPressRulesChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="wordPressRules" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.domainSections.php.enableWordPressRules') }}
</PrettyCheck>
</div>
@ -144,7 +142,6 @@ THE SOFTWARE.
<div :class="`control${drupalRulesChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="drupalRules" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.domainSections.php.enableDrupalRules') }}
</PrettyCheck>
</div>
@ -162,7 +159,6 @@ THE SOFTWARE.
<div :class="`control${magentoRulesChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="magentoRules" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.domainSections.php.enableMagentoRules') }}
</PrettyCheck>
</div>
@ -180,7 +176,6 @@ THE SOFTWARE.
<div :class="`control${joomlaRulesChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="joomlaRules" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.domainSections.php.enableJoomlaRules') }}
</PrettyCheck>
</div>
@ -192,10 +187,10 @@ THE SOFTWARE.
</template>
<script>
import PrettyCheck from 'pretty-checkbox-vue/check';
import VueSelect from 'vue-select';
import delegatedFromDefaults from '../../util/delegated_from_defaults';
import computedFromDefaults from '../../util/computed_from_defaults';
import PrettyCheck from '../inputs/checkbox';
// Value -> i18n key
const serverOptions = {

6
src/nginxconfig/templates/domain_sections/python.vue
View File

@ -1,5 +1,5 @@
<!--
Copyright 2020 DigitalOcean
Copyright 2022 DigitalOcean
This code is licensed under the MIT License.
You may obtain a copy of the License at
@ -56,7 +56,6 @@ THE SOFTWARE.
<div :class="`control${pythonChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="python" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.domainSections.python.enablePython') }}
</PrettyCheck>
</div>
@ -74,7 +73,6 @@ THE SOFTWARE.
<div :class="`control${djangoRulesChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="djangoRules" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.domainSections.python.enableDjangoRules') }}
</PrettyCheck>
</div>
@ -86,9 +84,9 @@ THE SOFTWARE.
</template>
<script>
import PrettyCheck from 'pretty-checkbox-vue/check';
import delegatedFromDefaults from '../../util/delegated_from_defaults';
import computedFromDefaults from '../../util/computed_from_defaults';
import PrettyCheck from '../inputs/checkbox';
const defaults = {
python: {

11
src/nginxconfig/templates/domain_sections/restrict.vue
View File

@ -37,7 +37,6 @@ THE SOFTWARE.
<div :class="`control${getMethodChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="getMethod" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.domainSections.restrict.disableForThisDomain') }}
</PrettyCheck>
</div>
@ -54,7 +53,6 @@ THE SOFTWARE.
<div :class="`control${postMethodChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="postMethod" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.domainSections.restrict.disableForThisDomain') }}
</PrettyCheck>
</div>
@ -71,7 +69,6 @@ THE SOFTWARE.
<div :class="`control${putMethodChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="putMethod" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.domainSections.restrict.disableForThisDomain') }}
</PrettyCheck>
</div>
@ -88,7 +85,6 @@ THE SOFTWARE.
<div :class="`control${patchMethodChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="patchMethod" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.domainSections.restrict.disableForThisDomain') }}
</PrettyCheck>
</div>
@ -105,7 +101,6 @@ THE SOFTWARE.
<div :class="`control${deleteMethodChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="deleteMethod" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.domainSections.restrict.disableForThisDomain') }}
</PrettyCheck>
</div>
@ -124,7 +119,6 @@ THE SOFTWARE.
<div :class="`control${headMethodChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="headMethod" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.domainSections.restrict.disableForThisDomain') }}
</PrettyCheck>
</div>
@ -141,7 +135,6 @@ THE SOFTWARE.
<div :class="`control${connectMethodChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="connectMethod" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.domainSections.restrict.disableForThisDomain') }}
</PrettyCheck>
</div>
@ -158,7 +151,6 @@ THE SOFTWARE.
<div :class="`control${optionsMethodChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="optionsMethod" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.domainSections.restrict.disableForThisDomain') }}
</PrettyCheck>
</div>
@ -175,7 +167,6 @@ THE SOFTWARE.
<div :class="`control${traceMethodChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="traceMethod" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.domainSections.restrict.disableForThisDomain') }}
</PrettyCheck>
</div>
@ -208,9 +199,9 @@ THE SOFTWARE.
</template>
<script>
import PrettyCheck from 'pretty-checkbox-vue/check';
import delegatedFromDefaults from '../../util/delegated_from_defaults';
import computedFromDefaults from '../../util/computed_from_defaults';
import PrettyCheck from '../inputs/checkbox';
const defaults = {
getMethod: {

3
src/nginxconfig/templates/domain_sections/reverse_proxy.vue
View File

@ -56,7 +56,6 @@ THE SOFTWARE.
<div class="control">
<div class="checkbox">
<PrettyCheck v-model="reverseProxy" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.domainSections.reverseProxy.enableReverseProxy') }}
</PrettyCheck>
</div>
@ -104,9 +103,9 @@ THE SOFTWARE.
</template>
<script>
import PrettyCheck from 'pretty-checkbox-vue/check';
import delegatedFromDefaults from '../../util/delegated_from_defaults';
import computedFromDefaults from '../../util/computed_from_defaults';
import PrettyCheck from '../inputs/checkbox';
const defaults = {
reverseProxy: {

9
src/nginxconfig/templates/domain_sections/routing.vue
View File

@ -35,7 +35,6 @@ THE SOFTWARE.
<div :class="`control${rootChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="root" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('common.enable') }}
</PrettyCheck>
</div>
@ -56,7 +55,6 @@ THE SOFTWARE.
>
<div class="radio">
<PrettyRadio v-model="index" :value="value" class="p-default p-round p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ value }}
</PrettyRadio>
</div>
@ -74,7 +72,6 @@ THE SOFTWARE.
<div v-if="fallbackHtmlEnabled" :class="`control${fallbackHtmlChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="fallbackHtml" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
index.html
</PrettyCheck>
</div>
@ -82,7 +79,6 @@ THE SOFTWARE.
<div v-if="fallbackPhpEnabled" :class="`control${fallbackPhpChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="fallbackPhp" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
index.php
</PrettyCheck>
</div>
@ -118,7 +114,6 @@ THE SOFTWARE.
<div :class="`control${legacyPhpRoutingChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="legacyPhpRouting" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.domainSections.routing.enableLegacyRouting') }}
</PrettyCheck>
</div>
@ -130,10 +125,10 @@ THE SOFTWARE.
</template>
<script>
import PrettyCheck from 'pretty-checkbox-vue/check';
import PrettyRadio from 'pretty-checkbox-vue/radio';
import delegatedFromDefaults from '../../util/delegated_from_defaults';
import computedFromDefaults from '../../util/computed_from_defaults';
import PrettyCheck from '../inputs/checkbox';
import PrettyRadio from '../inputs/radio';
const defaults = {
root: {

7
src/nginxconfig/templates/domain_sections/server.vue
View File

@ -1,5 +1,5 @@
<!--
Copyright 2020 DigitalOcean
Copyright 2022 DigitalOcean
This code is licensed under the MIT License.
You may obtain a copy of the License at
@ -70,7 +70,6 @@ THE SOFTWARE.
<div :class="`control${wwwSubdomainChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="wwwSubdomain" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
(www.{{ $props.data.domain.computed }})
</PrettyCheck>
</div>
@ -88,7 +87,6 @@ THE SOFTWARE.
<div :class="`control${cdnSubdomainChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="cdnSubdomain" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
(cdn.{{ $props.data.domain.computed }})
</PrettyCheck>
</div>
@ -106,7 +104,6 @@ THE SOFTWARE.
<div :class="`control${redirectSubdomainsChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="redirectSubdomains" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
({{ wwwSubdomain ? `${domain}, ` : '' }}*.{{ $props.data.domain.computed }}
<i class="fas fa-long-arrow-alt-right"></i>
{{ wwwSubdomain ? 'www.' : '' }}{{ $props.data.domain.computed }})
@ -148,9 +145,9 @@ THE SOFTWARE.
</template>
<script>
import PrettyCheck from 'pretty-checkbox-vue/check';
import delegatedFromDefaults from '../../util/delegated_from_defaults';
import computedFromDefaults from '../../util/computed_from_defaults';
import PrettyCheck from '../inputs/checkbox';
const defaults = {
domain: {

6
src/nginxconfig/templates/global_sections/docker.vue
View File

@ -1,5 +1,5 @@
<!--
Copyright 2020 DigitalOcean
Copyright 2022 DigitalOcean
This code is licensed under the MIT License.
You may obtain a copy of the License at
@ -52,7 +52,6 @@ THE SOFTWARE.
<div :class="`control${dockerfileChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="dockerfile" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.globalSections.docker.includeDockerfile') }}
</PrettyCheck>
</div>
@ -69,7 +68,6 @@ THE SOFTWARE.
<div :class="`control${dockerComposeChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="dockerCompose" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.globalSections.docker.includeDockerCompose') }}
</PrettyCheck>
</div>
@ -81,10 +79,10 @@ THE SOFTWARE.
</template>
<script>
import PrettyCheck from 'pretty-checkbox-vue/check';
import delegatedFromDefaults from '../../util/delegated_from_defaults';
import computedFromDefaults from '../../util/computed_from_defaults';
import analytics from '../../util/analytics';
import PrettyCheck from '../inputs/checkbox';
const defaults = {
dockerfile: {

16
src/nginxconfig/templates/global_sections/https.vue
View File

@ -35,7 +35,6 @@ THE SOFTWARE.
<div :class="`control${portReuseChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="portReuse" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.globalSections.https.enableReuseOfPort') }}
</PrettyCheck>
</div>
@ -73,7 +72,6 @@ THE SOFTWARE.
>
<div class="radio">
<PrettyRadio v-model="sslProfile" :value="value" class="p-default p-round p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t(name) }}
</PrettyRadio>
</div>
@ -92,7 +90,6 @@ THE SOFTWARE.
<div :class="`control${ocspCloudflareChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="ocspCloudflare" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.globalSections.https.cloudflareResolver') }}
</PrettyCheck>
</div>
@ -104,7 +101,6 @@ THE SOFTWARE.
>
<div class="radio">
<PrettyRadio v-model="ocspCloudflareType" :value="value" class="p-default p-round p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t(name) }}
</PrettyRadio>
</div>
@ -114,7 +110,6 @@ THE SOFTWARE.
<div :class="`control${ocspGoogleChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="ocspGoogle" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.globalSections.https.googlePublicDns') }}
</PrettyCheck>
</div>
@ -126,7 +121,6 @@ THE SOFTWARE.
>
<div class="radio">
<PrettyRadio v-model="ocspGoogleType" :value="value" class="p-default p-round p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t(name) }}
</PrettyRadio>
</div>
@ -136,7 +130,6 @@ THE SOFTWARE.
<div :class="`control${ocspOpenDnsChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="ocspOpenDns" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.globalSections.https.openDns') }}
</PrettyCheck>
</div>
@ -148,7 +141,6 @@ THE SOFTWARE.
>
<div class="radio">
<PrettyRadio v-model="ocspOpenDnsType" :value="value" class="p-default p-round p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t(name) }}
</PrettyRadio>
</div>
@ -158,7 +150,6 @@ THE SOFTWARE.
<div :class="`control${ocspQuad9Changed ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="ocspQuad9" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.globalSections.https.quad9') }}
</PrettyCheck>
</div>
@ -170,7 +161,6 @@ THE SOFTWARE.
>
<div class="radio">
<PrettyRadio v-model="ocspQuad9Type" :value="value" class="p-default p-round p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t(name) }}
</PrettyRadio>
</div>
@ -180,7 +170,6 @@ THE SOFTWARE.
<div :class="`control${ocspVerisignChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="ocspVerisign" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.globalSections.https.verisign') }}
</PrettyCheck>
</div>
@ -192,7 +181,6 @@ THE SOFTWARE.
>
<div class="radio">
<PrettyRadio v-model="ocspVerisignType" :value="value" class="p-default p-round p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t(name) }}
</PrettyRadio>
</div>
@ -242,11 +230,11 @@ THE SOFTWARE.
</template>
<script>
import PrettyCheck from 'pretty-checkbox-vue/check';
import PrettyRadio from 'pretty-checkbox-vue/radio';
import clone from 'clone';
import delegatedFromDefaults from '../../util/delegated_from_defaults';
import computedFromDefaults from '../../util/computed_from_defaults';
import PrettyCheck from '../inputs/checkbox';
import PrettyRadio from '../inputs/radio';
const ipType = {
default: 'ipv4',

12
src/nginxconfig/templates/global_sections/logging.vue
View File

@ -71,7 +71,6 @@ THE SOFTWARE.
<div :class="`control${logNotFoundChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="logNotFound" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.globalSections.logging.enableFileNotFoundErrorLogging') }} error_log
</PrettyCheck>
</div>
@ -89,7 +88,6 @@ THE SOFTWARE.
<div v-if="cloudflareEnabled" :class="`control${cloudflareChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="cloudflare" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.globalSections.logging.enableCloudflare') }}
</PrettyCheck>
</div>
@ -97,7 +95,6 @@ THE SOFTWARE.
<div v-if="cfRayEnabled" :class="`control${cfRayChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="cfRay" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.globalSections.logging.cfRay') }}
</PrettyCheck>
</div>
@ -105,7 +102,6 @@ THE SOFTWARE.
<div v-if="cfConnectingIpEnabled" :class="`control${cfConnectingIpChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="cfConnectingIp" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.globalSections.logging.cfConnectingIp') }}
</PrettyCheck>
</div>
@ -113,7 +109,6 @@ THE SOFTWARE.
<div v-if="xForwardedForEnabled" :class="`control${xForwardedForChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="xForwardedFor" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.globalSections.logging.xForwardedFor') }}
</PrettyCheck>
</div>
@ -121,7 +116,6 @@ THE SOFTWARE.
<div v-if="xForwardedProtoEnabled" :class="`control${xForwardedProtoChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="xForwardedProto" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.globalSections.logging.xForwardedProto') }}
</PrettyCheck>
</div>
@ -129,7 +123,6 @@ THE SOFTWARE.
<div v-if="trueClientIpEnabled" :class="`control${trueClientIpChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="trueClientIp" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.globalSections.logging.trueClientIp') }}
</PrettyCheck>
</div>
@ -137,7 +130,6 @@ THE SOFTWARE.
<div v-if="cfIpCountryEnabled" :class="`control${cfIpCountryChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="cfIpCountry" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.globalSections.logging.cfIpCountry') }}
</PrettyCheck>
</div>
@ -145,7 +137,6 @@ THE SOFTWARE.
<div v-if="cfVisitorEnabled" :class="`control${cfVisitorChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="cfVisitor" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.globalSections.logging.cfVisitor') }}
</PrettyCheck>
</div>
@ -153,7 +144,6 @@ THE SOFTWARE.
<div v-if="cdnLoopEnabled" :class="`control${cdnLoopChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="cdnLoop" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.globalSections.logging.cdnLoop') }}
</PrettyCheck>
</div>
@ -165,9 +155,9 @@ THE SOFTWARE.
</template>
<script>
import PrettyCheck from 'pretty-checkbox-vue/check';
import delegatedFromDefaults from '../../util/delegated_from_defaults';
import computedFromDefaults from '../../util/computed_from_defaults';
import PrettyCheck from '../inputs/checkbox';
const defaults = {
accessLog: {

4
src/nginxconfig/templates/global_sections/performance.vue
View File

@ -35,7 +35,6 @@ THE SOFTWARE.
<div :class="`control${gzipCompressionChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="gzipCompression" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.globalSections.performance.enableGzipCompression') }}
</PrettyCheck>
</div>
@ -53,7 +52,6 @@ THE SOFTWARE.
<div :class="`control${brotliCompressionChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="brotliCompression" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.globalSections.performance.enableBrotliCompression') }}
</PrettyCheck>
</div>
@ -150,10 +148,10 @@ THE SOFTWARE.
</template>
<script>
import PrettyCheck from 'pretty-checkbox-vue/check';
import ExternalLink from 'do-vue/src/templates/external_link';
import delegatedFromDefaults from '../../util/delegated_from_defaults';
import computedFromDefaults from '../../util/computed_from_defaults';
import PrettyCheck from '../inputs/checkbox';
const defaults = {
gzipCompression: {

3
src/nginxconfig/templates/global_sections/reverse_proxy.vue
View File

@ -130,7 +130,6 @@ THE SOFTWARE.
>
<div class="radio">
<PrettyRadio v-model="proxyCoexistenceXForwarded" :value="value" class="p-default p-round p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t(name) }}
</PrettyRadio>
</div>
@ -144,9 +143,9 @@ THE SOFTWARE.
</template>
<script>
import PrettyRadio from 'pretty-checkbox-vue/radio';
import delegatedFromDefaults from '../../util/delegated_from_defaults';
import computedFromDefaults from '../../util/computed_from_defaults';
import PrettyRadio from '../inputs/radio';
const defaults = {
proxyConnectTimeout: {

5
src/nginxconfig/templates/global_sections/security.vue
View File

@ -96,7 +96,6 @@ THE SOFTWARE.
<div :class="`control${serverTokensChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="serverTokens" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('common.enable') }}
</PrettyCheck>
</div>
@ -114,7 +113,6 @@ THE SOFTWARE.
<div :class="`control${limitReqChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="limitReq" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('common.enable') }}
</PrettyCheck>
</div>
@ -132,7 +130,6 @@ THE SOFTWARE.
<div :class="`control${securityTxt ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="securityTxt" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('common.enable') }}
</PrettyCheck>
</div>
@ -162,10 +159,10 @@ THE SOFTWARE.
</template>
<script>
import PrettyCheck from 'pretty-checkbox-vue/check';
import VueSelect from 'vue-select';
import delegatedFromDefaults from '../../util/delegated_from_defaults';
import computedFromDefaults from '../../util/computed_from_defaults';
import PrettyCheck from '../inputs/checkbox';
const defaults = {
referrerPolicy: {

4
src/nginxconfig/templates/global_sections/tools.vue
View File

@ -35,7 +35,6 @@ THE SOFTWARE.
<div :class="`control${modularizedStructureChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="modularizedStructure" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.globalSections.tools.enableModularizedConfigFiles') }}
</PrettyCheck>
</div>
@ -53,7 +52,6 @@ THE SOFTWARE.
<div :class="`control${symlinkVhostChanged ? ' is-changed' : ''}`">
<div class="checkbox">
<PrettyCheck v-model="symlinkVhost" class="p-default p-curve p-fill p-icon">
<i slot="extra" class="icon fas fa-check"></i>
{{ $t('templates.globalSections.tools.enableSymLinksFrom') }} sites-available/
{{ $t('templates.globalSections.tools.to') }} sites-enabled/
</PrettyCheck>
@ -146,12 +144,12 @@ THE SOFTWARE.
</template>
<script>
import PrettyCheck from 'pretty-checkbox-vue/check';
import Modal from 'do-vue/src/templates/modal';
import delegatedFromDefaults from '../../util/delegated_from_defaults';
import computedFromDefaults from '../../util/computed_from_defaults';
import shareQuery from '../../util/share_query';
import analytics from '../../util/analytics';
import PrettyCheck from '../inputs/checkbox';
const defaults = {
modularizedStructure: {

45
src/nginxconfig/templates/inputs/checkbox.vue Normal file
View File

@ -0,0 +1,45 @@
<!--
Copyright 2022 DigitalOcean
This code is licensed under the MIT License.
You may obtain a copy of the License at
https://github.com/digitalocean/nginxconfig.io/blob/master/LICENSE or https://mit-license.org/
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions :
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->
<template>
<PrettyCheck>
<!-- Set the FontAwesome check as the default extra -->
<template #extra>
<slot name="extra">
<i class="icon fas fa-check"></i>
</slot>
</template>
<!-- Load in all other slots -->
<template v-for="(_, slot) in $slots" #[slot]="scope">
<slot :name="slot" v-bind="scope || {}" />
</template>
</PrettyCheck>
</template>
<script setup>
import PrettyCheck from 'do-vue/src/templates/pretty-checkbox-vue/pretty_check';
</script>

45
src/nginxconfig/templates/inputs/radio.vue Normal file
View File

@ -0,0 +1,45 @@
<!--
Copyright 2022 DigitalOcean
This code is licensed under the MIT License.
You may obtain a copy of the License at
https://github.com/digitalocean/nginxconfig.io/blob/master/LICENSE or https://mit-license.org/
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions :
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->
<template>
<PrettyRadio>
<!-- Set the FontAwesome check as the default extra -->
<template #extra>
<slot name="extra">
<i class="icon fas fa-check"></i>
</slot>
</template>
<!-- Load in all other slots -->
<template v-for="(_, slot) in $slots" #[slot]="scope">
<slot :name="slot" v-bind="scope || {}" />
</template>
</PrettyRadio>
</template>
<script setup>
import PrettyRadio from 'do-vue/src/templates/pretty-checkbox-vue/pretty_radio';
</script>

6
src/nginxconfig/util/import_data.js
View File

@ -1,5 +1,5 @@
/*
Copyright 2021 DigitalOcean
Copyright 2022 DigitalOcean
This code is licensed under the MIT License.
You may obtain a copy of the License at
@ -104,9 +104,9 @@ export default (query, domains, global, nextTick) => new Promise(resolve => {
}
// Create a new domain (assume it has had custom user settings)
const domainImported = clone(Domain.delegated);
// Push transforms the object to a proxy, so re-fetch the proxy from the array
const domainImported = domains[domains.push(clone(Domain.delegated)) - 1];
domainImported.hasUserInteraction = true;
domains.push(domainImported);
// Apply the initial values on the next Vue tick, once the watchers are ready
nextTick(() => applyCategories(data.domains[i], domainImported));