Merge pull request #114 from justdlabs/laravel-11.x

Use navbar from justd

CHANGELOG.md

@@ -1,11 +1,24 @@
 
 
-## [1.0.34](https://github.com/justdlabs/inertia.ts/compare/1.0.33...1.0.34) (2024-10-17)
+## [1.1.1](https://github.com/justdlabs/inertia.ts/compare/1.1.0...1.1.1) (2024-10-22)
+
+## [1.1.0](https://github.com/justdlabs/inertia.ts/compare/1.0.34...1.1.0) (2024-10-22)
+
+
+### Features
+
+* sync justd ([5ccf885](https://github.com/justdlabs/inertia.ts/commit/5ccf885ca9f09e85e004acc07b006a7b500c1c7c))
 
 
 ### Bug Fixes
 
-* add flash message to page props ([5693438](https://github.com/justdlabs/inertia.ts/commit/5693438f098252f157fc3edc8f8d285e7a7fe479))
+* bump ([9cd9ba5](https://github.com/justdlabs/inertia.ts/commit/9cd9ba563d2107e603e2f68e46aa120a7a02454b))
+
+## [1.0.34](https://github.com/justdlabs/inertia.ts/compare/1.0.33...1.0.34) (2024-10-17)
+
+### Bug Fixes
+
+-   add flash message to page props ([5693438](https://github.com/justdlabs/inertia.ts/commit/5693438f098252f157fc3edc8f8d285e7a7fe479))
 
 ## [1.0.33](https://github.com/justdlabs/inertia.ts/compare/1.0.32...1.0.33) (2024-10-17)
 

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "justd/laravel",
-    "version": "1.0.34",
+    "version": "1.1.1",
     "type": "project",
     "description": "The skeleton application for the Laravel framework.",
     "keywords": [

package.json

@@ -15,10 +15,10 @@
         "@release-it/bumper": "^6.0.1",
         "@release-it/conventional-changelog": "^8.0.2",
         "@tailwindcss/forms": "^0.5.9",
-        "@types/node": "^18.19.56",
+        "@types/node": "^18.19.58",
         "@types/react": "^18.3.11",
         "@types/react-dom": "^18.3.1",
-        "@vitejs/plugin-react": "^4.3.2",
+        "@vitejs/plugin-react": "^4.3.3",
         "autoprefixer": "^10.4.20",
         "axios": "^1.7.7",
         "husky": "^9.1.6",
@@ -80,5 +80,5 @@
             }
         }
     },
-    "version": "1.0.34"
+    "version": "1.1.1"
 }

resources/js/components/header.tsx

@@ -1,6 +1,5 @@
-import { Container } from 'components/container';
 import * as React from 'react';
-import { cn } from 'ui';
+import { cn, Container } from 'ui';
 
 const Header = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
     ({ className, ...props }, ref) => (

resources/js/components/ui/container.tsx

@@ -0,0 +1,28 @@
+import React from 'react';
+
+import { tv } from 'tailwind-variants';
+
+const containerStyles = tv({
+    base: 'mx-auto w-full max-w-7xl',
+    variants: {
+        variant: {
+            constrained: 'container sm:px-6 lg:px-8',
+            'padded-content': 'px-4 sm:px-6 lg:px-8'
+        }
+    },
+    defaultVariants: {
+        variant: 'padded-content'
+    }
+});
+
+interface ContainerProps extends React.HTMLAttributes<HTMLDivElement> {
+    variant?: 'constrained' | 'padded-content';
+}
+
+const Container = React.forwardRef<HTMLDivElement, ContainerProps>(({ className, variant, ...props }, ref) => (
+    <div className={containerStyles({ variant, className })} {...props} ref={ref} />
+));
+
+Container.displayName = 'Container';
+
+export { Container };

resources/js/components/ui/index.ts

@@ -1,8 +1,8 @@
-export * from '../container';
 export * from './avatar';
 export * from './button';
 export * from './card';
 export * from './checkbox';
+export * from './container';
 export * from './dialog';
 export * from './dropdown';
 export * from './field';
@@ -13,10 +13,12 @@ export * from './link';
 export * from './list-box';
 export * from './menu';
 export * from './modal';
+export * from './navbar';
 export * from './pagination';
 export * from './popover';
 export * from './primitive';
 export * from './select';
+export * from './separator';
 export * from './sheet';
 export * from './table';
 export * from './text-field';