Skip to content
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.

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

feat: adding footer #241

Merged
merged 57 commits into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
4aab35f
feat: initial commit for footer
Srish-ty Oct 19, 2023
49910eb
Merge branch 'dev' of https://github.com/Srish-ty/project-oregano-Hac…
Srish-ty Oct 19, 2023
ea2d2c4
fix: fixed isssues
Srish-ty Oct 19, 2023
756748a
fix: fixed isssues
Srish-ty Oct 19, 2023
4d71da9
fix: fixed isssues
Srish-ty Oct 19, 2023
8e62279
fix: fixed isssues
Srish-ty Oct 19, 2023
87cace3
fix: resolved issues
Srish-ty Oct 20, 2023
6a882a2
Revert "fix: resolved issues"
Srish-ty Oct 20, 2023
5467ac2
Merge branch 'dscnitrourkela:dev' into dev
Srish-ty Oct 20, 2023
9214622
fix: resolved conflicts
Srish-ty Oct 24, 2023
9227792
feat: added logo and content
Srish-ty Oct 24, 2023
8a08563
fix: resolve issues
Srish-ty Oct 25, 2023
41031f5
feat: text color
Srish-ty Oct 25, 2023
e928a05
feat: text color
Srish-ty Oct 25, 2023
2fcf6f8
fix: text color
Srish-ty Oct 25, 2023
dc33eae
fix: text color
Srish-ty Oct 25, 2023
3569ad1
fix: text color
Srish-ty Oct 25, 2023
c7ac34e
fix: text color
Srish-ty Oct 25, 2023
d8427d0
Merge branch 'dscnitrourkela:dev' into dev
Srish-ty Oct 29, 2023
aa59013
feat: added pendulum and index in images
Srish-ty Nov 2, 2023
41225ec
feat: added terms conditions and credits.
Srish-ty Nov 2, 2023
e8199e6
fix: created separate file for credits
Srish-ty Nov 2, 2023
9081c7e
fix: separated initial abut section
Srish-ty Nov 2, 2023
a4bbcf8
Merge branch 'dev' of https://github.com/Srish-ty/project-oregano-Hac…
Srish-ty Nov 2, 2023
4f72df7
fix: resolved formatting issue using prettier
Srish-ty Nov 2, 2023
d5e9b7d
feat: added content in config
Srish-ty Nov 2, 2023
c73c549
feat: added content in config
Srish-ty Nov 2, 2023
7ed59bb
fix: prettier check
Srish-ty Nov 2, 2023
a7fad86
feat: added cradle files
Srish-ty Nov 6, 2023
b9648fc
fix: converted to styled comps
Srish-ty Nov 6, 2023
6baf20a
fix: converted to styled comps
Srish-ty Nov 6, 2023
5f343a3
fix: formatted files
Srish-ty Nov 8, 2023
3222743
Merge branch 'dev' into footer
Shurtu-gal Nov 8, 2023
d32684d
fix: deleted css files
Srish-ty Nov 8, 2023
fa1342e
Merge branch 'footer' of https://github.com/Srish-ty/project-oregano-…
Srish-ty Nov 8, 2023
d8c84cb
feat: added social logos
Srish-ty Nov 8, 2023
b5fe63a
fix: separated styles in styles.jsx
Srish-ty Nov 8, 2023
7c2ee1c
fix: formatted using pretter
Srish-ty Nov 8, 2023
8c48242
fix: converted css to tailwind
Srish-ty Nov 8, 2023
dd46dab
feat: made responsive
Srish-ty Nov 8, 2023
4c9976c
feat: added colour gradient
Srish-ty Nov 8, 2023
ca9b80e
fix: moved images to cloudinary
Srish-ty Nov 8, 2023
e0b868a
fix: changed mobile view layout
Srish-ty Nov 9, 2023
8b93365
Merge branch 'dev' into footer
Srish-ty Nov 9, 2023
a64b2df
fix: changed mobile view layout
Srish-ty Nov 9, 2023
45ac6f2
fix: formatted Herosection using prettire
Srish-ty Nov 9, 2023
8ca3892
fix: formatted Herosection using prettire
Srish-ty Nov 9, 2023
0500cad
fix: changed mobile view layout
Srish-ty Nov 9, 2023
04c65cc
fix: changed aboutsection layout
Srish-ty Nov 9, 2023
d0620ff
feat: created links array and mapped
Srish-ty Nov 9, 2023
a3cb7fc
fix: used absolute imports
Srish-ty Nov 9, 2023
b5ebdf6
feat: added gradient animation while moving
Srish-ty Nov 11, 2023
a7ecef6
added animation for desktop. fixed layout for tab
Srish-ty Nov 11, 2023
28aa604
feat: added pointer to links
Srish-ty Nov 11, 2023
687ec6c
fix: ghaction changes
Srish-ty Nov 11, 2023
f81cd1d
Merge branch 'dev' into footer
Srish-ty Nov 11, 2023
1f74738
fix: foramtted navbar files
Srish-ty Nov 13, 2023
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
41 changes: 36 additions & 5 deletions config/content/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,27 @@ import {
import config from '../website';

export default {
links: [
{
title: 'About Us',
id: 'about-us',
url: '',
},
{
title: 'Contact Us',
id: 'contact-us',
url: '',
},
{
title: 'Sponsor Us',
id: 'sponsor-us',
url: '',
},
],
Nitr: {
imgSrc: 'https://res.cloudinary.com/dxsyc4p2j/image/upload/v1699473996/nitr_logo_vdj3aw.png',
},

hacknitr: {
img: 'https://res.cloudinary.com/db4zymomi/image/upload/hacknitr/logo1_rg97i6.png',
alt: 'HackNITR 4.0',
Expand All @@ -23,7 +44,7 @@ export default {
cards: [
{
title: 'About NIT Rourkela',
text: 'With a total strength of around 7000 students, NIT Rourkela is one of the most coveted institutes for higher studies by future technocrats. With its lush green and humongous area, it indeed makes a pleasant campus impression.',
text: 'With a strength of around 7000 students, NIT Rourkela is one of the most coveted institutes for higher studies by future technocrats. With its lush green and humongous area, it indeed makes a pleasant campus impression.',
id: 'footer-card-1',
img: {
src: 'https://res.cloudinary.com/db4zymomi/image/upload/hacknitr/nitr_huzgbq.png',
Expand All @@ -42,28 +63,38 @@ export default {
],
socials: [
{
name: 'fb',
icon: faFacebook,
link: 'https://facebook.com/hacknitr',
imgLink: 'https://res.cloudinary.com/dxsyc4p2j/image/upload/v1699473996/fb_zzl91w.png',
},
{
name: 'insta',
icon: faInstagram,
link: 'https://www.instagram.com/hacknitr/',
imgLink: 'https://res.cloudinary.com/dxsyc4p2j/image/upload/v1699473996/insta_aktzjs.png',
},
{
name: 'li',
icon: faLinkedin,
link: 'https://www.linkedin.com/company/hacknitr/',
imgLink: 'https://res.cloudinary.com/dxsyc4p2j/image/upload/v1699473996/linkedin_eoenzs.png',
},
// {
// icon: faDiscord,
// link: 'https://hacknitr.com/discord',
// },
{
icon: faFacebook,
link: 'https://facebook.com/hacknitr',
},
{
name: 'gh',
icon: faGithubSquare,
link: 'https://github.com/dscnitrourkela/project-oregano',
imgLink: 'https://res.cloudinary.com/dxsyc4p2j/image/upload/v1699473996/github_ve2kbe.png',
},
{
name: 'twitter',
icon: faTwitterSquare,
link: 'https://twitter.com/hacknitr',
imgLink: 'https://res.cloudinary.com/dxsyc4p2j/image/upload/v1699473996/TwitterX_uua6eg.png',
},
],
organisers: [
Expand Down
4 changes: 2 additions & 2 deletions src/components/HeroSection/HeroSection.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ export default function Hero() {
</HeroHeadingBase>
<TaglineText>{hero.content}</TaglineText>
</ContentBlock>
<HeroButtons >
<DevfolioButton/>
<HeroButtons>
<DevfolioButton />
<DiscordButton />
</HeroButtons>
</HeroTitle>
Expand Down
2 changes: 1 addition & 1 deletion src/components/HeroSection/styles.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -146,4 +146,4 @@ export const HeroButtons = styled.div`
items-center
mt-4
`}
`;
`;
1 change: 0 additions & 1 deletion src/components/index.js
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@

export * from './shared';
38 changes: 38 additions & 0 deletions src/components/marginals/Footer/AboutBox.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import React from 'react';
import { Heading3 } from '../..';
import {
FirstAboutContainer,
FirstRow,
FrItems,
AboutBox,
Para,
Content,
LogoCont,
LogoImg,
} from './styles';

const AboutContainer = ({ AbtLogo, aboutContent, abtLinks }) => {

Check failure on line 14 in src/components/marginals/Footer/AboutBox.jsx

View workflow job for this annotation

GitHub Actions / eslint / Eslint Check

Unexpected block statement surrounding arrow body; move the returned value immediately after the `=>`
return (
<FirstAboutContainer>
<FirstRow>
{abtLinks.map((link) => (
<FrItems href='#' key={link.id}>
{link.title}
</FrItems>
))}
</FirstRow>

<AboutBox>
<LogoCont>
<LogoImg src={AbtLogo.imgSrc} alt={aboutContent.img.alt} />
</LogoCont>
<Para>
<Heading3>{aboutContent.title}</Heading3>
<Content>{aboutContent.text}</Content>
</Para>
</AboutBox>
</FirstAboutContainer>
);
};

export default AboutContainer;
36 changes: 36 additions & 0 deletions src/components/marginals/Footer/Cradle.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import React from 'react';
import { SocialLogo, SocialText, SocialsCont, CradleContainer, Ball, Ball1, Ball5 } from './styles';

const Cradle = ({ socials, text }) => {

Check failure on line 4 in src/components/marginals/Footer/Cradle.jsx

View workflow job for this annotation

GitHub Actions / eslint / Eslint Check

Unexpected block statement surrounding arrow body; move the returned value immediately after the `=>`
return (
<SocialsCont>
<CradleContainer>
<a href='https://facebook.com/hacknitr'>
<Ball1>
<SocialLogo src={socials[0].imgLink} />
</Ball1>
</a>
{socials.slice(1, -1).map((s) => (
<a key={socials.indexOf(s)} href={s.link}>
<Ball>
<SocialLogo src={s.imgLink} />
</Ball>
</a>
))}
<a href='https://twitter.com/hacknitr'>
<Ball5>
<SocialLogo src={socials[socials.length - 1].imgLink} />
</Ball5>
</a>
</CradleContainer>

<SocialText>
{text.content1}
<br />
{text.content2}
</SocialText>
</SocialsCont>
);
};

export default Cradle;
24 changes: 24 additions & 0 deletions src/components/marginals/Footer/Footer.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import React from 'react';
import { footer } from '../../../../config';
import { FooterContainer, InitialCont, SecondPendulumContainer } from './styles';
import TermsNCredits from './TermsNCredits';
import AboutContainer from './AboutBox';
import Cradle from './Cradle';

export const Footer = () => {

Check failure on line 8 in src/components/marginals/Footer/Footer.jsx

View workflow job for this annotation

GitHub Actions / eslint / Eslint Check

Unexpected block statement surrounding arrow body; move the returned value immediately after the `=>`
return (
<FooterContainer>
<InitialCont>
<AboutContainer
AbtLogo={footer.Nitr}
aboutContent={footer.cards[0]}
abtLinks={footer.links}
/>
<TermsNCredits copyw={footer.copyright} />
</InitialCont>
<SecondPendulumContainer>
<Cradle socials={footer.socials} text={footer.icons} />
</SecondPendulumContainer>
</FooterContainer>
);
};
16 changes: 16 additions & 0 deletions src/components/marginals/Footer/TermsNCredits.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import React from 'react';
import { LastLine, Terms, ConditionItems, Credits } from './styles';

const TermsNCredits = ({ copyw }) => {

Check failure on line 4 in src/components/marginals/Footer/TermsNCredits.jsx

View workflow job for this annotation

GitHub Actions / eslint / Eslint Check

Unexpected block statement surrounding arrow body; move the returned value immediately after the `=>`
return (
<LastLine>
<Terms>
<ConditionItems href='#'>Privacy & Cookies</ConditionItems>
<ConditionItems href='#'>Terms and Conditions</ConditionItems>
</Terms>
<Credits>{copyw.content}</Credits>
</LastLine>
);
};

export default TermsNCredits;
Loading
Loading