From 880ccdec3a6b11cf8546145baaf44e877ab5a502 Mon Sep 17 00:00:00 2001 From: Romulus21 Date: Thu, 6 Aug 2020 13:52:41 +0200 Subject: [PATCH 01/12] fix css owf purgecss --- .gitlab-ci.yml | 2 -- webpack.mix.js | 10 ++++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 70de1cf..1401df9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,8 +64,6 @@ before_script: - php artisan migrate # Run database seed - php artisan db:seed - only: - - master test: script: diff --git a/webpack.mix.js b/webpack.mix.js index e0ecfd9..9dee913 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -1,7 +1,7 @@ -const mix = require('laravel-mix'); +const mix = require('laravel-mix') const tailwindcss = require('tailwindcss') -require('laravel-mix-purgecss'); -require('laravel-mix-svg-vue'); +require('laravel-mix-purgecss') +require('laravel-mix-svg-vue') mix.js('resources/js/app.js', 'public/js') .svgVue() @@ -10,4 +10,6 @@ mix.js('resources/js/app.js', 'public/js') processCssUrls: false, postCss: [ tailwindcss('./tailwind.config.js') ], }) - .purgeCss({whitelistPatterns: [/-active$/, /-enter$/, /-leave-to$/, /show$/, /code$/, /pre$/, /blockquote$/]}); + .purgeCss({ + whitelistPatterns: [/-active$/, /-enter$/, /-leave-to$/, /show$/, /code$/, /pre$/, /blockquote$/, /owf/] + }) From 387c42ace93ac3b5417270f41346f7427989d1a6 Mon Sep 17 00:00:00 2001 From: Romulus21 Date: Thu, 6 Aug 2020 14:02:25 +0200 Subject: [PATCH 02/12] update laravel npm --- .gitlab-ci.yml | 1 + composer.lock | 60 +++++++++++++++++++++++++------------------------- package.json | 4 ++-- 3 files changed, 33 insertions(+), 32 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1401df9..4340000 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,7 @@ image: php:latest # Check out: http://docs.gitlab.com/ce/ci/docker/using_docker_images.html#what-is-a-service services: - mysql:latest + command: ["--default-authentication-plugin=mysql_native_password"] variables: MYSQL_DATABASE: portal diff --git a/composer.lock b/composer.lock index ed47b61..7838d32 100644 --- a/composer.lock +++ b/composer.lock @@ -1076,16 +1076,16 @@ }, { "name": "laravel/framework", - "version": "v7.22.4", + "version": "v7.23.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "30e851a2b3a2af73fba0b7f4fa22b04260db98e7" + "reference": "17cbce101f2fc78e61a6135861823563c7cfb50b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/30e851a2b3a2af73fba0b7f4fa22b04260db98e7", - "reference": "30e851a2b3a2af73fba0b7f4fa22b04260db98e7", + "url": "https://api.github.com/repos/laravel/framework/zipball/17cbce101f2fc78e61a6135861823563c7cfb50b", + "reference": "17cbce101f2fc78e61a6135861823563c7cfb50b", "shasum": "" }, "require": { @@ -1229,7 +1229,7 @@ "framework", "laravel" ], - "time": "2020-07-27T18:25:06+00:00" + "time": "2020-08-04T14:36:37+00:00" }, { "name": "laravel/passport", @@ -1899,16 +1899,16 @@ }, { "name": "nesbot/carbon", - "version": "2.37.0", + "version": "2.38.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "1f61206de973d67f36ce50f041c792ddac663c3e" + "reference": "d8f6a6a91d1eb9304527b040500f61923e97674b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/1f61206de973d67f36ce50f041c792ddac663c3e", - "reference": "1f61206de973d67f36ce50f041c792ddac663c3e", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d8f6a6a91d1eb9304527b040500f61923e97674b", + "reference": "d8f6a6a91d1eb9304527b040500f61923e97674b", "shasum": "" }, "require": { @@ -1923,7 +1923,7 @@ "kylekatarnls/multi-tester": "^2.0", "phpmd/phpmd": "^2.8", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^0.12.30", + "phpstan/phpstan": "^0.12.35", "phpunit/phpunit": "^7.5 || ^8.0", "squizlabs/php_codesniffer": "^3.4" }, @@ -1984,7 +1984,7 @@ "type": "tidelift" } ], - "time": "2020-07-28T06:04:54+00:00" + "time": "2020-08-04T19:12:46+00:00" }, { "name": "nikic/php-parser", @@ -3839,7 +3839,7 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -3915,7 +3915,7 @@ }, { "name": "symfony/polyfill-iconv", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", @@ -3992,7 +3992,7 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", @@ -4070,16 +4070,16 @@ }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe" + "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/bc6549d068d0160e0f10f7a5a23c7d1406b95ebe", - "reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/5dcab1bc7146cf8c1beaa4502a3d9be344334251", + "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251", "shasum": "" }, "require": { @@ -4151,11 +4151,11 @@ "type": "tidelift" } ], - "time": "2020-07-14T12:35:20+00:00" + "time": "2020-08-04T06:02:08+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", @@ -4236,7 +4236,7 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", @@ -4313,7 +4313,7 @@ }, { "name": "symfony/polyfill-php70", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php70.git", @@ -4390,7 +4390,7 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", @@ -4463,7 +4463,7 @@ }, { "name": "symfony/polyfill-php73", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", @@ -4539,7 +4539,7 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", @@ -5598,16 +5598,16 @@ }, { "name": "facade/ignition", - "version": "2.3.4", + "version": "2.3.5", "source": { "type": "git", "url": "https://github.com/facade/ignition.git", - "reference": "87335b120bc9652e4ee2bf285b7322a785211476" + "reference": "58dc4a8df3d41174c677a370b6779b694e4539e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/ignition/zipball/87335b120bc9652e4ee2bf285b7322a785211476", - "reference": "87335b120bc9652e4ee2bf285b7322a785211476", + "url": "https://api.github.com/repos/facade/ignition/zipball/58dc4a8df3d41174c677a370b6779b694e4539e7", + "reference": "58dc4a8df3d41174c677a370b6779b694e4539e7", "shasum": "" }, "require": { @@ -5666,7 +5666,7 @@ "laravel", "page" ], - "time": "2020-07-27T15:17:39+00:00" + "time": "2020-08-01T21:20:01+00:00" }, { "name": "facade/ignition-contracts", diff --git a/package.json b/package.json index c908d3b..e739a40 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "sass": "^1.26.10", "sass-loader": "^8.0.0", "vue": "^2.5.17", - "vue-router": "^3.3.4", + "vue-router": "^3.4.1", "vue-template-compiler": "^2.6.10", "vuex": "^3.5.1" }, @@ -40,6 +40,6 @@ "laravel-mix-svg-vue": "^0.2.6", "markdown-it": "^10.0.0", "markdown-it-checkbox": "^1.1.0", - "tailwindcss": "^1.6.0" + "tailwindcss": "^1.6.2" } } From 4f5a0c30f22976e883855422ed29703d5e472a8e Mon Sep 17 00:00:00 2001 From: Romulus21 Date: Thu, 6 Aug 2020 14:06:11 +0200 Subject: [PATCH 03/12] fix gitlabci --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4340000..d1304db 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,11 +7,11 @@ image: php:latest # Only needed when using a docker container to run your tests in. # Check out: http://docs.gitlab.com/ce/ci/docker/using_docker_images.html#what-is-a-service services: - - mysql:latest - command: ["--default-authentication-plugin=mysql_native_password"] + - mariadb:latest variables: MYSQL_DATABASE: portal + MYSQL_USER: root MYSQL_ROOT_PASSWORD: secret # This folder is cached between builds From 18085da9d4b646758210558fbfe7ea17345764cb Mon Sep 17 00:00:00 2001 From: Romulus21 Date: Thu, 6 Aug 2020 14:16:25 +0200 Subject: [PATCH 04/12] test gitlab ci mariadb --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d1304db..b2f07b6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,7 +31,7 @@ before_script: # Upgrade to Node 8 - curl -sL https://deb.nodesource.com/setup_10.x | bash - # Install dependencies - - apt-get install git nodejs libcurl4-gnutls-dev libicu-dev libmcrypt-dev libvpx-dev libjpeg-dev libpng-dev libxpm-dev zlib1g-dev libfreetype6-dev libxml2-dev libexpat1-dev libbz2-dev libgmp3-dev libldap2-dev unixodbc-dev libpq-dev libsqlite3-dev libaspell-dev libsnmp-dev libpcre3-dev libtidy-dev -yqq + - apt-get install git mariadb-server nodejs libcurl4-gnutls-dev libicu-dev libmcrypt-dev libvpx-dev libjpeg-dev libpng-dev libxpm-dev zlib1g-dev libfreetype6-dev libxml2-dev libexpat1-dev libbz2-dev libgmp3-dev libldap2-dev unixodbc-dev libpq-dev libsqlite3-dev libaspell-dev libsnmp-dev libpcre3-dev libtidy-dev -yqq #- apt-get install php-mbstring php-curl php-json php-intl php-gd php-xml php-zip php-bz2 -yqq # Install php extensions - docker-php-ext-install pdo pdo_mysql tokenizer xml pcntl curl json @@ -44,7 +44,7 @@ before_script: - php composer.phar install # Install Node dependencies. # comment this out if you don't have a node dependency - - npm install +# - npm install # Copy over testing configuration. # Don't forget to set the database config in .env.testing correctly # DB_HOST=mysql @@ -56,7 +56,7 @@ before_script: # comment this out if you don't have a frontend build # you can change this to to your frontend building script like # npm run build - - npm run dev +# - npm run dev # Generate an application key. Re-cache. - php artisan key:generate # - php artisan config:cache From 8b391a431230a0bc9ace89826209c19e4b310a89 Mon Sep 17 00:00:00 2001 From: Romulus21 Date: Thu, 6 Aug 2020 14:24:58 +0200 Subject: [PATCH 05/12] test gitlab ci mariadb --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2f07b6..5627ce4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,8 +31,9 @@ before_script: # Upgrade to Node 8 - curl -sL https://deb.nodesource.com/setup_10.x | bash - # Install dependencies - - apt-get install git mariadb-server nodejs libcurl4-gnutls-dev libicu-dev libmcrypt-dev libvpx-dev libjpeg-dev libpng-dev libxpm-dev zlib1g-dev libfreetype6-dev libxml2-dev libexpat1-dev libbz2-dev libgmp3-dev libldap2-dev unixodbc-dev libpq-dev libsqlite3-dev libaspell-dev libsnmp-dev libpcre3-dev libtidy-dev -yqq + - apt-get install git nodejs libcurl4-gnutls-dev libicu-dev libmcrypt-dev libvpx-dev libjpeg-dev libpng-dev libxpm-dev zlib1g-dev libfreetype6-dev libxml2-dev libexpat1-dev libbz2-dev libgmp3-dev libldap2-dev unixodbc-dev libpq-dev libsqlite3-dev libaspell-dev libsnmp-dev libpcre3-dev libtidy-dev -yqq #- apt-get install php-mbstring php-curl php-json php-intl php-gd php-xml php-zip php-bz2 -yqq + - apt-get install mariadb-server php-mysql # Install php extensions - docker-php-ext-install pdo pdo_mysql tokenizer xml pcntl curl json # - docker-php-ext-install mbstring intl gd xml bz2 opcache pdo_mysql curl json zip From 8e615d9c19fc70d08f0613469329019394fecc5f Mon Sep 17 00:00:00 2001 From: Romulus21 Date: Thu, 6 Aug 2020 14:28:30 +0200 Subject: [PATCH 06/12] test gitlab ci mariadb --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5627ce4..f8abe48 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ before_script: # Install dependencies - apt-get install git nodejs libcurl4-gnutls-dev libicu-dev libmcrypt-dev libvpx-dev libjpeg-dev libpng-dev libxpm-dev zlib1g-dev libfreetype6-dev libxml2-dev libexpat1-dev libbz2-dev libgmp3-dev libldap2-dev unixodbc-dev libpq-dev libsqlite3-dev libaspell-dev libsnmp-dev libpcre3-dev libtidy-dev -yqq #- apt-get install php-mbstring php-curl php-json php-intl php-gd php-xml php-zip php-bz2 -yqq - - apt-get install mariadb-server php-mysql + - apt-get install mariadb-server php7.4-mysql # Install php extensions - docker-php-ext-install pdo pdo_mysql tokenizer xml pcntl curl json # - docker-php-ext-install mbstring intl gd xml bz2 opcache pdo_mysql curl json zip From 684130322fa702006eefa1d9f2078ab491db46d5 Mon Sep 17 00:00:00 2001 From: Romulus21 Date: Thu, 6 Aug 2020 14:31:18 +0200 Subject: [PATCH 07/12] test gitlab ci mariadb --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f8abe48..aee85e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,9 +33,9 @@ before_script: # Install dependencies - apt-get install git nodejs libcurl4-gnutls-dev libicu-dev libmcrypt-dev libvpx-dev libjpeg-dev libpng-dev libxpm-dev zlib1g-dev libfreetype6-dev libxml2-dev libexpat1-dev libbz2-dev libgmp3-dev libldap2-dev unixodbc-dev libpq-dev libsqlite3-dev libaspell-dev libsnmp-dev libpcre3-dev libtidy-dev -yqq #- apt-get install php-mbstring php-curl php-json php-intl php-gd php-xml php-zip php-bz2 -yqq - - apt-get install mariadb-server php7.4-mysql + - apt-get install mariadb-server # Install php extensions - - docker-php-ext-install pdo pdo_mysql tokenizer xml pcntl curl json + - docker-php-ext-install pdo pdo_mysql tokenizer xml pcntl curl json php-mysql # - docker-php-ext-install mbstring intl gd xml bz2 opcache pdo_mysql curl json zip # Install & enable Xdebug for code coverage reports - pecl install xdebug From 5693e752c708ea4eaa2965c1ff9f988855cf2124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Delano=C3=AB?= Date: Thu, 6 Aug 2020 12:34:07 +0000 Subject: [PATCH 08/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aee85e5..22b98b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ before_script: # Install dependencies - apt-get install git nodejs libcurl4-gnutls-dev libicu-dev libmcrypt-dev libvpx-dev libjpeg-dev libpng-dev libxpm-dev zlib1g-dev libfreetype6-dev libxml2-dev libexpat1-dev libbz2-dev libgmp3-dev libldap2-dev unixodbc-dev libpq-dev libsqlite3-dev libaspell-dev libsnmp-dev libpcre3-dev libtidy-dev -yqq #- apt-get install php-mbstring php-curl php-json php-intl php-gd php-xml php-zip php-bz2 -yqq - - apt-get install mariadb-server + - apt-get install mariadb-server -yqq # Install php extensions - docker-php-ext-install pdo pdo_mysql tokenizer xml pcntl curl json php-mysql # - docker-php-ext-install mbstring intl gd xml bz2 opcache pdo_mysql curl json zip From 9bd71b8b56d5bb10a163bad446951669712b84cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Delano=C3=AB?= Date: Thu, 6 Aug 2020 12:38:51 +0000 Subject: [PATCH 09/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 22b98b5..52b27c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,9 +10,10 @@ services: - mariadb:latest variables: - MYSQL_DATABASE: portal - MYSQL_USER: root - MYSQL_ROOT_PASSWORD: secret + MYSQL_DATABASE: "portal" + MYSQL_USER: "root" + MYSQL_PASSWORD: "app" + MYSQL_ROOT_PASSWORD: "secret" # This folder is cached between builds # http://docs.gitlab.com/ce/ci/yaml/README.html#cache @@ -35,7 +36,7 @@ before_script: #- apt-get install php-mbstring php-curl php-json php-intl php-gd php-xml php-zip php-bz2 -yqq - apt-get install mariadb-server -yqq # Install php extensions - - docker-php-ext-install pdo pdo_mysql tokenizer xml pcntl curl json php-mysql + - docker-php-ext-install pdo pdo_mysql tokenizer xml pcntl curl json # - docker-php-ext-install mbstring intl gd xml bz2 opcache pdo_mysql curl json zip # Install & enable Xdebug for code coverage reports - pecl install xdebug From 1c46c47de31f28921d6248c80b087b890517c06f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Delano=C3=AB?= Date: Thu, 6 Aug 2020 12:50:10 +0000 Subject: [PATCH 10/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 52b27c7..e8af014 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,13 +7,11 @@ image: php:latest # Only needed when using a docker container to run your tests in. # Check out: http://docs.gitlab.com/ce/ci/docker/using_docker_images.html#what-is-a-service services: - - mariadb:latest + - mysql:latest variables: - MYSQL_DATABASE: "portal" - MYSQL_USER: "root" - MYSQL_PASSWORD: "app" - MYSQL_ROOT_PASSWORD: "secret" + MYSQL_DATABASE: portal + MYSQL_ROOT_PASSWORD: secret # This folder is cached between builds # http://docs.gitlab.com/ce/ci/yaml/README.html#cache @@ -30,14 +28,11 @@ before_script: # Prep for Node - apt-get install gnupg -yqq # Upgrade to Node 8 - - curl -sL https://deb.nodesource.com/setup_10.x | bash - + - curl -sL https://deb.nodesource.com/setup_8.x | bash - # Install dependencies - apt-get install git nodejs libcurl4-gnutls-dev libicu-dev libmcrypt-dev libvpx-dev libjpeg-dev libpng-dev libxpm-dev zlib1g-dev libfreetype6-dev libxml2-dev libexpat1-dev libbz2-dev libgmp3-dev libldap2-dev unixodbc-dev libpq-dev libsqlite3-dev libaspell-dev libsnmp-dev libpcre3-dev libtidy-dev -yqq - #- apt-get install php-mbstring php-curl php-json php-intl php-gd php-xml php-zip php-bz2 -yqq - - apt-get install mariadb-server -yqq # Install php extensions - - docker-php-ext-install pdo pdo_mysql tokenizer xml pcntl curl json -# - docker-php-ext-install mbstring intl gd xml bz2 opcache pdo_mysql curl json zip + - docker-php-ext-install mbstring pdo_mysql curl json intl gd xml zip bz2 opcache # Install & enable Xdebug for code coverage reports - pecl install xdebug - docker-php-ext-enable xdebug @@ -46,7 +41,7 @@ before_script: - php composer.phar install # Install Node dependencies. # comment this out if you don't have a node dependency -# - npm install + # - npm install # Copy over testing configuration. # Don't forget to set the database config in .env.testing correctly # DB_HOST=mysql @@ -58,11 +53,10 @@ before_script: # comment this out if you don't have a frontend build # you can change this to to your frontend building script like # npm run build -# - npm run dev + # - npm run dev # Generate an application key. Re-cache. - php artisan key:generate -# - php artisan config:cache - - php artisan optimize + - php artisan config:cache # Run database migrations. - php artisan migrate # Run database seed @@ -71,9 +65,9 @@ before_script: test: script: # run laravel tests - - php artisan test + - php vendor/bin/phpunit --coverage-text --colors=never # run frontend tests # if you have any task for testing frontend # set it in your package.json script # comment this out if you don't have a frontend test -# - npm test + - npm test From 816364a305f123656bcaf73a48d540bd3a9bf078 Mon Sep 17 00:00:00 2001 From: Romulus21 Date: Sat, 8 Aug 2020 15:06:38 +0200 Subject: [PATCH 11/12] add order buttons --- resources/js/views/Memo/MemoIndex.vue | 34 +++++++++++++++++++++++---- resources/sass/components/_btn.scss | 14 +++++++++++ 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/resources/js/views/Memo/MemoIndex.vue b/resources/js/views/Memo/MemoIndex.vue index 4f1d0cb..596af91 100755 --- a/resources/js/views/Memo/MemoIndex.vue +++ b/resources/js/views/Memo/MemoIndex.vue @@ -1,7 +1,17 @@