From 43491a2358bd3a7e3a2b38f54ef3fae203364b94 Mon Sep 17 00:00:00 2001 From: Dejwut Date: Tue, 16 May 2023 10:10:01 +0200 Subject: [PATCH 01/19] Initial commit --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..e153e12 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +KEJDA From 353eaa7b4a085512e4ec83fcfaed77a45e3b38d9 Mon Sep 17 00:00:00 2001 From: Dejwut Date: Tue, 16 May 2023 10:20:36 +0200 Subject: [PATCH 02/19] Initial commit --- readme.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 readme.txt diff --git a/readme.txt b/readme.txt deleted file mode 100644 index e69de29..0000000 From 799a72d2eab4487166882bd40cc98a08acb1eb01 Mon Sep 17 00:00:00 2001 From: Dejwut Date: Tue, 16 May 2023 10:22:00 +0200 Subject: [PATCH 03/19] Updated readme. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e153e12..e1e9423 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ -KEJDA +# AT&T Hackathon 2023 +This repository contains code made by the Pátek team for the 2023 AT&T Hackathon in Brno. From dac0c858236bcae1454713ebfe147b9ee61d65ba Mon Sep 17 00:00:00 2001 From: Dejwut Date: Tue, 16 May 2023 10:59:43 +0200 Subject: [PATCH 04/19] SHH test --- uwu | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 uwu diff --git a/uwu b/uwu new file mode 100644 index 0000000..e69de29 From 43a2eb103a3deb5bd884062c02b0d779a7ce3f4c Mon Sep 17 00:00:00 2001 From: Genibro Date: Tue, 16 May 2023 14:01:40 +0200 Subject: [PATCH 05/19] push test --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e1e9423..b1f82eb 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # AT&T Hackathon 2023 -This repository contains code made by the Pátek team for the 2023 AT&T Hackathon in Brno. +This repository contains code made by the Pátek team for the 2023 AT&T Hackathon in Brno. :) From 0dc94ea92cd0f97abbf056309fd237905d071496 Mon Sep 17 00:00:00 2001 From: OndreasCZ Date: Tue, 16 May 2023 14:10:10 +0200 Subject: [PATCH 06/19] Test Ondra --- uwu | 1 + 1 file changed, 1 insertion(+) diff --git a/uwu b/uwu index e69de29..edf4a09 100644 --- a/uwu +++ b/uwu @@ -0,0 +1 @@ +Test ondrej novak From 519fb5e5d6fbd055af4c20b82456a684212bdf85 Mon Sep 17 00:00:00 2001 From: Dejwut Date: Tue, 16 May 2023 14:22:54 +0200 Subject: [PATCH 07/19] =?UTF-8?q?My=20na=20projektu=20d=C4=9Bl=C3=A1me!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MY_NA_PROJEKTU_DELAME | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 MY_NA_PROJEKTU_DELAME diff --git a/MY_NA_PROJEKTU_DELAME b/MY_NA_PROJEKTU_DELAME new file mode 100644 index 0000000..e69de29 From 94476c873de16d68393dbca18d7dfc93f6244255 Mon Sep 17 00:00:00 2001 From: OndreasCZ Date: Tue, 16 May 2023 19:22:17 +0200 Subject: [PATCH 08/19] Rep info update --- .README.md.swp | Bin 0 -> 12288 bytes README.md | 1 + 2 files changed, 1 insertion(+) create mode 100644 .README.md.swp diff --git a/.README.md.swp b/.README.md.swp new file mode 100644 index 0000000000000000000000000000000000000000..bf49d113c2112cd85a0f785df59a10a7e22b3c89 GIT binary patch literal 12288 zcmeI&F-yZh6bJBEcTw~UJT17TjVVGq7E-8`YSGmFnp{aJ$(7_ebkW7lPvNI Date: Tue, 16 May 2023 19:26:02 +0200 Subject: [PATCH 09/19] Another README update --- .README.md.swo | Bin 0 -> 12288 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .README.md.swo diff --git a/.README.md.swo b/.README.md.swo new file mode 100644 index 0000000000000000000000000000000000000000..773f9dbc9c30c92ae95717bcafe1eec5308c15d6 GIT binary patch literal 12288 zcmeI&&q@M890%~R&Qa8{%ddo>!|JwDXg5Pc5lM0l0x8DbkzLdo8Ar%V-Fu6kqhoK= zQ#2#%MUcRo@cqH=Fn@kC!{;{44E(2No63cN**IeCN_(t+H|Sdp2Q_8{;KB8gY{-=>>jJDn8b$wRXKQi8p4W0|F4(T3~L5UiqL` z3a)%NNB;bbPL6w9PlrSZKmY;|fB*y_009Un@<1s}l7L?8?nrkhj881jly3^{-76Z*?ln@IOJ3x!6nx#hR zh0T$Mr_v_5#E6XG6B;VLY;%w3sTy8{)L1>Nr_`+>Re^3V`+b&Q I?{+Ed4`(u0%K!iX literal 0 HcmV?d00001 From abbe02d216f703506958b114d88199ee08181ff8 Mon Sep 17 00:00:00 2001 From: OndreasCZ Date: Tue, 16 May 2023 19:28:48 +0200 Subject: [PATCH 10/19] Another README update, like 3rd time. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a2c3125..135a13b 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ # AT&T Hackathon 2023 This repository contains code made by the Pátek team for the 2023 AT&T Hackathon in Brno. :) + FYI all code is currently on Broxon branch + From e9e5b3a1915e4ef73e8a8106726ead9ac2ee6207 Mon Sep 17 00:00:00 2001 From: Dejwut Date: Tue, 16 May 2023 19:40:51 +0200 Subject: [PATCH 11/19] Added .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3819313 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.swp +*.swo From c20b530c51a431317755e3dcd511f2dbfd60008a Mon Sep 17 00:00:00 2001 From: Dejwut Date: Tue, 16 May 2023 19:42:00 +0200 Subject: [PATCH 12/19] Removed trash. --- .README.md.swo | Bin 12288 -> 0 bytes .README.md.swp | Bin 12288 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .README.md.swo delete mode 100644 .README.md.swp diff --git a/.README.md.swo b/.README.md.swo deleted file mode 100644 index 773f9dbc9c30c92ae95717bcafe1eec5308c15d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI&&q@M890%~R&Qa8{%ddo>!|JwDXg5Pc5lM0l0x8DbkzLdo8Ar%V-Fu6kqhoK= zQ#2#%MUcRo@cqH=Fn@kC!{;{44E(2No63cN**IeCN_(t+H|Sdp2Q_8{;KB8gY{-=>>jJDn8b$wRXKQi8p4W0|F4(T3~L5UiqL` z3a)%NNB;bbPL6w9PlrSZKmY;|fB*y_009Un@<1s}l7L?8?nrkhj881jly3^{-76Z*?ln@IOJ3x!6nx#hR zh0T$Mr_v_5#E6XG6B;VLY;%w3sTy8{)L1>Nr_`+>Re^3V`+b&Q I?{+Ed4`(u0%K!iX diff --git a/.README.md.swp b/.README.md.swp deleted file mode 100644 index bf49d113c2112cd85a0f785df59a10a7e22b3c89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI&F-yZh6bJBEcTw~UJT17TjVVGq7E-8`YSGmFnp{aJ$(7_ebkW7lPvNI Date: Tue, 16 May 2023 21:32:06 +0200 Subject: [PATCH 13/19] Server init, removed some trash. --- server/docker-compose.yaml | 17 +++++++++++++++++ .../nginx/log/access.log | 0 server/nginx/log/error.log | 0 server/nginx/nginx.conf | 14 ++++++++++++++ server/server/Dockerfile | 11 +++++++++++ server/server/src/go.mod | 3 +++ server/server/src/main.go | 7 +++++++ uwu | 1 - 8 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 server/docker-compose.yaml rename MY_NA_PROJEKTU_DELAME => server/nginx/log/access.log (100%) create mode 100644 server/nginx/log/error.log create mode 100644 server/nginx/nginx.conf create mode 100644 server/server/Dockerfile create mode 100644 server/server/src/go.mod create mode 100644 server/server/src/main.go delete mode 100644 uwu diff --git a/server/docker-compose.yaml b/server/docker-compose.yaml new file mode 100644 index 0000000..a205494 --- /dev/null +++ b/server/docker-compose.yaml @@ -0,0 +1,17 @@ +services: + nginx: + image: nginx:stable-alpine + container_name: "uwu-nginx" + ports: + - "8080:80" + volumes: + - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro + - ./nginx/log/access.log:/var/log/nginx/access.log + - ./nginx/log/error.log:/var/log/nginx/error.log + restart: always + server: + container_name: "uwu-server" + build: + context: ./server + # env_file: .env + restart: always diff --git a/MY_NA_PROJEKTU_DELAME b/server/nginx/log/access.log similarity index 100% rename from MY_NA_PROJEKTU_DELAME rename to server/nginx/log/access.log diff --git a/server/nginx/log/error.log b/server/nginx/log/error.log new file mode 100644 index 0000000..e69de29 diff --git a/server/nginx/nginx.conf b/server/nginx/nginx.conf new file mode 100644 index 0000000..6d7ba6a --- /dev/null +++ b/server/nginx/nginx.conf @@ -0,0 +1,14 @@ +events {} + +http { + server { + listen 80; + + access_log /var/log/nginx/access.log; + error_log /var/log/nginx/error.log; + + location /api/v1 { + proxy_pass http://server:10000; + } + } +} diff --git a/server/server/Dockerfile b/server/server/Dockerfile new file mode 100644 index 0000000..ee43a6e --- /dev/null +++ b/server/server/Dockerfile @@ -0,0 +1,11 @@ +FROM golang:1.20.4-alpine3.18 AS builder + +WORKDIR /go/src/server +COPY ./src . +RUN go build -o /app ./ + +FROM alpine:3.18.0 +WORKDIR /go/src/server +COPY --from=builder /app ./ +RUN chmod +x ./app +ENTRYPOINT ["./app"] diff --git a/server/server/src/go.mod b/server/server/src/go.mod new file mode 100644 index 0000000..17860bf --- /dev/null +++ b/server/server/src/go.mod @@ -0,0 +1,3 @@ +module uwu + +go 1.20 diff --git a/server/server/src/main.go b/server/server/src/main.go new file mode 100644 index 0000000..10f0d03 --- /dev/null +++ b/server/server/src/main.go @@ -0,0 +1,7 @@ +package main + +import "fmt" + +func main() { + fmt.Println("uwu") +} diff --git a/uwu b/uwu deleted file mode 100644 index edf4a09..0000000 --- a/uwu +++ /dev/null @@ -1 +0,0 @@ -Test ondrej novak From 6c99cecbbf82bf34891c59e208036f588cca73ff Mon Sep 17 00:00:00 2001 From: Dejwut Date: Tue, 16 May 2023 22:18:08 +0200 Subject: [PATCH 14/19] =?UTF-8?q?Nev=C3=ADm,=20co=20sem=20d=C3=A1l=20ps?= =?UTF-8?q?=C3=A1t.=20Something=20server,=20Go,=20something.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/server/src/aps.go | 10 ++++++++++ server/server/src/main.go | 11 +++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 server/server/src/aps.go diff --git a/server/server/src/aps.go b/server/server/src/aps.go new file mode 100644 index 0000000..a20a85f --- /dev/null +++ b/server/server/src/aps.go @@ -0,0 +1,10 @@ +package main + +import "net/http" + +func Aps(res http.ResponseWriter, req *http.Request) { + if req.Method == "GET" { + res.WriteHeader(200) + return + } +} diff --git a/server/server/src/main.go b/server/server/src/main.go index 10f0d03..1d58bc0 100644 --- a/server/server/src/main.go +++ b/server/server/src/main.go @@ -1,7 +1,14 @@ package main -import "fmt" +import ( + "fmt" + "net/http" + +) func main() { - fmt.Println("uwu") + http.HandleFunc("/api/v1/aps", Aps) + if err := http.ListenAndServe(":10000", nil); err != nil { + fmt.Println("Well, ListenAndServe on port 10000 failed. What now?") + } } From 3e66130c1ab9c3f9061c180a9206e2b3b6d85bbd Mon Sep 17 00:00:00 2001 From: Dejwut Date: Wed, 17 May 2023 02:52:12 +0200 Subject: [PATCH 15/19] jojo jojo uwu --- .gitignore | 1 + server/docker-compose.yaml | 2 +- server/nginx/log/access.log | 0 server/server/src/aps.go | 9 +- server/server/src/database.go | 49 +++++++++ server/server/src/go.mod | 15 +++ server/server/src/go.sum | 199 ++++++++++++++++++++++++++++++++++ server/server/src/main.go | 4 +- server/server/src/structs.go | 16 +++ 9 files changed, 291 insertions(+), 4 deletions(-) delete mode 100644 server/nginx/log/access.log create mode 100644 server/server/src/database.go create mode 100644 server/server/src/go.sum create mode 100644 server/server/src/structs.go diff --git a/.gitignore b/.gitignore index 3819313..6eb933d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.swp *.swo +server/.env diff --git a/server/docker-compose.yaml b/server/docker-compose.yaml index a205494..6fe3755 100644 --- a/server/docker-compose.yaml +++ b/server/docker-compose.yaml @@ -13,5 +13,5 @@ services: container_name: "uwu-server" build: context: ./server - # env_file: .env + env_file: .env restart: always diff --git a/server/nginx/log/access.log b/server/nginx/log/access.log deleted file mode 100644 index e69de29..0000000 diff --git a/server/server/src/aps.go b/server/server/src/aps.go index a20a85f..e7c27c7 100644 --- a/server/server/src/aps.go +++ b/server/server/src/aps.go @@ -1,10 +1,15 @@ package main -import "net/http" +import ( + "encoding/json" + "net/http" +) func Aps(res http.ResponseWriter, req *http.Request) { if req.Method == "GET" { res.WriteHeader(200) - return + array := ApsQuery() + bytes, _ := json.Marshal(array) + res.Write(bytes) } } diff --git a/server/server/src/database.go b/server/server/src/database.go new file mode 100644 index 0000000..edb97f7 --- /dev/null +++ b/server/server/src/database.go @@ -0,0 +1,49 @@ +package main + +import ( + "context" + "fmt" + "os" + + "github.com/jackc/pgx/v4/pgxpool" +) + +func connect() *pgxpool.Pool { + password := os.Getenv("DB_PASSWORD") + user := os.Getenv("DB_USER") + host := os.Getenv("DB_HOST") + table := os.Getenv("DB_TABLE") + ctx := context.Background() + pool, err := pgxpool.Connect(ctx, fmt.Sprintf("postgres://%s:%s@%s/%s", user, password, host, table)) + if err != nil { + fmt.Println("DB connection failed") + os.Exit(1) + } + return pool +} + +func ApsInsert(ap Ap){ + +} + +func ApsQuery() []Ap { + var array []Ap + pool := connect() + rows, _ := pool.Query(context.Background(), "select * from aps") + defer rows.Close() + for rows.Next() { + var( + ip string + bruh int + name string + uwec int + ) + rows.Scan(&uwec, &ip, &name, &bruh) + array = append(array, Ap{ip, name, bruh}) + } + return array +} + +//func ModelInsert(model ApModel){//} +//func ModelQuery() ApModel { +//} diff --git a/server/server/src/go.mod b/server/server/src/go.mod index 17860bf..4da409f 100644 --- a/server/server/src/go.mod +++ b/server/server/src/go.mod @@ -1,3 +1,18 @@ module uwu go 1.20 + +require github.com/jackc/pgx/v4 v4.18.1 + +require ( + github.com/jackc/chunkreader/v2 v2.0.1 // indirect + github.com/jackc/pgconn v1.14.0 // indirect + github.com/jackc/pgio v1.0.0 // indirect + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgproto3/v2 v2.3.2 // indirect + github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect + github.com/jackc/pgtype v1.14.0 // indirect + github.com/jackc/puddle v1.3.0 // indirect + golang.org/x/crypto v0.6.0 // indirect + golang.org/x/text v0.7.0 // indirect +) diff --git a/server/server/src/go.sum b/server/server/src/go.sum new file mode 100644 index 0000000..77fb50b --- /dev/null +++ b/server/server/src/go.sum @@ -0,0 +1,199 @@ +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= +github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= +github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw= +github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= +github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= +github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= +github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= +github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA= +github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE= +github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s= +github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o= +github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY= +github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI= +github.com/jackc/pgconn v1.14.0 h1:vrbA9Ud87g6JdFWkHTJXppVce58qPIdP7N8y0Ml/A7Q= +github.com/jackc/pgconn v1.14.0/go.mod h1:9mBNlny0UvkgJdCDvdVHYSjI+8tD2rnKK69Wz8ti++E= +github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= +github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= +github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= +github.com/jackc/pgmock v0.0.0-20201204152224-4fe30f7445fd/go.mod h1:hrBW0Enj2AZTNpt/7Y5rr2xe/9Mn757Wtb2xeBzPv2c= +github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5Wi/+Zz7xoE5ALHsRQlOctkOiHc= +github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak= +github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= +github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= +github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78= +github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA= +github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg= +github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= +github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= +github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.3.2 h1:7eY55bdBeCz1F2fTzSz69QC+pG46jYq9/jtSPiJ5nn0= +github.com/jackc/pgproto3/v2 v2.3.2/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= +github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= +github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= +github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg= +github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc= +github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw= +github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM= +github.com/jackc/pgtype v1.14.0 h1:y+xUdabmyMkJLyApYuPj38mW+aAIqCe5uuBB51rH3Vw= +github.com/jackc/pgtype v1.14.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= +github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= +github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= +github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= +github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs= +github.com/jackc/pgx/v4 v4.18.1 h1:YP7G1KABtKpB5IHrO9vYwSrCOhs7p3uqhvhhQBptya0= +github.com/jackc/pgx/v4 v4.18.1/go.mod h1:FydWkUyadDmdNH/mHnGob881GawxeEm7TcMCzkb+qQE= +github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.3.0 h1:eHK/5clGOatcjX3oWGBO/MpxpbHzSwud5EWTSCI+MX0= +github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8= +github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= +github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= +github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= +github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= +github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= +github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= +github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= +go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= +go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= +go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc= +golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= diff --git a/server/server/src/main.go b/server/server/src/main.go index 1d58bc0..64f5763 100644 --- a/server/server/src/main.go +++ b/server/server/src/main.go @@ -3,9 +3,11 @@ package main import ( "fmt" "net/http" - + "github.com/jackc/pgx/v4/pgxpool" ) +var pool *pgxpool.Pool + func main() { http.HandleFunc("/api/v1/aps", Aps) if err := http.ListenAndServe(":10000", nil); err != nil { diff --git a/server/server/src/structs.go b/server/server/src/structs.go new file mode 100644 index 0000000..2ccb2d8 --- /dev/null +++ b/server/server/src/structs.go @@ -0,0 +1,16 @@ +package main + +type Ap struct { + IP string + Name string + Type int +} + +type ApModel struct { + Name string + Desc string + ConnMethod string + Channels []int + Controls string +} + From 0c6ee07e24fb93fb9c24fe2becbbba3e9a0334fd Mon Sep 17 00:00:00 2001 From: uwu uwu Date: Wed, 17 May 2023 03:25:43 +0200 Subject: [PATCH 16/19] Fixed nginx config --- server/nginx/nginx.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/server/nginx/nginx.conf b/server/nginx/nginx.conf index 6d7ba6a..c772737 100644 --- a/server/nginx/nginx.conf +++ b/server/nginx/nginx.conf @@ -9,6 +9,7 @@ http { location /api/v1 { proxy_pass http://server:10000; + add_header Access-Control-Allow-Origin *; } } } From 5cb47c7c2ff3b4c51d9318e3bca903530bd79acb Mon Sep 17 00:00:00 2001 From: Dejwut Date: Wed, 17 May 2023 03:44:53 +0200 Subject: [PATCH 17/19] Added location for aps. --- server/server/src/database.go | 5 +++-- server/server/src/structs.go | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/server/src/database.go b/server/server/src/database.go index edb97f7..0358cbd 100644 --- a/server/server/src/database.go +++ b/server/server/src/database.go @@ -37,9 +37,10 @@ func ApsQuery() []Ap { bruh int name string uwec int + location string ) - rows.Scan(&uwec, &ip, &name, &bruh) - array = append(array, Ap{ip, name, bruh}) + rows.Scan(&uwec, &ip, &name, &bruh, &location) + array = append(array, Ap{ip, name, bruh, location}) } return array } diff --git a/server/server/src/structs.go b/server/server/src/structs.go index 2ccb2d8..ef0f75f 100644 --- a/server/server/src/structs.go +++ b/server/server/src/structs.go @@ -4,6 +4,7 @@ type Ap struct { IP string Name string Type int + Location string } type ApModel struct { From 462c7db40181366b6336f3a130b6fa9dac9b8a22 Mon Sep 17 00:00:00 2001 From: Dejwut Date: Wed, 17 May 2023 09:12:05 +0200 Subject: [PATCH 18/19] Removed trash. --- MY_NA_PROJEKTU_DELAME | 0 uwu | 1 - 2 files changed, 1 deletion(-) delete mode 100644 MY_NA_PROJEKTU_DELAME delete mode 100644 uwu diff --git a/MY_NA_PROJEKTU_DELAME b/MY_NA_PROJEKTU_DELAME deleted file mode 100644 index e69de29..0000000 diff --git a/uwu b/uwu deleted file mode 100644 index edf4a09..0000000 --- a/uwu +++ /dev/null @@ -1 +0,0 @@ -Test ondrej novak From 26227c21bce009f6f87b525809d54b5f708a8e31 Mon Sep 17 00:00:00 2001 From: Dejwut Date: Wed, 17 May 2023 09:16:47 +0200 Subject: [PATCH 19/19] Noise --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6eb933d..b6e1bd4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.swp *.swo server/.env +server/nginx/log/*.log