From 3b74f7c90fbcefabd01743e339c39ff79d4410f5 Mon Sep 17 00:00:00 2001
From: Kenneth Ezekiel <88850771+KenEzekiel@users.noreply.github.com>
Date: Mon, 2 Oct 2023 17:25:13 +0700
Subject: [PATCH] feat: database connection
---
.env.example | 1 -
Dockerfile | 2 +-
{public => migrations/db}/files/img/film1.jpg | Bin
{public => migrations/db}/files/img/film10.jpg | Bin
{public => migrations/db}/files/img/film2.jpg | Bin
{public => migrations/db}/files/img/film3.jpg | Bin
{public => migrations/db}/files/img/film4.jpg | Bin
{public => migrations/db}/files/img/film5.jpg | Bin
{public => migrations/db}/files/img/film6.jpg | Bin
{public => migrations/db}/files/img/film7.jpg | Bin
{public => migrations/db}/files/img/film8.jpg | Bin
{public => migrations/db}/files/img/film9.jpg | Bin
{public => migrations/db}/files/trailer/film1.mp4 | Bin
{public => migrations/db}/files/trailer/film10.mp4 | Bin
{public => migrations/db}/files/trailer/film2.mp4 | Bin
{public => migrations/db}/files/trailer/film3.mp4 | Bin
{public => migrations/db}/files/trailer/film4.mp4 | Bin
{public => migrations/db}/files/trailer/film5.mp4 | Bin
{public => migrations/db}/files/trailer/film6.mp4 | Bin
{public => migrations/db}/files/trailer/film7.mp4 | Bin
{public => migrations/db}/files/trailer/film8.mp4 | Bin
{public => migrations/db}/files/trailer/film9.mp4 | Bin
{public => migrations/db}/wbd.sql | 0
php.ini | 4 +++-
src/base/BaseRepository.php | 2 --
src/base/BaseService.php | 9 ---------
src/database/DatabaseConnection.php | 2 +-
27 files changed, 5 insertions(+), 15 deletions(-)
rename {public => migrations/db}/files/img/film1.jpg (100%)
rename {public => migrations/db}/files/img/film10.jpg (100%)
rename {public => migrations/db}/files/img/film2.jpg (100%)
rename {public => migrations/db}/files/img/film3.jpg (100%)
rename {public => migrations/db}/files/img/film4.jpg (100%)
rename {public => migrations/db}/files/img/film5.jpg (100%)
rename {public => migrations/db}/files/img/film6.jpg (100%)
rename {public => migrations/db}/files/img/film7.jpg (100%)
rename {public => migrations/db}/files/img/film8.jpg (100%)
rename {public => migrations/db}/files/img/film9.jpg (100%)
rename {public => migrations/db}/files/trailer/film1.mp4 (100%)
rename {public => migrations/db}/files/trailer/film10.mp4 (100%)
rename {public => migrations/db}/files/trailer/film2.mp4 (100%)
rename {public => migrations/db}/files/trailer/film3.mp4 (100%)
rename {public => migrations/db}/files/trailer/film4.mp4 (100%)
rename {public => migrations/db}/files/trailer/film5.mp4 (100%)
rename {public => migrations/db}/files/trailer/film6.mp4 (100%)
rename {public => migrations/db}/files/trailer/film7.mp4 (100%)
rename {public => migrations/db}/files/trailer/film8.mp4 (100%)
rename {public => migrations/db}/files/trailer/film9.mp4 (100%)
rename {public => migrations/db}/wbd.sql (100%)
diff --git a/.env.example b/.env.example
index d2a7e27..7399ffc 100644
--- a/.env.example
+++ b/.env.example
@@ -1,3 +1,2 @@
-DB_HOST=localhost
nama=wbd
password=
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 9d5928c..81b2f1f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ RUN rm -f /etc/apt/apt.conf.d/docker-clean \
&& apt-get update \
&& apt install libxml2-dev -y
-RUN docker-php-ext-install pdo pdo_mysql soap
+RUN docker-php-ext-install pdo pdo_mysql
COPY ./php.ini /usr/local/etc/php/php.ini
RUN a2enmod rewrite
\ No newline at end of file
diff --git a/public/files/img/film1.jpg b/migrations/db/files/img/film1.jpg
similarity index 100%
rename from public/files/img/film1.jpg
rename to migrations/db/files/img/film1.jpg
diff --git a/public/files/img/film10.jpg b/migrations/db/files/img/film10.jpg
similarity index 100%
rename from public/files/img/film10.jpg
rename to migrations/db/files/img/film10.jpg
diff --git a/public/files/img/film2.jpg b/migrations/db/files/img/film2.jpg
similarity index 100%
rename from public/files/img/film2.jpg
rename to migrations/db/files/img/film2.jpg
diff --git a/public/files/img/film3.jpg b/migrations/db/files/img/film3.jpg
similarity index 100%
rename from public/files/img/film3.jpg
rename to migrations/db/files/img/film3.jpg
diff --git a/public/files/img/film4.jpg b/migrations/db/files/img/film4.jpg
similarity index 100%
rename from public/files/img/film4.jpg
rename to migrations/db/files/img/film4.jpg
diff --git a/public/files/img/film5.jpg b/migrations/db/files/img/film5.jpg
similarity index 100%
rename from public/files/img/film5.jpg
rename to migrations/db/files/img/film5.jpg
diff --git a/public/files/img/film6.jpg b/migrations/db/files/img/film6.jpg
similarity index 100%
rename from public/files/img/film6.jpg
rename to migrations/db/files/img/film6.jpg
diff --git a/public/files/img/film7.jpg b/migrations/db/files/img/film7.jpg
similarity index 100%
rename from public/files/img/film7.jpg
rename to migrations/db/files/img/film7.jpg
diff --git a/public/files/img/film8.jpg b/migrations/db/files/img/film8.jpg
similarity index 100%
rename from public/files/img/film8.jpg
rename to migrations/db/files/img/film8.jpg
diff --git a/public/files/img/film9.jpg b/migrations/db/files/img/film9.jpg
similarity index 100%
rename from public/files/img/film9.jpg
rename to migrations/db/files/img/film9.jpg
diff --git a/public/files/trailer/film1.mp4 b/migrations/db/files/trailer/film1.mp4
similarity index 100%
rename from public/files/trailer/film1.mp4
rename to migrations/db/files/trailer/film1.mp4
diff --git a/public/files/trailer/film10.mp4 b/migrations/db/files/trailer/film10.mp4
similarity index 100%
rename from public/files/trailer/film10.mp4
rename to migrations/db/files/trailer/film10.mp4
diff --git a/public/files/trailer/film2.mp4 b/migrations/db/files/trailer/film2.mp4
similarity index 100%
rename from public/files/trailer/film2.mp4
rename to migrations/db/files/trailer/film2.mp4
diff --git a/public/files/trailer/film3.mp4 b/migrations/db/files/trailer/film3.mp4
similarity index 100%
rename from public/files/trailer/film3.mp4
rename to migrations/db/files/trailer/film3.mp4
diff --git a/public/files/trailer/film4.mp4 b/migrations/db/files/trailer/film4.mp4
similarity index 100%
rename from public/files/trailer/film4.mp4
rename to migrations/db/files/trailer/film4.mp4
diff --git a/public/files/trailer/film5.mp4 b/migrations/db/files/trailer/film5.mp4
similarity index 100%
rename from public/files/trailer/film5.mp4
rename to migrations/db/files/trailer/film5.mp4
diff --git a/public/files/trailer/film6.mp4 b/migrations/db/files/trailer/film6.mp4
similarity index 100%
rename from public/files/trailer/film6.mp4
rename to migrations/db/files/trailer/film6.mp4
diff --git a/public/files/trailer/film7.mp4 b/migrations/db/files/trailer/film7.mp4
similarity index 100%
rename from public/files/trailer/film7.mp4
rename to migrations/db/files/trailer/film7.mp4
diff --git a/public/files/trailer/film8.mp4 b/migrations/db/files/trailer/film8.mp4
similarity index 100%
rename from public/files/trailer/film8.mp4
rename to migrations/db/files/trailer/film8.mp4
diff --git a/public/files/trailer/film9.mp4 b/migrations/db/files/trailer/film9.mp4
similarity index 100%
rename from public/files/trailer/film9.mp4
rename to migrations/db/files/trailer/film9.mp4
diff --git a/public/wbd.sql b/migrations/db/wbd.sql
similarity index 100%
rename from public/wbd.sql
rename to migrations/db/wbd.sql
diff --git a/php.ini b/php.ini
index df7a45b..9aab238 100644
--- a/php.ini
+++ b/php.ini
@@ -1,3 +1,5 @@
upload_max_filesize = 100M
-post_max_size = 100M
\ No newline at end of file
+post_max_size = 100M
+
+extension=pdo_mysql
\ No newline at end of file
diff --git a/src/base/BaseRepository.php b/src/base/BaseRepository.php
index 47c1df3..050a1da 100644
--- a/src/base/BaseRepository.php
+++ b/src/base/BaseRepository.php
@@ -101,8 +101,6 @@ abstract class BaseRepository
if ($isDesc) {
$sql .= " DESC";
- } else {
- $sql .= " ASC";
}
if ($pageSize && $pageNo) {
diff --git a/src/base/BaseService.php b/src/base/BaseService.php
index 796873a..348205f 100644
--- a/src/base/BaseService.php
+++ b/src/base/BaseService.php
@@ -4,18 +4,9 @@ namespace app\base;
abstract class BaseService
{
- protected static $instance;
protected $repository;
protected function __construct()
{
}
-
- public static function getInstance()
- {
- if (!isset(self::$instance)) {
- self::$instance = new static();
- }
- return self::$instance;
- }
}
diff --git a/src/database/DatabaseConnection.php b/src/database/DatabaseConnection.php
index 9302d26..842776b 100644
--- a/src/database/DatabaseConnection.php
+++ b/src/database/DatabaseConnection.php
@@ -12,7 +12,7 @@ class DatabaseConnection
private function __construct()
{
- $DB_HOST = $_ENV['DB_HOST'] ? $_ENV['DB_HOST'] : "db";
+ $DB_HOST = "db";
$DB_USERNAME = $_ENV['MYSQL_USER'];
$DB_PASSWORD = $_ENV['MYSQL_PASSWORD'];
$DB_NAME = $_ENV['MYSQL_DATABASE'];
--
GitLab