About page updates

achhabra2 · Jun 10, 2022 · 13513fa · 13513fa
1 parent 966aa90
commit 13513fa
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 84 deletions.
diff --git a/frontend/dist/bundle.js b/frontend/dist/bundle.js
diff --git a/frontend/dist/bundle.js.map b/frontend/dist/bundle.js.map
diff --git a/frontend/src/about.svelte b/frontend/src/about.svelte
@@ -8,15 +8,15 @@
   const issueUrl = "https://github.com/achhabra2/riftshare/issues/new/choose";
 
   const attributions = {
-    "wailsapp/wails": "https://wails.io",
-    "Jacalz/rymdport": "https://github.com/Jacalz/rymdport",
-    "psanford/wormhole-william": "https://github.com/psanford/wormhole-william",
+    "wailsapp/wails [MIT]": "https://wails.io",
+    "Jacalz/rymdport [GPLv3]": "https://github.com/Jacalz/rymdport",
+    "psanford/wormhole-william [MIT]": "https://github.com/psanford/wormhole-william",
     "magic-wormhole": "https://magic-wormhole.readthedocs.io/",
-    svelte: "https://github.com/sveltejs/svelte",
-    tailwindcss: "https://github.com/tailwindlabs/tailwindcss",
+    "svelte [MIT]": "https://github.com/sveltejs/svelte",
+    "tailwindcss [MIT]": "https://github.com/tailwindlabs/tailwindcss",
     "font awesome": "https://fontawesome.com",
-    "klauspost/compress": "https://github.com/klauspost/compress",
-    "go-github-selfupdate": "https://github.com/rhysd/go-github-selfupdate",
+    "klauspost/compress [Apache 2.0]": "https://github.com/klauspost/compress",
+    "go-github-selfupdate [MIT]": "https://github.com/rhysd/go-github-selfupdate",
   };
   onMount(() => {
     GetCurrentVersion().then((ver) => {
@@ -51,20 +51,20 @@
     </div>
   </div>
 
-  <p class="text-sm mb-1">
+  <p class="text-sm italic mb-1">
     The goal of this project is to enable everyone to securely share files
     freely and easily.
   </p>
   <div class="mb-1">
     <p class="text-bold">License</p>
-    <p class="text-sm">Licensed under the GNU GPL Version 3</p>
+    <a href="https://www.gnu.org/licenses/gpl-3.0.en.html" class="text-sm underline">Licensed under the GNU GPL Version 3</a>
   </div>
   <div>
     <p class="text-bold">Attributions</p>
-    <p class="text-sm">
+    <p class="text-sm mb-1">
       This project leverages the work of other Open Source Software
     </p>
-    <ul class="text-xs file-list">
+    <ul class="text-xs file-list ml-2">
       {#each Object.entries(attributions) as [name, url]}
         <li>
           <button

diff --git a/frontend/wailsjs/go/main/App.d.ts b/frontend/wailsjs/go/main/App.d.ts
@@ -2,50 +2,50 @@
 // This file is automatically generated. DO NOT EDIT
 import {settings} from '../models';
 
-export function GetLogPath():Promise<string>;
+export function OpenDirectoryDialog():Promise<Array<string>|Error>;
 
-export function SetDownloadsFolder():Promise<string>;
+export function OpenFile(arg1:string):void;
 
-export function SetSelfUpdateParam(arg1:boolean):Promise<boolean>;
+export function OpenFilesDialog():Promise<Array<string>|Error>;
 
-export function GetSelectedFiles():Promise<Array<string>>;
+export function SendDirectory(arg1:string):void;
 
-export function OpenFile(arg1:string):void;
+export function SendFile(arg1:string):void;
 
-export function OpenFilesDialog():Promise<Array<string>|Error>;
+export function SetOverwriteParam(arg1:boolean):Promise<boolean>;
 
-export function PersistUserSettings():void;
+export function ShowErrorDialog(arg1:string):void;
+
+export function ClearSelectedFiles():void;
 
 export function VerifyNotificationIcon():Promise<string>;
 
-export function AppInstalledFromPackageManager():Promise<boolean>;
+export function UpdateSendProgress(arg1:number,arg2:number):void;
 
-export function ClearSelectedFiles():void;
+export function PersistUserSettings():void;
 
-export function ReceiveFile(arg1:string):void;
+export function CancelWormholeRequest():void;
 
-export function SendDirectory(arg1:string):void;
+export function GetSelectedFiles():Promise<Array<string>>;
 
-export function SendFile(arg1:string):void;
+export function ReceiveFile(arg1:string):void;
 
-export function SetNotificationsParam(arg1:boolean):Promise<boolean>;
+export function SetDownloadsFolder():Promise<string>;
 
-export function SetOverwriteParam(arg1:boolean):Promise<boolean>;
+export function SetNotificationsParam(arg1:boolean):Promise<boolean>;
 
-export function UpdateSendProgress(arg1:number,arg2:number):void;
+export function UpdateCheckUI():void;
 
-export function CancelWormholeRequest():void;
+export function AppInstalledFromPackageManager():Promise<boolean>;
 
-export function GetCurrentVersion():Promise<string>;
+export function GetLogPath():Promise<string>;
 
 export function GetReceivedFile():Promise<string>;
 
 export function GetUserPrefs():Promise<settings.UserSettings>;
 
-export function OpenDirectoryDialog():Promise<Array<string>|Error>;
-
 export function SelectedFilesSend():void;
 
-export function ShowErrorDialog(arg1:string):void;
+export function SetSelfUpdateParam(arg1:boolean):Promise<boolean>;
 
-export function UpdateCheckUI():void;
+export function GetCurrentVersion():Promise<string>;
diff --git a/frontend/wailsjs/go/main/App.js b/frontend/wailsjs/go/main/App.js
@@ -2,76 +2,80 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
-export function GetLogPath() {
-  return window['go']['main']['App']['GetLogPath']();
+export function OpenDirectoryDialog() {
+  return window['go']['main']['App']['OpenDirectoryDialog']();
 }
 
-export function SetDownloadsFolder() {
-  return window['go']['main']['App']['SetDownloadsFolder']();
+export function OpenFile(arg1) {
+  return window['go']['main']['App']['OpenFile'](arg1);
 }
 
-export function SetSelfUpdateParam(arg1) {
-  return window['go']['main']['App']['SetSelfUpdateParam'](arg1);
+export function OpenFilesDialog() {
+  return window['go']['main']['App']['OpenFilesDialog']();
 }
 
-export function GetSelectedFiles() {
-  return window['go']['main']['App']['GetSelectedFiles']();
+export function SendDirectory(arg1) {
+  return window['go']['main']['App']['SendDirectory'](arg1);
 }
 
-export function OpenFile(arg1) {
-  window['go']['main']['App']['OpenFile'](arg1);
+export function SendFile(arg1) {
+  return window['go']['main']['App']['SendFile'](arg1);
 }
 
-export function OpenFilesDialog() {
-  return window['go']['main']['App']['OpenFilesDialog']();
+export function SetOverwriteParam(arg1) {
+  return window['go']['main']['App']['SetOverwriteParam'](arg1);
 }
 
-export function PersistUserSettings() {
-  window['go']['main']['App']['PersistUserSettings']();
+export function ShowErrorDialog(arg1) {
+  return window['go']['main']['App']['ShowErrorDialog'](arg1);
+}
+
+export function ClearSelectedFiles() {
+  return window['go']['main']['App']['ClearSelectedFiles']();
 }
 
 export function VerifyNotificationIcon() {
   return window['go']['main']['App']['VerifyNotificationIcon']();
 }
 
-export function AppInstalledFromPackageManager() {
-  return window['go']['main']['App']['AppInstalledFromPackageManager']();
+export function UpdateSendProgress(arg1, arg2) {
+  return window['go']['main']['App']['UpdateSendProgress'](arg1, arg2);
 }
 
-export function ClearSelectedFiles() {
-  window['go']['main']['App']['ClearSelectedFiles']();
+export function PersistUserSettings() {
+  return window['go']['main']['App']['PersistUserSettings']();
 }
 
-export function ReceiveFile(arg1) {
-  window['go']['main']['App']['ReceiveFile'](arg1);
+export function CancelWormholeRequest() {
+  return window['go']['main']['App']['CancelWormholeRequest']();
 }
 
-export function SendDirectory(arg1) {
-  window['go']['main']['App']['SendDirectory'](arg1);
+export function GetSelectedFiles() {
+  return window['go']['main']['App']['GetSelectedFiles']();
 }
 
-export function SendFile(arg1) {
-  window['go']['main']['App']['SendFile'](arg1);
+export function ReceiveFile(arg1) {
+  return window['go']['main']['App']['ReceiveFile'](arg1);
 }
 
-export function SetNotificationsParam(arg1) {
-  return window['go']['main']['App']['SetNotificationsParam'](arg1);
+export function SetDownloadsFolder() {
+  return window['go']['main']['App']['SetDownloadsFolder']();
 }
 
-export function SetOverwriteParam(arg1) {
-  return window['go']['main']['App']['SetOverwriteParam'](arg1);
+export function SetNotificationsParam(arg1) {
+  return window['go']['main']['App']['SetNotificationsParam'](arg1);
 }
 
-export function UpdateSendProgress(arg1, arg2) {
-  window['go']['main']['App']['UpdateSendProgress'](arg1, arg2);
+export function UpdateCheckUI() {
+  return window['go']['main']['App']['UpdateCheckUI']();
 }
 
-export function CancelWormholeRequest() {
-  window['go']['main']['App']['CancelWormholeRequest']();
+export function AppInstalledFromPackageManager() {
+  return window['go']['main']['App']['AppInstalledFromPackageManager']();
 }
 
-export function GetCurrentVersion() {
-  return window['go']['main']['App']['GetCurrentVersion']();
+export function GetLogPath() {
+  return window['go']['main']['App']['GetLogPath']();
 }
 
 export function GetReceivedFile() {
@@ -82,18 +86,14 @@ export function GetUserPrefs() {
   return window['go']['main']['App']['GetUserPrefs']();
 }
 
-export function OpenDirectoryDialog() {
-  return window['go']['main']['App']['OpenDirectoryDialog']();
-}
-
 export function SelectedFilesSend() {
-  window['go']['main']['App']['SelectedFilesSend']();
+  return window['go']['main']['App']['SelectedFilesSend']();
 }
 
-export function ShowErrorDialog(arg1) {
-  window['go']['main']['App']['ShowErrorDialog'](arg1);
+export function SetSelfUpdateParam(arg1) {
+  return window['go']['main']['App']['SetSelfUpdateParam'](arg1);
 }
 
-export function UpdateCheckUI() {
-  window['go']['main']['App']['UpdateCheckUI']();
+export function GetCurrentVersion() {
+  return window['go']['main']['App']['GetCurrentVersion']();
 }
diff --git a/go.mod b/go.mod
@@ -29,7 +29,6 @@ require (
 	github.com/labstack/echo/v4 v4.7.2 // indirect
 	github.com/labstack/gommon v0.3.1 // indirect
 	github.com/leaanthony/go-ansi-parser v1.5.0 // indirect
-	github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect
 	github.com/leaanthony/gosod v1.0.3 // indirect
 	github.com/leaanthony/slicer v1.6.0 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
@@ -58,3 +57,5 @@ require (
 	nhooyr.io/websocket v1.8.7 // indirect
 	salsa.debian.org/vasudev/gospake2 v0.0.0-20210510093858-d91629950ad1 // indirect
 )
+
+replace github.com/wailsapp/wails/v2 => /home/aman/Documents/code/wails/v2
diff --git a/go.sum b/go.sum
@@ -88,7 +88,6 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
@@ -169,7 +168,6 @@ github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hf
 github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
@@ -241,8 +239,6 @@ github.com/leaanthony/debme v1.2.1 h1:9Tgwf+kjcrbMQ4WnPcEIUcQuIZYqdWftzZkBr+i/oO
 github.com/leaanthony/debme v1.2.1/go.mod h1:3V+sCm5tYAgQymvSOfYQ5Xx2JCr+OXiD9Jkw3otUjiA=
 github.com/leaanthony/go-ansi-parser v1.5.0 h1:dOV8Kn+z7MW5fxCTRdAOQ35seL7PGjFSBtnEDXQhdcI=
 github.com/leaanthony/go-ansi-parser v1.5.0/go.mod h1:+vva/2y4alzVmmIEpk9QDhA7vLC5zKDTRwfZGOp3IWU=
-github.com/leaanthony/go-common-file-dialog v1.0.3 h1:O0uGjKnWtdEADGrkg+TyAAbZylykMwwx/MNEXn9fp+Y=
-github.com/leaanthony/go-common-file-dialog v1.0.3/go.mod h1:TGhEc9eSJgRsupZ+iH1ZgAOnEo9zp05cRH2j08RPrF0=
 github.com/leaanthony/gosod v1.0.3 h1:Fnt+/B6NjQOVuCWOKYRREZnjGyvg+mEhd1nkkA04aTQ=
 github.com/leaanthony/gosod v1.0.3/go.mod h1:BJ2J+oHsQIyIQpnLPjnqFGTMnOZXDbvWtRCSG7jGxs4=
 github.com/leaanthony/slicer v1.5.0/go.mod h1:FwrApmf8gOrpzEWM2J/9Lh79tyq8KTX5AzRtwV7m4AY=
@@ -370,8 +366,6 @@ github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52
 github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 github.com/wailsapp/mimetype v1.4.1 h1:pQN9ycO7uo4vsUUuPeHEYoUkLVkaRntMnHJxVwYhwHs=
 github.com/wailsapp/mimetype v1.4.1/go.mod h1:9aV5k31bBOv5z6u+QP8TltzvNGJPmNJD4XlAL3U+j3o=
-github.com/wailsapp/wails/v2 v2.0.0-beta.37 h1:LQpw4vXUl8v1tOyqIwbMVivclruUKpnYu8fRHIwcPkI=
-github.com/wailsapp/wails/v2 v2.0.0-beta.37/go.mod h1:dPVZfCu+SSg6HddAATME5Wj1ObXhSGIYDS7K88P383c=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

diff --git a/main.go b/main.go
@@ -6,6 +6,7 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+	"runtime"
 
 	"github.com/wailsapp/wails/v2/pkg/options/mac"
 
@@ -26,6 +27,11 @@ var icon []byte
 
 func main() {
 
+	if runtime.GOOS == "linux" {
+		_ = os.Setenv("GDK_BACKEND", "wayland,x11")
+		// _ = os.Setenv("GTK_USE_PORTAL", "1")
+	}
+
 	settingsDir, ferr := settings.GetSettingsDirectory()
 	if ferr != nil {
 		log.Fatal("Could not open settings directory")