+
diff --git a/src/components/Home.jsx b/src/components/Home.jsx
deleted file mode 100644
index 5387093..0000000
--- a/src/components/Home.jsx
+++ /dev/null
@@ -1,129 +0,0 @@
-import {
- faEdit,
- faSignOut,
- faTerminal,
-} from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import React, { useContext, useEffect, useState } from "react";
-import { Button, Card } from "react-bootstrap";
-import { Link, useLocation, useNavigate } from "react-router-dom";
-import { TerminalCxt, firebaseContext, serverContext } from "./App";
-import Terminal from "./Terminal/Terminal";
-import { To_chat } from "./utils/Navigations";
-function Home() {
- const firebase = useContext(firebaseContext);
- const server = useContext(serverContext);
- const location = useLocation();
- const terminalCxt = useContext(TerminalCxt);
- function setTerminalVisibility(e) {
- terminalCxt.setTerminalVisibility(e);
- }
- useEffect(() => {
- if (location.state?.serverToBeCreated == true) {
- createServer();
- }
- }, [location]);
-
- const navigate = useNavigate();
- function signOut() {
- firebase.signout();
- }
- function handleNotAuthed() {
- navigate("/auth/login", {
- state: { continue__: "/", serverToBeCreated: true },
- });
- }
- function createServer() {
- console.log("creating server");
- if (!server.server) {
- server.createServer(
- () => {
- handleNotAuthed();
- },
- (e) => navigate("/server/" + e)
- );
- }
- console.log("server created" + server.serverName);
- }
- function handleStop() {
- server.stopServer(() => navigate("/"));
- }
- function handleExit() {
- server.exitServer(() => navigate("/"));
- }
- return (
- <>
-
{terminalCxt.isVisible ||(
-
+
)}
-
-
-
-
- {server.server ? (
- "} />
- ) : (
-
- )}
-
-
- );
-}
-
-export default Home;
diff --git a/src/components/Home/Home.jsx b/src/components/Home/Home.jsx
new file mode 100644
index 0000000..d56b151
--- /dev/null
+++ b/src/components/Home/Home.jsx
@@ -0,0 +1,140 @@
+import {
+ faEdit,
+ faSignOut,
+ faTerminal,
+} from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import React, { useContext, useEffect, useState } from "react";
+import { button, Card } from "react-bootstrap";
+import { Link, useLocation, useNavigate } from "react-router-dom";
+import { TerminalCxt, firebaseContext, serverContext } from "../App";
+import Terminal from "../Terminal/Terminal";
+import { To_chat } from "../utils/Navigations";
+import "./index.sass";
+
+function Home() {
+ const firebase = useContext(firebaseContext);
+ const server = useContext(serverContext);
+ const location = useLocation();
+ const terminalCxt = useContext(TerminalCxt);
+ function setTerminalVisibility(e) {
+ terminalCxt.setTerminalVisibility(e);
+ }
+ useEffect(() => {
+ if (location.state?.serverToBeCreated == true) {
+ createServer();
+ }
+ }, [location]);
+
+ const navigate = useNavigate();
+ function signOut() {
+ firebase.signout();
+ }
+ function handleNotAuthed() {
+ navigate("/auth/login", {
+ state: { continue__: "/", serverToBeCreated: true },
+ });
+ }
+ function createServer() {
+ console.log("creating server");
+ if (!server.server) {
+ server.createServer(
+ () => {
+ handleNotAuthed();
+ },
+ (e) => navigate("/server/" + e)
+ );
+ }
+ console.log("server created" + server.serverName);
+ }
+ function handleStop() {
+ server.stopServer(() => navigate("/"));
+ }
+ function handleExit() {
+ server.exitServer(() => navigate("/"));
+ }
+ return (
+
-
- Hi,
-
- {firebase?.currentUser?.displayName}
-
-
-
-
-
-
-
-
{" "}
-
-
-
-
- ) : (
- {server.serverName}
- {server.isMyServer() ? (
-
- ) : (
-
- )}
-
-
-
-
- Jump to Server
-
-
- )}
- {terminalCxt.isVisible ? (
-
+
+
+
+
+ {server.server ? (
+ "} />
+ ) : (
+
+ )}
+
+ );
+}
+
+export default Home;
diff --git a/src/components/Home/index.js b/src/components/Home/index.js
new file mode 100644
index 0000000..f00a217
--- /dev/null
+++ b/src/components/Home/index.js
@@ -0,0 +1,2 @@
+import Home from "./Home.jsx"
+export default Home;
diff --git a/src/components/Home/index.sass b/src/components/Home/index.sass
new file mode 100644
index 0000000..dd6d7c1
--- /dev/null
+++ b/src/components/Home/index.sass
@@ -0,0 +1,4 @@
+@import "/src/css/mixin.sass"
+.home
+ .bg-glass
+ @include bgglass
diff --git a/src/components/JumpToServer.jsx b/src/components/JumpToServer.jsx
index b8a5ff7..523d02d 100644
--- a/src/components/JumpToServer.jsx
+++ b/src/components/JumpToServer.jsx
@@ -3,18 +3,25 @@ import { Button, Form } from "react-bootstrap";
import { useLocation, useNavigate, useParams } from "react-router-dom";
import { Back } from "./utils/Navigations";
import QRScan from "./utils/QRScan";
-import { serverContext } from "./App";
+import { firebaseContext, serverContext } from "./App";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faCheck } from "@fortawesome/free-solid-svg-icons";
+import Loading from "./utils/Loading";
function JumpToServer() {
const server = useContext(serverContext);
const params_server_url = useParams()["server"];
const [serverName, setServerName] = useState("");
+ const [showInterface, setShowInterface] = useState(false);
+ const firebase = useContext(firebaseContext);
const navigate = useNavigate();
-
+ const location = useLocation();
+ useEffect(() => {
+ if (location.state?.isReloaded) setShowInterface(false);
+ else setShowInterface(true);
+ }, [location]);
function handleNotAuthed(s_name) {
navigate("/auth/login", {
- state: { continue__: "/jump/" + s_name },
+ state: { ...location.state, continue__: "/jump/" + s_name },
});
}
@@ -28,14 +35,19 @@ function JumpToServer() {
function tryServer(sname, ifNotFound = function () {}) {
let s_name = validateServerName(sname);
if (isValidServerName(s_name))
- server.jumpToServer(
- s_name,
- () => handleNotAuthed(s_name),
- (e) => {
- if (e) navigate("/server/" + s_name + "/chat");
- else ifNotFound();
- }
- );
+ if (firebase.currentUser)
+ server.jumpToServer(
+ s_name,
+ () => handleNotAuthed(s_name),
+ (e) => {
+ if (e) {
+ if (location.state?.continue__) {
+ console.log("continue__", location.state.continue__);
+ navigate(location.state.continue__);
+ } else navigate("/server/" + s_name + "/chat");
+ } else ifNotFound();
+ }
+ );
}
function validateServerName(e) {
let s_name = e;
@@ -53,45 +65,56 @@ function JumpToServer() {
tryServer(serverName);
}
return (
-
+
+ Hi,
+
+ {firebase?.currentUser?.displayName}
+
+
+
+
+
+
+
+
{" "}
+
+
+
+
+ ) : (
+ {server.serverName}
+ {server.isMyServer() ? (
+
+ ) : (
+
+ )}
+
+
+
+
+ Jump to Server
+
+
+ )}
+ {terminalCxt.isVisible ? (
+
+
{
- setServerName(validateServerName(e)); // console.log(e);
- tryServer(validateServerName(e));
- }}
- style={{ width: "40vmin", height: "40vmin" }}
- />
-
+ {showInterface ? (
+ <>
+ {
+ setServerName(validateServerName(e)); // console.log(e);
+ tryServer(validateServerName(e));
+ }}
+ style={{ width: "40vmin", height: "40vmin" }}
+ />
+
+
+ ) : (
+
);
diff --git a/src/components/ServerInfo.jsx b/src/components/ServerInfo.jsx
index 0df9a85..ef9b365 100644
--- a/src/components/ServerInfo.jsx
+++ b/src/components/ServerInfo.jsx
@@ -6,20 +6,34 @@ import {
faTerminal,
} from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import React, { useContext } from "react";
+import React, { useContext, useEffect } from "react";
import { Button } from "react-bootstrap";
-import { Link, useNavigate } from "react-router-dom";
+import { Link, useNavigate, useParams } from "react-router-dom";
import { Back, To_chat } from "./utils/Navigations";
import { TerminalCxt, serverContext } from "./App";
import Terminal from "./Terminal/Terminal";
-import {shareServer }from "./utils/js/utils";
+import { shareServer } from "./utils/js/utils";
function ServerInfo() {
const server = useContext(serverContext);
const terminalCxt = useContext(TerminalCxt);
+ const navigate = useNavigate();
+ const params = useParams();
+ useEffect(() => {
+ if (params.server) {
+ if (server.server == null) {
+ navigate("/jump/" + params.server, {
+ state: {
+ continue__: "/server/" + params.server,
+ isReloaded: true,
+ },
+ });
+ }
+ }
+ }, [params]);
+
function setTerminalVisibility(e) {
terminalCxt.setTerminalVisibility(e);
}
- const navigate = useNavigate();
function stopServer() {
server.stopServer(() => navigate("/"));
}
@@ -27,70 +41,68 @@ function ServerInfo() {
server.exitServer(() => navigate("/"));
}
return (
-
+
+ )}
-
+
+
+
-
);
-
-
}
export default ServerInfo;
diff --git a/src/components/Terminal/SmallCommands.js b/src/components/Terminal/SmallCommands.js
index 2e60013..fc8f052 100644
--- a/src/components/Terminal/SmallCommands.js
+++ b/src/components/Terminal/SmallCommands.js
@@ -15,5 +15,6 @@ const smallCommands = {
},
do: _do,
exec: _do,
+ eval: _do,
};
export default smallCommands;
diff --git a/src/components/Terminal/Terminal.jsx b/src/components/Terminal/Terminal.jsx
index a273039..f40ddd2 100644
--- a/src/components/Terminal/Terminal.jsx
+++ b/src/components/Terminal/Terminal.jsx
@@ -172,6 +172,13 @@ function Terminal({ close = function () {}, prompt }) {
shareThis();
}
+ function type() {
+ let x = smallCommands.do(...arguments)
+ if(x=="[Object Object]")return "object";
+ navigate("/server/" + server.serverName + "/chat", {
+ state: { messageTyped:new String(x) },
+ });
+ }
const commands__ = {
clear: () => {
console.log("clearing");
@@ -210,6 +217,10 @@ function Terminal({ close = function () {}, prompt }) {
},
...{
send: send,
+ say: send,
+ echo:e=>e,
+ ["chat.type"]: type,
+ type: type,
["chat.send"]: send,
["chat.send.location"]: send_location,
send_location: send_location,
diff --git a/src/components/utils/FormComp/FormComp.jsx b/src/components/utils/FormComp/FormComp.jsx
index cd38f98..790fdb7 100644
--- a/src/components/utils/FormComp/FormComp.jsx
+++ b/src/components/utils/FormComp/FormComp.jsx
@@ -17,12 +17,13 @@ function Floating_Control_Label({
value,
onChange,
autoComplete,
+ ...props
}) {
return (
@@ -36,6 +37,7 @@ function Floating_Password_Label({
autoComplete = "current-password",
value,
onChange,
+ ...props
}) {
const [show, setShow] = useState(false);
return (
@@ -46,7 +48,7 @@ function Floating_Password_Label({
);
}
-function To_chat({ serverName }) {
+function To_chat({ serverName,size="3x" }) {
return (
-
- {server.serverName}
-
+ "} />
- ) : (
-
- )}
+
+ {server.serverName}
+
+
{server.isMyServer() ? (
-
) : (
-
)}
-
-
- {terminalCxt.isVisible ? (
-
+ {terminalCxt.isVisible ? (
+ "} />
+ ) : (
+
+ )}
+
Loading
- )
+
+
+
+ );
}
-export default Loading
\ No newline at end of file
+export default Loading;
diff --git a/src/components/utils/Navigations.jsx b/src/components/utils/Navigations.jsx
index fa29289..b0980e3 100644
--- a/src/components/utils/Navigations.jsx
+++ b/src/components/utils/Navigations.jsx
@@ -11,10 +11,10 @@ function Back({className , to = ".."}) {
+
+ {loadingText}
+