Merge pull request #102 from ctfguide-tech/dev

merge dev into main

Author: Laphatize

package.json

@@ -56,7 +56,7 @@
     "react-simplemde-editor": "^5.2.0",
     "react-text-loop": "^2.3.0",
     "react-text-transition": "^3.1.0",
-    "react-toastify": "^9.1.3",
+    "react-toastify": "^10.0.5",
     "react-tooltip": "^5.25.1",
     "react-top-loading-bar": "^2.3.1",
     "react-visibility-sensor": "^5.1.1",

public/geo-pattern.svg

@@ -28,7 +28,7 @@ function classNames(...classes) {
 const auth = getAuth();
 const baseUrl = process.env.NEXT_PUBLIC_FRONTEND_URL;
 
-const adminList = ['pranav,'];
+const adminList = ['pranav'];
 
 const DEFAULT_NOTIFICATION = {
   image:
@@ -38,12 +38,12 @@ const DEFAULT_NOTIFICATION = {
   receivedTime: '12h ago',
 };
 
-export function StandardNav() {
+export function StandardNav(props) {
   const [isAdmin, setIsAdmin] = useState(false);
   const [points, setPoints] = useState('0');
   const [notifications, setNotifications] = useState([]);
   const [showBanner, setShowBanner] = useState(false);
-
+  const { guestAllowed } = props;
   const router = useRouter();
 
   function logout() {
@@ -81,13 +81,22 @@ export function StandardNav() {
   ]);
 
   const [username, setUsername] = useState(null);
-  const [pfp, setPfp] = useState('');
+  const [pfp, setPfp] = useState(null);
 
   // get user's profile picture
   useEffect(() => {
     if (!username) {
       return;
     }
+
+  
+  if (localStorage.getItem("pfp")) {
+    setPfp(localStorage.getItem("pfp"));
+  }
+
+  
+
+   
       const fetchData = async () => {
           try {
               const endPoint = process.env.NEXT_PUBLIC_API_URL + '/users/' + username + '/pfp';
@@ -258,7 +267,8 @@ export function StandardNav() {
                     )}
                   </div>
                 </div>
-                <div className="flex items-center">
+                { !guestAllowed && 
+                  <div className="flex items-center ">
                   <div
                     className="mb-0 flex items-center space-x-2 rounded-lg px-4 py-1"
                     style={{ backgroundColor: '#212121', borderWidth: '0px' }}
@@ -389,6 +399,8 @@ export function StandardNav() {
                     </Menu>
                   </div>
                 </div>
+                }
+              
               </div>
             </div>
 

src/components/StandardNav.jsx

@@ -0,0 +1,18 @@
+import Link from 'next/link';
+
+export default function AuthFooter() {
+    return (
+
+        <div className='text-neutral-500 text-sm mt-4  items-center justify-center'>
+            &copy; CTFGuide Corporation 2024 <br />
+            <div className='flex items-center'>
+                <Link href="/terms-of-service" target="_blank" rel="noopener noreferrer" className="text-sm text-blue-600 hover:text-blue-700 mr-2">Terms of Service</Link>
+                <Link href="/privacy-policy" target="_blank" rel="noopener noreferrer" className="text-sm text-blue-600 hover:text-blue-700 mr-2">Privacy Policy</Link>
+                <a href="https://status.ctfguide.com" target="_blank" rel="noopener noreferrer" className="text-sm text-blue-600 hover:text-blue-700 ">Status</a>
+            </div>
+
+
+        </div>
+    )
+}
+

src/components/auth/AuthFooter.jsx

@@ -14,6 +14,8 @@ export function DashboardHeader() {
 
   const [points, setPoints] = useState('');
   const [rank, setRank] = useState('');
+  const baseUrl = process.env.NEXT_PUBLIC_FRONTEND_URL;
+
 
   useEffect(() => {
     try {
@@ -50,6 +52,7 @@ export function DashboardHeader() {
                 console.log(result)
                 if (result) {
                     setPfp(result)
+                    localStorage("pfp", result)
                 } else {
                     setPfp(`https://robohash.org/${username}.png?set=set1&size=150x150`)
                 }
@@ -84,7 +87,7 @@ export function DashboardHeader() {
       <div className="mx-auto max-w-7xl ">
         <div className="-mt-12 sm:-mt-16 sm:flex sm:items-end sm:space-x-5">
           <div className="flex">
-            <a href={`https://ctfguide.com/users/${username}`}>
+            <a href={`${baseUrl}/users/${username}`}>
               {(pfp && (
                 <img
                   style={{ borderColor: '#ffbf00' }}

src/components/dashboard/DashboardHeader.jsx

@@ -1,4 +1,14 @@
-export function SideNavContent({ username }) {
+import { useState } from 'react';
+import { useEffect } from 'react';
+
+export function SideNavContent({ }) {
+
+  const [username, setUsername] = useState(null);
+
+  useEffect(() => {
+    setUsername(localStorage.getItem('username'))
+  }, []);
+  
   return (
     <>
       <div
@@ -16,7 +26,7 @@ export function SideNavContent({ username }) {
           </li>
           <li className="mb-4 py-1">
             <a
-              href={`../dashboard/profile`}
+              href={`../users/${username}`}
               className="px-2 py-1 text-lg font-medium text-white hover:text-neutral-300"
             >
               <i class="fas fa-user-circle mr-2"></i>Profile

src/components/dashboard/SideNavContents.jsx

@@ -111,7 +111,7 @@ export function Hero() {
           </div>
           <div className="py-24 sm:py-32 lg:pb-40">
             <div className="mx-auto max-w-7xl px-6 lg:px-8">
-              <div className="mx-auto max-w-4xl text-center">
+              <div className= "  animate__animated animate__fadeInUp mx-auto max-w-4xl text-center">
                 <h1 className="text-4xl font-bold tracking-normal text-white sm:text-6xl leading-relaxed ">
                   The platform that <span className="text-blue-600 leading-relaxed">
                     <TextLoop>
@@ -127,7 +127,7 @@ export function Hero() {
                 <div className="mt-10 flex items-center justify-center gap-x-6">
                   <a
                     href="../register"
-                    className="rounded-md   px-6 py-1.5 text-lg font-semibold text-white border border-white hover:bg-slate-900 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-400"
+                    className="rounded-md   px-6 py-1.5 text-lg font-semibold text-white border border-white hover:bg-neutral-800/100 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-400"
                   >
                     Get started
                   </a>
@@ -145,7 +145,7 @@ export function Hero() {
               autoPlay
               width={2432}
               height={1442}
-              className="mt-16 rounded-md bg-white/5 shadow-2xl ring-1 ring-white/10 sm:mt-24"
+              className="animate__animated animate__fadeInUp mt-16 rounded-md bg-white/5 shadow-2xl ring-1 ring-white/10 sm:mt-24"
 
               >
                 <source src="../sample_vid.mp4" type="video/mp4" />