diff --git a/fclauncher/Admin.go b/fclauncher/Admin.go
index fcec963..52d926a 100644
--- a/fclauncher/Admin.go
+++ b/fclauncher/Admin.go
@@ -1,6 +1,8 @@
package main
import (
+ "fmt"
+
"golang.org/x/crypto/ssh"
)
@@ -9,16 +11,17 @@ type Admin struct {
}
func sftpConnect(conf *ssh.ClientConfig) (ssh.Conn, error) {
- return ssh.Dial("tcp", "gitea.piwalker.net:22", conf)
+ return ssh.Dial("tcp", "gitea-svr.piwalker.net:22", conf)
}
func sftpAuth(username string, password string) (*ssh.ClientConfig, error) {
+ key, _, _, _, err := ssh.ParseAuthorizedKey([]byte("gitea-svr.piwalker.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILkyh7MDvubWw4OzTFbvsUz7gOmOzBq77i5Q86STKqja"));
config := &ssh.ClientConfig{
User: username,
Auth: []ssh.AuthMethod{
ssh.Password(password),
},
- HostKeyCallback: ssh.InsecureIgnoreHostKey(),
+ HostKeyCallback: ssh.FixedHostKey(key),
}
conn, err := sftpConnect(config)
@@ -29,9 +32,10 @@ func sftpAuth(username string, password string) (*ssh.ClientConfig, error) {
return config, nil
}
-func (a *Admin)adminAuth(username string, password string) bool {
+func (a *Admin) AdminAuth(username string, password string) bool {
conf, err := sftpAuth(username, password)
if err != nil {
+ fmt.Println("SFTP error: ", err)
a.conf = nil
return false
}
diff --git a/fclauncher/frontend/src/AdminLogin.svelte b/fclauncher/frontend/src/AdminLogin.svelte
new file mode 100644
index 0000000..cf9616d
--- /dev/null
+++ b/fclauncher/frontend/src/AdminLogin.svelte
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+ {#if loginFail}
+ Login Failed!
+ {/if}
+
+
+
+
diff --git a/fclauncher/frontend/src/AdminPage.svelte b/fclauncher/frontend/src/AdminPage.svelte
new file mode 100644
index 0000000..b3b6f89
--- /dev/null
+++ b/fclauncher/frontend/src/AdminPage.svelte
@@ -0,0 +1,33 @@
+
+
+ Admin
+
+ {#if $adminLogin}
+
+ {:else}
+
+ {/if}
+
+ Admin Settings Placeholder
+
+
+
+
diff --git a/fclauncher/frontend/src/App.svelte b/fclauncher/frontend/src/App.svelte
index 2eb1bc0..2139101 100644
--- a/fclauncher/frontend/src/App.svelte
+++ b/fclauncher/frontend/src/App.svelte
@@ -12,6 +12,7 @@
import { set_attributes, set_style } from 'svelte/internal';
import {GetInstances} from '../wailsjs/go/main/InstanceManager.js'
import Settingspage from './Settingspage.svelte';
+ import AdminPage from './AdminPage.svelte';
let width: number = 10
let navMargin = document.getElementById("body") as HTMLElement;
@@ -75,10 +76,15 @@
- {:else if $currentPage == 4}
+ {:else if $currentPage == 4}
+ {:else if $currentPage == 5}
+
+
{/if}
diff --git a/fclauncher/frontend/src/Navbar.svelte b/fclauncher/frontend/src/Navbar.svelte
index fb6a633..a5c06d8 100644
--- a/fclauncher/frontend/src/Navbar.svelte
+++ b/fclauncher/frontend/src/Navbar.svelte
@@ -63,6 +63,15 @@ function unextend(){
+