From 14a99a83a2e58a55345d756221abe6ce3d996d40 Mon Sep 17 00:00:00 2001 From: Patrick Connolly Date: Sun, 6 Oct 2024 13:42:52 -0400 Subject: [PATCH 01/24] Added stories for UT-HAI's client-deliberation fork of client-participation. --- .gitmodules | 3 ++ .storybook/decorators.js | 11 ++++-- polis-UT-HAI | 1 + .../AgreeButton.stories.js | 17 ++++++++++ .../ConversationUI.stories.js | 14 ++++++++ .../DisagreeButton.stories.js | 17 ++++++++++ .../DoesNotExist.stories.js | 16 +++++++++ .../client-deliberation/HexLogo.stories.js | 14 ++++++++ .../IndividualDeliberation.stories.js | 14 ++++++++ .../InteriorHeader.stories.js | 17 ++++++++++ .../client-deliberation/Loading.stories.js | 17 ++++++++++ .../OpinionContainer.stories.js | 21 ++++++++++++ stories/client-deliberation/Overview.mdx | 18 ++++++++++ .../client-deliberation/PassButton.stories.js | 17 ++++++++++ .../StatementButton.stories.js | 17 ++++++++++ .../StatementForm.stories.js | 27 +++++++++++++++ .../StatementUI.stories.js | 34 +++++++++++++++++++ .../client-deliberation/Subtitle.stories.js | 16 +++++++++ stories/client-deliberation/Title.stories.js | 16 +++++++++ .../Visualization.stories.js | 14 ++++++++ 20 files changed, 319 insertions(+), 2 deletions(-) create mode 160000 polis-UT-HAI create mode 100644 stories/client-deliberation/AgreeButton.stories.js create mode 100644 stories/client-deliberation/ConversationUI.stories.js create mode 100644 stories/client-deliberation/DisagreeButton.stories.js create mode 100644 stories/client-deliberation/DoesNotExist.stories.js create mode 100644 stories/client-deliberation/HexLogo.stories.js create mode 100644 stories/client-deliberation/IndividualDeliberation.stories.js create mode 100644 stories/client-deliberation/InteriorHeader.stories.js create mode 100644 stories/client-deliberation/Loading.stories.js create mode 100644 stories/client-deliberation/OpinionContainer.stories.js create mode 100644 stories/client-deliberation/Overview.mdx create mode 100644 stories/client-deliberation/PassButton.stories.js create mode 100644 stories/client-deliberation/StatementButton.stories.js create mode 100644 stories/client-deliberation/StatementForm.stories.js create mode 100644 stories/client-deliberation/StatementUI.stories.js create mode 100644 stories/client-deliberation/Subtitle.stories.js create mode 100644 stories/client-deliberation/Title.stories.js create mode 100644 stories/client-deliberation/Visualization.stories.js diff --git a/.gitmodules b/.gitmodules index a7795f4..98bc449 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "polis"] path = polis url = https://github.com/CivicTechTO/polis.git +[submodule "polis-UT-HAI"] + path = polis-UT-HAI + url = https://github.com/UT-HAI/polis.git diff --git a/.storybook/decorators.js b/.storybook/decorators.js index 49b4035..e157bbd 100644 --- a/.storybook/decorators.js +++ b/.storybook/decorators.js @@ -1,13 +1,20 @@ import React from 'react' import { ThemeProvider } from 'theme-ui' -import theme from '../polis/client-admin/src/theme' +import compdemAdminTheme from '../polis/client-admin/src/theme' +import haiDelibTheme from '../polis-UT-HAI/client-deliberation/src/theme' import { Provider as ReduxProvider } from 'react-redux' import configureStore from '../polis/client-admin/src/store' const store = configureStore() export const withThemeUi = (Story) => ( - + + + +) + +export const withDelibThemeUi = (Story) => ( + ) diff --git a/polis-UT-HAI b/polis-UT-HAI new file mode 160000 index 0000000..3a0ae8b --- /dev/null +++ b/polis-UT-HAI @@ -0,0 +1 @@ +Subproject commit 3a0ae8b645af242de1fea61fe2214cd5078ce2fd diff --git a/stories/client-deliberation/AgreeButton.stories.js b/stories/client-deliberation/AgreeButton.stories.js new file mode 100644 index 0000000..60e26fc --- /dev/null +++ b/stories/client-deliberation/AgreeButton.stories.js @@ -0,0 +1,17 @@ +import React from 'react' +import AgreeButton from '../../polis-UT-HAI/client-deliberation/src/components/AgreeButton' +import { action } from '@storybook/addon-actions' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/AgreeButton', + component: AgreeButton, + decorators: [withDelibThemeUi], +} + +const Template = (args) => + +export const Default = Template.bind({}) +Default.args = { + vote: action("Voted!"), +} diff --git a/stories/client-deliberation/ConversationUI.stories.js b/stories/client-deliberation/ConversationUI.stories.js new file mode 100644 index 0000000..fa54cb8 --- /dev/null +++ b/stories/client-deliberation/ConversationUI.stories.js @@ -0,0 +1,14 @@ +import React from 'react' +import ConversationUI from '../../polis-UT-HAI/client-deliberation/src/components/ConversationUI' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/ConversationUI', + component: ConversationUI, + decorators: [withDelibThemeUi], +} + +const Template = (args) =>
Not Yet Implemented
+ +export const Default = Template.bind({}) +Default.args = {} diff --git a/stories/client-deliberation/DisagreeButton.stories.js b/stories/client-deliberation/DisagreeButton.stories.js new file mode 100644 index 0000000..5a318f6 --- /dev/null +++ b/stories/client-deliberation/DisagreeButton.stories.js @@ -0,0 +1,17 @@ +import React from 'react' +import DisagreeButton from '../../polis-UT-HAI/client-deliberation/src/components/DisagreeButton' +import { action } from '@storybook/addon-actions' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/DisagreeButton', + component: DisagreeButton, + decorators: [withDelibThemeUi], +} + +const Template = (args) => + +export const Default = Template.bind({}) +Default.args = { + vote: action("Voted!"), +} diff --git a/stories/client-deliberation/DoesNotExist.stories.js b/stories/client-deliberation/DoesNotExist.stories.js new file mode 100644 index 0000000..5b030ce --- /dev/null +++ b/stories/client-deliberation/DoesNotExist.stories.js @@ -0,0 +1,16 @@ +import React from 'react' +import DoesNotExist from '../../polis-UT-HAI/client-deliberation/src/components/DoesNotExist' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/DoesNotExist', + component: DoesNotExist, + decorators: [withDelibThemeUi], +} + +const Template = (args) => + +export const Default = Template.bind({}) +Default.args = { + title: "Some title", +} diff --git a/stories/client-deliberation/HexLogo.stories.js b/stories/client-deliberation/HexLogo.stories.js new file mode 100644 index 0000000..1a7e5ca --- /dev/null +++ b/stories/client-deliberation/HexLogo.stories.js @@ -0,0 +1,14 @@ +import React from 'react' +import HexLogo from '../../polis-UT-HAI/client-deliberation/src/components/hexLogo' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/HexLogo', + component: HexLogo, + decorators: [withDelibThemeUi], +} + +const Template = (args) => + +export const Default = Template.bind({}) +Default.args = {} diff --git a/stories/client-deliberation/IndividualDeliberation.stories.js b/stories/client-deliberation/IndividualDeliberation.stories.js new file mode 100644 index 0000000..d7044a0 --- /dev/null +++ b/stories/client-deliberation/IndividualDeliberation.stories.js @@ -0,0 +1,14 @@ +import React from 'react' +import IndividualDeliberation from '../../polis-UT-HAI/client-deliberation/src/components/IndividualDeliberation' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/IndividualDeliberation', + component: IndividualDeliberation, + decorators: [withDelibThemeUi], +} + +const Template = (args) => + +export const Default = Template.bind({}) +Default.args = {} diff --git a/stories/client-deliberation/InteriorHeader.stories.js b/stories/client-deliberation/InteriorHeader.stories.js new file mode 100644 index 0000000..572bd52 --- /dev/null +++ b/stories/client-deliberation/InteriorHeader.stories.js @@ -0,0 +1,17 @@ +import React from 'react' +import InteriorHeader from '../../polis-UT-HAI/client-deliberation/src/components/interior-header' +import { withDelibThemeUi } from '../../.storybook/decorators' +import { withRouter } from 'storybook-addon-remix-react-router' + + +export default { + title: 'Client-Deliberation/InteriorHeader', + component: InteriorHeader, + decorators: [withDelibThemeUi, withRouter], +} + +const Template = (args) => +
Lorem ipsum dolor sit amet...
+
+ +export const Default = Template.bind({}) diff --git a/stories/client-deliberation/Loading.stories.js b/stories/client-deliberation/Loading.stories.js new file mode 100644 index 0000000..2386c6c --- /dev/null +++ b/stories/client-deliberation/Loading.stories.js @@ -0,0 +1,17 @@ +import React from 'react' +import Loading from '../../polis-UT-HAI/client-deliberation/src/components/Loading' +import { action } from '@storybook/addon-actions' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/Loading', + component: Loading, + decorators: [withDelibThemeUi], +} + +const Template = (args) => + +export const Default = Template.bind({}) +Default.args = { + vote: action("Voted!"), +} diff --git a/stories/client-deliberation/OpinionContainer.stories.js b/stories/client-deliberation/OpinionContainer.stories.js new file mode 100644 index 0000000..a48c47d --- /dev/null +++ b/stories/client-deliberation/OpinionContainer.stories.js @@ -0,0 +1,21 @@ +import React from 'react' +import OpinionContainer from '../../polis-UT-HAI/client-deliberation/src/components/OpinionContainer' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/OpinionContainer', + component: OpinionContainer, + decorators: [withDelibThemeUi], +} + +const Template = (args) => + +export const Default = Template.bind({}) +Default.args = { + showHelperText: true, +} + +export const HideHelperText = Template.bind({}) +HideHelperText.args = { + showHelperText: 0, +} diff --git a/stories/client-deliberation/Overview.mdx b/stories/client-deliberation/Overview.mdx new file mode 100644 index 0000000..c3e67c5 --- /dev/null +++ b/stories/client-deliberation/Overview.mdx @@ -0,0 +1,18 @@ +# Overview: Client-Deliberation + +This section presents components from [an unofficial fork of Polis][repo-dev] maintained by the University of Texas Austin's [Human-AI Interaction Lab][UT-HAI]. + +- There is no publicly hosted version that we're aware of. +- We do not represent the institution, but simply wish to make it easier to view their UIs. +- They work on the `HAI-dev` branch (not the default `main` branch) and an in-progress branch called `Tutorial`. +- In this storybook, we only show the `HAI-dev` components. +- The most interesting work of their repo is in a directory called [`client-deliberation/`][repo-dev-dir], where they have converted many legacy components to React, and merged the upstream [`client-admin`][upstream-admin] and [`client-participatin`][upstream-participation] apps into one app. +- The repo is active and seems to exist for an ongoing research project. + + + [UT-HAI]: https://hai.ischool.utexas.edu/ + [repo-dev]: https://github.com/UT-HAI/polis/tree/HAI-dev/ + [repo-dev-dir]: https://github.com/UT-HAI/polis/tree/HAI-dev/client-deliberation + [repo-branch-tutorial]: https://github.com/UT-HAI/polis/tree/Tutorial/ + [upstream-participation]: https://github.com/compdemocracy/polis/tree/edge/client-participation + [upstream-admin]: https://github.com/compdemocracy/polis/tree/edge/client-admin diff --git a/stories/client-deliberation/PassButton.stories.js b/stories/client-deliberation/PassButton.stories.js new file mode 100644 index 0000000..42ae612 --- /dev/null +++ b/stories/client-deliberation/PassButton.stories.js @@ -0,0 +1,17 @@ +import React from 'react' +import PassButton from '../../polis-UT-HAI/client-deliberation/src/components/PassButton' +import { action } from '@storybook/addon-actions' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/PassButton', + component: PassButton, + decorators: [withDelibThemeUi], +} + +const Template = (args) => + +export const Default = Template.bind({}) +Default.args = { + vote: action("Voted!"), +} diff --git a/stories/client-deliberation/StatementButton.stories.js b/stories/client-deliberation/StatementButton.stories.js new file mode 100644 index 0000000..3f2d6f9 --- /dev/null +++ b/stories/client-deliberation/StatementButton.stories.js @@ -0,0 +1,17 @@ +import React from 'react' +import StatementButton from '../../polis-UT-HAI/client-deliberation/src/components/StatementButton' +import { action } from '@storybook/addon-actions' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/StatementButton', + component: StatementButton, + decorators: [withDelibThemeUi], +} + +const Template = (args) => + +export const Default = Template.bind({}) +Default.args = { + vote: action("Clicked!"), +} diff --git a/stories/client-deliberation/StatementForm.stories.js b/stories/client-deliberation/StatementForm.stories.js new file mode 100644 index 0000000..6a0de97 --- /dev/null +++ b/stories/client-deliberation/StatementForm.stories.js @@ -0,0 +1,27 @@ +import React from 'react' +import StatementForm from '../../polis-UT-HAI/client-deliberation/src/components/StatementForm' +import { action } from '@storybook/addon-actions' +import { withDelibThemeUi } from '../../.storybook/decorators' +import socialAvatar from '../../.storybook/assets/avatar-sample.jpg' + +export default { + title: 'Client-Deliberation/StatementForm', + component: StatementForm, + decorators: [withDelibThemeUi], +} + +const Template = (args) => + +export const Default = Template.bind({}) +Default.args = { + myAvatar: null, + conversation_id: "2demo", + processPidResponse: action("Processing response!"), +} + +export const KnownUser = Template.bind({}) +KnownUser.args = { + myAvatar: socialAvatar, + conversation_id: "2demo", + processPidResponse: action("Processing response!"), +} diff --git a/stories/client-deliberation/StatementUI.stories.js b/stories/client-deliberation/StatementUI.stories.js new file mode 100644 index 0000000..7790197 --- /dev/null +++ b/stories/client-deliberation/StatementUI.stories.js @@ -0,0 +1,34 @@ +import React from 'react' +import StatementUI from '../../polis-UT-HAI/client-deliberation/src/components/StatementUI' +import StatementUIContainer from '../../polis-UT-HAI/client-deliberation/src/components/StatementUIContainer' +import { action } from '@storybook/addon-actions' +import socialAvatar from '../../.storybook/assets/avatar-sample.jpg' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/StatementUI', + component: StatementUI, + decorators: [withDelibThemeUi], +} + +const Template = (args) => + + + +export const Default = Template.bind({}) +Default.args = { + author: "Anonymous", + authorAvatar: null, + numStatementsRemaining: 54, + statement: "I feel frustrated that this thing is that way.", + vote: action("Voted!"), +} + +export const KnownUser = Template.bind({}) +KnownUser.args = { + author: "Audrey Tang", + authorAvatar: socialAvatar, + numStatementsRemaining: 54, + statement: "I feel frustrated that this thing is that way.", + vote: action("Voted!"), +} diff --git a/stories/client-deliberation/Subtitle.stories.js b/stories/client-deliberation/Subtitle.stories.js new file mode 100644 index 0000000..6f2e541 --- /dev/null +++ b/stories/client-deliberation/Subtitle.stories.js @@ -0,0 +1,16 @@ +import React from 'react' +import Subtitle from '../../polis-UT-HAI/client-deliberation/src/components/Subtitle' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/Subtitle', + component: Subtitle, + decorators: [withDelibThemeUi], +} + +const Template = (args) => + +export const Default = Template.bind({}) +Default.args = { + valeu: "Some subtitle", +} diff --git a/stories/client-deliberation/Title.stories.js b/stories/client-deliberation/Title.stories.js new file mode 100644 index 0000000..fa96173 --- /dev/null +++ b/stories/client-deliberation/Title.stories.js @@ -0,0 +1,16 @@ +import React from 'react' +import Title from '../../polis-UT-HAI/client-deliberation/src/components/Title' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/Title', + component: Title, + decorators: [withDelibThemeUi], +} + +const Template = (args) => + +export const Default = Template.bind({}) +Default.args = { + valeu: "Some title", +} diff --git a/stories/client-deliberation/Visualization.stories.js b/stories/client-deliberation/Visualization.stories.js new file mode 100644 index 0000000..48e0e7d --- /dev/null +++ b/stories/client-deliberation/Visualization.stories.js @@ -0,0 +1,14 @@ +import React from 'react' +import Visualization from '../../polis-UT-HAI/client-deliberation/src/components/Visualization' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/Visualization', + component: Visualization, + decorators: [withDelibThemeUi], +} + +const Template = (args) => <div>Not Yet Implemented</div> + +export const Default = Template.bind({}) +Default.args = {} From b8ced4d479d751ee5913fa6e92bdc5527b89334f Mon Sep 17 00:00:00 2001 From: Patrick Connolly <patrick.c.connolly@gmail.com> Date: Sun, 6 Oct 2024 14:20:53 -0400 Subject: [PATCH 02/24] Oops. Small prop typo. --- stories/client-deliberation/Subtitle.stories.js | 2 +- stories/client-deliberation/Title.stories.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stories/client-deliberation/Subtitle.stories.js b/stories/client-deliberation/Subtitle.stories.js index 6f2e541..b16f761 100644 --- a/stories/client-deliberation/Subtitle.stories.js +++ b/stories/client-deliberation/Subtitle.stories.js @@ -12,5 +12,5 @@ const Template = (args) => <Subtitle {...args} /> export const Default = Template.bind({}) Default.args = { - valeu: "Some subtitle", + value: "Some subtitle", } diff --git a/stories/client-deliberation/Title.stories.js b/stories/client-deliberation/Title.stories.js index fa96173..853827b 100644 --- a/stories/client-deliberation/Title.stories.js +++ b/stories/client-deliberation/Title.stories.js @@ -12,5 +12,5 @@ const Template = (args) => <Title {...args} /> export const Default = Template.bind({}) Default.args = { - valeu: "Some title", + value: "Some title", } From 546909e87df0c309f073e3133c16a5ace2ad5461 Mon Sep 17 00:00:00 2001 From: Patrick Connolly <patrick.c.connolly@gmail.com> Date: Sun, 6 Oct 2024 15:13:22 -0400 Subject: [PATCH 03/24] Added branch build script to allow other PR to work. --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 3731571..13e16c1 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,8 @@ "scripts": { "test": "echo \"Error: no test specified\" && exit 1", "storybook": "storybook dev -p 6006", - "build-storybook": "storybook build" + "build-storybook": "storybook build", + "build-storybook-branch": "git submodule update --init && npm run build-storybook" }, "keywords": [], "author": "", From 15c26b122f132b2c44f7fb7826047b328f16c587 Mon Sep 17 00:00:00 2001 From: Patrick Connolly <patrick.c.connolly@gmail.com> Date: Sun, 6 Oct 2024 15:24:05 -0400 Subject: [PATCH 04/24] Fixed output dir to make other PR work. --- .gitignore | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8454fe9..061a7f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/node_modules -/storybook-static +/node_modules/ +/dist/ .DS_Store diff --git a/package.json b/package.json index 13e16c1..4c53db6 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "test": "echo \"Error: no test specified\" && exit 1", "storybook": "storybook dev -p 6006", - "build-storybook": "storybook build", + "build-storybook": "storybook build --output-dir dist/storybook", "build-storybook-branch": "git submodule update --init && npm run build-storybook" }, "keywords": [], From bfb5900da1ed40a732e8446fb846c26274c1a966 Mon Sep 17 00:00:00 2001 From: Patrick Connolly <patrick.c.connolly@gmail.com> Date: Sun, 6 Oct 2024 15:53:58 -0400 Subject: [PATCH 05/24] Allow submodules to sync properly. (other PR) --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 4c53db6..ea727e9 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ "test": "echo \"Error: no test specified\" && exit 1", "storybook": "storybook dev -p 6006", "build-storybook": "storybook build --output-dir dist/storybook", - "build-storybook-branch": "git submodule update --init && npm run build-storybook" + "sync-submodules": "git submodule update --init && git submodule sync", + "build-storybook-branch": "npm run sync-submodules && npm run build-storybook" }, "keywords": [], "author": "", From efb4cef35f1f38e45ecd9ece028144a248aac062 Mon Sep 17 00:00:00 2001 From: Patrick Connolly <patrick.c.connolly@gmail.com> Date: Mon, 7 Oct 2024 15:35:45 -0400 Subject: [PATCH 06/24] Added a stub overview page for the whole storybook. --- stories/Overview.mdx | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 stories/Overview.mdx diff --git a/stories/Overview.mdx b/stories/Overview.mdx new file mode 100644 index 0000000..abebe17 --- /dev/null +++ b/stories/Overview.mdx @@ -0,0 +1,18 @@ +# Overview: Polis-Storybook + +🚧 This overview page is considered a work-in-progress until this line is removed + +TODO: Summarize the structure, <s>goals</s>, and <s>affiliations</s> of this initiative. + +## Goals +- Make accessibility reviews and improvements of Polis interfaces easier +- Allow UI/UX desigers to more easily contribute and explore Polis UI changes without deploying the whole Polis application +- Allow more sharing of Polis UI variants from forks of Polis +- Support Polis practitioners in carrying out more UI explorations and experiments +- Help Polis practitioners to evolve their own hosted instances of the platform + +This is a project of the Polis Toronto breakout group ([notes][]), +incubated within the [Civic Tech Toronto][] community. + + [notes]: https://link.civictech.ca/polis + [Civic Tech Toronto]: https://civictech.ca/ From 6a2471b888a6253738a205daf5ed706483e9569b Mon Sep 17 00:00:00 2001 From: Patrick Connolly <patrick.c.connolly@gmail.com> Date: Mon, 7 Oct 2024 19:15:42 -0400 Subject: [PATCH 07/24] Fixing storybook config for multi-branch deploy. --- .storybook/preview.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.storybook/preview.js b/.storybook/preview.js index 6731af8..2d821eb 100644 --- a/.storybook/preview.js +++ b/.storybook/preview.js @@ -1,6 +1,9 @@ /** @type { import('@storybook/react').Preview } */ const preview = { parameters: { + branches: { + hostname: "127.0.0.1:8080/storybook-bundle", + }, controls: { matchers: { color: /(background|color)$/i, From 32a4c87234010d782eecc1c491b220b35905aa23 Mon Sep 17 00:00:00 2001 From: Patrick Connolly <patrick.c.connolly@gmail.com> Date: Mon, 7 Oct 2024 19:52:23 -0400 Subject: [PATCH 08/24] Copying multi-brain things to this branch for testing. --- .storybook/.branches.json | 2 +- .storybook/main.js | 4 ++++ .storybook/preview.js | 8 ++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.storybook/.branches.json b/.storybook/.branches.json index abbed7e..aad718f 100644 --- a/.storybook/.branches.json +++ b/.storybook/.branches.json @@ -3,7 +3,7 @@ "to": "dist/storybook-bundle", "script_name": "build-storybook-branch", "default_branch": "main", - "default_root": true, + "default_root": false, "provider": { "type": "github", "owner": "CivicTechTO", diff --git a/.storybook/main.js b/.storybook/main.js index 4a94895..1c12820 100644 --- a/.storybook/main.js +++ b/.storybook/main.js @@ -17,5 +17,9 @@ const config = { name: "@storybook/react-webpack5", options: {}, }, + env: (config) => ({ + ...config, + GITHUB_REPOSITORY: process.env["GITHUB_REPOSITORY"] || null, + }), }; export default config; diff --git a/.storybook/preview.js b/.storybook/preview.js index 2d821eb..7363c5e 100644 --- a/.storybook/preview.js +++ b/.storybook/preview.js @@ -1,4 +1,5 @@ /** @type { import('@storybook/react').Preview } */ +const isGithubBuild = !!process.env["GITHUB_REPOSITORY"] const preview = { parameters: { branches: { @@ -13,4 +14,11 @@ const preview = { }, }; +if (isGithubBuild) { + const [owner, repo] = process.env["GITHUB_REPOSITORY"].split("/") + preview.parameters["branches"] = { + hostname: `${owner}.github.io/${repo}`, + } +} + export default preview; From d440806ca1f1e7f8ceb1aa3e11b1f729a7cf3956 Mon Sep 17 00:00:00 2001 From: Patrick Connolly <patrick.c.connolly@gmail.com> Date: Mon, 7 Oct 2024 20:26:32 -0400 Subject: [PATCH 09/24] Remove github deploy sending for now. --- .storybook/main.js | 4 ---- .storybook/preview.js | 8 -------- 2 files changed, 12 deletions(-) diff --git a/.storybook/main.js b/.storybook/main.js index 1c12820..4a94895 100644 --- a/.storybook/main.js +++ b/.storybook/main.js @@ -17,9 +17,5 @@ const config = { name: "@storybook/react-webpack5", options: {}, }, - env: (config) => ({ - ...config, - GITHUB_REPOSITORY: process.env["GITHUB_REPOSITORY"] || null, - }), }; export default config; diff --git a/.storybook/preview.js b/.storybook/preview.js index 7363c5e..2d821eb 100644 --- a/.storybook/preview.js +++ b/.storybook/preview.js @@ -1,5 +1,4 @@ /** @type { import('@storybook/react').Preview } */ -const isGithubBuild = !!process.env["GITHUB_REPOSITORY"] const preview = { parameters: { branches: { @@ -14,11 +13,4 @@ const preview = { }, }; -if (isGithubBuild) { - const [owner, repo] = process.env["GITHUB_REPOSITORY"].split("/") - preview.parameters["branches"] = { - hostname: `${owner}.github.io/${repo}`, - } -} - export default preview; From 5ab870efa373089dae8521a15397418ecc7ce38e Mon Sep 17 00:00:00 2001 From: Patrick Connolly <patrick.c.connolly@gmail.com> Date: Mon, 7 Oct 2024 21:13:41 -0400 Subject: [PATCH 10/24] Base to using main branch as default. --- .storybook/.branches.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.storybook/.branches.json b/.storybook/.branches.json index aad718f..abbed7e 100644 --- a/.storybook/.branches.json +++ b/.storybook/.branches.json @@ -3,7 +3,7 @@ "to": "dist/storybook-bundle", "script_name": "build-storybook-branch", "default_branch": "main", - "default_root": false, + "default_root": true, "provider": { "type": "github", "owner": "CivicTechTO", From b3a38e2fa109b09aaf2568d5c0971bc5906dee1f Mon Sep 17 00:00:00 2001 From: Patrick Connolly <patrick.c.connolly@gmail.com> Date: Mon, 7 Oct 2024 19:26:10 -0400 Subject: [PATCH 11/24] Added smartness to preview.js to detect github builds and prepare for pages deploy properly. --- .storybook/main.js | 4 ++++ .storybook/preview.js | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/.storybook/main.js b/.storybook/main.js index 4a94895..1c12820 100644 --- a/.storybook/main.js +++ b/.storybook/main.js @@ -17,5 +17,9 @@ const config = { name: "@storybook/react-webpack5", options: {}, }, + env: (config) => ({ + ...config, + GITHUB_REPOSITORY: process.env["GITHUB_REPOSITORY"] || null, + }), }; export default config; diff --git a/.storybook/preview.js b/.storybook/preview.js index 2d821eb..7363c5e 100644 --- a/.storybook/preview.js +++ b/.storybook/preview.js @@ -1,4 +1,5 @@ /** @type { import('@storybook/react').Preview } */ +const isGithubBuild = !!process.env["GITHUB_REPOSITORY"] const preview = { parameters: { branches: { @@ -13,4 +14,11 @@ const preview = { }, }; +if (isGithubBuild) { + const [owner, repo] = process.env["GITHUB_REPOSITORY"].split("/") + preview.parameters["branches"] = { + hostname: `${owner}.github.io/${repo}`, + } +} + export default preview; From 18e10c5d0baf85273e83bf75f9fc6b0dce2c0d79 Mon Sep 17 00:00:00 2001 From: Patrick Connolly <patrick.c.connolly@gmail.com> Date: Mon, 7 Oct 2024 21:30:31 -0400 Subject: [PATCH 12/24] Removed localhost debug for multi-branch. --- .storybook/preview.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/.storybook/preview.js b/.storybook/preview.js index 7363c5e..6177e5b 100644 --- a/.storybook/preview.js +++ b/.storybook/preview.js @@ -2,9 +2,6 @@ const isGithubBuild = !!process.env["GITHUB_REPOSITORY"] const preview = { parameters: { - branches: { - hostname: "127.0.0.1:8080/storybook-bundle", - }, controls: { matchers: { color: /(background|color)$/i, From 34111594f451624eed50fbb1182f86562b190100 Mon Sep 17 00:00:00 2001 From: Patrick Connolly <patrick.c.connolly@gmail.com> Date: Tue, 8 Oct 2024 03:00:41 -0400 Subject: [PATCH 13/24] Added style fix for indented bullet spacing in MDX. --- .storybook/preview.js | 2 ++ .storybook/style.css | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 .storybook/style.css diff --git a/.storybook/preview.js b/.storybook/preview.js index 6177e5b..8627357 100644 --- a/.storybook/preview.js +++ b/.storybook/preview.js @@ -1,4 +1,6 @@ /** @type { import('@storybook/react').Preview } */ +import "./style.css" + const isGithubBuild = !!process.env["GITHUB_REPOSITORY"] const preview = { parameters: { diff --git a/.storybook/style.css b/.storybook/style.css new file mode 100644 index 0000000..8849d6a --- /dev/null +++ b/.storybook/style.css @@ -0,0 +1,8 @@ +/** To remove weird spacing in indented lists of MSX. **/ +.sbdocs-content :where( + ul:not( + .sb-anchor, .sb-unstyled, .sb-unstyled ul + ) +) :first-of-type { + margin-bottom: 0; +} From f7b8503be4ee71a958cd333dab477da8d0c95142 Mon Sep 17 00:00:00 2001 From: Patrick Connolly <patrick.c.connolly@gmail.com> Date: Tue, 8 Oct 2024 03:01:05 -0400 Subject: [PATCH 14/24] Migrated to UT-HAI using Tutorial branch. --- package-lock.json | 242 +++++++++++++++++++++++++++++++++++++++++++--- package.json | 2 + polis-UT-HAI | 2 +- 3 files changed, 231 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index 750b47e..9b047c3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,9 @@ "d3-force": "~1.2.1", "hull.js": "^0.2.11", "radium": "^0.26.2", + "react-chat-widget": "^3.0.5", "react-easy-emoji": "^1.8.1", + "styled-components": "^6.1.13", "theme-ui": "^0.3.5", "victory-core": "~36.6.8" }, @@ -2512,6 +2514,11 @@ "@types/send": "*" } }, + "node_modules/@types/stylis": { + "version": "4.2.5", + "resolved": "https://registry.npmjs.org/@types/stylis/-/stylis-4.2.5.tgz", + "integrity": "sha512-1Xve+NMN7FWjY14vLoY5tL3BVEQ/n42YLwaqJIPYhotZ9uBHt87VceMwWQpzmdEt2TNXIorIFG+YeCUUW7RInw==" + }, "node_modules/@types/unist": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", @@ -2930,6 +2937,14 @@ "node": ">= 8" } }, + "node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, "node_modules/aria-query": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", @@ -3233,6 +3248,14 @@ "tslib": "^2.0.3" } }, + "node_modules/camelize": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.1.tgz", + "integrity": "sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/caniuse-lite": { "version": "1.0.30001662", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001662.tgz", @@ -3365,6 +3388,11 @@ "integrity": "sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==", "dev": true }, + "node_modules/classnames": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz", + "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==" + }, "node_modules/clean-css": { "version": "5.3.3", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.3.tgz", @@ -3511,6 +3539,14 @@ "node": ">=10" } }, + "node_modules/css-color-keywords": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz", + "integrity": "sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==", + "engines": { + "node": ">=4" + } + }, "node_modules/css-in-js-utils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/css-in-js-utils/-/css-in-js-utils-2.0.1.tgz", @@ -3571,6 +3607,16 @@ "url": "https://github.com/sponsors/fb55" } }, + "node_modules/css-to-react-native": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.2.0.tgz", + "integrity": "sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==", + "dependencies": { + "camelize": "^1.0.0", + "css-color-keywords": "^1.0.0", + "postcss-value-parser": "^4.0.2" + } + }, "node_modules/css-what": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", @@ -3604,8 +3650,7 @@ "node_modules/csstype": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", - "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", - "devOptional": true + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" }, "node_modules/d3-array": { "version": "3.2.4", @@ -3757,6 +3802,21 @@ "node": ">= 12" } }, + "node_modules/date-fns": { + "version": "2.30.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz", + "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==", + "dependencies": { + "@babel/runtime": "^7.21.0" + }, + "engines": { + "node": ">=0.11" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/date-fns" + } + }, "node_modules/debug": { "version": "4.3.7", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", @@ -5429,6 +5489,14 @@ "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==" }, + "node_modules/linkify-it": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz", + "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==", + "dependencies": { + "uc.micro": "^1.0.1" + } + }, "node_modules/loader-runner": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", @@ -5550,6 +5618,41 @@ "integrity": "sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==", "dev": true }, + "node_modules/markdown-it": { + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz", + "integrity": "sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==", + "dependencies": { + "argparse": "^1.0.7", + "entities": "~1.1.1", + "linkify-it": "^2.0.0", + "mdurl": "^1.0.1", + "uc.micro": "^1.0.5" + }, + "bin": { + "markdown-it": "bin/markdown-it.js" + } + }, + "node_modules/markdown-it-link-attributes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/markdown-it-link-attributes/-/markdown-it-link-attributes-2.1.0.tgz", + "integrity": "sha512-NclmOF52k57idAZI93PREbPKbKPFyafwoJncWW9dKpkYGbO26oJGHa4bUoU27Lk8TeWLbPEzuKFyQGwuB2NbdA==" + }, + "node_modules/markdown-it-sanitizer": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/markdown-it-sanitizer/-/markdown-it-sanitizer-0.4.3.tgz", + "integrity": "sha512-0Q2ua8+oDN7/3r5UXMnbVq8C+LRfT2pzVKA+h4nXTLEMBFQDwp7qJZOe7DkBa79C7V2cSBXJyScxJ7vYs9kE2w==" + }, + "node_modules/markdown-it-sup": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/markdown-it-sup/-/markdown-it-sup-1.0.0.tgz", + "integrity": "sha512-E32m0nV9iyhRR7CrhnzL5msqic7rL1juWre6TQNxsnApg7Uf+F97JOKxUijg5YwXz86lZ0mqfOnutoryyNdntQ==" + }, + "node_modules/markdown-it/node_modules/entities": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", + "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==" + }, "node_modules/markdown-to-jsx": { "version": "7.5.0", "resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-7.5.0.tgz", @@ -5562,6 +5665,11 @@ "react": ">= 0.14.0" } }, + "node_modules/mdurl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", + "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==" + }, "node_modules/media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -5710,7 +5818,6 @@ "version": "3.3.7", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", - "dev": true, "funding": [ { "type": "github", @@ -6245,8 +6352,7 @@ "node_modules/postcss-value-parser": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", - "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", - "dev": true + "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==" }, "node_modules/pretty-error": { "version": "4.0.0", @@ -6440,6 +6546,25 @@ "node": ">=0.10.0" } }, + "node_modules/react-chat-widget": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/react-chat-widget/-/react-chat-widget-3.0.5.tgz", + "integrity": "sha512-I/2JRd4fQtWib2l3SVCoFFSeX89BkqnSCLZmlTBy6BSbRcyGAwwuydq5TbayskTJ5KQssolhRo5aB+40V/fh0Q==", + "dependencies": { + "classnames": "^2.2.6", + "date-fns": "^2.11.1", + "markdown-it": "^8.4.1", + "markdown-it-link-attributes": "^2.1.0", + "markdown-it-sanitizer": "^0.4.3", + "markdown-it-sup": "^1.0.0", + "react-redux": "^7.2.0", + "redux": "^4.0.5" + }, + "peerDependencies": { + "react": "^16.13.1", + "react-dom": "^16.13.1" + } + }, "node_modules/react-colorful": { "version": "5.6.1", "resolved": "https://registry.npmjs.org/react-colorful/-/react-colorful-5.6.1.tgz", @@ -6499,7 +6624,6 @@ "version": "16.14.0", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz", "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==", - "dev": true, "dependencies": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", @@ -6572,7 +6696,6 @@ "version": "7.2.2", "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.2.tgz", "integrity": "sha512-8+CQ1EvIVFkYL/vu6Olo7JFLWop1qRUeb46sGtIMDCSpgwPQq8fPLpirIB0iTqFe9XYEFPHssdX8/UwN6pAkEA==", - "dev": true, "dependencies": { "@babel/runtime": "^7.12.1", "hoist-non-react-statics": "^3.3.2", @@ -6597,7 +6720,6 @@ "version": "3.3.2", "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", - "dev": true, "dependencies": { "react-is": "^16.7.0" } @@ -6605,8 +6727,7 @@ "node_modules/react-redux/node_modules/react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", - "dev": true + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, "node_modules/react-router": { "version": "6.26.2", @@ -6699,8 +6820,6 @@ "version": "4.2.1", "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz", "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==", - "dev": true, - "peer": true, "dependencies": { "@babel/runtime": "^7.9.2" } @@ -6897,7 +7016,6 @@ "version": "0.19.1", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz", "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==", - "dev": true, "dependencies": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" @@ -7028,6 +7146,11 @@ "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", "dev": true }, + "node_modules/shallowequal": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz", + "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==" + }, "node_modules/side-channel": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", @@ -7084,7 +7207,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -7121,6 +7243,11 @@ "node": "*" } }, + "node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" + }, "node_modules/statuses": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", @@ -7271,6 +7398,83 @@ "webpack": "^5.0.0" } }, + "node_modules/styled-components": { + "version": "6.1.13", + "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.13.tgz", + "integrity": "sha512-M0+N2xSnAtwcVAQeFEsGWFFxXDftHUD7XrKla06QbpUMmbmtFBMMTcKWvFXtWxuD5qQkB8iU5gk6QASlx2ZRMw==", + "dependencies": { + "@emotion/is-prop-valid": "1.2.2", + "@emotion/unitless": "0.8.1", + "@types/stylis": "4.2.5", + "css-to-react-native": "3.2.0", + "csstype": "3.1.3", + "postcss": "8.4.38", + "shallowequal": "1.1.0", + "stylis": "4.3.2", + "tslib": "2.6.2" + }, + "engines": { + "node": ">= 16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/styled-components" + }, + "peerDependencies": { + "react": ">= 16.8.0", + "react-dom": ">= 16.8.0" + } + }, + "node_modules/styled-components/node_modules/@emotion/is-prop-valid": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.2.tgz", + "integrity": "sha512-uNsoYd37AFmaCdXlg6EYD1KaPOaRWRByMCYzbKUX4+hhMfrxdVSelShywL4JVaAeM/eHUOSprYBQls+/neX3pw==", + "dependencies": { + "@emotion/memoize": "^0.8.1" + } + }, + "node_modules/styled-components/node_modules/@emotion/memoize": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz", + "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==" + }, + "node_modules/styled-components/node_modules/@emotion/unitless": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz", + "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==" + }, + "node_modules/styled-components/node_modules/postcss": { + "version": "8.4.38", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", + "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "dependencies": { + "nanoid": "^3.3.7", + "picocolors": "^1.0.0", + "source-map-js": "^1.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, + "node_modules/styled-components/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/styled-system": { "version": "5.1.5", "resolved": "https://registry.npmjs.org/styled-system/-/styled-system-5.1.5.tgz", @@ -7291,6 +7495,11 @@ "object-assign": "^4.1.1" } }, + "node_modules/stylis": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.2.tgz", + "integrity": "sha512-bhtUjWd/z6ltJiQwg0dUfxEJ+W+jdqQd8TbWLWyeIJHlnsqmGLRFFd8e5mA0AZi/zx90smXRlN66YMTcaSFifg==" + }, "node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -7564,6 +7773,11 @@ "node": ">=14.17" } }, + "node_modules/uc.micro": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", + "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==" + }, "node_modules/undici-types": { "version": "6.19.8", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", diff --git a/package.json b/package.json index 70d9454..6c1c93a 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,9 @@ "d3-force": "~1.2.1", "hull.js": "^0.2.11", "radium": "^0.26.2", + "react-chat-widget": "^3.0.5", "react-easy-emoji": "^1.8.1", + "styled-components": "^6.1.13", "theme-ui": "^0.3.5", "victory-core": "~36.6.8" } diff --git a/polis-UT-HAI b/polis-UT-HAI index 3a0ae8b..73f1950 160000 --- a/polis-UT-HAI +++ b/polis-UT-HAI @@ -1 +1 @@ -Subproject commit 3a0ae8b645af242de1fea61fe2214cd5078ce2fd +Subproject commit 73f195070e609eb7f1a54f4c5c98bfd47e0cfae2 From 95b16535114139e8e8c0af0ce95de7ebcc67e926 Mon Sep 17 00:00:00 2001 From: Patrick Connolly <patrick.c.connolly@gmail.com> Date: Tue, 8 Oct 2024 03:02:05 -0400 Subject: [PATCH 15/24] Updated client-deliberation Overview doc. --- stories/client-deliberation/Overview.mdx | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/stories/client-deliberation/Overview.mdx b/stories/client-deliberation/Overview.mdx index c3e67c5..39f1ddf 100644 --- a/stories/client-deliberation/Overview.mdx +++ b/stories/client-deliberation/Overview.mdx @@ -4,10 +4,15 @@ This section presents components from [an unofficial fork of Polis][repo-dev] ma - There is no publicly hosted version that we're aware of. - We do not represent the institution, but simply wish to make it easier to view their UIs. -- They work on the `HAI-dev` branch (not the default `main` branch) and an in-progress branch called `Tutorial`. -- In this storybook, we only show the `HAI-dev` components. -- The most interesting work of their repo is in a directory called [`client-deliberation/`][repo-dev-dir], where they have converted many legacy components to React, and merged the upstream [`client-admin`][upstream-admin] and [`client-participatin`][upstream-participation] apps into one app. -- The repo is active and seems to exist for an ongoing research project. +- No meaningful work happens in the default `main` branch. +- The most interesting work of their repo is in a directory called [`client-deliberation/`][repo-dev-dir], + where they have converted many legacy components to React, + and merged the upstream [`client-admin`][upstream-admin] and [`client-participation`][upstream-participation] apps into one app. +- The repo hosts two main branches of interest: + - `HAI-dev`: a conversion of legacy BackboneJS views into modern React components, as well as a merger as explained above. + - `Tutorial`: an additional in-progress branch building on `HAI-dev`, with many additional onboarding- and AI-based components. +- In this storybook, we present components from the full `Tutorial` branch. +- The UT-HAI repo is active and seems to exist for an ongoing research project. [UT-HAI]: https://hai.ischool.utexas.edu/ From 55483450390b98cda5aa98d9b70b9686c26e0e28 Mon Sep 17 00:00:00 2001 From: Patrick Connolly <patrick.c.connolly@gmail.com> Date: Tue, 8 Oct 2024 03:02:19 -0400 Subject: [PATCH 16/24] Added new components for client-deliberation. --- .../client-deliberation/ArrowIcon.stories.js | 12 +++++++ .../IndividualDeliberation.stories.js | 10 +++++- .../IntegrateBox.stories.js | 18 +++++++++++ .../IntegrateBoxAndConclusion.stories.js | 18 +++++++++++ .../IntegrateLink.stories.js | 16 ++++++++++ stories/client-deliberation/Lock.stories.js | 16 ++++++++++ .../client-deliberation/ObtainLink.stories.js | 14 +++++++++ .../PolisButton.stories.js | 18 +++++++++++ .../client-deliberation/Sidebar.stories.js | 31 +++++++++++++++++++ .../SidebarModule.stories.js | 30 ++++++++++++++++++ .../TreeSummary.stories.js | 26 ++++++++++++++++ .../client-deliberation/Tutorial.stories.js | 28 +++++++++++++++++ .../client-deliberation/Tutorials.stories.js | 26 ++++++++++++++++ 13 files changed, 262 insertions(+), 1 deletion(-) create mode 100644 stories/client-deliberation/ArrowIcon.stories.js create mode 100644 stories/client-deliberation/IntegrateBox.stories.js create mode 100644 stories/client-deliberation/IntegrateBoxAndConclusion.stories.js create mode 100644 stories/client-deliberation/IntegrateLink.stories.js create mode 100644 stories/client-deliberation/Lock.stories.js create mode 100644 stories/client-deliberation/ObtainLink.stories.js create mode 100644 stories/client-deliberation/PolisButton.stories.js create mode 100644 stories/client-deliberation/Sidebar.stories.js create mode 100644 stories/client-deliberation/SidebarModule.stories.js create mode 100644 stories/client-deliberation/TreeSummary.stories.js create mode 100644 stories/client-deliberation/Tutorial.stories.js create mode 100644 stories/client-deliberation/Tutorials.stories.js diff --git a/stories/client-deliberation/ArrowIcon.stories.js b/stories/client-deliberation/ArrowIcon.stories.js new file mode 100644 index 0000000..d9a0549 --- /dev/null +++ b/stories/client-deliberation/ArrowIcon.stories.js @@ -0,0 +1,12 @@ +import React from 'react' +import ArrowIcon from '../../polis-UT-HAI/client-deliberation/src/components/ArrowIcon' + +export default { + title: 'Client-Deliberation/ArrowIcon', + component: ArrowIcon, +} + +const Template = (args) => <ArrowIcon {...args} /> + +export const Default = Template.bind({}) +Default.args = {} diff --git a/stories/client-deliberation/IndividualDeliberation.stories.js b/stories/client-deliberation/IndividualDeliberation.stories.js index d7044a0..65c85d5 100644 --- a/stories/client-deliberation/IndividualDeliberation.stories.js +++ b/stories/client-deliberation/IndividualDeliberation.stories.js @@ -6,9 +6,17 @@ export default { title: 'Client-Deliberation/IndividualDeliberation', component: IndividualDeliberation, decorators: [withDelibThemeUi], + argTypes: { + currentIndex: { + options: [0, 1, 2], + control: { type: 'inline-radio' }, + }, + }, } const Template = (args) => <IndividualDeliberation {...args} /> export const Default = Template.bind({}) -Default.args = {} +Default.args = { + currentIndex: 0, +} diff --git a/stories/client-deliberation/IntegrateBox.stories.js b/stories/client-deliberation/IntegrateBox.stories.js new file mode 100644 index 0000000..7e339e1 --- /dev/null +++ b/stories/client-deliberation/IntegrateBox.stories.js @@ -0,0 +1,18 @@ +import React from 'react' +import IntegrateBox from '../../polis-UT-HAI/client-deliberation/src/components/IntegrateBox' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/IntegrateBox', + component: IntegrateBox, + decorators: [withDelibThemeUi], +} + +const Template = (args) => <IntegrateBox {...args} /> + +export const Default = Template.bind({}) +Default.args = { + heading: "Some heading", + description: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", + items: ["Some bullet", "Some other bullet", "Yet another bullet"], +} diff --git a/stories/client-deliberation/IntegrateBoxAndConclusion.stories.js b/stories/client-deliberation/IntegrateBoxAndConclusion.stories.js new file mode 100644 index 0000000..b22d620 --- /dev/null +++ b/stories/client-deliberation/IntegrateBoxAndConclusion.stories.js @@ -0,0 +1,18 @@ +import React from 'react' +import IntegrateBoxAndConclusion from '../../polis-UT-HAI/client-deliberation/src/components/IntegrateBoxAndConclusion' +import { withDelibThemeUi } from '../../.storybook/decorators' +import { Default as DefaultIntegrateBoxStory } from './IntegrateBox.stories' + +export default { + title: 'Client-Deliberation/IntegrateBoxAndConclusion', + component: IntegrateBoxAndConclusion, + decorators: [withDelibThemeUi], +} + +const Template = (args) => <IntegrateBoxAndConclusion {...args} /> + +export const Default = Template.bind({}) +Default.args = { + ...DefaultIntegrateBoxStory.args, + conclusion: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", +} diff --git a/stories/client-deliberation/IntegrateLink.stories.js b/stories/client-deliberation/IntegrateLink.stories.js new file mode 100644 index 0000000..1141c97 --- /dev/null +++ b/stories/client-deliberation/IntegrateLink.stories.js @@ -0,0 +1,16 @@ +import React from 'react' +import IntegrateLink from '../../polis-UT-HAI/client-deliberation/src/components/IntegrateLink' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/IntegrateLink', + component: IntegrateLink, + decorators: [withDelibThemeUi], +} + +const Template = (args) => <IntegrateLink {...args} /> + +export const Default = Template.bind({}) +Default.args = { + link: '<script async src="https://example.com/embed.js"></script>', +} diff --git a/stories/client-deliberation/Lock.stories.js b/stories/client-deliberation/Lock.stories.js new file mode 100644 index 0000000..f3f00b6 --- /dev/null +++ b/stories/client-deliberation/Lock.stories.js @@ -0,0 +1,16 @@ +import React from 'react' +import Lock from '../../polis-UT-HAI/client-deliberation/src/components/Lock' + +export default { + title: 'Client-Deliberation/Lock', + component: Lock, +} + +const Template = (args) => <Lock {...args} /> + +export const Default = Template.bind({}) +Default.args = { + style: { + fill: "blue", + }, +} diff --git a/stories/client-deliberation/ObtainLink.stories.js b/stories/client-deliberation/ObtainLink.stories.js new file mode 100644 index 0000000..937578c --- /dev/null +++ b/stories/client-deliberation/ObtainLink.stories.js @@ -0,0 +1,14 @@ +import React from 'react' +import ObtainLink from '../../polis-UT-HAI/client-deliberation/src/components/ObtainLink' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/ObtainLink', + component: ObtainLink, + decorators: [withDelibThemeUi], +} + +const Template = (args) => <ObtainLink {...args} /> + +export const Default = Template.bind({}) +Default.args = {} diff --git a/stories/client-deliberation/PolisButton.stories.js b/stories/client-deliberation/PolisButton.stories.js new file mode 100644 index 0000000..b67482f --- /dev/null +++ b/stories/client-deliberation/PolisButton.stories.js @@ -0,0 +1,18 @@ +import React from 'react' +import PolisButton from '../../polis-UT-HAI/client-deliberation/src/components/PolisButton' +import { action } from '@storybook/addon-actions' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/PolisButton', + component: PolisButton, + decorators: [withDelibThemeUi], +} + +const Template = (args) => <PolisButton {...args} /> + +export const Default = Template.bind({}) +Default.args = { + onClick: action("Clicked!"), + buttonText: "Click me", +} diff --git a/stories/client-deliberation/Sidebar.stories.js b/stories/client-deliberation/Sidebar.stories.js new file mode 100644 index 0000000..537bc35 --- /dev/null +++ b/stories/client-deliberation/Sidebar.stories.js @@ -0,0 +1,31 @@ +import React from 'react' +import Sidebar from '../../polis-UT-HAI/client-deliberation/src/components/Sidebar' +import { withDelibThemeUi } from '../../.storybook/decorators' +import { action } from '@storybook/addon-actions' + +export default { + title: 'Client-Deliberation/Sidebar', + component: Sidebar, + decorators: [withDelibThemeUi], +} + +const Template = (args) => <Sidebar {...args} /> + +export const Default = Template.bind({}) +Default.args = { + onModuleClick: action("Clicked!"), + modules: [ + { + name: "Some module", + progress: 20, // percent + currently_displayed: true, + not_completed: true, + }, + { + name: "Another module", + progress: 50, // percent + currently_displayed: true, + not_completed: true, + }, + ], +} diff --git a/stories/client-deliberation/SidebarModule.stories.js b/stories/client-deliberation/SidebarModule.stories.js new file mode 100644 index 0000000..9cfc34c --- /dev/null +++ b/stories/client-deliberation/SidebarModule.stories.js @@ -0,0 +1,30 @@ +import React from 'react' +import SidebarModule from '../../polis-UT-HAI/client-deliberation/src/components/SidebarModule' +import Sidebar from '../../polis-UT-HAI/client-deliberation/src/components/Sidebar' +import { withDelibThemeUi } from '../../.storybook/decorators' +import { action } from '@storybook/addon-actions' + +export default { + title: 'Client-Deliberation/SidebarModule', + component: SidebarModule, + decorators: [withDelibThemeUi], +} + +const Template = (args) => <Sidebar modules={[ + {...args}, + { + name: "Another module", + progress: 50, // percent + currently_displayed: false, + not_completed: true, + }]} + onModuleClick={action("Clicked!")} +/> + +export const Default = Template.bind({}) +Default.args = { + name: "Some module", + progress: 20, // percent + currently_displayed: true, + not_completed: true, +} diff --git a/stories/client-deliberation/TreeSummary.stories.js b/stories/client-deliberation/TreeSummary.stories.js new file mode 100644 index 0000000..3bd930f --- /dev/null +++ b/stories/client-deliberation/TreeSummary.stories.js @@ -0,0 +1,26 @@ +import React from 'react' +import TreeSummary from '../../polis-UT-HAI/client-deliberation/src/components/TreeSummary' +import { action } from '@storybook/addon-actions' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/TreeSummary', + component: TreeSummary, + decorators: [withDelibThemeUi], +} + +const Template = (args) => <TreeSummary {...args} /> + +export const Default = Template.bind({}) +Default.args = { + topics: [ + "topic 1", + "topic 2", + ], + onButtonClick: action("Clicked!"), + onBack: action("Go Back!"), + topicsHistory: [ + ["topic 1"], + "topic 2", + ], +} diff --git a/stories/client-deliberation/Tutorial.stories.js b/stories/client-deliberation/Tutorial.stories.js new file mode 100644 index 0000000..06e2100 --- /dev/null +++ b/stories/client-deliberation/Tutorial.stories.js @@ -0,0 +1,28 @@ +import React from 'react' +import Tutorial from '../../polis-UT-HAI/client-deliberation/src/components/Tutorial' +import { action } from '@storybook/addon-actions' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/Tutorial', + component: Tutorial, + decorators: [withDelibThemeUi], + argTypes: { + currentIndexpage: { + options: [0, 1, 2, 3], + control: { type: 'inline-radio' }, + }, + }, +} + +const Template = (args) => <Tutorial {...args} /> + +export const Default = Template.bind({}) +Default.args = { + email: null, + currentIndex: 0, + tutorialprogress: 0, + setCurrentIndex: action("Set index!"), + currentIndexpage: 0, + setnextButtonState: () => {}, +} diff --git a/stories/client-deliberation/Tutorials.stories.js b/stories/client-deliberation/Tutorials.stories.js new file mode 100644 index 0000000..3a2bd9f --- /dev/null +++ b/stories/client-deliberation/Tutorials.stories.js @@ -0,0 +1,26 @@ +import React from 'react' +import Tutorials from '../../polis-UT-HAI/client-deliberation/src/components/Tutorials' +import { action } from '@storybook/addon-actions' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/Tutorials', + component: Tutorials, + decorators: [withDelibThemeUi], + argTypes: { + current_state_index: { + options: [0, 1, 2, 3, 4], + control: { type: 'inline-radio' }, + }, + }, +} + +const Template = (args) => <Tutorials {...args} /> + +export const Default = Template.bind({}) +Default.args = { + email: null, + current_state_index: 0, + setcurrent_state_index: action("Set index!"), + heading: "Some Tutorial", +} From 7eb657a710b7d27ee01b2fa62e29bf3ff3bebab5 Mon Sep 17 00:00:00 2001 From: Patrick Connolly <patrick.c.connolly@gmail.com> Date: Tue, 8 Oct 2024 13:31:51 -0400 Subject: [PATCH 17/24] Trying to do submodule command first. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fba610a..2b92a97 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "test": "echo \"Error: no test specified\" && exit 1", "storybook": "storybook dev -p 6006", "build-storybook": "storybook build --output-dir dist/storybook", - "build-storybook-branch": "npm install && npm run build-storybook" + "build-storybook-branch": "npm install && git submodule update --init && npm run build-storybook" }, "keywords": [], "author": "", From fd5689324c40f40332abe5c4ed1e25253acd4569 Mon Sep 17 00:00:00 2001 From: Patrick Connolly <patrick.c.connolly@gmail.com> Date: Tue, 8 Oct 2024 13:48:08 -0400 Subject: [PATCH 18/24] Trying to bring submodule init into branch switcher pkg. --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index a2f12a0..4153e85 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6952,7 +6952,7 @@ }, "node_modules/storybook-branch-switcher": { "version": "0.4.1", - "resolved": "git+ssh://git@github.com/patcon/storybook-branch-switcher.git#614c0320e6f890da8699eadce3a7a2f1f9df1c51", + "resolved": "git+ssh://git@github.com/patcon/storybook-branch-switcher.git#164d3e6a02e49bec8af48e970da345b1db542b9c", "dev": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 2b92a97..fba610a 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "test": "echo \"Error: no test specified\" && exit 1", "storybook": "storybook dev -p 6006", "build-storybook": "storybook build --output-dir dist/storybook", - "build-storybook-branch": "npm install && git submodule update --init && npm run build-storybook" + "build-storybook-branch": "npm install && npm run build-storybook" }, "keywords": [], "author": "", From 3efac20ea37e09a8ca7b323fc4e3a41eaee7ff85 Mon Sep 17 00:00:00 2001 From: Patrick Connolly <patrick.c.connolly@gmail.com> Date: Tue, 8 Oct 2024 18:57:40 -0400 Subject: [PATCH 19/24] Shift to using patcon's fork while waiting for upstream merge. --- .gitmodules | 2 +- polis-UT-HAI | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 98bc449..43fcc6c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,4 +3,4 @@ url = https://github.com/CivicTechTO/polis.git [submodule "polis-UT-HAI"] path = polis-UT-HAI - url = https://github.com/UT-HAI/polis.git + url = https://github.com/patcon/polis.git diff --git a/polis-UT-HAI b/polis-UT-HAI index 73f1950..14f8427 160000 --- a/polis-UT-HAI +++ b/polis-UT-HAI @@ -1 +1 @@ -Subproject commit 73f195070e609eb7f1a54f4c5c98bfd47e0cfae2 +Subproject commit 14f84279e14beb53eb37affe953e64d9815b017d From 9ae54d91ec7e66c26e73ad255c3ab1868ed13790 Mon Sep 17 00:00:00 2001 From: Patrick Connolly <patrick.c.connolly@gmail.com> Date: Tue, 8 Oct 2024 19:00:50 -0400 Subject: [PATCH 20/24] Added remaining placeholder components from UT-HAI codebase. --- .../ConversationUITutorial.stories.js | 14 ++++++++++++++ .../client-deliberation/Deliberation.stories.js | 14 ++++++++++++++ stories/client-deliberation/Legal.stories.js | 14 ++++++++++++++ .../StatementFormTutorial.stories.js | 14 ++++++++++++++ .../TutorialBackground.stories.js | 14 ++++++++++++++ stories/client-deliberation/TutorialBox.stories.js | 14 ++++++++++++++ .../client-deliberation/TutorialsBox.stories.js | 14 ++++++++++++++ .../client-deliberation/UnderstandAI.stories.js | 14 ++++++++++++++ .../VisualisationTutorial.stories.js | 14 ++++++++++++++ 9 files changed, 126 insertions(+) create mode 100644 stories/client-deliberation/ConversationUITutorial.stories.js create mode 100644 stories/client-deliberation/Deliberation.stories.js create mode 100644 stories/client-deliberation/Legal.stories.js create mode 100644 stories/client-deliberation/StatementFormTutorial.stories.js create mode 100644 stories/client-deliberation/TutorialBackground.stories.js create mode 100644 stories/client-deliberation/TutorialBox.stories.js create mode 100644 stories/client-deliberation/TutorialsBox.stories.js create mode 100644 stories/client-deliberation/UnderstandAI.stories.js create mode 100644 stories/client-deliberation/VisualisationTutorial.stories.js diff --git a/stories/client-deliberation/ConversationUITutorial.stories.js b/stories/client-deliberation/ConversationUITutorial.stories.js new file mode 100644 index 0000000..b818d8d --- /dev/null +++ b/stories/client-deliberation/ConversationUITutorial.stories.js @@ -0,0 +1,14 @@ +import React from 'react' +import ConversationUITutorial from '../../polis-UT-HAI/client-deliberation/src/components/ConversationUITutorial' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/ConversationUITutorial', + component: ConversationUITutorial, + decorators: [withDelibThemeUi], +} + +const Template = (args) => <div>Not Yet Implemented</div> + +export const Default = Template.bind({}) +Default.args = {} diff --git a/stories/client-deliberation/Deliberation.stories.js b/stories/client-deliberation/Deliberation.stories.js new file mode 100644 index 0000000..25526a4 --- /dev/null +++ b/stories/client-deliberation/Deliberation.stories.js @@ -0,0 +1,14 @@ +import React from 'react' +import Deliberation from '../../polis-UT-HAI/client-deliberation/src/components/Deliberation' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/Deliberation', + component: Deliberation, + decorators: [withDelibThemeUi], +} + +const Template = (args) => <div>Not Yet Implemented</div> + +export const Default = Template.bind({}) +Default.args = {} diff --git a/stories/client-deliberation/Legal.stories.js b/stories/client-deliberation/Legal.stories.js new file mode 100644 index 0000000..5e71e9e --- /dev/null +++ b/stories/client-deliberation/Legal.stories.js @@ -0,0 +1,14 @@ +import React from 'react' +import Legal from '../../polis-UT-HAI/client-deliberation/src/components/Legal' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/Legal', + component: Legal, + decorators: [withDelibThemeUi], +} + +const Template = (args) => <div>Not Yet Implemented</div> + +export const Default = Template.bind({}) +Default.args = {} diff --git a/stories/client-deliberation/StatementFormTutorial.stories.js b/stories/client-deliberation/StatementFormTutorial.stories.js new file mode 100644 index 0000000..416c5af --- /dev/null +++ b/stories/client-deliberation/StatementFormTutorial.stories.js @@ -0,0 +1,14 @@ +import React from 'react' +import StatementFormTutorial from '../../polis-UT-HAI/client-deliberation/src/components/StatementFormTutorial' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/StatementFormTutorial', + component: StatementFormTutorial, + decorators: [withDelibThemeUi], +} + +const Template = (args) => <div>Not Yet Implemented</div> + +export const Default = Template.bind({}) +Default.args = {} diff --git a/stories/client-deliberation/TutorialBackground.stories.js b/stories/client-deliberation/TutorialBackground.stories.js new file mode 100644 index 0000000..8e3ce02 --- /dev/null +++ b/stories/client-deliberation/TutorialBackground.stories.js @@ -0,0 +1,14 @@ +import React from 'react' +import TutorialBackground from '../../polis-UT-HAI/client-deliberation/src/components/TutorialBackground' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/TutorialBackground', + component: TutorialBackground, + decorators: [withDelibThemeUi], +} + +const Template = (args) => <div>Not Yet Implemented</div> + +export const Default = Template.bind({}) +Default.args = {} diff --git a/stories/client-deliberation/TutorialBox.stories.js b/stories/client-deliberation/TutorialBox.stories.js new file mode 100644 index 0000000..7626811 --- /dev/null +++ b/stories/client-deliberation/TutorialBox.stories.js @@ -0,0 +1,14 @@ +import React from 'react' +import TutorialBox from '../../polis-UT-HAI/client-deliberation/src/components/TutorialBox' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/TutorialBox', + component: TutorialBox, + decorators: [withDelibThemeUi], +} + +const Template = (args) => <div>Not Yet Implemented</div> + +export const Default = Template.bind({}) +Default.args = {} diff --git a/stories/client-deliberation/TutorialsBox.stories.js b/stories/client-deliberation/TutorialsBox.stories.js new file mode 100644 index 0000000..1b9bf40 --- /dev/null +++ b/stories/client-deliberation/TutorialsBox.stories.js @@ -0,0 +1,14 @@ +import React from 'react' +import TutorialsBox from '../../polis-UT-HAI/client-deliberation/src/components/TutorialsBox' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/TutorialsBox', + component: TutorialsBox, + decorators: [withDelibThemeUi], +} + +const Template = (args) => <div>Not Yet Implemented</div> + +export const Default = Template.bind({}) +Default.args = {} diff --git a/stories/client-deliberation/UnderstandAI.stories.js b/stories/client-deliberation/UnderstandAI.stories.js new file mode 100644 index 0000000..fcfe726 --- /dev/null +++ b/stories/client-deliberation/UnderstandAI.stories.js @@ -0,0 +1,14 @@ +import React from 'react' +import UnderstandAI from '../../polis-UT-HAI/client-deliberation/src/components/UnderstandAI' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/UnderstandAI', + component: UnderstandAI, + decorators: [withDelibThemeUi], +} + +const Template = (args) => <div>Not Yet Implemented</div> + +export const Default = Template.bind({}) +Default.args = {} diff --git a/stories/client-deliberation/VisualisationTutorial.stories.js b/stories/client-deliberation/VisualisationTutorial.stories.js new file mode 100644 index 0000000..9a4e9cc --- /dev/null +++ b/stories/client-deliberation/VisualisationTutorial.stories.js @@ -0,0 +1,14 @@ +import React from 'react' +import VisualisationTutorial from '../../polis-UT-HAI/client-deliberation/src/components/VisualisationTutorial' +import { withDelibThemeUi } from '../../.storybook/decorators' + +export default { + title: 'Client-Deliberation/VisualisationTutorial', + component: VisualisationTutorial, + decorators: [withDelibThemeUi], +} + +const Template = (args) => <div>Not Yet Implemented</div> + +export const Default = Template.bind({}) +Default.args = {} From 86a22eeb754ab01014e53879aae50bf1fecc2d3e Mon Sep 17 00:00:00 2001 From: Patrick Connolly <patrick.c.connolly@gmail.com> Date: Thu, 10 Oct 2024 13:56:39 -0400 Subject: [PATCH 21/24] Moving git submodule to codebases dir. --- .gitmodules | 2 +- polis-UT-HAI => codebases/UT-HAI | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename polis-UT-HAI => codebases/UT-HAI (100%) diff --git a/.gitmodules b/.gitmodules index 2d350cc..ff8c2ac 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,5 +2,5 @@ path = codebases/compdem url = https://github.com/CivicTechTO/polis.git [submodule "polis-UT-HAI"] - path = polis-UT-HAI + path = codebases/UT-HAI url = https://github.com/patcon/polis.git diff --git a/polis-UT-HAI b/codebases/UT-HAI similarity index 100% rename from polis-UT-HAI rename to codebases/UT-HAI From 06fd4d08b67f5caf7bec0bce55bdce98565654e8 Mon Sep 17 00:00:00 2001 From: Patrick Connolly <patrick.c.connolly@gmail.com> Date: Thu, 10 Oct 2024 13:58:50 -0400 Subject: [PATCH 22/24] Renamed imports to new dir. --- .storybook/decorators.js | 2 +- stories/client-deliberation/AgreeButton.stories.js | 2 +- stories/client-deliberation/ArrowIcon.stories.js | 2 +- stories/client-deliberation/ConversationUI.stories.js | 2 +- stories/client-deliberation/ConversationUITutorial.stories.js | 2 +- stories/client-deliberation/Deliberation.stories.js | 2 +- stories/client-deliberation/DisagreeButton.stories.js | 2 +- stories/client-deliberation/DoesNotExist.stories.js | 2 +- stories/client-deliberation/HexLogo.stories.js | 2 +- stories/client-deliberation/IndividualDeliberation.stories.js | 2 +- stories/client-deliberation/IntegrateBox.stories.js | 2 +- .../client-deliberation/IntegrateBoxAndConclusion.stories.js | 2 +- stories/client-deliberation/IntegrateLink.stories.js | 2 +- stories/client-deliberation/InteriorHeader.stories.js | 2 +- stories/client-deliberation/Legal.stories.js | 2 +- stories/client-deliberation/Loading.stories.js | 2 +- stories/client-deliberation/Lock.stories.js | 2 +- stories/client-deliberation/ObtainLink.stories.js | 2 +- stories/client-deliberation/OpinionContainer.stories.js | 2 +- stories/client-deliberation/PassButton.stories.js | 2 +- stories/client-deliberation/PolisButton.stories.js | 2 +- stories/client-deliberation/Sidebar.stories.js | 2 +- stories/client-deliberation/SidebarModule.stories.js | 4 ++-- stories/client-deliberation/StatementButton.stories.js | 2 +- stories/client-deliberation/StatementForm.stories.js | 2 +- stories/client-deliberation/StatementFormTutorial.stories.js | 2 +- stories/client-deliberation/StatementUI.stories.js | 4 ++-- stories/client-deliberation/Subtitle.stories.js | 2 +- stories/client-deliberation/Title.stories.js | 2 +- stories/client-deliberation/TreeSummary.stories.js | 2 +- stories/client-deliberation/Tutorial.stories.js | 2 +- stories/client-deliberation/TutorialBackground.stories.js | 2 +- stories/client-deliberation/TutorialBox.stories.js | 2 +- stories/client-deliberation/Tutorials.stories.js | 2 +- stories/client-deliberation/TutorialsBox.stories.js | 2 +- stories/client-deliberation/UnderstandAI.stories.js | 2 +- stories/client-deliberation/VisualisationTutorial.stories.js | 2 +- stories/client-deliberation/Visualization.stories.js | 2 +- 38 files changed, 40 insertions(+), 40 deletions(-) diff --git a/.storybook/decorators.js b/.storybook/decorators.js index 448d5a7..29047da 100644 --- a/.storybook/decorators.js +++ b/.storybook/decorators.js @@ -1,7 +1,7 @@ import React from 'react' import { ThemeProvider } from 'theme-ui' import compdemAdminTheme from '../codebases/compdem/client-admin/src/theme' -import haiDelibTheme from '../polis-UT-HAI/client-deliberation/src/theme' +import haiDelibTheme from '../codebases/UT-HAI/client-deliberation/src/theme' import { Provider as ReduxProvider } from 'react-redux' import configureStore from '../codebases/compdem/client-admin/src/store' diff --git a/stories/client-deliberation/AgreeButton.stories.js b/stories/client-deliberation/AgreeButton.stories.js index 60e26fc..87de1f9 100644 --- a/stories/client-deliberation/AgreeButton.stories.js +++ b/stories/client-deliberation/AgreeButton.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import AgreeButton from '../../polis-UT-HAI/client-deliberation/src/components/AgreeButton' +import AgreeButton from '../../codebases/UT-HAI/client-deliberation/src/components/AgreeButton' import { action } from '@storybook/addon-actions' import { withDelibThemeUi } from '../../.storybook/decorators' diff --git a/stories/client-deliberation/ArrowIcon.stories.js b/stories/client-deliberation/ArrowIcon.stories.js index d9a0549..ab0a29b 100644 --- a/stories/client-deliberation/ArrowIcon.stories.js +++ b/stories/client-deliberation/ArrowIcon.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import ArrowIcon from '../../polis-UT-HAI/client-deliberation/src/components/ArrowIcon' +import ArrowIcon from '../../codebases/UT-HAI/client-deliberation/src/components/ArrowIcon' export default { title: 'Client-Deliberation/ArrowIcon', diff --git a/stories/client-deliberation/ConversationUI.stories.js b/stories/client-deliberation/ConversationUI.stories.js index fa54cb8..5fdda3d 100644 --- a/stories/client-deliberation/ConversationUI.stories.js +++ b/stories/client-deliberation/ConversationUI.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import ConversationUI from '../../polis-UT-HAI/client-deliberation/src/components/ConversationUI' +import ConversationUI from '../../codebases/UT-HAI/client-deliberation/src/components/ConversationUI' import { withDelibThemeUi } from '../../.storybook/decorators' export default { diff --git a/stories/client-deliberation/ConversationUITutorial.stories.js b/stories/client-deliberation/ConversationUITutorial.stories.js index b818d8d..d3e6a73 100644 --- a/stories/client-deliberation/ConversationUITutorial.stories.js +++ b/stories/client-deliberation/ConversationUITutorial.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import ConversationUITutorial from '../../polis-UT-HAI/client-deliberation/src/components/ConversationUITutorial' +import ConversationUITutorial from '../../codebases/UT-HAI/client-deliberation/src/components/ConversationUITutorial' import { withDelibThemeUi } from '../../.storybook/decorators' export default { diff --git a/stories/client-deliberation/Deliberation.stories.js b/stories/client-deliberation/Deliberation.stories.js index 25526a4..d0199d0 100644 --- a/stories/client-deliberation/Deliberation.stories.js +++ b/stories/client-deliberation/Deliberation.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import Deliberation from '../../polis-UT-HAI/client-deliberation/src/components/Deliberation' +import Deliberation from '../../codebases/UT-HAI/client-deliberation/src/components/Deliberation' import { withDelibThemeUi } from '../../.storybook/decorators' export default { diff --git a/stories/client-deliberation/DisagreeButton.stories.js b/stories/client-deliberation/DisagreeButton.stories.js index 5a318f6..4bff199 100644 --- a/stories/client-deliberation/DisagreeButton.stories.js +++ b/stories/client-deliberation/DisagreeButton.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import DisagreeButton from '../../polis-UT-HAI/client-deliberation/src/components/DisagreeButton' +import DisagreeButton from '../../codebases/UT-HAI/client-deliberation/src/components/DisagreeButton' import { action } from '@storybook/addon-actions' import { withDelibThemeUi } from '../../.storybook/decorators' diff --git a/stories/client-deliberation/DoesNotExist.stories.js b/stories/client-deliberation/DoesNotExist.stories.js index 5b030ce..b95b907 100644 --- a/stories/client-deliberation/DoesNotExist.stories.js +++ b/stories/client-deliberation/DoesNotExist.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import DoesNotExist from '../../polis-UT-HAI/client-deliberation/src/components/DoesNotExist' +import DoesNotExist from '../../codebases/UT-HAI/client-deliberation/src/components/DoesNotExist' import { withDelibThemeUi } from '../../.storybook/decorators' export default { diff --git a/stories/client-deliberation/HexLogo.stories.js b/stories/client-deliberation/HexLogo.stories.js index 1a7e5ca..c442bba 100644 --- a/stories/client-deliberation/HexLogo.stories.js +++ b/stories/client-deliberation/HexLogo.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import HexLogo from '../../polis-UT-HAI/client-deliberation/src/components/hexLogo' +import HexLogo from '../../codebases/UT-HAI/client-deliberation/src/components/hexLogo' import { withDelibThemeUi } from '../../.storybook/decorators' export default { diff --git a/stories/client-deliberation/IndividualDeliberation.stories.js b/stories/client-deliberation/IndividualDeliberation.stories.js index 65c85d5..62ec5f7 100644 --- a/stories/client-deliberation/IndividualDeliberation.stories.js +++ b/stories/client-deliberation/IndividualDeliberation.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import IndividualDeliberation from '../../polis-UT-HAI/client-deliberation/src/components/IndividualDeliberation' +import IndividualDeliberation from '../../codebases/UT-HAI/client-deliberation/src/components/IndividualDeliberation' import { withDelibThemeUi } from '../../.storybook/decorators' export default { diff --git a/stories/client-deliberation/IntegrateBox.stories.js b/stories/client-deliberation/IntegrateBox.stories.js index 7e339e1..f082b38 100644 --- a/stories/client-deliberation/IntegrateBox.stories.js +++ b/stories/client-deliberation/IntegrateBox.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import IntegrateBox from '../../polis-UT-HAI/client-deliberation/src/components/IntegrateBox' +import IntegrateBox from '../../codebases/UT-HAI/client-deliberation/src/components/IntegrateBox' import { withDelibThemeUi } from '../../.storybook/decorators' export default { diff --git a/stories/client-deliberation/IntegrateBoxAndConclusion.stories.js b/stories/client-deliberation/IntegrateBoxAndConclusion.stories.js index b22d620..0c6ca8c 100644 --- a/stories/client-deliberation/IntegrateBoxAndConclusion.stories.js +++ b/stories/client-deliberation/IntegrateBoxAndConclusion.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import IntegrateBoxAndConclusion from '../../polis-UT-HAI/client-deliberation/src/components/IntegrateBoxAndConclusion' +import IntegrateBoxAndConclusion from '../../codebases/UT-HAI/client-deliberation/src/components/IntegrateBoxAndConclusion' import { withDelibThemeUi } from '../../.storybook/decorators' import { Default as DefaultIntegrateBoxStory } from './IntegrateBox.stories' diff --git a/stories/client-deliberation/IntegrateLink.stories.js b/stories/client-deliberation/IntegrateLink.stories.js index 1141c97..83ea03f 100644 --- a/stories/client-deliberation/IntegrateLink.stories.js +++ b/stories/client-deliberation/IntegrateLink.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import IntegrateLink from '../../polis-UT-HAI/client-deliberation/src/components/IntegrateLink' +import IntegrateLink from '../../codebases/UT-HAI/client-deliberation/src/components/IntegrateLink' import { withDelibThemeUi } from '../../.storybook/decorators' export default { diff --git a/stories/client-deliberation/InteriorHeader.stories.js b/stories/client-deliberation/InteriorHeader.stories.js index 572bd52..be71e13 100644 --- a/stories/client-deliberation/InteriorHeader.stories.js +++ b/stories/client-deliberation/InteriorHeader.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import InteriorHeader from '../../polis-UT-HAI/client-deliberation/src/components/interior-header' +import InteriorHeader from '../../codebases/UT-HAI/client-deliberation/src/components/interior-header' import { withDelibThemeUi } from '../../.storybook/decorators' import { withRouter } from 'storybook-addon-remix-react-router' diff --git a/stories/client-deliberation/Legal.stories.js b/stories/client-deliberation/Legal.stories.js index 5e71e9e..955f22e 100644 --- a/stories/client-deliberation/Legal.stories.js +++ b/stories/client-deliberation/Legal.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import Legal from '../../polis-UT-HAI/client-deliberation/src/components/Legal' +import Legal from '../../codebases/UT-HAI/client-deliberation/src/components/Legal' import { withDelibThemeUi } from '../../.storybook/decorators' export default { diff --git a/stories/client-deliberation/Loading.stories.js b/stories/client-deliberation/Loading.stories.js index 2386c6c..b9c4999 100644 --- a/stories/client-deliberation/Loading.stories.js +++ b/stories/client-deliberation/Loading.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import Loading from '../../polis-UT-HAI/client-deliberation/src/components/Loading' +import Loading from '../../codebases/UT-HAI/client-deliberation/src/components/Loading' import { action } from '@storybook/addon-actions' import { withDelibThemeUi } from '../../.storybook/decorators' diff --git a/stories/client-deliberation/Lock.stories.js b/stories/client-deliberation/Lock.stories.js index f3f00b6..f9c8d99 100644 --- a/stories/client-deliberation/Lock.stories.js +++ b/stories/client-deliberation/Lock.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import Lock from '../../polis-UT-HAI/client-deliberation/src/components/Lock' +import Lock from '../../codebases/UT-HAI/client-deliberation/src/components/Lock' export default { title: 'Client-Deliberation/Lock', diff --git a/stories/client-deliberation/ObtainLink.stories.js b/stories/client-deliberation/ObtainLink.stories.js index 937578c..daac5d7 100644 --- a/stories/client-deliberation/ObtainLink.stories.js +++ b/stories/client-deliberation/ObtainLink.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import ObtainLink from '../../polis-UT-HAI/client-deliberation/src/components/ObtainLink' +import ObtainLink from '../../codebases/UT-HAI/client-deliberation/src/components/ObtainLink' import { withDelibThemeUi } from '../../.storybook/decorators' export default { diff --git a/stories/client-deliberation/OpinionContainer.stories.js b/stories/client-deliberation/OpinionContainer.stories.js index a48c47d..6014195 100644 --- a/stories/client-deliberation/OpinionContainer.stories.js +++ b/stories/client-deliberation/OpinionContainer.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import OpinionContainer from '../../polis-UT-HAI/client-deliberation/src/components/OpinionContainer' +import OpinionContainer from '../../codebases/UT-HAI/client-deliberation/src/components/OpinionContainer' import { withDelibThemeUi } from '../../.storybook/decorators' export default { diff --git a/stories/client-deliberation/PassButton.stories.js b/stories/client-deliberation/PassButton.stories.js index 42ae612..2320794 100644 --- a/stories/client-deliberation/PassButton.stories.js +++ b/stories/client-deliberation/PassButton.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import PassButton from '../../polis-UT-HAI/client-deliberation/src/components/PassButton' +import PassButton from '../../codebases/UT-HAI/client-deliberation/src/components/PassButton' import { action } from '@storybook/addon-actions' import { withDelibThemeUi } from '../../.storybook/decorators' diff --git a/stories/client-deliberation/PolisButton.stories.js b/stories/client-deliberation/PolisButton.stories.js index b67482f..1985acf 100644 --- a/stories/client-deliberation/PolisButton.stories.js +++ b/stories/client-deliberation/PolisButton.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import PolisButton from '../../polis-UT-HAI/client-deliberation/src/components/PolisButton' +import PolisButton from '../../codebases/UT-HAI/client-deliberation/src/components/PolisButton' import { action } from '@storybook/addon-actions' import { withDelibThemeUi } from '../../.storybook/decorators' diff --git a/stories/client-deliberation/Sidebar.stories.js b/stories/client-deliberation/Sidebar.stories.js index 537bc35..59fa96a 100644 --- a/stories/client-deliberation/Sidebar.stories.js +++ b/stories/client-deliberation/Sidebar.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import Sidebar from '../../polis-UT-HAI/client-deliberation/src/components/Sidebar' +import Sidebar from '../../codebases/UT-HAI/client-deliberation/src/components/Sidebar' import { withDelibThemeUi } from '../../.storybook/decorators' import { action } from '@storybook/addon-actions' diff --git a/stories/client-deliberation/SidebarModule.stories.js b/stories/client-deliberation/SidebarModule.stories.js index 9cfc34c..ed0ecba 100644 --- a/stories/client-deliberation/SidebarModule.stories.js +++ b/stories/client-deliberation/SidebarModule.stories.js @@ -1,6 +1,6 @@ import React from 'react' -import SidebarModule from '../../polis-UT-HAI/client-deliberation/src/components/SidebarModule' -import Sidebar from '../../polis-UT-HAI/client-deliberation/src/components/Sidebar' +import SidebarModule from '../../codebases/UT-HAI/client-deliberation/src/components/SidebarModule' +import Sidebar from '../../codebases/UT-HAI/client-deliberation/src/components/Sidebar' import { withDelibThemeUi } from '../../.storybook/decorators' import { action } from '@storybook/addon-actions' diff --git a/stories/client-deliberation/StatementButton.stories.js b/stories/client-deliberation/StatementButton.stories.js index 3f2d6f9..3aa27b7 100644 --- a/stories/client-deliberation/StatementButton.stories.js +++ b/stories/client-deliberation/StatementButton.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import StatementButton from '../../polis-UT-HAI/client-deliberation/src/components/StatementButton' +import StatementButton from '../../codebases/UT-HAI/client-deliberation/src/components/StatementButton' import { action } from '@storybook/addon-actions' import { withDelibThemeUi } from '../../.storybook/decorators' diff --git a/stories/client-deliberation/StatementForm.stories.js b/stories/client-deliberation/StatementForm.stories.js index 6a0de97..23e1d55 100644 --- a/stories/client-deliberation/StatementForm.stories.js +++ b/stories/client-deliberation/StatementForm.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import StatementForm from '../../polis-UT-HAI/client-deliberation/src/components/StatementForm' +import StatementForm from '../../codebases/UT-HAI/client-deliberation/src/components/StatementForm' import { action } from '@storybook/addon-actions' import { withDelibThemeUi } from '../../.storybook/decorators' import socialAvatar from '../../.storybook/assets/avatar-sample.jpg' diff --git a/stories/client-deliberation/StatementFormTutorial.stories.js b/stories/client-deliberation/StatementFormTutorial.stories.js index 416c5af..9e70e13 100644 --- a/stories/client-deliberation/StatementFormTutorial.stories.js +++ b/stories/client-deliberation/StatementFormTutorial.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import StatementFormTutorial from '../../polis-UT-HAI/client-deliberation/src/components/StatementFormTutorial' +import StatementFormTutorial from '../../codebases/UT-HAI/client-deliberation/src/components/StatementFormTutorial' import { withDelibThemeUi } from '../../.storybook/decorators' export default { diff --git a/stories/client-deliberation/StatementUI.stories.js b/stories/client-deliberation/StatementUI.stories.js index 7790197..e5d436a 100644 --- a/stories/client-deliberation/StatementUI.stories.js +++ b/stories/client-deliberation/StatementUI.stories.js @@ -1,6 +1,6 @@ import React from 'react' -import StatementUI from '../../polis-UT-HAI/client-deliberation/src/components/StatementUI' -import StatementUIContainer from '../../polis-UT-HAI/client-deliberation/src/components/StatementUIContainer' +import StatementUI from '../../codebases/UT-HAI/client-deliberation/src/components/StatementUI' +import StatementUIContainer from '../../codebases/UT-HAI/client-deliberation/src/components/StatementUIContainer' import { action } from '@storybook/addon-actions' import socialAvatar from '../../.storybook/assets/avatar-sample.jpg' import { withDelibThemeUi } from '../../.storybook/decorators' diff --git a/stories/client-deliberation/Subtitle.stories.js b/stories/client-deliberation/Subtitle.stories.js index b16f761..84b7ded 100644 --- a/stories/client-deliberation/Subtitle.stories.js +++ b/stories/client-deliberation/Subtitle.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import Subtitle from '../../polis-UT-HAI/client-deliberation/src/components/Subtitle' +import Subtitle from '../../codebases/UT-HAI/client-deliberation/src/components/Subtitle' import { withDelibThemeUi } from '../../.storybook/decorators' export default { diff --git a/stories/client-deliberation/Title.stories.js b/stories/client-deliberation/Title.stories.js index 853827b..f8826a9 100644 --- a/stories/client-deliberation/Title.stories.js +++ b/stories/client-deliberation/Title.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import Title from '../../polis-UT-HAI/client-deliberation/src/components/Title' +import Title from '../../codebases/UT-HAI/client-deliberation/src/components/Title' import { withDelibThemeUi } from '../../.storybook/decorators' export default { diff --git a/stories/client-deliberation/TreeSummary.stories.js b/stories/client-deliberation/TreeSummary.stories.js index 3bd930f..3b3253c 100644 --- a/stories/client-deliberation/TreeSummary.stories.js +++ b/stories/client-deliberation/TreeSummary.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import TreeSummary from '../../polis-UT-HAI/client-deliberation/src/components/TreeSummary' +import TreeSummary from '../../codebases/UT-HAI/client-deliberation/src/components/TreeSummary' import { action } from '@storybook/addon-actions' import { withDelibThemeUi } from '../../.storybook/decorators' diff --git a/stories/client-deliberation/Tutorial.stories.js b/stories/client-deliberation/Tutorial.stories.js index 06e2100..a43d8f5 100644 --- a/stories/client-deliberation/Tutorial.stories.js +++ b/stories/client-deliberation/Tutorial.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import Tutorial from '../../polis-UT-HAI/client-deliberation/src/components/Tutorial' +import Tutorial from '../../codebases/UT-HAI/client-deliberation/src/components/Tutorial' import { action } from '@storybook/addon-actions' import { withDelibThemeUi } from '../../.storybook/decorators' diff --git a/stories/client-deliberation/TutorialBackground.stories.js b/stories/client-deliberation/TutorialBackground.stories.js index 8e3ce02..4ed5fac 100644 --- a/stories/client-deliberation/TutorialBackground.stories.js +++ b/stories/client-deliberation/TutorialBackground.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import TutorialBackground from '../../polis-UT-HAI/client-deliberation/src/components/TutorialBackground' +import TutorialBackground from '../../codebases/UT-HAI/client-deliberation/src/components/TutorialBackground' import { withDelibThemeUi } from '../../.storybook/decorators' export default { diff --git a/stories/client-deliberation/TutorialBox.stories.js b/stories/client-deliberation/TutorialBox.stories.js index 7626811..652e76f 100644 --- a/stories/client-deliberation/TutorialBox.stories.js +++ b/stories/client-deliberation/TutorialBox.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import TutorialBox from '../../polis-UT-HAI/client-deliberation/src/components/TutorialBox' +import TutorialBox from '../../codebases/UT-HAI/client-deliberation/src/components/TutorialBox' import { withDelibThemeUi } from '../../.storybook/decorators' export default { diff --git a/stories/client-deliberation/Tutorials.stories.js b/stories/client-deliberation/Tutorials.stories.js index 3a2bd9f..896b3cb 100644 --- a/stories/client-deliberation/Tutorials.stories.js +++ b/stories/client-deliberation/Tutorials.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import Tutorials from '../../polis-UT-HAI/client-deliberation/src/components/Tutorials' +import Tutorials from '../../codebases/UT-HAI/client-deliberation/src/components/Tutorials' import { action } from '@storybook/addon-actions' import { withDelibThemeUi } from '../../.storybook/decorators' diff --git a/stories/client-deliberation/TutorialsBox.stories.js b/stories/client-deliberation/TutorialsBox.stories.js index 1b9bf40..80349f7 100644 --- a/stories/client-deliberation/TutorialsBox.stories.js +++ b/stories/client-deliberation/TutorialsBox.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import TutorialsBox from '../../polis-UT-HAI/client-deliberation/src/components/TutorialsBox' +import TutorialsBox from '../../codebases/UT-HAI/client-deliberation/src/components/TutorialsBox' import { withDelibThemeUi } from '../../.storybook/decorators' export default { diff --git a/stories/client-deliberation/UnderstandAI.stories.js b/stories/client-deliberation/UnderstandAI.stories.js index fcfe726..bd93d3c 100644 --- a/stories/client-deliberation/UnderstandAI.stories.js +++ b/stories/client-deliberation/UnderstandAI.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import UnderstandAI from '../../polis-UT-HAI/client-deliberation/src/components/UnderstandAI' +import UnderstandAI from '../../codebases/UT-HAI/client-deliberation/src/components/UnderstandAI' import { withDelibThemeUi } from '../../.storybook/decorators' export default { diff --git a/stories/client-deliberation/VisualisationTutorial.stories.js b/stories/client-deliberation/VisualisationTutorial.stories.js index 9a4e9cc..2ca7f01 100644 --- a/stories/client-deliberation/VisualisationTutorial.stories.js +++ b/stories/client-deliberation/VisualisationTutorial.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import VisualisationTutorial from '../../polis-UT-HAI/client-deliberation/src/components/VisualisationTutorial' +import VisualisationTutorial from '../../codebases/UT-HAI/client-deliberation/src/components/VisualisationTutorial' import { withDelibThemeUi } from '../../.storybook/decorators' export default { diff --git a/stories/client-deliberation/Visualization.stories.js b/stories/client-deliberation/Visualization.stories.js index 48e0e7d..285acf9 100644 --- a/stories/client-deliberation/Visualization.stories.js +++ b/stories/client-deliberation/Visualization.stories.js @@ -1,5 +1,5 @@ import React from 'react' -import Visualization from '../../polis-UT-HAI/client-deliberation/src/components/Visualization' +import Visualization from '../../codebases/UT-HAI/client-deliberation/src/components/Visualization' import { withDelibThemeUi } from '../../.storybook/decorators' export default { From 673410a27f0f6ab6ad94ef36372fbd7387acbeeb Mon Sep 17 00:00:00 2001 From: Patrick Connolly <patrick.c.connolly@gmail.com> Date: Fri, 11 Oct 2024 19:57:33 -0400 Subject: [PATCH 23/24] Migrated client-deliberation into UT-HAI subdir. --- .../client-deliberation/AgreeButton.stories.js | 5 ++--- .../client-deliberation/ArrowIcon.stories.js | 3 +-- .../client-deliberation/ConversationUI.stories.js | 5 ++--- .../ConversationUITutorial.stories.js | 5 ++--- .../client-deliberation/Deliberation.stories.js | 5 ++--- .../client-deliberation/DisagreeButton.stories.js | 5 ++--- .../client-deliberation/DoesNotExist.stories.js | 5 ++--- .../{ => UT-HAI}/client-deliberation/HexLogo.stories.js | 5 ++--- .../IndividualDeliberation.stories.js | 5 ++--- .../client-deliberation/IntegrateBox.stories.js | 5 ++--- .../IntegrateBoxAndConclusion.stories.js | 5 ++--- .../client-deliberation/IntegrateLink.stories.js | 5 ++--- .../client-deliberation/InteriorHeader.stories.js | 5 ++--- .../{ => UT-HAI}/client-deliberation/Legal.stories.js | 5 ++--- .../{ => UT-HAI}/client-deliberation/Loading.stories.js | 5 ++--- stories/{ => UT-HAI}/client-deliberation/Lock.stories.js | 3 +-- .../client-deliberation/ObtainLink.stories.js | 5 ++--- .../client-deliberation/OpinionContainer.stories.js | 5 ++--- stories/{ => UT-HAI}/client-deliberation/Overview.mdx | 0 .../client-deliberation/PassButton.stories.js | 5 ++--- .../client-deliberation/PolisButton.stories.js | 5 ++--- .../{ => UT-HAI}/client-deliberation/Sidebar.stories.js | 5 ++--- .../client-deliberation/SidebarModule.stories.js | 7 +++---- .../client-deliberation/StatementButton.stories.js | 5 ++--- .../client-deliberation/StatementForm.stories.js | 7 +++---- .../client-deliberation/StatementFormTutorial.stories.js | 5 ++--- .../client-deliberation/StatementUI.stories.js | 9 ++++----- .../{ => UT-HAI}/client-deliberation/Subtitle.stories.js | 5 ++--- .../{ => UT-HAI}/client-deliberation/Title.stories.js | 5 ++--- .../client-deliberation/TreeSummary.stories.js | 5 ++--- .../{ => UT-HAI}/client-deliberation/Tutorial.stories.js | 5 ++--- .../client-deliberation/TutorialBackground.stories.js | 5 ++--- .../client-deliberation/TutorialBox.stories.js | 5 ++--- .../client-deliberation/Tutorials.stories.js | 7 +++---- .../client-deliberation/TutorialsBox.stories.js | 5 ++--- .../client-deliberation/UnderstandAI.stories.js | 5 ++--- .../client-deliberation/VisualisationTutorial.stories.js | 5 ++--- .../client-deliberation/Visualization.stories.js | 5 ++--- 38 files changed, 77 insertions(+), 114 deletions(-) rename stories/{ => UT-HAI}/client-deliberation/AgreeButton.stories.js (59%) rename stories/{ => UT-HAI}/client-deliberation/ArrowIcon.stories.js (57%) rename stories/{ => UT-HAI}/client-deliberation/ConversationUI.stories.js (51%) rename stories/{ => UT-HAI}/client-deliberation/ConversationUITutorial.stories.js (50%) rename stories/{ => UT-HAI}/client-deliberation/Deliberation.stories.js (52%) rename stories/{ => UT-HAI}/client-deliberation/DisagreeButton.stories.js (58%) rename stories/{ => UT-HAI}/client-deliberation/DoesNotExist.stories.js (54%) rename stories/{ => UT-HAI}/client-deliberation/HexLogo.stories.js (52%) rename stories/{ => UT-HAI}/client-deliberation/IndividualDeliberation.stories.js (61%) rename stories/{ => UT-HAI}/client-deliberation/IntegrateBox.stories.js (79%) rename stories/{ => UT-HAI}/client-deliberation/IntegrateBoxAndConclusion.stories.js (77%) rename stories/{ => UT-HAI}/client-deliberation/IntegrateLink.stories.js (58%) rename stories/{ => UT-HAI}/client-deliberation/InteriorHeader.stories.js (61%) rename stories/{ => UT-HAI}/client-deliberation/Legal.stories.js (54%) rename stories/{ => UT-HAI}/client-deliberation/Loading.stories.js (60%) rename stories/{ => UT-HAI}/client-deliberation/Lock.stories.js (63%) rename stories/{ => UT-HAI}/client-deliberation/ObtainLink.stories.js (52%) rename stories/{ => UT-HAI}/client-deliberation/OpinionContainer.stories.js (61%) rename stories/{ => UT-HAI}/client-deliberation/Overview.mdx (100%) rename stories/{ => UT-HAI}/client-deliberation/PassButton.stories.js (59%) rename stories/{ => UT-HAI}/client-deliberation/PolisButton.stories.js (61%) rename stories/{ => UT-HAI}/client-deliberation/Sidebar.stories.js (75%) rename stories/{ => UT-HAI}/client-deliberation/SidebarModule.stories.js (64%) rename stories/{ => UT-HAI}/client-deliberation/StatementButton.stories.js (58%) rename stories/{ => UT-HAI}/client-deliberation/StatementForm.stories.js (66%) rename stories/{ => UT-HAI}/client-deliberation/StatementFormTutorial.stories.js (50%) rename stories/{ => UT-HAI}/client-deliberation/StatementUI.stories.js (65%) rename stories/{ => UT-HAI}/client-deliberation/Subtitle.stories.js (55%) rename stories/{ => UT-HAI}/client-deliberation/Title.stories.js (55%) rename stories/{ => UT-HAI}/client-deliberation/TreeSummary.stories.js (68%) rename stories/{ => UT-HAI}/client-deliberation/Tutorial.stories.js (73%) rename stories/{ => UT-HAI}/client-deliberation/TutorialBackground.stories.js (50%) rename stories/{ => UT-HAI}/client-deliberation/TutorialBox.stories.js (52%) rename stories/{ => UT-HAI}/client-deliberation/Tutorials.stories.js (69%) rename stories/{ => UT-HAI}/client-deliberation/TutorialsBox.stories.js (52%) rename stories/{ => UT-HAI}/client-deliberation/UnderstandAI.stories.js (52%) rename stories/{ => UT-HAI}/client-deliberation/VisualisationTutorial.stories.js (50%) rename stories/{ => UT-HAI}/client-deliberation/Visualization.stories.js (52%) diff --git a/stories/client-deliberation/AgreeButton.stories.js b/stories/UT-HAI/client-deliberation/AgreeButton.stories.js similarity index 59% rename from stories/client-deliberation/AgreeButton.stories.js rename to stories/UT-HAI/client-deliberation/AgreeButton.stories.js index 87de1f9..96aa4ef 100644 --- a/stories/client-deliberation/AgreeButton.stories.js +++ b/stories/UT-HAI/client-deliberation/AgreeButton.stories.js @@ -1,10 +1,9 @@ import React from 'react' -import AgreeButton from '../../codebases/UT-HAI/client-deliberation/src/components/AgreeButton' +import AgreeButton from '../../../codebases/UT-HAI/client-deliberation/src/components/AgreeButton' import { action } from '@storybook/addon-actions' -import { withDelibThemeUi } from '../../.storybook/decorators' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/AgreeButton', component: AgreeButton, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/ArrowIcon.stories.js b/stories/UT-HAI/client-deliberation/ArrowIcon.stories.js similarity index 57% rename from stories/client-deliberation/ArrowIcon.stories.js rename to stories/UT-HAI/client-deliberation/ArrowIcon.stories.js index ab0a29b..3c4d8db 100644 --- a/stories/client-deliberation/ArrowIcon.stories.js +++ b/stories/UT-HAI/client-deliberation/ArrowIcon.stories.js @@ -1,8 +1,7 @@ import React from 'react' -import ArrowIcon from '../../codebases/UT-HAI/client-deliberation/src/components/ArrowIcon' +import ArrowIcon from '../../../codebases/UT-HAI/client-deliberation/src/components/ArrowIcon' export default { - title: 'Client-Deliberation/ArrowIcon', component: ArrowIcon, } diff --git a/stories/client-deliberation/ConversationUI.stories.js b/stories/UT-HAI/client-deliberation/ConversationUI.stories.js similarity index 51% rename from stories/client-deliberation/ConversationUI.stories.js rename to stories/UT-HAI/client-deliberation/ConversationUI.stories.js index 5fdda3d..6902eb7 100644 --- a/stories/client-deliberation/ConversationUI.stories.js +++ b/stories/UT-HAI/client-deliberation/ConversationUI.stories.js @@ -1,9 +1,8 @@ import React from 'react' -import ConversationUI from '../../codebases/UT-HAI/client-deliberation/src/components/ConversationUI' -import { withDelibThemeUi } from '../../.storybook/decorators' +import ConversationUI from '../../../codebases/UT-HAI/client-deliberation/src/components/ConversationUI' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/ConversationUI', component: ConversationUI, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/ConversationUITutorial.stories.js b/stories/UT-HAI/client-deliberation/ConversationUITutorial.stories.js similarity index 50% rename from stories/client-deliberation/ConversationUITutorial.stories.js rename to stories/UT-HAI/client-deliberation/ConversationUITutorial.stories.js index d3e6a73..542b232 100644 --- a/stories/client-deliberation/ConversationUITutorial.stories.js +++ b/stories/UT-HAI/client-deliberation/ConversationUITutorial.stories.js @@ -1,9 +1,8 @@ import React from 'react' -import ConversationUITutorial from '../../codebases/UT-HAI/client-deliberation/src/components/ConversationUITutorial' -import { withDelibThemeUi } from '../../.storybook/decorators' +import ConversationUITutorial from '../../../codebases/UT-HAI/client-deliberation/src/components/ConversationUITutorial' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/ConversationUITutorial', component: ConversationUITutorial, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/Deliberation.stories.js b/stories/UT-HAI/client-deliberation/Deliberation.stories.js similarity index 52% rename from stories/client-deliberation/Deliberation.stories.js rename to stories/UT-HAI/client-deliberation/Deliberation.stories.js index d0199d0..4f09750 100644 --- a/stories/client-deliberation/Deliberation.stories.js +++ b/stories/UT-HAI/client-deliberation/Deliberation.stories.js @@ -1,9 +1,8 @@ import React from 'react' -import Deliberation from '../../codebases/UT-HAI/client-deliberation/src/components/Deliberation' -import { withDelibThemeUi } from '../../.storybook/decorators' +import Deliberation from '../../../codebases/UT-HAI/client-deliberation/src/components/Deliberation' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/Deliberation', component: Deliberation, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/DisagreeButton.stories.js b/stories/UT-HAI/client-deliberation/DisagreeButton.stories.js similarity index 58% rename from stories/client-deliberation/DisagreeButton.stories.js rename to stories/UT-HAI/client-deliberation/DisagreeButton.stories.js index 4bff199..b4d5de3 100644 --- a/stories/client-deliberation/DisagreeButton.stories.js +++ b/stories/UT-HAI/client-deliberation/DisagreeButton.stories.js @@ -1,10 +1,9 @@ import React from 'react' -import DisagreeButton from '../../codebases/UT-HAI/client-deliberation/src/components/DisagreeButton' +import DisagreeButton from '../../../codebases/UT-HAI/client-deliberation/src/components/DisagreeButton' import { action } from '@storybook/addon-actions' -import { withDelibThemeUi } from '../../.storybook/decorators' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/DisagreeButton', component: DisagreeButton, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/DoesNotExist.stories.js b/stories/UT-HAI/client-deliberation/DoesNotExist.stories.js similarity index 54% rename from stories/client-deliberation/DoesNotExist.stories.js rename to stories/UT-HAI/client-deliberation/DoesNotExist.stories.js index b95b907..fa04454 100644 --- a/stories/client-deliberation/DoesNotExist.stories.js +++ b/stories/UT-HAI/client-deliberation/DoesNotExist.stories.js @@ -1,9 +1,8 @@ import React from 'react' -import DoesNotExist from '../../codebases/UT-HAI/client-deliberation/src/components/DoesNotExist' -import { withDelibThemeUi } from '../../.storybook/decorators' +import DoesNotExist from '../../../codebases/UT-HAI/client-deliberation/src/components/DoesNotExist' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/DoesNotExist', component: DoesNotExist, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/HexLogo.stories.js b/stories/UT-HAI/client-deliberation/HexLogo.stories.js similarity index 52% rename from stories/client-deliberation/HexLogo.stories.js rename to stories/UT-HAI/client-deliberation/HexLogo.stories.js index c442bba..93a55d7 100644 --- a/stories/client-deliberation/HexLogo.stories.js +++ b/stories/UT-HAI/client-deliberation/HexLogo.stories.js @@ -1,9 +1,8 @@ import React from 'react' -import HexLogo from '../../codebases/UT-HAI/client-deliberation/src/components/hexLogo' -import { withDelibThemeUi } from '../../.storybook/decorators' +import HexLogo from '../../../codebases/UT-HAI/client-deliberation/src/components/hexLogo' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/HexLogo', component: HexLogo, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/IndividualDeliberation.stories.js b/stories/UT-HAI/client-deliberation/IndividualDeliberation.stories.js similarity index 61% rename from stories/client-deliberation/IndividualDeliberation.stories.js rename to stories/UT-HAI/client-deliberation/IndividualDeliberation.stories.js index 62ec5f7..7c28b4d 100644 --- a/stories/client-deliberation/IndividualDeliberation.stories.js +++ b/stories/UT-HAI/client-deliberation/IndividualDeliberation.stories.js @@ -1,9 +1,8 @@ import React from 'react' -import IndividualDeliberation from '../../codebases/UT-HAI/client-deliberation/src/components/IndividualDeliberation' -import { withDelibThemeUi } from '../../.storybook/decorators' +import IndividualDeliberation from '../../../codebases/UT-HAI/client-deliberation/src/components/IndividualDeliberation' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/IndividualDeliberation', component: IndividualDeliberation, decorators: [withDelibThemeUi], argTypes: { diff --git a/stories/client-deliberation/IntegrateBox.stories.js b/stories/UT-HAI/client-deliberation/IntegrateBox.stories.js similarity index 79% rename from stories/client-deliberation/IntegrateBox.stories.js rename to stories/UT-HAI/client-deliberation/IntegrateBox.stories.js index f082b38..15722d2 100644 --- a/stories/client-deliberation/IntegrateBox.stories.js +++ b/stories/UT-HAI/client-deliberation/IntegrateBox.stories.js @@ -1,9 +1,8 @@ import React from 'react' -import IntegrateBox from '../../codebases/UT-HAI/client-deliberation/src/components/IntegrateBox' -import { withDelibThemeUi } from '../../.storybook/decorators' +import IntegrateBox from '../../../codebases/UT-HAI/client-deliberation/src/components/IntegrateBox' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/IntegrateBox', component: IntegrateBox, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/IntegrateBoxAndConclusion.stories.js b/stories/UT-HAI/client-deliberation/IntegrateBoxAndConclusion.stories.js similarity index 77% rename from stories/client-deliberation/IntegrateBoxAndConclusion.stories.js rename to stories/UT-HAI/client-deliberation/IntegrateBoxAndConclusion.stories.js index 0c6ca8c..b9cf465 100644 --- a/stories/client-deliberation/IntegrateBoxAndConclusion.stories.js +++ b/stories/UT-HAI/client-deliberation/IntegrateBoxAndConclusion.stories.js @@ -1,10 +1,9 @@ import React from 'react' -import IntegrateBoxAndConclusion from '../../codebases/UT-HAI/client-deliberation/src/components/IntegrateBoxAndConclusion' -import { withDelibThemeUi } from '../../.storybook/decorators' +import IntegrateBoxAndConclusion from '../../../codebases/UT-HAI/client-deliberation/src/components/IntegrateBoxAndConclusion' +import { withDelibThemeUi } from '../../../.storybook/decorators' import { Default as DefaultIntegrateBoxStory } from './IntegrateBox.stories' export default { - title: 'Client-Deliberation/IntegrateBoxAndConclusion', component: IntegrateBoxAndConclusion, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/IntegrateLink.stories.js b/stories/UT-HAI/client-deliberation/IntegrateLink.stories.js similarity index 58% rename from stories/client-deliberation/IntegrateLink.stories.js rename to stories/UT-HAI/client-deliberation/IntegrateLink.stories.js index 83ea03f..4a19eab 100644 --- a/stories/client-deliberation/IntegrateLink.stories.js +++ b/stories/UT-HAI/client-deliberation/IntegrateLink.stories.js @@ -1,9 +1,8 @@ import React from 'react' -import IntegrateLink from '../../codebases/UT-HAI/client-deliberation/src/components/IntegrateLink' -import { withDelibThemeUi } from '../../.storybook/decorators' +import IntegrateLink from '../../../codebases/UT-HAI/client-deliberation/src/components/IntegrateLink' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/IntegrateLink', component: IntegrateLink, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/InteriorHeader.stories.js b/stories/UT-HAI/client-deliberation/InteriorHeader.stories.js similarity index 61% rename from stories/client-deliberation/InteriorHeader.stories.js rename to stories/UT-HAI/client-deliberation/InteriorHeader.stories.js index be71e13..4b3b6c0 100644 --- a/stories/client-deliberation/InteriorHeader.stories.js +++ b/stories/UT-HAI/client-deliberation/InteriorHeader.stories.js @@ -1,11 +1,10 @@ import React from 'react' -import InteriorHeader from '../../codebases/UT-HAI/client-deliberation/src/components/interior-header' -import { withDelibThemeUi } from '../../.storybook/decorators' +import InteriorHeader from '../../../codebases/UT-HAI/client-deliberation/src/components/interior-header' +import { withDelibThemeUi } from '../../../.storybook/decorators' import { withRouter } from 'storybook-addon-remix-react-router' export default { - title: 'Client-Deliberation/InteriorHeader', component: InteriorHeader, decorators: [withDelibThemeUi, withRouter], } diff --git a/stories/client-deliberation/Legal.stories.js b/stories/UT-HAI/client-deliberation/Legal.stories.js similarity index 54% rename from stories/client-deliberation/Legal.stories.js rename to stories/UT-HAI/client-deliberation/Legal.stories.js index 955f22e..773b0b2 100644 --- a/stories/client-deliberation/Legal.stories.js +++ b/stories/UT-HAI/client-deliberation/Legal.stories.js @@ -1,9 +1,8 @@ import React from 'react' -import Legal from '../../codebases/UT-HAI/client-deliberation/src/components/Legal' -import { withDelibThemeUi } from '../../.storybook/decorators' +import Legal from '../../../codebases/UT-HAI/client-deliberation/src/components/Legal' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/Legal', component: Legal, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/Loading.stories.js b/stories/UT-HAI/client-deliberation/Loading.stories.js similarity index 60% rename from stories/client-deliberation/Loading.stories.js rename to stories/UT-HAI/client-deliberation/Loading.stories.js index b9c4999..3d68a68 100644 --- a/stories/client-deliberation/Loading.stories.js +++ b/stories/UT-HAI/client-deliberation/Loading.stories.js @@ -1,10 +1,9 @@ import React from 'react' -import Loading from '../../codebases/UT-HAI/client-deliberation/src/components/Loading' +import Loading from '../../../codebases/UT-HAI/client-deliberation/src/components/Loading' import { action } from '@storybook/addon-actions' -import { withDelibThemeUi } from '../../.storybook/decorators' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/Loading', component: Loading, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/Lock.stories.js b/stories/UT-HAI/client-deliberation/Lock.stories.js similarity index 63% rename from stories/client-deliberation/Lock.stories.js rename to stories/UT-HAI/client-deliberation/Lock.stories.js index f9c8d99..0bca7ba 100644 --- a/stories/client-deliberation/Lock.stories.js +++ b/stories/UT-HAI/client-deliberation/Lock.stories.js @@ -1,8 +1,7 @@ import React from 'react' -import Lock from '../../codebases/UT-HAI/client-deliberation/src/components/Lock' +import Lock from '../../../codebases/UT-HAI/client-deliberation/src/components/Lock' export default { - title: 'Client-Deliberation/Lock', component: Lock, } diff --git a/stories/client-deliberation/ObtainLink.stories.js b/stories/UT-HAI/client-deliberation/ObtainLink.stories.js similarity index 52% rename from stories/client-deliberation/ObtainLink.stories.js rename to stories/UT-HAI/client-deliberation/ObtainLink.stories.js index daac5d7..aff46c1 100644 --- a/stories/client-deliberation/ObtainLink.stories.js +++ b/stories/UT-HAI/client-deliberation/ObtainLink.stories.js @@ -1,9 +1,8 @@ import React from 'react' -import ObtainLink from '../../codebases/UT-HAI/client-deliberation/src/components/ObtainLink' -import { withDelibThemeUi } from '../../.storybook/decorators' +import ObtainLink from '../../../codebases/UT-HAI/client-deliberation/src/components/ObtainLink' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/ObtainLink', component: ObtainLink, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/OpinionContainer.stories.js b/stories/UT-HAI/client-deliberation/OpinionContainer.stories.js similarity index 61% rename from stories/client-deliberation/OpinionContainer.stories.js rename to stories/UT-HAI/client-deliberation/OpinionContainer.stories.js index 6014195..07a6b2a 100644 --- a/stories/client-deliberation/OpinionContainer.stories.js +++ b/stories/UT-HAI/client-deliberation/OpinionContainer.stories.js @@ -1,9 +1,8 @@ import React from 'react' -import OpinionContainer from '../../codebases/UT-HAI/client-deliberation/src/components/OpinionContainer' -import { withDelibThemeUi } from '../../.storybook/decorators' +import OpinionContainer from '../../../codebases/UT-HAI/client-deliberation/src/components/OpinionContainer' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/OpinionContainer', component: OpinionContainer, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/Overview.mdx b/stories/UT-HAI/client-deliberation/Overview.mdx similarity index 100% rename from stories/client-deliberation/Overview.mdx rename to stories/UT-HAI/client-deliberation/Overview.mdx diff --git a/stories/client-deliberation/PassButton.stories.js b/stories/UT-HAI/client-deliberation/PassButton.stories.js similarity index 59% rename from stories/client-deliberation/PassButton.stories.js rename to stories/UT-HAI/client-deliberation/PassButton.stories.js index 2320794..fd7cf33 100644 --- a/stories/client-deliberation/PassButton.stories.js +++ b/stories/UT-HAI/client-deliberation/PassButton.stories.js @@ -1,10 +1,9 @@ import React from 'react' -import PassButton from '../../codebases/UT-HAI/client-deliberation/src/components/PassButton' +import PassButton from '../../../codebases/UT-HAI/client-deliberation/src/components/PassButton' import { action } from '@storybook/addon-actions' -import { withDelibThemeUi } from '../../.storybook/decorators' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/PassButton', component: PassButton, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/PolisButton.stories.js b/stories/UT-HAI/client-deliberation/PolisButton.stories.js similarity index 61% rename from stories/client-deliberation/PolisButton.stories.js rename to stories/UT-HAI/client-deliberation/PolisButton.stories.js index 1985acf..b2d31fa 100644 --- a/stories/client-deliberation/PolisButton.stories.js +++ b/stories/UT-HAI/client-deliberation/PolisButton.stories.js @@ -1,10 +1,9 @@ import React from 'react' -import PolisButton from '../../codebases/UT-HAI/client-deliberation/src/components/PolisButton' +import PolisButton from '../../../codebases/UT-HAI/client-deliberation/src/components/PolisButton' import { action } from '@storybook/addon-actions' -import { withDelibThemeUi } from '../../.storybook/decorators' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/PolisButton', component: PolisButton, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/Sidebar.stories.js b/stories/UT-HAI/client-deliberation/Sidebar.stories.js similarity index 75% rename from stories/client-deliberation/Sidebar.stories.js rename to stories/UT-HAI/client-deliberation/Sidebar.stories.js index 59fa96a..693d842 100644 --- a/stories/client-deliberation/Sidebar.stories.js +++ b/stories/UT-HAI/client-deliberation/Sidebar.stories.js @@ -1,10 +1,9 @@ import React from 'react' -import Sidebar from '../../codebases/UT-HAI/client-deliberation/src/components/Sidebar' -import { withDelibThemeUi } from '../../.storybook/decorators' +import Sidebar from '../../../codebases/UT-HAI/client-deliberation/src/components/Sidebar' +import { withDelibThemeUi } from '../../../.storybook/decorators' import { action } from '@storybook/addon-actions' export default { - title: 'Client-Deliberation/Sidebar', component: Sidebar, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/SidebarModule.stories.js b/stories/UT-HAI/client-deliberation/SidebarModule.stories.js similarity index 64% rename from stories/client-deliberation/SidebarModule.stories.js rename to stories/UT-HAI/client-deliberation/SidebarModule.stories.js index ed0ecba..d73c722 100644 --- a/stories/client-deliberation/SidebarModule.stories.js +++ b/stories/UT-HAI/client-deliberation/SidebarModule.stories.js @@ -1,11 +1,10 @@ import React from 'react' -import SidebarModule from '../../codebases/UT-HAI/client-deliberation/src/components/SidebarModule' -import Sidebar from '../../codebases/UT-HAI/client-deliberation/src/components/Sidebar' -import { withDelibThemeUi } from '../../.storybook/decorators' +import SidebarModule from '../../../codebases/UT-HAI/client-deliberation/src/components/SidebarModule' +import Sidebar from '../../../codebases/UT-HAI/client-deliberation/src/components/Sidebar' +import { withDelibThemeUi } from '../../../.storybook/decorators' import { action } from '@storybook/addon-actions' export default { - title: 'Client-Deliberation/SidebarModule', component: SidebarModule, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/StatementButton.stories.js b/stories/UT-HAI/client-deliberation/StatementButton.stories.js similarity index 58% rename from stories/client-deliberation/StatementButton.stories.js rename to stories/UT-HAI/client-deliberation/StatementButton.stories.js index 3aa27b7..d75a5a2 100644 --- a/stories/client-deliberation/StatementButton.stories.js +++ b/stories/UT-HAI/client-deliberation/StatementButton.stories.js @@ -1,10 +1,9 @@ import React from 'react' -import StatementButton from '../../codebases/UT-HAI/client-deliberation/src/components/StatementButton' +import StatementButton from '../../../codebases/UT-HAI/client-deliberation/src/components/StatementButton' import { action } from '@storybook/addon-actions' -import { withDelibThemeUi } from '../../.storybook/decorators' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/StatementButton', component: StatementButton, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/StatementForm.stories.js b/stories/UT-HAI/client-deliberation/StatementForm.stories.js similarity index 66% rename from stories/client-deliberation/StatementForm.stories.js rename to stories/UT-HAI/client-deliberation/StatementForm.stories.js index 23e1d55..986a23a 100644 --- a/stories/client-deliberation/StatementForm.stories.js +++ b/stories/UT-HAI/client-deliberation/StatementForm.stories.js @@ -1,11 +1,10 @@ import React from 'react' -import StatementForm from '../../codebases/UT-HAI/client-deliberation/src/components/StatementForm' +import StatementForm from '../../../codebases/UT-HAI/client-deliberation/src/components/StatementForm' import { action } from '@storybook/addon-actions' -import { withDelibThemeUi } from '../../.storybook/decorators' -import socialAvatar from '../../.storybook/assets/avatar-sample.jpg' +import { withDelibThemeUi } from '../../../.storybook/decorators' +import socialAvatar from '../../../.storybook/assets/avatar-sample.jpg' export default { - title: 'Client-Deliberation/StatementForm', component: StatementForm, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/StatementFormTutorial.stories.js b/stories/UT-HAI/client-deliberation/StatementFormTutorial.stories.js similarity index 50% rename from stories/client-deliberation/StatementFormTutorial.stories.js rename to stories/UT-HAI/client-deliberation/StatementFormTutorial.stories.js index 9e70e13..28a7f5e 100644 --- a/stories/client-deliberation/StatementFormTutorial.stories.js +++ b/stories/UT-HAI/client-deliberation/StatementFormTutorial.stories.js @@ -1,9 +1,8 @@ import React from 'react' -import StatementFormTutorial from '../../codebases/UT-HAI/client-deliberation/src/components/StatementFormTutorial' -import { withDelibThemeUi } from '../../.storybook/decorators' +import StatementFormTutorial from '../../../codebases/UT-HAI/client-deliberation/src/components/StatementFormTutorial' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/StatementFormTutorial', component: StatementFormTutorial, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/StatementUI.stories.js b/stories/UT-HAI/client-deliberation/StatementUI.stories.js similarity index 65% rename from stories/client-deliberation/StatementUI.stories.js rename to stories/UT-HAI/client-deliberation/StatementUI.stories.js index e5d436a..6b74454 100644 --- a/stories/client-deliberation/StatementUI.stories.js +++ b/stories/UT-HAI/client-deliberation/StatementUI.stories.js @@ -1,12 +1,11 @@ import React from 'react' -import StatementUI from '../../codebases/UT-HAI/client-deliberation/src/components/StatementUI' -import StatementUIContainer from '../../codebases/UT-HAI/client-deliberation/src/components/StatementUIContainer' +import StatementUI from '../../../codebases/UT-HAI/client-deliberation/src/components/StatementUI' +import StatementUIContainer from '../../../codebases/UT-HAI/client-deliberation/src/components/StatementUIContainer' import { action } from '@storybook/addon-actions' -import socialAvatar from '../../.storybook/assets/avatar-sample.jpg' -import { withDelibThemeUi } from '../../.storybook/decorators' +import socialAvatar from '../../../.storybook/assets/avatar-sample.jpg' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/StatementUI', component: StatementUI, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/Subtitle.stories.js b/stories/UT-HAI/client-deliberation/Subtitle.stories.js similarity index 55% rename from stories/client-deliberation/Subtitle.stories.js rename to stories/UT-HAI/client-deliberation/Subtitle.stories.js index 84b7ded..736987b 100644 --- a/stories/client-deliberation/Subtitle.stories.js +++ b/stories/UT-HAI/client-deliberation/Subtitle.stories.js @@ -1,9 +1,8 @@ import React from 'react' -import Subtitle from '../../codebases/UT-HAI/client-deliberation/src/components/Subtitle' -import { withDelibThemeUi } from '../../.storybook/decorators' +import Subtitle from '../../../codebases/UT-HAI/client-deliberation/src/components/Subtitle' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/Subtitle', component: Subtitle, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/Title.stories.js b/stories/UT-HAI/client-deliberation/Title.stories.js similarity index 55% rename from stories/client-deliberation/Title.stories.js rename to stories/UT-HAI/client-deliberation/Title.stories.js index f8826a9..6f6593e 100644 --- a/stories/client-deliberation/Title.stories.js +++ b/stories/UT-HAI/client-deliberation/Title.stories.js @@ -1,9 +1,8 @@ import React from 'react' -import Title from '../../codebases/UT-HAI/client-deliberation/src/components/Title' -import { withDelibThemeUi } from '../../.storybook/decorators' +import Title from '../../../codebases/UT-HAI/client-deliberation/src/components/Title' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/Title', component: Title, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/TreeSummary.stories.js b/stories/UT-HAI/client-deliberation/TreeSummary.stories.js similarity index 68% rename from stories/client-deliberation/TreeSummary.stories.js rename to stories/UT-HAI/client-deliberation/TreeSummary.stories.js index 3b3253c..7662ae8 100644 --- a/stories/client-deliberation/TreeSummary.stories.js +++ b/stories/UT-HAI/client-deliberation/TreeSummary.stories.js @@ -1,10 +1,9 @@ import React from 'react' -import TreeSummary from '../../codebases/UT-HAI/client-deliberation/src/components/TreeSummary' +import TreeSummary from '../../../codebases/UT-HAI/client-deliberation/src/components/TreeSummary' import { action } from '@storybook/addon-actions' -import { withDelibThemeUi } from '../../.storybook/decorators' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/TreeSummary', component: TreeSummary, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/Tutorial.stories.js b/stories/UT-HAI/client-deliberation/Tutorial.stories.js similarity index 73% rename from stories/client-deliberation/Tutorial.stories.js rename to stories/UT-HAI/client-deliberation/Tutorial.stories.js index a43d8f5..5d0dbb8 100644 --- a/stories/client-deliberation/Tutorial.stories.js +++ b/stories/UT-HAI/client-deliberation/Tutorial.stories.js @@ -1,10 +1,9 @@ import React from 'react' -import Tutorial from '../../codebases/UT-HAI/client-deliberation/src/components/Tutorial' +import Tutorial from '../../../codebases/UT-HAI/client-deliberation/src/components/Tutorial' import { action } from '@storybook/addon-actions' -import { withDelibThemeUi } from '../../.storybook/decorators' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/Tutorial', component: Tutorial, decorators: [withDelibThemeUi], argTypes: { diff --git a/stories/client-deliberation/TutorialBackground.stories.js b/stories/UT-HAI/client-deliberation/TutorialBackground.stories.js similarity index 50% rename from stories/client-deliberation/TutorialBackground.stories.js rename to stories/UT-HAI/client-deliberation/TutorialBackground.stories.js index 4ed5fac..f3da1b4 100644 --- a/stories/client-deliberation/TutorialBackground.stories.js +++ b/stories/UT-HAI/client-deliberation/TutorialBackground.stories.js @@ -1,9 +1,8 @@ import React from 'react' -import TutorialBackground from '../../codebases/UT-HAI/client-deliberation/src/components/TutorialBackground' -import { withDelibThemeUi } from '../../.storybook/decorators' +import TutorialBackground from '../../../codebases/UT-HAI/client-deliberation/src/components/TutorialBackground' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/TutorialBackground', component: TutorialBackground, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/TutorialBox.stories.js b/stories/UT-HAI/client-deliberation/TutorialBox.stories.js similarity index 52% rename from stories/client-deliberation/TutorialBox.stories.js rename to stories/UT-HAI/client-deliberation/TutorialBox.stories.js index 652e76f..40dbcdc 100644 --- a/stories/client-deliberation/TutorialBox.stories.js +++ b/stories/UT-HAI/client-deliberation/TutorialBox.stories.js @@ -1,9 +1,8 @@ import React from 'react' -import TutorialBox from '../../codebases/UT-HAI/client-deliberation/src/components/TutorialBox' -import { withDelibThemeUi } from '../../.storybook/decorators' +import TutorialBox from '../../../codebases/UT-HAI/client-deliberation/src/components/TutorialBox' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/TutorialBox', component: TutorialBox, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/Tutorials.stories.js b/stories/UT-HAI/client-deliberation/Tutorials.stories.js similarity index 69% rename from stories/client-deliberation/Tutorials.stories.js rename to stories/UT-HAI/client-deliberation/Tutorials.stories.js index 896b3cb..32d0ad5 100644 --- a/stories/client-deliberation/Tutorials.stories.js +++ b/stories/UT-HAI/client-deliberation/Tutorials.stories.js @@ -1,10 +1,9 @@ import React from 'react' -import Tutorials from '../../codebases/UT-HAI/client-deliberation/src/components/Tutorials' +import Tutorials from '../../../codebases/UT-HAI/client-deliberation/src/components/Tutorials' import { action } from '@storybook/addon-actions' -import { withDelibThemeUi } from '../../.storybook/decorators' +import { withDelibThemeUi } from '../../../.storybook/decorators' -export default { - title: 'Client-Deliberation/Tutorials', +export default { component: Tutorials, decorators: [withDelibThemeUi], argTypes: { diff --git a/stories/client-deliberation/TutorialsBox.stories.js b/stories/UT-HAI/client-deliberation/TutorialsBox.stories.js similarity index 52% rename from stories/client-deliberation/TutorialsBox.stories.js rename to stories/UT-HAI/client-deliberation/TutorialsBox.stories.js index 80349f7..f5912bd 100644 --- a/stories/client-deliberation/TutorialsBox.stories.js +++ b/stories/UT-HAI/client-deliberation/TutorialsBox.stories.js @@ -1,9 +1,8 @@ import React from 'react' -import TutorialsBox from '../../codebases/UT-HAI/client-deliberation/src/components/TutorialsBox' -import { withDelibThemeUi } from '../../.storybook/decorators' +import TutorialsBox from '../../../codebases/UT-HAI/client-deliberation/src/components/TutorialsBox' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/TutorialsBox', component: TutorialsBox, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/UnderstandAI.stories.js b/stories/UT-HAI/client-deliberation/UnderstandAI.stories.js similarity index 52% rename from stories/client-deliberation/UnderstandAI.stories.js rename to stories/UT-HAI/client-deliberation/UnderstandAI.stories.js index bd93d3c..b63c9a5 100644 --- a/stories/client-deliberation/UnderstandAI.stories.js +++ b/stories/UT-HAI/client-deliberation/UnderstandAI.stories.js @@ -1,9 +1,8 @@ import React from 'react' -import UnderstandAI from '../../codebases/UT-HAI/client-deliberation/src/components/UnderstandAI' -import { withDelibThemeUi } from '../../.storybook/decorators' +import UnderstandAI from '../../../codebases/UT-HAI/client-deliberation/src/components/UnderstandAI' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/UnderstandAI', component: UnderstandAI, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/VisualisationTutorial.stories.js b/stories/UT-HAI/client-deliberation/VisualisationTutorial.stories.js similarity index 50% rename from stories/client-deliberation/VisualisationTutorial.stories.js rename to stories/UT-HAI/client-deliberation/VisualisationTutorial.stories.js index 2ca7f01..bcabfc9 100644 --- a/stories/client-deliberation/VisualisationTutorial.stories.js +++ b/stories/UT-HAI/client-deliberation/VisualisationTutorial.stories.js @@ -1,9 +1,8 @@ import React from 'react' -import VisualisationTutorial from '../../codebases/UT-HAI/client-deliberation/src/components/VisualisationTutorial' -import { withDelibThemeUi } from '../../.storybook/decorators' +import VisualisationTutorial from '../../../codebases/UT-HAI/client-deliberation/src/components/VisualisationTutorial' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/VisualisationTutorial', component: VisualisationTutorial, decorators: [withDelibThemeUi], } diff --git a/stories/client-deliberation/Visualization.stories.js b/stories/UT-HAI/client-deliberation/Visualization.stories.js similarity index 52% rename from stories/client-deliberation/Visualization.stories.js rename to stories/UT-HAI/client-deliberation/Visualization.stories.js index 285acf9..58d9626 100644 --- a/stories/client-deliberation/Visualization.stories.js +++ b/stories/UT-HAI/client-deliberation/Visualization.stories.js @@ -1,9 +1,8 @@ import React from 'react' -import Visualization from '../../codebases/UT-HAI/client-deliberation/src/components/Visualization' -import { withDelibThemeUi } from '../../.storybook/decorators' +import Visualization from '../../../codebases/UT-HAI/client-deliberation/src/components/Visualization' +import { withDelibThemeUi } from '../../../.storybook/decorators' export default { - title: 'Client-Deliberation/Visualization', component: Visualization, decorators: [withDelibThemeUi], } From 222c16476f7942246ca71afc5cfaf82cba3177eb Mon Sep 17 00:00:00 2001 From: Patrick Connolly <patrick.c.connolly@gmail.com> Date: Fri, 11 Oct 2024 21:31:32 -0400 Subject: [PATCH 24/24] Got barebones stories working for most of remaining UT-HAI components. --- .../{Overview.mdx => 1-Overview.mdx} | 6 ++++ .../ConversationUI.stories.js | 1 + .../ConversationUITutorial.stories.js | 1 + .../Deliberation.stories.js | 6 ++-- .../client-deliberation/Legal.stories.js | 17 ++++++++-- .../StatementFormTutorial.stories.js | 12 +++++-- .../client-deliberation/Tutorial.stories.js | 12 ++++--- .../TutorialBackground.stories.js | 31 +++++++++++++++++-- .../TutorialBox.stories.js | 17 ++++++++-- .../TutorialsBox.stories.js | 14 +++++++-- .../UnderstandAI.stories.js | 17 ++++++++-- .../VisualisationTutorial.stories.js | 1 + .../Visualization.stories.js | 1 + 13 files changed, 118 insertions(+), 18 deletions(-) rename stories/UT-HAI/client-deliberation/{Overview.mdx => 1-Overview.mdx} (83%) diff --git a/stories/UT-HAI/client-deliberation/Overview.mdx b/stories/UT-HAI/client-deliberation/1-Overview.mdx similarity index 83% rename from stories/UT-HAI/client-deliberation/Overview.mdx rename to stories/UT-HAI/client-deliberation/1-Overview.mdx index 39f1ddf..60b51f3 100644 --- a/stories/UT-HAI/client-deliberation/Overview.mdx +++ b/stories/UT-HAI/client-deliberation/1-Overview.mdx @@ -1,3 +1,8 @@ +import LinkTo from '@storybook/addon-links/react'; +import { Meta } from '@storybook/blocks'; + +<Meta title="UT-HAI/client-deliberation/Overview" /> + # Overview: Client-Deliberation This section presents components from [an unofficial fork of Polis][repo-dev] maintained by the University of Texas Austin's [Human-AI Interaction Lab][UT-HAI]. @@ -13,6 +18,7 @@ This section presents components from [an unofficial fork of Polis][repo-dev] ma - `Tutorial`: an additional in-progress branch building on `HAI-dev`, with many additional onboarding- and AI-based components. - In this storybook, we present components from the full `Tutorial` branch. - The UT-HAI repo is active and seems to exist for an ongoing research project. +- <LinkTo kind="UT-HAI/client-deliberation/Deliberation" story="Default">`Deliberation` component</LinkTo> is where the bulk of the new components are wired up. [UT-HAI]: https://hai.ischool.utexas.edu/ diff --git a/stories/UT-HAI/client-deliberation/ConversationUI.stories.js b/stories/UT-HAI/client-deliberation/ConversationUI.stories.js index 6902eb7..bd3e370 100644 --- a/stories/UT-HAI/client-deliberation/ConversationUI.stories.js +++ b/stories/UT-HAI/client-deliberation/ConversationUI.stories.js @@ -7,6 +7,7 @@ export default { decorators: [withDelibThemeUi], } +// Needs to have "route params" passed in to work. const Template = (args) => <div>Not Yet Implemented</div> export const Default = Template.bind({}) diff --git a/stories/UT-HAI/client-deliberation/ConversationUITutorial.stories.js b/stories/UT-HAI/client-deliberation/ConversationUITutorial.stories.js index 542b232..baf8eab 100644 --- a/stories/UT-HAI/client-deliberation/ConversationUITutorial.stories.js +++ b/stories/UT-HAI/client-deliberation/ConversationUITutorial.stories.js @@ -7,6 +7,7 @@ export default { decorators: [withDelibThemeUi], } +// Needs to have "route params" passed in to work. const Template = (args) => <div>Not Yet Implemented</div> export const Default = Template.bind({}) diff --git a/stories/UT-HAI/client-deliberation/Deliberation.stories.js b/stories/UT-HAI/client-deliberation/Deliberation.stories.js index 4f09750..3f94aae 100644 --- a/stories/UT-HAI/client-deliberation/Deliberation.stories.js +++ b/stories/UT-HAI/client-deliberation/Deliberation.stories.js @@ -7,7 +7,9 @@ export default { decorators: [withDelibThemeUi], } -const Template = (args) => <div>Not Yet Implemented</div> +const Template = (args) => <Deliberation {...args} /> export const Default = Template.bind({}) -Default.args = {} +Default.args = { + tutorialprogress: 0, +} diff --git a/stories/UT-HAI/client-deliberation/Legal.stories.js b/stories/UT-HAI/client-deliberation/Legal.stories.js index 773b0b2..dbe7661 100644 --- a/stories/UT-HAI/client-deliberation/Legal.stories.js +++ b/stories/UT-HAI/client-deliberation/Legal.stories.js @@ -5,9 +5,22 @@ import { withDelibThemeUi } from '../../../.storybook/decorators' export default { component: Legal, decorators: [withDelibThemeUi], + argTypes: { + currentIndex: { + options: [7, 8, 9], + control: { type: "inline-radio" }, + }, + }, } -const Template = (args) => <div>Not Yet Implemented</div> +const Template = (args) => <Legal {...args} /> export const Default = Template.bind({}) -Default.args = {} +Default.args = { + currentIndex: 7, +} + +export const ZoomStep = Template.bind({}) +ZoomStep.args = { + currentIndex: 9, +} diff --git a/stories/UT-HAI/client-deliberation/StatementFormTutorial.stories.js b/stories/UT-HAI/client-deliberation/StatementFormTutorial.stories.js index 28a7f5e..07c3d07 100644 --- a/stories/UT-HAI/client-deliberation/StatementFormTutorial.stories.js +++ b/stories/UT-HAI/client-deliberation/StatementFormTutorial.stories.js @@ -1,13 +1,21 @@ import React from 'react' import StatementFormTutorial from '../../../codebases/UT-HAI/client-deliberation/src/components/StatementFormTutorial' import { withDelibThemeUi } from '../../../.storybook/decorators' +import socialAvatar from '../../../.storybook/assets/avatar-sample.jpg' export default { component: StatementFormTutorial, decorators: [withDelibThemeUi], } -const Template = (args) => <div>Not Yet Implemented</div> +const Template = (args) => <StatementFormTutorial {...args} /> export const Default = Template.bind({}) -Default.args = {} +Default.args = { + myAvatar: null, +} + +export const KnownUser = Template.bind({}) +KnownUser.args = { + myAvatar: socialAvatar, +} diff --git a/stories/UT-HAI/client-deliberation/Tutorial.stories.js b/stories/UT-HAI/client-deliberation/Tutorial.stories.js index 5d0dbb8..912c796 100644 --- a/stories/UT-HAI/client-deliberation/Tutorial.stories.js +++ b/stories/UT-HAI/client-deliberation/Tutorial.stories.js @@ -8,6 +8,10 @@ export default { decorators: [withDelibThemeUi], argTypes: { currentIndexpage: { + options: [0, 1, 2], + control: { type: 'inline-radio' }, + }, + tutorialprogress: { options: [0, 1, 2, 3], control: { type: 'inline-radio' }, }, @@ -18,10 +22,10 @@ const Template = (args) => <Tutorial {...args} /> export const Default = Template.bind({}) Default.args = { - email: null, - currentIndex: 0, tutorialprogress: 0, - setCurrentIndex: action("Set index!"), currentIndexpage: 0, - setnextButtonState: () => {}, + email: "foo@example.com", + currentIndex: 1, + setCurrentIndex: action("setCurrentIndex!"), + setnextButtonState: action("setnextButtonState!"), } diff --git a/stories/UT-HAI/client-deliberation/TutorialBackground.stories.js b/stories/UT-HAI/client-deliberation/TutorialBackground.stories.js index f3da1b4..3b2b026 100644 --- a/stories/UT-HAI/client-deliberation/TutorialBackground.stories.js +++ b/stories/UT-HAI/client-deliberation/TutorialBackground.stories.js @@ -5,9 +5,36 @@ import { withDelibThemeUi } from '../../../.storybook/decorators' export default { component: TutorialBackground, decorators: [withDelibThemeUi], + argTypes: { + currentIndex: { + options: [0, 1, 2, 3, 4, 5, 6, 7, 8], + control: { type: "inline-radio" }, + }, + }, } -const Template = (args) => <div>Not Yet Implemented</div> +const Template = (args) => <TutorialBackground {...args} /> export const Default = Template.bind({}) -Default.args = {} +Default.args = { + currentIndex: 0, + tutorial_text: [], +} + +export const OverrideText = Template.bind({}) +OverrideText.args = { + currentIndex: 0, + tutorial_text: [ + { + name: "Some name", + subheading_one: "Subheading 1", + paragraph_one: "Paragraph 1...", + bulletpoint_one: ["Bullet point 1A...", "Bullet point 1B..."], + subheading_two: "Subheading 2", + paragraph_two: "Paragraph 2...", + bulletpoint_two: ["Bullet point 2A...", "Bullet point 2B..."], + conclusion: "Lorem ipsum conclusion...", + + } + ], +} diff --git a/stories/UT-HAI/client-deliberation/TutorialBox.stories.js b/stories/UT-HAI/client-deliberation/TutorialBox.stories.js index 40dbcdc..c6ae921 100644 --- a/stories/UT-HAI/client-deliberation/TutorialBox.stories.js +++ b/stories/UT-HAI/client-deliberation/TutorialBox.stories.js @@ -1,13 +1,26 @@ import React from 'react' import TutorialBox from '../../../codebases/UT-HAI/client-deliberation/src/components/TutorialBox' import { withDelibThemeUi } from '../../../.storybook/decorators' +import { action } from '@storybook/addon-actions' export default { component: TutorialBox, decorators: [withDelibThemeUi], } -const Template = (args) => <div>Not Yet Implemented</div> +const Template = (args) => <TutorialBox {...args} /> export const Default = Template.bind({}) -Default.args = {} +Default.args = { + heading: "Some heading", + description: [ + "Lorem ipsum 1", + "Lorem ipsum 2", + "Lorem ipsum 3", + ], + currentIndex: 0, + email: "foo@example.com", + onHide: action("onHide!"), + setnextButtonstate: action("setnextButtonstate!"), + setCurrentIndex: action("setCurrentIndex!"), +} diff --git a/stories/UT-HAI/client-deliberation/TutorialsBox.stories.js b/stories/UT-HAI/client-deliberation/TutorialsBox.stories.js index f5912bd..8b810ca 100644 --- a/stories/UT-HAI/client-deliberation/TutorialsBox.stories.js +++ b/stories/UT-HAI/client-deliberation/TutorialsBox.stories.js @@ -1,5 +1,6 @@ import React from 'react' import TutorialsBox from '../../../codebases/UT-HAI/client-deliberation/src/components/TutorialsBox' +import { action } from '@storybook/addon-actions' import { withDelibThemeUi } from '../../../.storybook/decorators' export default { @@ -7,7 +8,16 @@ export default { decorators: [withDelibThemeUi], } -const Template = (args) => <div>Not Yet Implemented</div> +const Template = (args) => <TutorialsBox {...args} /> export const Default = Template.bind({}) -Default.args = {} +Default.args = { + current_state_index: 0, + heading: "Some heading", + description: [ + "Lorem ipsum 1", + "Lorem ipsum 2", + "Lorem ipsum 3", + ], + setcurrent_state_index: action("Set index state!"), +} diff --git a/stories/UT-HAI/client-deliberation/UnderstandAI.stories.js b/stories/UT-HAI/client-deliberation/UnderstandAI.stories.js index b63c9a5..5b995eb 100644 --- a/stories/UT-HAI/client-deliberation/UnderstandAI.stories.js +++ b/stories/UT-HAI/client-deliberation/UnderstandAI.stories.js @@ -5,9 +5,22 @@ import { withDelibThemeUi } from '../../../.storybook/decorators' export default { component: UnderstandAI, decorators: [withDelibThemeUi], + argTypes: { + currentIndex: { + options: [0, 1, 2, 3, 4, 5], + control: { type: "inline-radio" }, + }, + }, } -const Template = (args) => <div>Not Yet Implemented</div> +const Template = (args) => <UnderstandAI {...args} /> export const Default = Template.bind({}) -Default.args = {} +Default.args = { + currentIndex: 0, +} + +export const ZoomStep = Template.bind({}) +ZoomStep.args = { + currentIndex: 5, +} diff --git a/stories/UT-HAI/client-deliberation/VisualisationTutorial.stories.js b/stories/UT-HAI/client-deliberation/VisualisationTutorial.stories.js index bcabfc9..7635dd2 100644 --- a/stories/UT-HAI/client-deliberation/VisualisationTutorial.stories.js +++ b/stories/UT-HAI/client-deliberation/VisualisationTutorial.stories.js @@ -7,6 +7,7 @@ export default { decorators: [withDelibThemeUi], } +// TODO: Need to mock PolisNet API calls. const Template = (args) => <div>Not Yet Implemented</div> export const Default = Template.bind({}) diff --git a/stories/UT-HAI/client-deliberation/Visualization.stories.js b/stories/UT-HAI/client-deliberation/Visualization.stories.js index 58d9626..70bef9c 100644 --- a/stories/UT-HAI/client-deliberation/Visualization.stories.js +++ b/stories/UT-HAI/client-deliberation/Visualization.stories.js @@ -7,6 +7,7 @@ export default { decorators: [withDelibThemeUi], } +// TODO: Need to mock PolisNet API calls. const Template = (args) => <div>Not Yet Implemented</div> export const Default = Template.bind({})