ugly-app 0.1.11 → 0.1.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli/dev.js +1 -1
- package/dist/cli/dev.js.map +1 -1
- package/package.json +1 -1
- package/templates/client/App.tsx +14 -15
- package/templates/client/main.tsx +3 -3
- package/templates/client/router.ts +2 -2
- package/templates/server/index.ts +17 -5
- package/templates/shared/collections.ts +2 -4
- package/templates/shared/pages.ts +5 -3
- package/templates/vite.config.ts +3 -3
package/dist/cli/dev.js
CHANGED
|
@@ -113,7 +113,7 @@ export async function runDev() {
|
|
|
113
113
|
q('npx tsx watch --env-file=.env server/index.ts'),
|
|
114
114
|
q('npx vite'),
|
|
115
115
|
q(noFail('npx tsc --watch --noEmit')),
|
|
116
|
-
q(noFail('npx esw --watch --changed --ext .ts,.tsx
|
|
116
|
+
q(noFail('npx esw --watch --changed --ext .ts,.tsx server client shared')),
|
|
117
117
|
].join(' ');
|
|
118
118
|
const child = spawn(cmd, [], {
|
|
119
119
|
stdio: 'inherit',
|
package/dist/cli/dev.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../src/cli/dev.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../src/cli/dev.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/templates/client/App.tsx
CHANGED
|
@@ -1,32 +1,31 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
+
import type { RouterState } from 'ugly-app/shared';
|
|
2
3
|
import type { AppSocket } from 'ugly-app/client';
|
|
3
4
|
import { FeedbackButton } from 'ugly-app/client';
|
|
4
|
-
import type { AppRegistry } from '../shared/api
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
5
|
+
import type { AppRegistry } from '../shared/api';
|
|
6
|
+
import { RouterView } from './router';
|
|
7
|
+
import { AuthDemoPage } from './pages/AuthDemoPage';
|
|
8
|
+
import { HomePage } from './pages/HomePage';
|
|
9
|
+
import { SearchPage } from './pages/SearchPage';
|
|
10
|
+
import { UserPage } from './pages/UserPage';
|
|
9
11
|
|
|
10
12
|
interface AppProps {
|
|
11
13
|
socket: AppSocket<AppRegistry> | null;
|
|
12
14
|
}
|
|
13
15
|
|
|
14
|
-
function
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
return <UserPage userId={userId} />;
|
|
16
|
+
function renderPage(state: RouterState): React.ReactNode {
|
|
17
|
+
switch (state.routeName) {
|
|
18
|
+
case 'auth-demo': return <AuthDemoPage />;
|
|
19
|
+
case 'user/:userId': return <UserPage userId={state.params.userId ?? ''} />;
|
|
20
|
+
case 'search': return <SearchPage />;
|
|
21
|
+
default: return <HomePage />;
|
|
21
22
|
}
|
|
22
|
-
if (path.startsWith('/search')) return <SearchPage />;
|
|
23
|
-
return <HomePage />;
|
|
24
23
|
}
|
|
25
24
|
|
|
26
25
|
export default function App({ socket }: AppProps): React.ReactElement {
|
|
27
26
|
return (
|
|
28
27
|
<>
|
|
29
|
-
<
|
|
28
|
+
<RouterView renderPage={renderPage} />
|
|
30
29
|
<FeedbackButton socket={socket} />
|
|
31
30
|
</>
|
|
32
31
|
);
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { createRoot } from 'react-dom/client';
|
|
2
2
|
import { AppProvider, createSocket, LoginPopup } from 'ugly-app/client';
|
|
3
|
-
import { functions, requests } from '../shared/api
|
|
4
|
-
import App from './App
|
|
5
|
-
import { RouterProvider } from './router
|
|
3
|
+
import { functions, requests } from '../shared/api';
|
|
4
|
+
import App from './App';
|
|
5
|
+
import { RouterProvider } from './router';
|
|
6
6
|
|
|
7
7
|
const root = createRoot(document.getElementById('root')!);
|
|
8
8
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { createRouter } from 'ugly-app/client';
|
|
2
|
-
import { pages } from '../shared/pages
|
|
2
|
+
import { pages } from '../shared/pages';
|
|
3
3
|
|
|
4
|
-
export const { RouterProvider, useRouter } = createRouter({ pages });
|
|
4
|
+
export const { RouterProvider, RouterView, useRouter } = createRouter({ pages });
|
|
@@ -1,10 +1,22 @@
|
|
|
1
|
-
import { createApp, registerFeedbackHandlers } from 'ugly-app';
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
1
|
+
import { createApp, createUserHelper, registerFeedbackHandlers } from 'ugly-app';
|
|
2
|
+
import { UserBase } from 'ugly-app/shared';
|
|
3
|
+
import { functions, requests } from '../shared/api';
|
|
4
|
+
import { collections } from '../shared/collections';
|
|
5
|
+
import { pages } from '../shared/pages';
|
|
6
|
+
|
|
7
|
+
// Extend UserBase with any app-specific fields
|
|
8
|
+
export interface User extends UserBase {
|
|
9
|
+
// name?: string;
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
const userHelper = createUserHelper<User>(collections.user);
|
|
5
13
|
|
|
6
14
|
const app = createApp({ functions, requests }, collections, (configurator) => {
|
|
7
15
|
configurator.setPages({ pages });
|
|
16
|
+
configurator.setUserHelper(userHelper);
|
|
17
|
+
configurator.setOnUserCreate(async (userId, info, db) => {
|
|
18
|
+
await userHelper.set(db, { id: userId, ...info });
|
|
19
|
+
});
|
|
8
20
|
});
|
|
9
21
|
|
|
10
22
|
const maintainBotUserId = process.env.MAINTAIN_BOT_USER_ID ?? '';
|
|
@@ -12,7 +24,7 @@ registerFeedbackHandlers(app, maintainBotUserId);
|
|
|
12
24
|
|
|
13
25
|
// Register request handlers
|
|
14
26
|
app.registerRequest('getMe', async (ctx) => {
|
|
15
|
-
const user = await ctx.
|
|
27
|
+
const user = await userHelper.get(ctx.db, ctx.userId);
|
|
16
28
|
return {
|
|
17
29
|
userId: ctx.userId,
|
|
18
30
|
email: user?.email,
|
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
import { defineCollections } from 'ugly-app/shared';
|
|
2
2
|
|
|
3
|
-
// Define your MongoDB collections here.
|
|
4
|
-
// See docs/collections.md for flag explanations.
|
|
5
|
-
|
|
6
3
|
export const collections = defineCollections({
|
|
7
|
-
|
|
4
|
+
user: { cache: true, trackable: false, public: false, parent: null },
|
|
5
|
+
// Add your collections here:
|
|
8
6
|
// post: { cache: false, trackable: true, public: true, parent: null },
|
|
9
7
|
});
|
|
10
8
|
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { definePage, definePages } from 'ugly-app/shared';
|
|
2
2
|
|
|
3
3
|
export const pages = definePages({
|
|
4
|
-
'': definePage<{}>({ auth: false, ssr: true }),
|
|
5
|
-
'
|
|
4
|
+
'': definePage<{}>({ auth: false, ssr: true }),
|
|
5
|
+
'auth-demo': definePage<{}>({ auth: false }),
|
|
6
|
+
'user/:userId': definePage<{ userId: string }>(),
|
|
7
|
+
'search': definePage<{ q?: string }>({ auth: false }),
|
|
6
8
|
});
|
|
7
9
|
|
|
8
|
-
export type
|
|
10
|
+
export type AppPages = typeof pages;
|
package/templates/vite.config.ts
CHANGED
|
@@ -9,9 +9,9 @@ export default defineConfig({
|
|
|
9
9
|
},
|
|
10
10
|
server: {
|
|
11
11
|
proxy: {
|
|
12
|
-
'/rpc': { target:
|
|
13
|
-
'/auth':
|
|
14
|
-
'/logs':
|
|
12
|
+
'/rpc': { target: `ws://localhost:${process.env['PORT'] ?? 3000}`, ws: true },
|
|
13
|
+
'/auth': `http://localhost:${process.env['PORT'] ?? 3000}`,
|
|
14
|
+
'/logs': `http://localhost:${process.env['PORT'] ?? 3000}`,
|
|
15
15
|
},
|
|
16
16
|
},
|
|
17
17
|
});
|