From 0ff8a2cf42837f52eacda0e00413273b7631caed Mon Sep 17 00:00:00 2001 From: "p.belezov" Date: Wed, 31 Jan 2024 12:05:03 +0800 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=B3=D0=BB=D0=B0=D0=B2=D0=BD=D0=B0=D1=8F=20=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=86=D0=B0=20=D1=81=20=D0=B8=D0=BD=D1=84?= =?UTF-8?q?=D0=BE=D0=B9=20=D0=BF=D0=BE=20=D1=81=D1=82=D1=80=D0=B8=D0=BC?= =?UTF-8?q?=D0=B0=D0=BC,=20=D0=B8=D0=BD=D1=84=D0=B0=20=D0=BF=D0=BE=D0=B4?= =?UTF-8?q?=D1=82=D1=8F=D0=B3=D0=B8=D0=B2=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20?= =?UTF-8?q?=D0=B8=D0=B7=20=D0=91=D0=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...dexController.php => CaesarController.php} | 2 +- app/Http/Controllers/LinksController.php | 18 ++++ app/Http/Controllers/SchedulesController.php | 29 ++++++ app/Models/Game.php | 11 +++ app/Models/Link.php | 11 +++ app/Models/Schedule.php | 11 +++ app/Models/Weekdays.php | 11 +++ .../2024_01_30_063219_create_links_table.php | 29 ++++++ ...024_01_31_025117_create_weekdays_table.php | 28 ++++++ .../2024_01_31_025321_create_games_table.php | 27 ++++++ ...24_01_31_025427_create_schedules_table.php | 33 +++++++ package.json | 3 +- public/images/twitch.png | Bin 0 -> 8108 bytes resources/views/Schedule.vue | 85 ++++++++++++++++++ resources/views/Welcome.vue | 6 +- resources/views/caesar/Caesar.vue | 2 +- resources/views/welcome.blade.php | 2 +- routes/api_v1.php | 5 +- 18 files changed, 305 insertions(+), 8 deletions(-) rename app/Http/Controllers/Api/V1/{IndexController.php => CaesarController.php} (98%) create mode 100644 app/Http/Controllers/LinksController.php create mode 100644 app/Http/Controllers/SchedulesController.php create mode 100644 app/Models/Game.php create mode 100644 app/Models/Link.php create mode 100644 app/Models/Schedule.php create mode 100644 app/Models/Weekdays.php create mode 100644 database/migrations/2024_01_30_063219_create_links_table.php create mode 100644 database/migrations/2024_01_31_025117_create_weekdays_table.php create mode 100644 database/migrations/2024_01_31_025321_create_games_table.php create mode 100644 database/migrations/2024_01_31_025427_create_schedules_table.php create mode 100644 public/images/twitch.png create mode 100644 resources/views/Schedule.vue diff --git a/app/Http/Controllers/Api/V1/IndexController.php b/app/Http/Controllers/Api/V1/CaesarController.php similarity index 98% rename from app/Http/Controllers/Api/V1/IndexController.php rename to app/Http/Controllers/Api/V1/CaesarController.php index 4662793..6881c73 100644 --- a/app/Http/Controllers/Api/V1/IndexController.php +++ b/app/Http/Controllers/Api/V1/CaesarController.php @@ -6,7 +6,7 @@ namespace App\Http\Controllers\Api\V1; use App\Http\Controllers\Controller; -class IndexController extends Controller +class CaesarController extends Controller { public function index() { diff --git a/app/Http/Controllers/LinksController.php b/app/Http/Controllers/LinksController.php new file mode 100644 index 0000000..145d991 --- /dev/null +++ b/app/Http/Controllers/LinksController.php @@ -0,0 +1,18 @@ +getAll(); + } + + public function getAll(){ + $links = new Link(); + return $links->all(); + } +} diff --git a/app/Http/Controllers/SchedulesController.php b/app/Http/Controllers/SchedulesController.php new file mode 100644 index 0000000..8e693e4 --- /dev/null +++ b/app/Http/Controllers/SchedulesController.php @@ -0,0 +1,29 @@ +join('weekdays', "schedules.weekday_id", "=", "weekdays.weekday_id") + ->join("games", "schedules.game_id", "=", "games.game_id") + ->select("weekdays.weekday_name", "weekdays.current_date", "games.name", "schedules.stream_time") + ->get(); + return $finalSchedules; + } + + public function mmDate(){ + $minmaxDates = DB::table("weekdays") + ->select("weekdays.current_date")->where("weekday_id", "=", 1) + ->orWhere("weekday_id", "=", 7) + ->get(); + return $minmaxDates; + } +} diff --git a/app/Models/Game.php b/app/Models/Game.php new file mode 100644 index 0000000..d18a40f --- /dev/null +++ b/app/Models/Game.php @@ -0,0 +1,11 @@ +id('link_id'); + $table->text("link_name"); + $table->text("link"); + $table->text("image"); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('links'); + } +}; diff --git a/database/migrations/2024_01_31_025117_create_weekdays_table.php b/database/migrations/2024_01_31_025117_create_weekdays_table.php new file mode 100644 index 0000000..3f285f7 --- /dev/null +++ b/database/migrations/2024_01_31_025117_create_weekdays_table.php @@ -0,0 +1,28 @@ +id("weekday_id"); + $table->text("weekday_name"); + $table->date("current_date"); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('weekdays'); + } +}; diff --git a/database/migrations/2024_01_31_025321_create_games_table.php b/database/migrations/2024_01_31_025321_create_games_table.php new file mode 100644 index 0000000..5fc729f --- /dev/null +++ b/database/migrations/2024_01_31_025321_create_games_table.php @@ -0,0 +1,27 @@ +id("game_id"); + $table->text("name"); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('games'); + } +}; diff --git a/database/migrations/2024_01_31_025427_create_schedules_table.php b/database/migrations/2024_01_31_025427_create_schedules_table.php new file mode 100644 index 0000000..cfcb0e3 --- /dev/null +++ b/database/migrations/2024_01_31_025427_create_schedules_table.php @@ -0,0 +1,33 @@ +id("schedule_id"); + $table->foreignId("weekday_id")->constrained( + table: "weekdays", column: "weekday_id", indexName: "constraint_weekday_id" + ); + $table->foreignId("game_id")->constrained( + table: "games", column: "game_id", indexName: "constraint_game_id" + ); + $table->text("stream_time"); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('schedules'); + } +}; diff --git a/package.json b/package.json index 4bfc064..0208e13 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,8 @@ "type": "module", "scripts": { "dev": "vite", - "build": "vite build" + "build": "vite build", + "lara": "vite build && php artisan serve" }, "devDependencies": { "@vitejs/plugin-vue": "^5.0.3", diff --git a/public/images/twitch.png b/public/images/twitch.png new file mode 100644 index 0000000000000000000000000000000000000000..6631e8b4052803ff441f0a1e9702391181fac409 GIT binary patch literal 8108 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 literal 0 HcmV?d00001 diff --git a/resources/views/Schedule.vue b/resources/views/Schedule.vue new file mode 100644 index 0000000..23e3ef7 --- /dev/null +++ b/resources/views/Schedule.vue @@ -0,0 +1,85 @@ + + + + + diff --git a/resources/views/Welcome.vue b/resources/views/Welcome.vue index feb368e..1c96cb0 100644 --- a/resources/views/Welcome.vue +++ b/resources/views/Welcome.vue @@ -1,15 +1,15 @@ diff --git a/resources/views/caesar/Caesar.vue b/resources/views/caesar/Caesar.vue index 635e487..390955c 100644 --- a/resources/views/caesar/Caesar.vue +++ b/resources/views/caesar/Caesar.vue @@ -112,7 +112,7 @@ export default {