staging to main #107

Merged
b merged 17 commits from staging into main 2024-06-07 14:25:47 +00:00
4 changed files with 21 additions and 9 deletions
Showing only changes of commit 12ca854c48 - Show all commits

View File

@ -185,6 +185,18 @@ export const AppBar = () => {
>
Settings
</MenuItem>
<MenuItem
onClick={() => {
setAnchorElUser(null)
navigate(appPublicRoutes.verify)
}}
sx={{
justifyContent: 'center'
}}
>
Verify
</MenuItem>
<Link
to={appPublicRoutes.source}
target="_blank"

View File

@ -1,7 +1,7 @@
import { Box, Button } from '@mui/material'
import styles from './style.module.scss'
import { useNavigate } from 'react-router-dom'
import { appPrivateRoutes } from '../../routes'
import { appPrivateRoutes, appPublicRoutes } from '../../routes'
export const HomePage = () => {
const navigate = useNavigate()
@ -21,7 +21,7 @@ export const HomePage = () => {
Sign
</Button>
<Button
onClick={() => navigate(appPrivateRoutes.verify)}
onClick={() => navigate(appPublicRoutes.verify)}
variant="contained"
>
Verify

View File

@ -28,7 +28,7 @@ import { toast } from 'react-toastify'
import { LoadingSpinner } from '../../components/LoadingSpinner'
import { UserComponent } from '../../components/username'
import { MetadataController, NostrController } from '../../controllers'
import { appPrivateRoutes } from '../../routes'
import { appPublicRoutes } from '../../routes'
import { State } from '../../store/rootReducer'
import {
CreateSignatureEventContent,
@ -585,7 +585,7 @@ export const SignPage = () => {
setIsLoading(false)
navigate(appPrivateRoutes.verify)
navigate(appPublicRoutes.verify)
}
const handleExportSigit = async () => {

View File

@ -15,7 +15,6 @@ export const appPrivateRoutes = {
homePage: '/',
create: '/create',
sign: '/sign',
verify: '/verify',
settings: '/settings',
profileSettings: '/settings/profile/:npub',
cacheSettings: '/settings/cache',
@ -26,6 +25,7 @@ export const appPublicRoutes = {
profile: '/profile/:npub',
landingPage: '/',
login: '/login',
verify: '/verify',
source: 'https://git.sigit.io/sig/it'
}
@ -49,6 +49,10 @@ export const publicRoutes = [
{
path: appPublicRoutes.profile,
element: <ProfilePage />
},
{
path: appPublicRoutes.verify,
element: <VerifyPage />
}
]
@ -65,10 +69,6 @@ export const privateRoutes = [
path: appPrivateRoutes.sign,
element: <SignPage />
},
{
path: appPrivateRoutes.verify,
element: <VerifyPage />
},
{
path: appPrivateRoutes.settings,
element: <SettingsPage />