Merge branch 'dev' of https://github.com/ctfguide-tech/CTFGuideReact-2.0 into dev

feat: misc changes

Author: Laphatize

src/pages/assignments/[code]/submissions/[id].jsx

@@ -9,11 +9,12 @@ import { Dialog, Transition } from '@headlessui/react'
 import { CheckIcon } from '@heroicons/react/24/outline'
 import request from '@/utils/request';
 import { useRouter } from 'next/router';
+
 import ClassroomNav from '@/components/groups/classroomNav';
 import { getCookie } from '@/utils/request';
 const baseUrl = process.env.NEXT_PUBLIC_API_URL;
 
-export default function id() {
+export default function Id() {
   const [open, setOpen] = useState(false);
 
   const router = useRouter();

src/pages/assignments/student/[code].jsx

@@ -10,10 +10,12 @@ import 'react-toastify/dist/ReactToastify.css';
 
 import { Dialog, Transition } from '@headlessui/react';
 import { Fragment } from 'react';
-import api from '@/utils/terminal-api';
 
+import request, { getCookie } from '@/utils/request';
+import { jwtDecode } from 'jwt-decode';
+
+import api from '@/utils/terminal-api';
 import io from 'socket.io-client';
-import request from '@/utils/request';
 
 const baseUrl = process.env.NEXT_PUBLIC_API_URL;
 
@@ -142,7 +144,9 @@ export default function Slug() {
     if (!challenge) return;
     setLoadingMessage('Creating terminal ');
     setFetchingTerminal(true);
-    const token = auth.currentUser.accessToken;
+    const cookie = getCookie('idToken');
+    const data = jwtDecode(cookie);
+    const token = data.id;
     const [created, termId] = await api.buildTerminal(challenge, token);
     console.log('Pengiouns here:', created, termId);
     if (created) {
@@ -164,7 +168,9 @@ export default function Slug() {
     setFetchingTerminal(true);
     if (!challenge) return;
     setLoadingMessage('Fetching terminal ');
-    const token = auth.currentUser.accessToken;
+    const cookie = getCookie('idToken');
+    const decode = jwtDecode(cookie);
+    const token = decode.id;
     setFetchingTerminal(true);
     const data = await api.checkUserTerminal(token, challenge.id);
     if (data !== null) {
@@ -325,7 +331,9 @@ export default function Slug() {
 
   const checkIfTerminalExists = async () => {
     setFetchingTerminal(true);
-    const token = auth.currentUser.accessToken;
+    const cookie = getCookie('idToken');
+    const decode = jwtDecode(cookie);
+    const token = decode.id;
     if (!challenge || !token) return;
     const data = await api.checkUserTerminal(token, challenge.id);
     if (data !== null) {

src/pages/assignments/teacher/[code].jsx

@@ -2,6 +2,7 @@ import Head from 'next/head';
 import { StandardNav } from '@/components/StandardNav';
 import { Footer } from '@/components/Footer';
 import { MarkdownViewer } from '@/components/MarkdownViewer';
+
 import { useEffect, useState } from 'react';
 import { Dialog, Transition } from '@headlessui/react';
 import { Fragment } from 'react';
@@ -12,10 +13,13 @@ import ClassroomNav from '@/components/groups/classroomNav';
 import { useRouter } from 'next/router';
 import Loader from '@/components/Loader';
 import api from '@/utils/terminal-api';
-import request from '@/utils/request';
+
+import request, { getCookie } from '@/utils/request';
+import { jwtDecode } from 'jwt-decode';
 
 const baseUrl = process.env.NEXT_PUBLIC_API_URL;
-export default function id() {
+
+export default function Id() {
 
   // challenge desc minmize 
   const [isCodeVisible, setIsCodeVisible] = useState(true);
@@ -150,7 +154,9 @@ export default function id() {
     setLoadingMessage('Creating terminal ');
     if(!challenge) return;
     setFetchingTerminal(true);
-    const token = auth.currentUser.accessToken;
+    const cookie = getCookie('idToken');
+    const data = jwtDecode(cookie);
+    const token = data.id;
     const [created, termId] = await api.buildTerminal(challenge, token);
     console.log('Pengiouns here:', created, termId);
     if(created) {
@@ -172,7 +178,9 @@ export default function id() {
     setLoadingMessage('Fetching terminal ');
     setFetchingTerminal(true);
     if(!challenge) return;
-    const token = auth.currentUser.accessToken;
+    const cookie = getCookie('idToken');
+    const decode = jwtDecode(cookie);
+    const token = decode.id;
     setFetchingTerminal(true);
     const data = await api.checkUserTerminal(token, challenge.id);
     if(data !== null) {
@@ -279,7 +287,9 @@ export default function id() {
 
   const checkIfTerminalExists = async () => {
     setFetchingTerminal(true);
-    const token = auth.currentUser.accessToken;
+    const cookie = getCookie('idToken');
+    const decode = jwtDecode(cookie);
+    const token = decode.id;
     if(!challenge || !token) return;
     const data = await api.checkUserTerminal(token, challenge.id);
     if (data !== null) {

src/pages/create/new.jsx

@@ -68,7 +68,6 @@ export default function Createchall() {
       } else {
         const cookie = getCookie('idToken');
         const data = jwtDecode(cookie);
-
         const token = data.id;
         const fileId = await fileApi(token, selectedFile);
         if(fileId !== null) {

src/pages/leaderboards.jsx

@@ -9,12 +9,11 @@ import { StandardNav } from '@/components/StandardNav';
 import { Footer } from '@/components/Footer';
 import { PracticeNav } from '@/components/practice/PracticeNav';
 import { Community } from '@/components/practice/community';
-import request from '@/utils/request';
 import { MyTable } from '@/components/Table';
 import { TableHead, TableRow, TableHeader, TableCell, TableBody, Table } from "@/components/ui/table"
 
-export default function Competitions() {
 
+export default function Competitions() {
 
   return (
     <>