Skip to content

refactor: full re-skin #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kentbull merged 1 commit into from
Apr 22, 2026
Merged

refactor: full re-skin #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { CssBaseline } from '@mui/material';
import { ThemeProvider } from '@mui/material/styles';
import { Provider } from 'react-redux';
import { RouterProvider } from 'react-router-dom';
import { createAppRouter } from './app/router';
import { createAppRuntime } from './app/runtime';
import { appTheme } from './app/theme';
import { appStore } from './state/store';

const appRuntime = createAppRuntime({ store: appStore });
Expand All @@ -27,8 +29,10 @@ if (import.meta.hot) {
function App() {
return (
<Provider store={appStore}>
<CssBaseline />
<RouterProvider router={appRouter} />
<ThemeProvider theme={appTheme}>
<CssBaseline />
<RouterProvider router={appRouter} />
</ThemeProvider>
</Provider>
);
}
Expand Down
261 changes: 159 additions & 102 deletions src/app/ConnectDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,17 @@ import {
DialogActions,
DialogContent,
DialogTitle,
Divider,
Grid,
IconButton,
Stack,
TextField,
Tooltip,
Typography,
} from '@mui/material';
import ContentCopyIcon from '@mui/icons-material/ContentCopy';
import RefreshIcon from '@mui/icons-material/Refresh';
import { useFetcher } from 'react-router-dom';
import { appConfig, type ConnectionOption } from '../config';
import { monoValueSx } from './consoleStyles';
import type { RootActionData } from './routeData';
import type { SignifyConnectionState } from './runtime';

Expand All @@ -33,29 +36,6 @@ export interface ConnectDialogProps {
onClose: () => void;
}

/**
* User-facing status label for the typed connection state.
*
* Keep this local until another component truly needs the same presentation
* policy; duplicating a second tiny formatter is preferable to a premature
* shared status abstraction.
*/
const connectionStatusLabel = (connection: SignifyConnectionState): string => {
if (connection.status === 'idle') {
return 'Not Connected';
}

if (connection.status === 'connecting') {
return 'Connecting';
}

if (connection.status === 'connected') {
return 'Connected';
}

return 'Error';
};

/**
* Modal form for selecting a configured KERIA target and passcode.
*
Expand All @@ -73,7 +53,7 @@ export const ConnectDialog = ({
const [selectedConnection, setSelectedConnection] =
useState<ConnectionOption>(appConfig.connectionOptions[0]);
const [draftPasscode, setDraftPasscode] = useState<string | null>(null);
const isConnected = connection.status === 'connected';
const [copiedPasscode, setCopiedPasscode] = useState(false);
const isSubmitting =
connection.status === 'connecting' || connectFetcher.state !== 'idle';
const isGenerating = passcodeFetcher.state !== 'idle';
Expand All @@ -83,6 +63,7 @@ export const ConnectDialog = ({
? passcodeFetcher.data.passcode
: null;
const passcode = draftPasscode ?? generatedPasscode ?? '';
const passcodeReady = passcode.length >= 21;
const actionError =
connection.status === 'error'
? connection.error.message
Expand All @@ -105,9 +86,22 @@ export const ConnectDialog = ({
const formData = new FormData();
formData.set('intent', 'generatePasscode');
setDraftPasscode(null);
setCopiedPasscode(false);
passcodeFetcher.submit(formData, { method: 'post', action: '/' });
};

const handleCopyPasscode = () => {
if (passcode.length === 0) {
return;
}

void globalThis.navigator.clipboard
?.writeText(passcode)
.catch(() => undefined);
setCopiedPasscode(true);
globalThis.setTimeout(() => setCopiedPasscode(false), 1500);
};

return (
<Dialog
open={open}
Expand All @@ -124,71 +118,115 @@ export const ConnectDialog = ({
},
}}
>
<DialogTitle>Connect</DialogTitle>
<DialogContent sx={{ px: { xs: 2, sm: 3 } }}>
<Stack spacing={3}>
<Autocomplete
id="combo-box-demo"
options={appConfig.connectionOptions}
getOptionLabel={(option) =>
`${option.label} (${option.adminUrl})`
}
isOptionEqualToValue={(option, value) =>
option.adminUrl === value.adminUrl &&
option.bootUrl === value.bootUrl
}
renderInput={(params) => (
<TextField {...params} fullWidth />
)}
value={selectedConnection}
fullWidth
onChange={(_event, newValue) => {
setSelectedConnection(
newValue ?? appConfig.connectionOptions[0]
);
<DialogTitle>Connect Wallet</DialogTitle>
<DialogContent sx={{ px: { xs: 2, sm: 3 }, py: 3 }}>
<Stack spacing={2.5}>
<Box
sx={{
border: 1,
borderColor: passcodeReady
? 'primary.main'
: 'divider',
borderRadius: 1,
bgcolor: 'rgba(5, 9, 13, 0.62)',
p: { xs: 1.5, sm: 2 },
}}
/>
<Stack direction={{ xs: 'column', sm: 'row' }} spacing={2}>
>
<Stack
direction={{ xs: 'column', sm: 'row' }}
spacing={1}
sx={{
alignItems: { xs: 'stretch', sm: 'center' },
justifyContent: 'space-between',
mb: 1.25,
}}
>
<Box>
<Typography
variant="caption"
color="primary.main"
sx={{
display: 'block',
fontWeight: 700,
textTransform: 'uppercase',
}}
>
Passcode generator
</Typography>
<Typography color="text.secondary">
Generate a fresh Signify passcode or paste
an existing one.
</Typography>
</Box>
<Stack direction="row" spacing={1}>
<Tooltip title="Copy passcode">
<span>
<IconButton
aria-label="Copy passcode"
disabled={passcode.length === 0}
onClick={handleCopyPasscode}
>
<ContentCopyIcon />
</IconButton>
</span>
</Tooltip>
<Button
variant="contained"
color="primary"
data-testid="generate-passcode"
disabled={isSubmitting || isGenerating}
onClick={handleGeneratePasscode}
startIcon={<RefreshIcon />}
>
{isGenerating
? 'Generating...'
: 'Generate'}
</Button>
</Stack>
</Stack>
<TextField
id="outlined-password-input"
label="Passcode"
type="text"
autoComplete="current-password"
variant="outlined"
value={passcode}
onChange={(event) =>
setDraftPasscode(event.target.value)
onChange={(event) => {
setCopiedPasscode(false);
setDraftPasscode(event.target.value);
}}
helperText={
passcodeReady
? copiedPasscode
? 'Copied to clipboard'
: 'Ready to connect'
: 'Passcode must be at least 21 characters'
}
helperText="Passcode must be at least 21 characters"
fullWidth
/>
<Button
variant="contained"
color="primary"
data-testid="generate-passcode"
disabled={isSubmitting || isGenerating}
onClick={handleGeneratePasscode}
sx={{
alignSelf: {
xs: 'stretch',
sm: 'flex-start',
slotProps={{
input: {
sx: {
...monoValueSx,
fontSize: { xs: '1rem', sm: '1.12rem' },
},
},
inputLabel: {
shrink: true,
},
minHeight: 40,
mt: { xs: 0, sm: 1 },
}}
>
{isGenerating ? 'Creating...' : 'Create'}
</Button>
</Stack>
/>
</Box>

<Button
variant="contained"
color="primary"
data-testid="connect-submit"
disabled={
isSubmitting || isGenerating || passcode.length < 21
isSubmitting || isGenerating || !passcodeReady
}
onClick={handleConnect}
size="large"
fullWidth
>
{isSubmitting ? 'Connecting...' : 'Connect'}
</Button>
Expand All @@ -200,40 +238,59 @@ export const ConnectDialog = ({
{actionError}
</Typography>
)}
</Stack>
</DialogContent>
<Box sx={{ mt: 2 }}>
<Divider />
</Box>
<DialogActions sx={{ px: { xs: 2, sm: 3 }, pb: 2 }}>
<Grid container spacing={2} sx={{ width: '100%' }}>
<Grid size={12}>
<Button
fullWidth
disabled
data-testid={`connection-status-${connection.status}`}
sx={{
'&.Mui-disabled': {
background: isConnected ? 'green' : 'red',
color: 'black',
},
}}
<Box>
<Typography
variant="caption"
color="text.secondary"
sx={{ display: 'block', mb: 0.75, fontWeight: 700 }}
>
Status: {connectionStatusLabel(connection)}
</Button>
</Grid>

<Grid size={12}>
<Button
onClick={onClose}
color="primary"
KERIA target
</Typography>
<Autocomplete
id="combo-box-demo"
options={appConfig.connectionOptions}
getOptionLabel={(option) =>
`${option.label} (${option.adminUrl})`
}
isOptionEqualToValue={(option, value) =>
option.adminUrl === value.adminUrl &&
option.bootUrl === value.bootUrl
}
renderInput={(params) => (
<TextField
{...params}
label="Connection"
fullWidth
/>
)}
value={selectedConnection}
fullWidth
data-testid="connect-close"
onChange={(_event, newValue) => {
setSelectedConnection(
newValue ?? appConfig.connectionOptions[0]
);
}}
/>
<Typography
variant="caption"
color="text.secondary"
sx={{ display: 'block', mt: 0.75, ...monoValueSx }}
>
Close
</Button>
</Grid>
</Grid>
Admin {selectedConnection.adminUrl} | Boot{' '}
{selectedConnection.bootUrl}
</Typography>
</Box>
</Stack>
</DialogContent>
<DialogActions sx={{ px: { xs: 2, sm: 3 }, py: 2 }}>
<Button
onClick={onClose}
color="primary"
fullWidth
data-testid="connect-close"
>
Close
</Button>
</DialogActions>
</Dialog>
);
Expand Down
13 changes: 11 additions & 2 deletions src/app/ConnectionRequired.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Box, Typography } from '@mui/material';
import { ConsolePanel, StatusPill } from './Console';

/**
* Blocked-state view for routes that need a connected Signify client.
Expand All @@ -7,7 +8,15 @@ import { Box, Typography } from '@mui/material';
* direct URL navigation should be passive until the user chooses to connect.
*/
export const ConnectionRequired = () => (
<Box sx={{ p: 3 }} data-testid="connection-required">
<Typography>Connect to KERIA before opening this view.</Typography>
<Box sx={{ maxWidth: 720 }} data-testid="connection-required">
<ConsolePanel
title="KERIA connection required"
eyebrow="Access gate"
actions={<StatusPill label="offline" tone="error" />}
>
<Typography color="text.secondary">
Connect to KERIA before opening this view.
</Typography>
</ConsolePanel>
</Box>
);
Loading
Loading