From dbc31bc06d7186ca473c8a120f31f1fb60a16d9c Mon Sep 17 00:00:00 2001 From: apoyen <apoyen@grandlyon.com> Date: Mon, 27 Jul 2020 09:40:59 +0200 Subject: [PATCH] Fix import path --- README.md | 4 +-- go.mod | 8 ++--- go.sum | 49 +++++++++++++--------------- internal/auth/auth.go | 2 +- internal/auth/auth_test.go | 2 +- internal/auth/inmemory.go | 6 ++-- internal/auth/oauth2.go | 6 ++-- internal/mocks/mocks.go | 2 +- internal/models/area.go | 2 +- internal/models/candidate.go | 2 +- internal/models/candidateList.go | 2 +- internal/models/capturer.go | 2 +- internal/models/capturerDeskRound.go | 2 +- internal/models/desk.go | 2 +- internal/models/deskRound.go | 2 +- internal/models/election.go | 2 +- internal/models/models.go | 2 +- internal/models/party.go | 2 +- internal/models/round.go | 2 +- internal/models/section.go | 2 +- internal/models/vote.go | 2 +- internal/rootmux/admin_test.go | 4 +-- internal/rootmux/capturer_test.go | 4 +-- internal/rootmux/rootmux.go | 8 ++--- internal/rootmux/rootmux_test.go | 8 ++--- internal/rootmux/visualizer_test.go | 4 +-- main.go | 10 +++--- web/index.html | 2 +- 28 files changed, 71 insertions(+), 74 deletions(-) diff --git a/README.md b/README.md index 6988671..5823fdf 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Trois comptes de démonstrations permettent de tester l'application avec trois p Télécharger le dépot ```sh -git clone https://forge.grandlyon.com/apoyen/elections.git +git clone https://forge.grandlyon.com/gestion-des-assemblees/elections.git ``` Ouvrir le dépôt avec VS Code puis dans l'onglet `Debug`, démarrer le projet avec `Debug elections with Mock OAuth2` @@ -41,7 +41,7 @@ Installer sur le poste [Docker](https://docs.docker.com/get-docker/) et [docker- Télécharger le dépot ```sh -git clone https://forge.grandlyon.com/apoyen/elections.git +git clone https://forge.grandlyon.com/gestion-des-assemblees/elections.git cd elections ``` diff --git a/go.mod b/go.mod index 6ecac3a..839992e 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,10 @@ -module forge.grandlyon.com/apoyen/elections +module forge.grandlyon.com/gestion-des-assemblees/elections go 1.14 require ( - forge.grandlyon.com/apoyen/sdk-go v0.0.0-20200506130516-44169b4175cf - github.com/jinzhu/gorm v1.9.12 - golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 + forge.grandlyon.com/systemes-dinformation/project-template/sdk-go v0.0.0-20200727072650-c47302587c74 + github.com/jinzhu/gorm v1.9.15 + golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d ) diff --git a/go.sum b/go.sum index 23c89f0..171ca85 100644 --- a/go.sum +++ b/go.sum @@ -1,51 +1,49 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -forge.grandlyon.com/apoyen/sdk-go v0.0.0-20200504124323-b515b737f420 h1:zMXCCzbXelZF53D4+YaHFwld3WYPlYaXaJdYwCWj3dg= -forge.grandlyon.com/apoyen/sdk-go v0.0.0-20200504124323-b515b737f420/go.mod h1:ajJR/1lQlFldcLXFE+PhHNEL/KhU0kW7bTeVUnaM574= -forge.grandlyon.com/apoyen/sdk-go v0.0.0-20200506130516-44169b4175cf h1:qPCX0bepDzHy/JO1exHZY0i3M5+j0X86uY+11vevUSE= -forge.grandlyon.com/apoyen/sdk-go v0.0.0-20200506130516-44169b4175cf/go.mod h1:ajJR/1lQlFldcLXFE+PhHNEL/KhU0kW7bTeVUnaM574= +forge.grandlyon.com/systemes-dinformation/project-template/sdk-go v0.0.0-20200727072650-c47302587c74 h1:ldtbCH1pNQlyfaIeR8ycfxq3dBMxrzN+npMB6jkkz/g= +forge.grandlyon.com/systemes-dinformation/project-template/sdk-go v0.0.0-20200727072650-c47302587c74/go.mod h1:G/Kk2/BsET+q9DKLl0RyLRn/gDQm7MUUlxwNrTuyp/4= +github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= +github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6ROGeiHFAP8WJdI2RoxALQYgdllERc3N5N2DM= github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= -github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA= -github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= +github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/jinzhu/gorm v1.9.12 h1:Drgk1clyWT9t9ERbzHza6Mj/8FY/CqMyVzOiHviMo6Q= -github.com/jinzhu/gorm v1.9.12/go.mod h1:vhTjlKSJUTWNtcbQtrMBFCxy7eXTzeCAzfL5fBZT/Qs= +github.com/jinzhu/gorm v1.9.15 h1:OdR1qFvtXktlxk73XFYMiYn9ywzTwytqe4QkuMRqc38= +github.com/jinzhu/gorm v1.9.15/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.0.1 h1:HjfetcXq097iXP0uoPCdnM4Efp5/9MsM0/M+XOTeR3M= github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4= github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/mattn/go-sqlite3 v2.0.1+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U= -github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/oschwald/maxminddb-golang v1.6.0 h1:KAJSjdHQ8Kv45nFIbtoLGrGWqHFajOIm7skTyz/+Dls= -github.com/oschwald/maxminddb-golang v1.6.0/go.mod h1:DUJFucBg2cvqx42YmDa/+xHvb0elJtOm3o4aFQ/nb/w= +github.com/mattn/go-sqlite3 v1.14.0 h1:mLyGNKR8+Vv9CAU7PphKa2hkEqxxhn8i32J6FPj1/QA= +github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus= +github.com/oschwald/maxminddb-golang v1.7.0 h1:JmU4Q1WBv5Q+2KZy5xJI+98aUwTIrPPxZUkd5Cwr8Zc= +github.com/oschwald/maxminddb-golang v1.7.0/go.mod h1:RXZtst0N6+FY/3qCNmZMBApR19cdQj43/NM9VkrNAis= 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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 h1:IaQbIIB2X/Mp/DKctl6ROxz1KyMlKp4uyvL6+kQ7C88= -golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 h1:DZhuSZLsGlFL4CmhA8BcRA0mnthyA/nZ00AqCUo7vHg= +golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5 h1:WQ8q63x+f/zpC8Ac1s9wLElVoHhm32p6tudrU72n1QA= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw= @@ -53,14 +51,13 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3 h1:5B6i6EAiSYyejWfvc5Rc9BbI3rzIsrrXfAQBWnYfn+w= -golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/auth/auth.go b/internal/auth/auth.go index ce8a4fe..9a58565 100644 --- a/internal/auth/auth.go +++ b/internal/auth/auth.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "forge.grandlyon.com/apoyen/sdk-go/pkg/tokens" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/tokens" ) type key int diff --git a/internal/auth/auth_test.go b/internal/auth/auth_test.go index 3c6cc34..8dc8d94 100644 --- a/internal/auth/auth_test.go +++ b/internal/auth/auth_test.go @@ -3,7 +3,7 @@ package auth import ( "testing" - "forge.grandlyon.com/apoyen/sdk-go/pkg/tester" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/tester" ) var noH = tester.Header{Key: "", Value: ""} diff --git a/internal/auth/inmemory.go b/internal/auth/inmemory.go index 6cef481..2d1b728 100644 --- a/internal/auth/inmemory.go +++ b/internal/auth/inmemory.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "forge.grandlyon.com/apoyen/sdk-go/pkg/common" - "forge.grandlyon.com/apoyen/sdk-go/pkg/log" - "forge.grandlyon.com/apoyen/sdk-go/pkg/tokens" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/common" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/log" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/tokens" "golang.org/x/crypto/bcrypt" ) diff --git a/internal/auth/oauth2.go b/internal/auth/oauth2.go index ca1dc27..48d411d 100644 --- a/internal/auth/oauth2.go +++ b/internal/auth/oauth2.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "forge.grandlyon.com/apoyen/sdk-go/pkg/common" - "forge.grandlyon.com/apoyen/sdk-go/pkg/log" - "forge.grandlyon.com/apoyen/sdk-go/pkg/tokens" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/common" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/log" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/tokens" "golang.org/x/oauth2" ) diff --git a/internal/mocks/mocks.go b/internal/mocks/mocks.go index d20b500..514bd7e 100644 --- a/internal/mocks/mocks.go +++ b/internal/mocks/mocks.go @@ -7,7 +7,7 @@ import ( "os" "strconv" - "forge.grandlyon.com/apoyen/sdk-go/pkg/middlewares" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/middlewares" ) const literralContentType = "Content-Type" diff --git a/internal/models/area.go b/internal/models/area.go index cd66e00..b49a00a 100644 --- a/internal/models/area.go +++ b/internal/models/area.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "forge.grandlyon.com/apoyen/elections/internal/auth" + "forge.grandlyon.com/gestion-des-assemblees/elections/internal/auth" ) func (d *DataHandler) handleArea(w http.ResponseWriter, r *http.Request) { diff --git a/internal/models/candidate.go b/internal/models/candidate.go index 22a6dcf..5c0ede2 100644 --- a/internal/models/candidate.go +++ b/internal/models/candidate.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "forge.grandlyon.com/apoyen/elections/internal/auth" + "forge.grandlyon.com/gestion-des-assemblees/elections/internal/auth" ) func (d *DataHandler) handleCandidate(w http.ResponseWriter, r *http.Request) { diff --git a/internal/models/candidateList.go b/internal/models/candidateList.go index fffde7b..b1bf439 100644 --- a/internal/models/candidateList.go +++ b/internal/models/candidateList.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "forge.grandlyon.com/apoyen/elections/internal/auth" + "forge.grandlyon.com/gestion-des-assemblees/elections/internal/auth" ) func (d *DataHandler) handleCandidateList(w http.ResponseWriter, r *http.Request) { diff --git a/internal/models/capturer.go b/internal/models/capturer.go index d8c4d1c..09c1b79 100644 --- a/internal/models/capturer.go +++ b/internal/models/capturer.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "forge.grandlyon.com/apoyen/elections/internal/auth" + "forge.grandlyon.com/gestion-des-assemblees/elections/internal/auth" ) // handleCapturer handle API calls on Capturer diff --git a/internal/models/capturerDeskRound.go b/internal/models/capturerDeskRound.go index b6fbb08..a1107bf 100644 --- a/internal/models/capturerDeskRound.go +++ b/internal/models/capturerDeskRound.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "forge.grandlyon.com/apoyen/elections/internal/auth" + "forge.grandlyon.com/gestion-des-assemblees/elections/internal/auth" ) type capturerDeskRound struct { diff --git a/internal/models/desk.go b/internal/models/desk.go index 301f416..f3f8f32 100644 --- a/internal/models/desk.go +++ b/internal/models/desk.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "forge.grandlyon.com/apoyen/elections/internal/auth" + "forge.grandlyon.com/gestion-des-assemblees/elections/internal/auth" ) func (d *DataHandler) handleDesk(w http.ResponseWriter, r *http.Request) { diff --git a/internal/models/deskRound.go b/internal/models/deskRound.go index b939019..807da91 100644 --- a/internal/models/deskRound.go +++ b/internal/models/deskRound.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "forge.grandlyon.com/apoyen/elections/internal/auth" + "forge.grandlyon.com/gestion-des-assemblees/elections/internal/auth" ) func (d *DataHandler) handleDeskRound(w http.ResponseWriter, r *http.Request) { diff --git a/internal/models/election.go b/internal/models/election.go index 24327bd..01f72a3 100644 --- a/internal/models/election.go +++ b/internal/models/election.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "forge.grandlyon.com/apoyen/elections/internal/auth" + "forge.grandlyon.com/gestion-des-assemblees/elections/internal/auth" ) func (d *DataHandler) handleElection(w http.ResponseWriter, r *http.Request) { diff --git a/internal/models/models.go b/internal/models/models.go index 83907ed..5ae35b1 100644 --- a/internal/models/models.go +++ b/internal/models/models.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "forge.grandlyon.com/apoyen/elections/internal/auth" + "forge.grandlyon.com/gestion-des-assemblees/elections/internal/auth" "github.com/jinzhu/gorm" // Needed for sqlite diff --git a/internal/models/party.go b/internal/models/party.go index f5bc7bc..790d2a0 100644 --- a/internal/models/party.go +++ b/internal/models/party.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "forge.grandlyon.com/apoyen/elections/internal/auth" + "forge.grandlyon.com/gestion-des-assemblees/elections/internal/auth" ) func (d *DataHandler) handleParty(w http.ResponseWriter, r *http.Request) { diff --git a/internal/models/round.go b/internal/models/round.go index 545d0a7..d542d03 100644 --- a/internal/models/round.go +++ b/internal/models/round.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "forge.grandlyon.com/apoyen/elections/internal/auth" + "forge.grandlyon.com/gestion-des-assemblees/elections/internal/auth" ) func (d *DataHandler) handleRound(w http.ResponseWriter, r *http.Request) { diff --git a/internal/models/section.go b/internal/models/section.go index 3e9ec60..79bb29d 100644 --- a/internal/models/section.go +++ b/internal/models/section.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "forge.grandlyon.com/apoyen/elections/internal/auth" + "forge.grandlyon.com/gestion-des-assemblees/elections/internal/auth" ) func (d *DataHandler) handleSection(w http.ResponseWriter, r *http.Request) { diff --git a/internal/models/vote.go b/internal/models/vote.go index 5f1d800..f4caf7a 100644 --- a/internal/models/vote.go +++ b/internal/models/vote.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "forge.grandlyon.com/apoyen/elections/internal/auth" + "forge.grandlyon.com/gestion-des-assemblees/elections/internal/auth" "github.com/jinzhu/gorm" ) diff --git a/internal/rootmux/admin_test.go b/internal/rootmux/admin_test.go index 49113d4..76c5914 100644 --- a/internal/rootmux/admin_test.go +++ b/internal/rootmux/admin_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" "testing" - "forge.grandlyon.com/apoyen/elections/internal/auth" - "forge.grandlyon.com/apoyen/sdk-go/pkg/tester" + "forge.grandlyon.com/gestion-des-assemblees/elections/internal/auth" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/tester" ) /** diff --git a/internal/rootmux/capturer_test.go b/internal/rootmux/capturer_test.go index d57ac83..7a13671 100644 --- a/internal/rootmux/capturer_test.go +++ b/internal/rootmux/capturer_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" "testing" - "forge.grandlyon.com/apoyen/elections/internal/auth" - "forge.grandlyon.com/apoyen/sdk-go/pkg/tester" + "forge.grandlyon.com/gestion-des-assemblees/elections/internal/auth" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/tester" ) /** diff --git a/internal/rootmux/rootmux.go b/internal/rootmux/rootmux.go index 5c02e48..9d09f70 100644 --- a/internal/rootmux/rootmux.go +++ b/internal/rootmux/rootmux.go @@ -4,11 +4,11 @@ import ( "net/http" "os" - "forge.grandlyon.com/apoyen/elections/internal/auth" - "forge.grandlyon.com/apoyen/elections/internal/models" - "forge.grandlyon.com/apoyen/sdk-go/pkg/middlewares" + "forge.grandlyon.com/gestion-des-assemblees/elections/internal/auth" + "forge.grandlyon.com/gestion-des-assemblees/elections/internal/models" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/middlewares" - "forge.grandlyon.com/apoyen/sdk-go/pkg/common" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/common" ) // RootMux represents the main controller of the application diff --git a/internal/rootmux/rootmux_test.go b/internal/rootmux/rootmux_test.go index 6d86312..e1b47c0 100644 --- a/internal/rootmux/rootmux_test.go +++ b/internal/rootmux/rootmux_test.go @@ -11,11 +11,11 @@ import ( "regexp" "testing" - "forge.grandlyon.com/apoyen/elections/internal/auth" - "forge.grandlyon.com/apoyen/sdk-go/pkg/tester" - "forge.grandlyon.com/apoyen/sdk-go/pkg/tokens" + "forge.grandlyon.com/gestion-des-assemblees/elections/internal/auth" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/tester" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/tokens" - "forge.grandlyon.com/apoyen/elections/internal/mocks" + "forge.grandlyon.com/gestion-des-assemblees/elections/internal/mocks" ) var ( diff --git a/internal/rootmux/visualizer_test.go b/internal/rootmux/visualizer_test.go index 5fad08f..48ab80d 100644 --- a/internal/rootmux/visualizer_test.go +++ b/internal/rootmux/visualizer_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" "testing" - "forge.grandlyon.com/apoyen/elections/internal/auth" - "forge.grandlyon.com/apoyen/sdk-go/pkg/tester" + "forge.grandlyon.com/gestion-des-assemblees/elections/internal/auth" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/tester" ) /** diff --git a/main.go b/main.go index 3a27a4f..3520591 100644 --- a/main.go +++ b/main.go @@ -11,12 +11,12 @@ import ( "syscall" "time" - "forge.grandlyon.com/apoyen/sdk-go/pkg/middlewares" - "forge.grandlyon.com/apoyen/sdk-go/pkg/tokens" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/middlewares" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/tokens" - "forge.grandlyon.com/apoyen/elections/internal/mocks" - "forge.grandlyon.com/apoyen/elections/internal/rootmux" - "forge.grandlyon.com/apoyen/sdk-go/pkg/log" + "forge.grandlyon.com/gestion-des-assemblees/elections/internal/mocks" + "forge.grandlyon.com/gestion-des-assemblees/elections/internal/rootmux" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/log" "golang.org/x/crypto/acme/autocert" ) diff --git a/web/index.html b/web/index.html index 1d4c6c0..526f42e 100644 --- a/web/index.html +++ b/web/index.html @@ -29,7 +29,7 @@ <div class="navbar-brand"> <div class="navbar-item"> <div class="buttons"> - <a class="button is-danger" href="https://forge.grandlyon.com/apoyen/elections" target="_blank" rel="noopener noreferrer"> + <a class="button is-danger" href="https://forge.grandlyon.com/gestion-des-assemblees/elections" target="_blank" rel="noopener noreferrer"> <span class="icon"> <svg class="svg-inline--fa fa-gitlab fa-w-16" -- GitLab