diff --git a/admin/balance.template.html b/admin/balance.template.html index 0abb9f4db13981fcbf94c19590bacd67d72593ac..94d733d0738f78a63b37d3c4cd6a8970d528cb13 100644 --- a/admin/balance.template.html +++ b/admin/balance.template.html @@ -3,25 +3,32 @@ {{ template "navbar" .User }} {{- if .User.IsAdmin }} -<h2>{{ .From}}-tól {{ .To }}-ig</h2> -<table> - <tr> - <th>Termék neve</th> - <th>Egységár</th> - <th>Darabszám</th> - <th>Összes bevétel</th> - </tr> -{{ $prod := .Products }} -{{ range $k, $v := .Counts }} - {{ $p := index $prod $k }} - <tr> - <td>{{ $p.Name }}</td> - <td>{{ $p.Price }} JMF</td> - <td>{{$v}} db</td> - <td>{{mul $v $p.Price}} JMF</td> - </tr> -{{ end }} -</table> + +<div class="container"> + <div class="text-center form justify-content-center"> + <h2 class="my-3">{{ .From}}-tól {{ .To }}-ig</h2> + <div style="overflow-x: auto;"> + <table class="table" id="admin-table"> + <tr> + <th scope="col">Termék neve</th> + <th scope="col">Egységár</th> + <th scope="col">Darabszám</th> + <th scope="col">Összes bevétel</th> + </tr> + {{ $prod := .Products }} + {{ range $k, $v := .Counts }} + {{ $p := index $prod $k }} + <tr style="text-align: center"> + <td style="text-align: left">{{ $p.Name }}</td> + <td>{{ $p.Price }} JMF</td> + <td>{{$v}} db</td> + <td>{{mul $v $p.Price}} JMF</td> + </tr> + {{ end }} + </table> + </div> + </div> +</div> {{- end }} {{ template "footer" . }} \ No newline at end of file diff --git a/admin/between.template.html b/admin/between.template.html index 75c0b2ddbb9cc5e44b8dc13051e7e588c88de5b9..29377471f66c1e05acccc1d49fc3bf1ca0718761 100644 --- a/admin/between.template.html +++ b/admin/between.template.html @@ -17,7 +17,10 @@ </form> </div> <script> - document.getElementById("balanceFromDate").valueAsDate = new Date() - document.getElementById("balanceToDate").valueAsDate = new Date() + let today = new Date(); + let tomorrow = new Date(); + tomorrow.setDate(today.getDate() + 1); + document.getElementById("balanceFromDate").valueAsDate = today; + document.getElementById("balanceToDate").valueAsDate = tomorrow; </script> {{ end }} \ No newline at end of file diff --git a/k8s/values.yaml b/k8s/values.yaml index 31eddb1704791ed1b9c4722db126904f862a56d7..e7d8ad82df0204f96d3ef18347f96fc56956da80 100644 --- a/k8s/values.yaml +++ b/k8s/values.yaml @@ -7,5 +7,5 @@ POSTGRES: "${POSTGRES}" POSTGRES_PASS: "${POSTGRES_PASS}" POSTGRES_USER: "${POSTGRES_USER}" POSTGRES_DB: "${POSTGRES_DB}" -Tag: "v1.5.8" +Tag: "v1.6.0" REGISTRY_CONF: "${REGISTRY_CONF}" diff --git a/static/style.css b/static/style.css index d7651871f1be7ae7911cc81622bab2eec9388716..d618deb026d9dcfd57d421e84fda1cf1dfaf0b9c 100644 --- a/static/style.css +++ b/static/style.css @@ -73,11 +73,19 @@ body { color: white; } +.dark #admin-table #schacc #topup { + color: white !important; +} + .light { background-color: #e9e9ec; color: #3051bf; } +.light #admin-table #schacc #topup { + color: #3051bf !important; +} + .donate { height: 4em; } diff --git a/topup/topup.template.html b/topup/topup.template.html index b8144fd09a2d0526b51605e16ff94e75bf403a78..6d2218724f28882ef6e8746514391f2f51066a49 100644 --- a/topup/topup.template.html +++ b/topup/topup.template.html @@ -20,7 +20,7 @@ <div class="mx-auto text-center form"> <h1 class="display-4 py-2 text-truncate">Válassz</h1> <label for="schacc"></label> - <select class="form-select {{ if .Dark }}dark{{ else }}light{{ end }}" id="schacc" name="schacc" form="topup"> + <select class="form-select" id="schacc" name="schacc" form="topup"> {{- range .Users }} <option value="{{ .SchAcc }}">{{ .SchAcc }} - {{ .Name }}</option> {{- end }} @@ -28,7 +28,7 @@ <form action="/topup/" method="POST" id="topup" class="justify-content-center"> <div class="form-group"> <label for="money">Mennyit tölt fel?</label><br> - <input type="number" class="{{ if .Dark }}dark{{ else }}light{{ end }}" id="money" name="money"><br> + <input type="number" id="money" name="money"><br> </div> <div class="form-group"> <button type="submit" class="btn bg-kszk text-white">Go</button>