Merge branch '3.0' of https://git.steelants.cz/SH/PHP_SMART_HOME_V3 into 3.0

.gitignore

@@ -12,3 +12,8 @@ Homestead.yaml
 npm-debug.log
 yarn-error.log
 .idea/
+
+
+
+
+.vscode

composer.json

@@ -18,7 +18,6 @@
     "require-dev": {
         "facade/ignition": "^2.5",
         "fakerphp/faker": "^1.9.1",
-        "laravel/sail": "^1.0.1",
         "mockery/mockery": "^1.4.2",
         "nunomaduro/collision": "^5.0",
         "phpunit/phpunit": "^9.3.3"

database/migrations/2021_01_07_183923_create_rooms_table.php

@@ -19,6 +19,7 @@ class CreateRoomsTable extends Migration
             $table->int('owner_id');  //TODO: Foregin key to user Table
             $table->boolval('default');
             $table->timestamps();
+            $table->forgein('owner_id')->references('user_id')->on('users');
         });
     }
 

database/migrations/2021_01_07_184250_create_devices_table.php

@@ -16,19 +16,21 @@ class CreateDevicesTable extends Migration
         Schema::create('devices', function (Blueprint $table) {
             $table->id()->unique();
             $table->int('room_id'); //TODO: Foregin key to Room Table
-            $table->string('type');
-            $table->string('token')->unique();
-            $table->datetime('heartbeat')
-            $table->string('mac');
-            $table->string('firmware_hash');
-            $table->string('ip_address')->unique();
-            $table->string('sleep_time');
             $table->string('owner_id'); //TODO: Foregin key to user Table
+            $table->string('token')->unique();
             $table->boolval('approved');
-            $table->string('icon');
-            $table->string('command');
             $table->string('name')->unique();
             $table->string('description')->nullable();
+            $table->string('type');
+            $table->string('icon');
+            $table->string('mac_address');
+            $table->string('ip_address')->unique();
+            $table->string('firmware_hash');
+            $table->string('sleep_time');
+            $table->datetime('heartbeat');
+            $table->string('command');
+            $table->forgein('owner_id')->references('user_id')->on('users');
+            $table->forgein('room_id')->references('room_id')->on('rooms');
             $table->timestamps();
         });
     }

docker-compose.yml

@@ -1,72 +0,0 @@
-# For more information: https://laravel.com/docs/sail
-version: '3'
-services:
-    laravel.test:
-        build:
-            context: ./vendor/laravel/sail/runtimes/8.0
-            dockerfile: Dockerfile
-            args:
-                WWWGROUP: '${WWWGROUP}'
-        image: sail-8.0/app
-        ports:
-            - '${APP_PORT:-80}:80'
-        environment:
-            WWWUSER: '${WWWUSER}'
-            LARAVEL_SAIL: 1
-        volumes:
-            - '.:/var/www/html'
-        networks:
-            - sail
-        depends_on:
-            - mysql
-            - redis
-            # - selenium
-    # selenium:
-    #     image: 'selenium/standalone-chrome'
-    #     volumes:
-    #         - '/dev/shm:/dev/shm'
-    #     networks:
-    #         - sail
-    mysql:
-        image: 'mysql:8.0'
-        ports:
-            - '${FORWARD_DB_PORT:-3306}:3306'
-        environment:
-            MYSQL_ROOT_PASSWORD: '${DB_PASSWORD}'
-            MYSQL_DATABASE: '${DB_DATABASE}'
-            MYSQL_USER: '${DB_USERNAME}'
-            MYSQL_PASSWORD: '${DB_PASSWORD}'
-            MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
-        volumes:
-            - 'sailmysql:/var/lib/mysql'
-        networks:
-            - sail
-    redis:
-        image: 'redis:alpine'
-        ports:
-            - '${FORWARD_REDIS_PORT:-6379}:6379'
-        volumes:
-            - 'sailredis:/data'
-        networks:
-            - sail
-    # memcached:
-    #     image: 'memcached:alpine'
-    #     ports:
-    #         - '11211:11211'
-    #     networks:
-    #         - sail
-    mailhog:
-        image: 'mailhog/mailhog:latest'
-        ports:
-            - 1025:1025
-            - 8025:8025
-        networks:
-            - sail
-networks:
-    sail:
-        driver: bridge
-volumes:
-    sailmysql:
-        driver: local
-    sailredis:
-        driver: local