Merge branch 'main' into List-the-letter-sound-correspondences-where-…

…a-letter-is-used-#1701

.github/pull_request_template.md

@@ -0,0 +1,16 @@
+<!-- Which issue does this PR address? -->
+Resolves #
+
+<!-- What is the purpose of this PR? -->
+
+
+### Technical Details
+<!-- Are there any key aspects of the implementation to highlight? -->
+
+### Testing Instructions
+<!-- How can the reviewer verify the functionality or fix introduced by this PR? Please provide steps. -->
+
+### Screenshots
+<!-- If this PR affects the UI, please include screenshots demonstrating the changes. -->
+
+<!-- Attribution: External code is properly credited. -->

FUNDING_SPLITS.csv

@@ -1,21 +1,21 @@
 ethereum_address,github_username,impact_percentage
-0x5D388Ec24Cc2C0C77458338696aa63AFB706A7b1,nya-elimu,46.99
-0xd46Cc93E3eE6a4fb532D9B48E95be7eD8f8f1DA0,jo-elimu,39.12
-0x342FaeB14127A79735144bbdC772AbB6b1bBe343,coderabbitai,2.76
-0x3965d420cde24fe00f742cb31257ca90e04556a7,tomaszsmy,1.05
-0x819e4F5E912abb36c8f6c03790e7508e03cc37a3,UmenR,0.99
-0x513DceE2929a6e0CD115fb65Ec926d6569d98aff,venkatesh2k3,0.67
-0x5367a6d4F5991327Bb20466684790e394bE000dE,Shubham-Vishwakarma,0.67
-0x0000000000000000000000000000000000000000,aschworer,0.64
-0x4709ebf314c6492d57f4c6d4f57357d5b2bb074e,vrudas,0.53
-0x6321286F9B73f427C72e1f9F1bC6b3d25eF06605,hhio618,0.51
-0x0000000000000000000000000000000000000000,urosht,0.50
-0x0000000000000000000000000000000000000000,SnehaHS65,0.42
-0x78888390AA08D9A25f3BDB8A1B35351D7c7F8a12,Bender-22,0.41
+0x5D388Ec24Cc2C0C77458338696aa63AFB706A7b1,nya-elimu,45.86
+0xd46Cc93E3eE6a4fb532D9B48E95be7eD8f8f1DA0,jo-elimu,39.06
+0x342FaeB14127A79735144bbdC772AbB6b1bBe343,coderabbitai,3.58
+0x3965d420cde24fe00f742cb31257ca90e04556a7,tomaszsmy,1.01
+0x819e4F5E912abb36c8f6c03790e7508e03cc37a3,UmenR,0.95
+0x513DceE2929a6e0CD115fb65Ec926d6569d98aff,venkatesh2k3,0.82
+0x5367a6d4F5991327Bb20466684790e394bE000dE,Shubham-Vishwakarma,0.64
+0x0000000000000000000000000000000000000000,aschworer,0.61
+0x4709ebf314c6492d57f4c6d4f57357d5b2bb074e,vrudas,0.59
+0x0000000000000000000000000000000000000000,SnehaHS65,0.50
+0x6321286F9B73f427C72e1f9F1bC6b3d25eF06605,hhio618,0.49
+0x0000000000000000000000000000000000000000,urosht,0.48
+0x78888390AA08D9A25f3BDB8A1B35351D7c7F8a12,Bender-22,0.39
 0x0000000000000000000000000000000000000000,alexander-kuruvilla,0.40
-0x914dBEe36BcAb63B2D15fAED08839Be43797b421,watr-sheep,0.33
-0x0000000000000000000000000000000000000000,eymaal,0.32
-0x38c19Bc91fC35f8bCAd07F177cC2F11098B1F3ff,vuriaval,0.31
-0x0000000000000000000000000000000000000000,jpatel3,0.31
-0x0000000000000000000000000000000000000000,Keerthi4308,0.30
-0x0000000000000000000000000000000000000000,SamehNoukary,0.25
+0x914dBEe36BcAb63B2D15fAED08839Be43797b421,watr-sheep,0.32
+0x0000000000000000000000000000000000000000,eymaal,0.30
+0x0000000000000000000000000000000000000000,jpatel3,0.29
+0x38c19Bc91fC35f8bCAd07F177cC2F11098B1F3ff,vuriaval,0.29
+0x0000000000000000000000000000000000000000,Keerthi4308,0.29
+0x0000000000000000000000000000000000000000,SamehNoukary,0.24

pom.xml

@@ -4,7 +4,7 @@
     <groupId>ai.elimu</groupId>
     <artifactId>webapp</artifactId>
     <packaging>war</packaging>
-    <version>2.4.31-SNAPSHOT</version>
+    <version>2.4.33-SNAPSHOT</version>
 
     <properties>
     	<java.version>17</java.version>

src/main/config/DEPLOY.md

@@ -114,7 +114,7 @@ Copy the content from [`webapp.xml`](./centos-stream-9/opt/jetty-base/webapps/we
 
 Start the `jetty` service:
 
-    systemctl jetty
+    systemctl start jetty
 
 > [!TIP]
 > To verify that everything has been configured correctly, you can run `cd /opt/jetty-base/; java -jar /opt/jetty-home-10.0.22/start.jar --list-config` and `systemctl status jetty`
@@ -139,7 +139,7 @@ Install MariaDB:
 
 Start the MariaDB service:
 
-    service mariadb start
+    systemctl start mariadb
 
 > [!TIP]
 > To verify that MariaDB is running, use this command: `systemctl status mariadb`
@@ -156,13 +156,13 @@ Secure your MariaDB installation:
 
     mariadb-secure-installation
 
-☑️ Set root password: ***
-🟪 Switch to unix_socket authentication [Y/n] n
-☑️ Change the root password? [Y/n] n
-☑️ Remove anonymous users? [Y/n] Y
-☑️ Disallow root login remotely? [Y/n] Y
-☑️ Remove test database and access to it? [Y/n] Y
-☑️ Reload privilege tables now? [Y/n] Y
+- ☑️ Set root password: ***
+- 🟪 Switch to unix_socket authentication [Y/n] n
+- 🟪 Change the root password? [Y/n] n
+- ☑️ Remove anonymous users? [Y/n] Y
+- ☑️ Disallow root login remotely? [Y/n] Y
+- ☑️ Remove test database and access to it? [Y/n] Y
+- ☑️ Reload privilege tables now? [Y/n] Y
 
 ### Make UTF-8 the Default Character Set
 

src/main/java/ai/elimu/service/storybook/StoryBookEPubService.java

@@ -0,0 +1,18 @@
+package ai.elimu.service.storybook;
+
+import org.springframework.stereotype.Service;
+
+import static java.util.Objects.isNull;
+
+@Service
+public class StoryBookEPubService {
+
+    public boolean isTableOfContentsFileHtmlLike(String fileName) {
+        if (isNull(fileName) || fileName.isBlank()) {
+            return false;
+        }
+
+        return fileName.endsWith(".xhtml") || fileName.endsWith(".html");
+    }
+
+}