Skip to content

Commit

Permalink
Removes Top contributor section and controller code (#1978)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Souvik-Cyclic
Souvik-Cyclic authored Feb 4, 2025
2 parents 4a6dc5c + d3a3c0d commit f2739b6
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 205 deletions.
85 changes: 17 additions & 68 deletions src/main/java/ai/elimu/web/content/MainContentController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,65 +35,50 @@
@Controller
@RequestMapping("/content")
public class MainContentController {

private final Logger logger = LogManager.getLogger();

@Autowired
private LetterDao letterDao;

@Autowired
private SoundDao soundDao;

@Autowired
private LetterSoundDao letterSoundDao;

@Autowired
private NumberDao numberDao;

@Autowired
private SyllableDao syllableDao;

@Autowired
private WordDao wordDao;

@Autowired
private EmojiDao emojiDao;

@Autowired
private StoryBookDao storyBookDao;

@Autowired
private AudioDao audioDao;

@Autowired
private ImageDao imageDao;

@Autowired
private VideoDao videoDao;

@Autowired
private StoryBookContributionEventDao storyBookContributionEventDao;

@Autowired
private AudioContributionEventDao audioContributionEventDao;

@Autowired
private WordContributionEventDao wordContributionEventDao;

@Autowired
private NumberContributionEventDao numberContributionEventDao;

@Autowired
private ContributorDao contributorDao;

@RequestMapping(method = RequestMethod.GET)
public String handleRequest(
HttpServletRequest request,
HttpSession session,
Principal principal,
HttpServletRequest request,
HttpSession session,
Principal principal,
Model model) {
logger.info("handleRequest");

model.addAttribute("letterCount", letterDao.readCount());
model.addAttribute("soundCount", soundDao.readCount());
model.addAttribute("letterSoundCount", letterSoundDao.readCount());
Expand All @@ -105,43 +90,7 @@ public String handleRequest(
model.addAttribute("audioCount", audioDao.readCount());
model.addAttribute("imageCount", imageDao.readCount());
model.addAttribute("videoCount", videoDao.readCount());

List<Contributor> contributorsWithStoryBookContributions = contributorDao.readAllWithStoryBookContributions();
logger.info("contributorsWithStoryBookContributions.size(): " + contributorsWithStoryBookContributions.size());
model.addAttribute("contributorsWithStoryBookContributions", contributorsWithStoryBookContributions);
Map<Long, Long> storyBookContributionsCountMap = new HashMap<>();
for (Contributor contributorWithContributions : contributorsWithStoryBookContributions) {
storyBookContributionsCountMap.put(contributorWithContributions.getId(), storyBookContributionEventDao.readCount(contributorWithContributions));
}
model.addAttribute("storyBookContributionsCountMap", storyBookContributionsCountMap);

List<Contributor> contributorsWithAudioContributions = contributorDao.readAllWithAudioContributions();
logger.info("contributorsWithAudioContributions.size(): " + contributorsWithAudioContributions.size());
model.addAttribute("contributorsWithAudioContributions", contributorsWithAudioContributions);
Map<Long, Long> audioContributionsCountMap = new HashMap<>();
for (Contributor contributorWithContributions : contributorsWithAudioContributions) {
audioContributionsCountMap.put(contributorWithContributions.getId(), audioContributionEventDao.readCount(contributorWithContributions));
}
model.addAttribute("audioContributionsCountMap", audioContributionsCountMap);

List<Contributor> contributorsWithWordContributions = contributorDao.readAllWithWordContributions();
logger.info("contributorsWithWordContributions.size(): " + contributorsWithWordContributions.size());
model.addAttribute("contributorsWithWordContributions", contributorsWithWordContributions);
Map<Long, Long> wordContributionsCountMap = new HashMap<>();
for (Contributor contributorWithContributions : contributorsWithWordContributions) {
wordContributionsCountMap.put(contributorWithContributions.getId(), wordContributionEventDao.readCount(contributorWithContributions));
}
model.addAttribute("wordContributionsCountMap", wordContributionsCountMap);

List<Contributor> contributorsWithNumberContributions = contributorDao.readAllWithNumberContributions();
logger.info("contributorsWithNumberContributions.size(): " + contributorsWithNumberContributions.size());
model.addAttribute("contributorsWithNumberContributions", contributorsWithNumberContributions);
Map<Long, Long> numberContributionsCountMap = new HashMap<>();
for (Contributor contributorWithContributions : contributorsWithNumberContributions) {
numberContributionsCountMap.put(contributorWithContributions.getId(), numberContributionEventDao.readCount(contributorWithContributions));
}
model.addAttribute("numberContributionsCountMap", numberContributionsCountMap);


return "content/main";
}
}
137 changes: 0 additions & 137 deletions src/main/webapp/WEB-INF/jsp/content/main.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,140 +138,3 @@
</div>
</div>
</content:section>

<content:aside>
<h5 class="center"><fmt:message key="top.contributors" /> 🏆</h5>
<div class="card-panel deep-purple lighten-5">
<b><fmt:message key="storybooks" /></b><br />
<ol style="list-style-type: inherit;">
<c:forEach var="contributor" items="${contributorsWithStoryBookContributions}">
<li>
<a href="<spring:url value='/contributor/${contributor.id}' />">
<div class="chip">
<c:choose>
<c:when test="${not empty contributor.imageUrl}">
<img src="${contributor.imageUrl}" />
</c:when>
<c:when test="${not empty contributor.providerIdWeb3}">
<img src="https://effigy.im/a/<c:out value="${contributor.providerIdWeb3}" />.png" />
</c:when>
<c:otherwise>
<img src="<spring:url value='/static/img/placeholder.png' />" />
</c:otherwise>
</c:choose>
<c:choose>
<c:when test="${not empty contributor.firstName}">
<c:out value="${contributor.firstName}" />&nbsp;<c:out value="${contributor.lastName}" />
</c:when>
<c:when test="${not empty contributor.providerIdWeb3}">
${fn:substring(contributor.providerIdWeb3, 0, 6)}...${fn:substring(contributor.providerIdWeb3, 38, 42)}
</c:when>
</c:choose>
</div> (${storyBookContributionsCountMap[contributor.id]})
</a>
</li>
</c:forEach>
</ol>

<div class="divider" style="margin: 1em 0;"></div>

<b><fmt:message key="audios" /></b><br />
<ol style="list-style-type: inherit;">
<c:forEach var="contributor" items="${contributorsWithAudioContributions}">
<li>
<a href="<spring:url value='/contributor/${contributor.id}' />">
<div class="chip">
<c:choose>
<c:when test="${not empty contributor.imageUrl}">
<img src="${contributor.imageUrl}" />
</c:when>
<c:when test="${not empty contributor.providerIdWeb3}">
<img src="https://effigy.im/a/<c:out value="${contributor.providerIdWeb3}" />.png" />
</c:when>
<c:otherwise>
<img src="<spring:url value='/static/img/placeholder.png' />" />
</c:otherwise>
</c:choose>
<c:choose>
<c:when test="${not empty contributor.firstName}">
<c:out value="${contributor.firstName}" />&nbsp;<c:out value="${contributor.lastName}" />
</c:when>
<c:when test="${not empty contributor.providerIdWeb3}">
${fn:substring(contributor.providerIdWeb3, 0, 6)}...${fn:substring(contributor.providerIdWeb3, 38, 42)}
</c:when>
</c:choose>
</div> (${audioContributionsCountMap[contributor.id]})
</a>
</li>
</c:forEach>
</ol>

<div class="divider" style="margin: 1em 0;"></div>

<b><fmt:message key="words" /></b><br />
<ol style="list-style-type: inherit;">
<c:forEach var="contributor" items="${contributorsWithWordContributions}">
<li>
<a href="<spring:url value='/contributor/${contributor.id}' />">
<div class="chip">
<c:choose>
<c:when test="${not empty contributor.imageUrl}">
<img src="${contributor.imageUrl}" />
</c:when>
<c:when test="${not empty contributor.providerIdWeb3}">
<img src="https://effigy.im/a/<c:out value="${contributor.providerIdWeb3}" />.png" />
</c:when>
<c:otherwise>
<img src="<spring:url value='/static/img/placeholder.png' />" />
</c:otherwise>
</c:choose>
<c:choose>
<c:when test="${not empty contributor.firstName}">
<c:out value="${contributor.firstName}" />&nbsp;<c:out value="${contributor.lastName}" />
</c:when>
<c:when test="${not empty contributor.providerIdWeb3}">
${fn:substring(contributor.providerIdWeb3, 0, 6)}...${fn:substring(contributor.providerIdWeb3, 38, 42)}
</c:when>
</c:choose>
</div> (${wordContributionsCountMap[contributor.id]})
</a>
</li>
</c:forEach>
</ol>

<div class="divider" style="margin: 1em 0;"></div>

<b><fmt:message key="numbers" /></b><br />
<ol style="list-style-type: inherit;">
<c:forEach var="contributor" items="${contributorsWithNumberContributions}">
<li>
<a href="<spring:url value='/contributor/${contributor.id}' />">
<div class="chip">
<c:choose>
<c:when test="${not empty contributor.imageUrl}">
<img src="${contributor.imageUrl}" />
</c:when>
<c:when test="${not empty contributor.providerIdWeb3}">
<img src="https://effigy.im/a/<c:out value="${contributor.providerIdWeb3}" />.png" />
</c:when>
<c:otherwise>
<img src="<spring:url value='/static/img/placeholder.png' />" />
</c:otherwise>
</c:choose>
<c:choose>
<c:when test="${not empty contributor.firstName}">
<c:out value="${contributor.firstName}" />&nbsp;<c:out value="${contributor.lastName}" />
</c:when>
<c:when test="${not empty contributor.providerIdWeb3}">
${fn:substring(contributor.providerIdWeb3, 0, 6)}...${fn:substring(contributor.providerIdWeb3, 38, 42)}
</c:when>
</c:choose>
</div> (${numberContributionsCountMap[contributor.id]})
</a>
</li>
</c:forEach>
</ol>

<div class="divider" style="margin: 1em 0;"></div>
</div>
</content:aside>

0 comments on commit f2739b6

Please sign in to comment.