Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions mock/theme/theme.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
// import font styles
@import './shared/fonts';

// ARMSTRONG IMPORTs
@import '@rocketmakers/armstrong/css';

*,
*:before,
*:after {
Expand Down
18,720 changes: 7,727 additions & 10,993 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
"react": "17.x || 18.x"
},
"devDependencies": {
"@rocketmakers/armstrong": "3.13.5",
"@semantic-release/changelog": "^6.0.3",
"@semantic-release/git": "^10.0.1",
"@storybook/addon-a11y": "^6.5.12",
Expand Down
9 changes: 4 additions & 5 deletions stories/useInfiniteQuery.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import * as React from 'react';
import { Button } from '@rocketmakers/armstrong';
import { createMeta } from '../_test/storybook/utils';
import { useGetUsersInfinite as axiosQuery } from '../mock/state/axiosControllers/user';
import { useGetUsersInfinite as genericQuery } from '../mock/state/genericControllers/user';
Expand Down Expand Up @@ -32,9 +31,9 @@ export const AxiosController = () => {
</tbody>
)}
</table>
<Button onClick={() => setPage((s) => s + 1)} disabled={page === totalPages}>
<button onClick={() => setPage((s) => s + 1)} disabled={page === totalPages}>
Load more
</Button>
</button>
<div>Current page: {page}</div>
</div>
);
Expand Down Expand Up @@ -66,9 +65,9 @@ export const GenericController = () => {
</tbody>
)}
</table>
<Button onClick={() => setPage((s) => s + 1)} disabled={page === totalPages}>
<button onClick={() => setPage((s) => s + 1)} disabled={page === totalPages}>
Load more
</Button>
</button>
<div>Current page: {page}</div>
</div>
);
Expand Down
59 changes: 0 additions & 59 deletions stories/useMutation.stories.tsx

This file was deleted.

17 changes: 8 additions & 9 deletions stories/usePagedQuery.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import * as React from 'react';
import { Button } from '@rocketmakers/armstrong';
import { createMeta } from '../_test/storybook/utils';
import { useGetUsersPaged as axiosQuery } from '../mock/state/axiosControllers/user';
import { useGetUsersPaged as genericQuery } from '../mock/state/genericControllers/user';
Expand Down Expand Up @@ -33,13 +32,13 @@ export const AxiosController = () => {
</tbody>
)}
</table>
<Button onClick={() => setPage((s) => s - 1)} disabled={page === 1}>
<button onClick={() => setPage((s) => s - 1)} disabled={page === 1}>
Prev
</Button>
</button>
<div>Current page: {page}</div>
<Button onClick={() => setPage((s) => s + 1)} disabled={page === totalPages}>
<button onClick={() => setPage((s) => s + 1)} disabled={page === totalPages}>
Next
</Button>
</button>
</div>
);
};
Expand Down Expand Up @@ -73,13 +72,13 @@ export const GenericController = () => {
</tbody>
)}
</table>
<Button onClick={() => setPage((s) => s - 1)} disabled={page === 1}>
<button onClick={() => setPage((s) => s - 1)} disabled={page === 1}>
Prev
</Button>
</button>
<div>Current page: {page}</div>
<Button onClick={() => setPage((s) => s + 1)} disabled={page === totalPages}>
<button onClick={() => setPage((s) => s + 1)} disabled={page === totalPages}>
Next
</Button>
</button>
</div>
);
};
Expand Down
9 changes: 2 additions & 7 deletions stories/useQuery.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import * as React from 'react';
import { Button } from '@rocketmakers/armstrong';
import { createMeta } from '../_test/storybook/utils';
import { useGetUsers as axiosQuery } from '../mock/state/axiosControllers/user';
import { useGetUsers as genericQuery } from '../mock/state/genericControllers/user';
Expand Down Expand Up @@ -30,9 +29,7 @@ export const AxiosController = () => {
</tbody>
)}
</table>
<Button pending={isLoading || isValidating} onClick={() => invalidate()}>
Refetch
</Button>
<button onClick={() => invalidate()}>Refetch</button>
</div>
);
};
Expand Down Expand Up @@ -63,9 +60,7 @@ export const GenericController = () => {
</tbody>
)}
</table>
<Button pending={isLoading || isValidating} onClick={() => invalidate()}>
Refetch
</Button>
<button onClick={() => invalidate()}>Refetch</button>
</div>
);
};
Expand Down
2 changes: 2 additions & 0 deletions tsconfig-base.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
"isolatedModules": false,
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"skipLibCheck": true,
"skipDefaultLibCheck": true,
"jsx": "react",
"declaration": false,
"noImplicitAny": false,
Expand Down