Skip to content

Commit 5865fec

Browse files
ariflogsariflogs
authored
Merge branch 'main' into silderAdd2
2 parents 83e8967 + 549088e commit 5865fec

File tree

70 files changed

+1734
-152
lines changed

Some content is hidden

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

70 files changed

+1734
-152
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.5 ./
28-
docker push devarifhossain/retroui:1.1.5
27+
docker build -t devarifhossain/retroui:1.1.9 ./
28+
docker push devarifhossain/retroui:1.1.9
2929
3030
# - name: Set up SSH
3131
# uses: webfactory/[email protected]

‎.vscode/settings.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
{
2-
"cSpell.words": [
3-
"clsx",
4-
"rehype"
5-
],
2+
"cSpell.words": ["clsx", "rehype", "retroui"],
63
"tailwindCSS.experimental.classRegex": [
74
["cva\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"],
85
["cx\\(([^)]*)\\)", "(?:'|\"|`)([^']*)(?:'|\"|`)"]

‎app/(docs)/docs/layout.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export default function ComponentLayout({
1515
<div className="hidden lg:block">
1616
<SideNav />
1717
</div>
18-
<div className="lg:ml-72 px-4 lg:px-0">{children}</div>
18+
<div className="lg:ml-72 mt-16 md:mt-10 px-4 lg:px-0">{children}</div>
1919
</div>
2020
);
2121
}

‎app/(marketing)/page.tsx‎

Lines changed: 48 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,8 @@ export default async function Home() {
6969

7070
<Text as="h1" className="text-5xl lg:text-6xl">
7171
Make your projects
72-
</Text>
73-
<Text as="h1" className="text-5xl lg:text-6xl text-outlined">
74-
stand out!
72+
<br />
73+
<span className="text-outlined">stand out!</span>
7574
</Text>
7675

7776
<p className="text-lg text-muted-foreground mb-8 mt-4">
@@ -80,7 +79,7 @@ export default async function Home() {
8079
into your projects.
8180
</p>
8281

83-
<div className="max-w-96 grid gap-4 grid-cols-2 mx-auto lg:mx-0">
82+
<div className="flex space-x-4">
8483
<Link href="/docs" passHref>
8584
<Button
8685
className="w-full"
@@ -89,17 +88,13 @@ export default async function Home() {
8988
Get Started
9089
</Button>
9190
</Link>
92-
<Link
93-
href="https://github.com/Logging-Stuff/retroui"
94-
target="_blank"
95-
passHref
96-
>
91+
<Link href="https://pro.retroui.dev/blocks" passHref>
9792
<Button
9893
className="w-full"
9994
variant="outline"
10095
aria-label="Get Started with RetroUI"
10196
>
102-
Github
97+
Browse Blocks
10398
</Button>
10499
</Link>
105100
</div>
@@ -217,7 +212,7 @@ export default async function Home() {
217212
<Text as="h3" className="mb-2 font-sans">
218213
Github Stars
219214
</Text>
220-
<Text as="h1" className="text-outlined text-7xl lg:text-8xl">
215+
<Text className="text-outlined text-7xl lg:text-8xl font-head">
221216
350+
222217
</Text>
223218
<Image
@@ -232,7 +227,7 @@ export default async function Home() {
232227
<Text as="h3" className="mb-2 font-sans">
233228
Discord Members
234229
</Text>
235-
<Text as="h1" className="text-outlined text-7xl lg:text-8xl">
230+
<Text className="text-outlined text-7xl lg:text-8xl font-head">
236231
100+
237232
</Text>
238233
<Image
@@ -286,43 +281,6 @@ export default async function Home() {
286281
</div>
287282
</section>
288283

289-
<section className="container max-w-6xl mx-auto px-4 lg:px-0 grid grid-cols-1 lg:grid-cols-2 gap-8 items-center my-36">
290-
<div className="w-full">
291-
<Text as="h2">
292-
The <span className="text-outlined">Figma</span> UI Kit You Were
293-
Looking For!
294-
</Text>
295-
<div className="flex flex-col space-y-1 mt-6 mb-8 text-muted-foreground">
296-
<Text className="text-lg">
297-
- Based on the design foundation of RetroUI.
298-
</Text>
299-
<Text className="text-lg">
300-
- Comes with 60+ UI elements like cards, modals, stats, etc .
301-
</Text>
302-
<Text className="text-lg">
303-
- Get Lifetime update of new versions.
304-
</Text>
305-
</div>
306-
307-
<Link
308-
id="checkout-figma-kit"
309-
data-umami-event="checkout-figma-kit"
310-
href="https://dub.sh/retroui-figma"
311-
target="_blank"
312-
>
313-
<Button>Checkout Now</Button>
314-
</Link>
315-
</div>
316-
<div className="w-full">
317-
<Image
318-
src="/images/figma-banner.png"
319-
width={800}
320-
height={800}
321-
alt="retroui code showcase"
322-
/>
323-
</div>
324-
</section>
325-
326284
<section className="container max-w-6xl mx-auto border-2 bg-primary border-black py-16 px-4 lg:p-16 my-36">
327285
<Text as="h2" className="text-center mb-2">
328286
Community Contributors
@@ -355,20 +313,59 @@ export default async function Home() {
355313
target="_blank"
356314
passHref
357315
>
358-
<Button className="flex items-center bg-white" variant="outline">
316+
<Button className="bg-white" variant="outline">
359317
<GithubIcon size="16" className="mr-2" />
360318
Star on Github
361319
</Button>
362320
</Link>
363321
<Link href="https://discord.gg/Jum3NJxK6Q" target="_blank" passHref>
364-
<Button className="flex items-center bg-white" variant="outline">
322+
<Button className="bg-white" variant="outline">
365323
<MessageCircle size="16" className="mr-2" />
366324
Join Community
367325
</Button>
368326
</Link>
369327
</div>
370328
</section>
371329

330+
<section className="container max-w-6xl mx-auto px-4 lg:px-0 grid grid-cols-1 lg:grid-cols-2 gap-8 items-center my-36">
331+
<div className="w-full">
332+
<Text as="h2">
333+
🚀 Ship <span className="text-outlined">Faster</span> With Pro
334+
Blocks and Templates!
335+
</Text>
336+
<div className="flex flex-col space-y-1 mt-6 mb-8 text-muted-foreground">
337+
<Text className="text-lg">
338+
- Based on the design foundation of RetroUI.
339+
</Text>
340+
<Text className="text-lg">
341+
- Over 50+ premium ready-to-use components.
342+
</Text>
343+
<Text className="text-lg">
344+
- Complete pre-built website templates.
345+
</Text>
346+
<Text className="text-lg">
347+
- Lifetime access to all future updates.
348+
</Text>
349+
</div>
350+
351+
<Link
352+
id="checkout-figma-kit"
353+
data-umami-event="checkout-figma-kit"
354+
href="https://dub.sh/retroui-pro"
355+
target="_blank"
356+
>
357+
<Button>Explore Blocks</Button>
358+
</Link>
359+
</div>
360+
<div className="w-full">
361+
<Image
362+
src="/images/figma-banner.png"
363+
width={800}
364+
height={800}
365+
alt="retroui code showcase"
366+
/>
367+
</div>
368+
</section>
372369
<footer className="bg-black py-8">
373370
<div className="container max-w-6xl mx-auto flex flex-col lg:flex-row space-y-4 lg:space-y-0 justify-between items-center">
374371
<div className="flex justify-center space-x-4">

‎app/global.css‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@
66

77
--shadow-xs: 1px 1px 0 0 var(--border);
88
--shadow-sm: 2px 2px 0 0 var(--border);
9-
--shadow-md: 3px 3px 0 0 var(--border);
10-
--shadow-lg: 4px 4px 0 1px var(--border);
9+
--shadow: 3px 3px 0 0 var(--border);
10+
--shadow-md: 4px 4px 0 0 var(--border);
11+
--shadow-lg: 6px 6px 0 0 var(--border);
12+
--shadow-xl: 10px 10px 0 1px var(--border);
13+
--shadow-2xl: 16px 16px 0 1px var(--border);
1114

1215
--color-background: var(--background);
1316
--color-foreground: var(--foreground);

‎components/ComponentInstall.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ function ComponentInstall({ children }: IComponentShowcase) {
2323
<Tab className="min-w-12 cursor-pointer relative px-2 py-1 bg-transparent data-selected:border data-selected:border-b-0 data-selected:bg-black data-selected:text-white focus:outline-hidden">
2424
Manual
2525
</Tab>
26+
<Tab className="min-w-12 cursor-pointer relative px-2 py-1 bg-transparent data-selected:border data-selected:border-b-0 data-selected:bg-black data-selected:text-white focus:outline-hidden">
27+
Open in V0
28+
</Tab>
2629
</TabList>
2730

2831
<TabPanels>{children}</TabPanels>

‎components/ComponentShowcase.tsx‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { componentConfig } from "@/config";
22
import { TabGroup, TabList, TabPanels, TabPanel, Tab } from "@headlessui/react";
33
import React, { HTMLAttributes } from "react";
4+
import { Button } from "./ui";
45

56
interface IComponentShowcase extends HTMLAttributes<HTMLDivElement> {
67
name: keyof typeof componentConfig.examples;
@@ -22,7 +23,35 @@ export function ComponentShowcase({ name, children }: IComponentShowcase) {
2223
</TabList>
2324
<TabPanels>
2425
<TabPanel>
25-
<div className="border rounded-sm p-6 mt-4">
26+
<div className="border rounded-sm px-6 py-24 flex justify-center items-center min-h-80 mt-4 relative">
27+
<a
28+
href={`https://v0.dev/chat/api/open?url=https://retroui.dev/r/${name}.json`}
29+
target="_blank"
30+
>
31+
<Button
32+
variant="secondary"
33+
size="sm"
34+
className="font-sans absolute top-4 right-4"
35+
>
36+
Open in
37+
<svg
38+
viewBox="0 0 40 20"
39+
fill="none"
40+
xmlns="http://www.w3.org/2000/svg"
41+
className="h-5 w-5 ml-2 text-current"
42+
>
43+
<path
44+
d="M23.3919 0H32.9188C36.7819 0 39.9136 3.13165 39.9136 6.99475V16.0805H36.0006V6.99475C36.0006 6.90167 35.9969 6.80925 35.9898 6.71766L26.4628 16.079C26.4949 16.08 26.5272 16.0805 26.5595 16.0805H36.0006V19.7762H26.5595C22.6964 19.7762 19.4788 16.6139 19.4788 12.7508V3.68923H23.3919V12.7508C23.3919 12.9253 23.4054 13.0977 23.4316 13.2668L33.1682 3.6995C33.0861 3.6927 33.003 3.68923 32.9188 3.68923H23.3919V0Z"
45+
fill="currentColor"
46+
></path>
47+
<path
48+
d="M13.7688 19.0956L0 3.68759H5.53933L13.6231 12.7337V3.68759H17.7535V17.5746C17.7535 19.6705 15.1654 20.6584 13.7688 19.0956Z"
49+
fill="currentColor"
50+
></path>
51+
</svg>
52+
</Button>
53+
</a>
54+
2655
<Preview />
2756
</div>
2857
</TabPanel>

‎components/SideNav.tsx‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,31 @@
1+
"use client";
2+
13
import { navConfig } from "@/config/navigation";
24
import { Badge, Text } from "@/components/ui";
35
import Link from "next/link";
6+
import { usePathname } from "next/navigation";
47

58
export default function SideNav() {
9+
const pathname = usePathname();
10+
611
return (
712
<div
8-
className={`fixed right-auto border-r-2 border-black h-full overflow-y-scroll transition-transform transform md:translate-x-0 w-64 bg-white flex flex-col justify-center md:justify-start py-14 md:py-8`}
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`}
914
>
10-
<nav className="flex flex-col items-start pr-6 pb-16 space-y-4">
15+
<nav className="flex flex-col items-start px-6 lg:pl-0 pb-26 space-y-4">
1116
{navConfig.sideNavItems.map((item) => (
12-
<div key={item.title}>
17+
<div key={item.title} className="w-full">
1318
<Text as="h6">{item.title}</Text>
14-
<div className="flex flex-col space-y-2">
19+
<div className="flex flex-col w-full">
1520
{item.children.map((child) => (
16-
<Link key={child.title} href={child.href}>
21+
<Link
22+
key={child.title}
23+
href={child.href}
24+
className={`px-2 py-1 w-full border border-transparent ${
25+
pathname === child.href &&
26+
"bg-primary text-black border-black"
27+
}`}
28+
>
1729
{child.title}
1830
{child.tag && (
1931
<Badge size="sm" className="ml-2">

0 commit comments

Comments
 (0)