diff --git a/kiszolgalo/.gitignore b/kiszolgalo/.gitignore index bf898c6..eb7a765 100644 --- a/kiszolgalo/.gitignore +++ b/kiszolgalo/.gitignore @@ -3,6 +3,8 @@ build/ !gradle/wrapper/gradle-wrapper.jar !**/src/main/**/build/ !**/src/test/**/build/ +.env +*.env ### IntelliJ IDEA ### .idea/modules.xml diff --git a/kiszolgalo/docker-compose.yml b/kiszolgalo/docker-compose.yml index 0539ac3..3415521 100644 --- a/kiszolgalo/docker-compose.yml +++ b/kiszolgalo/docker-compose.yml @@ -1,6 +1,18 @@ services: - backup-scheduler: - image: kotlin:latest - container_name: "bs" - ports: - - "8080:80" \ No newline at end of file + web: + build: . + container_name: "scottgpt" + env_file: .env + volumes: + - ./src/main/resources:/srv/src + networks: + - traefik + labels: + - "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" + +networks: + traefik: + external: true diff --git a/kiszolgalo/src/main/resources/admin.html b/kiszolgalo/src/main/resources/admin.html index 50049ab..6c163f8 100644 --- a/kiszolgalo/src/main/resources/admin.html +++ b/kiszolgalo/src/main/resources/admin.html @@ -46,6 +46,7 @@ async function open_message(id) { answid = id; + var url = 'admin/api/all_messages/' + id; fetch(url) @@ -57,13 +58,23 @@ }) .then(data => { - document.getElementById("messages").innerHTML = '' + data; + document.getElementById("messages").innerHTML = '' + data; + var input = document.getElementById("promptText"); + input.addEventListener("keypress", function(event) { + if (event.key === "Enter") { + + event.preventDefault(); + + document.getElementById("send-button").click(); + } + }); console.log(data.body) }) .catch(error => {x0 console.error('Error:', error); }); + } async function send_data() diff --git a/kiszolgalo/src/main/resources/index.html b/kiszolgalo/src/main/resources/index.html index 9ae439e..ce9fb81 100644 --- a/kiszolgalo/src/main/resources/index.html +++ b/kiszolgalo/src/main/resources/index.html @@ -38,7 +38,7 @@ @@ -49,6 +49,15 @@