Skip to content

Bring changes from main into dev #161

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 3 commits into from
Jul 31, 2024
Merged

Bring changes from main into dev #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff95a19
feat: remove login warning
Laphatize Jul 30, 2024
4083381
feat: vercel analytics
Laphatize Jul 30, 2024
2125846
Merge pull request #160 from ctfguide-tech/dev
Laphatize Jul 31, 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
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"@tremor/react": "^1.8.1",
"@uiw/react-markdown-editor": "^6.1.1",
"@uiw/react-md-editor": "3.6.0",
"@vercel/analytics": "^1.3.1",
"asciinema-player": "3.6.3",
"autoprefixer": "^10.4.12",
"babel-plugin-macros": "^3.1.0",
Expand Down
1 change: 1 addition & 0 deletions src/pages/_app.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { GoogleOAuthProvider } from '@react-oauth/google';
import { Context } from '../context';
import { useEffect, useState } from 'react';
import request from '@/utils/request';
import { Analytics } from "@vercel/analytics/react"

export default function App({ Component, pageProps }) {
const [username, setUsername] = useState('');
Expand Down
5 changes: 0 additions & 5 deletions src/pages/login.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,7 @@ export default function Login() {
className="flex min-h-full flex-col justify-center py-12 sm:px-6 lg:px-8 animate__animated animate__fadeIn "
>

<h1 className='text-red-400 text-center'>You are on the preview version of CTFGuide. Preview accounts do not use the same authentication system as https://ctfguide.com</h1>
<h1 className='text-red-400 text-center'>Account data may not persist. Features may not work as expected.</h1>
<h1 className='text-red-400 text-center'>You assume all risk by using preview.ctfguide.com.</h1>

<a className='mx-auto bg-blue-700 mt-2 text-white px-4 py-2 rounded-md w-1/6 text-center' href='https://ctfguide.com'>Take me to the main site</a>

<form onSubmit={handleLogin}>

<div className="sm:mx-auto sm:w-full sm:max-w-md">
Expand Down
12 changes: 12 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1960,6 +1960,13 @@
resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==

"@vercel/analytics@^1.3.1":
version "1.3.1"
resolved "https://registry.yarnpkg.com/@vercel/analytics/-/analytics-1.3.1.tgz#e2b1deac1b5d14fa2e4fe36186ac5054c6385ae4"
integrity sha512-xhSlYgAuJ6Q4WQGkzYTLmXwhYl39sWjoMA3nHxfkvG+WdBT25c563a7QhwwKivEOZtPJXifYHR1m2ihoisbWyA==
dependencies:
server-only "^0.0.1"

acorn-jsx@^5.3.2:
version "5.3.2"
resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
Expand Down Expand Up @@ -6751,6 +6758,11 @@ seroval@^1.0.2:
resolved "https://registry.yarnpkg.com/seroval/-/seroval-1.0.2.tgz#ec5f5026239ed0d6935139482353d9648e875835"
integrity sha512-buswWxRzf65ZGUk8MAf3qVtBJHbe5gq6hZyPeqlJCKEIl/tEhUZze0YJg7vB7tFRGgPeneRaP083OB/vDiYLvA==

server-only@^0.0.1:
version "0.0.1"
resolved "https://registry.yarnpkg.com/server-only/-/server-only-0.0.1.tgz#0f366bb6afb618c37c9255a314535dc412cd1c9e"
integrity sha512-qepMx2JxAa5jjfzxG79yPPq+8BuFToHd1hm7kI+Z4zAq1ftQiP7HcxMhDDItrbtwVeLg/cY2JnKnrcFkmiswNA==

shebang-command@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
Expand Down