Skip to content

Commit

Permalink
fix/UNI-266 : Updated SQL query to remove duplicate course cards (#273)
Browse files Browse the repository at this point in the history
* feat: update devsoc branding references (#260)

* chore(landing): update landing meta description

* Update README.md

* added more strict sorting when calling getCoursesbyOffset

---------

Co-authored-by: Bob Chen <[email protected]>
Co-authored-by: Jared L <[email protected]>
Co-authored-by: Dylan W <[email protected]>
  • Loading branch information
4 people authored Apr 6, 2024
1 parent 8869e1b commit 7de5bfe
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 14 deletions.
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Uni-lectives

Copyright (C) 2023 CSESoc UNSW
Copyright (C) 2023 DevSoc UNSW

This program is free software: you can redistribute it and/or modify it under
the terms of the GNU Affero General Public License as published by the Free
Expand Down Expand Up @@ -37,7 +37,7 @@ party components included in the software.
6. If you use this software in a product that is freely available to the
public, you must give full credit to the original authors of the software by
prominently displaying the following attribution in the product: "This product
includes software developed by CSESoc UNSW."
includes software developed by DevSoc UNSW."

7. This license extension shall not be interpreted to affect the validity or
enforceability of the AGPL-v3 license.
Expand Down
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
# cselectives-v2
# unilectives

A website to review UNSW courses and electives.

## Branch conventions

Type: feature, task, bugfix, refactor
Jira Ticket: ELEC-XXX
[type]/UNI-XXX-[opt. description-in-kebab-case]

{type}/{jira-ticket}

e.g. feature/ELEC-777
e.g. feature/UNI-777-the-brown-fox

## Running Locally

Expand Down
2 changes: 1 addition & 1 deletion backend/src/repositories/course.repository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export class CourseRepository {
FROM courses c
LEFT JOIN reviews r ON c.course_code = r.course_code
GROUP BY c.course_code
ORDER BY "reviewCount" DESC
ORDER BY "reviewCount" DESC, c.course_code ASC
LIMIT 25 OFFSET ${offset};
`) as any[];
return courses;
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import { Course, Courses } from "@/types/api";
export async function generateMetadata(): Promise<Metadata> {
return {
title: `Home | Unilectives - UNSW Course Reviews`,
description: `A course review website for UNSW made by CSESoc`,
description: `UNSW course reviews, ratings, and study tips. Unilectives is your one-stop shop for making informed course choices at UNSW.`,
};
}

export default async function Home() {
const { courses: initialCourses } = (await get(
"/courses?offset=0"
"/courses?offset=0",
)) as Courses;

const metaLD: WithContext<ItemList> = {
Expand Down Expand Up @@ -66,7 +66,7 @@ export default async function Home() {
<div className="flex flex-row w-5/6 space-y-0 justify-between items-left md:space-y-4 md:flex-col md:items-center">
<div className="flex flex-col w-full gap-3">
<p className="drop-shadow-md text-base sm:text-xs">
CSESoc presents
DevSoc presents
</p>
<h1 className="justify-center font-bold text-unilectives-blue text-7xl sm:text-4xl">
unilectives
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/app/terms-and-conditions/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ export default function TermsAndConditions() {
<h1 className="text-lg font-bold">Terms and Conditions</h1>
<br />
<p>
CSESoc is the constituent student society of UNSW&apos;s School of Computer
Science and Engineering. We do not represent the School, Faculty or
Software Development Society (DevSoc) is a student society comprised of interested
developers, inventors and tech enthusiasts. We do not represent the School, Faculty or
University.
</p>
<br />
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Navbar/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ export default function Navbar({ userZid }: NavbarProps) {
.
</span>
<span className={collapsed ? "hidden" : "text-xs"}>
© CSESoc {new Date().getFullYear()}, v1.0.0
© DevSoc {new Date().getFullYear()}, v1.0.0
</span>
</div>
</div>
Expand Down

0 comments on commit 7de5bfe

Please sign in to comment.