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

fix: website revamp #458

Closed
wants to merge 10 commits into from
Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
7 changes: 7 additions & 0 deletions site/.prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"semi": true,
"tabWidth": 2,
"printWidth": 100,
"singleQuote": true,
"trailingComma": "none"
}
2 changes: 2 additions & 0 deletions site/gatsby-browser.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import React from 'react';

import { ThemeProvider } from './src/components/Theme';
import './src/styles/global.css';

Expand Down
39 changes: 0 additions & 39 deletions site/package-lock.json

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

1 change: 0 additions & 1 deletion site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"postcss": "^8.4.31",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.17.0",
"tailwindcss": "^3.3.5"
},
"overrides": {
Expand Down
2 changes: 1 addition & 1 deletion site/src/components/Dropdown/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useState } from 'react';
import { React, useState } from 'react';
import Sidebar from '../Sidebar';

const Dropdown = () => {
Expand Down
2 changes: 2 additions & 0 deletions site/src/components/Footer/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import React from 'react';

const Footer = () => {
return (
<div className="ml-[17.5rem] pt-[5rem]">
Expand Down
22 changes: 22 additions & 0 deletions site/src/components/Layout/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import React, { useContext } from 'react';
import ThemeContext from '../Theme';
import Navbar from '../Navigation';
import Sidebar from '../../pages/identity/Sidebar';
import Footer from '../Footer';

const Layout = ({ children }) => {
const theme = useContext(ThemeContext);

return (
<div className={`${theme.dark ? 'dark' : 'light'} bg-background-default`}>
<Navbar />
<div className="flex gap-8">
<Sidebar />
<main>{children}</main>
</div>
<Footer />
</div>
);
};

export default Layout;
2 changes: 2 additions & 0 deletions site/src/components/Navigation/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import React from 'react';

import { useContext } from 'react';
import Search from '../../assets/images/Search.svg';
import SearchDark from '../../assets/images/SearchDark.svg';
Expand Down
4 changes: 3 additions & 1 deletion site/src/components/Sidebar/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react';

import { useState } from 'react';
import { Link } from 'react-router-dom';
import { Link } from 'gatsby';
import ChevronLightUp from '../../assets/images/Chevron-light-up.svg';
import Chevron from '../../assets/images/Chevron-light.svg';

Expand Down
1 change: 1 addition & 0 deletions site/src/pages/404.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import React from 'react';
import { Link } from 'gatsby';

const pageStyles = {
Expand Down
2 changes: 2 additions & 0 deletions site/src/pages/components/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import React from 'react';

const Components = () => {
return <div className="text-center text-bold">Components</div>;
};
Expand Down
2 changes: 2 additions & 0 deletions site/src/pages/home/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import React from 'react';

const Home = () => {
return <div className="text-center text-bold">Home</div>;
};
Expand Down
2 changes: 2 additions & 0 deletions site/src/pages/identity/Content.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import React from 'react';

const Content = (props) => {
return (
<div className="w-[844px] pt-8 text-gray-700 text-sm font-normal font-openSans leading-loose">
Expand Down
2 changes: 2 additions & 0 deletions site/src/pages/identity/Heading.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import React from 'react';

const Heading = (props) => {
return (
<div className="self-stretch text-gray-950 text-[52px] font-bold font-qanelas leading-[64px]">
Expand Down
5 changes: 4 additions & 1 deletion site/src/pages/identity/Navigation.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { Link } from 'react-router-dom';
import React from 'react';
import { Link } from 'gatsby';

const Navigation = (props) => {
console.log('naviation');
return (
<div className="w-[1120px] h-14 relative mt-[32px]">
<div className="w-[1160px] h-0.5 left-[-50px] top-[54px] absolute bg-gray-200" />
Expand All @@ -9,6 +11,7 @@ const Navigation = (props) => {
<Link
to={`/identity/${props.type}/overview`}
className="grow shrink basis-0 text-center text-emerald-700 text-base font-semibold font-openSans leading-7"
relative="path"
>
Overview
</Link>
Expand Down
4 changes: 3 additions & 1 deletion site/src/pages/identity/Next.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import { Link } from 'react-router-dom';
import React from 'react';

import { Link } from 'gatsby';
import nextIcon from '../../assets/images/Chevron-light.svg';

const Next = ({ content, parent, child, subchild }) => {
Expand Down
3 changes: 2 additions & 1 deletion site/src/pages/identity/Previous.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Link } from 'react-router-dom';
import React from 'react';
import { Link } from 'gatsby';
import PrevIcon from '../../assets/images/Chevron-light.svg';

const Previous = ({ content, parent, child, subchild }) => {
Expand Down
2 changes: 2 additions & 0 deletions site/src/pages/identity/Sidebar.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import React from 'react';

const Sidebar = (props) => {
return (
<div className="float-right w-[11.25rem] h-[3.75rem] px-4 py-6 bg-slate-200 bg-opacity-10 rounded-lg backdrop-blur-lg flex-col justify-start items-start gap-4 inline-flex">
Expand Down
1 change: 1 addition & 0 deletions site/src/pages/identity/SubContent.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import React from 'react';
const SubContent = (props) => {
return (
<>
Expand Down
1 change: 1 addition & 0 deletions site/src/pages/identity/SubHeading.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import React from 'react';
const SubHeading = (props) => {
return (
<div className="w-[53.75rem] text-gray-950 text-[2rem] font-medium font-qanelas-medium leading-[3rem]">
Expand Down
1 change: 1 addition & 0 deletions site/src/pages/identity/SubText.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import SubContent from './SubContent';
import SubHeading from './SubHeading';
import React from 'react';

const SubText = (props) => {
return (
Expand Down
2 changes: 2 additions & 0 deletions site/src/pages/identity/Text.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import React from 'react';

import Content from './Content';
import Heading from './Heading';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import React from 'react';

import Next from '../Next';
import Previous from '../Previous';
import Sidebar from '../Sidebar';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import React from 'react';

import Next from '../Next';
import Previous from '../Previous';
import Sidebar from '../Sidebar';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
import { useParams } from 'react-router-dom';
import React from 'react';
import Navigation from '../Navigation';
import Text from '../Text';
import Code from './code';
import Guidance from './guidance';
import Overview from './overview';
import Layout from '../../../components/Layout';

const Color = () => {
const { id } = useParams();
return (
<>
<Layout>
<Text
title="Color"
description="Colors when accurately applied can be a potent tool that enables designers and developers to implement solutions with speed and efficiency. Here are a couple of things to keep in mind."
/>
<Navigation type="color" />
{id === 'guidance' ? <Guidance /> : id === 'code' ? <Code /> : <Overview />}
</>
</Layout>
);
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import React from 'react';

import Next from '../Next';
import Previous from '../Previous';
import Sidebar from '../Sidebar';
Expand Down
2 changes: 2 additions & 0 deletions site/src/pages/identity/elevation/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import React from 'react';

const Elevation = () => {
return <div className="text-center text-bold">Elevation</div>;
};
Expand Down
2 changes: 2 additions & 0 deletions site/src/pages/identity/page-layouts/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import React from 'react';

const PageLayout = () => {
return <div className="text-center text-bold">Page Layout</div>;
};
Expand Down
2 changes: 2 additions & 0 deletions site/src/pages/identity/spacing/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import React from 'react';

const Spacing = () => {
return <div className="text-center text-bold">Spacing</div>;
};
Expand Down
2 changes: 2 additions & 0 deletions site/src/pages/identity/typography/code.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import React from 'react';

import Next from '../Next';
import Previous from '../Previous';
import Sidebar from '../Sidebar';
Expand Down
2 changes: 2 additions & 0 deletions site/src/pages/identity/typography/guidance.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import React from 'react';

import Next from '../Next';
import Previous from '../Previous';
import Sidebar from '../Sidebar';
Expand Down
13 changes: 5 additions & 8 deletions site/src/pages/identity/typography/index.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
import { useParams } from 'react-router-dom';
import React from 'react';

import Navigation from '../Navigation';
import Text from '../Text';
import Code from './code';
import Guidance from './guidance';
import Overview from './overview';
import Layout from '../../../components/Layout';

const Typography = () => {
const { id } = useParams();
return (
<>
<Layout>
<Text
title="Typography"
description="Most of the information that is present in a user interface for the purpose of passing information across is represented via typography. Correct structuring and appropriate application is important for all interfaces."
/>
<Navigation type="typography" />
{id === 'guidance' ? <Guidance /> : id === 'code' ? <Code /> : <Overview />}
</>
</Layout>
);
};

Expand Down
Loading
Loading