Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/nwplus/admin into erping/ui-…
Browse files Browse the repository at this point in the history
…updates
  • Loading branch information
ErpingS committed Oct 10, 2024
2 parents ab7bce3 + 9dfb804 commit 67a23e6
Show file tree
Hide file tree
Showing 7 changed files with 61 additions and 18,046 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: CI

on:
pull_request:
branches: [main]
branches: [main, dev]

jobs:
lint:
Expand Down
28 changes: 28 additions & 0 deletions components/sidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,34 @@ export default ({ hackathons, currentPath }) => {
</Link>
</NextLink>

<ItemContainer>
<Icon color={currentPath && currentPath.includes('hackerapps') && COLOR.WHITE} icon="file-alt" />
<Label selected={currentPath && currentPath.includes('hackerapps')}>Hacker Apps</Label>
</ItemContainer>

{HACKATHONS.map(id => {
const href = '/hackerapps/[id]/welcome'
const link = `/hackerapps/${id}/welcome`
return (
<NextLink key={id} href={href} as={link} passHref>
<IndentedLink
onClick={() => {
if (currentPath !== `hackerapps/${id}`) {
setIfTimeOut(
setTimeout(() => {
setLoading(true)
}, 750)
)
}
}}
selected={currentPath === `hackerapps/${id}`}
>
{id}
</IndentedLink>
</NextLink>
)
})}

<ItemContainer>
<Icon icon="th-list" />
<Label>Hackathons</Label>
Expand Down
Loading

0 comments on commit 67a23e6

Please sign in to comment.