Skip to content

Commit

Permalink
feat: Add devsoc logo and replace most csesoc references (#1097)
Browse files Browse the repository at this point in the history
* feat: Add devsoc logo and replace most csesoc references

* fix: changed all csesoc styled component names

* feat: add UNSW branding

---------

Co-authored-by: ollibowers <[email protected]>
  • Loading branch information
3bobchen and ollibowers authored Jan 25, 2024
1 parent 7ad2d70 commit a9d50e4
Show file tree
Hide file tree
Showing 6 changed files with 68 additions and 16 deletions.
51 changes: 51 additions & 0 deletions frontend/src/assets/devsocLogo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 7 additions & 6 deletions frontend/src/pages/LandingPage/FooterSection/Footer.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PageContainer from 'styles/PageContainer';
import csesocLogoSrc from 'assets/csesocLogo.png';
import devsocLogo from 'assets/devsocLogo.svg';
import footerBlobSrc from 'assets/LandingPage/footerBlob.svg';
import { CURR_YEAR } from 'config/constants';
import S from './styles';
Expand All @@ -13,13 +13,14 @@ const Footer = () => {
<PageContainer>
<S.FooterContentContainer>
<S.FooterLogoWrapper>
<S.CSELogo src={csesocLogoSrc} alt="CSESoc Logo" />
<b>© {CURR_YEAR}CSESoc UNSW</b>
<S.DevSocLogo src={devsocLogo} alt="DevSoc Logo" />
<b>© {CURR_YEAR}Software Development Society UNSW</b>
</S.FooterLogoWrapper>
<S.FooterDisclaimer>
<div>
CSESoc is the constituent student society of UNSW&apos;s School of Computer Science
and Engineering. We do not represent the School, Faculty, or University.
Software Development Society (DevSoc) is a student society comprised of interested
developers, inventors and tech enthusiasts. We do not represent the School, Faculty,
or University (UNSW).
</div>
<div>
This website seeks to be a general guide for degree planning and course selection,
Expand All @@ -34,7 +35,7 @@ const Footer = () => {
Engineering Society have no responsibility on whether the information shown is
accurate.
</div>
<div>Circles was made with love by CSE students for CSE students.</div>
<div>Circles was made with love by students for students.</div>
</S.FooterDisclaimer>
</S.FooterContentContainer>
</PageContainer>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/pages/LandingPage/FooterSection/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const FooterLogoWrapper = styled.div`
gap: 50px;
`;

const CSELogo = styled.img`
const DevSocLogo = styled.img`
width: 100%;
`;

Expand All @@ -45,5 +45,5 @@ export default {
FooterLogoWrapper,
FooterDisclaimer,
FooterWrapper,
CSELogo
DevSocLogo
};
4 changes: 2 additions & 2 deletions frontend/src/pages/LandingPage/GetInvolved/GetInvolved.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const GetInvolved = () => {
<S.Title>Interested in Circles?</S.Title>
<S.ContentWrapper>
If you&apos;re a CSE student with a keen interest in Circles and looking to get involved,
keep an eye out for our recruitment announcements on CSESoc&apos;s socials. Otherwise, you
keep an eye out for our recruitment announcements on DevSoc&apos;s socials. Otherwise, you
can also contribute by suggesting cool new features, report any bugs or even make a pull
request on the Circles repo.
</S.ContentWrapper>
Expand All @@ -19,7 +19,7 @@ const GetInvolved = () => {
Feedback
</Button>
<Button
href="https://github.com/csesoc/circles"
href="https://github.com/devsoc-unsw/circles"
target="_blank"
rel="noreferrer"
size="large"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { Link } from 'react-router-dom';
import { ArrowRightOutlined } from '@ant-design/icons';
import cseLogo from 'assets/csesocLogo.png';
import devsocLogo from 'assets/devsocLogo.svg';
import easySubTitle from 'assets/LandingPage/easySubtitle.svg';
import S from './styles';

Expand All @@ -21,9 +21,9 @@ const HeroContent = () => (
<ArrowRightOutlined style={{ strokeWidth: '5rem', stroke: '#9453e6' }} />
</S.HeroCTA>
</Link>
<S.CSESocLogo
src={cseLogo}
alt="CSE Logo"
<S.DevSocLogo
src={devsocLogo}
alt="DevSoc Logo"
initial={{ opacity: 0, scale: 0.5, x: 100 }}
animate={{ opacity: 1, scale: 1, x: 0 }}
transition={{ duration: 1 }}
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/pages/LandingPage/Hero/HeroContent/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ const HeroCTA = motion(styled.button`
color: #9453e6;
`);

const CSESocLogo = motion(styled.img`
const DevSocLogo = motion(styled.img`
width: 160px;
`);

export default {
CSESocLogo,
DevSocLogo,
HeroContent,
HeroCTA,
HeroSubTitle,
Expand Down

0 comments on commit a9d50e4

Please sign in to comment.