From 7fabc5ce7f4559e3b2c3a9c8548541e770488e16 Mon Sep 17 00:00:00 2001 From: Sivert Date: Sat, 23 Sep 2023 00:57:54 +0200 Subject: [PATCH] Added colors and updated each page with new grid --- dev/src/app/components/avatars/page.tsx | 4 +- dev/src/app/components/badges/page.tsx | 184 +++++++++--------- .../components/buttons/icons_only/page.tsx | 4 +- dev/src/app/components/buttons/page.tsx | 4 +- .../app/components/buttons/regular/page.tsx | 4 +- .../app/components/buttons/with_icon/page.tsx | 4 +- dev/src/app/components/colors/layout.tsx | 14 ++ dev/src/app/components/colors/page.tsx | 78 ++++++++ dev/src/app/components/inputs/page.tsx | 4 +- dev/src/app/components/servercards/page.tsx | 32 +-- dev/src/app/page.tsx | 6 +- dev/src/navbar.json | 3 +- dev/src/navbar_names.json | 1 + 13 files changed, 215 insertions(+), 127 deletions(-) create mode 100644 dev/src/app/components/colors/layout.tsx create mode 100644 dev/src/app/components/colors/page.tsx diff --git a/dev/src/app/components/avatars/page.tsx b/dev/src/app/components/avatars/page.tsx index 084d6df..93d7990 100644 --- a/dev/src/app/components/avatars/page.tsx +++ b/dev/src/app/components/avatars/page.tsx @@ -4,7 +4,7 @@ import React from 'react' export default function badges() { return ( - +
@@ -22,6 +22,6 @@ export default function badges() {
- +
) } diff --git a/dev/src/app/components/badges/page.tsx b/dev/src/app/components/badges/page.tsx index 732e12c..c04b2ff 100644 --- a/dev/src/app/components/badges/page.tsx +++ b/dev/src/app/components/badges/page.tsx @@ -14,104 +14,96 @@ import { Badge } from '@/index' export default function badges() { return ( - -
-
-

Regular

- Normal - Primary - Secondary - Accent - Ghost - Outline - Error - Warning - Info - Success -
+
+
+

Regular

+ Normal + Primary + Secondary + Accent + Ghost + Outline + Error + Warning + Info + Success +
-
-

Icon and text

- - Normal - - - Primary - - - - Secondary - - - - Accent - - - - Ghost - - - - Outline - - - - Error - - - - Warning - - - - Info - - - - Success - -
+
+

Icon and text

+ + Normal + + + Primary + + + + Secondary + + + + Accent + + + + Ghost + + + + Outline + + + + Error + + + + Warning + + + + Info + + + + Success + +
-
-

Icons only

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+

Icons only

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- +
) } diff --git a/dev/src/app/components/buttons/icons_only/page.tsx b/dev/src/app/components/buttons/icons_only/page.tsx index 145d8da..e49b955 100644 --- a/dev/src/app/components/buttons/icons_only/page.tsx +++ b/dev/src/app/components/buttons/icons_only/page.tsx @@ -15,7 +15,7 @@ import { export default function page() { return ( - +
@@ -55,6 +55,6 @@ export default function page() { - +
) } diff --git a/dev/src/app/components/buttons/page.tsx b/dev/src/app/components/buttons/page.tsx index db49a21..69161eb 100644 --- a/dev/src/app/components/buttons/page.tsx +++ b/dev/src/app/components/buttons/page.tsx @@ -5,7 +5,7 @@ import { Section } from '@/pageComponents/Section' export default function buttons() { return ( - +
@@ -37,6 +37,6 @@ export default function buttons() {
- +
) } diff --git a/dev/src/app/components/buttons/regular/page.tsx b/dev/src/app/components/buttons/regular/page.tsx index cb667dd..61b3e09 100644 --- a/dev/src/app/components/buttons/regular/page.tsx +++ b/dev/src/app/components/buttons/regular/page.tsx @@ -3,7 +3,7 @@ import React from 'react' export default function page() { return ( - +
@@ -17,6 +17,6 @@ export default function page() { - +
) } diff --git a/dev/src/app/components/buttons/with_icon/page.tsx b/dev/src/app/components/buttons/with_icon/page.tsx index 18ffb30..6ba49f3 100644 --- a/dev/src/app/components/buttons/with_icon/page.tsx +++ b/dev/src/app/components/buttons/with_icon/page.tsx @@ -15,7 +15,7 @@ import { export default function page() { return ( - +
@@ -66,6 +66,6 @@ export default function page() { Link - +
) } diff --git a/dev/src/app/components/colors/layout.tsx b/dev/src/app/components/colors/layout.tsx new file mode 100644 index 0000000..6219582 --- /dev/null +++ b/dev/src/app/components/colors/layout.tsx @@ -0,0 +1,14 @@ +import { PageTitle } from '@/pageComponents/PageWrapper' +import React from 'react' + +export default function RootLayout({ + children +}: { + children: React.ReactNode +}) { + return ( + + {children} + + ) +} diff --git a/dev/src/app/components/colors/page.tsx b/dev/src/app/components/colors/page.tsx new file mode 100644 index 0000000..ab88b4c --- /dev/null +++ b/dev/src/app/components/colors/page.tsx @@ -0,0 +1,78 @@ +'use client' + +import React from 'react' +import { Section } from '@/pageComponents/Section' + +export default function colors() { + function ColorPalette({ className }: { className?: string | undefined }) { + return ( + + ) + } + + return ( +
+
+ + + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+
+ ) +} diff --git a/dev/src/app/components/inputs/page.tsx b/dev/src/app/components/inputs/page.tsx index 1717c22..1317b38 100644 --- a/dev/src/app/components/inputs/page.tsx +++ b/dev/src/app/components/inputs/page.tsx @@ -5,7 +5,7 @@ import InputGroup from '@/components/InputGroup/InputGroup' export default function buttons() { return ( - +
-
+
) } diff --git a/dev/src/app/components/servercards/page.tsx b/dev/src/app/components/servercards/page.tsx index 4d31aa5..1b32952 100644 --- a/dev/src/app/components/servercards/page.tsx +++ b/dev/src/app/components/servercards/page.tsx @@ -4,24 +4,26 @@ import React from 'react' export default function servercards() { return ( -
-

Card without any data

- -
-
-

Sample card

- +
+
+

Card without any data

+ +
+
+

Sample card

+ +
-
+

Example cards:

-
+

Gryt UI

-

Welcome!

+

Welcome!👋

) diff --git a/dev/src/navbar.json b/dev/src/navbar.json index a98276d..1d8775c 100644 --- a/dev/src/navbar.json +++ b/dev/src/navbar.json @@ -3,6 +3,7 @@ "badges": "/components/badges/", "icons_only": "/components/buttons/icons_only/", "buttons": "/components/buttons/", + "colors": "/components/colors/", "regular": "/components/buttons/regular/", "with_icon": "/components/buttons/with_icon/", "inputs": "/components/inputs/", @@ -10,4 +11,4 @@ "components": "/components/", "servercards": "/components/servercards/", "app": "/" -} \ No newline at end of file +} diff --git a/dev/src/navbar_names.json b/dev/src/navbar_names.json index 0e83d58..a2e34ba 100644 --- a/dev/src/navbar_names.json +++ b/dev/src/navbar_names.json @@ -4,6 +4,7 @@ "icons_only": "Icon only", "buttons": "Buttons", "regular": "Regular", + "colors": "Colors", "with_icon": "With icon", "inputs": "Inputs", "modals": "Modals",