Merge branch 'main' of github.com:Protofy-xyz/Protofy

Protofy-xyz · Jul 5, 2024 · 87c6301 · 87c6301
2 parents b726e54 + 3c42258
commit 87c6301
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/packages/app/features/auth/register.tsx b/packages/app/features/auth/register.tsx
@@ -1,11 +1,24 @@
 import { FormEvent, useEffect, useRef, useState } from 'react'
-import { Button, Input, Paragraph, Separator, Spinner, Stack, XStack, YStack } from 'tamagui'
-import { Page, useSession, useSessionContext, createSession, Auth, Center, HorizontalBox, Notice, Section, SpotLight, ElevatedArea, BackgroundGradient, LogoIcon, PendingResult, getPendingResult } from 'protolib'
-import { getEnv } from 'protolib/base'
+import { Button, Input, Paragraph, Spinner, Stack, YStack } from 'tamagui'
+import { getEnv } from 'protolib/base/lib/getEnv'
 import { DefaultLayout } from '../../layout/DefaultLayout'
 import Link from 'next/link'
-import { ProtofyLogoSVG, getErrorMessage, getValidation } from '@my/ui'
+import { ProtofyLogoSVG, Separator, XStack, getValidation } from '@my/ui'
 import { useSearchParams, useRouter } from 'solito/navigation';
+import { getErrorMessage } from "@my/ui";
+import { useSession, useSessionContext } from 'protolib/lib/Session'
+import { createSession } from 'protolib/api/lib/session'
+import { Auth } from 'protolib/lib/Auth'
+import { Center } from 'protolib/components/Center'
+import { HorizontalBox } from 'protolib/components/HorizontalBox'
+import { Notice } from 'protolib/components/Notice'
+import { Section } from 'protolib/components/Section'
+import { SpotLight } from 'protolib/components/SpotLight'
+import { ElevatedArea } from 'protolib/components/ElevatedArea'
+import { BackgroundGradient } from 'protolib/components/BackgroundGradient'
+import { Page } from 'protolib/components/Page'
+import { LogoIcon } from 'protolib/components/LogoIcon'
+import { PendingResult, getPendingResult} from 'protolib/base/PendingResult'
 
 export function SignInPage(props) {
   return (

diff --git a/packages/app/features/visualui/components/index.tsx b/packages/app/features/visualui/components/index.tsx
@@ -1,4 +1,5 @@
-import { visualuiComponents, tamaguiComponents } from 'protolib';
+import { tamaguiComponents } from 'protolib/visualui/tamagui';
+import visualuiComponents from 'protolib/visualui'
 import siteComponents from './site'
 
 export default { visualui: visualuiComponents, site:siteComponents, tamagui: tamaguiComponents}
diff --git a/packages/protoflow/src/fields/ColorFields.tsx b/packages/protoflow/src/fields/ColorFields.tsx
@@ -143,7 +143,7 @@ export default ({ nodeData = {}, node, item }) => {
                             width: "28px", height: "28px", cursor: 'pointer',
                             backgroundColor: getColorPreview(),
                             borderRadius: 4, zIndex: 10, position: 'absolute', marginLeft: '5px',
-                            border: !value ? '1px solid ' + textColor : '', top: '13px'
+                            border: !value ? '1px solid ' + textColor : '', top: '-13px'
                         }}
                     >
                     </div>

diff --git a/packages/protoflow/src/fields/index.tsx b/packages/protoflow/src/fields/index.tsx
@@ -93,7 +93,7 @@ export const CustomField = ({ label, input, menuActions = undefined }: any) => {
                         <Popover.Trigger>
                             <div
                                 onClick={() => setMenuOpened(true)}
-                                style={{ padding: '4px', justifyContent: 'center', cursor: 'pointer', position: 'absolute', right: 0, alignSelf: 'center', zIndex: 10 }}
+                                style={{ padding: '4px', justifyContent: 'center', cursor: 'pointer', position: 'absolute', right: -10, top: 2, alignSelf: 'center', zIndex: 10 }}
                             >
                                 <MoreVertical size={16} color={useTheme('textColor')} />
                             </div>