Skip to content

Commit

Permalink
Merge branch 'main' of github.com:reearth/reearth into chore/timeline-ux
Browse files Browse the repository at this point in the history
  • Loading branch information
@mkumbobeaty
mkumbobeaty committed Dec 22, 2023
2 parents abdd4ca + 1468728 commit 8820171
Show file tree
Hide file tree
Showing 72 changed files with 3,711 additions and 515 deletions.
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
View file
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
* @rot1024

/server/ @pyshx
/web/ @KaWaite
/web/ @airslice
/web/e2e/ @keiya01

/web/src/classic/core/ @keiya01

/web/src/beta/lib/core/ @keiya01
/web/src/beta/lib/core/StoryPanel @KaWaite
/web/src/beta/lib/core/StoryPanel @mkumbobeaty

2 changes: 1 addition & 1 deletion web/i18next-parser.config.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
export default {
locales: ["en", "ja"],
output: "src/services/i18n/translations/$LOCALE.yml",
input: ["src/**/*.{ts,tsx}"],
Expand Down
14 changes: 9 additions & 5 deletions web/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"repository": "https://github.com/reearth/reearth.git",
"author": "Re:Earth contributors <[email protected]>",
"license": "Apache-2.0",
"type": "module",
"private": true,
"scripts": {
"start": "yarn && vite",
Expand All @@ -27,7 +28,7 @@
"gen:doc:plugin": "ts-node -O '{\"module\":\"CommonJS\"}' ./bin/pluginDoc"
},
"engines": {
"node": ">=16"
"node": ">=18"
},
"lint-staged": {
"**/*.{js,cjs,mjs,jsx,ts,cts,mts,tsx}": "eslint --fix"
Expand Down Expand Up @@ -70,7 +71,7 @@
"@types/styled-components": "5.1.29",
"@types/tinycolor2": "1.4.5",
"@types/uuid": "9.0.6",
"@vitejs/plugin-react": "4.1.0",
"@vitejs/plugin-react-swc": "3.5.0",
"@vitest/coverage-v8": "0.34.6",
"@welldone-software/why-did-you-render": "7.0.1",
"del-cli": "5.1.0",
Expand All @@ -93,10 +94,11 @@
"type-fest": "4.6.0",
"typescript": "5.0.4",
"typescript-styled-plugin": "0.18.3",
"vite": "4.5.0",
"vite": "5.0.8",
"vite-plugin-cesium": "1.2.22",
"vite-plugin-svgr": "4.2.0",
"vite-tsconfig-paths": "4.2.1",
"vitest": "0.34.6",
"vitest": "1.0.4",
"web-streams-polyfill": "3.2.1"
},
"dependencies": {
Expand All @@ -115,6 +117,7 @@
"@sentry/browser": "7.77.0",
"@seznam/compose-react-refs": "1.0.6",
"@turf/turf": "6.5.0",
"@types/d3": "^7.4.3",
"@types/escape-string-regexp": "2.0.1",
"@ungap/event-target": "0.2.4",
"apollo-link-sentry": "3.2.3",
Expand All @@ -128,6 +131,7 @@
"core-js": "3.33.2",
"crypto-js": "4.2.0",
"csv-parse": "5.5.2",
"d3": "^7.8.5",
"date-fns": "2.30.0",
"dayjs": "1.11.10",
"detect-browser": "5.3.0",
Expand Down Expand Up @@ -175,7 +179,7 @@
"react-nl2br": "1.0.4",
"react-player": "2.13.0",
"react-popper": "2.3.0",
"react-router-dom": "6.18.0",
"react-router-dom": "6.21.0",
"react-spinners": "0.13.8",
"react-use": "17.4.0",
"react18-json-view": "0.2.6",
Expand Down
4 changes: 1 addition & 3 deletions web/src/beta/components/Button/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ const Button: React.FC<Props> = ({
return !!text || !!children;
}, [children, text]);

const iSize = useMemo(() => {
return size === "medium" ? "16px" : "12px";
}, [size]);
const iSize = useMemo(() => (size === "medium" ? 16 : 12), [size]);

const WrappedIcon = useMemo(() => {
return icon ? (
Expand Down
4 changes: 2 additions & 2 deletions web/src/beta/components/CatalogCard/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export type Props = {
name: string;
url?: string;
icon?: string;
iconSize?: string;
iconSize?: number;
checked?: boolean;
selected?: boolean;
actionContent?: ReactNode;
Expand Down Expand Up @@ -119,7 +119,7 @@ const CatalogCard: React.FC<Props> = ({
{name}
</FileName>
)}
{checked && <StyledIcon icon="checkCircle" alt="checked" size="18px" />}
{checked && <StyledIcon icon="checkCircle" size={18} />}

{actionContent && (
<Popover.Provider
Expand Down
189 changes: 95 additions & 94 deletions web/src/beta/components/Icon/icons.ts
View file
Original file line number Diff line number Diff line change
@@ -1,126 +1,127 @@
/* eslint-disable import/order */
/// <reference types="vite-plugin-svgr/client" />

// Primitives
import PrimPhotoOverlay from "./Icons/primPhotoIcon.svg";
import PrimPhotoOverlay from "./Icons/primPhotoIcon.svg?react";

// Infobox Blocks
import Infobox from "./Icons/infoboxIcon.svg";
import InfoHTML from "./Icons/infoboxHTMLIcon.svg";
import InfoLocation from "./Icons/infoboxLocationIcon.svg";
import InfoTable from "./Icons/infoboxTableIcon.svg";
import InfoText from "./Icons/infoboxTextIcon.svg";
import InfoVideo from "./Icons/infoboxVideoIcon.svg";
import Infobox from "./Icons/infoboxIcon.svg?react";
import InfoHTML from "./Icons/infoboxHTMLIcon.svg?react";
import InfoLocation from "./Icons/infoboxLocationIcon.svg?react";
import InfoTable from "./Icons/infoboxTableIcon.svg?react";
import InfoText from "./Icons/infoboxTextIcon.svg?react";
import InfoVideo from "./Icons/infoboxVideoIcon.svg?react";

// Arrow
import ArrowUpDown from "./Icons/arrowUpDown.svg";
import ArrowLeft from "./Icons/arrowLeft.svg";
import ArrowRight from "./Icons/arrowRight.svg";
import ArrowLongLeft from "./Icons/arrowLongLeft.svg";
import ArrowLongRight from "./Icons/arrowLongRight.svg";
import ArrowDown from "./Icons/arrowDown.svg";
import ArrowToggle from "./Icons/arrowToggle.svg";
import ArrowUpDown from "./Icons/arrowUpDown.svg?react";
import ArrowLeft from "./Icons/arrowLeft.svg?react";
import ArrowRight from "./Icons/arrowRight.svg?react";
import ArrowLongLeft from "./Icons/arrowLongLeft.svg?react";
import ArrowLongRight from "./Icons/arrowLongRight.svg?react";
import ArrowDown from "./Icons/arrowDown.svg?react";
import ArrowToggle from "./Icons/arrowToggle.svg?react";

// Indicator
import Crosshair from "./Icons/crosshair.svg";
import Crosshair from "./Icons/crosshair.svg?react";

// Fields / Actions
import FolderPlus from "./Icons/folderPlus.svg";
import PlusSquare from "./Icons/plusSquare.svg";
import Cancel from "./Icons/cancel.svg";
import ActionButton from "./Icons/actionButton.svg";
import Help from "./Icons/help.svg";
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";
import Bin from "./Icons/bin.svg";
import Install from "./Icons/install.svg";
import UploadSimple from "./Icons/uploadSimple.svg";
import Search from "./Icons/search.svg";
import AddLayerIcon from "./Icons/addLayer.svg";
import ZoomToLayer from "./Icons/zoomToLayer.svg";
import LayerStyleIcon from "./Icons/layerStyle.svg";
import AddLayerStyleButtonIcon from "./Icons/addLayerStyleButton.svg";
import LayerInspector from "./Icons/layerInspector.svg";
import LayerIcon from "./Icons/layer.svg";
import Clock from "./Icons/Clock.svg";
import FolderPlus from "./Icons/folderPlus.svg?react";
import PlusSquare from "./Icons/plusSquare.svg?react";
import Cancel from "./Icons/cancel.svg?react";
import ActionButton from "./Icons/actionButton.svg?react";
import Help from "./Icons/help.svg?react";
import CheckMark from "./Icons/checkMark.svg?react";
import Plus from "./Icons/plus.svg?react";
import Minus from "./Icons/minus.svg?react";
import Alert from "./Icons/alert.svg?react";
import DndHandle from "./Icons/dndHandle.svg?react";
import Bin from "./Icons/bin.svg?react";
import Install from "./Icons/install.svg?react";
import UploadSimple from "./Icons/uploadSimple.svg?react";
import Search from "./Icons/search.svg?react";
import AddLayerIcon from "./Icons/addLayer.svg?react";
import ZoomToLayer from "./Icons/zoomToLayer.svg?react";
import LayerStyleIcon from "./Icons/layerStyle.svg?react";
import AddLayerStyleButtonIcon from "./Icons/addLayerStyleButton.svg?react";
import LayerInspector from "./Icons/layerInspector.svg?react";
import LayerIcon from "./Icons/layer.svg?react";
import Clock from "./Icons/Clock.svg?react";

// MSIC
import CheckCircle from "./Icons/checkCircle.svg";
import CheckCircle from "./Icons/checkCircle.svg?react";

// Dataset
import File from "./Icons/fileIcon.svg";
import File from "./Icons/fileIcon.svg?react";

// Timeline
import Timeline from "./Icons/timeline.svg";
import PlayRight from "./Icons/play-right.svg";
import PlayLeft from "./Icons/play-left.svg";
import Ellipse from "./Icons/ellipse.svg";
import TimelinePlayRight from "./Icons/timeline-play-right.svg";
import TimelinePlayLeft from "./Icons/timeline-play-left.svg";
import Pause from "./Icons/pause.svg";
import Slider from "./Icons/slider.svg";
import Set from "./Icons/set.svg";
import Timeline from "./Icons/timeline.svg?react";
import PlayRight from "./Icons/play-right.svg?react";
import PlayLeft from "./Icons/play-left.svg?react";
import Ellipse from "./Icons/ellipse.svg?react";
import TimelinePlayRight from "./Icons/timeline-play-right.svg?react";
import TimelinePlayLeft from "./Icons/timeline-play-left.svg?react";
import Pause from "./Icons/pause.svg?react";
import Slider from "./Icons/slider.svg?react";
import Set from "./Icons/set.svg?react";

// Dashboard
import Dashboard from "./Icons/dashboard.svg";
import Scene from "./Icons/scene.svg";
import Logout from "./Icons/logout.svg";
import Dashboard from "./Icons/dashboard.svg?react";
import Scene from "./Icons/scene.svg?react";
import Logout from "./Icons/logout.svg?react";

// Workspaces
import WorkspaceAdd from "./Icons/workspaceAdd.svg";
import Workspaces from "./Icons/workspaces.svg";
import WorkspaceAdd from "./Icons/workspaceAdd.svg?react";
import Workspaces from "./Icons/workspaces.svg?react";

// Storytelling tab
import StoryPage from "./Icons/storyPage.svg";
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";
import ShowLayersStoryBlock from "./Icons/showLayersStoryBlock.svg";
import TimelineStoryBlock from "./Icons/timelineStoryBlock.svg";
import TimelineStoryBlockSolid from "./Icons/timelineStoryBlockSolid.svg";
import NextPageStoryBlock from "./Icons/nextPageStoryBlock.svg";
import StoryPage from "./Icons/storyPage.svg?react";
import Square from "./Icons/square.svg?react";
import Swiper from "./Icons/swiper.svg?react";
import Book from "./Icons/book.svg?react";
import Copy from "./Icons/copy.svg?react";
import GearSix from "./Icons/gearSix.svg?react";
import PencilSimple from "./Icons/pencilSimple.svg?react";
import Trash from "./Icons/trash.svg?react";
import TextStoryBlock from "./Icons/textStoryBlock.svg?react";
import Edit from "./Icons/storyBlockEdit.svg?react";
import Exit from "./Icons/exit.svg?react";
import Settings from "./Icons/settings.svg?react";
import Padding from "./Icons/padding.svg?react";
import TitleStoryBlock from "./Icons/titleStoryBlock.svg?react";
import VideoStoryBlock from "./Icons/videoStoryBlock.svg?react";
import ImageStoryBlock from "./Icons/imageStoryBlock.svg?react";
import MdTextStoryBlock from "./Icons/mdTextStoryBlock.svg?react";
import CameraButtonStoryBlock from "./Icons/cameraButtonStoryBlock.svg?react";
import ShowLayersStoryBlock from "./Icons/showLayersStoryBlock.svg?react";
import TimelineStoryBlock from "./Icons/timelineStoryBlock.svg?react";
import TimelineStoryBlockSolid from "./Icons/timelineStoryBlockSolid.svg?react";
import NextPageStoryBlock from "./Icons/nextPageStoryBlock.svg?react";

// Widget tab
import Desktop from "./Icons/desktop.svg";
import Mobile from "./Icons/mobile.svg";
import WidgetSystem from "./Icons/widgetSystem.svg";
import Widgets from "./Icons/widgetsIcon.svg";
import WidgetMenu from "./Icons/widgetMenu.svg";
import WidgetButton from "./Icons/widgetButton.svg";
import WidgetStory from "./Icons/widgetStorytelling.svg";
import StorytellingMenu from "./Icons/storytellingMenu.svg";
import WidgetSplash from "./Icons/widgetSplashscreen.svg";
import WidgetNavigator from "./Icons/widgetNavigator.svg";
import NavigatorAngle from "./Icons/navigatorAngle.svg";
import Compass from "./Icons/compass.svg";
import CompassFocus from "./Icons/compassFocus.svg";
import House from "./Icons/house.svg";
import Plugin from "./Icons/plugin.svg";
import Desktop from "./Icons/desktop.svg?react";
import Mobile from "./Icons/mobile.svg?react";
import WidgetSystem from "./Icons/widgetSystem.svg?react";
import Widgets from "./Icons/widgetsIcon.svg?react";
import WidgetMenu from "./Icons/widgetMenu.svg?react";
import WidgetButton from "./Icons/widgetButton.svg?react";
import WidgetStory from "./Icons/widgetStorytelling.svg?react";
import StorytellingMenu from "./Icons/storytellingMenu.svg?react";
import WidgetSplash from "./Icons/widgetSplashscreen.svg?react";
import WidgetNavigator from "./Icons/widgetNavigator.svg?react";
import NavigatorAngle from "./Icons/navigatorAngle.svg?react";
import Compass from "./Icons/compass.svg?react";
import CompassFocus from "./Icons/compassFocus.svg?react";
import House from "./Icons/house.svg?react";
import Plugin from "./Icons/plugin.svg?react";

// Logos
import Logo from "./Icons/reearthLogo.svg";
import LogoColorful from "./Icons/reearthLogoColorful.svg";
import Logo from "./Icons/reearthLogo.svg?react";
import LogoColorful from "./Icons/reearthLogoColorful.svg?react";

// Plug-ins
import UploadZipPlugin from "./Icons/uploadZipPlugin.svg";
import PublicGitHubRepo from "./Icons/publicGitHubRepo.svg";
import Marketplace from "./Icons/marketplace.svg";
import UploadZipPlugin from "./Icons/uploadZipPlugin.svg?react";
import PublicGitHubRepo from "./Icons/publicGitHubRepo.svg?react";
import Marketplace from "./Icons/marketplace.svg?react";

export default {
layer: LayerIcon,
Expand Down
12 changes: 5 additions & 7 deletions web/src/beta/components/Icon/index.stories.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@ export default {
component: Icon,
} as Meta;

export const Default = () => <Icon icon="file" alt="icon" size={20} />;
export const Color = () => <Icon icon="file" color="red" alt="icon" size={20} />;
export const Image = () => <Icon icon={`/sample.svg`} alt="icon" size={20} />;
export const Svg = () => <Icon icon={icon} alt="icon" size={20} />;
export const Wrapped = () => (
<Icon icon={icon} alt="icon" size={20} style={{ background: "green" }} />
);
export const Default = () => <Icon icon="file" size={20} />;
export const Color = () => <Icon icon="file" color="red" size={20} />;
export const Image = () => <Icon icon={`/sample.svg`} size={20} />;
export const Svg = () => <Icon icon={icon} size={20} />;
export const Wrapped = () => <Icon icon={icon} size={20} style={{ background: "green" }} />;
Loading

0 comments on commit 8820171

Please sign in to comment.