Merge pull request #33 from Muhammed-Rahif/beta

.github/workflows/playwright.yml

@@ -3,7 +3,6 @@ on:
   push:
     branches: [main, beta]
   pull_request:
-    branches: [main, beta]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}

.github/workflows/release.yml

@@ -28,5 +28,6 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TELEGRAM_BOT_ID: ${{ secrets.TELEGRAM_BOT_ID }}
           TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
+          TELEGRAM_BOT_API_KEY: ${{ secrets.TELEGRAM_BOT_API_KEY }}
         run: |
           yarn semantic-release

.gitignore

@@ -10,6 +10,7 @@
 
 # production
 /build
+/dist
 
 # misc
 .DS_Store
@@ -33,3 +34,5 @@ env.local
 /test-results/
 /playwright-report/
 /playwright/.cache/
+/dev-dist/
+scripts/telegram-bot/*.js

.prettierignore

@@ -2,4 +2,4 @@ node_modules
 android
 ios
 node_modules
-www
+www

CHANGELOG.md

@@ -1,48 +1,80 @@
-# 1.0.0 (2023-03-25)
+# [1.1.0-beta.6](https://github.com/Muhammed-Rahif/Islam/compare/v1.1.0-beta.5...v1.1.0-beta.6) (2023-03-29)
 
 
 ### Bug Fixes
 
-* **api:** perfomance improve ([8eb80d4](https://github.com/Muhammed-Rahif/Islam/commit/8eb80d4ed04e9332b7ba25f1891085efd6a4fc55))
-* **quran:** next chapter, prev chapter, to top buttons at end of chapter ([9b90137](https://github.com/Muhammed-Rahif/Islam/commit/9b90137306b275e37443ec75cc20da078c2dd84e))
-* **quran:** reading content issue ([6c16367](https://github.com/Muhammed-Rahif/Islam/commit/6c16367096b1443b0c8dbf1e1a6c98a6955f5343))
-* **quran:** remove scroll to top fab button ([283d130](https://github.com/Muhammed-Rahif/Islam/commit/283d130cabc2e5c45ea8875e94a5da60304dd8f4))
-* **quran:** scroll to last read delay ([13d541e](https://github.com/Muhammed-Rahif/Islam/commit/13d541ece94ff16b2755ec423841fc8948e1b056))
-* **quran:** search issue when in juzs section ([429eab8](https://github.com/Muhammed-Rahif/Islam/commit/429eab814c83627f8996e1b7be05e8f484f12a2c))
-* **quran:** type select visible after scrolled ([286a888](https://github.com/Muhammed-Rahif/Islam/commit/286a888d3d92906b55b4c73508235390c6992a0c))
-* **quran:** typo and margin ([3bc455d](https://github.com/Muhammed-Rahif/Islam/commit/3bc455dbbd116a03c253372628a7e7de2b7b47b4))
-* **quran:** view chapter last read scroll smooth ([3dbd4a7](https://github.com/Muhammed-Rahif/Islam/commit/3dbd4a767e88edbadef4fe5b2fac3a1e886f2826))
-* **scripts:** verify.sh updated ([d6e5c57](https://github.com/Muhammed-Rahif/Islam/commit/d6e5c5793a4fcf4c3ab881aceab32229aeab1008))
-* **scripts:** verify.sh updated ([d309e4a](https://github.com/Muhammed-Rahif/Islam/commit/d309e4a7d45e8bc10eee7ff711b25af13cd8030c))
-* **scripts:** verify.sh updated ([475a236](https://github.com/Muhammed-Rahif/Islam/commit/475a236b102c58e2bbef4347fbd77432680d7fa2))
-* **scripts:** verify.sh updated ([8e06eda](https://github.com/Muhammed-Rahif/Islam/commit/8e06eda24599c5823b94c29676eaa5a7c3b577ab))
-* **scripts:** verify.sh updated ([6fed20b](https://github.com/Muhammed-Rahif/Islam/commit/6fed20bfb0b1ece80b0ec1ac0b7484d06d3bac63))
-* **semantic-release:** add verify.sh script ([02e11d3](https://github.com/Muhammed-Rahif/Islam/commit/02e11d36daabbf22ccd14a93af01f28e44f47e8f))
-* **semantic-release:** gradle versioning not added to git commit ([869a571](https://github.com/Muhammed-Rahif/Islam/commit/869a57195faa820f383652860a91c4277972e871))
-* **semantic-release:** gradle versioning not added to git commit ([c03dd5a](https://github.com/Muhammed-Rahif/Islam/commit/c03dd5a4ea928adc774b57449e199c38c88f193e))
-* **semantic-release:** gradle versioning not added to git commit ([a6e1ebf](https://github.com/Muhammed-Rahif/Islam/commit/a6e1ebf9575e0f8ed024840e76fac1e72308cebf))
-* **semantic-release:** update config ([644ee20](https://github.com/Muhammed-Rahif/Islam/commit/644ee20033059aa6dc07e93650d5766470d26b9a))
-* **virtual-scroll:** performance improvement ([b087369](https://github.com/Muhammed-Rahif/Islam/commit/b087369ddea637ed1f59a3e99f67c75a9bb0d2b3))
+* **community:** telegram bot infinite running on CI beacuse of not stopping the bot ([568d512](https://github.com/Muhammed-Rahif/Islam/commit/568d5126b3720bd296b767cbbd3f164de071e480))
+* **community:** telegram bot infinite running on CI issue ([3561fd5](https://github.com/Muhammed-Rahif/Islam/commit/3561fd5edd7a36a6aa8b4fd7d6d50b87f5d39bb6))
+
+# [1.1.0-beta.5](https://github.com/Muhammed-Rahif/Islam/compare/v1.1.0-beta.4...v1.1.0-beta.5) (2023-03-29)
 
 
 ### Features
 
-* **api:** add retrying option for apis ([2c62fcc](https://github.com/Muhammed-Rahif/Islam/commit/2c62fccd0641c37d7cf943594c180370ab8bb415))
-* **component:** create 'motioncaret' component ([fcd9a14](https://github.com/Muhammed-Rahif/Islam/commit/fcd9a14c9b9e3b6f0dc10a3e779aa42a8d5cd105))
-* **font:** change font to 'Cabin' ([82c0c47](https://github.com/Muhammed-Rahif/Islam/commit/82c0c47c7cad857a828f4d237ea03158a596c776))
-* **font:** change font to ubuntu ([38d476d](https://github.com/Muhammed-Rahif/Islam/commit/38d476d6da2b223e525ec390b21690aee9e80163))
-* **quran:** add bismi pre for quran reading ([4e1e54b](https://github.com/Muhammed-Rahif/Islam/commit/4e1e54b21aa1f37f1b7671961f1c5157110a987e))
-* **quran:** add list chapters feature ([be62c1d](https://github.com/Muhammed-Rahif/Islam/commit/be62c1df64be83227208bb1cc1f90737225b0309))
-* **quran:** add view chapter reading feature ([b33a605](https://github.com/Muhammed-Rahif/Islam/commit/b33a6057b802b4426ea926b381deb9752aa5d03b))
-* **quran:** add view chapter translation feature ([033a1a0](https://github.com/Muhammed-Rahif/Islam/commit/033a1a0c185b9651ffbd46a72129871f00b54cae))
-* **quran:** continue from last read ([7619249](https://github.com/Muhammed-Rahif/Islam/commit/7619249cae04d52fd59750d4db4885943a8e0561))
-* **quran:** scroll to top fab btn ([a09adc9](https://github.com/Muhammed-Rahif/Islam/commit/a09adc9a619b0ddff7a8f66402472d02e5caf18f))
-* **quran:** search feature ([783da46](https://github.com/Muhammed-Rahif/Islam/commit/783da46f7d37fc93a9d6ea1b03f71a94cc684964))
-* **quran:** search feature in juzs selection ([5c7efec](https://github.com/Muhammed-Rahif/Islam/commit/5c7efec1cf236e99c92faee897672b3d46d76cc6))
-* **router:** add 'good-deeds' router tab ([d56fe9e](https://github.com/Muhammed-Rahif/Islam/commit/d56fe9ea43b476bdefde85926ae20f819257f8fe))
-* **router:** update quran router ([f03bd30](https://github.com/Muhammed-Rahif/Islam/commit/f03bd30f03380e90408dcb64d6e513fd00b6c22d))
-* **store:** add 'quranLastRead' store ([67ffd0b](https://github.com/Muhammed-Rahif/Islam/commit/67ffd0b5e49165718fc13409966dbcc67902fcd5))
-* **ui:** update ui quran page, add components ([db48663](https://github.com/Muhammed-Rahif/Islam/commit/db48663267b75f6492399ef61bedffa96e7692fa))
+* **quran:** add page no in reading section ([325034f](https://github.com/Muhammed-Rahif/Islam/commit/325034f25cad29da6cab607e2f0b826d4228fef8))
+
+# [1.1.0-beta.4](https://github.com/Muhammed-Rahif/Islam/compare/v1.1.0-beta.3...v1.1.0-beta.4) (2023-03-29)
+
+
+### Bug Fixes
+
+* **quran:** short page cant load next page, fixed by adding load more btn ([3dd5a2b](https://github.com/Muhammed-Rahif/Islam/commit/3dd5a2bd0a264b8aec69b5f974cfb3fff3295e63))
+
+# [1.1.0-beta.3](https://github.com/Muhammed-Rahif/Islam/compare/v1.1.0-beta.2...v1.1.0-beta.3) (2023-03-29)
+
+
+### Bug Fixes
+
+* **community:** telegram bot issue ([b2e2d95](https://github.com/Muhammed-Rahif/Islam/commit/b2e2d953af4ba704f87d4756f3e6858a4711ddcf))
+
+# [1.1.0-beta.2](https://github.com/Muhammed-Rahif/Islam/compare/v1.1.0-beta.1...v1.1.0-beta.2) (2023-03-29)
+
+
+### Bug Fixes
+
+* **deps:** update @ionic/react-router to 6.7.0 ([bce85dd](https://github.com/Muhammed-Rahif/Islam/commit/bce85dd60d2cc15fdbbfd644d6036c47f60e699c))
+
+# [1.1.0-beta.1](https://github.com/Muhammed-Rahif/Islam/compare/v1.0.0...v1.1.0-beta.1) (2023-03-29)
+
+
+### Bug Fixes
+
+* **api:** change api to pages method and infinite scroll to improve perfomance ([072595c](https://github.com/Muhammed-Rahif/Islam/commit/072595c11ec9bd28e8704cba4e5329952d2795b4))
+* **atom-state:** remove last read quran atom state ([abe3d3e](https://github.com/Muhammed-Rahif/Islam/commit/abe3d3ede8aab3978a71d6574f7a2a38d9be704c))
+* **community:** telegram bot success-release typescript compile issue ([bf70968](https://github.com/Muhammed-Rahif/Islam/commit/bf7096824c02f4a4e1bb82fc3bc35123a913007b))
+* **community:** telegram bot sucessCmd issue ([0c59617](https://github.com/Muhammed-Rahif/Islam/commit/0c5961753d729b15cf4364b879f9177746b930bc))
+* **community:** update telegram bot success-release message template ([0dda88e](https://github.com/Muhammed-Rahif/Islam/commit/0dda88eb5b3ae13b3054fc82b6815823120d180b))
+* **component:** make general settings saperate ([f57e996](https://github.com/Muhammed-Rahif/Islam/commit/f57e996bd3bfd1c0583ce94ea6e46655ad95225b))
+* **deps:** add typescript version ([9c6a313](https://github.com/Muhammed-Rahif/Islam/commit/9c6a31376f0f847a9cbcfc8cff57e24027afc0e7))
+* **quran:** add padding bottom; bottom items are not visible ([255d6f2](https://github.com/Muhammed-Rahif/Islam/commit/255d6f26007c8ce1462719062de06f1969851654))
+* **semantic-release:** update scripts\build\versioning.js ([c55df7c](https://github.com/Muhammed-Rahif/Islam/commit/c55df7cf269ad99fe3e258bdebd87be4ebaa7245))
+* **semantic-release:** update scripts\build\versioning.js ([540f595](https://github.com/Muhammed-Rahif/Islam/commit/540f595a978975193aac1a9dc444947d14baffc8))
+* **theme:** light or dark mode not applying when app loads ([39ce9de](https://github.com/Muhammed-Rahif/Islam/commit/39ce9deac07c41922266c074b1d9c644063f7e84))
+* **ui:** quran- reading and translation section update ([2135193](https://github.com/Muhammed-Rahif/Islam/commit/21351935d49ebe1f0bb10629dab14ea8645fa83c))
+* **ui:** verse no incorrect in reading section; translations api repeated loding ([b97ca1b](https://github.com/Muhammed-Rahif/Islam/commit/b97ca1b5b25094036629874eed4a984e1a7da27e))
+
+
+### Features
+
+* **font:** add more quran fonts ([5332d18](https://github.com/Muhammed-Rahif/Islam/commit/5332d181e943381e9f9ed7c608aa7c565a063b86))
+* **semantic-release:** telegram bot message ([0072cf5](https://github.com/Muhammed-Rahif/Islam/commit/0072cf5d4666e0a9133ef56487919b7a8cb07068))
+* **semantic-release:** update telegram bot message ([a258fef](https://github.com/Muhammed-Rahif/Islam/commit/a258fefd325ffa0cce749f717994055e2af74992))
+* **settings:** add components without functionalities ([85c66d4](https://github.com/Muhammed-Rahif/Islam/commit/85c66d4c554f8dab428851296eede7552501b833))
+* **settings:** dark and light mode ([5bffb5e](https://github.com/Muhammed-Rahif/Islam/commit/5bffb5e97153357486c42157396e96b82a126151))
+* **settings:** quran settings added with fonts ([2cf14de](https://github.com/Muhammed-Rahif/Islam/commit/2cf14deee88feaed9e4eebf00bbccb225e439ed0))
+
+
+### Performance Improvements
+
+* **quran:** quran list 'react-window' implement ([ec35ae2](https://github.com/Muhammed-Rahif/Islam/commit/ec35ae23958793de7e3ea427c25ac0335852dd09))
+* **vite:** integrate vite ([90c88b5](https://github.com/Muhammed-Rahif/Islam/commit/90c88b5a3dc353441f634906f6f6247e71a0191f))
+
+# [1.0.0-beta.2](https://github.com/Muhammed-Rahif/Islam/compare/v1.0.0-beta.1...v1.0.0-beta.2) (2023-03-25)
+
+
+### Features
+
+* **settings:** dark and light mode ([5bffb5e](https://github.com/Muhammed-Rahif/Islam/commit/5bffb5e97153357486c42157396e96b82a126151))
 
 # 1.0.0-beta.1 (2023-03-25)
 

android/app/build.gradle

@@ -7,7 +7,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "v1.0.0"
+        versionName "v1.1.0-beta.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

git-conventional-commits.yaml

@@ -38,6 +38,11 @@ convention:
       "font",
       "changelog",
       "playwright",
+      "vite",
+      "gitignore",
+      "atom-state",
+      "community",
+      "deps",
     ]
   releaseTagGlobPattern: v[0-9]*.[0-9]*.[0-9]*
 changelog:

public/index.html → index.html

@@ -13,9 +13,9 @@
   <meta name="format-detection" content="telephone=no" />
   <meta name="msapplication-tap-highlight" content="no" />
 
-  <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+  <link rel="manifest" href="/manifest.json" />
 
-  <link rel="shortcut icon" type="image/png" href="%PUBLIC_URL%/assets/icon/favicon.png" />
+  <link rel="shortcut icon" type="image/png" href="/assets/icon/favicon.png" />
 
   <!-- add to homescreen for ios -->
   <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -25,6 +25,8 @@
 
 <body>
   <div id="root"></div>
+
+  <script type="module" src="/src/index.tsx"></script>
 </body>
 
 </html>

ios/App/App.xcodeproj/project.pbxproj

@@ -350,7 +350,7 @@
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = v1.0.0;
+				MARKETING_VERSION = v1.1.0-beta.6;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = tech.rahif.islam;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -370,7 +370,7 @@
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = v1.0.0;
+				MARKETING_VERSION = v1.1.0-beta.6;
 				PRODUCT_BUNDLE_IDENTIFIER = tech.rahif.islam;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Islam",
-  "version": "1.0.1",
+  "version": "v1.1.0-beta.6",
   "private": true,
   "dependencies": {
     "@capacitor/android": "4.7.1",
@@ -10,36 +10,45 @@
     "@capacitor/ios": "4.7.1",
     "@capacitor/keyboard": "4.1.1",
     "@capacitor/status-bar": "4.1.1",
-    "@ionic/react": "^6.0.0",
-    "@ionic/react-router": "^6.0.0",
+    "@ionic/react": "^6.7.0",
+    "@ionic/react-router": "^6.7.0",
     "@tanstack/react-query": "^4.27.0",
     "@tanstack/react-query-devtools": "^4.27.0",
     "@testing-library/jest-dom": "^5.11.9",
     "@testing-library/react": "^13.3.0",
     "@testing-library/user-event": "^12.6.3",
     "@types/jest": "^26.0.20",
+    "@types/marked": "^4.0.8",
     "@types/node": "^12.19.15",
     "@types/react": "^18.0.17",
     "@types/react-dom": "^18.0.6",
     "@types/react-router": "^5.1.11",
     "@types/react-router-dom": "^5.1.7",
-    "@types/react-scroll-into-view-if-needed": "^2.1.1",
+    "@types/react-virtualized-auto-sizer": "^1.0.1",
+    "@types/react-window": "^1.8.5",
+    "@vitejs/plugin-react": "^3.1.0",
     "axios": "^1.3.4",
     "framer-motion": "^10.6.0",
     "history": "^4.9.0",
     "ionicons": "^7.0.0",
     "jotai": "^2.0.3",
+    "marked": "^4.3.0",
+    "minimist": "^1.2.8",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router": "^5.2.0",
     "react-router-dom": "^5.2.0",
-    "react-scripts": "^5.0.0",
     "react-virtuoso": "^4.1.0",
-    "semantic-release-telegram": "^1.6.2",
+    "react-window": "^1.8.8",
     "smooth-scroll-into-view-if-needed": "^2.0.0",
-    "typescript": "*",
+    "telegraf": "^4.12.2",
+    "typescript": "^5.0.2",
+    "vite": "^4.2.1",
+    "vite-plugin-pwa": "^0.14.6",
+    "vite-plugin-svgr": "^2.4.0",
+    "vite-tsconfig-paths": "^4.0.7",
     "web-vitals": "^0.2.4",
-    "workbox-background-sync": "^5.1.4",
+    "workbox-background-sync": "^6.5.4",
     "workbox-broadcast-update": "^5.1.4",
     "workbox-cacheable-response": "^6.5.4",
     "workbox-core": "^5.1.4",
@@ -49,15 +58,17 @@
     "workbox-precaching": "^5.1.4",
     "workbox-range-requests": "^6.5.4",
     "workbox-routing": "^5.1.4",
-    "workbox-strategies": "^5.1.4",
+    "workbox-strategies": "^6.5.4",
     "workbox-streams": "^5.1.4"
   },
   "scripts": {
-    "start": "react-scripts start",
-    "build": "react-scripts build",
-    "test": "react-scripts test --transformIgnorePatterns 'node_modules/(?!(@ionic/react|@ionic/react-router|@ionic/core|@stencil/core|ionicons)/)'",
-    "eject": "react-scripts eject",
-    "pretty": "prettier --write ."
+    "ionic:serve": "vite",
+    "ionic:build": "vite build",
+    "start": "vite",
+    "build": "vite build",
+    "serve": "vite preview",
+    "pretty": "prettier --write .",
+    "preview": "vite preview"
   },
   "eslintConfig": {
     "extends": [
@@ -89,6 +100,7 @@
     "@semantic-release/exec": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
     "@typescript-eslint/eslint-plugin": "^5.43.0",
+    "autoprefixer": "^10.4.14",
     "capacitor-set-version": "^2.0.13",
     "eslint": "^8.0.1",
     "eslint-config-prettier": "^8.7.0",
@@ -98,9 +110,10 @@
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-promise": "^6.0.0",
     "eslint-plugin-react": "^7.32.2",
+    "postcss": "^8.4.21",
     "prettier": "2.8.6",
-    "semantic-release": "^20.1.3",
+    "semantic-release": "^21.0.0",
     "tailwindcss": "^3.2.7"
   },
-  "description": "An Ionic project"
+  "description": "Quran, Hadiths, Sunnah and Dhikrs in one place!"
 }

postcss.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+  plugins: {
+    tailwindcss: {},
+    autoprefixer: {},
+  },
+}