From 53f6cd19faffeb37edcce03cf61f0ae1429504f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Delano=C3=AB?= Date: Thu, 18 Jun 2020 21:10:15 +0000 Subject: [PATCH 1/2] Add .gitlab-ci.yml --- .gitlab-ci.yml | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..54177ee --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,73 @@ +# This file is a template, and might need editing before it works on your project. +# Official framework image. Look for the different tagged releases at: +# https://hub.docker.com/r/library/php +image: php:latest + +# Pick zero or more services to be used on all builds. +# 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 + +variables: + MYSQL_DATABASE: project_name + MYSQL_ROOT_PASSWORD: secret + +# This folder is cached between builds +# http://docs.gitlab.com/ce/ci/yaml/README.html#cache +cache: + paths: + - vendor/ + - node_modules/ + +# This is a basic example for a gem or script which doesn't use +# services such as redis or postgres +before_script: + # Update packages + - apt-get update -yqq + # Prep for Node + - apt-get install gnupg -yqq + # Upgrade to Node 8 + - 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 + # Install php extensions + - 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 + # Install Composer and project dependencies. + - curl -sS https://getcomposer.org/installer | php + - php composer.phar install + # Install Node dependencies. + # comment this out if you don't have a node dependency + - npm install + # Copy over testing configuration. + # Don't forget to set the database config in .env.testing correctly + # DB_HOST=mysql + # DB_DATABASE=project_name + # DB_USERNAME=root + # DB_PASSWORD=secret + - cp .env.testing .env + # Run npm build + # 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 + # Generate an application key. Re-cache. + - php artisan key:generate + - php artisan config:cache + # Run database migrations. + - php artisan migrate + # Run database seed + - php artisan db:seed + +test: + script: + # run laravel tests + - 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 From b6143e67a8f05dee991c429b477d269906d783c8 Mon Sep 17 00:00:00 2001 From: Romulus21 Date: Thu, 2 Jul 2020 20:40:38 +0200 Subject: [PATCH 2/2] add meteo home board --- app/Http/Controllers/AutomationController.php | 19 +++++++ .../AutomaticLinksHome.vue} | 2 +- .../views/Automation/AutomaticMeteoHome.vue | 56 +++++++++++++++++++ resources/js/views/Home.vue | 8 ++- routes/api.php | 1 + 5 files changed, 82 insertions(+), 4 deletions(-) create mode 100644 app/Http/Controllers/AutomationController.php rename resources/js/views/{Domotics/DomoticHome.vue => Automation/AutomaticLinksHome.vue} (97%) create mode 100644 resources/js/views/Automation/AutomaticMeteoHome.vue diff --git a/app/Http/Controllers/AutomationController.php b/app/Http/Controllers/AutomationController.php new file mode 100644 index 0000000..a6c3592 --- /dev/null +++ b/app/Http/Controllers/AutomationController.php @@ -0,0 +1,19 @@ +requestAsync('GET', $url); + $response = $promise->wait(); + + return $response->getBody()->getContents(); + } +} diff --git a/resources/js/views/Domotics/DomoticHome.vue b/resources/js/views/Automation/AutomaticLinksHome.vue similarity index 97% rename from resources/js/views/Domotics/DomoticHome.vue rename to resources/js/views/Automation/AutomaticLinksHome.vue index bfbdcc3..bb74ff6 100644 --- a/resources/js/views/Domotics/DomoticHome.vue +++ b/resources/js/views/Automation/AutomaticLinksHome.vue @@ -15,7 +15,7 @@ + + diff --git a/resources/js/views/Home.vue b/resources/js/views/Home.vue index ade0f08..023380b 100644 --- a/resources/js/views/Home.vue +++ b/resources/js/views/Home.vue @@ -4,7 +4,8 @@
- + +
@@ -12,12 +13,13 @@ diff --git a/routes/api.php b/routes/api.php index 47453da..d53eb87 100644 --- a/routes/api.php +++ b/routes/api.php @@ -30,6 +30,7 @@ Route::middleware('auth:api')->group(function () { // '/friend-request' => 'FriendRequestController', ]); + Route::get('/automation/home', 'AutomationController@home'); Route::post('/images/users/{users}', 'ImageController@users'); Route::post('/images/memos/{memo}', 'ImageController@memos'); Route::patch('/to-do-lists/{toDoList}/to-do/{toDo}/change', 'ToDoController@changeOrder');