Skip to content

Commit f521519

Browse files
committed
Merge branch 'main' into copilot/fix-object-chart-components
2 parents 0fdebb8 + 311e49f commit f521519

File tree

381 files changed

+811
-56064
lines changed

Some content is hidden

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

381 files changed

+811
-56064
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
[![React](https://img.shields.io/badge/React-18+-61dafb.svg)](https://reactjs.org/)
1414
[![Tailwind CSS](https://img.shields.io/badge/Tailwind-3.0+-38bdf8.svg)](https://tailwindcss.com/)
1515

16-
[**Documentation**](https://www.objectui.org) | [**Quick Start**](#quick-start) | [**🎨 Showcase**](#-try-the-showcase) | [**Examples**](#examples)
16+
[**Documentation**](https://www.objectui.org) | [**Quick Start**](#quick-start)
1717

1818
</div>
1919

apps/site/.gitignore

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,26 @@
1-
# Dependencies
1+
# deps
22
/node_modules
33

4-
# Next.js
4+
# generated content
5+
.source
6+
7+
# test & build
8+
/coverage
59
/.next/
610
/out/
7-
8-
# Production
911
/build
12+
*.tsbuildinfo
1013

11-
# Misc
14+
# misc
1215
.DS_Store
1316
*.pem
14-
15-
# Debug
17+
/.pnp
18+
.pnp.js
1619
npm-debug.log*
1720
yarn-debug.log*
1821
yarn-error.log*
1922

20-
# Local env files
23+
# others
2124
.env*.local
22-
23-
# Vercel
2425
.vercel
25-
26-
# TypeScript
27-
*.tsbuildinfo
28-
next-env.d.ts
29-
30-
# Fumadocs
31-
.map.ts
32-
.source
26+
next-env.d.ts

apps/site/README.md

Lines changed: 30 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,45 @@
1-
# Object UI Documentation Site (Fumadocs Migration - In Progress)
1+
# my-app
22

3-
This is the official documentation site for Object UI, being migrated to [Fumadocs](https://fumadocs.vercel.app/).
3+
This is a Next.js application generated with
4+
[Create Fumadocs](https://github.com/fuma-nama/fumadocs).
45

5-
## Status
6-
7-
🚧 **Work in Progress** - The site structure is complete but there are issues with the fumadocs source API integration that need to be resolved.
8-
9-
### Completed
10-
- ✅ Next.js 15 + TypeScript setup
11-
- ✅ Tailwind CSS configuration
12-
- ✅ Fumadocs UI integration
13-
- ✅ MDX content processing
14-
- ✅ Basic documentation pages created
15-
- ✅ Homepage and layout structure
16-
17-
### Known Issues
18-
- ⚠️ Route generation not working - investigating fumadocs 15.x API changes
19-
- The `.source` output from fumadocs-mdx needs proper integration with loader
20-
- `createMDXSource` API compatibility issue with runtime-processed docs/meta
21-
22-
## Development
6+
Run development server:
237

248
```bash
25-
# Install dependencies
26-
pnpm install
27-
28-
# Start development server (NOTE: routes currently return 404)
9+
npm run dev
10+
# or
2911
pnpm dev
30-
31-
# Build for production
32-
pnpm build
12+
# or
13+
yarn dev
3314
```
3415

35-
## Project Structure
16+
Open http://localhost:3000 with your browser to see the result.
3617

37-
```
38-
apps/site/
39-
├── app/ # Next.js app directory
40-
│ ├── docs/ # Documentation pages
41-
│ ├── layout.tsx # Root layout
42-
│ └── page.tsx # Homepage
43-
├── content/ # MDX documentation content
44-
│ └── docs/ # Documentation markdown files
45-
├── lib/ # Library code
46-
│ └── source.ts # Fumadocs source configuration
47-
├── public/ # Static assets
48-
├── next.config.mjs # Next.js configuration
49-
├── tailwind.config.ts # Tailwind CSS configuration
50-
└── source.config.ts # Fumadocs MDX configuration
51-
```
18+
## Explore
19+
20+
In the project, you can see:
21+
22+
- `lib/source.ts`: Code for content source adapter, [`loader()`](https://fumadocs.dev/docs/headless/source-api) provides the interface to access your content.
23+
- `lib/layout.shared.tsx`: Shared options for layouts, optional but preferred to keep.
5224

53-
## Technical Notes
25+
| Route | Description |
26+
| ------------------------- | ------------------------------------------------------ |
27+
| `app/(home)` | The route group for your landing page and other pages. |
28+
| `app/docs` | The documentation layout and pages. |
29+
| `app/api/search/route.ts` | The Route Handler for search. |
5430

55-
The fumadocs-mdx compiler generates a `.source` directory with processed docs and meta exports. These are wrapped by `_runtime.doc()` and `_runtime.meta()` functions. The correct integration with fumadocs-core's `loader` and `createMDXSource` needs investigation based on fumadocs 15.x API.
31+
### Fumadocs MDX
5632

57-
## Next Steps
33+
A `source.config.ts` config file has been included, you can customise different options like frontmatter schema.
5834

59-
1. Investigate correct fumadocs 15.x API for integrating `.source` exports
60-
2. Fix route generation to resolve 404 errors
61-
3. Add search functionality
62-
4. Migrate remaining documentation content
63-
5. Set up deployment
35+
Read the [Introduction](https://fumadocs.dev/docs/mdx) for further details.
6436

65-
## Tech Stack
37+
## Learn More
6638

67-
- [Next.js 15](https://nextjs.org/) - React framework
68-
- [Fumadocs](https://fumadocs.vercel.app/) - Documentation framework
69-
- [Tailwind CSS](https://tailwindcss.com/) - Styling
70-
- [TypeScript](https://www.typescriptlang.org/) - Type safety
39+
To learn more about Next.js and Fumadocs, take a look at the following
40+
resources:
7141

42+
- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js
43+
features and API.
44+
- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
45+
- [Fumadocs](https://fumadocs.dev) - learn about Fumadocs

apps/site/app/(home)/layout.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import { HomeLayout } from 'fumadocs-ui/layouts/home';
2+
import { baseOptions } from '@/lib/layout.shared';
3+
4+
export default function Layout({ children }: LayoutProps<'/'>) {
5+
return <HomeLayout {...baseOptions()}>{children}</HomeLayout>;
6+
}
Lines changed: 4 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,9 @@
11
import Link from 'next/link';
2-
import { HomeLayout } from 'fumadocs-ui/layouts/home';
3-
import { Logo } from './components/Logo';
2+
43

54
export default function HomePage() {
65
return (
7-
<HomeLayout
8-
nav={{
9-
title: <Logo />,
10-
url: '/',
11-
}}
12-
githubUrl="https://github.com/objectstack-ai/objectui"
13-
links={[
14-
{
15-
text: 'Guide',
16-
url: '/docs/guide',
17-
active: 'nested-url',
18-
},
19-
{
20-
text: 'Components',
21-
url: '/docs/components',
22-
active: 'nested-url',
23-
},
24-
{
25-
text: 'Ecosystem',
26-
url: '/docs/ecosystem',
27-
active: 'nested-url',
28-
},
29-
{
30-
text: 'Blog',
31-
url: '/blog',
32-
active: 'nested-url',
33-
},
34-
]}
35-
>
36-
{/* Hero Section */}
6+
<>
377
<section className="relative overflow-hidden bg-gradient-to-br from-fd-background via-fd-background to-fd-muted/20 px-6 py-24 sm:py-32 lg:px-8">
388
<div className="relative mx-auto max-w-7xl">
399
<div className="mx-auto max-w-3xl text-center">
@@ -328,6 +298,6 @@ export default function HomePage() {
328298
</p>
329299
</div>
330300
</footer>
331-
</HomeLayout>
332-
);
301+
</>
302+
)
333303
}

apps/site/app/api/search/route.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import { source } from '@/lib/source';
2+
import { createFromSource } from 'fumadocs-core/search/server';
3+
4+
export const { GET } = createFromSource(source, {
5+
// https://docs.orama.com/docs/orama-js/supported-languages
6+
language: 'english',
7+
});

apps/site/app/blog/[slug]/page.tsx

Lines changed: 0 additions & 77 deletions
This file was deleted.

apps/site/app/blog/page.tsx

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)