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.

Sign up for GitHub

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 Sistent Website build failure #241

Merged
merged 5 commits into from
Nov 7, 2023
+202 −174
Merged

Fix Sistent Website build failure #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
194f8ca
feat(core): fix build failure
coder12git Nov 7, 2023
39a38f1
Merge branch 'master' into sistent-site-draft
aabidsofi19 Nov 7, 2023
e09d7c0
feat(core): modify theme.js
coder12git Nov 7, 2023
bb15cc8
Merge branch 'sistent-site-draft' of https://github.com/coder12git/si…
coder12git Nov 7, 2023
b29f6e0
feat(core): fixed typo and added useContext
coder12git Nov 7, 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
6 changes: 6 additions & 0 deletions site/gatsby-browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
import React from 'react'
import "./src/styles/global.css"
import { ThemeProvider } from "./src/components/Theme"

export const wrapRootElement = ({ element }) => (
<ThemeProvider>{element}</ThemeProvider>
)
2 changes: 1 addition & 1 deletion site/gatsby-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ module.exports = {
title: `Sistent Design System | Layer5`,
siteUrl: `https://design.layer5.io`
},
plugins: ["gatsby-plugin-postcss", 'gatsby-plugin-dark-mode']
plugins: ["gatsby-plugin-postcss"]
};
20 changes: 0 additions & 20 deletions site/package-lock.json
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"dependencies": {
"autoprefixer": "^10.4.16",
"gatsby": "^5.12.4",
"gatsby-plugin-dark-mode": "^1.1.2",
"gatsby-plugin-postcss": "^6.12.0",
"postcss": "^8.4.31",
"react": "^18.2.0",
Expand Down
5 changes: 5 additions & 0 deletions site/src/assets/images/ChevronDark.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file added site/src/assets/images/ChevronDark.svg:Zone.Identifier
View file
Open in desktop
Empty file.
6 changes: 2 additions & 4 deletions site/src/assets/images/Weather.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions site/src/assets/images/WeatherDark.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 12 additions & 8 deletions site/src/components/Navigation/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
import React from "react";
import React, {useContext} from "react";
import Search from '../../assets/images/Search.svg';
import SearchDark from "../../assets/images/SearchDark.svg";
import ThemeToggle from "../Theme";
import ThemeContext from "../Theme";
import Weather from '../../assets/images/Weather.svg';
import WeatherDark from '../../assets/images/WeatherDark.svg';

const Navbar = ()=>{
return (
<>
const Navbar = () => {
const theme = useContext(ThemeContext)

return (
<>
<div className=" w-[1440px] h-[100px] px-10 py-6 bg-background-default justify-between items-center inline-flex">
<div className="h-12 justify-center items-center gap-4 flex">
<div className="w-12 h-12 relative rounded-lg border border-border-strong" />
Expand All @@ -24,16 +28,16 @@ const Navbar = ()=>{
</div>
</div>
<div className="justify-end items-center gap-8 flex">
<div className="w-6 h-6 relative"><img src={localStorage.getItem('theme')==='dark'? SearchDark : Search}/></div>
<div className="w-6 h-6 relative"><img src={theme.dark? SearchDark : Search }/></div>
<div className="w-6 h-6 justify-center items-center flex">
<div className="w-6 h-6 relative flex-col justify-start items-start flex"><ThemeToggle/></div>
<div className="w-6 h-6 relative flex-col justify-start items-start flex"><img src={theme.dark? WeatherDark : Weather } onClick={theme.toggleDark}/></div>
</div>
</div>
</div>
</div>
<hr className="border-border-default border-solid"/>
</>
)
)
};

export default Navbar;
Loading
Loading