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

Add Light Theme #178

Merged
merged 1 commit into from
Oct 5, 2023
Merged
Show file tree
Hide file tree
Changes from all 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
11 changes: 7 additions & 4 deletions src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,20 @@ import Error from "./components/Error/Error";
import SearchInput from "./components/Search/SearchInput";
import Layout from "./components/Layout/Layout";
import BGShape from "./components/BGShape";
import { ThemeProvider } from "./context/ThemeContext";

function App() {
const [search, setSearch] = useState("");
const [type, setType] = useState("");

return (
<>
<Layout>
<SearchInput search={search} setSearch={setSearch} setType={setType} />
<Error search={search} type={type} />
</Layout>
<ThemeProvider>
<Layout>
<SearchInput search={search} setSearch={setSearch} setType={setType} />
<Error search={search} type={type} />
</Layout>
</ThemeProvider>
</>
);
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/Doc/DocItem.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ const DocItem = ({ title, content }) => {
// const b = "<b>"
return (
<div className={`p-4 rounded shadow-lg shadow-[#118d7c22] bg-white/5 backdrop-blur-[10px]`}>
<h6 className='font-semibold text-white text-opacity-80 mb-2'>{title}</h6>
<p className={`text-sm text-gray line-clamp-11 leading-relaxed ${!readMore ? "none" : "hidden"}`}>
<h6 className='font-semibold text-dark dark:text-white text-opacity-80 mb-2'>{title}</h6>
<p className={`text-sm text-zinc-600 dark:text-gray line-clamp-11 leading-relaxed ${!readMore ? "none" : "hidden"}`}>
{
content.length > 100 ? content.substring(0, 100).replace(/`/g, '') : content.replace(/`/g, '')
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Error/ErrorCard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function ErrorCard({ error }) {
<div className="bg-primary w-full h-[2px] my-4" />

<div className="h-fit">
<p className="text-sm text-gray line-clamp-11 leading-relaxed">
<p className="text-sm text-zinc-700 dark:text-gray line-clamp-11 leading-relaxed">
{readMore ? error.description : error.description.substring(0, 100)}
{error.description.length > 100 ? (
<button
Expand Down
20 changes: 16 additions & 4 deletions src/components/Header/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,14 @@ import { MdPeople, MdInsertDriveFile } from "react-icons/md";
import { AiFillGithub } from "react-icons/ai";
import { Link } from "react-router-dom";

import { HiMoon, HiSun } from "react-icons/hi";
import { ThemeContext } from '../../context/ThemeContext'
import { useContext } from "react";

function Header({ notice }) {
const { toggleTheme } = useContext(ThemeContext);


const navLink = [
{
name: 'Home',
Expand All @@ -12,12 +19,12 @@ function Header({ notice }) {
{
name: 'Doc',
link: '/doc',
icon: <MdInsertDriveFile size='1rem'/>
icon: <MdInsertDriveFile size='1rem' />
},
{
name: 'Contributors',
link: '/Contributors',
icon: <MdPeople size='1.25rem'/>
icon: <MdPeople size='1.25rem' />
},
{
name: '',
Expand All @@ -33,7 +40,7 @@ function Header({ notice }) {
GITHUB <span className="text-primary line-through">ERROR</span> SOLVE
</h1> */}
<Link to={'/'}>
<img src="/assets/logo.png" className="w-36 bg-transparent" alt="GES" />
<img src="/assets/logo.png" className="w-36 bg-transparent invert dark:invert-0" alt="GES" />
</Link>
<div className="flex mt-2 md:mt-0 items-center gap-7 text-sm">

Expand All @@ -47,9 +54,14 @@ function Header({ notice }) {
) : null
)
})

}

<p className="text-lg cursor-pointer" onClick={toggleTheme}>
<HiMoon className="dark:hidden" />
<HiSun className="hidden dark:inline" />
</p>



{/* <MdConstruction className="text-lg" />
<h6>Under Construction</h6>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Search/SearchInput.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function SearchInput({ search, setSearch, setType }) {
<div className="flex flex-col mx-auto mt-12 items-center gap-4 py-3 px-6 rounded-lg w-11/12 md:w-5/6">
<form
onSubmit={(e) => e.preventDefault()}
className="flex mx-auto mt-12 items-center gap-4 py-3 px-6 rounded-lg bg-white w-11/12 md:w-5/6"
className="flex mx-auto mt-12 items-center border border-zinc-300 gap-4 py-3 px-6 rounded-lg bg-white w-11/12 md:w-5/6"
>
<MdSearch className="text-gray text-2xl" />
<input
Expand All @@ -46,7 +46,7 @@ function SearchInput({ search, setSearch, setType }) {
<div className="types mt-4">
{width > 768 ? (
<ul
className={`flex flex-col sm:flex-row mx-auto mt-2 items-start gap-4 py-3 px-6 rounded-lg bg-white w-full md:w-12/12 md:w-auto`}
className={`flex flex-col sm:flex-row mx-auto mt-2 border border-zinc-300 items-start gap-4 py-3 px-6 rounded-lg bg-white w-full md:w-12/12 md:w-auto`}
>
{errorType.map((item, i) => (
<li
Expand Down
38 changes: 38 additions & 0 deletions src/context/ThemeContext.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import React, { createContext, useState, useEffect } from 'react';

export const ThemeContext = createContext();

export const ThemeProvider = ({ children }) => {
const [theme, setTheme] = useState();

useEffect(() => {
const localTheme = localStorage.getItem('theme');
console.log('Get LocalStorage theme', localTheme);

setTheme(localTheme || 'dark');
}, []);

const toggleTheme = () => {
setTheme(theme === 'light' ? 'dark' : 'light');
};

useEffect(() => {
if (theme && theme !== 'undefined' && theme !== 'null') {
localStorage.setItem('theme', theme);
console.log('Set LocalStorage theme', theme);

if (theme == 'dark') {
document.documentElement.classList.add('dark')

} else {
document.documentElement.classList.remove('dark')
}
}
}, [theme]);

return (
<ThemeContext.Provider value={{ theme, toggleTheme }}>
{children}
</ThemeContext.Provider>
);
};
2 changes: 1 addition & 1 deletion src/hooks/useColorBorderBox.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const useColorBorderBox = (error = "") => {

let item = error.type;

let response = `py-4 mb-4 col-span-12 md:col-span-6 xl:col-span-4 px-2 md:px-6 border-l-4 rounded-lg items-start bg-white/5 backdrop-blur-[10px] flex flex-col hover:scale-105 duration-300 ${
let response = `py-4 mb-4 col-span-12 md:col-span-6 xl:col-span-4 px-2 md:px-6 border-l-4 rounded-lg items-start bg-dark/5 dark:bg-white/5 backdrop-blur-[10px] flex flex-col hover:scale-105 duration-300 ${
item === "add"
? "border-[#4024e0]"
: item === "commit"
Expand Down
2 changes: 1 addition & 1 deletion src/index.css

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

1 change: 1 addition & 0 deletions tailwind.config.cjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/** @type {import('tailwindcss').Config} */
module.exports = {
darkMode: 'class',
content: ["./src/**/*.{js,jsx,ts,tsx}"],
theme: {
fontFamily: {
Expand Down