Add css; Show pinned courses for other semesters

TUM-Dev · Aug 8, 2023 · 6db90be · 6db90be
1 parent aeacd83
commit 6db90be
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 16 deletions.
diff --git a/api/courses.go b/api/courses.go
@@ -266,18 +266,6 @@ func (r coursesRoutes) getUsers(c *gin.Context) {
 func (r coursesRoutes) getPinned(c *gin.Context) {
 	tumLiveContext := c.MustGet("TUMLiveContext").(tools.TUMLiveContext)
 
-	year, term := tum.GetCurrentSemester()
-	year, err := strconv.Atoi(c.DefaultQuery("year", strconv.Itoa(year)))
-	if err != nil {
-		_ = c.Error(tools.RequestError{
-			Status:        http.StatusBadRequest,
-			CustomMessage: "invalid year",
-			Err:           err,
-		})
-		return
-	}
-	term = c.DefaultQuery("term", term)
-
 	var pinnedCourses []model.Course
 	if tumLiveContext.User != nil {
 		pinnedCourses = tumLiveContext.User.PinnedCourses
@@ -288,7 +276,7 @@ func (r coursesRoutes) getPinned(c *gin.Context) {
 	pinnedCourses = commons.Unique(pinnedCourses, func(c model.Course) uint { return c.ID })
 	resp := make([]model.CourseDTO, 0, len(pinnedCourses))
 	for _, course := range pinnedCourses {
-		if !course.IsHidden() && course.Year == year && course.TeachingTerm == term {
+		if !course.IsHidden() {
 			resp = append(resp, course.ToDTO())
 		}
 	}

diff --git a/model/user.go b/model/user.go
@@ -329,5 +329,5 @@ func (u *User) BeforeCreate(tx *gorm.DB) (err error) {
 	if len(u.Name) == 0 {
 		return ErrUsernameNoText
 	}
-	return nil;
+	return nil
 }
diff --git a/web/assets/css/home.css b/web/assets/css/home.css
@@ -57,6 +57,14 @@
     @apply bg-blue-500 dark:bg-indigo-600
 }
 
+.tum-live-border-primary {
+    @apply border-blue-500 dark:border-indigo-600
+}
+
+.tum-live-font-primary {
+    @apply text-blue-500 dark:text-indigo-600
+}
+
 /* Elements */
 .tum-live-button {
     @apply rounded-full px-3 py-1 text-sm font-semibold

diff --git a/web/template/home.gohtml b/web/template/home.gohtml
@@ -67,8 +67,8 @@
         {{else}}
             <div>
                 <button type="button" @click="userContext.toggle(true)"
-                        class="tum-live-button-primary mx-3 flex items-center justify-center rounded-full h-[32px] w-[32px]">
-                    <span class="text-white font-semibold uppercase">{{printf "%.1s" $user.GetPreferredName}}</span>
+                        class="border-2 tum-live-border-primary mx-3 flex items-center justify-center rounded-full h-[32px] w-[32px]">
+                    <i class = "fa-solid fa-user tum-live-font-primary"></i>
                 </button>
                 <div class="relative">
                     <article x-cloak x-show="userContext.value"

diff --git a/web/ts/api/courses.ts b/web/ts/api/courses.ts
@@ -121,6 +121,8 @@ export class Course {
 
     readonly Pinned: boolean = false;
 
+    readonly UserID: number;
+
     private readonly Streams?: Stream[];
 
     readonly Recordings?: Stream[];