From d7e17e6146d8d5f84c71cbd0f3f684467bebb4f6 Mon Sep 17 00:00:00 2001 From: Robin Schneider <45321827+robinschneider@users.noreply.github.com> Date: Fri, 8 Oct 2021 17:50:19 +0200 Subject: [PATCH 1/8] Spelling fix --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 0746863..e0063d5 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -14,5 +14,5 @@ Fixes # (issue) - [ ] I've read & comply with the [contributing guidelines](https://github.com/bastienwirtz/homer/blob/main/CONTRIBUTING.md) - [ ] I have tested my code for new features & regressions on both mobile & desktop devices, using the latest version of major browsers. -- [ ] I have made corresponding changes the documentation (README.md). +- [ ] I have made corresponding changes to the documentation (README.md). - [ ] I've checked my modifications for any breaking changes, especially in the `config.yml` file From a25e1b1a70649f4a0341056cca0669d4b7d78fb5 Mon Sep 17 00:00:00 2001 From: Bastien Wirtz Date: Sun, 10 Oct 2021 09:23:35 +0200 Subject: [PATCH 2/8] Auto PR lint --- .github/workflows/integration.yml | 31 +++++++++++++++++++++ .github/workflows/{main.yml => release.yml} | 0 2 files changed, 31 insertions(+) create mode 100644 .github/workflows/integration.yml rename .github/workflows/{main.yml => release.yml} (100%) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml new file mode 100644 index 0000000..196113d --- /dev/null +++ b/.github/workflows/integration.yml @@ -0,0 +1,31 @@ +# This workflow will do a clean install of node dependencies, cache/restore them, build the source code and run tests across different versions of node +# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions + +name: Node.js CI + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +jobs: + build: + + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [16.x] + # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ + + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v2 + with: + node-version: ${{ matrix.node-version }} + cache: 'yarn' + - run: yarn install + - run: yarn lint + diff --git a/.github/workflows/main.yml b/.github/workflows/release.yml similarity index 100% rename from .github/workflows/main.yml rename to .github/workflows/release.yml From 0a3be103dc02182af7cd5e92fdd6130e3198e1a7 Mon Sep 17 00:00:00 2001 From: Bastien Wirtz Date: Sun, 10 Oct 2021 09:26:02 +0200 Subject: [PATCH 3/8] Factorize fetch options --- src/App.vue | 6 ++++-- src/assets/defaults.yml | 3 +++ src/components/Service.vue | 3 ++- src/components/services/AdGuardHome.vue | 18 +++++++--------- src/mixins/service.js | 28 +++++++++++++++++++++++++ 5 files changed, 45 insertions(+), 13 deletions(-) create mode 100644 src/mixins/service.js diff --git a/src/App.vue b/src/App.vue index 1f4f509..c263c8a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -74,7 +74,8 @@ @@ -102,7 +103,8 @@ diff --git a/src/assets/defaults.yml b/src/assets/defaults.yml index f011346..ae4f523 100644 --- a/src/assets/defaults.yml +++ b/src/assets/defaults.yml @@ -42,3 +42,6 @@ colors: message: ~ links: [] services: [] + + +proxy: ~ \ No newline at end of file diff --git a/src/components/Service.vue b/src/components/Service.vue index 39a9ac4..25b86d5 100644 --- a/src/components/Service.vue +++ b/src/components/Service.vue @@ -1,5 +1,5 @@