Skip to content

Commit

Permalink
Merge pull request #181 from AppQuality/develop
Browse files Browse the repository at this point in the history
feat!: Rework datepicker (#178)
  • Loading branch information
d-beezee authored Apr 4, 2024
2 parents 3c526f8 + aa04762 commit d750030
Show file tree
Hide file tree
Showing 64 changed files with 15,157 additions and 80,657 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
- uses: actions/checkout@v2
- name: Prepare repository
run: git fetch --unshallow --tags
- name: Use Node.js 12.x
- name: Use Node.js 18.x
uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 18.x
- name: Cache node modules
uses: actions/cache@v1
with:
Expand All @@ -35,6 +35,6 @@ jobs:
#👇 npm token, see https://storybook.js.org/tutorials/design-systems-for-developers/react/en/distribute/ to obtain it
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
run: |
npm ci
npm run build
npm run release
yarn --frozen-lockfile
yarn run build
yarn run release
6 changes: 3 additions & 3 deletions .github/workflows/storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ jobs:
- uses: actions/checkout@v2
- name: Prepare repository
run: git fetch --unshallow --tags
- name: Use Node.js 12.x
- name: Use Node.js 18.x
uses: actions/setup-node@v2
with:
node-version: "14"
node-version: "18"
- name: Cache npm cache
id: cache-npm
uses: actions/cache@v2
Expand All @@ -42,5 +42,5 @@ jobs:
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
run: |
npm ci
yarn --frozen-lockfile
npx chromatic --project-token ${{ secrets.CHROMATIC_TOKEN }} --exit-zero-on-changes --ci
14 changes: 12 additions & 2 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
module.exports = {
stories: ["../src/**/*.stories.mdx", "../src/**/*.stories.@(js|jsx|ts|tsx)"],
stories: ["../src/**/*.mdx", "../src/**/*.stories.tsx"],

addons: [
"@storybook/addon-links",
"@storybook/addon-essentials",
"@storybook/preset-create-react-app",
"storybook-addon-designs",
"@storybook/addon-mdx-gfm",
],

framework: {
name: "@storybook/react-webpack5",
options: {},
},

docs: {
autodocs: true,
},
};
7 changes: 3 additions & 4 deletions .storybook/preview.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
import React from "react";

import GlobalStyle from "../src/shared/globalStyle";
import { ThemeProvider } from "styled-components";
import GlobalStyle from "../src/shared/globalStyle";
import { aqBootstrapTheme } from "../src/stories/theme/defaultTheme";

// Global decorator to apply the styles to all stories
export const decorators = [
(Story) => (
(StoryFn) => (
<div style={{ padding: "10px" }}>
<div
style={{ overflow: "hidden", background: "#fff", minHeight: "100vh" }}
>
<ThemeProvider theme={aqBootstrapTheme}>
<GlobalStyle />
<Story />
<StoryFn />
</ThemeProvider>
</div>
</div>
),
];

export const parameters = {
actions: { argTypesRegex: "^on[A-Z].*" },
layout: "fullscreen",
controls: {
matchers: {
Expand Down
4 changes: 2 additions & 2 deletions generate-story.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ EOF
}
generate_stories() {
cat << EOF
import { Story, Meta } from "@storybook/react";
import { StoryFn, Meta } from "@storybook/react";
import { ${STORY_NAME}Props } from "./_types";
import { ${STORY_NAME} } from "./${STORY_NAME}";
Expand All @@ -45,7 +45,7 @@ export default {
component: ${STORY_NAME},
} as Meta;
const Template: Story<${STORY_NAME}Props> = (args) => <${STORY_NAME} {...args} />;
const Template: StoryFn<${STORY_NAME}Props> = (args) => <${STORY_NAME} {...args} />;
export const ${STORY_NAME}Base = Template.bind({});
${STORY_NAME}Base.args = {};
Expand Down
Loading

0 comments on commit d750030

Please sign in to comment.