feat(client): challs sort weight

Author: chen-robert

client/src/routes/challs.js

@@ -103,6 +103,17 @@ const Challenges = ({ classes }) => {
         }
       })
     }
+
+    filtered.sort((a, b) => {
+      if (a.points === b.points) {
+        const aWeight = a.sortWeight || 0
+        const bWeight = b.sortWeight || 0
+
+        return bWeight - aWeight
+      }
+      return a.points - b.points
+    })
+
     return filtered
   }, [problems, categories, showSolved, solveIDs])
 

preact.config.js

@@ -11,9 +11,12 @@ export default (config, env, helpers) => {
     // Disable sourcemaps
     config.devtool = false
   } else {
-    config.devServer.proxy = {
-      '/api': 'http://localhost:3000'
-    }
+    config.devServer.proxy = [{
+      path: '/api/**',
+      target: 'http://localhost:3000',
+      changeOrigin: true,
+      changeHost: true
+    }]
   }
 
   config.resolveLoader.modules.unshift(path.resolve(__dirname, 'client/lib/loaders'))

server/challenges/index.ts

@@ -13,7 +13,7 @@ let challengesMap: Map<string, Challenge> = new Map()
 let cleanedChallengesMap: Map<string, CleanedChallenge> = new Map()
 
 const cleanChallenge = (chall: Challenge): CleanedChallenge => {
-  const { files, description, author, points, id, name, category } = chall
+  const { files, description, author, points, id, name, category, sortWeight } = chall
 
   return {
     files,
@@ -22,7 +22,8 @@ const cleanChallenge = (chall: Challenge): CleanedChallenge => {
     points,
     id,
     name,
-    category
+    category,
+    sortWeight
   }
 }
 

server/challenges/types.ts

@@ -16,6 +16,7 @@ export interface CleanedChallenge {
   author: string;
   files: File[];
   points: Points;
+  sortWeight?: number;
 }
 
 export interface Challenge {
@@ -28,4 +29,5 @@ export interface Challenge {
   points: Points;
   flag: string;
   tiebreakEligible: boolean;
+  sortWeight?: number;
 }

server/providers/challenges/rdeploy-blob/index.ts

@@ -25,6 +25,7 @@ interface RDeployChallenge {
   points: Points;
   flag: string;
   tiebreakEligible: boolean;
+  sortWeight?: number;
 }
 
 class RDeployBlobProvider extends EventEmitter implements Provider {