Skip to content

Commit 330884f

Browse files
ariflogsariflogs
authored
Merge pull request #56 from Logging-Stuff/v1.2
V1.2
2 parents 8f22b21 + 77a7c2e commit 330884f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+549
-524
lines changed

‎.github/workflows/deploy.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ jobs:
2424

2525
- name: Build and push to DockerHub
2626
run: |
27-
docker build -t devarifhossain/retroui:1.1.10 ./
28-
docker push devarifhossain/retroui:1.1.10
27+
docker build -t devarifhossain/retroui:1.2.0 ./
28+
docker push devarifhossain/retroui:1.2.0
2929
3030
# - name: Set up SSH
3131
# uses: webfactory/[email protected]

‎app/(docs)/docs/[[...slug]]/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export default function page({ params }: IProps) {
5050
<Text as="h1">{doc.title}</Text>
5151
<p className="text-lg text-muted-foreground mt-2">{doc.description}</p>
5252
{doc.links && (
53-
<div className="flex space-x-4 text-sm mt-4">
53+
<div className="flex space-x-4 text-sm mt-4 text-black">
5454
{doc.links?.api_reference && (
5555
<a
5656
className="flex items-center bg-gray-200 px-1.5 py-.5"

‎app/global.css‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
--color-background: var(--background);
1616
--color-foreground: var(--foreground);
1717
--color-primary: var(--primary);
18+
--color-primary-foreground: var(--primary-foreground);
19+
--color-secondary: var(--secondary);
20+
--color-secondary-foreground: var(--secondary-foreground);
1821
--color-primary-hover: var(--primary-hover);
1922
--color-card: var(--card);
2023
--color-card-foreground: var(--card-foreground);
@@ -35,6 +38,8 @@
3538
--primary: #ffdb33;
3639
--primary-hover: #ffcc00;
3740
--primary-foreground: #000;
41+
--secondary: #000;
42+
--secondary-foreground: #fff;
3843
--muted: #aeaeae;
3944
--muted-foreground: #5a5a5a;
4045
--accent: #fae583;
@@ -43,33 +48,23 @@
4348
--destructive-foreground: #fff;
4449
--border: #000;
4550
}
46-
4751
.dark {
4852
--background: #121212;
49-
--foreground: #fff;
53+
--foreground: #eaeaea;
5054
--card: #1e1e1e;
51-
--card-foreground: #fff;
52-
--popover: #1e1e1e;
53-
--popover-foreground: #fff;
54-
--primary: #ffdb33;
55+
--card-foreground: #eaeaea;
56+
--primary: #ffcc00;
57+
--primary-hover: #ffdb33;
5558
--primary-foreground: #000;
56-
--secondary: #292929;
57-
--secondary-foreground: #e5e5e5;
58-
--muted: #3b3b3b;
59-
--muted-foreground: #9a9b9c;
60-
--accent: #ffdb33;
59+
--secondary: #fff;
60+
--secondary-foreground: #000;
61+
--muted: #5a5a5a;
62+
--muted-foreground: #aeaeae;
63+
--accent: #ffd966;
6164
--accent-foreground: #000;
62-
--destructive: #ff6b6b;
65+
--destructive: #e63946;
6366
--destructive-foreground: #fff;
64-
--border: #333;
65-
--input: #444;
66-
--ring: #ffdb33;
67-
--radius: 0.5rem;
68-
--chart-1: #ff4500;
69-
--chart-2: #ff8c00;
70-
--chart-3: #00b894;
71-
--chart-4: #355070;
72-
--chart-5: #e9c46a;
67+
--border: #eee;
7368
}
7469

7570
.text-outlined {

‎app/layout.tsx‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,32 @@ export default function RootLayout({
4343
return (
4444
<html lang="en">
4545
<head>
46+
<script
47+
dangerouslySetInnerHTML={{
48+
__html: `
49+
(function() {
50+
try {
51+
const theme = localStorage.getItem('theme');
52+
if (theme === 'dark') {
53+
document.documentElement.classList.add('dark');
54+
} else {
55+
document.documentElement.classList.remove('dark');
56+
}
57+
} catch (e) {
58+
console.error('Error applying theme:', e);
59+
}
60+
})();
61+
`,
62+
}}
63+
/>
4664
<script
4765
defer
4866
src="https://cloud.umami.is/script.js"
4967
data-website-id="97dd6182-c656-4265-97e0-ee9613b88078"
5068
/>
5169
</head>
5270
<body
53-
className={`${space.className} ${archivoBlack.variable} ${space.variable} ${spaceMono.variable}`}
71+
className={`${space.className} ${archivoBlack.variable} ${space.variable} ${spaceMono.variable} bg-background text-foreground`}
5472
>
5573
<div className="relative z-40 pb-16">
5674
<TopNav />

‎components/SideNav.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export default function SideNav() {
1010

1111
return (
1212
<div
13-
className={`fixed right-auto border-r-2 border-black h-full overflow-y-scroll transition-transform transform md:translate-x-0 w-60 bg-white flex flex-col justify-center md:justify-start py-14 md:py-8`}
13+
className={`fixed right-auto border-r-2 h-full overflow-y-scroll transition-transform transform md:translate-x-0 w-60 bg-background flex flex-col justify-center md:justify-start py-14 md:py-8`}
1414
>
1515
<nav className="flex flex-col items-start px-6 lg:pl-0 pb-26 space-y-4">
1616
{navConfig.sideNavItems.map((item) => (
@@ -22,8 +22,7 @@ export default function SideNav() {
2222
key={child.title}
2323
href={child.href}
2424
className={`px-2 py-1 w-full border border-transparent ${
25-
pathname === child.href &&
26-
"bg-primary text-black border-black"
25+
pathname === child.href && "bg-primary text-black"
2726
}`}
2827
>
2928
{child.title}

‎components/TopNav.tsx‎

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,43 @@
1-
import React from "react";
1+
"use client";
2+
import React, { useEffect, useState } from "react";
23
import Link from "next/link";
34
import Image from "next/image";
4-
import { GithubIcon } from "lucide-react";
5+
import { GithubIcon, MoonIcon, SunIcon } from "lucide-react";
56
import HamburgerMenu from "./HamburgerMenu";
67
import { Button, Text } from "@/components/retroui";
78
import { navConfig } from "@/config/navigation";
89

910
export default function TopNav() {
11+
const [isDarkMode, setIsDarkMode] = useState(false);
12+
13+
// Apply the saved theme preference on page load
14+
useEffect(() => {
15+
const savedTheme = localStorage.getItem("theme");
16+
if (savedTheme === "dark") {
17+
document.documentElement.classList.add("dark");
18+
setIsDarkMode(true);
19+
} else {
20+
document.documentElement.classList.remove("dark");
21+
setIsDarkMode(false);
22+
}
23+
}, []);
24+
25+
const toggleDarkMode = () => {
26+
const htmlElement = document.documentElement;
27+
if (htmlElement.classList.contains("dark")) {
28+
htmlElement.classList.remove("dark");
29+
localStorage.setItem("theme", "light");
30+
setIsDarkMode(false);
31+
} else {
32+
htmlElement.classList.add("dark");
33+
localStorage.setItem("theme", "dark");
34+
setIsDarkMode(true);
35+
}
36+
};
37+
1038
return (
1139
<>
12-
<nav className="fixed top-0 left-0 right-0 w-full border-b-2 border-black bg-white">
40+
<nav className="fixed top-0 left-0 right-0 w-full border-b-2 bg-background">
1341
<div className="w-full bg-black text-white">
1442
<div className="container max-w-6xl mx-auto px-4 py-2 flex justify-center space-x-4 items-center">
1543
<Text className="text-sm text-center">
@@ -68,7 +96,7 @@ export default function TopNav() {
6896
<HamburgerMenu />
6997
</div>
7098

71-
<div className="hidden lg:flex items-center">
99+
<div className="hidden lg:flex items-center space-x-3">
72100
<Link
73101
href="https://github.com/Logging-Stuff/retroui"
74102
target="_blank"
@@ -79,6 +107,9 @@ export default function TopNav() {
79107
Star on GitHub
80108
</Button>
81109
</Link>
110+
<Button variant="secondary" size="icon" onClick={toggleDarkMode}>
111+
{isDarkMode ? <SunIcon size="14" /> : <MoonIcon size="14" />}
112+
</Button>
82113
</div>
83114
</div>
84115
</div>

‎components/retroui/Accordion.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const AccordionItem = React.forwardRef<
1515
<AccordionPrimitive.Item
1616
ref={ref}
1717
className={cn(
18-
"border-2 border-black shadow-md hover:shadow-sm data-[state=open]:shadow-sm transition-all overflow-hidden",
18+
"border-2 bg-background text-foreground shadow-md hover:shadow-sm data-[state=open]:shadow-sm transition-all overflow-hidden",
1919
className,
2020
)}
2121
{...props}
@@ -31,7 +31,7 @@ const AccordionHeader = React.forwardRef<
3131
<AccordionPrimitive.Trigger
3232
ref={ref}
3333
className={cn(
34-
"flex flex-1 items-start justify-between px-4 py-2 font-head text-black cursor-pointer focus:outline-hidden [&[data-state=open]>svg]:rotate-180",
34+
"flex flex-1 items-start justify-between px-4 py-2 font-head cursor-pointer focus:outline-hidden [&[data-state=open]>svg]:rotate-180",
3535
className,
3636
)}
3737
{...props}

‎components/retroui/Alert.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { cva, type VariantProps } from "class-variance-authority";
44
import { cn } from "@/lib/utils";
55
import { Text } from "@/components/retroui/Text";
66

7-
const alertVariants = cva("relative w-full border-2 border-black p-4", {
7+
const alertVariants = cva("relative w-full border-2 p-4", {
88
variants: {
99
variant: {
1010
default: "bg-background text-foreground",

‎components/retroui/Avatar.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const Avatar = React.forwardRef<
1010
<AvatarPrimitive.Root
1111
ref={ref}
1212
className={cn(
13-
"relative flex h-14 w-14 border-2 border-black rounded-full overflow-hidden",
13+
"relative flex h-14 w-14 border-2 rounded-full overflow-hidden",
1414
className,
1515
)}
1616
{...props}

‎components/retroui/Badge.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ const badgeVariants = cva("font-semibold ", {
66
variants: {
77
variant: {
88
default: "bg-gray-200 text-gray-700",
9-
outline: "outline-2 outline-black text-black",
10-
solid: "bg-black text-white",
9+
outline: "outline-2 outline-foreground text-foreground",
10+
solid: "bg-foreground text-background",
1111
surface: "outline-2 bg-primary text-black",
1212
},
1313
size: {

0 commit comments

Comments
 (0)