Update history page styles (#101)

* Update history page styles

* Move history out of account as parent div being flex/grid affects table style
* Adjust width of side panel to be maximum 90% of screen width
* Update styles of readonly editor

* Fix compose.dev.yml

* Fix panel description styling

Co-authored-by: samuelim01 <[email protected]>

* Conver history panel to primeNG sidebar

* Fix sorting for history table

* Remove console log statements in history component

* Add fix to history

* Make SortEvent required
* Adjust undefined handling for dt
* Adjust time format

* Remove removable sort

* Fix question sort

* Fix filter

---------

Co-authored-by: Samuel Lim <[email protected]>
Co-authored-by: samuelim01 <[email protected]>

Author: McNaBry

compose.dev.yml

@@ -48,6 +48,10 @@ services:
       - /app/node_modules
       - ./services/collaboration:/app
 
+  collaboration-db:
+    ports:
+      - 27020:27017
+  
   history:
     command: npm run dev
     ports:

frontend/src/_services/history.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { historyResponse, MatchingHistory } from '../app/account/history/history.model';
+import { historyResponse, MatchingHistory } from '../app/history/history.model';
 import { ApiService } from './api.service';
 
 @Injectable({
@@ -22,7 +22,8 @@ export class HistoryService extends ApiService {
                     id: item._id,
                     roomId: item.roomId,
                     collaborator: item.collaborator.username,
-                    question: item.question,
+                    title: item.question.title,
+                    description: item.question.description,
                     topics: item.question.topics,
                     difficulty: item.question.difficulty,
                     status: item.status,

frontend/src/app/account/account.component.ts

@@ -5,7 +5,6 @@ import { LoginComponent } from './login/login.component';
 import { RegisterComponent } from './register/register.component';
 import { LayoutComponent } from './layout.component';
 import { ProfileComponent } from './profile/profile.component';
-import { HistoryComponent } from './history/history.component';
 
 const routes: Routes = [
     {
@@ -16,7 +15,6 @@ const routes: Routes = [
             { path: 'login', component: LoginComponent },
             { path: 'register', component: RegisterComponent },
             { path: 'profile', component: ProfileComponent },
-            { path: 'history', component: HistoryComponent },
         ],
     },
 ];

frontend/src/app/account/account.module.ts

@@ -7,7 +7,6 @@ import { RegisterComponent } from './register/register.component';
 import { LayoutComponent } from './layout.component';
 import { AccountRoutingModule } from './account.component';
 import { ProfileComponent } from './profile/profile.component';
-import { HistoryComponent } from './history/history.component';
 
 @NgModule({
     imports: [
@@ -18,7 +17,6 @@ import { HistoryComponent } from './history/history.component';
         LoginComponent,
         RegisterComponent,
         ProfileComponent,
-        HistoryComponent,
     ],
 })
 export class AccountModule {}

frontend/src/app/account/history/history.component.html

@@ -5,6 +5,7 @@ import { MatchingComponent } from './matching/matching.component';
 import { HomeComponent } from './home/home.component';
 import { AuthGuardService } from '../_services/auth.guard.service';
 import { CollabGuardService } from '../_services/collab.guard.service';
+import { HistoryComponent } from './history/history.component';
 
 const accountModule = () => import('./account/account.module').then(x => x.AccountModule);
 
@@ -33,6 +34,11 @@ export const routes: Routes = [
         component: HomeComponent,
         canActivate: [AuthGuardService],
     },
+    {
+        path: 'history',
+        component: HistoryComponent,
+        canActivate: [AuthGuardService],
+    },
     {
         path: '**',
         redirectTo: '/home',

frontend/src/app/app.routes.ts

@@ -1,3 +1,12 @@
+.container {
+    min-height: calc(100dvh - 160px); 
+    width: 100%;
+    justify-content: center; 
+    align-items: center; 
+    padding: 1rem;
+    margin-top: auto;
+}
+
 .sliding-panel {
     position: fixed;
     top: 0;
@@ -9,6 +18,7 @@
     box-shadow: -2px 0 5px rgba(0,0,0,0.5);
     transition: right 0.3s ease;
     z-index: 1000;
+    max-width: 90%;
 }
 
 .sliding-panel.open {

frontend/src/app/account/history/history.component.css renamed to frontend/src/app/history/history.component.css

@@ -0,0 +1,83 @@
+<div class="container">
+    <div class="table-container" style="max-width: 1150px; margin: 100px auto">
+        <p-table
+            #dt
+            sortField="time"
+            [sortOrder]="1"
+            [value]="histories"
+            datakey="id"
+            [tableStyle]="{ 'table-layout': 'auto', width: '100%', 'min-width': '50rem', 'text-align': 'center' }"
+            [paginator]="true"
+            [rows]="10"
+            [rowsPerPageOptions]="[10, 25, 50]"
+            [globalFilterFields]="['title', 'difficulty', 'topics', 'collaborator', 'status', 'time']"
+            styleClass="p-datatable-gridlines-striped"
+            (sortFunction)="customSort($event)"
+            [customSort]="true">
+            <ng-template pTemplate="caption">
+                <div class="flex flex-wrap align-items-center justify-content-between">
+                    <h3 class="">Matching History</h3>
+                    <p-iconField iconPosition="left">
+                        <p-inputIcon>
+                            <i class="pi pi-search"></i>
+                        </p-inputIcon>
+                        <input
+                            pInputText
+                            type="text"
+                            (input)="dt.filterGlobal($any($event.target).value, 'contains')"
+                            placeholder="Search keyword" />
+                    </p-iconField>
+                </div>
+            </ng-template>
+            <ng-template pTemplate="header" let-columns>
+                <tr>
+                    <th pSortableColumn="title" style="width: 20%">Question<p-sortIcon field="title"></p-sortIcon></th>
+                    <th pSortableColumn="difficulty" style="width: 15%">
+                        Difficulty<p-sortIcon field="difficulty"></p-sortIcon>
+                    </th>
+                    <th pSortableColumn="topics" style="width: 24%">Topics<p-sortIcon field="topics"></p-sortIcon></th>
+                    <th pSortableColumn="collaborator" style="width: 17%">
+                        Collaborator<p-sortIcon field="collaborator"></p-sortIcon>
+                    </th>
+                    <th pSortableColumn="status" style="width: 12%">Status<p-sortIcon field="status"></p-sortIcon></th>
+                    <th pSortableColumn="time" style="width: 12%">Time<p-sortIcon field="time"></p-sortIcon></th>
+                </tr>
+            </ng-template>
+            <ng-template pTemplate="body" let-history>
+                <tr (click)="onRowSelect(history)">
+                    <td>{{ history.title }}</td>
+                    <td>{{ history.difficulty }}</td>
+                    <td>{{ history.topics.join(', ') }}</td>
+                    <td>{{ history.collaborator }}</td>
+                    <td>
+                        @if (history.status === 'COMPLETED') {
+                            <i class="pi pi-check" style="color: green; font-size: large"></i>
+                        } @else if (history.status === 'FORFEITED') {
+                            <i class="pi pi-times" style="color: red; font-size: large"></i>
+                        } @else if (history.status === 'IN_PROGRESS') {
+                            <i class="pi pi-spin pi-spinner" style="color: white; font-size: large"></i>
+                        }
+                    </td>
+                    <td>{{ history.time | date: 'dd/MM/yyyy hh:mm a' }}</td>
+                </tr>
+            </ng-template>
+        </p-table>
+    </div>
+    <p-sidebar
+        [(visible)]="isPanelVisible"
+        position="right"
+        [blockScroll]="true"
+        styleClass="w-10 md:w-8 lg:w-6"
+        transitionOptions="200ms cubic-bezier(0, 0, 0.2, 1)"
+        (onHide)="closePanel()">
+        <ng-template pTemplate="header">
+            <h3>{{ panelHistory?.title }}</h3>
+        </ng-template>
+        <div class="panel-content">
+            <p style="white-space: pre-wrap">{{ panelHistory?.description }}</p>
+            <h4>Submitted Solution</h4>
+            <div #editor class="editor-content text-lg"></div>
+        </div>
+    </p-sidebar>
+    <p-toast position="bottom-right" [breakpoints]="{ '920px': { width: '90%' } }" />
+</div>