From 122783a3856e3f384a5bbd65196487c18c19a481 Mon Sep 17 00:00:00 2001 From: Max Schmitt Date: Mon, 5 Feb 2018 14:04:47 +0100 Subject: [PATCH] Changed maxibanki to new mxschmitt username --- .travis.yml | 4 ++-- Dockerfile.amd64 | 2 +- Dockerfile.arm | 2 +- Makefile | 8 ++++---- README.md | 4 ++-- build/bintray.json | 2 +- docker-compose.yml | 2 +- handlers/auth.go | 4 ++-- handlers/auth/auth.go | 2 +- handlers/auth/github.go | 2 +- handlers/auth/google.go | 2 +- handlers/auth/microsoft.go | 2 +- handlers/auth_test.go | 6 +++--- handlers/handlers.go | 6 +++--- handlers/public.go | 6 +++--- handlers/public_test.go | 4 ++-- main.go | 6 +++--- main_test.go | 2 +- static/src/About/About.js | 8 ++++---- stores/boltdb/boltdb.go | 2 +- stores/store.go | 6 +++--- stores/store_test.go | 4 ++-- util/config.go | 2 +- 23 files changed, 44 insertions(+), 44 deletions(-) diff --git a/.travis.yml b/.travis.yml index 04d49f5..e828b5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,10 +13,10 @@ script: - make - goveralls -service=travis-ci -ignore="handlers/static.go,handlers/tmpls/tmpls.go" - make buildDockerImage - - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" && docker push maxibanki/golang_url_shortener && docker push maxibanki/golang_url_shortener:arm; fi' + - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" && docker push mxschmitt/golang_url_shortener && docker push mxschmitt/golang_url_shortener:arm; fi' deploy: provider: bintray - user: maxibanki + user: mxschmitt file: "build/bintray.json" key: secure: ErqvSFIlL3d9XuMj+T+hO6xZqll8Ubx0DEdHD6NJKi7sH7Be3b3/vUoPdAjdFOP70DhaccbncGCTPZ9hsNKdqYxZmuKx3WWwH4H4U5YdDIViXtH6+B5KdAmvdZIynaj+THQAbVAhr+QyvcqotNySPd3Ac1HCg2YAcUHme6y3FsiRJ79To80JWxTSR1G/oObmeoDn8R18wmH1gHl8KQ7ltC537Osb/H34bJ/hY94hRe8IEmoQE4yz/EP44kGXRb/F87i92y1mO081ZS1I1hs5Kbom43YoItqSVbJP/abPMyCsGDv2FGXaGqk5IVC1k+01pcAjqxCzMvXC272itc0E8OEWqE4qONN+m2S9tyALyOaUZ7j5meWLHQj49Rzo7XIWh1PvvEMovdl/wk/Oc9f0ZywPuvoRht5ZebgXbPWAMMNywwy0GKM4nU0DCyFm23mlzPh4iklo12gEUzq3YLc18RhAZuy4timeevrDCuJMQeQ3sqcQBKCQ+rdOxzVCKKl2sGpNaTJEYaHGT9KLCEGBLmvaB58RKgmGN6IIEwpxSm2SGoirfnQsr+DP+kaSvWPr6R/pZAhO1JzO+azaXvfr+hL2SMX6U7j5+SDmFGIFDwxok7ny1QUTQXKlNzA/ks9/vufe30hrTkph/MfEvM5mYVbfgAn5zZ0v+dJ2wCoe1go= diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index bc04f67..c8cc0f4 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -1,7 +1,7 @@ FROM alpine LABEL maintainer="Max Schmitt " -LABEL readme.md="https://github.com/maxibanki/golang-url-shortener/blob/master/README.md" +LABEL readme.md="https://github.com/mxschmitt/golang-url-shortener/blob/master/README.md" LABEL description="This Dockerfile will install the Golang URL Shortener." RUN apk update && apk add ca-certificates curl diff --git a/Dockerfile.arm b/Dockerfile.arm index 7e07565..2e4e32e 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -1,7 +1,7 @@ FROM alpine LABEL maintainer="Max Schmitt " -LABEL readme.md="https://github.com/maxibanki/golang-url-shortener/blob/master/README.md" +LABEL readme.md="https://github.com/mxschmitt/golang-url-shortener/blob/master/README.md" LABEL description="This Dockerfile will install the Golang URL Shortener." RUN apk update && apk add ca-certificates curl diff --git a/Makefile b/Makefile index 0a9a8d3..128c7cb 100644 --- a/Makefile +++ b/Makefile @@ -23,13 +23,13 @@ getGoDependencies: buildProject: rm -rf releases mkdir releases - gox -output="releases/{{.Dir}}_{{.OS}}_{{.Arch}}/{{.Dir}}" -osarch="linux/amd64 linux/arm windows/amd64 windows/386" -ldflags="-X github.com/maxibanki/golang-url-shortener/util.ldFlagNodeJS=`node --version` -X github.com/maxibanki/golang-url-shortener/util.ldFlagCommit=`git rev-parse HEAD` -X github.com/maxibanki/golang-url-shortener/util.ldFlagYarn=`yarn --version` -X github.com/maxibanki/golang-url-shortener/util.ldFlagCompilationTime=`date --iso-8601=seconds`" + gox -output="releases/{{.Dir}}_{{.OS}}_{{.Arch}}/{{.Dir}}" -osarch="linux/amd64 linux/arm windows/amd64 windows/386" -ldflags="-X github.com/mxschmitt/golang-url-shortener/util.ldFlagNodeJS=`node --version` -X github.com/mxschmitt/golang-url-shortener/util.ldFlagCommit=`git rev-parse HEAD` -X github.com/mxschmitt/golang-url-shortener/util.ldFlagYarn=`yarn --version` -X github.com/mxschmitt/golang-url-shortener/util.ldFlagCompilationTime=`date --iso-8601=seconds`" find releases -maxdepth 1 -mindepth 1 -type d -exec cp build/config.yaml {} \; find releases -maxdepth 1 -mindepth 1 -type d -exec tar -cvjf {}.tar.bz2 {} \; buildDockerImage: rm -rf docker_releases mkdir docker_releases - CGO_ENABLED=0 gox -output="docker_releases/{{.Dir}}_{{.OS}}_{{.Arch}}/{{.Dir}}" -osarch="linux/amd64 linux/arm" -ldflags="-X github.com/maxibanki/golang-url-shortener/util.ldFlagNodeJS=`node --version` -X github.com/maxibanki/golang-url-shortener/util.ldFlagCommit=`git rev-parse HEAD` -X github.com/maxibanki/golang-url-shortener/util.ldFlagYarn=`yarn --version` -X github.com/maxibanki/golang-url-shortener/util.ldFlagCompilationTime=`date --iso-8601=seconds`" - docker build -t maxibanki/golang_url_shortener:arm -f Dockerfile.arm . - docker build -t maxibanki/golang_url_shortener -f Dockerfile.amd64 . \ No newline at end of file + CGO_ENABLED=0 gox -output="docker_releases/{{.Dir}}_{{.OS}}_{{.Arch}}/{{.Dir}}" -osarch="linux/amd64 linux/arm" -ldflags="-X github.com/mxschmitt/golang-url-shortener/util.ldFlagNodeJS=`node --version` -X github.com/mxschmitt/golang-url-shortener/util.ldFlagCommit=`git rev-parse HEAD` -X github.com/mxschmitt/golang-url-shortener/util.ldFlagYarn=`yarn --version` -X github.com/mxschmitt/golang-url-shortener/util.ldFlagCompilationTime=`date --iso-8601=seconds`" + docker build -t mxschmitt/golang_url_shortener:arm -f Dockerfile.arm . + docker build -t mxschmitt/golang_url_shortener -f Dockerfile.amd64 . \ No newline at end of file diff --git a/README.md b/README.md index f5250f1..c40829b 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ [![Go Report Card](https://goreportcard.com/badge/github.com/mxschmitt/golang-url-shortener)](https://goreportcard.com/report/github.com/mxschmitt/golang-url-shortener) [![Coverage Status](https://coveralls.io/repos/github/mxschmitt/golang-url-shortener/badge.svg?branch=master)](https://coveralls.io/github/mxschmitt/golang-url-shortener?branch=master) [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT) -[![Download](https://api.bintray.com/packages/maxibanki/golang-url-shortener/travis-ci/images/download.svg?version=0.1) ](https://bintray.com/maxibanki/golang-url-shortener/travis-ci/0.1/link) -[![Docker Pulls](https://img.shields.io/docker/pulls/maxibanki/golang_url_shortener.svg)](https://hub.docker.com/r/maxibanki/golang_url_shortener/) +[![Download](https://api.bintray.com/packages/mxschmitt/golang-url-shortener/travis-ci/images/download.svg?version=0.1) ](https://bintray.com/mxschmitt/golang-url-shortener/travis-ci/0.1/link) +[![Docker Pulls](https://img.shields.io/docker/pulls/mxschmitt/golang_url_shortener.svg)](https://hub.docker.com/r/mxschmitt/golang_url_shortener/) ## Main Features diff --git a/build/bintray.json b/build/bintray.json index a9eb7e3..6dd7f6c 100644 --- a/build/bintray.json +++ b/build/bintray.json @@ -2,7 +2,7 @@ "package": { "name": "travis-ci", "repo": "golang-url-shortener", - "subject": "maxibanki" + "subject": "mxschmitt" }, "version": { "name": "0.1" diff --git a/docker-compose.yml b/docker-compose.yml index 445b91c..5e5f46d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ golang_url_shortener: - image: maxibanki/golang_url_shortener + image: mxschmitt/golang_url_shortener ports: - 8080:8080 volumes: diff --git a/handlers/auth.go b/handlers/auth.go index da671ee..6f1f3ec 100644 --- a/handlers/auth.go +++ b/handlers/auth.go @@ -3,8 +3,8 @@ package handlers import ( "net/http" - "github.com/maxibanki/golang-url-shortener/handlers/auth" - "github.com/maxibanki/golang-url-shortener/util" + "github.com/mxschmitt/golang-url-shortener/handlers/auth" + "github.com/mxschmitt/golang-url-shortener/util" "github.com/sirupsen/logrus" jwt "github.com/dgrijalva/jwt-go" diff --git a/handlers/auth/auth.go b/handlers/auth/auth.go index fd7979d..c42356b 100644 --- a/handlers/auth/auth.go +++ b/handlers/auth/auth.go @@ -10,7 +10,7 @@ import ( jwt "github.com/dgrijalva/jwt-go" "github.com/gin-gonic/contrib/sessions" "github.com/gin-gonic/gin" - "github.com/maxibanki/golang-url-shortener/util" + "github.com/mxschmitt/golang-url-shortener/util" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/handlers/auth/github.go b/handlers/auth/github.go index aa31aa6..7c63e47 100644 --- a/handlers/auth/github.go +++ b/handlers/auth/github.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" - "github.com/maxibanki/golang-url-shortener/util" + "github.com/mxschmitt/golang-url-shortener/util" "github.com/sirupsen/logrus" "golang.org/x/oauth2/github" diff --git a/handlers/auth/google.go b/handlers/auth/google.go index 6e36f9d..f2d1055 100644 --- a/handlers/auth/google.go +++ b/handlers/auth/google.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" - "github.com/maxibanki/golang-url-shortener/util" + "github.com/mxschmitt/golang-url-shortener/util" "github.com/pkg/errors" "golang.org/x/oauth2" "golang.org/x/oauth2/google" diff --git a/handlers/auth/microsoft.go b/handlers/auth/microsoft.go index b9cfa99..546402f 100644 --- a/handlers/auth/microsoft.go +++ b/handlers/auth/microsoft.go @@ -7,7 +7,7 @@ import ( "golang.org/x/oauth2/microsoft" - "github.com/maxibanki/golang-url-shortener/util" + "github.com/mxschmitt/golang-url-shortener/util" "github.com/sirupsen/logrus" "github.com/pkg/errors" diff --git a/handlers/auth_test.go b/handlers/auth_test.go index fa21c28..4fbad9c 100644 --- a/handlers/auth_test.go +++ b/handlers/auth_test.go @@ -11,9 +11,9 @@ import ( jwt "github.com/dgrijalva/jwt-go" "github.com/gin-gonic/gin" - "github.com/maxibanki/golang-url-shortener/handlers/auth" - "github.com/maxibanki/golang-url-shortener/stores" - "github.com/maxibanki/golang-url-shortener/util" + "github.com/mxschmitt/golang-url-shortener/handlers/auth" + "github.com/mxschmitt/golang-url-shortener/stores" + "github.com/mxschmitt/golang-url-shortener/util" "github.com/pkg/errors" ) diff --git a/handlers/handlers.go b/handlers/handlers.go index ddab841..b72bf5a 100644 --- a/handlers/handlers.go +++ b/handlers/handlers.go @@ -10,9 +10,9 @@ import ( "github.com/sirupsen/logrus" "github.com/gin-gonic/gin" - "github.com/maxibanki/golang-url-shortener/handlers/tmpls" - "github.com/maxibanki/golang-url-shortener/stores" - "github.com/maxibanki/golang-url-shortener/util" + "github.com/mxschmitt/golang-url-shortener/handlers/tmpls" + "github.com/mxschmitt/golang-url-shortener/stores" + "github.com/mxschmitt/golang-url-shortener/util" "github.com/pkg/errors" ) diff --git a/handlers/public.go b/handlers/public.go index 16af852..d3a495c 100644 --- a/handlers/public.go +++ b/handlers/public.go @@ -12,9 +12,9 @@ import ( "time" "github.com/gin-gonic/gin" - "github.com/maxibanki/golang-url-shortener/handlers/auth" - "github.com/maxibanki/golang-url-shortener/stores/shared" - "github.com/maxibanki/golang-url-shortener/util" + "github.com/mxschmitt/golang-url-shortener/handlers/auth" + "github.com/mxschmitt/golang-url-shortener/stores/shared" + "github.com/mxschmitt/golang-url-shortener/util" "golang.org/x/crypto/bcrypt" ) diff --git a/handlers/public_test.go b/handlers/public_test.go index c6d65b9..2b55a98 100644 --- a/handlers/public_test.go +++ b/handlers/public_test.go @@ -11,8 +11,8 @@ import ( "testing" "github.com/gin-gonic/gin" - "github.com/maxibanki/golang-url-shortener/stores" - "github.com/maxibanki/golang-url-shortener/stores/shared" + "github.com/mxschmitt/golang-url-shortener/stores" + "github.com/mxschmitt/golang-url-shortener/stores/shared" ) const testURL = "https://www.google.de/" diff --git a/main.go b/main.go index e86def7..bad00e8 100644 --- a/main.go +++ b/main.go @@ -4,9 +4,9 @@ import ( "os" "os/signal" - "github.com/maxibanki/golang-url-shortener/handlers" - "github.com/maxibanki/golang-url-shortener/stores" - "github.com/maxibanki/golang-url-shortener/util" + "github.com/mxschmitt/golang-url-shortener/handlers" + "github.com/mxschmitt/golang-url-shortener/stores" + "github.com/mxschmitt/golang-url-shortener/util" "github.com/pkg/errors" "github.com/shiena/ansicolor" "github.com/sirupsen/logrus" diff --git a/main_test.go b/main_test.go index 0dfc81e..ccc56b8 100644 --- a/main_test.go +++ b/main_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/maxibanki/golang-url-shortener/util" + "github.com/mxschmitt/golang-url-shortener/util" ) func TestInitShortener(t *testing.T) { diff --git a/static/src/About/About.js b/static/src/About/About.js index 9b0033a..9f6387a 100644 --- a/static/src/About/About.js +++ b/static/src/About/About.js @@ -26,11 +26,11 @@ export default class AboutComponent extends Component { Source Code - github.com/maxibanki/golang-url-shortener + github.com/mxschmitt/golang-url-shortener Author - Max Schmitt + Max Schmitt Compilation Time @@ -38,7 +38,7 @@ export default class AboutComponent extends Component { Commit Hash - {info.commit} + {info.commit} Go Version @@ -58,7 +58,7 @@ export default class AboutComponent extends Component { License - MIT + MIT } diff --git a/stores/boltdb/boltdb.go b/stores/boltdb/boltdb.go index 5f33b24..3c5f401 100644 --- a/stores/boltdb/boltdb.go +++ b/stores/boltdb/boltdb.go @@ -6,7 +6,7 @@ import ( "time" "github.com/boltdb/bolt" - "github.com/maxibanki/golang-url-shortener/stores/shared" + "github.com/mxschmitt/golang-url-shortener/stores/shared" "github.com/pkg/errors" ) diff --git a/stores/store.go b/stores/store.go index 9cde61a..6f7520f 100644 --- a/stores/store.go +++ b/stores/store.go @@ -12,9 +12,9 @@ import ( "unicode" "github.com/asaskevich/govalidator" - "github.com/maxibanki/golang-url-shortener/stores/boltdb" - "github.com/maxibanki/golang-url-shortener/stores/shared" - "github.com/maxibanki/golang-url-shortener/util" + "github.com/mxschmitt/golang-url-shortener/stores/boltdb" + "github.com/mxschmitt/golang-url-shortener/stores/shared" + "github.com/mxschmitt/golang-url-shortener/util" "github.com/pborman/uuid" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/stores/store_test.go b/stores/store_test.go index fc582aa..d08c421 100644 --- a/stores/store_test.go +++ b/stores/store_test.go @@ -6,9 +6,9 @@ import ( "github.com/pkg/errors" - "github.com/maxibanki/golang-url-shortener/stores/shared" + "github.com/mxschmitt/golang-url-shortener/stores/shared" - "github.com/maxibanki/golang-url-shortener/util" + "github.com/mxschmitt/golang-url-shortener/util" ) var testData = struct { diff --git a/util/config.go b/util/config.go index 7466c24..a69e363 100644 --- a/util/config.go +++ b/util/config.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - envstruct "github.com/maxibanki/golang-env-struct" + envstruct "github.com/mxschmitt/golang-env-struct" "github.com/sirupsen/logrus" "github.com/pkg/errors"