diff --git a/README.md b/README.md index 34921ae..aba33de 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ You can now visit http://localhost:8081/ and start using it. 1. Clone this repository 2. Run ```docker build . -t vesica/alquran.cloud```. This will build an image with production dependencies only. -3. Run ```docker run -it -p 8081:8080 -v ($pwd)/.:/var/www vesica/alquran.cloud``` to spin up the built image. +3. Run ```docker run -it -p 8081:8080 -v $(pwd)/.:/var/www vesica/alquran.cloud``` to spin up the built image. 3. Run ```composer install``` to add development dependencies. 6. Make sure you have internet connectivity so the app can connect to https://api.alquran.cloud. 7. Open your browser and browse to http://localhost:8081/. diff --git a/html/public/css/alquran.cloud.css b/html/public/css/alquran.cloud.css index 67f0df5..1f5ca04 100644 --- a/html/public/css/alquran.cloud.css +++ b/html/public/css/alquran.cloud.css @@ -71,39 +71,31 @@ div.container { .ayah-number { width: 90%; height: 90%; - position: absolute; top: 0px; left: 0; z-index: 10; margin-top: 25%; margin-left: -20%; - font-size: 60%; } .ayah-number-2digit { width: 90%; height: 90%; - position: absolute; top: 0px; left: 0; right: 5px; z-index: 10; margin-top: 25%; - margin-right: 20%; - font-size: 60%; } .ayah-number-3digit { width: 90%; height: 90%; - position: absolute; top: 0px; right: 1px; left: 0; z-index: 10; margin-top: 25%; - margin-right: 20%; - font-size: 60%; } .ayahEditionName:first-letter { diff --git a/html/public/css/font-all.css b/html/public/css/font-all.css index 1840fcd..355b071 100644 --- a/html/public/css/font-all.css +++ b/html/public/css/font-all.css @@ -36,7 +36,7 @@ @font-face { font-family: 'Uthmani'; - src: url("//cdn.alquran.cloud/public/fonts/uthman_tn09.otf") format("opentype"); + src: url("//cdn.alquran.cloud/public/fonts/uthman_tn09_archive.otf") format("opentype"); } .font-uthmani { diff --git a/routes/ayah.php b/routes/ayah.php index 2f4b590..d0e0373 100644 --- a/routes/ayah.php +++ b/routes/ayah.php @@ -9,7 +9,7 @@ } else { $reference = '24:35'; } - $ayah = $this->client->AlQuranCloudApi->ayah($reference, 'quran-uthmani'); + $ayah = $this->client->AlQuranCloudApi->ayah($reference, 'quran-simple'); return $this->view->render($response, 'ayah.php', [ 'pageTitle' => 'Quran - Surah ' . $ayah->data->surah->englishName . ' Ayah ' . $ayah->data->numberInSurah . ' (' . $ayah->data->surah->number . ':' . $ayah->data->numberInSurah . ')', @@ -29,7 +29,7 @@ if ($request->getQueryParam('reference') !== null && $request->getQueryParam('reference') != '') { $reference = $request->getQueryParam('reference'); } - $ayah = $this->client->AlQuranCloudApi->ayah($reference, 'quran-uthmani'); + $ayah = $this->client->AlQuranCloudApi->ayah($reference, 'quran-simple'); return $this->view->render($response, 'ayah.php', [ 'pageTitle' => 'Quran - Surah ' . $ayah->data->surah->englishName . ' Ayah ' . $ayah->data->numberInSurah . ' (' . $ayah->data->surah->number . ':' . $ayah->data->numberInSurah . ')', 'metaDescription' => 'AlQuran Cloud', @@ -49,7 +49,7 @@ if ($request->getQueryParam('reference') !== null && $request->getQueryParam('reference') != '') { $reference = $request->getQueryParam('reference'); } - $ayah = $this->client->AlQuranCloudApi->ayah($reference, 'quran-uthmani'); + $ayah = $this->client->AlQuranCloudApi->ayah($reference, 'quran-simple'); return $this->view->render($response, 'ayah.php', [ 'pageTitle' => 'Quran - Surah ' . $ayah->data->surah->englishName . ' Ayah ' . $ayah->data->numberInSurah . ' (' . $ayah->data->surah->number . ':' . $ayah->data->numberInSurah . ')', 'metaDescription' => 'AlQuran Cloud', diff --git a/routes/juz.php b/routes/juz.php index 6b5bfc7..0332395 100644 --- a/routes/juz.php +++ b/routes/juz.php @@ -14,7 +14,7 @@ return $this->view->render($response, 'juz.php', [ 'pageTitle' => 'Quran - Juz 1', 'metaDescription' => 'AlQuran Cloud', - 'juz' => $this->client->AlQuranCloudApi->juz('1', 'quran-uthmani'), + 'juz' => $this->client->AlQuranCloudApi->juz('1', 'quran-simple'), 'editions' => [ 'editions' => $this->client->AlQuranCloudApi->editions(null, null, 'text'), ], @@ -24,7 +24,7 @@ $app->get('/juz/{reference}', function ($request, $response, $args) { $reference = $request->getAttribute('reference'); - $juz = $this->client->AlQuranCloudApi->juz($reference, 'quran-uthmani'); + $juz = $this->client->AlQuranCloudApi->juz($reference, 'quran-simple'); return $this->view->render($response, 'juz.php', [ 'pageTitle' => 'Quran - Juz ' . $juz->data->number, 'metaDescription' => 'AlQuran Cloud', @@ -40,7 +40,7 @@ $reference = $request->getAttribute('reference'); $edition = $request->getAttribute('edition'); - $juz = $this->client->AlQuranCloudApi->juz($reference, 'quran-uthmani'); + $juz = $this->client->AlQuranCloudApi->juz($reference, 'quran-simple'); $juzEdition = $this->client->AlQuranCloudApi->juz($reference, $edition); return $this->view->render($response, 'juz.php', [ 'pageTitle' => 'Quran - Juz ' . $juz->data->number . ' - ' . $juzEdition->data->edition->name, diff --git a/routes/quran.php b/routes/quran.php index 698a590..2306e4c 100644 --- a/routes/quran.php +++ b/routes/quran.php @@ -15,7 +15,7 @@ return $this->view->render($response, 'quran.php', [ 'pageTitle' => 'The Holy Quran', 'metaDescription' => 'A Complete Rendering and Recitation of the Quran', - 'quran' => $this->client->AlQuranCloudApi->quran('quran-uthmani'), + 'quran' => $this->client->AlQuranCloudApi->quran('quran-simple'), 'suwar' => $this->client->AlQuranCloudApi->surahs(), 'editions' => [ 'editions' => $this->client->AlQuranCloudApi->editions(null, null, 'text'), @@ -31,7 +31,7 @@ return $this->view->render($response, 'quran.php', [ 'pageTitle' => 'Al Quran Cloud', 'metaDescription' => 'AlQuran Cloud', - 'quran' => $this->client->AlQuranCloudApi->quran('quran-uthmani'), + 'quran' => $this->client->AlQuranCloudApi->quran('quran-simple'), 'suwar' => $this->client->AlQuranCloudApi->surahs(), 'quranEdition' => $this->client->AlQuranCloudApi->quran($edition), 'editions' => [ diff --git a/routes/surah.php b/routes/surah.php index 3189c4b..218f617 100644 --- a/routes/surah.php +++ b/routes/surah.php @@ -14,7 +14,7 @@ $app->get('/surah', function ($request, $response, $args) { - $surah = $this->client->AlQuranCloudApi->surah('1', 'quran-uthmani'); + $surah = $this->client->AlQuranCloudApi->surah('1', 'quran-simple'); return $this->view->render($response, 'surah.php', [ 'pageTitle' => 'Quran - Surah ' . $surah->data->englishName . ' (' . $surah->data->name. ')', @@ -31,7 +31,7 @@ $app->get('/surah/{reference}', function ($request, $response, $args) { $reference = $request->getAttribute('reference'); - $surah = $this->client->AlQuranCloudApi->surah($reference, 'quran-uthmani'); + $surah = $this->client->AlQuranCloudApi->surah($reference, 'quran-simple'); return $this->view->render($response, 'surah.php', [ 'pageTitle' => 'Quran - Surah ' . $surah->data->englishName . ' (' . $surah->data->name. ')', 'metaDescription' => 'AlQuran Cloud', @@ -48,7 +48,7 @@ $reference = $request->getAttribute('reference'); $edition = $request->getAttribute('edition'); - $surah = $this->client->AlQuranCloudApi->surah($reference, 'quran-uthmani'); + $surah = $this->client->AlQuranCloudApi->surah($reference, 'quran-simple'); return $this->view->render($response, 'surah.php', [ 'pageTitle' => 'Quran - Surah ' . $surah->data->englishName . ' (' . $surah->data->name. ')', 'metaDescription' => 'AlQuran Cloud', diff --git a/src/AlQuranCloud/Renderer/Ayah.php b/src/AlQuranCloud/Renderer/Ayah.php index 4dd9134..bd09cec 100644 --- a/src/AlQuranCloud/Renderer/Ayah.php +++ b/src/AlQuranCloud/Renderer/Ayah.php @@ -14,8 +14,9 @@ public static function renderAyahEndingInArabic($number) } else { $ayahNumber = 'ayah-number'; } - return '۝ - ' . + + return ' + ' . Generic::latinToArabicNumerals($number) . ' diff --git a/views/about.php b/views/about.php index 5fef6ee..ef47b32 100644 --- a/views/about.php +++ b/views/about.php @@ -3,7 +3,7 @@
- بِسْمِ اللهِ الرَّحْمٰنِ الرَّحِيْمِ + بِسْمِ ٱللّٰهِ الرَّحْمٰنِ الرَّحِيْمِ
@@ -42,7 +42,7 @@

- بِسْمِ اللهِ الرَّحْمٰنِ الرَّحِيْمِ + بِسْمِ ٱللّٰهِ الرَّحْمٰنِ الرَّحِيْمِ

@@ -53,7 +53,7 @@

- بِسْمِ اللهِ الرَّحْمٰنِ الرَّحِيْمِ + بِسْمِ ٱللّٰهِ الرَّحْمٰنِ الرَّحِيْمِ

@@ -65,7 +65,7 @@

- بِسْمِ اللهِ الرَّحْمٰنِ الرَّحِيْمِ + بِسْمِ ٱللّٰهِ الرَّحْمٰنِ الرَّحِيْمِ

@@ -77,7 +77,7 @@

- بِسْمِ اللهِ الرَّحْمٰنِ الرَّحِيْمِ + بِسْمِ ٱللّٰهِ الرَّحْمٰنِ الرَّحِيْمِ

@@ -89,7 +89,7 @@

- بِسْمِ اللهِ الرَّحْمٰنِ الرَّحِيْمِ + بِسْمِ ٱللّٰهِ الرَّحْمٰنِ الرَّحِيْمِ

@@ -101,7 +101,7 @@

- بِسْمِ اللهِ الرَّحْمٰنِ الرَّحِيْمِ + بِسْمِ ٱللّٰهِ الرَّحْمٰنِ الرَّحِيْمِ

@@ -113,7 +113,7 @@

- بِسْمِ اللهِ الرَّحْمٰنِ الرَّحِيْمِ + بِسْمِ ٱللّٰهِ الرَّحْمٰنِ الرَّحِيْمِ

@@ -125,7 +125,7 @@

- بِسْمِ اللهِ الرَّحْمٰنِ الرَّحِيْمِ + بِسْمِ ٱللّٰهِ الرَّحْمٰنِ الرَّحِيْمِ

diff --git a/views/ayah.php b/views/ayah.php index 0cb3735..090090b 100644 --- a/views/ayah.php +++ b/views/ayah.php @@ -6,7 +6,7 @@
- بِسْمِ اللهِ الرَّحْمٰنِ الرَّحِيْمِ + بِسْمِ ٱللّٰهِِ الرَّحْمٰنِ الرَّحِيْمِ