Skip to content

late march - early april sprint #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Apr 15, 2025
Merged

late march - early april sprint #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
af551e3
Merge pull request #224 from ctfguide-tech/main
Laphatize Jan 6, 2025
b52df44
Merge pull request #225 from ctfguide-tech/main
Laphatize Mar 19, 2025
00f0c51
Merge pull request #227 from ctfguide-tech/main
Laphatize Apr 3, 2025
3d50821
Merge remote-tracking branch 'upstream/dev' into dev
davidyoum Apr 5, 2025
32f69e5
Fixed bug official
davidyoum Apr 5, 2025
d1a1408
Merge pull request #229 from davidyoum/link-fix
Laphatize Apr 5, 2025
ef98ab5
Merge branch 'link-fix' into dev
davidyoum Apr 5, 2025
f0df5a0
Merge remote-tracking branch 'upstream/dev' into dev
davidyoum Apr 5, 2025
1bf520b
Made it mobile friendly and overall nicer looking
davidyoum Apr 7, 2025
01128fe
Merge pull request #230 from davidyoum/new-404-site
Laphatize Apr 7, 2025
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
16 changes: 8 additions & 8 deletions src/components/settingComponents/sidebar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,30 @@ export default function Sidebar() {
<ul className="mr-2 py-2">
<li className="py-1">
<Link href="../settings" passHref>
<a className="px-2 py-1 text-lg font-medium text-white hover:text-gray-400 sm:text-base">
<div className="px-2 py-1 text-lg font-medium text-white hover:text-gray-400 sm:text-base">
General
</a>
</div>
</Link>
</li>
<li className="py-1">
<Link href="../settings/security" passHref>
<a className="px-2 py-1 text-lg font-medium text-white hover:text-gray-400 sm:text-base">
<div className="px-2 py-1 text-lg font-medium text-white hover:text-gray-400 sm:text-base">
Security
</a>
</div>
</Link>
</li>
<li className="py-1">
<Link href="../settings/preferences" passHref>
<a className="px-2 py-1 text-lg font-medium text-white hover:text-gray-400 sm:text-base">
<div className="px-2 py-1 text-lg font-medium text-white hover:text-gray-400 sm:text-base">
Email Preferences
</a>
</div>
</Link>
</li>
<li className="py-1">
<Link href="../settings/billing" passHref>
<a className="px-2 py-1 text-lg font-medium text-white hover:text-gray-400 sm:text-base">
<div className="px-2 py-1 text-lg font-medium text-white hover:text-gray-400 sm:text-base">
Billing
</a>
</div>
</Link>
</li>
</ul>
Expand Down
26 changes: 14 additions & 12 deletions src/pages/404.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ const NotFound = () => {
</style>
</Head>
<div className="grid h-screen place-items-center bg-center">
<div className="text-blue-600 mt-12 mx-auto text-center">
<div className="text-blue-600 mx-auto text-center">
<div className='grid-cols-1 grid'>
<div>
<div className='p-2'>
<img
width="200"
width="150"
src={`${process.env.NEXT_PUBLIC_FRONTEND_URL}/ctfguide404WithLogo.png`}
className='mx-auto text-center mt-10'
className='mx-auto text-center mt-5'
alt="CTF Guide 404"
/>
<h1 className='text-white text-xl mt-4'>Uh, oh. We looked everywhere and couldn't find that page.</h1>
<div className='bg-black text-white text-left px-4 py-4 mt-4'>
<div className='bg-black text-white text-left px-4 py-4 mt-4 mb-4'>
<div>
root@ctfguide:/home/cat/cat_stuff: <span className='text-yellow-400'>cd {pathname}</span> <br />
bash: cd: {pathname}: <span className='text-red-500'>No such file or directory</span>
Expand All @@ -45,18 +45,20 @@ const NotFound = () => {
<a className='ml-2 hover:text-blue-500 cursor-pointer' href="https://discord.gg/cTp4w9u8F2">[Join our Discord]</a>
</div>
</div>
<img
width="500"
src={`${process.env.NEXT_PUBLIC_FRONTEND_URL}/Kana404.png`}
className='mx-auto text-center mt-10'
alt="Kana 404"
/>

<span
onClick={() => router.back()}
className="mt-6 cursor-pointer text-neutral-200 hover:text-neutral-400 mr-4 text-lg"
className="cursor-pointer text-neutral-200 hover:text-neutral-400 mr-4 text-2xl"
>
<i className="fas fa-arrow-left"></i> Go Back
</span>

<img
width="500"
src={`${process.env.NEXT_PUBLIC_FRONTEND_URL}/Kana404.png`}
className='mx-auto mt-10 text-center hidden lg:block'
alt="Kana 404"
/>
</div>
</div>
</div>
Expand Down