Skip to content

Commit

Permalink
Merge branch 'development' into hacktoberfest
Browse files Browse the repository at this point in the history
  • Loading branch information
yashsehgal committed Sep 19, 2021
2 parents 1cefa0f + 3ec4b1c commit 95c90e6
Show file tree
Hide file tree
Showing 23 changed files with 605 additions and 69 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"build": "CI= react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
Expand Down
15 changes: 13 additions & 2 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
import { BrowserRouter, Route } from "react-router-dom";
// import Footer from "./components/section-components/Footer";
import Footer from "./components/section-components/Footer";
import Header from "./components/section-components/Header";
import './styles/index.css';
import Careers from "./views/Careers";
import Discord from "./views/Redirect/Discord";
import LandingPage from "./views/LandingPage";
import Products from "./views/Products";
import Team from "./views/Team";
import Twitter from "./views/Redirect/Twitter";
import GitHub from "./views/Redirect/GitHub";
import LinkedIn from "./views/Redirect/Linkedin";
import PersonalLinks from "./views/PersonalLinks";

function App() {
return (
Expand All @@ -18,9 +23,15 @@ function App() {
<Route path="/team" exact component={Team} />
<Route path="/products" exact component={Products} />
<Route path="/careers" exact component={Careers} />
{/* routes for re-direction to external links */}
<Route path="/discord" exact component={Discord} />
<Route path="/twitter" exact component={Twitter} />
<Route path="/github" exact component={GitHub} />
<Route path="/linkedin" exact component={LinkedIn} />
<Route path="/yash" exact component={() => PersonalLinks('yash')} />
</BrowserRouter>
{/* footer component */}
{/* <Footer /> */}
<Footer />
</div>
);
}
Expand Down
14 changes: 14 additions & 0 deletions src/components/section-components/Footer/__usefulLinks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[
{
"Home": "/",
"Career": "/careers",
"Team": "/team",
"Contact": "/contact-us",
"Eccentrictouch": "/products",

"LinkedIn": "https://www.linkedin.com/company/designsystemsoss/",
"GitHub": "https://github.com/DesignSystemsOSS",
"Twitter": "https://twitter.com/TDesignsystems",
"Discord": "https://discord.gg/VcmnY4HTEc"
}
]
160 changes: 146 additions & 14 deletions src/components/section-components/Footer/index.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,153 @@
import React from 'react';
import './style.footer.css';
import React from "react";
import { useState } from "react";
import "./style.footer.css";
import LinksData from "./__usefulLinks.json";
import Button from "../../widgets/Button";

export default function Footer() {
const [footerLinksDetails] = useState(LinksData);
return (
<div className="footer">
{/* <div className="logo-wrapper">
<h1 className="demo-logo-icon">DS</h1>
<p className="logo-title">The DesignSystems</p>
<div className="footer-row-1">
<div className="logo-container color-change-4x">
<h1 className="demo-logo-icon">DS</h1>
<p className="logo-title">The DesignSystems</p>
</div>

<div className="footer-col-1">
<div className="useful-links-section">
<p className="useful-links-title links-title">
<b>Useful links</b>
</p>
<div className="useful-links-list">
{footerLinksDetails.map((data, index) => (
<ul className="useful-links-list">
<li className="useful-link-item" key={index}>
<a href={data.Home}>Home</a>
</li>
<li className="useful-link-item" key={index}>
<a href={data.Career}>Career</a>
</li>
<li className="useful-link-item" key={index}>
<a href={data.Team}>Team</a>
</li>
<li className="useful-link-item" key={index}>
<a href={data.Contact}>Contact Us</a>
</li>
</ul>
))}
</div>
</div>

<div className="products-links-section">
<p className="products-links-title links-title">
<b>Products</b>
</p>
<div className="product-links-list">
{footerLinksDetails.map((data, index) => (
<ul className="products-links-list">
<li className="products-links-item" key={index}>
<a href={data.Eccentrictouch}>Eccentrictouch</a>
</li>
</ul>
))}
</div>
</div>
</div>

<div className="footer-col-2">
<div className="connect-community">
<p className="community-title gradient-text">
Don't miss anything, Join our GitHub Organization and Discord
Community
</p>
<div className="community-links-wrapper">
<a
href="https://github.com/DesignSystemsOSS"
target="_blank"
rel="noreferrer"
>
<Button
type="outline"
value="Join our Github Organization"
startIcon="fab fa-github"
/>
</a>

<a
href="https://discord.gg/VcmnY4HTEc"
target="_blank"
rel="noreferrer"
>
<Button
type="primary"
value="Join Discord Community"
startIcon="fab fa-discord"
/>
</a>
</div>
</div>
</div>
</div>
<div className="footer-col-1">
<div className="useful-links-section">
<p className="useful-links-title links-title">Useful links</p>
<ul className="useful-links-list">
<li className="useful-link-item"></li>
</ul>

<div className="footer-row-2">
<div className="social-links-container">
{footerLinksDetails.map((data, index) => (
<div className="social-links-list">
<a
href={data.LinkedIn}
target="_blank"
rel="noreferrer"
key={index}
className="color-change-4x"
>
<button type="button" className="fab fa-linkedin"></button>
</a>

<a
href={data.GitHub}
target="_blank"
rel="noreferrer"
key={index}
>
<button
type="button"
className="fab fa-github social-link"
></button>
</a>

<a
href={data.Twitter}
target="_blank"
rel="noreferrer"
key={index}
>
<button type="button" className="fab fa-twitter"></button>
</a>

<a
href={data.Discord}
target="_blank"
rel="noreferrer"
key={index}
>
<button type="button" className="fab fa-discord"></button>
</a>
</div>
))}
</div>
<div className="privacy-copyright-links-title">
<a href="#" target="_blank" rel="noreferrer">
Privacy
</a>
<a href="#" target="_blank" rel="noreferrer">
Terms
</a>
<p className="copyright-content">
&copy;2021 The DesignSystems | All Rights Reserved
</p>
</div>
</div> */}
</div>
</div>
)
}
);
}
154 changes: 153 additions & 1 deletion src/components/section-components/Footer/style.footer.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 95c90e6

Please sign in to comment.