things

kiszolgalo/build.gradle.kts

@@ -14,6 +14,7 @@ version = "1.0-SNAPSHOT"
 
 repositories {
     mavenCentral()
+    maven { url = uri("https://jitpack.io") }
 }
 
 application {
@@ -26,6 +27,7 @@ dependencies {
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-sessions:${ktor_version}")
     implementation("io.ktor:ktor-server-auth:${ktor_version}")
+    implementation("com.github.BinaryWriter:discord-webhooks:1.0")
 }
 
 tasks.test {

kiszolgalo/docker-compose.yml

@@ -3,6 +3,7 @@ services:
     build: .
     container_name: "scottgpt"
     env_file: .env
+    restart: unless-stopped
     volumes:
       - ./src/main/resources:/srv/src
     networks:
@@ -11,8 +12,7 @@ services:
       - "traefik.enable=true"
       - "traefik.http.routers.scottgpt.rule=Host(`ai.sc0tt.org`)"
       - "traefik.http.services.scottgpt.loadbalancer.server.port=8080"
-      - "traefik.http.routers.scottgpt.tls.certresolver=myresolver"
+#      - "traefik.http.routers.scottgpt.tls.certresolver=letsencrypt"
-
 networks:
   traefik:
     external: true

kiszolgalo/src/main/kotlin/Main.kt

@@ -14,6 +14,9 @@ import kotlin.random.nextInt
 import io.ktor.server.auth.*
 import io.ktor.server.application.*
 
+import me.binarywriter.discordwebhooks.data.* //discord webhook
+import java.awt.Color
+
 //átlagos JAVA alapú fejlesztő
 
 val httpPort: Int = System.getenv("HTTP_PORT")?.toInt() ?: 8080
@@ -180,6 +183,36 @@ class Message(val user: Boolean, messagetext: String)
     }
 }
 
+fun discordWebhook(id: Int, message: String, embed_color: Color)
+{
+
+    val webhook = Webhook {
+        this.username = "Sc0ttGPT bot"
+        //this.content = "Content"
+        embed {
+            this.title = id.toString()
+            this.description = message
+            this.url = "https://vesztettem.sch.bme.hu/"
+
+            /*
+            author {
+                this.name = "Author Name"
+            }
+*/
+            this.color = embed_color
+/*
+            field {
+                this.name = "Field Name"
+                this.value = "Field Value"
+            }*/
+        }
+
+        // ...
+    }
+
+    webhook.send("https://discord.com/api/webhooks/1471523550522249381/XVHtwUk7JsPvfwbd1J8sX9inb6Q05lsXRfww1mTpOGcgcAw15diohzBgVg7qlQtw1eyA")
+}
+
 fun main(args: Array<String>) {
     Logger.log("HTTP server started on 127.0.0.1:$httpPort")
 
@@ -237,17 +270,23 @@ fun runEmbeddedServer()
                 }
             }
 
-            staticFiles("/admin", File(resourcesPath+"/admin.html"))
+            staticFiles("/admin", File("$resourcesPath/admin.html"))
             staticFiles("/resources", File(resourcesPath))
-            staticFiles("/", File(resourcesPath+"/index.html"))
+            staticFiles("/", File("$resourcesPath/index.html"))
-            staticFiles("/about", File(resourcesPath+"/about.html"))
+            staticFiles("/style", File("$resourcesPath/style.css"))
+            staticFiles("/about", File("$resourcesPath/about.html"))
 
             put("/api/write/{id}")
             {
                 try {
+                    val id = call.parameters["id"]?.toInt() ?: -1
+                    val text = call.receiveText()
+
                     ConversationHandler.conversations.find {
-                        it.ID == call.parameters["id"]?.toInt()
+                        it.ID == id
-                    }?.write(Message(true, call.receiveText()))
+                    }?.write(Message(true, text))
+
+                    discordWebhook(id, text, Color.blue)
 
                     call.respond(HttpStatusCode.OK)
 
@@ -267,6 +306,7 @@ fun runEmbeddedServer()
             get("/api/init") {
                 ConversationHandler.newConv()
                 Logger.log("Conversation ${ConversationHandler.conversations.last().ID} initialized")
+                discordWebhook(ConversationHandler.conversations.last().ID, "New conversation probably incoming", Color.green)
                 call.respondText(ConversationHandler.conversations.last().ID.toString())
             }
 

kiszolgalo/src/main/resources/index.html

@@ -2,34 +2,25 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+
     <title>ScottGPT</title>
     <link rel="icon" type="image/x-icon" href="/resources/favicon.ico">
-    <link rel="stylesheet" href="/resources/style.css">
+    <link rel="stylesheet" href="/style">
 
 </head>
 <body onload="javascript:init()" style="margin: 0; height: 100%; overflow: hidden;">
 
 <div class="main-flexbox">
 
-<header class="navbar">
+<header class="navbar" id="funniez">
     <a href="https://sc0tt.org/" style="float: left" target="_blank">Sc0tt főoldal</a>
     <a href="/about" style="float: left">About</a>
-    <button onclick="genZ()" style="float: left;">Gen Z compatible site</button>
+    <!--<button onclick="genZ()" style="float: left;" class="funny">Gen Z compatible site</button>-->
 
-    <img src="resources/logo.png" alt=logo" style="float: right;">
+    <img src="resources/logo.png" alt=logo" class="logo" style="float: right;">
-
-    <a href="javascript:void(0);"
-       class="icon"
-       onclick="toggleMenu()">
-        &#9776;
-    </a>
 </header>
 
-    <iframe width="420" height="315"
-            src="https://www.youtube.com/embed/mn-Tlb_wfjc"
-            id="funniez"
-            style="display: none;">
-    </iframe>
 
     <div id="messages" class="messages">
 
@@ -37,8 +28,8 @@
 
     <footer>
         <div class="textbox">
-            <input class="text_input" name="valami" type="text" id="promptText" placeholder="Kérdezz az OSI modellről... vagy idk...">
+            <input class="text_input" name="valami" type="text" id="promptText" placeholder="Kérdezz az OSI modellről... vagy idk..." onchange="sendButton()" >
-            <button id="send-button" class="send_button" onclick="send_data()">send</button>
+            <button id="send-button" class="send_button" onclick="send_data()"></button>
         </div>
     </footer>
 
@@ -48,8 +39,22 @@
 
 <script>
     let id;
+    var genz = false;
 
     var input = document.getElementById("promptText");
+
+    function sendButton() {
+        var x = document.getElementById("send-button");
+        var input = document.getElementById("promptText")
+
+        console.log(input.value)
+        if (input.value == "") {
+            x.style.display = "none";
+        } else {
+            x.style.display = "block";
+        }
+    }
+
     input.addEventListener("keypress", function(event) {
       if (event.key === "Enter") {
 
@@ -60,11 +65,15 @@
     });
 
     function genZ() {
-      var x = document.getElementById("funniez");
+        let genzHtml = "    <iframe width=\"420\" height=\"315\"\n" +
-      if (x.style.display === "none") {
+            "            src=\"https://www.youtube.com/embed/mn-Tlb_wfjc\"\n" +
-        x.style.display = "block";
+            "            style=\"display: none;\" id='genz'>\n" +
+            "    </iframe>";
+
+        if (genz === false) {
+            document.getElementById("funniez").insertAdjacentHTML("afterend", genzHtml);
         } else {
-        x.style.display = "none";
+            document.getElementById("genz").remove();
         }
     }
 

kiszolgalo/src/main/resources/style.css

@@ -2,6 +2,8 @@ body {
     background: #212121;
     color: white;
     font-family: Roboto, sans-serif;
+    max-width: 100%;
+    overflow-x: hidden;
 }
 
 .about-content {
@@ -21,17 +23,15 @@ body {
 }
 
 .main-content {
-/*
+
-    display: flex;
-    margin: auto;
-    text-align: center;
-    box-sizing: border-box;*/
     margin-top: 5%;
     margin-bottom: 0;
     justify-content: center;
     flex-direction: column;
     height: 80vh;
     overflow-y: scroll;
+    max-width: 100%;
+    overflow-x: hidden;
     flex-grow: 8;
 
     background: red;
@@ -63,7 +63,6 @@ body {
 }
 
 .messages {
-    margin-bottom: 10%;
     position: relative;
     display: flex;
     margin: 5px auto 0px auto;
@@ -107,12 +106,13 @@ body {
 }
 
 .send_button {
+    aspect-ratio: 1 / 1;
     justify-content: flex-end;
     padding: 4px 8px;
     margin: 10px;
     height: 30px;
     border-radius: 50%;
-    background: white;
+    background-image: url("/resources/send.png");
     color: #212121;
     border: none;
 }
@@ -121,12 +121,7 @@ body {
     background: #323232;
     display: flex;
     margin: auto;
-    @media (max-width: 600px) {
-      width: 100%;
-    }
-    @media (min-width: 600px) {
     width: 80%;
-    }
 
     padding: 10px 10px;
     border-radius: 25px;
@@ -185,6 +180,21 @@ footer {
     background-color: #545454;
 }
 
+@media (max-width: 767px) {
+    .textbox-parent {
+        bottom: 30px;
+    }
+    .messages {
+        width: 100%;
+    }
+    .message {
+        width: 80%;
+    }
+    .funny {
+        display: none;
+    }
+}
+
 .navbar a.icon {
     display: none;
 }