[taler-taldir] branch master updated (1940024 -> 2c4721e)

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch master
in repository taldir.

    from 1940024  go fmt
     new 5869a1a  follow go project bcp
     new c2f7a3c  assets directory
     new 2c4721e  web directory

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitmodules                                        |   2 +-
 Makefile                                           |  10 ++++-----
 cmd/taldir-cli/main.go                             |   7 ++++---
 cmd/taldir-server/main_test.go                     |  11 +++++-----
 {config => configs}/taldir-example.conf            |   2 +-
 {pkg => internal}/util/helper.go                   |   0
 pkg/rest/taldir.go                                 |  23 +++++++++++----------
 {contrib => scripts}/Makefile                      |   0
 {contrib => scripts}/pp/Makefile                   |   0
 {contrib => scripts}/pp/README                     |   0
 {contrib => scripts}/pp/conf.py                    |   0
 {contrib => scripts}/pp/en/0.epub                  | Bin
 {contrib => scripts}/pp/en/0.html                  |   0
 {contrib => scripts}/pp/en/0.pdf                   | Bin
 {contrib => scripts}/pp/en/0.txt                   |   0
 {contrib => scripts}/pp/en/0.xml                   |   0
 {contrib => scripts}/pp/pp.rst                     |   0
 {contrib => scripts}/tos/Makefile                  |   0
 {contrib => scripts}/tos/README                    |   0
 {contrib => scripts}/tos/conf.py                   |   0
 {contrib => scripts}/tos/en/0.epub                 | Bin
 {contrib => scripts}/tos/en/0.html                 |   0
 {contrib => scripts}/tos/en/0.pdf                  | Bin
 {contrib => scripts}/tos/en/0.txt                  |   0
 {contrib => scripts}/tos/en/0.xml                  |   0
 {contrib => scripts}/tos/tos.rst                   |   0
 {contrib => scripts}/update-pp.sh                  |   0
 {contrib => scripts}/update-tos.sh                 |   0
 scripts/{ => validators}/taldir-validate-mail      |   0
 scripts/{ => validators}/taldir-validate-twitter   |   0
 {contrib => third_party}/gana                      |   0
 .../templates}/validation_landing.html             |   0
 32 files changed, 29 insertions(+), 26 deletions(-)
 rename {config => configs}/taldir-example.conf (94%)
 rename {pkg => internal}/util/helper.go (100%)
 rename {contrib => scripts}/Makefile (100%)
 rename {contrib => scripts}/pp/Makefile (100%)
 rename {contrib => scripts}/pp/README (100%)
 rename {contrib => scripts}/pp/conf.py (100%)
 rename {contrib => scripts}/pp/en/0.epub (100%)
 rename {contrib => scripts}/pp/en/0.html (100%)
 rename {contrib => scripts}/pp/en/0.pdf (100%)
 rename {contrib => scripts}/pp/en/0.txt (100%)
 rename {contrib => scripts}/pp/en/0.xml (100%)
 rename {contrib => scripts}/pp/pp.rst (100%)
 rename {contrib => scripts}/tos/Makefile (100%)
 rename {contrib => scripts}/tos/README (100%)
 rename {contrib => scripts}/tos/conf.py (100%)
 rename {contrib => scripts}/tos/en/0.epub (100%)
 rename {contrib => scripts}/tos/en/0.html (100%)
 rename {contrib => scripts}/tos/en/0.pdf (100%)
 rename {contrib => scripts}/tos/en/0.txt (100%)
 rename {contrib => scripts}/tos/en/0.xml (100%)
 rename {contrib => scripts}/tos/tos.rst (100%)
 rename {contrib => scripts}/update-pp.sh (100%)
 rename {contrib => scripts}/update-tos.sh (100%)
 rename scripts/{ => validators}/taldir-validate-mail (100%)
 rename scripts/{ => validators}/taldir-validate-twitter (100%)
 rename {contrib => third_party}/gana (100%)
 rename {templates => web/templates}/validation_landing.html (100%)

diff --git a/.gitmodules b/.gitmodules
index 925be0e..3640bdb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "contrib/gana"]
-       path = contrib/gana
+       path = third_party/gana
        url = https://git.gnunet.org/git/gana
diff --git a/Makefile b/Makefile
index 0f39e2a..98d08a7 100644
--- a/Makefile
+++ b/Makefile
@@ -3,11 +3,11 @@ all: gana server cli
 SCRIPT_TARGET:=$(shell dirname $(shell go list -f '{{.Target}}' 
./cmd/taldir-server))
 
 gana:
-       mkdir -p pkg/gana
+       mkdir -p internal/gana
        git submodule update --init --recursive
        git submodule sync --recursive
-       cd contrib/gana/gnu-taler-error-codes && make taler_error_codes.go
-       cp contrib/gana/gnu-taler-error-codes/taler_error_codes.go pkg/gana/
+       cd third_party/gana/gnu-taler-error-codes && make taler_error_codes.go
+       cp third_party/gana/gnu-taler-error-codes/taler_error_codes.go 
internal/gana/
 
 server:
        go build ./cmd/taldir-server
@@ -17,7 +17,7 @@ cli:
 
 install: server cli
        go install ./cmd/taldir-server && go install ./cmd/taldir-cli
-       chmod +x scripts/*
-       cp scripts/* $(SCRIPT_TARGET)
+       chmod +x scripts/validators/*
+       cp scripts/validators/* $(SCRIPT_TARGET)
 
 .PHONY: all gana
diff --git a/cmd/taldir-cli/main.go b/cmd/taldir-cli/main.go
index 83ba368..920d5eb 100644
--- a/cmd/taldir-cli/main.go
+++ b/cmd/taldir-cli/main.go
@@ -22,10 +22,11 @@ import (
        "crypto/sha512"
        "flag"
        "fmt"
-       gnunetutil "git.gnunet.org/gnunet-go.git/pkg/util"
        "os"
-       "taler.net/taldir/pkg/rest"
-       "taler.net/taldir/pkg/util"
+
+       gnunetutil "git.gnunet.org/gnunet-go.git/pkg/util"
+       "taler.net/taldir/internal/util"
+       taldir "taler.net/taldir/pkg/rest"
 )
 
 // Generates a link from a challenge and address
diff --git a/cmd/taldir-server/main_test.go b/cmd/taldir-server/main_test.go
index ec475c8..2e5e86c 100644
--- a/cmd/taldir-server/main_test.go
+++ b/cmd/taldir-server/main_test.go
@@ -21,17 +21,18 @@ package main_test
 import (
        "bytes"
        "crypto/sha512"
-       gnunetutil "git.gnunet.org/gnunet-go.git/pkg/util"
-       "github.com/jarcoal/httpmock"
        "io/ioutil"
        "net/http"
        "net/http/httptest"
        "os"
        "strings"
-       _ "taler.net/taldir/cmd/taldir-server"
-       "taler.net/taldir/pkg/rest"
-       "taler.net/taldir/pkg/util"
        "testing"
+
+       gnunetutil "git.gnunet.org/gnunet-go.git/pkg/util"
+       "github.com/jarcoal/httpmock"
+       _ "taler.net/taldir/cmd/taldir-server"
+       "taler.net/taldir/internal/util"
+       taldir "taler.net/taldir/pkg/rest"
 )
 
 var t taldir.Taldir
diff --git a/config/taldir-example.conf b/configs/taldir-example.conf
similarity index 94%
rename from config/taldir-example.conf
rename to configs/taldir-example.conf
index 6bb8b47..890dce4 100644
--- a/config/taldir-example.conf
+++ b/configs/taldir-example.conf
@@ -17,7 +17,7 @@ validation_timeframe = 10m
 solution_attempt_timeframe = 1h
 merchant_baseurl_private = http://merchant.taldir/instances/myInstance
 merchant_token = superSecretToken
-validation_landing = templates/validation_landing.html
+validation_landing = assets/templates/validation_landing.html
 validation_expiration = 24h
 
 [taldir-email]
diff --git a/pkg/util/helper.go b/internal/util/helper.go
similarity index 100%
rename from pkg/util/helper.go
rename to internal/util/helper.go
diff --git a/pkg/rest/taldir.go b/pkg/rest/taldir.go
index afe23d9..bfd577d 100644
--- a/pkg/rest/taldir.go
+++ b/pkg/rest/taldir.go
@@ -28,14 +28,6 @@ import (
        "encoding/base64"
        "encoding/json"
        "fmt"
-       gnunetutil "git.gnunet.org/gnunet-go.git/pkg/util"
-       "github.com/gorilla/mux"
-       "github.com/skip2/go-qrcode"
-       "golang.org/x/text/language"
-       "gopkg.in/ini.v1"
-       "gorm.io/driver/postgres"
-       "gorm.io/gorm"
-       "gorm.io/gorm/logger"
        "html/template"
        "io/ioutil"
        "log"
@@ -44,10 +36,19 @@ import (
        "os"
        "os/exec"
        "strings"
-       "taler.net/taldir/pkg/gana"
-       "taler.net/taldir/pkg/taler"
-       "taler.net/taldir/pkg/util"
        "time"
+
+       gnunetutil "git.gnunet.org/gnunet-go.git/pkg/util"
+       "github.com/gorilla/mux"
+       "github.com/skip2/go-qrcode"
+       "golang.org/x/text/language"
+       "gopkg.in/ini.v1"
+       "gorm.io/driver/postgres"
+       "gorm.io/gorm"
+       "gorm.io/gorm/logger"
+       "taler.net/taldir/internal/gana"
+       "taler.net/taldir/internal/util"
+       "taler.net/taldir/pkg/taler"
 )
 
 // Taldir is the primary object of the Taldir service
diff --git a/contrib/Makefile b/scripts/Makefile
similarity index 100%
rename from contrib/Makefile
rename to scripts/Makefile
diff --git a/contrib/pp/Makefile b/scripts/pp/Makefile
similarity index 100%
rename from contrib/pp/Makefile
rename to scripts/pp/Makefile
diff --git a/contrib/pp/README b/scripts/pp/README
similarity index 100%
rename from contrib/pp/README
rename to scripts/pp/README
diff --git a/contrib/pp/conf.py b/scripts/pp/conf.py
similarity index 100%
rename from contrib/pp/conf.py
rename to scripts/pp/conf.py
diff --git a/contrib/pp/en/0.epub b/scripts/pp/en/0.epub
similarity index 100%
rename from contrib/pp/en/0.epub
rename to scripts/pp/en/0.epub
diff --git a/contrib/pp/en/0.html b/scripts/pp/en/0.html
similarity index 100%
rename from contrib/pp/en/0.html
rename to scripts/pp/en/0.html
diff --git a/contrib/pp/en/0.pdf b/scripts/pp/en/0.pdf
similarity index 100%
rename from contrib/pp/en/0.pdf
rename to scripts/pp/en/0.pdf
diff --git a/contrib/pp/en/0.txt b/scripts/pp/en/0.txt
similarity index 100%
rename from contrib/pp/en/0.txt
rename to scripts/pp/en/0.txt
diff --git a/contrib/pp/en/0.xml b/scripts/pp/en/0.xml
similarity index 100%
rename from contrib/pp/en/0.xml
rename to scripts/pp/en/0.xml
diff --git a/contrib/pp/pp.rst b/scripts/pp/pp.rst
similarity index 100%
rename from contrib/pp/pp.rst
rename to scripts/pp/pp.rst
diff --git a/contrib/tos/Makefile b/scripts/tos/Makefile
similarity index 100%
rename from contrib/tos/Makefile
rename to scripts/tos/Makefile
diff --git a/contrib/tos/README b/scripts/tos/README
similarity index 100%
rename from contrib/tos/README
rename to scripts/tos/README
diff --git a/contrib/tos/conf.py b/scripts/tos/conf.py
similarity index 100%
rename from contrib/tos/conf.py
rename to scripts/tos/conf.py
diff --git a/contrib/tos/en/0.epub b/scripts/tos/en/0.epub
similarity index 100%
rename from contrib/tos/en/0.epub
rename to scripts/tos/en/0.epub
diff --git a/contrib/tos/en/0.html b/scripts/tos/en/0.html
similarity index 100%
rename from contrib/tos/en/0.html
rename to scripts/tos/en/0.html
diff --git a/contrib/tos/en/0.pdf b/scripts/tos/en/0.pdf
similarity index 100%
rename from contrib/tos/en/0.pdf
rename to scripts/tos/en/0.pdf
diff --git a/contrib/tos/en/0.txt b/scripts/tos/en/0.txt
similarity index 100%
rename from contrib/tos/en/0.txt
rename to scripts/tos/en/0.txt
diff --git a/contrib/tos/en/0.xml b/scripts/tos/en/0.xml
similarity index 100%
rename from contrib/tos/en/0.xml
rename to scripts/tos/en/0.xml
diff --git a/contrib/tos/tos.rst b/scripts/tos/tos.rst
similarity index 100%
rename from contrib/tos/tos.rst
rename to scripts/tos/tos.rst
diff --git a/contrib/update-pp.sh b/scripts/update-pp.sh
similarity index 100%
rename from contrib/update-pp.sh
rename to scripts/update-pp.sh
diff --git a/contrib/update-tos.sh b/scripts/update-tos.sh
similarity index 100%
rename from contrib/update-tos.sh
rename to scripts/update-tos.sh
diff --git a/scripts/taldir-validate-mail 
b/scripts/validators/taldir-validate-mail
similarity index 100%
rename from scripts/taldir-validate-mail
rename to scripts/validators/taldir-validate-mail
diff --git a/scripts/taldir-validate-twitter 
b/scripts/validators/taldir-validate-twitter
similarity index 100%
rename from scripts/taldir-validate-twitter
rename to scripts/validators/taldir-validate-twitter
diff --git a/contrib/gana b/third_party/gana
similarity index 100%
rename from contrib/gana
rename to third_party/gana
diff --git a/templates/validation_landing.html 
b/web/templates/validation_landing.html
similarity index 100%
rename from templates/validation_landing.html
rename to web/templates/validation_landing.html

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.