Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
dfa14e3
Updated navbar
kynhix Mar 28, 2024
b9c2be1
Updated navbar and cleared out dashboard
kynhix Mar 29, 2024
604e9a6
Dashboard redesign
kynhix Mar 31, 2024
ca048bb
Fixed multiple errors on dashboard, and added CardDecorator componentp
kynhix Apr 1, 2024
40a8b75
Added card container plugin style
kynhix Apr 1, 2024
b86f080
Refactored navbar
kynhix Apr 2, 2024
82e43f1
Refactored settings page to use Link components instead of a tags
kynhix Apr 2, 2024
5427e11
Navbar is now keyboard accessible
kynhix Apr 2, 2024
de911b4
Added card decorator support for left
kynhix Apr 2, 2024
af9c15c
Refactored Challenge card and slight dashboard update
kynhix Apr 2, 2024
cb76c46
Added ChallengeCard Component.
kynhix Apr 3, 2024
3eb83e1
Updated ChallengeCard style
kynhix Apr 4, 2024
8b3afa9
Refactored practice page to be reactive
kynhix Apr 5, 2024
4271e58
Dashboard is currently still under development and being tested
kynhix Apr 6, 2024
f1c7bb3
Merge pull request #1 from ctfguide-tech/dev
kynhix Apr 6, 2024
ff25cda
Merge pull request #110 from kynhix/dev
AbhiByreddy Apr 6, 2024
53337a8
[feat] fix build errors
Laphatize Apr 6, 2024
038be79
[feat] new sales page for edu
Laphatize Apr 6, 2024
09f86da
Improved readability of careers page
kynhix Apr 6, 2024
5b31e5f
Added loading style to challenge cards
kynhix Apr 6, 2024
2fafe74
Updated loading style
kynhix Apr 6, 2024
6a325bd
fixed skeleton loading in DashboardHeader
kynhix Apr 6, 2024
0993614
Refactored dashboard and challenge cards
kynhix Apr 7, 2024
86467fa
minor profile changes
k-kochhar Apr 8, 2024
71e5198
Updated Challenge Card to be brighter
kynhix Apr 8, 2024
2a72e7c
removed learn page
kynhix Apr 12, 2024
d11c5e3
Redesign of challenges page
kynhix Apr 14, 2024
0904157
Merge branch 'pages/dashboard' into dev
kynhix Apr 14, 2024
1718327
Updated challenge pages
kynhix Apr 16, 2024
7e03ba8
Merge branch 'pages/dashboard' into dev
kynhix Apr 16, 2024
f7b4664
Fixed markdown not displaying properly
kynhix Apr 17, 2024
50204e5
Added indicator for which tab you have selected on challenge
kynhix Apr 17, 2024
24843c7
Added caching system
kynhix Apr 17, 2024
11f4296
Updated caching system
kynhix Apr 17, 2024
46bf0a3
Added dialog box to challenges
kynhix Apr 19, 2024
f626de5
feat: UI/UX improvements to homepage
Laphatize May 8, 2024
b80278f
feat: more ui/ux improvements to home
Laphatize May 8, 2024
bc8c3ac
Merge branch 'feature/challenges' into dev
kynhix May 9, 2024
a2c06fd
feat: navbar experiments
Laphatize May 9, 2024
e3a8f96
:wq
Laphatize May 9, 2024
755cad8
feat: remove countup
Laphatize May 11, 2024
162caa5
feat: lots of new ui
Laphatize May 11, 2024
d91e05b
feat: search
Laphatize May 11, 2024
b55acca
chore: remove references to Stats component
Laphatize May 11, 2024
df36be1
feat: more ui updates
Laphatize May 11, 2024
cfb1048
Creating new challenges on gp works
SteveStef May 11, 2024
e0585e7
Adjusting register flow functions
SteveStef May 13, 2024
3a6af3c
TestPage
Anindya-K-Das May 14, 2024
20affb3
Login and signup complete
SteveStef May 15, 2024
8ee51f6
feat: new ui
Laphatize May 16, 2024
8622e48
Merge branch 'dev' of https://github.com/ctfguide-tech/CTFGuideReact-…
Laphatize May 16, 2024
e0f5f41
feat: components + more responsiveness
Laphatize May 16, 2024
7601386
Email verification
SteveStef May 17, 2024
2b74311
Merge branch 'ctfguide-tech:dev' into dev
Anindya-K-Das May 18, 2024
38ec626
feat: latest component structures
Anindya-K-Das May 18, 2024
22a3892
Google login update
SteveStef May 18, 2024
6f9fd24
feat: conditional rendering for what is pro and what isn't
Laphatize May 18, 2024
424be72
feat: new practice page ui/ux
Laphatize May 18, 2024
a9fdb66
feat: upgrade page
Laphatize May 18, 2024
c5a77e6
feat: new create page
Laphatize May 19, 2024
c57d1fa
Google auth is complete
SteveStef May 19, 2024
ae7c24b
Added components for billing and preferences
Anindya-K-Das May 20, 2024
0218594
added function to get all writeups for a challengeid
AbhiByreddy May 20, 2024
af024a9
Turned components into pages and used router.push to render page
Anindya-K-Das May 20, 2024
172ed18
Restructured code and added variables into pages
Anindya-K-Das May 20, 2024
22fb573
bug fix
SteveStef May 21, 2024
0712b30
feat: Revamp Settings
Anindya-K-Das May 22, 2024
d426dcc
chore: clean up PR
Laphatize May 22, 2024
79de65d
Co-authored-by: Sai Rangineeni <SAIRANGINEENI1@GMAIL.COM>
Laphatize May 22, 2024
511f1a3
chore: clean up
Laphatize May 22, 2024
2fcae20
Merge pull request #114 from Anindya-K-Das/dev
Laphatize May 22, 2024
588a58f
Merge branch 'dev' into feat-auth-frontend
Laphatize May 23, 2024
e2ed5c8
Merge pull request #115 from ctfguide-tech/feat-auth-frontend
Laphatize May 23, 2024
e277cdd
Fixed auth firebase dep
SteveStef May 23, 2024
0162b43
Fixed not defined bug
SteveStef May 23, 2024
e68b9fe
feat: moderation panel v.1
Laphatize May 23, 2024
7f783b9
chore: update env.development
Laphatize May 23, 2024
6540229
chore: fix env bug in frontend
Laphatize May 23, 2024
0677a42
feat: update bug
Laphatize May 23, 2024
a7baf0f
feat: update frontend
Laphatize May 23, 2024
9e0bae4
Bug in classrooms from new auth fix
SteveStef May 23, 2024
50907e1
Merge branch 'dev' of https://github.com/ctfguide-tech/CTFGuideNext i…
SteveStef May 23, 2024
9de781c
feat: more ui updates
Laphatize May 24, 2024
b989765
Merge branch 'dev' of https://github.com/ctfguide-tech/CTFGuideReact-…
Laphatize May 24, 2024
30b4222
first
SteveStef May 25, 2024
8a180e4
Searching for users or challenges
SteveStef May 25, 2024
47fda0f
feat: writeup editor v.0.1
Laphatize May 25, 2024
2de234d
Merge branch 'dev' into feat-search-frontend
Laphatize May 25, 2024
c236ae7
Merge pull request #116 from ctfguide-tech/feat-search-frontend
Laphatize May 25, 2024
564cf52
chore: update .env api url
Laphatize May 25, 2024
9943e90
Made the auth login go to onboarding on 401
SteveStef May 26, 2024
3eca4cd
Time left
SteveStef May 27, 2024
13b156f
Context reloading
SteveStef May 28, 2024
2a370a4
Small bug fixed
SteveStef May 28, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .env.development
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@
#NEXT_PUBLIC_APP_MEASUREMENT_ID=G-7ZNKM9VFN2

# TDO
#
NEXT_PUBLIC_API_URL=https://node-api-vchgui6lfq-uc.a.run.app
NEXT_PUBLIC_FRONTEND_URL=https://preview.ctfguide.com
#NEXT_PUBLIC_API_URL=http://localhost:3001
#NEXT_PUBLIC_FRONTEND_URL=http://localhost:3000

NEXT_PUBLIC_API_URL=http://localhost:3001
NEXT_PUBLIC_FRONTEND_URL=http://localhost:3000
NEXT_PUBLIC_APP_API_KEY=AIzaSyAHz1s-UuNhlZ6aKvqwzmzzidzWxBKw9hw
NEXT_PUBLIC_APP_AUTH_DOMAIN=ctfguide-dev.firebaseapp.com
NEXT_PUBLIC_APP_PROJECT_ID=ctfguide-dev
Expand All @@ -23,3 +26,4 @@ NEXT_PUBLIC_APP_MEASUREMENT_ID=G-7ZNKM9VFN2
NEXT_PUBLIC_TERM_URL=https://file-system-run-qi6ms4rtoa-ue.a.run.app/
NEXT_PUBLIC_APP_STRIPE_KEY=pk_test_51NyMUrJJ9Dbjmm7hji7JsdifB3sWmgPKQhfRsG7pEPjvwyYe0huU1vLeOwbUe5j5dmPWkS0EqB6euANw2yJ2yQn000lHnTXis7
NEXT_PUBLIC_KANA_SERVER_URL=kana-server.ctfguide.com
NEXT_PUBLIC_GOOGLE_CLIENT_ID=166652277588-4uk7g7irqlicacelg1nfgt0ejmskmo9h.apps.googleusercontent.com
Empty file added .vscode/settings.json
Empty file.
16 changes: 16 additions & 0 deletions components.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"$schema": "https://ui.shadcn.com/schema.json",
"style": "default",
"rsc": false,
"tsx": false,
"tailwind": {
"config": "tailwind.config.js",
"css": "src/styles/globals.css",
"baseColor": "gray",
"cssVariables": false
},
"aliases": {
"utils": "@/lib/utils",
"components": "@/components"
}
}
10 changes: 7 additions & 3 deletions next.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
const removeImports = require("next-remove-imports")();

/** @type {import('next').NextConfig} */
const nextConfig = {
webpack: (config, { dev }) => {
Expand All @@ -15,8 +17,10 @@ const nextConfig = {
},
experimental: {
scrollRestoration: true,
esmExternals: true, // Add this to ensure esmExternals is true
},
ignoreDuringBuilds: true
}
ignoreDuringBuilds: true,
transpilePackages: ['react-md-editor']
};

module.exports = nextConfig
module.exports = removeImports(nextConfig);
11 changes: 9 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,12 @@
"@heroicons/react": "^2.0.13",
"@mui/material": "^5.15.2",
"@mui/x-charts": "^6.18.4",
"@react-oauth/google": "^0.12.1",
"@stripe/stripe-js": "^2.1.7",
"@tailwindcss/forms": "^0.5.3",
"@tremor/react": "^1.8.1",
"@uiw/react-markdown-editor": "^6.1.1",
"@uiw/react-md-editor": "3.6.0",
"asciinema-player": "3.6.3",
"autoprefixer": "^10.4.12",
"babel-plugin-macros": "^3.1.0",
Expand All @@ -33,39 +36,43 @@
"dotenv": "^16.0.3",
"easymde": "^2.18.0",
"enable": "^3.4.0",
"firebase": "^9.16.0",
"focus-visible": "^5.2.0",
"framer-motion": "^10.2.4",
"heroicons": "^2.0.13",
"jwt-decode": "^4.0.0",
"marked": "^4.3.0",
"material-ui-popup-state": "^5.0.5",
"next": "^14.0.2",
"next-remove-imports": "^1.0.12",
"postcss-focus-visible": "^6.0.4",
"puppeteer": "^22.0.0",
"react": "18.2.0",
"react-chartjs-2": "^5.2.0",
"react-collapsible": "^2.10.0",
"react-countup": "^2.4.0",
"react-dom": "18.2.0",
"react-firebase-hooks": "^5.1.1",
"react-google-charts": "^4.0.1",
"react-joyride": "^2.7.2",
"react-loading-skeleton": "^3.2.0",
"react-markdown": "^8.0.7",
"react-router-dom": "^6.9.0",
"react-select-country-list": "^2.2.3",
"react-simplemde-editor": "^5.2.0",
"react-text-loop": "^2.3.0",
"react-text-transition": "^3.1.0",
"react-toastify": "^10.0.5",
"react-tooltip": "^5.25.1",
"react-top-loading-bar": "^2.3.1",
"react-transition-group": "^4.4.5",
"react-visibility-sensor": "^5.1.1",
"reactjs-popup": "^2.0.5",
"recharts": "^2.5.0",
"simplemde": "^1.11.2",
"socket.io-client": "^4.7.4",
"stripe": "^13.9.0",
"tailwind-merge": "^2.3.0",
"tailwindcss": "^3.2.1",
"tailwindcss-animate": "^1.0.7",
"xterm": "^5.3.0"
},
"devDependencies": {
Expand Down
Binary file added public/flag.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/icons8-leaderboard.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/newflag.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/site.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 1 addition & 15 deletions src/components/AuthPopup.jsx
Original file line number Diff line number Diff line change
@@ -1,24 +1,10 @@
import { useState, useEffect } from 'react';
import Link from 'next/link';
import { getAuth, onAuthStateChanged } from 'firebase/auth';
//import { getAuth, onAuthStateChanged } from 'firebase/auth';

export function AuthPopup() {
// check if firebase logged in
const [user, setUser] = useState(false);
const auth = getAuth();
useEffect(() => {
const auth = getAuth();
onAuthStateChanged(auth, (user) => {
if (user) {
// User is signed in, see docs for a list of available properties
// https://firebase.google.com/docs/reference/js/firebase.User
const uid = user.uid;
setUser(false);
} else {
setUser(false);
}
});
});
if (user) {
return <div>{/*User logged in*/}</div>;
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,4 @@ export function Header() {
</Container>
</header>
);
}
}
4 changes: 2 additions & 2 deletions src/components/Logo.jsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
export function Logo(props) {
return (
<div className="mx-auto my-auto flex">
<img className="mx-auto w-12 text-center" src="../../../../darkLogo.png" />
<img className="mx-auto w-12 text-center spin-on-hover" src="../../../../darkLogo.png" />
<h1
className="my-auto text-xl font-semibold text-white"
style={{ fontFamily: 'Poppins, sans-serif' }}
>
CTFGuide <span className="text-blue-500 text-sm ">BETA</span>
CTFGuide
</h1>
</div>
);
Expand Down
4 changes: 2 additions & 2 deletions src/components/MarkdownViewer.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from 'react';
import ReactMarkdown from 'react-markdown';

export function MarkdownViewer({content, className = ""}) {
export function MarkdownViewer({ content, className = "" }) {
return (
<div style={{whiteSpace: "pre-wrap"}} className={`${className} markdown `}>
<div className={`${className} markdown `}>
<ReactMarkdown>{content}</ReactMarkdown>
</div>
);
Expand Down
10 changes: 5 additions & 5 deletions src/components/PersonCard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@ export default function PersonCard({ person }) {
return (
<motion.div
className="py-8 text-white"
// whileHover={{ rotate: 360 }}
// whileHover={{ rotate: 360 }}
>
<img
className="mx-auto h-42 w-42 rounded-full border bg-neutral-900"
src={`https://robohash.org/${person.personName}.png?set=set1&size=150x150`}
loading="lazy"
alt=""
/>
<h1 className="mt-4 text-xl font-bold text-blue-500">{person.personName}</h1>
<h2>{person.position}</h2>
<hr className='mt-4 border-gray-500 w-4/5 mx-auto'></hr>
<h1 className="mt-4 text-center text-xl font-bold text-blue-500">{person.personName}</h1>
<h2 className='text-center'>{person.position}</h2>
<hr className='mt-4 text-center border-gray-500 w-4/5 mx-auto'></hr>
<motion.p
className="mt-4 text-lg px-2 leading-relaxed text-gray-300"
className="mt-4 text-justify text-lg px-2 leading-relaxed text-gray-300"
variants={variants}
initial="hidden"
animate="visible"
Expand Down
Loading