Create release 0.8.2

.eslintrc.yml

@@ -9,5 +9,12 @@ extends:
     - "plugin:vue/strongly-recommended"
     - "plugin:vue/recommended"
     - prettier
-    #- prettier/babel
-    - prettier/vue
+
+globals:
+    OC:
+    t:
+
+rules:
+    no-plusplus:
+        - error
+        - allowForLoopAfterthoughts: true

.github/workflows/build-test-images.yml

@@ -17,8 +17,21 @@ jobs:
                     - "7.3"
                     - "8"
         steps:
+            - name: Check if secret is known
+              shell: bash
+              id: check
+              run: |
+                echo "::set-output name=skip::false"
+                if [ -z "${{ secrets.DOCKER_HUB_TOKEN }}" ]; then
+                    echo "::set-output name=skip::true"
+                fi
+                if [ -z "${{ secrets.DOCKER_HUB_USERNAME }}" ]; then
+                    echo "::set-output name=skip::true"
+                fi
+
             - name: Checkout the app
               uses: actions/checkout@v2
+              if: ${{ steps.check.outputs.skip == 'false' }}
 
             - name: Build and push the image
               shell: bash
@@ -31,3 +44,4 @@ jobs:
                 export COMPOSE_DOCKER_CLI_BUILD=1 &&
                 PHP_VERSION=${{ matrix.phpVersion }}
                 ./run-locally.sh --pull --create-images --push-images
+              if: ${{ steps.check.outputs.skip == 'false' }}

.github/workflows/tests.yml

@@ -8,30 +8,64 @@ on:
 jobs:
 
   php-lint:
-     name: Run PHP Linter and Code Style checker
-     runs-on: ubuntu-latest
-     steps:
-        -  name: Checkout the project
-           uses: actions/checkout@v2
-        -  name: Get PHP version
-           shell: bash
-           run: php -v
-        -  name: Install Composer
-           shell: bash
-           run: >-
-              wget https://github.com/composer/getcomposer.org/raw/master/web/installer -O - -q |
-              php -- --quiet
-        -  name: Install packages
-           shell: bash
-           run: composer install
-        -  name: Run linter
-           shell: bash
-           run: composer lint:lint
-        -  name: Run code style checker
-           shell: bash
-           env:
-              PHP_CS_FIXER_IGNORE_ENV: 1
-           run: composer cs:check
+    name: Run PHP Linter and Code Style checker
+    runs-on: ubuntu-latest
+    steps:
+        -   name: Checkout the project
+            uses: actions/checkout@v2
+        -   name: Get PHP version
+            shell: bash
+            run: php -v
+
+        -   name: Install Composer
+            shell: bash
+            run: >-
+                wget https://github.com/composer/getcomposer.org/raw/master/web/installer -O - -q |
+                php -- --quiet
+
+        -   name: Install PHP packages
+            shell: bash
+            run: composer install
+        -   name: Install Node packages
+            shell: bash
+            run: npm -q install
+
+        -   name: Run PHP linter
+            shell: bash
+            run: composer lint:lint
+        -   name: Run PHP code style checker
+            shell: bash
+            env:
+                PHP_CS_FIXER_IGNORE_ENV: 1
+            run: composer cs:check
+
+        -   name: Check for formatting issues with vue files (prettier)
+            shell: bash
+            run: >-
+                npm run prettier || {
+                echo '::error ::The prettier style checker failed.
+                Please run `npm run prettier-fix` in order to correct this.';
+                exit 1;
+                }
+
+        -   name: Check for issues with vue and js files (eslint)
+            shell: bash
+            run: >-
+                npm run eslint || {
+                echo '::error ::The eslint style checker failed.
+                Please run `npm run eslint-fix` in order to correct this.';
+                exit 1;
+                }
+
+        -   name: Check for formatting issues with CSS files (stylelint)
+            shell: bash
+            run: >-
+                npm run stylelint || {
+                echo '::error ::The stylelint checker failed.
+                Please run `npm run stylelint-fix` to help solving these issues if possible.';
+                exit 1;
+                }
+
 
   unit-tests:
     name: Run the unittests
@@ -47,7 +81,7 @@ jobs:
                 - pgsql
                 - sqlite
             coreVersion:
-                - stable20
+                - stable21
             phpVersion:
                 - "7"
             httpServer:
@@ -57,26 +91,26 @@ jobs:
             include:
                 # Test different core versions additionally
                 -   database: mysql
-                    coreVersion: stable18
+                    coreVersion: stable19
                     phpVersion: "7"
                     httpServer: "apache"
                     mayFail: false
                 -   database: mysql
-                    coreVersion: stable19
+                    coreVersion: stable20
                     phpVersion: "7"
                     httpServer: "apache"
                     mayFail: false
 
                 # Test different PHP versions additionally
                 -   database: mysql
-                    coreVersion: stable20
+                    coreVersion: stable21
                     phpVersion: "7.3"
                     httpServer: "apache"
                     mayFail: false
 
                 # Test different HTTP server
                 -   database: mysql
-                    coreVersion: stable20
+                    coreVersion: stable21
                     phpVersion: "7"
                     httpServer: "nginx"
                     mayFail: false

.php_cs.dist

@@ -10,13 +10,13 @@ $config = new Config();
 $config
 	->getFinder()
 	->ignoreVCSIgnored(true)
-	->notPath('build')
-	->notPath('l10n')
+	->exclude('build')
+	->exclude('l10n')
 //	->notPath('lib/Vendor')
-	->notPath('src')
-	->notPath('node_modules')
-	->notPath('vendor')
-	->notPath('.github')
+	->exclude('src')
+	->exclude('node_modules')
+	->exclude('vendor')
+	->exclude('.github')
 	->in(__DIR__);
 return $config;
 

.stylelintrc.yml

@@ -10,6 +10,7 @@ rules:
             - attribute
     "selector-max-id": 1
     "max-nesting-depth": 2
+    "selector-max-compound-selectors": 4
 
 extends:
     - stylelint-config-standard

CHANGELOG.md

@@ -1,5 +1,33 @@
 ## [Unreleased]
 
+## 0.8.2 - 2021-03-03
+
+### Fixed
+- Added translation for nutritient-value label placeholder
+  [#596](https://github.com/nextcloud/cookbook/pull/596) @seyfeb
+- Updated dependency of eslint-config-prettier
+  [#603](https://github.com/nextcloud/cookbook/pull/603) @christianlupus
+- Enforce basic code styling using prettier in vue files
+  [#607](https://github.com/nextcloud/cookbook/pull/607) @christianlupus
+- Enforce CSS styling using stylelint
+  [#608](https://github.com/nextcloud/cookbook/pull/608) @christianlupus
+- More code styling, cleanup & minor bugfixes
+  [#615](https://github.com/nextcloud/cookbook/pull/615) @seyfeb
+- Avoid daily issues in personal forks due to missing secrets
+  [#620](https://github.com/nextcloud/cookbook/pull/620) @christianlupus
+- Avoid descending of CS_fixer into non-code folders
+  [#621](https://github.com/nextcloud/cookbook/pull/621) @christianlupus
+- Fixed compatiblity with Nextcloud 21
+  [#605](https://github.com/nextcloud/cookbook/pull/605) @icewind1991
+
+## Deprecated
+- Obsolete routes to old user interface, see `appinfo/routes.php`
+  [#580](https://github.com/nextcloud/cookbook/pull/580) @christianlupus
+
+## Removed
+- Dropped support for NC core version <= 18
+  [#630](https://github.com/nextcloud/cookbook/pull/630) @christianlupus
+
 ## 0.8.1 - 2021-02-15
 
 ### Added

appinfo/info.xml

@@ -16,7 +16,7 @@
     <screenshot small-thumbnail="https://raw.githubusercontent.com/nextcloud/cookbook/stable/img/screenshot-small.jpg">https://raw.githubusercontent.com/nextcloud/cookbook/stable/img/screenshot-small.jpg</screenshot>
     <dependencies>
         <php min-version="7.2"/>
-        <nextcloud min-version="17" max-version="20"/>
+        <nextcloud min-version="19" max-version="21"/>
     </dependencies>
     <navigations>
         <navigation>

appinfo/routes.php

@@ -16,16 +16,9 @@
 		 */
 		['name' => 'main#getApiVersion', 'url' => '/api/version', 'verb' => 'GET'],
 		['name' => 'main#index', 'url' => '/', 'verb' => 'GET'],
-		['name' => 'main#home', 'url' => '/home', 'verb' => 'GET'],
 		['name' => 'main#keywords', 'url' => '/keywords', 'verb' => 'GET'],
 		['name' => 'main#categories', 'url' => '/categories', 'verb' => 'GET'],
-		['name' => 'main#error', 'url' => '/error', 'verb' => 'GET'],
-		['name' => 'main#create', 'url' => '/recipes/create', 'verb' => 'GET'],
-		['name' => 'main#new', 'url' => '/recipes/create', 'verb' => 'POST'],
 		['name' => 'main#import', 'url' => '/import', 'verb' => 'POST'],
-		['name' => 'main#edit', 'url' => '/recipes/{id}/edit', 'verb' => 'GET', 'requirements' => ['id' => '\d+']],
-		['name' => 'main#update', 'url' => '/recipes/{id}/edit', 'verb' => 'PUT', 'requirements' => ['id' => '\d+']],
-		['name' => 'main#recipe', 'url' => '/recipes/{id}', 'verb' => 'GET', 'requirements' => ['id' => '\d+']],
 		['name' => 'recipe#image', 'url' => '/recipes/{id}/image', 'verb' => 'GET', 'requirements' => ['id' => '\d+']],
 		['name' => 'config#reindex', 'url' => '/reindex', 'verb' => 'POST'],
 		['name' => 'config#list', 'url' => '/config', 'verb' => 'GET'],
@@ -35,6 +28,15 @@
 		['name' => 'main#categoryUpdate', 'url' => '/api/category/{category}', 'verb' => 'PUT'],
 		['name' => 'main#tags', 'url' => '/api/tags/{keywords}', 'verb' => 'GET'],
 		['name' => 'main#search', 'url' => '/api/search/{query}', 'verb' => 'GET'],
+		/* Unknown usage */
+		/* Deprecated routes */
+		['name' => 'main#new', 'url' => '/recipes/create', 'verb' => 'POST'],
+		['name' => 'main#update', 'url' => '/recipes/{id}/edit', 'verb' => 'PUT', 'requirements' => ['id' => '\d+']],
+		['name' => 'main#home', 'url' => '/home', 'verb' => 'GET'],
+		['name' => 'main#error', 'url' => '/error', 'verb' => 'GET'],
+		['name' => 'main#create', 'url' => '/recipes/create', 'verb' => 'GET'],
+		['name' => 'main#edit', 'url' => '/recipes/{id}/edit', 'verb' => 'GET', 'requirements' => ['id' => '\d+']],
+		['name' => 'main#recipe', 'url' => '/recipes/{id}', 'verb' => 'GET', 'requirements' => ['id' => '\d+']],
 	],
 
 	/* API resources */

l10n/af.js

@@ -2,11 +2,11 @@ OC.L10N.register(
     "cookbook",
     {
     "Home" : "Tuis",
-    "Filter" : "Filter",
-    "Search" : "Soek",
     "Save changes" : "Bewaar veranderinge",
     "Loading…" : "Laai…",
     "Page not found" : "Blad nie gevind nie",
+    "Filter" : "Filter",
+    "Search" : "Soek",
     "Category" : "Kategorie",
     "Add" : "Voeg by",
     "Name" : "Naam",

l10n/af.json

@@ -1,10 +1,10 @@
 { "translations": {
     "Home" : "Tuis",
-    "Filter" : "Filter",
-    "Search" : "Soek",
     "Save changes" : "Bewaar veranderinge",
     "Loading…" : "Laai…",
     "Page not found" : "Blad nie gevind nie",
+    "Filter" : "Filter",
+    "Search" : "Soek",
     "Category" : "Kategorie",
     "Add" : "Voeg by",
     "Name" : "Naam",

l10n/ar.js

@@ -2,10 +2,10 @@ OC.L10N.register(
     "cookbook",
     {
     "Home" : "الرئيسية",
-    "Filter" : "فلتر",
-    "Search" : "البحث",
     "Save changes" : "حفظ التعديلات",
     "Loading…" : "التحميل جارٍ…",
+    "Filter" : "فلتر",
+    "Search" : "البحث",
     "Category" : "الفئة",
     "Uncategorized recipes" : "وصفات غير مصنفة",
     "Add" : "إضافة",

l10n/ar.json

@@ -1,9 +1,9 @@
 { "translations": {
     "Home" : "الرئيسية",
-    "Filter" : "فلتر",
-    "Search" : "البحث",
     "Save changes" : "حفظ التعديلات",
     "Loading…" : "التحميل جارٍ…",
+    "Filter" : "فلتر",
+    "Search" : "البحث",
     "Category" : "الفئة",
     "Uncategorized recipes" : "وصفات غير مصنفة",
     "Add" : "إضافة",

l10n/ast.js

@@ -2,11 +2,11 @@ OC.L10N.register(
     "cookbook",
     {
     "Home" : "Aniciu",
-    "Filter" : "Peñerar",
-    "Search" : "Search",
     "Save changes" : "Guardar camudancies",
     "Loading…" : "Cargando...",
     "Page not found" : "Nun s'alcontró la páxina",
+    "Filter" : "Peñerar",
+    "Search" : "Search",
     "Category" : "Estaya",
     "Add" : "Amestar",
     "Name" : "Nome",

l10n/ast.json

@@ -1,10 +1,10 @@
 { "translations": {
     "Home" : "Aniciu",
-    "Filter" : "Peñerar",
-    "Search" : "Search",
     "Save changes" : "Guardar camudancies",
     "Loading…" : "Cargando...",
     "Page not found" : "Nun s'alcontró la páxina",
+    "Filter" : "Peñerar",
+    "Search" : "Search",
     "Category" : "Estaya",
     "Add" : "Amestar",
     "Name" : "Nome",

l10n/bg.js

@@ -2,11 +2,11 @@ OC.L10N.register(
     "cookbook",
     {
     "Home" : "Начало",
-    "Filter" : "Филтър",
-    "Search" : "Търсене",
     "Save changes" : "Запиши промените",
     "Loading…" : "Зареждане…",
     "Page not found" : "Страницата не е намерена",
+    "Filter" : "Филтър",
+    "Search" : "Търсене",
     "Category" : "Категория",
     "Add" : "Добави",
     "Name" : "Име",

l10n/bg.json

@@ -1,10 +1,10 @@
 { "translations": {
     "Home" : "Начало",
-    "Filter" : "Филтър",
-    "Search" : "Търсене",
     "Save changes" : "Запиши промените",
     "Loading…" : "Зареждане…",
     "Page not found" : "Страницата не е намерена",
+    "Filter" : "Филтър",
+    "Search" : "Търсене",
     "Category" : "Категория",
     "Add" : "Добави",
     "Name" : "Име",

l10n/br.js

@@ -2,10 +2,10 @@ OC.L10N.register(
     "cookbook",
     {
     "Home" : "Degemer",
-    "Filter" : "Filtre",
-    "Search" : "Klask",
     "Save changes" : "Enrollañ ar cheñchamantoù",
     "Loading…" : "O Kargañ...",
+    "Filter" : "Filtre",
+    "Search" : "Klask",
     "Add" : "Ouzhpennañ",
     "Name" : "Anv",
     "Description" : "Diskrivadur",