bender/27cfa8f0-0dd8-4a18-b25d-1b3f589563f4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_3 into main #4

Merged
bender merged 2 commits from version_3 into main 2026-05-22 09:31:39 +00:00
Conversation 0 Commits 2 Files Changed 2 +26 -16
2 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/app/contact/page.tsx
View File

@@ -5,20 +5,24 @@ import ReactLenis from "lenis/react";
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import FaqSplitMedia from '@/components/sections/faq/FaqSplitMedia';
import FooterCard from '@/components/sections/footer/FooterCard';
import ContactCTA from '@/components/sections/contact/ContactCTA';
import { Facebook, Instagram, Twitter } from "lucide-react";
export default function ContactPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<NavbarStyleCentered
navItems={[{ name: "ホーム", id: "/" }, { name: "ショップ", id: "/shop" }, { name: "観光農園", id: "/garden" }, { name: "ブランド", id: "/brand" }, { name: "お問い合わせ", id: "/contact" }]}
brandName="ミキファーム"
/>
<ContactCTA tag="Contact" title="お問い合わせ" description="ご質問やご相談がございましたら、お気軽にご連絡ください。" buttons={[{ text: "メールを送る" }]} />
<FaqSplitMedia faqs={[]} faqsAnimation="slide-up" title="よくある質問" textboxLayout="default" />
<FooterCard logoText="有限会社ミキファーム" socialLinks={[{ icon: Facebook, href: "#", ariaLabel: "Facebook" }, { icon: Instagram, href: "#", ariaLabel: "Instagram" }, { icon: Twitter, href: "#", ariaLabel: "Twitter" }]} />
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[{ name: "ホーム", id: "/" }, { name: "ショップ", id: "/shop" }, { name: "お問い合わせ", id: "/contact" }]}
brandName="ミキファーム"
/>
</div>
<div id="faq" data-section="faq">
<FaqSplitMedia faqs={[]} faqsAnimation="slide-up" title="よくある質問" description="お問い合わせの多い質問をまとめています。" textboxLayout="default" useInvertedBackground={false} />
</div>
<div id="footer" data-section="footer">
<FooterCard logoText="有限会社ミキファーム" socialLinks={[{ icon: Facebook, href: "#", ariaLabel: "Facebook" }, { icon: Instagram, href: "#", ariaLabel: "Instagram" }, { icon: Twitter, href: "#", ariaLabel: "Twitter" }]} />
</div>
</ReactLenis>
</ThemeProvider>
);

20
src/app/shop/page.tsx
View File

@@ -9,18 +9,24 @@ import { Facebook, Instagram, Twitter } from "lucide-react";
export default function ShopPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<NavbarStyleCentered
navItems={[{ name: "ホーム", id: "/" }, { name: "ショップ", id: "/shop" }, { name: "観光農園", id: "/garden" }, { name: "ブランド", id: "/brand" }, { name: "お問い合わせ", id: "/contact" }]}
brandName="ミキファーム"
/>
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[{ name: "ホーム", id: "/" }, { name: "ショップ", id: "/shop" }, { name: "お問い合わせ", id: "/contact" }]}
brandName="ミキファーム"
/>
</div>
<div className="pt-32 pb-20 px-6 max-w-7xl mx-auto">
<h1 className="text-4xl font-bold mb-8">オンラインショップ</h1>
<p>厳選された完熟ライチを全国へお届けいたします。</p>
</div>
<FaqSplitMedia faqs={[]} faqsAnimation="slide-up" title="ショップ関連の質問" textboxLayout="default" />
<FooterCard logoText="有限会社ミキファーム" socialLinks={[{ icon: Facebook, href: "#", ariaLabel: "Facebook" }, { icon: Instagram, href: "#", ariaLabel: "Instagram" }, { icon: Twitter, href: "#", ariaLabel: "Twitter" }]} />
<div id="faq" data-section="faq">
<FaqSplitMedia faqs={[]} faqsAnimation="slide-up" title="ショップ関連の質問" description="ショップのご利用に関する質問です。" textboxLayout="default" useInvertedBackground={false} />
</div>
<div id="footer" data-section="footer">
<FooterCard logoText="有限会社ミキファーム" socialLinks={[{ icon: Facebook, href: "#", ariaLabel: "Facebook" }, { icon: Instagram, href: "#", ariaLabel: "Instagram" }, { icon: Twitter, href: "#", ariaLabel: "Twitter" }]} />
</div>
</ReactLenis>
</ThemeProvider>
);