Merge remote-tracking branch 'refs/remotes/origin/main'

MananGandhi1810 · Nov 22, 2024 · c28e4af · c28e4af
2 parents be5e566 + ef506ea
commit c28e4af
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 23 deletions.
diff --git a/backend/execution-worker/execute.js b/backend/execution-worker/execute.js
@@ -81,7 +81,6 @@ const executeFromQueue = async (message, channel) => {
                     return;
                 }
                 resolve();
-                console.log("TLE");
                 didTLE = true;
                 const result = {
                     status: "TimeLimitExceeded",
@@ -193,7 +192,6 @@ const executeFromQueue = async (message, channel) => {
                     points: true,
                 },
             });
-            console.log(updated.points);
         }
     }
 };

diff --git a/backend/middlewares/rate-limit.js b/backend/middlewares/rate-limit.js
@@ -14,7 +14,6 @@ const rateLimit = async (req, res, next, limit = 5, use = "") => {
             req.socket.remoteAddress ||
             req.connection.socket.remoteAddress;
     }
-    console.log(key);
     const redisId = `rate-limit:${use}/${key}`;
     const requests = await redis.incr(redisId);
     if (requests === 1) {

diff --git a/code-runner/Dockerfile b/code-runner/Dockerfile
@@ -1,11 +1,12 @@
-FROM ubuntu:latest
+FROM alpine:latest
 
 WORKDIR /usr/code-runner
-RUN apt update
-RUN apt install gcc g++ -y
-RUN apt install nodejs -y
-RUN apt install python3 -y
-RUN apt install default-jdk -y
+RUN apk update
+RUN apk add gcc g++
+RUN apk add nodejs
+RUN apk add python3
+RUN apk add openjdk11
+RUN apk add bash
 COPY executor.py executor.py
 
 CMD ["bash"]
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -10,8 +10,8 @@ services:
         volumes:
             - ./backend/.env.prod:/usr/src/app/.env
             - /var/run/docker.sock:/var/run/docker.sock
-            # - /path/to/ssl/fullchain.pem:/usr/src/app/ssl/fullchain.pem
-            # - /path/to/ssl/privkey.pem:/usr/src/app/ssl/privkey.pem
+            - /path/to/ssl/fullchain.pem:/usr/src/app/ssl/fullchain.pem
+            - /path/to/ssl/privkey.pem:/usr/src/app/ssl/privkey.pem
         user: root
         command: sh -c "npx prisma migrate deploy && npm run start"
 

diff --git a/frontend/src/components/custom/Editorials.jsx b/frontend/src/components/custom/Editorials.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import React from "react";
 import { ScrollArea } from "../ui/scroll-area";
 import {
     Table,
@@ -8,7 +8,7 @@ import {
     TableHeader,
     TableRow,
 } from "../ui/table";
-import { ArrowLeft, DeleteIcon, Edit } from "lucide-react";
+import { ArrowLeft, DeleteIcon } from "lucide-react";
 import Markdown from "react-markdown";
 import { Button } from "../ui/button";
 
@@ -23,13 +23,6 @@ function Editorials({
         return (
             <div className="flex h-full-w-nav-w-tab w-full justify-center items-center flex-col gap-2">
                 No Editorials Found
-                <Button
-                    variant="outline"
-                    className="py-2 flex flex-row gap-2 m-2"
-                >
-                    <Edit />
-                    Compose an editorial
-                </Button>
             </div>
         );
     }

diff --git a/frontend/src/pages/Home.jsx b/frontend/src/pages/Home.jsx
@@ -32,7 +32,7 @@ function Home() {
                     </div>
                     <div className="space-4">
                         <Button className="group" asChild>
-                            <Link to="https://github.com/MananGandhi1810/online-ide">
+                            <Link to="https://git.new/manan-code">
                                 <Star className="mr-2 size-[20px] z-10 group-hover:mr-3 duration-200" />
                                 Star on GitHub
                                 <SquareArrowOutUpRight className="ml-2 size-[20px] z-10 group-hover:ml-3 duration-200" />

diff --git a/frontend/src/pages/NoPageFound.jsx b/frontend/src/pages/NoPageFound.jsx
@@ -3,8 +3,8 @@ import { CircleX } from "lucide-react";
 function NoPageFound() {
     return (
         <div className="h-full-w-nav w-screen flex justify-center items-center flex-col">
-            <div className="flex flex-row gap-4">
-                <CircleX className="size-[40px]" />
+            <div className="flex flex-col items-center gap-6">
+                <CircleX className="size-[50px]" />
                 <span className="self-center text-xl">
                     Error 404 - Page not found
                 </span>