Skip to content

Commit 7977ac9

Browse files
davidnewhalldavidnewhall
authored
Pretty a few things (#73)
2 parents 807ca3e + 732d862 commit 7977ac9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+222
-206
lines changed

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
AC_USERNAME: ${{ secrets.AC_USERNAME }}
6161
AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
6262
run: |
63-
wails build -debug -m -trimpath -platform darwin/universal -webview2 embed -ldflags='${{ env.VERSION_LDFLAGS }}'
63+
wails build -m -trimpath -platform darwin/universal -webview2 embed -ldflags='${{ env.VERSION_LDFLAGS }}'
6464
brew install mitchellh/gon/gon
6565
build/darwin/makedmg.sh
6666
@@ -72,7 +72,7 @@ jobs:
7272
sudo apt install -y libgtk-3-0 libwebkit2gtk-4.0-dev nsis osslsigncode rpm fakeroot zip debsigs gnupg jq
7373
sudo gem install --no-document fpm
7474
go mod vendor
75-
wails build -debug -trimpath -platform linux/amd64 -webview2 embed -o toolbarr.amd64 -ldflags='${{ env.VERSION_LDFLAGS }}'
75+
wails build -trimpath -platform linux/amd64 -webview2 embed -o toolbarr.amd64 -ldflags='${{ env.VERSION_LDFLAGS }}'
7676
7777
# This one sucked to figure out, and it's slow, but it works!
7878
# - name: Build Linux ARM
@@ -98,8 +98,8 @@ jobs:
9898
EXE_SIGNING_KEY: ${{ secrets.EXE_SIGNING_KEY }}
9999
EXE_SIGNING_KEY_PASSWORD: ${{ secrets.EXE_SIGNING_KEY_PASSWORD }}
100100
run: |
101-
wails build -debug -s -m -trimpath -platform windows/amd64 -nsis -webview2 embed -o Toolbarr.amd64.exe -ldflags='${{ env.VERSION_LDFLAGS }}'
102-
wails build -debug -s -m -trimpath -platform windows/arm64 -nsis -webview2 embed -o Toolbarr.arm64.exe -ldflags='${{ env.VERSION_LDFLAGS }}'
101+
wails build -s -m -trimpath -platform windows/amd64 -nsis -webview2 embed -o Toolbarr.amd64.exe -ldflags='${{ env.VERSION_LDFLAGS }}'
102+
wails build -s -m -trimpath -platform windows/arm64 -nsis -webview2 embed -o Toolbarr.arm64.exe -ldflags='${{ env.VERSION_LDFLAGS }}'
103103
for FILE in build/bin/*.a??64.exe; do zip -9j "${FILE%.*}.zip" "${FILE}"; done
104104
105105
- name: Package Linux Binaries

‎build/darwin/Info.dev.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<string>{{.Info.Copyright}}</string>
2626
<key>NSAppTransportSecurity</key>
2727
<dict>
28-
<key>NSAllowsLocalNetworking</key>
28+
<key>NSAllowsArbitraryLoads</key>
2929
<true/>
3030
</dict>
3131
</dict>

‎build/darwin/Info.plist‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,10 @@
2323
<string>true</string>
2424
<key>NSHumanReadableCopyright</key>
2525
<string>{{.Info.Copyright}}</string>
26+
<key>NSAppTransportSecurity</key>
27+
<dict>
28+
<key>NSAllowsArbitraryLoads</key>
29+
<true/>
30+
</dict>
2631
</dict>
2732
</plist>

‎frontend/src/About.svelte‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
import Fa from "svelte-fa"
55
import { faGithub, faDiscord } from "@fortawesome/free-brands-svg-icons"
66
import { faGear } from "@fortawesome/free-solid-svg-icons"
7-
import { EventsOn, EventsOff } from "../wailsjs/runtime"
8-
import { CheckUpdate, DownloadUpdate, LaunchInstaller, OpenFolder } from "../wailsjs/go/app/App"
7+
import { EventsOn, EventsOff } from "/wailsjs/runtime"
8+
import { CheckUpdate, DownloadUpdate, LaunchInstaller, OpenFolder } from "/wailsjs/go/app/App"
99
import { Container, Row, Table, Col, Card, Tooltip, Button, Progress, Badge } from "sveltestrap"
10-
import BGLogo from "./libs/BackgroundLogo.svelte"
11-
import { app, conf } from "./libs/config"
12-
import { toast, onOnce, onInterval } from "./libs/funcs"
13-
import T, { _ } from "./libs/Translate.svelte"
10+
import BGLogo from "/src/libs/BackgroundLogo.svelte"
11+
import { app, conf } from "/src/libs/config"
12+
import { toast, onOnce, onInterval } from "/src/libs/funcs"
13+
import T, { _ } from "/src/libs/Translate.svelte"
1414
1515
let update = {
1616
Downloading: "",

‎frontend/src/Landing.svelte‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<script lang="ts">
22
export let hidden = false
33
4-
import mainLogo from "./assets/images/logo.png"
5-
import BGLogo from "./libs/BackgroundLogo.svelte"
6-
import { _ } from "./libs/Translate.svelte"
4+
import mainLogo from "/src/assets/images/logo.png"
5+
import BGLogo from "/src/libs/BackgroundLogo.svelte"
6+
import { _ } from "/src/libs/Translate.svelte"
77
</script>
88

99
<BGLogo {hidden}>

‎frontend/src/Links.svelte‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
export let hidden: boolean = false
33
44
import { Container, Row } from "sveltestrap"
5-
import BGLogo from "./libs/BackgroundLogo.svelte"
6-
import { _ } from "./libs/Translate.svelte"
5+
import BGLogo from "/src/libs/BackgroundLogo.svelte"
6+
import { _ } from "/src/libs/Translate.svelte"
77
import { Card } from "sveltestrap"
88
</script>
99

‎frontend/src/Navbar.svelte‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,27 @@
1111
NavbarToggler,
1212
NavLink,
1313
Tooltip
14-
} from "sveltestrap"
15-
import { EventsOn } from "../wailsjs/runtime"
14+
} from "sveltestrap"
15+
import { EventsOn } from "/wailsjs/runtime"
1616
import Fa from "svelte-fa"
1717
import { faGear, faBookBible, faLink } from "@fortawesome/free-solid-svg-icons"
18-
import About from "./About.svelte"
19-
import Landing from "./Landing.svelte"
20-
import Starr from "./Starr/Index.svelte"
21-
import Toolbox from "./Toolbox.svelte"
22-
import Links from "./Links.svelte"
23-
import Settings from "./Settings/Index.svelte"
24-
import Applogo from "./libs/Applogo.svelte"
18+
import About from "/src/About.svelte"
19+
import Landing from "/src/Landing.svelte"
20+
import Starr from "/src/Starr/Index.svelte"
21+
import Toolbox from "/src/Toolbox.svelte"
22+
import Links from "/src/Links.svelte"
23+
import Settings from "/src/Settings/Index.svelte"
24+
import Applogo from "/src/libs/Applogo.svelte"
2525
import { ToastContainer, FlatToast } from "svelte-toasts"
2626
import { app, conf, AllStarrs } from "./libs/config"
27-
import ConfigInput from "./libs/Input.svelte"
28-
import bgVint from "./assets/images/vintage-background.png"
29-
import bgDark from "./assets/images/dark-background.png"
30-
import { _, isReady } from "./libs/Translate.svelte"
31-
import { toast } from "./libs/funcs"
32-
import darkCSS from "./assets/bootstrap.darkly.css?url"
33-
import liteCSS from "./assets/bootstrap.flatly.css?url"
34-
import icons from "./assets/bootstrap-icons.css?url"
27+
import ConfigInput from "/src/libs/Input.svelte"
28+
import bgVint from "/src/assets/images/vintage-background.png"
29+
import bgDark from "/src/assets/images/dark-background.png"
30+
import { _, isReady } from "/src/libs/Translate.svelte"
31+
import { toast } from "/src/libs/funcs"
32+
import darkCSS from "/src/assets/bootstrap.darkly.css?url"
33+
import liteCSS from "/src/assets/bootstrap.flatly.css?url"
34+
import icons from "/src/assets/bootstrap-icons.css?url"
3535
3636
let isOpen = false // nav open/closer tracker (mobile)
3737
$: pageName = $app.Title

‎frontend/src/Settings/Advanced.svelte‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<script lang="ts">
22
import { Input, InputGroup, InputGroupText } from "sveltestrap"
3-
import ConfigInput from "../libs/Input.svelte"
4-
import { app } from "../libs/config"
5-
import { _ } from "../libs/Translate.svelte"
3+
import ConfigInput from "/src/libs/Input.svelte"
4+
import { app } from "/src/libs/config"
5+
import { _ } from "/src/libs/Translate.svelte"
66
</script>
77

88
<p>{$_("advanced_application_settings")}</p>

‎frontend/src/Settings/General.svelte‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<script lang="ts">
22
import { Button, InputGroup, Offcanvas } from "sveltestrap"
3-
import ConfigInput from "../libs/Input.svelte"
4-
import { conf } from "../libs/config"
5-
import { Languages } from "../../wailsjs/go/app/App"
3+
import ConfigInput from "/src/libs/Input.svelte"
4+
import { conf } from "/src/libs/config"
5+
import { Languages } from "/wailsjs/go/app/App"
66
import { faQuestion } from "@fortawesome/free-solid-svg-icons"
77
import Fa from "svelte-fa"
8-
import T, { _ } from "../libs/Translate.svelte"
8+
import T, { _ } from "/src/libs/Translate.svelte"
99
1010
let langHelp = false
1111
let langs = undefined

‎frontend/src/Settings/Index.svelte‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
export let hidden = false
33
44
import { Button, Container, Form, InputGroup, Nav, NavLink, Offcanvas, Row } from "sveltestrap"
5-
import Logs from "./Logs.svelte"
6-
import Advanced from "./Advanced.svelte"
7-
import { CreateShortcut } from "../../wailsjs/go/app/App"
8-
import BGLogo from "../libs/BackgroundLogo.svelte"
5+
import Logs from "/src/Settings/Logs.svelte"
6+
import Advanced from "/src/Settings/Advanced.svelte"
7+
import General from "/src/Settings/General.svelte"
8+
import { CreateShortcut } from "/wailsjs/go/app/App"
9+
import BGLogo from "/src/libs/BackgroundLogo.svelte"
910
import Fa from "svelte-fa"
1011
import { faQuestion } from "@fortawesome/free-solid-svg-icons"
11-
import { conf, app } from "../libs/config"
12-
import windowsConf from "../assets/images/windows-conf-file.png"
13-
import { toast } from "../libs/funcs"
14-
import ConfigInput from "../libs/Input.svelte"
15-
import General from "./General.svelte"
16-
import T, { _ } from "../libs/Translate.svelte"
12+
import { conf, app } from "/src/libs/config"
13+
import windowsConf from "/src/assets/images/windows-conf-file.png"
14+
import { toast } from "/src/libs/funcs"
15+
import ConfigInput from "/src/libs/Input.svelte"
16+
import T, { _ } from "/src/libs/Translate.svelte"
1717
1818
let activeTab = Logs
1919
let confHelp = false

0 commit comments

Comments
 (0)