🚀 Feature Request: Relevance for Courses based on Semester (#101)

* add courseInfo to card * add sort by date to non-community searches
jcserv · Sep 1, 2021 · 34e939e · 34e939e
1 parent 9317b4c
commit 34e939e
Show file tree

Hide file tree

Showing 5 changed files with 87 additions and 24 deletions.
diff --git a/client/components/Card.jsx b/client/components/Card.jsx
@@ -1,11 +1,24 @@
-import { Box, Center, useColorModeValue } from "@chakra-ui/react";
+import { Box, Center, Icon, useColorModeValue } from "@chakra-ui/react";
 import Image from "next/image";
 import { useRouter } from "next/router";
 import React from "react";
-import { FaDiscord, FaTree, FaWhatsapp } from "react-icons/fa";
+import {
+  FaDiscord,
+  FaRegSnowflake,
+  FaSun,
+  FaTree,
+  FaWhatsapp,
+} from "react-icons/fa";
+import { GiChestnutLeaf } from "react-icons/gi";
 import Tilt from "react-vanilla-tilt";
 
-const Icon = ({ link, titleColor }) => (
+const termToIcon = {
+  Fall: GiChestnutLeaf,
+  Winter: FaRegSnowflake,
+  Summer: FaSun,
+};
+
+const LinkIcon = ({ link, titleColor }) => (
   <>
     {link.includes("discord") && (
       <FaDiscord color={titleColor} style={{ marginRight: "5px" }} />
@@ -19,7 +32,28 @@ const Icon = ({ link, titleColor }) => (
   </>
 );
 
-export const Card = ({ name, description, image, links, id }) => {
+const CourseInfo = ({ descriptionColor, campus, term, year }) => (
+  <>
+    <Box
+      mt="1"
+      color={descriptionColor}
+      fontWeight="semibold"
+      as="h2"
+      isTruncated
+    >
+      {campus} <Icon as={termToIcon[term]} /> {year}
+    </Box>
+  </>
+);
+
+export const Card = ({
+  name,
+  image,
+  links,
+  id,
+  isCommunity,
+  courseInformation,
+}) => {
   const { locale, defaultLocale, push } = useRouter();
   const backgroundColor = useColorModeValue("#FFFFFF", "#181a1b");
   const descriptionColor = useColorModeValue("gray.600", "gray.400");
@@ -45,6 +79,7 @@ export const Card = ({ name, description, image, links, id }) => {
       <Box
         bg={backgroundColor}
         maxW="sm"
+        minHeight="100%"
         borderWidth="1px"
         borderRadius="lg"
         overflow="hidden"
@@ -68,19 +103,15 @@ export const Card = ({ name, description, image, links, id }) => {
           >
             {name}
           </Box>
-
-          <Box
-            mt="1"
-            color={descriptionColor}
-            fontWeight="semibold"
-            as="h2"
-            isTruncated
-          >
-            {description}
-          </Box>
+          {!isCommunity && (
+            <CourseInfo
+              descriptionColor={descriptionColor}
+              {...courseInformation}
+            />
+          )}
           <Box className="d-flex" mt="2">
             {links.map((link, index) => (
-              <Icon key={index} color={titleColor} link={link} />
+              <LinkIcon key={index} color={titleColor} link={link} />
             ))}
           </Box>
         </Box>

diff --git a/client/gql/GroupChat.js b/client/gql/GroupChat.js
@@ -89,6 +89,12 @@ export const SEARCH_GROUPCHATS = gql`
         links
         id
         isCommunity
+        courseInformation {
+          term
+          campus
+          code
+          year
+        }
       }
       totalPages
       pageNumber
@@ -110,6 +116,12 @@ export const SEARCH_ALL_GROUPCHATS = gql`
         links
         id
         isCommunity
+        courseInformation {
+          term
+          campus
+          code
+          year
+        }
       }
       totalPages
       pageNumber

diff --git a/server/dist/resolvers/GroupChatResolver.js b/server/dist/resolvers/GroupChatResolver.js
diff --git a/server/dist/resolvers/GroupChatResolver.js.map b/server/dist/resolvers/GroupChatResolver.js.map
diff --git a/server/resolvers/GroupChatResolver.ts b/server/resolvers/GroupChatResolver.ts
@@ -102,10 +102,21 @@ export class GroupChatResolver {
     if (type != undefined) {
       queryObj = { ...queryObj, isCommunity: type };
     }
-    const groupChats = await GroupChatModel.find(queryObj)
-      .sort({ views: -1, likes: -1 })
-      .skip(page * pageSize)
-      .limit(pageSize);
+
+    let groupChats;
+
+    if (type) {
+      groupChats = await GroupChatModel.find(queryObj)
+        .sort({ views: -1, likes: -1 })
+        .skip(page * pageSize)
+        .limit(pageSize);
+    } else {
+      groupChats = await GroupChatModel.find(queryObj)
+        .sort({ created: -1, views: -1, likes: -1 })
+        .skip(page * pageSize)
+        .limit(pageSize);
+    }
+
     const totalCount = await GroupChatModel.find(queryObj).countDocuments();
     if (totalCount === 0) {
       return {