fix: error

This commit is contained in:
2024-03-20 17:46:31 +08:00
parent b49ef982b9
commit f9c6a2fb75
8 changed files with 861 additions and 1102 deletions

View File

@@ -11,7 +11,7 @@
"lint": "eslint src", "lint": "eslint src",
"jest": "jest", "jest": "jest",
"jest:watch": "jest --watch", "jest:watch": "jest --watch",
"test": "yarn typecheck && yarn lint", "test": "pnpm typecheck && pnpm lint",
"storybook": "NODE_OPTIONS=--openssl-legacy-provider start-storybook -p 6006", "storybook": "NODE_OPTIONS=--openssl-legacy-provider start-storybook -p 6006",
"build-storybook": "build-storybook", "build-storybook": "build-storybook",
"chromatic": "npx chromatic --project-token=180ac2186305" "chromatic": "npx chromatic --project-token=180ac2186305"
@@ -36,23 +36,23 @@
"remark-html": "^16.0.1" "remark-html": "^16.0.1"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.24.0", "@babel/core": "^7.24.1",
"@mantine/form": "^7.6.2", "@mantine/form": "^7.6.2",
"@storybook/addon-actions": "^8.0.1", "@storybook/addon-actions": "^8.0.2",
"@storybook/addon-essentials": "^8.0.1", "@storybook/addon-essentials": "^8.0.2",
"@storybook/addon-interactions": "^8.0.1", "@storybook/addon-interactions": "^8.0.2",
"@storybook/addon-links": "^8.0.1", "@storybook/addon-links": "^8.0.2",
"@storybook/addons": "^7.6.17", "@storybook/addons": "^7.6.17",
"@storybook/api": "^7.6.17", "@storybook/api": "^7.6.17",
"@storybook/builder-vite": "^8.0.1", "@storybook/builder-vite": "^8.0.2",
"@storybook/components": "^8.0.1", "@storybook/components": "^8.0.2",
"@storybook/core-events": "^8.0.1", "@storybook/core-events": "^8.0.2",
"@storybook/react": "^8.0.1", "@storybook/react": "^8.0.2",
"@storybook/testing-library": "^0.2.2", "@storybook/testing-library": "^0.2.2",
"@storybook/theming": "^8.0.1", "@storybook/theming": "^8.0.2",
"@testing-library/dom": "^9.3.4", "@testing-library/dom": "^9.3.4",
"@testing-library/jest-dom": "^6.4.2", "@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^14.2.1", "@testing-library/react": "^14.2.2",
"@testing-library/user-event": "^14.5.2", "@testing-library/user-event": "^14.5.2",
"@types/jest": "^29.5.12", "@types/jest": "^29.5.12",
"@types/lodash": "^4.17.0", "@types/lodash": "^4.17.0",
@@ -62,7 +62,7 @@
"@typescript-eslint/parser": "^7.3.1", "@typescript-eslint/parser": "^7.3.1",
"@vitejs/plugin-react": "^4.2.1", "@vitejs/plugin-react": "^4.2.1",
"babel-loader": "^9.1.3", "babel-loader": "^9.1.3",
"chromatic": "^11.0.8", "chromatic": "^11.1.1",
"eslint": "^8.57.0", "eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0", "eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.1", "eslint-import-resolver-typescript": "^3.6.1",
@@ -77,17 +77,17 @@
"install-peerdeps": "^3.0.3", "install-peerdeps": "^3.0.3",
"jest": "^29.7.0", "jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0", "jest-environment-jsdom": "^29.7.0",
"postcss": "^8.4.36", "postcss": "^8.4.37",
"postcss-preset-mantine": "^1.13.0", "postcss-preset-mantine": "^1.13.0",
"postcss-simple-vars": "^7.0.1", "postcss-simple-vars": "^7.0.1",
"prettier": "^3.2.5", "prettier": "^3.2.5",
"react-router": "^6.22.3", "react-router": "^6.22.3",
"storybook": "^8.0.1", "storybook": "^8.0.2",
"storybook-dark-mode": "^4.0.1", "storybook-dark-mode": "^4.0.1",
"storybook-react-i18next": "3.0.1", "storybook-react-i18next": "3.0.1",
"stylis-plugin-rtl": "^2.1.1", "stylis-plugin-rtl": "^2.1.1",
"ts-jest": "^29.1.2", "ts-jest": "^29.1.2",
"typescript": "^5.4.2", "typescript": "^5.4.2",
"vite": "^5.1.6" "vite": "^5.2.0"
} }
} }

1893
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -12,7 +12,7 @@ export function ThemeSetting() {
return ( return (
<SegmentedControl <SegmentedControl
value={colorScheme} value={colorScheme}
onChange={v => setColorScheme(v as any)} onChange={(v) => setColorScheme(v as any)}
data={[ data={[
{ {
value: "light", value: "light",

View File

@@ -64,6 +64,9 @@ export class SearchApi {
const { data } = await api.get( const { data } = await api.get(
new URL(`/api/paragraph/_doc/${id}`, baseUrl).toString(), new URL(`/api/paragraph/_doc/${id}`, baseUrl).toString(),
); );
return merge(data._source, { _id: data._id, '@timestamp': data['@timestamp'] }); return merge(data._source, {
_id: data._id,
"@timestamp": data["@timestamp"],
});
} }
} }

View File

@@ -35,10 +35,13 @@ export default function MainLayout() {
}, },
}); });
const search = useCallback(function submit({ search }: { search: string }) { const search = useCallback(
console.log(search); function submit({ search }: { search: string }) {
navigate(`/search/${encodeURIComponent(search)}`); console.log(search);
}, []); navigate(`/search/${encodeURIComponent(search)}`);
},
[navigate],
);
return ( return (
<TitleContext.Provider value={[title, setTitle]}> <TitleContext.Provider value={[title, setTitle]}>

View File

@@ -57,10 +57,13 @@ export default function ParagraphPage() {
return ( return (
<Container py="2rem"> <Container py="2rem">
<Title >{paragraph.title}</Title> <Title>{paragraph.title}</Title>
<Group justify="space-between" align="center" my="md"> <Group justify="space-between" align="center" my="md">
<Group> <Group>
<Text size="sm" c="dimmed"> {dayjs().to(dayjs(paragraph["@timestamp"]))}</Text> <Text size="sm" c="dimmed">
{" "}
{dayjs().to(dayjs(paragraph["@timestamp"]))}
</Text>
<Text <Text
ml="1rem" ml="1rem"
size="sm" size="sm"
@@ -83,13 +86,9 @@ export default function ParagraphPage() {
</Badge> </Badge>
</> </>
))} ))}
{ {paragraph.source_url && (
paragraph.source_url && ( <a href={paragraph.source_url}>Goto Source</a>
<a href={paragraph.source_url}> )}
Goto Source
</a>
)
}
</Group> </Group>
</Group> </Group>

View File

@@ -7,6 +7,7 @@ import preferenceReducer from "./reducer/preference";
const localStorageMiddleware: Middleware = ({ getState }) => { const localStorageMiddleware: Middleware = ({ getState }) => {
return (next) => (action) => { return (next) => (action) => {
const result = next(action); const result = next(action);
console.log(result);
localStorage.setItem("applicationState", JSON.stringify(getState())); localStorage.setItem("applicationState", JSON.stringify(getState()));
return result; return result;
}; };
@@ -25,7 +26,7 @@ const store = configureStore({
}, },
middleware: (getDefaultMiddleware) => middleware: (getDefaultMiddleware) =>
getDefaultMiddleware().concat(localStorageMiddleware), getDefaultMiddleware().concat(localStorageMiddleware),
preloadedState: reHydrateStore(), preloadedState: reHydrateStore,
}); });
type AppState = ReturnType<typeof store.getState>; type AppState = ReturnType<typeof store.getState>;