Skip to content

Commit 5f3afdf

Browse files
committed
WIP
1 parent 3c4930b commit 5f3afdf

File tree

6 files changed

+9895
-2645
lines changed

6 files changed

+9895
-2645
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
password: ${{ secrets.DOCKERHUB_TOKEN }}
2121
- name: Extract metadata (tags, labels) for Docker
2222
id: meta
23-
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
23+
uses: docker/metadata-action@v5
2424
with:
2525
images: joepmeneer/atomic-server
2626
github-token: ${{ secrets.GITHUB_TOKEN }}

browser/data-browser/src/components/ErrorLook.tsx

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { styled, css } from 'styled-components';
33

44
import { FaExclamationTriangle } from 'react-icons/fa';
55
import { Column } from './Row';
6+
import { CodeBlock } from './CodeBlock';
67

78
export const errorLookStyle = css`
89
color: ${props => props.theme.colors.alert};
@@ -27,17 +28,11 @@ export function ErrorBlock({ error, showTrace }: ErrorBlockProps): JSX.Element {
2728
Something went wrong
2829
</BiggerText>
2930
<Column>
30-
<CodeBlock>{error.message}</CodeBlock>
31+
<CodeBlock content={error.message || 'no error message available'} />
3132
{showTrace && (
3233
<>
3334
Stack trace:
34-
<CodeBlock
35-
style={{
36-
maxHeight: '10rem',
37-
}}
38-
>
39-
{error.stack}
40-
</CodeBlock>
35+
<CodeBlock content={error.stack || 'no stack trace available'} />
4136
</>
4237
)}
4338
</Column>
@@ -46,12 +41,11 @@ export function ErrorBlock({ error, showTrace }: ErrorBlockProps): JSX.Element {
4641
}
4742

4843
const ErrorLookBig = styled.div`
49-
color: ${p => p.theme.colors.alert};
5044
font-size: 1rem;
5145
padding: ${p => p.theme.margin}rem;
5246
border-radius: ${p => p.theme.radius};
5347
border: 1px solid ${p => lighten(0.2, p.theme.colors.alert)};
54-
background-color: ${p => p.theme.colors.bg1};
48+
background-color: ${p => p.theme.colors.bg};
5549
`;
5650

5751
const Pre = styled.pre`
@@ -63,6 +57,7 @@ const Pre = styled.pre`
6357
`;
6458

6559
const BiggerText = styled.p`
60+
color: ${p => p.theme.colors.alert};
6661
font-size: 1.3rem;
6762
display: flex;
6863
align-items: center;

browser/data-browser/src/components/RegisterSignIn.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export function RegisterSignIn({
8282
Sign In
8383
</Button>
8484
</Row>
85-
<Dialog {...dialogProps}>
85+
{/* <Dialog {...dialogProps}>
8686
{pageState === PageStateOpts.register && (
8787
<Register
8888
setPageState={setPageState}
@@ -114,7 +114,7 @@ export function RegisterSignIn({
114114
message={'Click that link to create a new PassPhrase.'}
115115
/>
116116
)}
117-
</Dialog>
117+
</Dialog> */}
118118
</>
119119
);
120120
}

browser/data-browser/src/views/ErrorPage.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { Guard } from '../components/Guard';
1717
function ErrorPage({ resource }: ResourcePageProps): JSX.Element {
1818
const { agent } = useSettings();
1919
const store = useStore();
20-
const subject = resource.getSubject();
20+
const subject = resource.subject;
2121

2222
React.useEffect(() => {
2323
// Try again when agent changes
@@ -60,8 +60,8 @@ function ErrorPage({ resource }: ResourcePageProps): JSX.Element {
6060
return (
6161
<ContainerWide>
6262
<Column>
63-
<h1>Could not open {resource.getSubject()}</h1>
64-
<ErrorBlock error={resource.error!} />
63+
<h1>Could not open {resource.subject}</h1>
64+
<ErrorBlock error={resource.error!} showTrace />
6565
<Row>
6666
<Button
6767
onClick={() =>

0 commit comments

Comments
 (0)