Merge branch 'main' into renovate/cesium-1.x

reearth · Oct 18, 2021 · d2acc8f · d2acc8f
2 parents 84241c4 + 2017aa3
commit d2acc8f
Show file tree

Hide file tree

Showing 14 changed files with 232 additions and 145 deletions.
diff --git a/src/components/atoms/TextBox/index.tsx b/src/components/atoms/TextBox/index.tsx
@@ -103,44 +103,46 @@ const TextBox: React.FC<Props> = ({
   }, [innerValue, onChange, throttle, throttleTimeout]);
 
   return (
-    <FormWrapper className={className} align="center">
-      {prefix && (
-        <FloatedText floatedTextColor={floatedTextColor} color={color}>
-          {prefix}
-        </FloatedText>
-      )}
-      {multiline ? (
-        <StyledTextarea
-          ref={textAreaRef}
-          value={innerValue ?? ""}
-          onChange={handleChangeTextArea}
-          onBlur={handleBlur}
-          color={color}
-          backgroundColor={backgroundColor}
-          disabled={disabled}
-          placeholder={placeholder}
-          rows={rows}
-        />
-      ) : (
-        <StyledInput
-          value={innerValue ?? ""}
-          onChange={handleChange}
-          onKeyPress={handleKeyPress}
-          onBlur={handleBlur}
-          color={color}
-          type={type}
-          backgroundColor={backgroundColor}
-          disabled={disabled}
-          placeholder={placeholder}
-          borderColor={borderColor}
-        />
-      )}
-      {suffix && (
-        <FloatedText floatedTextColor={floatedTextColor} color={color}>
-          {suffix}
-        </FloatedText>
-      )}
-    </FormWrapper>
+    <div className={className}>
+      <FormWrapper align="center">
+        {prefix && (
+          <FloatedText floatedTextColor={floatedTextColor} color={color}>
+            {prefix}
+          </FloatedText>
+        )}
+        {multiline ? (
+          <StyledTextarea
+            ref={textAreaRef}
+            value={innerValue ?? ""}
+            onChange={handleChangeTextArea}
+            onBlur={handleBlur}
+            color={color}
+            backgroundColor={backgroundColor}
+            disabled={disabled}
+            placeholder={placeholder}
+            rows={rows}
+          />
+        ) : (
+          <StyledInput
+            value={innerValue ?? ""}
+            onChange={handleChange}
+            onKeyPress={handleKeyPress}
+            onBlur={handleBlur}
+            color={color}
+            type={type}
+            backgroundColor={backgroundColor}
+            disabled={disabled}
+            placeholder={placeholder}
+            borderColor={borderColor}
+          />
+        )}
+        {suffix && (
+          <FloatedText floatedTextColor={floatedTextColor} color={color}>
+            {suffix}
+          </FloatedText>
+        )}
+      </FormWrapper>
+    </div>
   );
 };
 

diff --git a/src/components/molecules/Common/ProjectMenu/index.tsx b/src/components/molecules/Common/ProjectMenu/index.tsx
@@ -46,12 +46,6 @@ const ProjectMenu: React.FC<Props> = ({ currentProject, teamId }) => {
                 text={intl.formatMessage({ defaultMessage: "Datasets" })}
               />
             </MenuListItem>
-            {/* <MenuListItem>
-              <MenuListItemLabel
-                linkTo={`/settings/project/${currentProject.id}/plugins`}
-                text={intl.formatMessage({ defaultMessage: "Plugins" })}
-              />
-            </MenuListItem> */}
             <Spacer />
             <MenuListItem>
               <MenuListItemLabel
@@ -60,17 +54,10 @@ const ProjectMenu: React.FC<Props> = ({ currentProject, teamId }) => {
               />
             </MenuListItem>
             <Spacer />
-            <MenuListItem>
-              <MenuListItemLabel
-                icon="dashboard"
-                linkTo={`/dashboard/${teamId}`}
-                text={intl.formatMessage({ defaultMessage: "Top page" })}
-              />
-            </MenuListItem>
             <MenuListItem>
               <MenuListItemLabel
                 icon="help"
-                linkTo="/projects"
+                onClick={() => window.open("http://docs.reearth.io", "_blank", "noopener")}
                 text={intl.formatMessage({ defaultMessage: "Help" })}
               />
             </MenuListItem>

diff --git a/src/components/molecules/Dashboard/QuickStart.tsx b/src/components/molecules/Dashboard/QuickStart.tsx
@@ -48,7 +48,7 @@ const QuickStart: React.FC<Props> = ({
         <LongBannerButton
           align="center"
           justify="center"
-          onClick={() => window.location.assign("http://docs.reearth.io")}>
+          onClick={() => window.open("http://docs.reearth.io")}>
           <MapIcon icon="map" />
           <Text size="m" weight="bold" customColor>
             {intl.formatMessage({ defaultMessage: "User guide" })}

diff --git a/src/components/molecules/Dashboard/Workspace.tsx b/src/components/molecules/Dashboard/Workspace.tsx
@@ -71,6 +71,7 @@ const StyledLink = styled(Link)`
   padding: ${metricsSizes["2xs"]}px;
   border-radius: ${metricsSizes.xs}px;
   align-self: flex-end;
+  display: flex;
 
   &:hover {
     text-decoration: none;

diff --git a/src/components/molecules/Settings/Account/AccountSection/index.tsx b/src/components/molecules/Settings/Account/AccountSection/index.tsx
@@ -4,7 +4,9 @@ import { useIntl } from "react-intl";
 import Flex from "@reearth/components/atoms/Flex";
 import Icon from "@reearth/components/atoms/Icon";
 import Text from "@reearth/components/atoms/Text";
-import PasswordModal from "@reearth/components/molecules/Settings/Account/PasswordModal";
+import PasswordModal, {
+  PasswordPolicy,
+} from "@reearth/components/molecules/Settings/Account/PasswordModal";
 import Field from "@reearth/components/molecules/Settings/Field";
 import EditableItem from "@reearth/components/molecules/Settings/Project/EditableItem";
 import Section from "@reearth/components/molecules/Settings/Section";
@@ -18,6 +20,7 @@ export type Props = {
   appTheme?: string;
   lang?: string;
   hasPassword: boolean;
+  passwordPolicy?: PasswordPolicy;
   updatePassword?: (password: string, passwordConfirmation: string) => void;
   updateLanguage?: (lang: string) => void;
   updateTheme?: (theme: string) => void;
@@ -28,6 +31,7 @@ const ProfileSection: React.FC<Props> = ({
   email,
   appTheme,
   hasPassword,
+  passwordPolicy,
   updatePassword,
   updateLanguage,
   updateTheme,
@@ -111,6 +115,7 @@ const ProfileSection: React.FC<Props> = ({
       </Section>
       <PasswordModal
         hasPassword={hasPassword}
+        passwordPolicy={passwordPolicy}
         updatePassword={handleUpdatePassword}
         isVisible={isOpen}
         onClose={() => setIsOpen(false)}