Compare commits
No commits in common. "c29bdd59aeca11bebaa7697eca79222363b18582" and "54451205116eb7cc46739bc32032d176d3bd0679" have entirely different histories.
c29bdd59ae
...
5445120511
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
src/assets/images/avatar.png
Normal file
BIN
src/assets/images/avatar.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 169 KiB |
BIN
src/assets/images/nostr-logo.jpg
Normal file
BIN
src/assets/images/nostr-logo.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 85 KiB |
Binary file not shown.
Before Width: | Height: | Size: 32 KiB |
BIN
src/assets/roboto-font/Roboto-Bold.ttf
Normal file
BIN
src/assets/roboto-font/Roboto-Bold.ttf
Normal file
Binary file not shown.
BIN
src/assets/roboto-font/Roboto-Light.ttf
Normal file
BIN
src/assets/roboto-font/Roboto-Light.ttf
Normal file
Binary file not shown.
BIN
src/assets/roboto-font/Roboto-Medium.ttf
Normal file
BIN
src/assets/roboto-font/Roboto-Medium.ttf
Normal file
Binary file not shown.
BIN
src/assets/roboto-font/Roboto-Regular.ttf
Normal file
BIN
src/assets/roboto-font/Roboto-Regular.ttf
Normal file
Binary file not shown.
@ -137,7 +137,7 @@ export const AppBar = () => {
|
||||
<Button
|
||||
startIcon={<ButtonIcon />}
|
||||
onClick={() => {
|
||||
navigate(appPublicRoutes.nostr)
|
||||
navigate(appPublicRoutes.login)
|
||||
}}
|
||||
variant="contained"
|
||||
>
|
||||
|
@ -2,7 +2,6 @@ import { Box, Button, Link as LinkMui } from '@mui/material'
|
||||
import { Link } from 'react-router-dom'
|
||||
import styles from './style.module.scss'
|
||||
import { Container } from '../Container'
|
||||
import nostrImage from '../../assets/images/nostr.gif'
|
||||
|
||||
export const Footer = () => (
|
||||
<footer className={`${styles.borderTop} ${styles.footer}`}>
|
||||
@ -118,7 +117,12 @@ export const Footer = () => (
|
||||
}}
|
||||
variant={'contained'}
|
||||
>
|
||||
<img src={nostrImage} width="25" alt="nostr logo" height="25" />
|
||||
<img
|
||||
src="https://image.nostr.build/fb557f1b6d58c7bbcdf4d1edb1b48090c76ff1d1384b9d1aae13d652e7a3cfe4.gif"
|
||||
width="25"
|
||||
alt="nostr logo"
|
||||
height="25"
|
||||
/>
|
||||
</Button>
|
||||
</Box>
|
||||
</Box>
|
||||
|
@ -16,6 +16,30 @@
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: 'Roboto';
|
||||
font-weight: 300;
|
||||
src: local('Roboto-Light'), url(./assets/roboto-font/Roboto-Light.ttf);
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: 'Roboto';
|
||||
font-weight: 400;
|
||||
src: local('Roboto-Regular'), url(./assets/Roboto-font/Roboto-Regular.ttf);
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: 'Roboto';
|
||||
font-weight: 500;
|
||||
src: local('Roboto-Medium'), url(./assets/Roboto-font/Roboto-Medium.ttf);
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: 'Roboto';
|
||||
font-weight: 700;
|
||||
src: local('Roboto-Bold'), url(./assets/Roboto-font/Roboto-Bold.ttf);
|
||||
}
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
min-width: 320px;
|
||||
@ -107,44 +131,3 @@ button:disabled {
|
||||
border-radius: 50%;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* Fonts */
|
||||
@font-face {
|
||||
font-family: 'Roboto';
|
||||
src: local('Roboto Medium'), local('Roboto-Medium'),
|
||||
url('assets/fonts/roboto-medium.woff2') format('woff2'),
|
||||
url('assets/fonts/roboto-medium.woff') format('woff');
|
||||
font-weight: 500;
|
||||
font-style: normal;
|
||||
font-display: swap;
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: 'Roboto';
|
||||
src: local('Roboto Light'), local('Roboto-Light'),
|
||||
url('assets/fonts/roboto-light.woff2') format('woff2'),
|
||||
url('assets/fonts/roboto-light.woff') format('woff');
|
||||
font-weight: 300;
|
||||
font-style: normal;
|
||||
font-display: swap;
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: 'Roboto';
|
||||
src: local('Roboto Bold'), local('Roboto-Bold'),
|
||||
url('assets/fonts/roboto-bold.woff2') format('woff2'),
|
||||
url('assets/fonts/roboto-bold.woff') format('woff');
|
||||
font-weight: bold;
|
||||
font-style: normal;
|
||||
font-display: swap;
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: 'Roboto';
|
||||
src: local('Roboto'), local('Roboto-Regular'),
|
||||
url('assets/fonts/roboto-regular.woff2') format('woff2'),
|
||||
url('assets/fonts/roboto-regular.woff') format('woff');
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
font-display: swap;
|
||||
}
|
@ -10,7 +10,6 @@ import styles from './style.module.scss'
|
||||
import { appPublicRoutes } from '../../routes'
|
||||
import { faClose } from '@fortawesome/free-solid-svg-icons'
|
||||
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
|
||||
import nostrImage from '../../assets/images/nostr.gif'
|
||||
|
||||
function useRouteMatch(patterns: readonly string[]) {
|
||||
const { pathname } = useLocation()
|
||||
@ -35,7 +34,14 @@ export const Modal = () => {
|
||||
to: appPublicRoutes.nostr,
|
||||
title: 'Login',
|
||||
sx: { padding: '10px' },
|
||||
label: <img src={nostrImage} width="25" alt="nostr logo" height="25" />
|
||||
label: (
|
||||
<img
|
||||
src="https://image.nostr.build/fb557f1b6d58c7bbcdf4d1edb1b48090c76ff1d1384b9d1aae13d652e7a3cfe4.gif"
|
||||
width="25"
|
||||
alt="nostr logo"
|
||||
height="25"
|
||||
/>
|
||||
)
|
||||
}
|
||||
]
|
||||
const routeMatch = useRouteMatch(tabs.map((t) => t.to))
|
||||
@ -93,10 +99,6 @@ export const Modal = () => {
|
||||
)
|
||||
})}
|
||||
</ul>
|
||||
{activeTab === appPublicRoutes.login ||
|
||||
activeTab === appPublicRoutes.register ? (
|
||||
<div className={styles.comingSoon}>Coming soon!</div>
|
||||
) : null}
|
||||
<div className={styles.tabContent}>
|
||||
<Outlet />
|
||||
</div>
|
||||
|
@ -66,14 +66,6 @@ $default-modal-padding: 15px 25px;
|
||||
padding-inline: 10px;
|
||||
}
|
||||
|
||||
.comingSoon {
|
||||
padding: 15px;
|
||||
color: rgba(0, 0, 0, 0.5);
|
||||
text-align: center;
|
||||
font-weight: 400;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
.footer {
|
||||
padding: 15px;
|
||||
border-top: solid 1px rgba(0, 0, 0, 0.1);
|
||||
|
@ -25,7 +25,7 @@ export const LandingPage = () => {
|
||||
const location = useLocation()
|
||||
|
||||
const onSignInClick = async () => {
|
||||
navigate(appPublicRoutes.nostr)
|
||||
navigate(appPublicRoutes.login)
|
||||
}
|
||||
|
||||
const cards = [
|
||||
@ -109,11 +109,11 @@ export const LandingPage = () => {
|
||||
<div className={styles.background}>
|
||||
<div
|
||||
className={`${styles.backgroundBlob} ${styles.backgroundBlobLeft}`}
|
||||
style={{ backgroundImage: `url("${bg_l}")` }}
|
||||
style={{ backgroundImage: `url(${bg_l})` }}
|
||||
></div>
|
||||
<div
|
||||
className={`${styles.backgroundBlob} ${styles.backgroundBlobRight}`}
|
||||
style={{ backgroundImage: `url("${bg_r}")` }}
|
||||
style={{ backgroundImage: `url(${bg_r})` }}
|
||||
></div>
|
||||
|
||||
<Container className={styles.container}>
|
||||
|
@ -1,8 +1,6 @@
|
||||
import { Button, TextField } from '@mui/material'
|
||||
|
||||
export const Login = () => {
|
||||
// TODO: All fields, buttons are disabled
|
||||
// Feature not implemented
|
||||
return (
|
||||
<>
|
||||
<TextField
|
||||
@ -11,7 +9,6 @@ export const Login = () => {
|
||||
fullWidth
|
||||
margin="dense"
|
||||
autoComplete="username"
|
||||
disabled
|
||||
/>
|
||||
<TextField
|
||||
label="Password"
|
||||
@ -19,10 +16,9 @@ export const Login = () => {
|
||||
fullWidth
|
||||
margin="dense"
|
||||
autoComplete="current-password"
|
||||
disabled
|
||||
/>
|
||||
|
||||
<Button variant="contained" fullWidth disabled>
|
||||
<Button variant="contained" fullWidth>
|
||||
Login
|
||||
</Button>
|
||||
</>
|
||||
|
@ -1,8 +1,6 @@
|
||||
import { Button, TextField } from '@mui/material'
|
||||
|
||||
export const Register = () => {
|
||||
// TODO: All fields, buttons are disabled
|
||||
// Feature not implemented
|
||||
return (
|
||||
<>
|
||||
<TextField
|
||||
@ -11,7 +9,6 @@ export const Register = () => {
|
||||
fullWidth
|
||||
margin="dense"
|
||||
autoComplete="username"
|
||||
disabled
|
||||
/>
|
||||
<TextField
|
||||
label="Password"
|
||||
@ -20,7 +17,6 @@ export const Register = () => {
|
||||
margin="dense"
|
||||
type="password"
|
||||
autoComplete="new-password"
|
||||
disabled
|
||||
/>
|
||||
<TextField
|
||||
label="Confirm password"
|
||||
@ -29,10 +25,9 @@ export const Register = () => {
|
||||
margin="dense"
|
||||
type="password"
|
||||
autoComplete="new-password"
|
||||
disabled
|
||||
/>
|
||||
|
||||
<Button variant="contained" fullWidth disabled>
|
||||
<Button variant="contained" fullWidth>
|
||||
Register
|
||||
</Button>
|
||||
</>
|
||||
|
@ -55,10 +55,7 @@ export const theme = extendTheme({
|
||||
},
|
||||
contained: {
|
||||
background: 'var(--primary-main)',
|
||||
color: 'white',
|
||||
':hover': {
|
||||
color: 'white'
|
||||
}
|
||||
},
|
||||
outlined: {
|
||||
':hover': {
|
||||
|
Loading…
x
Reference in New Issue
Block a user