Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(web): story block system #619

Merged
merged 54 commits into from
Aug 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
10457f7
wip: storypage
KaWaite Aug 2, 2023
868da40
wip scroll
KaWaite Aug 2, 2023
7c12965
Merge remote-tracking branch 'origin/main' into chore/story-block-system
KaWaite Aug 3, 2023
4a4cf21
Merge remote-tracking branch 'origin/main' into chore/story-block-system
KaWaite Aug 4, 2023
da608c8
remove unused code
KaWaite Aug 4, 2023
89c2ab8
Merge remote-tracking branch 'origin/main' into chore/story-block-system
KaWaite Aug 4, 2023
fbd5681
update indicator
KaWaite Aug 7, 2023
d11663c
Add page gap
KaWaite Aug 7, 2023
9248b25
refactor storytellingApi
KaWaite Aug 7, 2023
439db73
add create, remove, move block api
KaWaite Aug 7, 2023
407c58e
wip: add block indicator
KaWaite Aug 7, 2023
8a22c4a
wip: show installable block
KaWaite Aug 7, 2023
b48b436
add storyblock to extension type on backend
KaWaite Aug 7, 2023
d28a8b4
wip: storyblock add
KaWaite Aug 7, 2023
69fa647
story block creation
KaWaite Aug 7, 2023
19795ac
Merge remote-tracking branch 'origin/main' into chore/story-block-system
KaWaite Aug 7, 2023
9d55af7
fix storybooks
KaWaite Aug 7, 2023
46825b5
readd deps needed for classic gql
KaWaite Aug 7, 2023
38bda1c
fix classic gql's codegen config
KaWaite Aug 7, 2023
0bd7849
update storytelling queries/generated files
KaWaite Aug 7, 2023
607174c
Merge remote-tracking branch 'origin/main' into chore/story-block-system
KaWaite Aug 7, 2023
75442d7
show installed story blocks
KaWaite Aug 7, 2023
2def96c
fix page/block mutations
KaWaite Aug 7, 2023
4f092c9
fix type error
KaWaite Aug 7, 2023
317afe2
fix block popover showing multiple
KaWaite Aug 8, 2023
fdd01ff
rename scene tab to map tab
KaWaite Aug 8, 2023
2a75fa6
move storypanel out of tab dir
KaWaite Aug 8, 2023
4ef3b23
wip: block system setup + image block
KaWaite Aug 8, 2023
2579dce
fix typo
KaWaite Aug 8, 2023
24b52a2
gen i18n
KaWaite Aug 8, 2023
2318a43
Merge remote-tracking branch 'origin/main' into chore/story-block-system
KaWaite Aug 8, 2023
f13b5f4
regen server gql
KaWaite Aug 8, 2023
bb13555
fix wrong navigation path
KaWaite Aug 8, 2023
4a2fd7f
refactor storyblock builtin
KaWaite Aug 8, 2023
77847a0
move storypanel in to vis context, etc
KaWaite Aug 8, 2023
81fb199
add storyblock icons
KaWaite Aug 9, 2023
8162116
update block wrapper and imageblock
KaWaite Aug 9, 2023
9b9cb58
refactor icons, fix styles
KaWaite Aug 9, 2023
ae36951
add icons
KaWaite Aug 9, 2023
f9fe674
add styled comp support to popover
KaWaite Aug 9, 2023
7c677dd
wip: block settings
KaWaite Aug 9, 2023
4577490
fix types
KaWaite Aug 9, 2023
a97436d
block remove func
KaWaite Aug 9, 2023
660976b
move template to Wrapper
KaWaite Aug 9, 2023
1533c67
setup basic func structure to textblock
KaWaite Aug 9, 2023
ca63014
Fix block adding (esp w index)
KaWaite Aug 9, 2023
f7e1d67
Fix scrolling to selected page
KaWaite Aug 9, 2023
4da4d84
fix zindex for block's editor panel
KaWaite Aug 9, 2023
af54386
regen i18n to make web build ci happy
KaWaite Aug 9, 2023
6371b23
refactor StoryPanel
KaWaite Aug 10, 2023
e54051d
refactor page indicator
KaWaite Aug 10, 2023
b888bf6
refactor Page
KaWaite Aug 10, 2023
efa2048
refactor builtin wrapper, etc
KaWaite Aug 10, 2023
0a9addc
Merge remote-tracking branch 'origin/main' into chore/story-block-system
KaWaite Aug 10, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions web/codegen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ export default config;
// overwrite: true,
// schema: "../server/gql/*.graphql",
// documents: [
// "src/services/gql/fragments/*.ts",
// "src/services/gql/queries/*.ts",
// "src/services/**/*.graphql",
// "src/classic/gql/fragments/*.ts",
// "src/classic/gql/queries/*.ts",
// "src/classic/**/*.graphql",
// ],
// generates: {
// "./src/services/gql/graphql-client-api.tsx": {
// "./src/classic/gql/graphql-client-api.tsx": {
// plugins: ["typescript", "typescript-operations", "typescript-react-apollo"],
// config: {
// useTypeImports: true,
Expand All @@ -65,10 +65,10 @@ export default config;
// },
// },
// },
// "./src/services/gql/graphql.schema.json": {
// "./src/classic/gql/graphql.schema.json": {
// plugins: ["introspection"],
// },
// "./src/services/gql/fragmentMatcher.json": {
// "./src/classic/gql/fragmentMatcher.json": {
// plugins: ["fragment-matcher"],
// },
// },
Expand Down
4 changes: 4 additions & 0 deletions web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
"@graphql-codegen/cli": "3.3.1",
"@graphql-codegen/client-preset": "4.0.1",
"@graphql-codegen/fragment-matcher": "4.0.1",
"@graphql-codegen/introspection": "4.0.0",
"@graphql-codegen/typescript": "4.0.1",
"@graphql-codegen/typescript-operations": "4.0.1",
"@graphql-codegen/typescript-react-apollo": "3.3.7",
"@playwright/test": "1.33.0",
"@rollup/plugin-yaml": "4.1.0",
"@storybook/addon-essentials": "7.0.18",
Expand Down
3 changes: 0 additions & 3 deletions web/src/beta/components/Icon/Icons/audio.svg

This file was deleted.

4 changes: 0 additions & 4 deletions web/src/beta/components/Icon/Icons/buttonBlock.svg

This file was deleted.

8 changes: 8 additions & 0 deletions web/src/beta/components/Icon/Icons/dndHandle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions web/src/beta/components/Icon/Icons/exit.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions web/src/beta/components/Icon/Icons/imageStoryBlock.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 0 additions & 6 deletions web/src/beta/components/Icon/Icons/infoboxIcon copy.svg

This file was deleted.

6 changes: 0 additions & 6 deletions web/src/beta/components/Icon/Icons/mdFile.svg

This file was deleted.

7 changes: 7 additions & 0 deletions web/src/beta/components/Icon/Icons/mdTextStoryBlock.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions web/src/beta/components/Icon/Icons/padding.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions web/src/beta/components/Icon/Icons/storyBlockEdit.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions web/src/beta/components/Icon/Icons/textStoryBlock.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions web/src/beta/components/Icon/Icons/titleStoryBlock.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 23 additions & 17 deletions web/src/beta/components/Icon/icons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import CheckMark from "./Icons/checkMark.svg";
import Plus from "./Icons/plus.svg";
import Minus from "./Icons/minus.svg";
import Alert from "./Icons/alert.svg";
import DndHandle from "./Icons/dndHandle.svg";

// Dataset
import File from "./Icons/fileIcon.svg";
Expand All @@ -43,15 +44,6 @@ import PlayRight from "./Icons/play-right.svg";
import PlayLeft from "./Icons/play-left.svg";
import Ellipse from "./Icons/ellipse.svg";

// Storytelling blocks
import Audio from "./Icons/audio.svg";
import EditIcon from "./Icons/editIcon.svg";
import Settings from "./Icons/settings.svg";
import ButtonBlock from "./Icons/buttonBlock.svg";
import Camera from "./Icons/camera.svg";
import MdFile from "./Icons/mdFile.svg";
import Clock from "./Icons/clock.svg";

// Dashboard
import Dashboard from "./Icons/dashboard.svg";
import Logout from "./Icons/logout.svg";
Expand All @@ -60,14 +52,24 @@ import Logout from "./Icons/logout.svg";
import WorkspaceAdd from "./Icons/workspaceAdd.svg";
import Workspaces from "./Icons/workspaces.svg";

// StoryTelling tab
// Storytelling tab
import Square from "./Icons/square.svg";
import Swiper from "./Icons/swiper.svg";
import Book from "./Icons/book.svg";
import Copy from "./Icons/copy.svg";
import GearSix from "./Icons/gearSix.svg";
import PencilSimple from "./Icons/pencilSimple.svg";
import Trash from "./Icons/trash.svg";
import TextStoryBlock from "./Icons/textStoryBlock.svg";
import Edit from "./Icons/storyBlockEdit.svg";
import Exit from "./Icons/exit.svg";
import Settings from "./Icons/settings.svg";
import Padding from "./Icons/padding.svg";
import TitleStoryBlock from "./Icons/titleStoryBlock.svg";
import VideoStoryBlock from "./Icons/videoStoryBlock.svg";
import ImageStoryBlock from "./Icons/imageStoryBlock.svg";
import MdTextStoryBlock from "./Icons/mdTextStoryBlock.svg";
import CameraButtonStoryBlock from "./Icons/cameraButtonStoryBlock.svg";

// Widget tab
import Desktop from "./Icons/desktop.svg";
Expand Down Expand Up @@ -119,13 +121,6 @@ export default {
plus: Plus,
timeline: Timeline,
actionbutton: ActionButton,
audio: Audio,
editIcon: EditIcon,
settings: Settings,
buttonBlock: ButtonBlock,
camera: Camera,
mdFile: MdFile,
clock: Clock,
dashboard: Dashboard,
help: Help,
logout: Logout,
Expand All @@ -134,6 +129,7 @@ export default {
checkmark: CheckMark,
minus: Minus,
alert: Alert,
dndHandle: DndHandle,
logo: Logo,
logoColorful: LogoColorful,
desktop: Desktop,
Expand All @@ -143,6 +139,16 @@ export default {
gearSix: GearSix,
pencilSimple: PencilSimple,
trash: Trash,
storyBlockEdit: Edit,
exit: Exit,
settings: Settings,
padding: Padding,
textStoryBlock: TextStoryBlock,
titleStoryBlock: TitleStoryBlock,
videoStoryBlock: VideoStoryBlock,
imageStoryBlock: ImageStoryBlock,
mdTextStoryBlock: MdTextStoryBlock,
cameraButtonStoryBlock: CameraButtonStoryBlock,
widget: Widgets,
widgets: Widgets,
menu: WidgetMenu,
Expand Down
2 changes: 1 addition & 1 deletion web/src/beta/components/NotFound/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const Wrapper = styled.div`
justify-content: center;
padding-top: 40vh;
height: 100%;
background: ${({ theme }) => theme.bg[2]};
background: ${({ theme }) => theme.bg[1]};
`;

const IconWrapper = styled.div`
Expand Down
Loading
Loading