mirror of
https://github.com/lowdefy/lowdefy.git
synced 2025-04-06 15:30:30 +08:00
feat(server-dev): Use Client in dev server.
This commit is contained in:
Gervwyk
parent
31de543757
commit
4089191bc8
@ -16,40 +16,47 @@
|
||||
|
||||
import React from 'react';
|
||||
|
||||
import { urlQuery } from '@lowdefy/helpers';
|
||||
import { useRouter } from 'next/router';
|
||||
|
||||
import Page from './Page.js';
|
||||
import Reload from './Reload.js';
|
||||
import setPageId from '../utils/setPageId.js';
|
||||
import setupLink from '../utils/setupLink.js';
|
||||
import useRootConfig from '../utils/useRootConfig.js';
|
||||
import createComponents from './createComponents.js';
|
||||
import Head from 'next/head';
|
||||
import Link from 'next/link';
|
||||
|
||||
const App = ({ lowdefy }) => {
|
||||
import Reload from './Reload.js';
|
||||
import Page from './Page.js';
|
||||
import setPageId from './utils/setPageId.js';
|
||||
import useRootConfig from './utils/useRootConfig.js';
|
||||
|
||||
import actions from '../build/plugins/actions.js';
|
||||
import blocks from '../build/plugins/blocks.js';
|
||||
import icons from '../build/plugins/icons.js';
|
||||
import operators from '../build/plugins/operatorsClient.js';
|
||||
|
||||
import '../build/plugins/styles.less';
|
||||
|
||||
const App = () => {
|
||||
const router = useRouter();
|
||||
const { data: rootConfig } = useRootConfig(router.basePath);
|
||||
|
||||
window.lowdefy = lowdefy;
|
||||
|
||||
lowdefy._internal.router = router;
|
||||
lowdefy._internal.link = setupLink(lowdefy);
|
||||
lowdefy._internal.components = createComponents(lowdefy);
|
||||
|
||||
lowdefy.basePath = lowdefy._internal.router.basePath;
|
||||
lowdefy.home = rootConfig.home;
|
||||
lowdefy.lowdefyGlobal = rootConfig.lowdefyGlobal;
|
||||
lowdefy.menus = rootConfig.menus;
|
||||
lowdefy.urlQuery = urlQuery.parse(window.location.search.slice(1));
|
||||
|
||||
const redirect = setPageId(lowdefy);
|
||||
const { redirect, pageId } = setPageId(router);
|
||||
if (redirect) {
|
||||
lowdefy._internal.router.push(`/${lowdefy.pageId}`);
|
||||
router.push(`/${pageId}`);
|
||||
}
|
||||
|
||||
return (
|
||||
<Reload lowdefy={lowdefy}>
|
||||
<Page lowdefy={lowdefy} />
|
||||
<Reload basePath={router.basePath}>
|
||||
<Page
|
||||
Components={{ Head, Link }}
|
||||
config={{
|
||||
rootConfig,
|
||||
}}
|
||||
pageId={pageId}
|
||||
router={router}
|
||||
types={{
|
||||
actions,
|
||||
blocks,
|
||||
icons,
|
||||
operators,
|
||||
}}
|
||||
/>
|
||||
</Reload>
|
||||
);
|
||||
};
|
||||
@ -15,14 +15,29 @@
|
||||
*/
|
||||
|
||||
import React from 'react';
|
||||
import Head from 'next/head';
|
||||
|
||||
const BindHead = ({ properties }) => {
|
||||
import Client from '@lowdefy/client';
|
||||
import usePageConfig from './utils/usePageConfig.js';
|
||||
|
||||
const Page = ({ Components, config, pageId, router, types }) => {
|
||||
const { data: pageConfig } = usePageConfig(pageId, router.basePath);
|
||||
if (!pageConfig) {
|
||||
router.replace(`/404`);
|
||||
return '';
|
||||
}
|
||||
return (
|
||||
<Head>
|
||||
<title>{properties.title}</title>
|
||||
</Head>
|
||||
<Client
|
||||
Components={Components}
|
||||
config={{
|
||||
...config,
|
||||
pageConfig,
|
||||
}}
|
||||
router={router}
|
||||
stage="dev"
|
||||
types={types}
|
||||
window={window}
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
||||
export default BindHead;
|
||||
export default Page;
|
||||
@ -16,13 +16,13 @@
|
||||
|
||||
import React, { useEffect } from 'react';
|
||||
|
||||
import useMutateCache from '../utils/useMutateCache.js';
|
||||
import waitForRestartedServer from '../utils/waitForRestartedServer.js';
|
||||
import useMutateCache from './utils/useMutateCache.js';
|
||||
import waitForRestartedServer from './utils/waitForRestartedServer.js';
|
||||
|
||||
const Reload = ({ children, lowdefy }) => {
|
||||
const mutateCache = useMutateCache(lowdefy.basePath);
|
||||
const Reload = ({ children, basePath }) => {
|
||||
const mutateCache = useMutateCache(basePath);
|
||||
useEffect(() => {
|
||||
const sse = new EventSource(`${lowdefy.basePath}/api/reload`);
|
||||
const sse = new EventSource(`${basePath}/api/reload`);
|
||||
|
||||
sse.addEventListener('reload', () => {
|
||||
mutateCache();
|
||||
@ -31,7 +31,7 @@ const Reload = ({ children, lowdefy }) => {
|
||||
|
||||
sse.onerror = () => {
|
||||
sse.close();
|
||||
waitForRestartedServer(lowdefy);
|
||||
waitForRestartedServer(basePath);
|
||||
};
|
||||
return () => {
|
||||
sse.close();
|
||||
@ -1,57 +0,0 @@
|
||||
/*
|
||||
Copyright 2020-2022 Lowdefy, Inc
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
import React from 'react';
|
||||
import getContext from '@lowdefy/engine';
|
||||
|
||||
import MountEvents from './block/MountEvents.js';
|
||||
|
||||
const Context = ({ children, lowdefy, config }) => {
|
||||
const context = getContext({ config, lowdefy });
|
||||
|
||||
return (
|
||||
<MountEvents
|
||||
asyncEventName="onInitAsync"
|
||||
context={context}
|
||||
eventName="onInit"
|
||||
triggerEvent={({ name, context, async }) => {
|
||||
if (!async) {
|
||||
context._internal.update(); // TODO: do we need this?
|
||||
context._internal.State.freezeState();
|
||||
}
|
||||
context._internal.RootBlocks.areas.root.blocks[0].triggerEvent({ name });
|
||||
}}
|
||||
>
|
||||
{(loadingOnInit) => {
|
||||
if (loadingOnInit) return ''; // TODO: handle onInit Loader
|
||||
return (
|
||||
<MountEvents
|
||||
asyncEventName="onEnterAsync"
|
||||
context={context}
|
||||
eventName="onEnter"
|
||||
triggerEvent={({ name, context }) =>
|
||||
context._internal.RootBlocks.areas.root.blocks[0].triggerEvent({ name })
|
||||
}
|
||||
>
|
||||
{(loadingOnEnter) => children(context, loadingOnEnter)}
|
||||
</MountEvents>
|
||||
);
|
||||
}}
|
||||
</MountEvents>
|
||||
);
|
||||
};
|
||||
|
||||
export default Context;
|
||||
@ -1,50 +0,0 @@
|
||||
/*
|
||||
Copyright 2020-2022 Lowdefy, Inc
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
import React from 'react';
|
||||
|
||||
import actions from '../../build/plugins/actions.js';
|
||||
import callRequest from '../utils/callRequest.js';
|
||||
import blockComponents from '../../build/plugins/blocks.js';
|
||||
import operators from '../../build/plugins/operatorsClient.js';
|
||||
|
||||
const LowdefyContext = ({ children, lowdefy }) => {
|
||||
if (!lowdefy._internal) {
|
||||
lowdefy._internal = {
|
||||
actions,
|
||||
blockComponents,
|
||||
callRequest,
|
||||
components: {},
|
||||
document,
|
||||
operators,
|
||||
updaters: {},
|
||||
window,
|
||||
displayMessage: ({ content }) => {
|
||||
console.log(content);
|
||||
return () => undefined;
|
||||
},
|
||||
link: () => undefined,
|
||||
};
|
||||
lowdefy.contexts = {};
|
||||
lowdefy.inputs = {};
|
||||
lowdefy.lowdefyGlobal = {};
|
||||
}
|
||||
lowdefy._internal.updateBlock = (blockId) =>
|
||||
lowdefy._internal.updaters[blockId] && lowdefy._internal.updaters[blockId]();
|
||||
return <>{children}</>;
|
||||
};
|
||||
|
||||
export default LowdefyContext;
|
||||
@ -1,54 +0,0 @@
|
||||
/*
|
||||
Copyright 2020-2022 Lowdefy, Inc
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
import React from 'react';
|
||||
|
||||
import Block from './block/Block.js';
|
||||
import Context from './Context.js';
|
||||
import Head from './Head.js';
|
||||
import usePageConfig from '../utils/usePageConfig.js';
|
||||
|
||||
const LoadingBlock = () => <div>Loading...</div>;
|
||||
|
||||
const Page = ({ lowdefy }) => {
|
||||
const { data: pageConfig } = usePageConfig(lowdefy.pageId, lowdefy.basePath);
|
||||
if (!pageConfig) {
|
||||
lowdefy._internal.router.replace(`/404`);
|
||||
return <LoadingBlock />;
|
||||
}
|
||||
return (
|
||||
<Context config={pageConfig} lowdefy={lowdefy}>
|
||||
{(context, loading) => {
|
||||
if (loading) {
|
||||
return <LoadingBlock />;
|
||||
}
|
||||
return (
|
||||
<>
|
||||
<Head properties={context._internal.RootBlocks.map[pageConfig.id].eval.properties} />
|
||||
<Block
|
||||
block={context._internal.RootBlocks.map[pageConfig.id]}
|
||||
Blocks={context._internal.RootBlocks}
|
||||
context={context}
|
||||
lowdefy={lowdefy}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
}}
|
||||
</Context>
|
||||
);
|
||||
};
|
||||
|
||||
export default Page;
|
||||
@ -1,57 +0,0 @@
|
||||
/*
|
||||
Copyright 2020-2022 Lowdefy, Inc
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
import React, { Suspense, useState } from 'react';
|
||||
|
||||
import { ErrorBoundary } from '@lowdefy/block-utils';
|
||||
|
||||
import CategorySwitch from './CategorySwitch.js';
|
||||
import LoadingBlock from './LoadingBlock.js';
|
||||
import MountEvents from './MountEvents.js';
|
||||
|
||||
const Block = ({ block, Blocks, context, isRoot, lowdefy }) => {
|
||||
const [updates, setUpdate] = useState(0);
|
||||
lowdefy._internal.updaters[block.id] = () => setUpdate(updates + 1);
|
||||
return (
|
||||
<ErrorBoundary>
|
||||
<Suspense fallback={<LoadingBlock block={block} lowdefy={lowdefy} />}>
|
||||
<MountEvents
|
||||
asyncEventName="onMountAsync"
|
||||
context={context}
|
||||
eventName="onMount"
|
||||
triggerEvent={block.triggerEvent}
|
||||
>
|
||||
{(loading) =>
|
||||
loading ? (
|
||||
<LoadingBlock block={block} lowdefy={lowdefy} />
|
||||
) : (
|
||||
<CategorySwitch
|
||||
block={block}
|
||||
Blocks={Blocks}
|
||||
context={context}
|
||||
isRoot={isRoot}
|
||||
lowdefy={lowdefy}
|
||||
updates={updates}
|
||||
/>
|
||||
)
|
||||
}
|
||||
</MountEvents>
|
||||
</Suspense>
|
||||
</ErrorBoundary>
|
||||
);
|
||||
};
|
||||
|
||||
export default Block;
|
||||
@ -1,115 +0,0 @@
|
||||
/*
|
||||
Copyright 2020-2022 Lowdefy, Inc
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
import React from 'react';
|
||||
import { BlockLayout } from '@lowdefy/layout';
|
||||
import { makeCssClass } from '@lowdefy/block-utils';
|
||||
|
||||
import Container from './Container.js';
|
||||
import List from './List.js';
|
||||
|
||||
const CategorySwitch = ({ block, Blocks, context, lowdefy }) => {
|
||||
if (!block.eval) return null; // Renderer updates before eval is executed for the first time on lists. See #520
|
||||
if (block.eval.visible === false)
|
||||
return <div id={`vs-${block.blockId}`} style={{ display: 'none' }} />;
|
||||
const Component = lowdefy._internal.blockComponents[block.type];
|
||||
switch (Component.meta.category) {
|
||||
case 'list':
|
||||
return (
|
||||
<List
|
||||
block={block}
|
||||
Blocks={Blocks}
|
||||
Component={Component}
|
||||
context={context}
|
||||
lowdefy={lowdefy}
|
||||
/>
|
||||
);
|
||||
case 'container':
|
||||
return (
|
||||
<Container
|
||||
block={block}
|
||||
Blocks={Blocks}
|
||||
Component={Component}
|
||||
context={context}
|
||||
lowdefy={lowdefy}
|
||||
/>
|
||||
);
|
||||
case 'input':
|
||||
return (
|
||||
<BlockLayout
|
||||
id={`bl-${block.blockId}`}
|
||||
blockStyle={block.eval.style}
|
||||
highlightBorders={lowdefy.lowdefyGlobal.highlightBorders}
|
||||
layout={block.eval.layout || {}}
|
||||
makeCssClass={makeCssClass}
|
||||
>
|
||||
<Component
|
||||
methods={Object.assign(block.methods, {
|
||||
makeCssClass,
|
||||
registerEvent: block.registerEvent,
|
||||
registerMethod: block.registerMethod,
|
||||
setValue: block.setValue,
|
||||
triggerEvent: block.triggerEvent,
|
||||
})}
|
||||
basePath={lowdefy.basePath}
|
||||
blockId={block.blockId}
|
||||
components={lowdefy._internal.components}
|
||||
events={block.eval.events}
|
||||
key={block.blockId}
|
||||
menus={lowdefy.menus}
|
||||
pageId={lowdefy.pageId}
|
||||
properties={block.eval.properties}
|
||||
required={block.eval.required}
|
||||
user={lowdefy.user}
|
||||
validation={block.eval.validation}
|
||||
value={block.value}
|
||||
/>
|
||||
</BlockLayout>
|
||||
);
|
||||
default:
|
||||
return (
|
||||
<BlockLayout
|
||||
id={`bl-${block.blockId}`}
|
||||
blockStyle={block.eval.style}
|
||||
highlightBorders={lowdefy.lowdefyGlobal.highlightBorders}
|
||||
layout={block.eval.layout || {}}
|
||||
makeCssClass={makeCssClass}
|
||||
>
|
||||
<Component
|
||||
methods={Object.assign(block.methods, {
|
||||
makeCssClass,
|
||||
registerEvent: block.registerEvent,
|
||||
registerMethod: block.registerMethod,
|
||||
triggerEvent: block.triggerEvent,
|
||||
})}
|
||||
basePath={lowdefy.basePath}
|
||||
blockId={block.blockId}
|
||||
components={lowdefy._internal.components}
|
||||
events={block.eval.events}
|
||||
key={block.blockId}
|
||||
menus={lowdefy.menus}
|
||||
pageId={lowdefy.pageId}
|
||||
properties={block.eval.properties}
|
||||
required={block.eval.required}
|
||||
user={lowdefy.user}
|
||||
validation={block.eval.validation}
|
||||
/>
|
||||
</BlockLayout>
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
export default CategorySwitch;
|
||||
@ -1,85 +0,0 @@
|
||||
/*
|
||||
Copyright 2020-2022 Lowdefy, Inc
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
import React from 'react';
|
||||
import { Area, BlockLayout, layoutParamsToArea } from '@lowdefy/layout';
|
||||
import { makeCssClass } from '@lowdefy/block-utils';
|
||||
|
||||
import Block from './Block.js';
|
||||
|
||||
const Container = ({ block, Blocks, Component, context, lowdefy }) => {
|
||||
const content = {};
|
||||
// eslint-disable-next-line prefer-destructuring
|
||||
const areas = Blocks.subBlocks[block.id][0].areas;
|
||||
Object.keys(areas).forEach((areaKey, i) => {
|
||||
content[areaKey] = (areaStyle) => (
|
||||
<Area
|
||||
id={`ar-${block.blockId}-${areaKey}`}
|
||||
key={`ar-${block.blockId}-${areaKey}-${i}`}
|
||||
area={layoutParamsToArea({
|
||||
area: block.eval.areas[areaKey] || {},
|
||||
areaKey,
|
||||
layout: block.eval.layout || {},
|
||||
})}
|
||||
areaStyle={[areaStyle, block.eval.areas[areaKey] && block.eval.areas[areaKey].style]}
|
||||
highlightBorders={lowdefy.lowdefyGlobal.highlightBorders}
|
||||
makeCssClass={makeCssClass}
|
||||
>
|
||||
{areas[areaKey].blocks.map((bl, k) => (
|
||||
<Block
|
||||
key={`co-${bl.blockId}-${k}`}
|
||||
Blocks={Blocks.subBlocks[block.id][0]}
|
||||
block={bl}
|
||||
context={context}
|
||||
lowdefy={lowdefy}
|
||||
/>
|
||||
))}
|
||||
</Area>
|
||||
);
|
||||
});
|
||||
return (
|
||||
<BlockLayout
|
||||
id={`bl-${block.blockId}`}
|
||||
blockStyle={block.eval.style}
|
||||
highlightBorders={lowdefy.lowdefyGlobal.highlightBorders}
|
||||
layout={block.eval.layout || {}}
|
||||
makeCssClass={makeCssClass}
|
||||
>
|
||||
<Component
|
||||
methods={Object.assign(block.methods, {
|
||||
makeCssClass,
|
||||
registerEvent: block.registerEvent,
|
||||
registerMethod: block.registerMethod,
|
||||
triggerEvent: block.triggerEvent,
|
||||
})}
|
||||
basePath={lowdefy.basePath}
|
||||
blockId={block.blockId}
|
||||
components={lowdefy._internal.components}
|
||||
content={content}
|
||||
events={block.eval.events}
|
||||
key={block.blockId}
|
||||
menus={lowdefy.menus}
|
||||
pageId={lowdefy.pageId}
|
||||
properties={block.eval.properties}
|
||||
required={block.eval.required}
|
||||
user={lowdefy.user}
|
||||
validation={block.eval.validation}
|
||||
/>
|
||||
</BlockLayout>
|
||||
);
|
||||
};
|
||||
|
||||
export default Container;
|
||||
@ -1,92 +0,0 @@
|
||||
/*
|
||||
Copyright 2020-2022 Lowdefy, Inc
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
import React from 'react';
|
||||
import { Area, BlockLayout, layoutParamsToArea } from '@lowdefy/layout';
|
||||
import { makeCssClass } from '@lowdefy/block-utils';
|
||||
|
||||
import Block from './Block.js';
|
||||
|
||||
const List = ({ block, Blocks, Component, context, lowdefy }) => {
|
||||
const content = {};
|
||||
const contentList = [];
|
||||
Blocks.subBlocks[block.id].forEach((SBlock) => {
|
||||
Object.keys(SBlock.areas).forEach((areaKey) => {
|
||||
content[areaKey] = (areaStyle) => (
|
||||
<Area
|
||||
id={`ar-${block.blockId}-${SBlock.id}-${areaKey}`}
|
||||
key={`ar-${block.blockId}-${SBlock.id}-${areaKey}`}
|
||||
area={layoutParamsToArea({
|
||||
area: block.eval.areas[areaKey] || {},
|
||||
areaKey,
|
||||
layout: block.eval.layout || {},
|
||||
})}
|
||||
areaStyle={[areaStyle, block.eval.areas[areaKey] && block.eval.areas[areaKey].style]}
|
||||
highlightBorders={lowdefy.lowdefyGlobal.highlightBorders}
|
||||
makeCssClass={makeCssClass}
|
||||
>
|
||||
{SBlock.areas[areaKey].blocks.map((bl) => (
|
||||
<Block
|
||||
key={`ls-${bl.blockId}`}
|
||||
Blocks={SBlock}
|
||||
block={bl}
|
||||
context={context}
|
||||
lowdefy={lowdefy}
|
||||
/>
|
||||
))}
|
||||
</Area>
|
||||
);
|
||||
});
|
||||
contentList.push({ ...content });
|
||||
});
|
||||
return (
|
||||
<BlockLayout
|
||||
id={`bl-${block.blockId}`}
|
||||
blockStyle={block.eval.style}
|
||||
highlightBorders={lowdefy.lowdefyGlobal.highlightBorders}
|
||||
layout={block.eval.layout || {}}
|
||||
makeCssClass={makeCssClass}
|
||||
>
|
||||
<Component
|
||||
methods={Object.assign(block.methods, {
|
||||
makeCssClass,
|
||||
moveItemDown: block.moveItemDown,
|
||||
moveItemUp: block.moveItemUp,
|
||||
pushItem: block.pushItem,
|
||||
registerEvent: block.registerEvent,
|
||||
registerMethod: block.registerMethod,
|
||||
removeItem: block.removeItem,
|
||||
triggerEvent: block.triggerEvent,
|
||||
unshiftItem: block.unshiftItem,
|
||||
})}
|
||||
basePath={lowdefy.basePath}
|
||||
blockId={block.blockId}
|
||||
components={lowdefy._internal.components}
|
||||
events={block.eval.events}
|
||||
key={block.blockId}
|
||||
list={contentList}
|
||||
menus={lowdefy.menus}
|
||||
pageId={lowdefy.pageId}
|
||||
properties={block.eval.properties}
|
||||
required={block.eval.required}
|
||||
user={lowdefy.user}
|
||||
validation={block.eval.validation}
|
||||
/>
|
||||
</BlockLayout>
|
||||
);
|
||||
};
|
||||
|
||||
export default List;
|
||||
@ -1,22 +0,0 @@
|
||||
import React from 'react';
|
||||
// import { Loading, makeCssClass } from '@lowdefy/block-utils';
|
||||
// import { get } from '@lowdefy/helpers';
|
||||
// import { BlockLayout } from '@lowdefy/layout';
|
||||
|
||||
const LoadingBlock = ({ block, lowdefy }) => (
|
||||
<div>LoadingBlock</div>
|
||||
// <BlockLayout
|
||||
// id={`bl-loading-${block.blockId}`}
|
||||
// blockStyle={get(block, 'eval.style') || get(block, 'meta.loading.style', { default: {} })}
|
||||
// highlightBorders={lowdefy.lowdefyGlobal.highlightBorders}
|
||||
// layout={get(block, 'eval.layout') || get(block, 'meta.loading.layout', { default: {} })}
|
||||
// makeCssClass={makeCssClass}
|
||||
// >
|
||||
// <Loading
|
||||
// properties={get(block, 'meta.loading.properties')}
|
||||
// type={get(block, 'meta.loading.type')}
|
||||
// />
|
||||
// </BlockLayout>
|
||||
);
|
||||
|
||||
export default LoadingBlock;
|
||||
@ -1,46 +0,0 @@
|
||||
/*
|
||||
Copyright 2020-2022 Lowdefy, Inc
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
import React, { useEffect, useState } from 'react';
|
||||
|
||||
const MountEvents = ({ asyncEventName, context, eventName, triggerEvent, children }) => {
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [error, setError] = useState(null);
|
||||
useEffect(() => {
|
||||
let mounted = true;
|
||||
const mount = async () => {
|
||||
try {
|
||||
await triggerEvent({ name: eventName, context });
|
||||
if (mounted) {
|
||||
triggerEvent({ name: asyncEventName, context, async: true });
|
||||
setLoading(false);
|
||||
}
|
||||
} catch (err) {
|
||||
setError(err);
|
||||
}
|
||||
};
|
||||
mount();
|
||||
return () => {
|
||||
mounted = false;
|
||||
};
|
||||
}, [context]);
|
||||
|
||||
if (error) throw error;
|
||||
|
||||
return <>{children(loading)}</>;
|
||||
};
|
||||
|
||||
export default MountEvents;
|
||||
@ -1,29 +0,0 @@
|
||||
/*
|
||||
Copyright 2020-2022 Lowdefy, Inc
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
import { createIcon } from '@lowdefy/block-utils';
|
||||
|
||||
import createLinkComponent from './createLinkComponent.js';
|
||||
import icons from '../../build/plugins/icons.js';
|
||||
|
||||
const createComponents = (lowdefy) => {
|
||||
return {
|
||||
Link: createLinkComponent(lowdefy),
|
||||
Icon: createIcon(icons),
|
||||
};
|
||||
};
|
||||
|
||||
export default createComponents;
|
||||
@ -1,97 +0,0 @@
|
||||
import React from 'react';
|
||||
import NextLink from 'next/link';
|
||||
import { createLink } from '@lowdefy/engine';
|
||||
import { type } from '@lowdefy/helpers';
|
||||
|
||||
const createLinkComponent = (lowdefy) => {
|
||||
const backLink = ({ ariaLabel, children, className, id, rel }) => (
|
||||
<a
|
||||
id={id}
|
||||
onClick={() => lowdefy._internal.router.back()}
|
||||
className={className}
|
||||
rel={rel}
|
||||
aria-label={ariaLabel || 'back'}
|
||||
>
|
||||
{type.isFunction(children) ? children(id) : children}
|
||||
</a>
|
||||
);
|
||||
const newOriginLink = ({
|
||||
ariaLabel,
|
||||
children,
|
||||
className,
|
||||
id,
|
||||
newTab,
|
||||
pageId,
|
||||
query,
|
||||
rel,
|
||||
url,
|
||||
}) => {
|
||||
return (
|
||||
<a
|
||||
id={id}
|
||||
aria-label={ariaLabel}
|
||||
className={className}
|
||||
href={`${url}${query ? `?${query}` : ''}`}
|
||||
rel={rel || (newTab && 'noopener noreferrer')}
|
||||
target={newTab && '_blank'}
|
||||
>
|
||||
{type.isFunction(children) ? children(pageId || url || id) : children}
|
||||
</a>
|
||||
);
|
||||
};
|
||||
const sameOriginLink = ({
|
||||
ariaLabel,
|
||||
children,
|
||||
className,
|
||||
id,
|
||||
newTab,
|
||||
pageId,
|
||||
pathname,
|
||||
query,
|
||||
rel,
|
||||
replace,
|
||||
scroll,
|
||||
setInput,
|
||||
url,
|
||||
}) => {
|
||||
if (newTab) {
|
||||
return (
|
||||
// eslint-disable-next-line react/jsx-no-target-blank
|
||||
<a
|
||||
id={id}
|
||||
aria-label={ariaLabel}
|
||||
className={className}
|
||||
href={`${window.location.origin}${lowdefy.basePath}${pathname}${
|
||||
query ? `?${query}` : ''
|
||||
}`}
|
||||
rel={rel || 'noopener noreferrer'}
|
||||
target="_blank"
|
||||
>
|
||||
{type.isFunction(children) ? children(pageId || url || id) : children}
|
||||
</a>
|
||||
);
|
||||
}
|
||||
return (
|
||||
<NextLink href={{ pathname, query }} replace={replace} scroll={scroll}>
|
||||
<a id={id} aria-label={ariaLabel} className={className} rel={rel} onClick={setInput}>
|
||||
{type.isFunction(children) ? children(pageId || url || id) : children}
|
||||
</a>
|
||||
</NextLink>
|
||||
);
|
||||
};
|
||||
const noLink = ({ className, children, id }) => (
|
||||
<span id={id} className={className}>
|
||||
{type.isFunction(children) ? children(id) : children}
|
||||
</span>
|
||||
);
|
||||
return createLink({
|
||||
backLink,
|
||||
lowdefy,
|
||||
newOriginLink,
|
||||
sameOriginLink,
|
||||
noLink,
|
||||
disabledLink: noLink,
|
||||
});
|
||||
};
|
||||
|
||||
export default createLinkComponent;
|
||||
@ -14,20 +14,17 @@
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
function setPageId(lowdefy) {
|
||||
if (lowdefy._internal.router.pathname === `/404`) {
|
||||
lowdefy.pageId = '404';
|
||||
return false;
|
||||
function setPageId(router, rootConfig) {
|
||||
if (router.pathname === `/404`) {
|
||||
return { redirect: false, pageId: '404' };
|
||||
}
|
||||
if (!lowdefy._internal.router.query.pageId) {
|
||||
lowdefy.pageId = lowdefy.home.pageId;
|
||||
if (lowdefy.home.configured === false) {
|
||||
return true;
|
||||
if (!router.query.pageId) {
|
||||
if (rootConfig.home.configured === false) {
|
||||
return { redirect: true, pageId: rootConfig.home.pageId };
|
||||
}
|
||||
return false;
|
||||
return { redirect: false, pageId: rootConfig.home.pageId };
|
||||
}
|
||||
lowdefy.pageId = lowdefy._internal.router.query.pageId;
|
||||
return false;
|
||||
return { redirect: false, pageId: router.query.pageId };
|
||||
}
|
||||
|
||||
export default setPageId;
|
||||
@ -1,27 +0,0 @@
|
||||
/*
|
||||
Copyright 2020-2022 Lowdefy, Inc
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
import request from './request.js';
|
||||
|
||||
function callRequest(apiContext, { pageId, payload, requestId }) {
|
||||
return request({
|
||||
url: `${apiContext.config.basePath}/api/request/${pageId}/${requestId}`,
|
||||
method: 'POST',
|
||||
body: { payload },
|
||||
});
|
||||
}
|
||||
|
||||
export default callRequest;
|
||||
@ -20,14 +20,13 @@ async function request({ url, method = 'GET', body }) {
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: body && JSON.stringify(body),
|
||||
body: JSON.stringify(body),
|
||||
});
|
||||
if (res.status === 404) {
|
||||
return null;
|
||||
}
|
||||
if (!res.ok) {
|
||||
// TODO: check
|
||||
const body = await res.json();
|
||||
console.log(res);
|
||||
console.log(body);
|
||||
throw new Error(body.message || 'Request error');
|
||||
}
|
||||
return res.json();
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
/*
|
||||
Copyright 2020-2022 Lowdefy, Inc
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
import { createLink } from '@lowdefy/engine';
|
||||
|
||||
function setupLink(lowdefy) {
|
||||
const { router, window } = lowdefy._internal;
|
||||
const backLink = () => router.back();
|
||||
const disabledLink = () => {};
|
||||
const newOriginLink = ({ url, query, newTab }) => {
|
||||
if (newTab) {
|
||||
return window.open(`${url}${query ? `?${query}` : ''}`, '_blank').focus();
|
||||
} else {
|
||||
return window.location.assign(`${url}${query ? `?${query}` : ''}`);
|
||||
}
|
||||
};
|
||||
const sameOriginLink = ({ newTab, pathname, query, setInput }) => {
|
||||
if (newTab) {
|
||||
return window
|
||||
.open(
|
||||
`${window.location.origin}${lowdefy.basePath}${pathname}${query ? `?${query}` : ''}`,
|
||||
'_blank'
|
||||
)
|
||||
.focus();
|
||||
} else {
|
||||
setInput();
|
||||
return router.push({
|
||||
pathname,
|
||||
query,
|
||||
});
|
||||
}
|
||||
};
|
||||
const noLink = () => {
|
||||
throw new Error(`Invalid Link.`);
|
||||
};
|
||||
return createLink({ backLink, disabledLink, lowdefy, newOriginLink, noLink, sameOriginLink });
|
||||
}
|
||||
|
||||
export default setupLink;
|
||||
@ -18,7 +18,7 @@ import request from './request.js';
|
||||
// TODO: Handle TokenExpiredError
|
||||
|
||||
function fetchPageConfig(url) {
|
||||
return request({ url });
|
||||
return request(url);
|
||||
}
|
||||
|
||||
function usePageConfig(pageId, basePath) {
|
||||
|
||||
@ -16,15 +16,15 @@
|
||||
|
||||
import request from './request.js';
|
||||
|
||||
function waitForRestartedServer(lowdefy) {
|
||||
function waitForRestartedServer(basePath) {
|
||||
setTimeout(async () => {
|
||||
try {
|
||||
await request({
|
||||
url: `${lowdefy.basePath}/api/ping`,
|
||||
url: `${basePath}/api/ping`,
|
||||
});
|
||||
lowdefy._internal.window.location.reload();
|
||||
window.location.reload();
|
||||
} catch (error) {
|
||||
waitForRestartedServer(lowdefy);
|
||||
waitForRestartedServer(basePath);
|
||||
}
|
||||
}, 1500);
|
||||
}
|
||||
|
||||
@ -37,8 +37,8 @@
|
||||
"next": "next"
|
||||
},
|
||||
"dependencies": {
|
||||
"@lowdefy/actions-core": "4.0.0-alpha.8",
|
||||
"@lowdefy/api": "4.0.0-alpha.8",
|
||||
"@lowdefy/block-utils": "4.0.0-alpha.8",
|
||||
"@lowdefy/blocks-antd": "4.0.0-alpha.8",
|
||||
"@lowdefy/blocks-basic": "4.0.0-alpha.8",
|
||||
"@lowdefy/blocks-color-selectors": "4.0.0-alpha.8",
|
||||
@ -46,6 +46,7 @@
|
||||
"@lowdefy/blocks-loaders": "4.0.0-alpha.8",
|
||||
"@lowdefy/blocks-markdown": "4.0.0-alpha.8",
|
||||
"@lowdefy/build": "4.0.0-alpha.8",
|
||||
"@lowdefy/client": "4.0.0-alpha.8",
|
||||
"@lowdefy/connection-axios-http": "4.0.0-alpha.8",
|
||||
"@lowdefy/engine": "4.0.0-alpha.8",
|
||||
"@lowdefy/helpers": "4.0.0-alpha.8",
|
||||
|
||||
@ -14,27 +14,14 @@
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
import React, { Suspense } from 'react';
|
||||
import React from 'react';
|
||||
import dynamic from 'next/dynamic';
|
||||
|
||||
import { ErrorBoundary } from '@lowdefy/block-utils';
|
||||
|
||||
import LowdefyContext from '../lib/components/LowdefyContext.js';
|
||||
|
||||
// Must be in _app due to next specifications.
|
||||
import '../build/plugins/styles.less';
|
||||
|
||||
const lowdefy = {};
|
||||
|
||||
function App({ Component, pageProps }) {
|
||||
return (
|
||||
<Suspense fallback="">
|
||||
<ErrorBoundary>
|
||||
<LowdefyContext lowdefy={lowdefy}>
|
||||
<Component lowdefy={lowdefy} {...pageProps} />
|
||||
</LowdefyContext>
|
||||
</ErrorBoundary>
|
||||
</Suspense>
|
||||
);
|
||||
return <Component {...pageProps} />;
|
||||
}
|
||||
|
||||
const DynamicApp = dynamic(() => Promise.resolve(App), {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user