diff --git a/.gitignore b/.gitignore index cc40fd6..7cd8025 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ debug /config.* /handlers/static.go /handlers/tmpls/tmpls.go +/util/version.go /store/main.db /releases /data \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 0bf6e0f..aa70f1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,3 @@ deploy: 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= -notifications: - webhooks: - - https://ws.b0n.pl/relaunch diff --git a/Makefile b/Makefile index a85f9af..ea90040 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,7 @@ buildNodeFrontend: embedFrontend: @cd handlers/tmpls && esc -o tmpls.go -pkg tmpls -include ^*\.tmpl . @cd handlers && esc -o static.go -pkg handlers -prefix ../static/build ../static/build + bash build/info.sh getCMDDependencies: go get -v github.com/mattn/goveralls diff --git a/README.md b/README.md index 249f103..dfe71c1 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ [![Coverage Status](https://coveralls.io/repos/github/maxibanki/golang-url-shortener/badge.svg?branch=master)](https://coveralls.io/github/maxibanki/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/) ## Main Features @@ -13,7 +14,7 @@ - Visitor Counting - Expirable Links - URL deletion -- Authorization System via OAuth 2.0 from Google (more providers following) +- Authorization System via OAuth 2.0 (Google, GitHub and Micrsoft) - High performance database with [bolt](https://github.com/boltdb/bolt) - Easy [ShareX](https://github.com/ShareX/ShareX) integration - Dockerizable diff --git a/build/info.sh b/build/info.sh new file mode 100644 index 0000000..161ef3b --- /dev/null +++ b/build/info.sh @@ -0,0 +1,10 @@ +cat > util/info.go < res.json()).then(d => this.setState({ info: d })) + } render() { + const { info } = this.state return ( -
About
+ {info && + + + Property + Info + + + + + + Source Code + github.com/maxibanki/golang-url-shortener + + + Author + Max Schmitt + + + Compilation Time + {info.compilationTime} + + + Commit Hash + {info.commit} + + + Go Version + {info.go.replace("go", "")} + + + React Version + {React.version} + + + Node.js Version + {info.nodeJS.replace("v", "")} + + + Yarn Version + {info.yarn} + + + License + MIT + + +
}
) } diff --git a/static/src/ShareX/ShareX.css b/static/src/ShareX/ShareX.css new file mode 100644 index 0000000..5a83601 --- /dev/null +++ b/static/src/ShareX/ShareX.css @@ -0,0 +1,3 @@ +.token.operator, .token.entity, .token.url, .language-css .token.string, .style .token.string { + background: none; +} \ No newline at end of file diff --git a/static/src/ShareX/ShareX.js b/static/src/ShareX/ShareX.js index f846a77..93025ba 100644 --- a/static/src/ShareX/ShareX.js +++ b/static/src/ShareX/ShareX.js @@ -6,6 +6,8 @@ import 'prismjs/components/prism-json' import PrismCode from 'react-prism' import 'prismjs/themes/prism.css'; +import './ShareX.css' + export default class ShareXComponent extends Component { state = { config: JSON.stringify({