Skip to content

Commit

Permalink
Merge pull request #21 from ultreme/dev/moul/import-old-templates
Browse files Browse the repository at this point in the history
chore: import old templates & static files
  • Loading branch information
moul authored Jan 20, 2019
2 parents 0d6a717 + d9a8b3a commit 3808bd6
Show file tree
Hide file tree
Showing 536 changed files with 115,739 additions and 4 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
.DS_Store
*~
.#*
*#

.env
docker-compose.yml
Dockerfile
Expand Down
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ require (
github.com/golang/protobuf v1.2.0
github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect
github.com/gorilla/handlers v1.4.0
github.com/gorilla/mux v1.6.2
github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190104160321-4832df01553a
github.com/grpc-ecosystem/grpc-gateway v1.6.4
github.com/jtolds/gls v4.2.1+incompatible // indirect
Expand Down
1 change: 1 addition & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORR
github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
github.com/gorilla/handlers v1.4.0 h1:XulKRWSQK5uChr4pEgSE4Tc/OcmnU9GJuSwdog/tZsA=
github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
github.com/gorilla/mux v1.6.2 h1:Pgr17XVTNXAk3q/r4CpKzC5xBM/qW1uVLV+IhRZpIIk=
github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
github.com/gorilla/pat v0.0.0-20180118222023-199c85a7f6d1/go.mod h1:YeAe0gNeiNT5hoiZRI4yiOky6jVdNvfO2N6Kav/HmxY=
github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
Expand Down
11 changes: 8 additions & 3 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/gobuffalo/packr"
"github.com/gogo/gateway"
"github.com/gorilla/handlers"
"github.com/gorilla/mux"
grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
grpc_zap "github.com/grpc-ecosystem/go-grpc-middleware/logging/zap"
grpc_recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery"
Expand All @@ -26,6 +27,7 @@ import (

"ultre.me/calcbiz/api"
"ultre.me/calcbiz/svc"
"ultre.me/calcbiz/views"
)

// VERSION represents the version of the Camembert au lait crew's website
Expand Down Expand Up @@ -140,11 +142,14 @@ func startHTTPServer(ctx context.Context, opts *serverOptions) error {
return err
}
zap.L().Info("starting HTTP server", zap.String("bind", opts.HTTPBind))
router := mux.NewRouter()
views.Setup(router)
box := packr.NewBox("./static")
router.PathPrefix("/").Handler(http.FileServer(box))
mux := http.NewServeMux()
mux.Handle("/api/", gwmux)

box := packr.NewBox("./static")
mux.Handle("/", http.FileServer(box))
mux.Handle("/", router)
// FIXME: handle 404

handler := handlers.LoggingHandler(os.Stderr, mux)
handler = handlers.RecoveryHandler(handlers.PrintRecoveryStack(true))(handler)
Expand Down
Binary file added static/audio/une_gomme.mp3
Binary file not shown.
47 changes: 47 additions & 0 deletions static/components/bootstrap/.bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"name": "bootstrap",
"description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
"version": "3.2.0",
"keywords": [
"css",
"js",
"less",
"mobile-first",
"responsive",
"front-end",
"framework",
"web"
],
"homepage": "http://getbootstrap.com",
"main": [
"less/bootstrap.less",
"dist/css/bootstrap.css",
"dist/js/bootstrap.js",
"dist/fonts/glyphicons-halflings-regular.eot",
"dist/fonts/glyphicons-halflings-regular.svg",
"dist/fonts/glyphicons-halflings-regular.ttf",
"dist/fonts/glyphicons-halflings-regular.woff"
],
"ignore": [
".*",
"_config.yml",
"CNAME",
"composer.json",
"CONTRIBUTING.md",
"docs",
"js/tests",
"test-infra"
],
"dependencies": {
"jquery": ">= 1.9.0"
},
"_release": "3.2.0",
"_resolution": {
"type": "version",
"tag": "v3.2.0",
"commit": "c068162161154a4b85110ea1e7dd3d7897ce2b72"
},
"_source": "https://github.com/twbs/bootstrap.git",
"_target": "~3.2.0",
"_originalSource": "bootstrap"
}
Loading

0 comments on commit 3808bd6

Please sign in to comment.