Skip to content

Commit

Permalink
Merge pull request #13 from AlexGarrixen/next
Browse files Browse the repository at this point in the history
Redesign and new functions
  • Loading branch information
AlexGarrixen authored Jun 22, 2024
2 parents e2eebe6 + 7898f51 commit 55debcc
Show file tree
Hide file tree
Showing 133 changed files with 3,413 additions and 2,855 deletions.
1,607 changes: 881 additions & 726 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"dependencies": {
"@radix-ui/react-dialog": "^1.0.5",
"@radix-ui/react-popover": "^1.0.7",
"@radix-ui/react-select": "^2.0.0",
"@uidotdev/usehooks": "^2.4.1",
"chroma-js": "^2.4.2",
"color": "^4.2.3",
Expand All @@ -31,12 +32,13 @@
"react": "^18",
"react-colorful": "^5.6.1",
"react-dom": "^18",
"react-responsive-masonry": "^2.1.7"
"react-responsive-masonry": "^2.1.7",
"vaul": "^0.9.1"
},
"devDependencies": {
"@commitlint/cli": "^18.4.3",
"@commitlint/config-conventional": "^18.4.3",
"@pandacss/dev": "^0.21.0",
"@pandacss/dev": "^0.40.1",
"@storybook/addon-essentials": "^7.6.4",
"@storybook/addon-interactions": "^7.6.4",
"@storybook/addon-links": "^7.6.4",
Expand Down
2 changes: 2 additions & 0 deletions panda.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import tokens from "./theme/tokens";
import semanticTokens from "./theme/semantic-tokens";
import textStyles from "./theme/text-styles";
import breakpoints from "./theme/breakpoints";
import keyframes from "./theme/keyframes";
import patterns from "./theme/patterns";
import { recipes, slotRecipes } from "./theme/recipes";

Expand All @@ -28,5 +29,6 @@ export default defineConfig({
breakpoints,
recipes,
slotRecipes,
keyframes,
},
});
Binary file added public/photo-hero.webp
Binary file not shown.
14 changes: 7 additions & 7 deletions src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { css } from "@root/styled-system/css";
import { container } from "@root/styled-system/patterns";

import { dmSans } from "@/styles/fonts";
// import { dmSans } from "@/styles/fonts";
import { Layout } from "@/components/layout";
import { Aside } from "@/components/aside";
import { Navbar } from "@/components/navbar";
import { Footer } from "@/components/footer";
import { GoogleAnalytics } from "@/components/google-analytics";
import { DialogMoreDetails } from "@/components/dialog-more-details";
import metadata from "@/config/seo";
import { font } from "@/lib/local-font";

import "../styles/globals.css";

Expand All @@ -19,22 +19,22 @@ export default function RootLayout({ children }: { children: React.ReactNode })
return (
<html lang="en">
<body
className={`${dmSans.className} ${css({
className={`${font.className} ${css({
color: "text-primary",
bg: "bg-primary",
bg: "bg-secondary",
textStyle: "body-base",
})}`}
>
<Layout
aside={<Aside />}
content={
<>
<div className={container()}>{children}</div>
{children}
<Footer />
</>
}
header={<Navbar />}
/>
<DialogMoreDetails />
{IS_PROD ? <GoogleAnalytics /> : null}
</body>
</html>
Expand Down
8 changes: 7 additions & 1 deletion src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
import { SamplesPreview } from "@/components/samples-preview";
import { Toolbar } from "@/components/toolbar";

export default function Home() {
return <SamplesPreview />;
return (
<>
<Toolbar />
<SamplesPreview />
</>
);
}
66 changes: 0 additions & 66 deletions src/components/aside/aside.tsx

This file was deleted.

1 change: 0 additions & 1 deletion src/components/aside/index.ts

This file was deleted.

This file was deleted.

19 changes: 0 additions & 19 deletions src/components/background-suggestions/background-suggestions.tsx

This file was deleted.

8 changes: 0 additions & 8 deletions src/components/background-suggestions/index.ts

This file was deleted.

21 changes: 0 additions & 21 deletions src/components/color-inputs/__tests__/background.test.tsx

This file was deleted.

21 changes: 0 additions & 21 deletions src/components/color-inputs/__tests__/foreground.test.tsx

This file was deleted.

29 changes: 0 additions & 29 deletions src/components/color-inputs/__tests__/swap-button.test.tsx

This file was deleted.

13 changes: 0 additions & 13 deletions src/components/color-inputs/background.tsx

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 55debcc

Please sign in to comment.