Merge branch 'upgrade-login-page' into 'main'

Implement login button

See merge request soapbox-pub/soapbox!3338

src/features/ui/components/panels/sign-up-panel.tsx

@@ -2,6 +2,7 @@ import { FormattedMessage } from 'react-intl';
 
 import { openModal } from 'soapbox/actions/modals.ts';
 import Button from 'soapbox/components/ui/button.tsx';
+import HStack from 'soapbox/components/ui/hstack.tsx';
 import Stack from 'soapbox/components/ui/stack.tsx';
 import Text from 'soapbox/components/ui/text.tsx';
 import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts';
@@ -26,19 +27,32 @@ const SignUpPanel = () => {
           <FormattedMessage id='signup_panel.title' defaultMessage='New to {site_title}?' values={{ site_title: instance.title }} />
         </Text>
 
-        <Text theme='muted' size='sm'>
+        <Text size='sm' theme='muted'>
           <FormattedMessage id='signup_panel.subtitle' defaultMessage="Sign up now to discuss what's happening." />
         </Text>
       </Stack>
 
-      <Button
-        theme='primary'
-        onClick={nostrSignup ? () => dispatch(openModal('NOSTR_SIGNUP')) : undefined}
-        to={nostrSignup ? undefined : '/signup'}
-        block
-      >
-        <FormattedMessage id='account.register' defaultMessage='Sign up' />
-      </Button>
+      <HStack space={2}>
+        <Button
+          theme='tertiary'
+          onClick={nostrSignup ? () => dispatch(openModal('NOSTR_LOGIN')) : undefined}
+          to={nostrSignup ? undefined : '/login'}
+          block
+        >
+          <FormattedMessage id='account.login' defaultMessage='Log in' />
+        </Button>
+
+        <Button
+          theme='primary'
+          onClick={nostrSignup ? () => dispatch(openModal('NOSTR_SIGNUP')) : undefined}
+          to={nostrSignup ? undefined : '/signup'}
+          block
+        >
+          <FormattedMessage id='account.register' defaultMessage='Sign up' />
+        </Button>
+
+      </HStack>
+
     </Stack>
   );
 };