Skip to content

Commit a8b0073

Browse files
committed
Merge remote-tracking branch 'origin/main' into wsl-autoinstall
2 parents c6f4b55 + f8c0ed8 commit a8b0073

3 files changed

Lines changed: 41 additions & 3 deletions

File tree

src/components/Menu/MenuBarDefinition.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,14 @@ export default [
369369
openUrl("https://github.com/nab138/CrossCode/issues");
370370
},
371371
},
372+
{
373+
name: "Troubleshooting",
374+
callback: () => {
375+
openUrl(
376+
"https://github.com/nab138/CrossCode/wiki/Troubleshooting"
377+
);
378+
},
379+
},
372380
],
373381
},
374382
{

src/components/SwiftMenu.tsx

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
import { Button, FormControl, Radio, RadioGroup, Typography } from "@mui/joy";
1+
import {
2+
Button,
3+
FormControl,
4+
Link,
5+
Radio,
6+
RadioGroup,
7+
Typography,
8+
} from "@mui/joy";
29
import { Toolchain, useIDE } from "../utilities/IDEContext";
310
import { useEffect, useState } from "react";
411
import { openUrl } from "@tauri-apps/plugin-opener";
@@ -87,7 +94,20 @@ export default () => {
8794
>
8895
swiftly install 6.1
8996
</span>
90-
" or manually.
97+
" or manually. If you have already done so, but it is not showing up,
98+
your toolchain installation may be broken. For help, refer to the{" "}
99+
<Link
100+
href="#"
101+
onClick={(e) => {
102+
e.preventDefault();
103+
openUrl(
104+
"https://github.com/nab138/CrossCode/wiki/Troubleshooting#swift-toolchain-not-detected"
105+
);
106+
}}
107+
>
108+
troubleshooting guide
109+
</Link>
110+
.
91111
</Typography>
92112
)}
93113
{toolchains !== null && allToolchains.length > 0 && (

src/pages/Onboarding.tsx

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,17 @@ export default ({}: OnboardingProps) => {
9696
>
9797
github
9898
</Link>
99-
.
99+
. Check the{" "}
100+
<Link
101+
href="#"
102+
onClick={(e) => {
103+
e.preventDefault();
104+
open("https://github.com/nab138/CrossCode/wiki/Troubleshooting");
105+
}}
106+
>
107+
troubleshooting guide
108+
</Link>{" "}
109+
for known issues and workarounds.
100110
</Typography>
101111
</div>
102112
<div className="onboarding-buttons">

0 commit comments

Comments
 (0)