Skip to content

Commit

Permalink
Switch branding to SDCTF
Browse files Browse the repository at this point in the history
  • Loading branch information
SheepTester committed May 9, 2024
1 parent e9426b3 commit 12e2159
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 60 deletions.
2 changes: 1 addition & 1 deletion src/GZCTF/ClientApp/.env
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VITE_BACKEND_URL="http://localhost:55000/"
VITE_BACKEND_URL="https://ctf.sdc.tf/"
9 changes: 5 additions & 4 deletions src/GZCTF/ClientApp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
<head>
<meta charset="UTF-8"/>
<meta content="width=device-width, initial-scale=1.0" name="viewport"/>
<meta content="GZ::CTF is an open source CTF platform" name="description"/>
<meta content="#0AD7AF" name="theme-color"/>
<link href="/favicon.webp" rel="icon" type="image/webp"/>
<title>GZ::CTF</title>
<meta content="San Diego CTF is an annual Capture the Flag competition hosted by ACM Cyber at UC San Diego." name="description"/>
<meta content="#F19A3E" name="theme-color"/>
<link href="/favicon.png" rel="icon" type="image/png"/>
<meta property="og:image" content="/favicon.png">
<title>SDCTF 2024</title>
</head>
<body>
<div id="root"></div>
Expand Down
Binary file added src/GZCTF/ClientApp/public/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/GZCTF/ClientApp/src/components/AppFooter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ const AppFooter: FC = () => {
<Center mx="auto" h="100%">
<Stack gap="sm" w={isMobile ? '100%' : '80%'}>
<Stack w="100%" align="center" gap={2}>
<MainIcon style={{ maxWidth: isMobile ? '3rem' : '4rem', height: 'auto' }} />
<MainIcon style={{ maxWidth: isMobile ? '3rem' : '6rem', height: 'auto' }} />
<Text fw="bold" size={isMobile ? '2rem' : '2.5rem'}>
GZ<span className={logoClasses.brand}>::</span>CTF
SDCTF
</Text>
</Stack>

Expand Down
5 changes: 1 addition & 4 deletions src/GZCTF/ClientApp/src/components/LogoHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@ export const LogoHeader = forwardRef<HTMLDivElement, GroupProps>((props, ref) =>
return (
<Group ref={ref} wrap="nowrap" {...props}>
<MainIcon style={{ maxWidth: 60, height: 'auto' }} />
<Title className={classes.title}>
{config?.title ?? 'GZ'}
<span className={classes.brand}>::</span>CTF
</Title>
<Title className={classes.title}>{config?.title ?? 'GZ'}CTF</Title>
</Group>
)
})
Expand Down
50 changes: 13 additions & 37 deletions src/GZCTF/ClientApp/src/components/icon/MainIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,43 +10,19 @@ const MainIcon: FC<MainIconProps> = (props: MainIconProps) => {
const { ignoreTheme, ...svgProps } = props

return (
<svg width="480" height="480" viewBox="0 0 4800 4800" {...svgProps}>
{ignoreTheme ? (
<path
fill="#fff"
fillRule="evenodd"
d="M2994.48,4244.61L505.28,2807.47V1992.53l256.572-148.14L1287,2285l258-307,160.39,135.56L1209.27,2400l1786.1,1031.21V2427.79L3517,1806,2420.98,886.5l573.5-331.11,705.76,407.474V3837.14Z"
/>
) : (
<path
className={classes.triangle}
fillRule="evenodd"
d="M2994.48,4244.61L505.28,2807.47V1992.53l256.572-148.14L1287,2285l258-307,160.39,135.56L1209.27,2400l1786.1,1031.21V2427.79L3517,1806,2420.98,886.5l573.5-331.11,705.76,407.474V3837.14Z"
/>
)}
<g id="Flag">
<path
id="Flag_0"
// fill="#00bfa5"
className={classes.front}
fillRule="evenodd"
d="M1280.55,582.029L2046.6,1224.82l-771.35,919.25L509.21,1501.28Z"
/>
<path
id="Flag_1"
// fill="#007f6e"
className={classes.back}
fillRule="evenodd"
d="M1225.95,1580.54l306.42,257.11-257.12,306.42Z"
/>
<path
id="Flag_2"
// fill="#1de9b6"
className={classes.mid}
fillRule="evenodd"
d="M2636.97,2699.25l-32.14,38.31-264.98,315.78L1812.4,2748.51l332.8-396.63-919.25-771.34L1997.3,661.284,3376.18,1818.3ZM1880,3601.24l0.15-.04L1351.4,4231.34,891.769,3845.67l460.361-548.64Z"
/>
</g>
<svg width="480" height="480" viewBox="0 -100 977 926" {...svgProps}>
<path
d="M608.018 543.331L572.403 557.091L647.711 327.112C647.711 327.112 625.154 331.107 613.953 340.249C602.457 349.632 589.88 373.291 589.88 373.291C589.88 373.291 589.608 364.474 589.88 358.835C590.233 351.54 591.946 344.379 591.946 344.379C591.946 344.379 579.066 357.432 575.423 367.096C572.28 375.431 571.292 391.878 571.292 391.878C560.833 366.349 565.376 348.268 582.295 331.043C599.387 313.642 643.633 319.249 643.633 319.249C643.633 319.249 632.884 309.304 624.992 305.141C616.286 300.549 598.142 292.75 598.142 292.75L622.926 296.88C622.926 296.88 607.474 283.851 596.076 277.97C586.133 272.84 569.226 267.969 569.226 267.969L600.207 272.098C600.207 272.098 593.09 264.313 585.75 259.708C578.409 255.102 558.9 245.252 558.9 245.252C558.9 245.252 618.24 251.392 635.319 277.97C644.387 292.082 653.526 313.352 653.526 313.352C653.526 313.352 657.046 300.926 658.038 292.75C659.302 282.342 658.038 265.903 658.038 265.903L665.397 282.424C665.397 282.424 668.698 266.061 665.397 255.577C662.096 245.093 653.526 230.795 653.526 230.795C653.526 230.795 686.004 249.488 685.183 272.098C684.622 287.557 664.234 315.318 664.234 315.318C684.526 296.555 724.819 273.072 754.434 282.424C777.692 289.769 787.478 303.344 786.092 327.112C786.092 327.112 779.629 317.958 774.22 313.352C768.811 308.746 758.391 303.524 758.391 303.524L762.349 315.318C762.349 315.318 750.181 306.318 742.719 303.524C735.256 300.73 707.607 301.011 707.607 301.011L726.196 309.272C726.196 309.272 709.365 306.867 699.033 309.272C689.927 311.391 677.269 319.249 677.269 319.249C677.269 319.249 722.826 328.179 742.719 350.699C762.903 373.548 769.569 416.66 769.569 416.66C769.569 416.66 764.245 405.892 758.391 397.874C749.635 385.88 736.627 368.39 736.627 368.39V397.874C736.627 397.874 733.67 385.463 728.261 376.252C722.853 367.041 714.862 356.77 714.862 356.77V382.149C714.862 382.149 707.948 361.325 699.033 350.699C688.518 338.165 679.616 333.556 665.397 331.043C665.397 331.043 679.178 353.016 685.183 368.39C693.56 389.836 701.865 413.738 699.033 437.187C696.767 455.956 677.269 468.288 677.269 468.288C677.269 468.288 681.738 454.679 682.823 445.049C683.907 435.42 682.823 416.66 682.823 416.66L670.431 437.311C670.431 437.311 671.882 422.912 672.496 412.53C673.109 402.147 672.496 382.149 672.496 382.149L660.104 403.771C660.104 403.771 664.721 379.249 662.169 360.901C660.748 350.687 655.973 338.183 655.973 338.183L608.018 543.331Z"
fill="#F19A3E"
stroke="black"
strokeLinejoin="round"
/>
<path
d="M453.565 453.833C436.292 411.383 391.603 323.727 391.603 323.727C391.603 323.727 393.669 356.77 395.735 373.291C397.482 387.268 408.127 414.595 408.127 414.595L391.603 400.138L420.519 474.485C420.519 474.485 385.128 443.783 375.08 420.79C358.447 382.723 364.754 350.575 375.08 298.946C375.08 298.946 365.321 306.946 360.623 313.401C350.258 327.645 335.838 367.096 335.838 367.096V327.858C335.838 327.858 327.577 338.184 317.25 356.77C306.923 375.356 298.661 400.138 298.661 400.138L304.858 350.575C304.858 350.575 284.204 377.422 278.008 387.748C266.975 406.132 253.223 437.311 253.223 437.311C253.223 437.311 254.159 393.06 263.55 367.096C271.767 344.379 294.531 317.532 294.531 317.532L267.681 327.858C267.681 327.858 286.269 307.206 306.923 294.816C320.755 286.517 348.231 280.359 348.231 280.359C348.231 280.359 308.988 272.098 286.269 280.359C274.429 284.664 253.223 298.946 253.223 298.946L261.485 278.294C261.485 278.294 247.283 283.427 240.831 290.685C234.378 297.943 220.177 313.401 220.177 313.401L226.373 286.555C226.373 286.555 215.802 295.06 205.719 305.141C195.637 315.222 183 331.988 183 331.988C186.66 298.3 211.846 266.419 242.896 253.512C261.649 245.717 274.27 245.907 294.531 247.317C328.45 249.677 375.08 280.359 375.08 280.359C375.08 280.359 361.323 254.288 348.231 241.121C317.626 210.343 282.825 202.436 242.896 222.535C242.896 222.535 253.015 208.739 261.485 201.883C269.954 195.028 286.269 187.427 286.269 187.427L259.419 183.297C288.078 172.164 323.052 165.638 348.231 187.427C363.001 200.209 375.08 222.535 375.08 222.535V193.623C375.08 193.623 384.255 210.892 387.473 230.795C390.565 249.92 391.603 292.75 391.603 292.75C391.603 292.75 401.676 265.906 414.323 253.512C427.979 240.129 457.696 230.795 457.696 230.795L445.304 243.186C445.304 243.186 466.742 242.369 480.415 247.317C496.051 252.974 515.527 272.098 515.527 272.098C515.527 272.098 481.439 260.462 457.696 263.838C429.816 267.802 403.996 292.75 403.996 292.75C403.996 292.75 426.505 294.785 451.5 305.141C469.375 312.548 489.531 326.647 499.004 336.119C521.723 358.835 521.723 408.399 521.723 408.399C521.723 408.399 512.911 392.489 507.265 383.617C501.619 374.745 492.808 362.966 492.808 362.966L490.742 381.552C490.742 381.552 485.255 371.031 480.415 362.966C475.576 354.901 453.565 331.988 453.565 331.988L457.696 356.77C457.696 356.77 444.64 339.901 437.042 331.988C424.957 319.403 403.996 309.272 403.996 309.272C403.996 309.272 450.399 395.269 472.154 437.311C496.879 485.094 532.199 569.702 532.199 569.702L488.549 584.511C488.549 584.511 473.695 503.3 453.565 453.833Z"
fill="#51C0C0"
stroke="black"
strokeLinejoin="round"
/>
</svg>
)
}
Expand Down
4 changes: 2 additions & 2 deletions src/GZCTF/ClientApp/src/pages/About.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const About: FC = () => {
<Stack justify="space-between" h="calc(100vh - 16px)">
<Center h="calc(100vh - 16px)">
<Title order={2} className={classes.watermark}>
GZ::CTF
SDCTF
</Title>
<Text className={classes.bio}>
&gt; {config?.slogan ?? t('common.content.about.slogan')}
Expand Down Expand Up @@ -55,7 +55,7 @@ const About: FC = () => {
}}
className={classes.title}
>
GZ<span className={classes.brand}>::</span>CTF
SDCTF
</Title>
<Group ml="-18px" mt="-5px">
<Anchor
Expand Down
20 changes: 10 additions & 10 deletions src/GZCTF/ClientApp/src/utils/ThemeOverride.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@ export const CustomTheme: MantineThemeOverride = createTheme({
'#141414',
],
brand: [
'#A7FFEB',
'#64FFDA',
'#25EEBA',
'#1DE9B6',
'#0AD7AF',
'#04CAAB',
'#02BFA5',
'#009985',
'#007F6E',
'#005A4C',
'#F19A3E',
'#F19A3E',
'#F19A3E',
'#F19A3E',
'#F19A3E',
'#F19A3E',
'#F19A3E',
'#F19A3E',
'#F19A3E',
'#F19A3E',
],
alert: [
'#FFB4B4',
Expand Down

0 comments on commit 12e2159

Please sign in to comment.