ShareX
/
golang-url-shortener
mirror of https://github.com/mxschmitt/golang-url-shortener.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed maxibanki to new mxschmitt username

This commit is contained in:
Max Schmitt 2018-02-05 14:04:47 +01:00
parent c59b42788a
commit 122783a385
23 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -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=

2
Dockerfile.amd64
View File

@ -1,7 +1,7 @@
FROM alpine
LABEL maintainer="Max Schmitt <max@schmitt.mx>"
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

2
Dockerfile.arm
View File

@ -1,7 +1,7 @@
FROM alpine
LABEL maintainer="Max Schmitt <max@schmitt.mx>"
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

8
Makefile
View File

@ -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 .
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 .

4
README.md
View File

@ -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

2
build/bintray.json
View File

@ -2,7 +2,7 @@
"package": {
"name": "travis-ci",
"repo": "golang-url-shortener",
"subject": "maxibanki"
"subject": "mxschmitt"
},
"version": {
"name": "0.1"

2
docker-compose.yml
View File

@ -1,5 +1,5 @@
golang_url_shortener:
image: maxibanki/golang_url_shortener
image: mxschmitt/golang_url_shortener
ports:
- 8080:8080
volumes:

4
handlers/auth.go
View File

@ -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"

2
handlers/auth/auth.go
View File

@ -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"
)

2
handlers/auth/github.go
View File

@ -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"

2
handlers/auth/google.go
View File

@ -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"

2
handlers/auth/microsoft.go
View File

@ -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"

6
handlers/auth_test.go
View File

@ -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"
)

6
handlers/handlers.go
View File

@ -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"
)

6
handlers/public.go
View File

@ -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"
)

4
handlers/public_test.go
View File

@ -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/"

6
main.go
View File

@ -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"

2
main_test.go
View File

@ -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) {

8
static/src/About/About.js
View File

@ -26,11 +26,11 @@ export default class AboutComponent extends Component {
<Table.Body>
<Table.Row>
<Table.Cell>Source Code</Table.Cell>
<Table.Cell><a href="https://github.com/maxibanki/golang-url-shortener" target="_blank" rel="noopener noreferrer">github.com/maxibanki/golang-url-shortener</a></Table.Cell>
<Table.Cell><a href="https://github.com/mxschmitt/golang-url-shortener" target="_blank" rel="noopener noreferrer">github.com/mxschmitt/golang-url-shortener</a></Table.Cell>
</Table.Row>
<Table.Row>
<Table.Cell>Author</Table.Cell>
<Table.Cell><a href="https://github.com/maxibanki/" target="_blank" rel="noopener noreferrer">Max Schmitt</a></Table.Cell>
<Table.Cell><a href="https://github.com/mxschmitt/" target="_blank" rel="noopener noreferrer">Max Schmitt</a></Table.Cell>
</Table.Row>
<Table.Row>
<Table.Cell>Compilation Time</Table.Cell>
@ -38,7 +38,7 @@ export default class AboutComponent extends Component {
</Table.Row>
<Table.Row>
<Table.Cell>Commit Hash</Table.Cell>
<Table.Cell><a href={"https://github.com/maxibanki/golang-url-shortener/commit/" + info.commit} target="_blank" rel="noopener noreferrer">{info.commit}</a></Table.Cell>
<Table.Cell><a href={"https://github.com/mxschmitt/golang-url-shortener/commit/" + info.commit} target="_blank" rel="noopener noreferrer">{info.commit}</a></Table.Cell>
</Table.Row>
<Table.Row>
<Table.Cell>Go Version</Table.Cell>
@ -58,7 +58,7 @@ export default class AboutComponent extends Component {
</Table.Row>
<Table.Row>
<Table.Cell>License</Table.Cell>
<Table.Cell><a href="https://github.com/maxibanki/golang-url-shortener/blob/master/LICENSE.md" target="_blank" rel="noopener noreferrer">MIT</a></Table.Cell>
<Table.Cell><a href="https://github.com/mxschmitt/golang-url-shortener/blob/master/LICENSE.md" target="_blank" rel="noopener noreferrer">MIT</a></Table.Cell>
</Table.Row>
</Table.Body>
</Table>}

2
stores/boltdb/boltdb.go
View File

@ -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"
)

6
stores/store.go
View File

@ -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"

4
stores/store_test.go
View File

@ -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 {

2
util/config.go
View File

@ -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"