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

Protofy-xyz · Jul 5, 2024 · c73c170 · c73c170
2 parents e4dd62f + b1dba32
commit c73c170
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 8 deletions.
diff --git a/packages/app/features/auth/login.tsx b/packages/app/features/auth/login.tsx
@@ -1,14 +1,23 @@
 import { FormEvent, useEffect, useRef, useState } from 'react'
 import { Button, Input, Paragraph, Spinner, Stack, YStack } from 'tamagui'
-import { useSession, useSessionContext, createSession, Auth, Center, HorizontalBox, Notice, Section, SpotLight, ElevatedArea, BackgroundGradient, LogoIcon, PendingResult, getPendingResult, Page} from 'protolib'
+import { LogoIcon, PendingResult, getPendingResult, Page} from 'protolib'
 import { getEnv } from 'protolib/base'
 import { DefaultLayout } from '../../layout/DefaultLayout'
 import Link from 'next/link'
 import { ProtofyLogoSVG } from '@my/ui'
 import { useSearchParams, useRouter } from 'solito/navigation';
 import { getErrorMessage } from "@my/ui";
 import { SiteConfig } from '../../conf'
-
+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'
 
 export function SignInPage(props) {
   return (

diff --git a/packages/protolib/components/BackgroundGradient.tsx b/packages/protolib/components/BackgroundGradient.tsx
@@ -1,7 +1,7 @@
 import { YStack } from "tamagui"
 import React from 'react'
 
-const BackgroundGradient = React.forwardRef(({height=521, o=0.08, direction="up", ...props}:any, ref: any) => (
+export const BackgroundGradient = React.forwardRef(({height=521, o=0.08, direction="up", ...props}:any, ref: any) => (
     <YStack
     ref={ref}
     className={"bg-grid mask-gradient-"+direction}

diff --git a/packages/protolib/components/Center.tsx b/packages/protolib/components/Center.tsx
@@ -1,7 +1,7 @@
 import { StackProps, YStack } from "tamagui"
 import React from 'react'
 
-const Center = React.forwardRef(({children, ...props}: StackProps, ref:any) => (
+export const Center = React.forwardRef(({children, ...props}: StackProps, ref:any) => (
     <YStack flex={1} alignItems="center" justifyContent="center" ref={ref} {...props}>
         {children}
     </YStack>

diff --git a/packages/protolib/components/ElevatedArea.tsx b/packages/protolib/components/ElevatedArea.tsx
@@ -1,7 +1,7 @@
 import { StackProps, YStack } from "tamagui";
 import React from "react"
 
-const ElevatedArea = React.forwardRef((props:StackProps, ref:any) => (
+export const ElevatedArea = React.forwardRef((props:StackProps, ref:any) => (
     <YStack
         ref={ref}
         //@ts-ignore

diff --git a/packages/protolib/components/HorizontalBox.tsx b/packages/protolib/components/HorizontalBox.tsx
@@ -2,7 +2,7 @@ import React from "react"
 import { ContainerLarge } from "./Container"
 import { StackProps, XStack, XStackProps } from "tamagui"
 
-const HorizontalBox = React.forwardRef((props:StackProps, ref:any) => (
+export const HorizontalBox = React.forwardRef((props:StackProps, ref:any) => (
     <ContainerLarge ref={ref}>
         <XStack
         flex={1}

diff --git a/packages/protolib/components/Section.tsx b/packages/protolib/components/Section.tsx
@@ -5,7 +5,7 @@ import { StackProps, YStack } from "tamagui"
 import { Theme } from "tamagui"
 import {Tinted} from './Tinted'
 
-const Section = React.forwardRef((props: StackProps, ref: any) => (
+export const Section = React.forwardRef((props: StackProps, ref: any) => (
     <YStack ref={ref} flex={1} {...props}>
         <Tinted>{props.children}</Tinted>
     </YStack>

diff --git a/packages/protolib/components/SpotLight.tsx b/packages/protolib/components/SpotLight.tsx
@@ -1,7 +1,7 @@
 import React from "react"
 import { YStack } from "tamagui"
 
-const SpotLight = React.forwardRef((props: any, ref: any) => (
+export const SpotLight = React.forwardRef((props: any, ref: any) => (
     <YStack
         ref={ref}
         o={0.75}