From 4acb6b66e118019f0046640746f81031dcde5b49 Mon Sep 17 00:00:00 2001 From: musta20 Date: Mon, 2 Dec 2024 05:36:35 +0200 Subject: [PATCH 1/2] fix all faling test --- database/migrations/2024_01_25_100443_create_stores_table.php | 4 ++-- docker-compose.yml => docker-compose.old.yml | 0 docker-compose-old.yaml => docker-compose.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename docker-compose.yml => docker-compose.old.yml (100%) rename docker-compose-old.yaml => docker-compose.yaml (99%) diff --git a/database/migrations/2024_01_25_100443_create_stores_table.php b/database/migrations/2024_01_25_100443_create_stores_table.php index 211fe228..7607c9e3 100644 --- a/database/migrations/2024_01_25_100443_create_stores_table.php +++ b/database/migrations/2024_01_25_100443_create_stores_table.php @@ -13,7 +13,7 @@ public function up(): void { Schema::create('stores', function (Blueprint $table) { - $socialMedia = [ + $socialMedia = json_encode( [ SocialMedia::FACEBOOK->value => '', SocialMedia::X->value => '', SocialMedia::INSTAGRAM->value => '', @@ -23,7 +23,7 @@ public function up(): void SocialMedia::TIKTOK->value => '', SocialMedia::TELEGRAM->value => '', - ]; + ]); $table->ulid('id')->primary(); $table->string('title'); diff --git a/docker-compose.yml b/docker-compose.old.yml similarity index 100% rename from docker-compose.yml rename to docker-compose.old.yml diff --git a/docker-compose-old.yaml b/docker-compose.yaml similarity index 99% rename from docker-compose-old.yaml rename to docker-compose.yaml index dd278a69..25810ec3 100644 --- a/docker-compose-old.yaml +++ b/docker-compose.yaml @@ -10,7 +10,7 @@ services: dockerfile: Dockerfile depends_on: - - app + - smt volumes: - ./:/var/www/vhost/smt/ - ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf @@ -29,7 +29,7 @@ services: - 'traefik.http.routers.${PROJECT_NAME}_nginx.priority=1' - 'traefik.docker.network=proxy' - app: + smt: container_name: "${PROJECT_NAME}_php" build: context: ./docker/php From 2a5aee63f6ed6eebd4f74ac90bd5cec15ba52f47 Mon Sep 17 00:00:00 2001 From: musta20 Date: Mon, 2 Dec 2024 03:38:44 +0000 Subject: [PATCH 2/2] Dusting --- .../migrations/2024_01_25_100443_create_stores_table.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/database/migrations/2024_01_25_100443_create_stores_table.php b/database/migrations/2024_01_25_100443_create_stores_table.php index 7607c9e3..538ae4cd 100644 --- a/database/migrations/2024_01_25_100443_create_stores_table.php +++ b/database/migrations/2024_01_25_100443_create_stores_table.php @@ -13,7 +13,7 @@ public function up(): void { Schema::create('stores', function (Blueprint $table) { - $socialMedia = json_encode( [ + $socialMedia = json_encode([ SocialMedia::FACEBOOK->value => '', SocialMedia::X->value => '', SocialMedia::INSTAGRAM->value => '', @@ -23,8 +23,8 @@ public function up(): void SocialMedia::TIKTOK->value => '', SocialMedia::TELEGRAM->value => '', - ]); - + ]); + $table->ulid('id')->primary(); $table->string('title'); $table->string('logo')->nullable();