true
diff --git a/src/main/webapp/WEB-INF/jsp/content/letter/list.jsp b/src/main/webapp/WEB-INF/jsp/content/letter/list.jsp
index 58ea89c1c..4b2d53285 100644
--- a/src/main/webapp/WEB-INF/jsp/content/letter/list.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/letter/list.jsp
@@ -44,12 +44,12 @@
|
-
-
-
-
-
-
+
+
+
+
+
+
|
From 78f5e8cade64318c787716b3901e8a3f47059ed2 Mon Sep 17 00:00:00 2001
From: jo-elimu <1451036+jo-elimu@users.noreply.github.com>
Date: Sat, 24 Aug 2024 12:18:38 +0700
Subject: [PATCH 18/29] style: include all xmls in format check
#1728
---
pom.xml | 2 +-
src/main/webapp/WEB-INF/dispatcher-servlet.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index ae1e14fe8..9babf1668 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,9 +99,9 @@
- pom.xml
**/*.java
**/*.jsp
+ **/*.xml
true
diff --git a/src/main/webapp/WEB-INF/dispatcher-servlet.xml b/src/main/webapp/WEB-INF/dispatcher-servlet.xml
index 4800456c5..12a3e3d60 100644
--- a/src/main/webapp/WEB-INF/dispatcher-servlet.xml
+++ b/src/main/webapp/WEB-INF/dispatcher-servlet.xml
@@ -6,5 +6,5 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
-
+
From 01cda98e575eb810d0f8445c72da37784343b5c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nya=20=CE=9Elimu?=
Date: Sat, 24 Aug 2024 12:41:56 +0700
Subject: [PATCH 19/29] Update FUNDING_SPLITS.csv
https://github.com/elimu-ai/web3-wiki/issues/44
---
FUNDING_SPLITS.csv | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/FUNDING_SPLITS.csv b/FUNDING_SPLITS.csv
index 28f2af6c8..95b443426 100644
--- a/FUNDING_SPLITS.csv
+++ b/FUNDING_SPLITS.csv
@@ -1,21 +1,21 @@
ethereum_address,github_username,impact_percentage
-0x5D388Ec24Cc2C0C77458338696aa63AFB706A7b1,nya-elimu,45.86
-0xd46Cc93E3eE6a4fb532D9B48E95be7eD8f8f1DA0,jo-elimu,39.06
-0x342FaeB14127A79735144bbdC772AbB6b1bBe343,coderabbitai,3.58
-0x3965d420cde24fe00f742cb31257ca90e04556a7,tomaszsmy,1.01
-0x819e4F5E912abb36c8f6c03790e7508e03cc37a3,UmenR,0.95
+0x5D388Ec24Cc2C0C77458338696aa63AFB706A7b1,nya-elimu,45.57
+0xd46Cc93E3eE6a4fb532D9B48E95be7eD8f8f1DA0,jo-elimu,39.21
+0x342FaeB14127A79735144bbdC772AbB6b1bBe343,coderabbitai,3.69
+0x3965d420cde24fe00f742cb31257ca90e04556a7,tomaszsmy,1.00
+0x819e4F5E912abb36c8f6c03790e7508e03cc37a3,UmenR,0.94
0x513DceE2929a6e0CD115fb65Ec926d6569d98aff,venkatesh2k3,0.82
0x5367a6d4F5991327Bb20466684790e394bE000dE,Shubham-Vishwakarma,0.64
+0x4709ebf314c6492d57f4c6d4f57357d5b2bb074e,vrudas,0.62
0x0000000000000000000000000000000000000000,aschworer,0.61
-0x4709ebf314c6492d57f4c6d4f57357d5b2bb074e,vrudas,0.59
-0x0000000000000000000000000000000000000000,SnehaHS65,0.50
-0x6321286F9B73f427C72e1f9F1bC6b3d25eF06605,hhio618,0.49
+0x0000000000000000000000000000000000000000,SnehaHS65,0.49
+0x6321286F9B73f427C72e1f9F1bC6b3d25eF06605,hhio618,0.48
0x0000000000000000000000000000000000000000,urosht,0.48
-0x78888390AA08D9A25f3BDB8A1B35351D7c7F8a12,Bender-22,0.39
0x0000000000000000000000000000000000000000,alexander-kuruvilla,0.40
+0x78888390AA08D9A25f3BDB8A1B35351D7c7F8a12,Bender-22,0.39
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
+0x0000000000000000000000000000000000000000,Souvik-Cyclic,0.26
From a0ec5c272947e9a72d510a5cba65d1351c0b9f6c Mon Sep 17 00:00:00 2001
From: Souvik Kumar
Date: Sat, 24 Aug 2024 12:02:40 +0530
Subject: [PATCH 20/29] Update ethereum_address in funding_splits
---
FUNDING_SPLITS.csv | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/FUNDING_SPLITS.csv b/FUNDING_SPLITS.csv
index 95b443426..98cb7a361 100644
--- a/FUNDING_SPLITS.csv
+++ b/FUNDING_SPLITS.csv
@@ -18,4 +18,4 @@ ethereum_address,github_username,impact_percentage
0x0000000000000000000000000000000000000000,jpatel3,0.29
0x38c19Bc91fC35f8bCAd07F177cC2F11098B1F3ff,vuriaval,0.29
0x0000000000000000000000000000000000000000,Keerthi4308,0.29
-0x0000000000000000000000000000000000000000,Souvik-Cyclic,0.26
+0x22d83d2681c8F04877b60F907D8288f011b314F8,Souvik-Cyclic,0.26
From 1464b6318d767c90a6a03a3e4addd0cb8df2f30d Mon Sep 17 00:00:00 2001
From: jo-elimu <1451036+jo-elimu@users.noreply.github.com>
Date: Sat, 24 Aug 2024 14:27:01 +0700
Subject: [PATCH 21/29] style: clean up the pom file
---
pom.xml | 547 ++++++++++++++++++++++++++++----------------------------
1 file changed, 269 insertions(+), 278 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9babf1668..52c8d2203 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,14 +9,18 @@
17
UTF-8
- 2.0.73
- 5.6.15.Final
- 10.0.22
- 5.3.18
- 5.6.2
- 3.1.2
+ 2.0.73
+ 5.6.15.Final
+ 10.0.22
+ 5.3.18
+ 5.6.2
+ 3.1.2
+
+ webapp
+ http://localhost:8080/webapp
+
webapp-SNAPSHOT
@@ -36,7 +40,7 @@
org.apache.maven.plugins
- maven-compiler-plugin
+ maven-compiler-plugin
3.11.0
${java.version}
@@ -57,7 +61,7 @@
org.apache.maven.plugins
- maven-release-plugin
+ maven-release-plugin
3.1.1
@@ -130,19 +134,7 @@
-
- webapp
- http://localhost:8080/webapp
-
-
- GitHub
- https://github.com/orgs/elimu-ai/projects?query=is%3Aopen
-
-
- GitHub Actions
- https://github.com/elimu-ai/webapp/actions
-
scm:git:git@github.com:elimu-ai/webapp.git
scm:git:https://github.com/elimu-ai/webapp.git
@@ -279,7 +271,7 @@
org.apache.maven.plugins
- maven-war-plugin
+ maven-war-plugin
3.4.0
${basedir}/target/web.xml
@@ -298,284 +290,283 @@
-
-
- com.github.elimu-ai
- model
- model-${model.version}
-
-
-
- org.pmml4s
- pmml4s_3
- 1.0.1
-
-
-
- commons-fileupload
- commons-fileupload
-
- 1.4
-
-
-
-
- org.springframework
- spring-aspects
- ${spring.version}
-
-
- org.springframework
- spring-context
- ${spring.version}
-
-
- org.springframework
- spring-context-support
- ${spring.version}
-
-
- org.springframework
- spring-orm
- ${spring.version}
-
-
- org.springframework
- spring-oxm
- ${spring.version}
-
-
- org.springframework
- spring-web
- ${spring.version}
-
-
- org.springframework
- spring-webmvc
- ${spring.version}
-
-
-
-
- org.springframework.security
- spring-security-web
- ${spring.security.version}
-
-
- org.springframework.security
- spring-security-config
- ${spring.security.version}
-
-
- org.springframework.security
- spring-security-taglibs
- ${spring.security.version}
-
-
-
- com.github.scribejava
- scribejava-apis
- 8.3.3
-
-
- org.json
- json
- 20231013
-
+
+
+
+ com.github.elimu-ai
+ model
+ model-${model.version}
+
-
- org.apache.logging.log4j
- log4j-api
- 2.16.0
-
-
- org.apache.logging.log4j
- log4j-core
- 2.16.0
-
-
- org.apache.logging.log4j
- log4j-web
- 2.14.1
-
+
+
+ org.springframework
+ spring-aspects
+ ${spring.version}
+
+
+ org.springframework
+ spring-context
+ ${spring.version}
+
+
+ org.springframework
+ spring-context-support
+ ${spring.version}
+
+
+ org.springframework
+ spring-orm
+ ${spring.version}
+
+
+ org.springframework
+ spring-oxm
+ ${spring.version}
+
+
+ org.springframework
+ spring-web
+ ${spring.version}
+
+
+ org.springframework
+ spring-webmvc
+ ${spring.version}
+
-
- org.owasp.antisamy
- antisamy
- 1.7.6
-
+
+
+ org.springframework.security
+ spring-security-web
+ ${spring.security.version}
+
+
+ org.springframework.security
+ spring-security-config
+ ${spring.security.version}
+
+
+ org.springframework.security
+ spring-security-taglibs
+ ${spring.security.version}
+
-
- org.apache.httpcomponents.client5
- httpclient5
- 5.3.1
-
+
+
+ org.apache.logging.log4j
+ log4j-api
+ 2.16.0
+
+
+ org.apache.logging.log4j
+ log4j-core
+ 2.16.0
+
+
+ org.apache.logging.log4j
+ log4j-web
+ 2.16.0
+
-
- org.web3j
- core
- 5.0.0
-
+
+
+ commons-fileupload
+ commons-fileupload
+ 1.4
+
+
+ commons-lang
+ commons-lang
+ 2.6
+
+
+ commons-io
+ commons-io
+ 2.16.1
+
+
+ commons-validator
+ commons-validator
+ 1.9.0
+
+
+ org.apache.commons
+ commons-csv
+ 1.9.0
+
-
- org.aspectj
- aspectjweaver
- 1.9.22.1
-
+
+
+ org.pmml4s
+ pmml4s_3
+ 1.0.1
+
-
- javax.validation
- validation-api
- 2.0.1.Final
-
-
- org.hibernate.validator
- hibernate-validator
- 6.1.7.Final
-
+
+ com.github.scribejava
+ scribejava-apis
+ 8.3.3
+
+
+ org.json
+ json
+ 20231013
+
+
+ org.owasp.antisamy
+ antisamy
+ 1.7.6
+
-
- commons-lang
- commons-lang
- 2.6
-
-
- commons-io
- commons-io
- 2.16.1
-
-
- commons-validator
- commons-validator
- 1.9.0
-
-
- org.apache.commons
- commons-csv
- 1.9.0
-
+
+ org.apache.httpcomponents.client5
+ httpclient5
+ 5.3.1
+
-
- org.imgscalr
- imgscalr-lib
- 4.2
-
+
+ org.web3j
+ core
+ 5.0.0
+
-
- com.googlecode.soundlibs
- jlayer
- 1.0.1.4
-
-
- junit
- junit
-
-
-
+
+ org.aspectj
+ aspectjweaver
+ 1.9.22.1
+
-
- com.googlecode.soundlibs
- tritonus-share
- 0.3.7.4
-
+
+ org.imgscalr
+ imgscalr-lib
+ 4.2
+
-
- com.googlecode.soundlibs
- mp3spi
- 1.9.5.4
-
+
+
+ com.googlecode.soundlibs
+ jlayer
+ 1.0.1.4
+
+
+ junit
+ junit
+
+
+
+
+ com.googlecode.soundlibs
+ tritonus-share
+ 0.3.7.4
+
+
+ com.googlecode.soundlibs
+ mp3spi
+ 1.9.5.4
+
+
+ org.bitbucket.ijabz
+ jaudiotagger
+ 3.0.1
+
-
- com.googlecode.texhyphj
- texhyphj
- 1.2
-
+
+ com.googlecode.texhyphj
+ texhyphj
+ 1.2
+
-
- net.dongliu
- apk-parser
- 2.6.10
-
+
+ net.dongliu
+ apk-parser
+ 2.6.10
+
-
- org.hibernate
- hibernate-core
- ${hibernate.version}
-
-
- org.hibernate
- hibernate-entitymanager
- ${hibernate.version}
-
-
- org.hibernate
- hibernate-tools
- ${hibernate.version}
-
-
- javax.persistence
- javax.persistence-api
- 2.2
-
+
+ javax.servlet
+ jstl
+ 1.2
+
-
- javax.servlet
- jstl
- 1.2
-
+
+
+ org.hibernate
+ hibernate-core
+ ${hibernate.version}
+
+
+ org.hibernate
+ hibernate-entitymanager
+ ${hibernate.version}
+
+
+ org.hibernate
+ hibernate-tools
+ ${hibernate.version}
+
-
-
- org.bitbucket.ijabz
- jaudiotagger
- 3.0.1
-
+
+ org.hibernate.validator
+ hibernate-validator
+ 6.1.7.Final
+
+
+ javax.validation
+ validation-api
+ 2.0.1.Final
+
-
-
- javax.transaction
- jta
- 1.1
-
-
- org.hsqldb
- hsqldb
- 2.7.3
-
-
- mysql
- mysql-connector-java
- 8.0.30
-
-
- commons-dbcp
- commons-dbcp
- 1.4
-
+
+
+ javax.persistence
+ javax.persistence-api
+ 2.2
+
+
+ javax.transaction
+ jta
+ 1.1
+
+
+ org.hsqldb
+ hsqldb
+ 2.7.3
+
+
+ mysql
+ mysql-connector-java
+ 8.0.30
+
+
+ commons-dbcp
+ commons-dbcp
+ 1.4
+
-
-
- javax.servlet
- javax.servlet-api
- 4.0.1
- provided
-
-
- javax.servlet.jsp
- javax.servlet.jsp-api
- 2.3.3
- provided
-
-
- org.junit.jupiter
- junit-jupiter
- 5.10.3
- test
-
+
+
+ javax.servlet
+ javax.servlet-api
+ 4.0.1
+ provided
+
+
+ javax.servlet.jsp
+ javax.servlet.jsp-api
+ 2.3.3
+ provided
+
-
+
+
+ org.junit.jupiter
+ junit-jupiter
+ 5.10.3
+ test
+
org.mockito
mockito-core
From 505eb84fe9370ed238ce6f240a6ce1efd188a401 Mon Sep 17 00:00:00 2001
From: jo-elimu <1451036+jo-elimu@users.noreply.github.com>
Date: Sat, 24 Aug 2024 14:39:11 +0700
Subject: [PATCH 22/29] style: clean up the pom file
---
pom.xml | 6 ------
1 file changed, 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 52c8d2203..78e4f0d60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -450,12 +450,6 @@
com.googlecode.soundlibs
jlayer
1.0.1.4
-
-
- junit
- junit
-
-
com.googlecode.soundlibs
From 3bf8354f5868a4072124267b9b8cfd48ec6c43a4 Mon Sep 17 00:00:00 2001
From: jo-elimu <1451036+jo-elimu@users.noreply.github.com>
Date: Sat, 24 Aug 2024 14:52:51 +0700
Subject: [PATCH 23/29] refactor: adjust css for buttons
---
src/main/webapp/WEB-INF/jsp/admin/application/create.jsp | 2 +-
src/main/webapp/WEB-INF/jsp/admin/application/edit.jsp | 2 +-
src/main/webapp/WEB-INF/jsp/content/contributor/add-email.jsp | 2 +-
.../WEB-INF/jsp/content/contributor/edit-motivation.jsp | 2 +-
src/main/webapp/WEB-INF/jsp/content/contributor/edit-name.jsp | 2 +-
src/main/webapp/WEB-INF/jsp/content/emoji/create.jsp | 2 +-
src/main/webapp/WEB-INF/jsp/content/emoji/edit.jsp | 2 +-
src/main/webapp/WEB-INF/jsp/content/letter-sound/create.jsp | 2 +-
src/main/webapp/WEB-INF/jsp/content/letter-sound/edit.jsp | 4 ++--
src/main/webapp/WEB-INF/jsp/content/letter/create.jsp | 2 +-
src/main/webapp/WEB-INF/jsp/content/letter/edit.jsp | 2 +-
.../webapp/WEB-INF/jsp/content/multimedia/audio/create.jsp | 2 +-
.../webapp/WEB-INF/jsp/content/multimedia/image/create.jsp | 2 +-
src/main/webapp/WEB-INF/jsp/content/multimedia/image/edit.jsp | 2 +-
.../webapp/WEB-INF/jsp/content/multimedia/video/create.jsp | 2 +-
src/main/webapp/WEB-INF/jsp/content/multimedia/video/edit.jsp | 2 +-
src/main/webapp/WEB-INF/jsp/content/number/create.jsp | 2 +-
src/main/webapp/WEB-INF/jsp/content/number/edit.jsp | 2 +-
src/main/webapp/WEB-INF/jsp/content/sound/create.jsp | 2 +-
src/main/webapp/WEB-INF/jsp/content/sound/edit.jsp | 2 +-
.../webapp/WEB-INF/jsp/content/storybook/chapter/create.jsp | 2 +-
.../webapp/WEB-INF/jsp/content/storybook/create-from-epub.jsp | 2 +-
src/main/webapp/WEB-INF/jsp/content/storybook/create.jsp | 2 +-
src/main/webapp/WEB-INF/jsp/content/storybook/edit.jsp | 2 +-
.../webapp/WEB-INF/jsp/content/storybook/paragraph/create.jsp | 2 +-
.../webapp/WEB-INF/jsp/content/storybook/paragraph/edit.jsp | 2 +-
src/main/webapp/WEB-INF/jsp/content/word/create.jsp | 2 +-
src/main/webapp/WEB-INF/jsp/content/word/edit.jsp | 2 +-
src/main/webapp/static/css/styles.css | 4 +++-
29 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/src/main/webapp/WEB-INF/jsp/admin/application/create.jsp b/src/main/webapp/WEB-INF/jsp/admin/application/create.jsp
index a5e27672f..66df3075a 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/application/create.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/application/create.jsp
@@ -70,7 +70,7 @@
- |