Skip to content

sync #203

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 5 commits into from
Aug 26, 2024
Merged

sync #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fa94e61
feat: cooler looking activity feed!
AbhiByreddy Aug 13, 2024
90e91bf
feat: allow unverified challenges to edit and see challenge screen
AbhiByreddy Aug 13, 2024
e49ce3e
feat: users being able to go to their challenge thats verified off cr…
AbhiByreddy Aug 13, 2024
c582fb5
Update dashboard.jsx
Laphatize Aug 22, 2024
4ae71ea
Merge pull request #202 from ctfguide-tech/feat/HeroChanges
Laphatize Aug 22, 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
2 changes: 1 addition & 1 deletion src/components/home/Hero.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export function Hero() {
{ userName: 'laphatize', challengeName: 'Excel-lently Hidden', profilePic: 'https://imagedelivery.net/1Dym4oPRvM_5USnDWCdSCw/7523c0cb-2330-443c-94f1-030cd8bde300/public' },
{ userName: 'herronjo', challengeName: 'Trading Bananas' , profilePic: 'https://imagedelivery.net/1Dym4oPRvM_5USnDWCdSCw/1bd03d05-1057-48fc-3d3f-b3ed512cb500/public' },
{ userName: 'thunderbird', challengeName: 'Sneaky Cat ' , profilePic: 'https://imagedelivery.net/1Dym4oPRvM_5USnDWCdSCw/3b312b5f-c90d-490d-80d0-e52b367d4400/public' },
{ userName: 'steven', challengeName: 'Pretty Obvious', profilePic: 'https://imagedelivery.net/1Dym4oPRvM_5USnDWCdSCw/3e75c7a3-dfe9-47cc-0d46-736187e62400/public' },
{ userName: 'stevestef', challengeName: 'Pretty Obvious', profilePic: 'https://imagedelivery.net/1Dym4oPRvM_5USnDWCdSCw/3e75c7a3-dfe9-47cc-0d46-736187e62400/public' },
]);
};

Expand Down
23 changes: 23 additions & 0 deletions src/pages/create.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,8 +437,31 @@ export default function Create() {
>
<i className="fas fa-comments mr-1"></i> View Feedback
</button>

<a className='ml-4 text-red-600 hover:text-red-700 cursor-pointer' onClick={() => window.open(`../../challenges/${challenge.id}`, '_blank')}>
<i className="fas fa-external-link-alt mr-2"></i>
Go to Challenge Page
</a>
</>
)}
{challenge.state === 'STANDARD_UNVERIFIED' &&(
<>
<a href={`/create/edit?id=${challenge.id}`} className="text-blue-600 hover:text-blue-500">
<i className="fas fa-pencil-alt mr-1"></i> Edit<span className="sr-only">, {challenge.title}</span>
</a>

<a className='ml-4 text-red-600 hover:text-red-700 cursor-pointer' onClick={() => window.open(`../../challenges/${challenge.id}`, '_blank')}>
<i className="fas fa-external-link-alt mr-2"></i>
Go to Challenge Page
</a>
</>
)}
{challenge.state === 'STANDARD_VERIFIED' &&(
<a className='ml-4 text-red-600 hover:text-red-700 cursor-pointer' onClick={() => window.open(`../../challenges/${challenge.id}`, '_blank')}>
<i className="fas fa-external-link-alt mr-2"></i>
Go to Challenge Page
</a>
)}

</td>

Expand Down
5 changes: 3 additions & 2 deletions src/pages/dashboard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,20 +257,21 @@ export default function Dashboard() {
</h1>
<ul className='flex flex-col gap-4 [&>*]:line-clamp-2'>

{activities && activities.length > 0 ?
{activities && activities.length > 0 ?
activities.slice().reverse().map((data) =>
<div className="text-lg">
<li>
<a className='text-blue-500 hover:text-blue-600 cursor-pointer font-bold' href={"../users/" + data.userName}>{data.userName}</a> completed
<a className='text-yellow-500 hover:text-yellow-600 cursor-pointer' href={"../challenges/" + data.challengeId}> {data.challengeName}</a>
</li>
</div>
</div>
) :
<>
<Skeleton containerClassName='col-span-2' className='mb-4' baseColor='#262626' highlightColor='#3a3a3a' count={2} />
</>
}



</ul>
</div>
Expand Down