Moves static into webapp

This commit is contained in:
2016-02-11 14:54:04 +01:00
parent 15974168f5
commit 143274f369
9 changed files with 8 additions and 8 deletions

View File

@@ -16,5 +16,5 @@ gulp.task('test', function() {
gulp.task('autotest', function() { gulp.task('autotest', function() {
return gulp.watch(['static/js/**/*.js','test/specs/*.js'], ['test']); return gulp.watch(['webapp/js/**/*.js','test/specs/*.js'], ['test']);
}); });

View File

@@ -125,17 +125,17 @@ func (a *appData) buildRouter() http.Handler {
dirs := []string{"css", "js", "img", "fonts", "html", "bower_components"} dirs := []string{"css", "js", "img", "fonts", "html", "bower_components"}
for _, d := range dirs { for _, d := range dirs {
router.ServeFiles(path.Join("/", d, "/*filepath"), http.Dir(filepath.Join("static", d))) router.ServeFiles(path.Join("/", d, "/*filepath"), http.Dir(filepath.Join("webapp", d)))
} }
router.GET("/", narco.EndChain(ch, narco.HandlerFunc( router.GET("/", narco.EndChain(ch, narco.HandlerFunc(
func(ctx context.Context, w http.ResponseWriter, req *http.Request, _ httprouter.Params) { func(ctx context.Context, w http.ResponseWriter, req *http.Request, _ httprouter.Params) {
f, err := os.Open(filepath.Join("static", "index.html")) f, err := os.Open(filepath.Join("webapp", "index.html"))
if err != nil { if err != nil {
narco.Error(ctx, w, err, http.StatusInternalServerError) narco.Error(ctx, w, err, http.StatusInternalServerError)
return return
} }
defer closeOrPanic(f, filepath.Join("static", "index.html")) defer closeOrPanic(f, filepath.Join("webapp", "index.html"))
io.Copy(w, f) io.Copy(w, f)
}))) })))

View File

@@ -2,10 +2,10 @@ module.exports = function(config) {
config.set({ config.set({
basepath: './', basepath: './',
files : [ files : [
'static/bower_components/angular/angular.js', 'webapp/bower_components/angular/angular.js',
'static/bower_components/angular-route/angular-route.js', 'webapp/bower_components/angular-route/angular-route.js',
'static/bower_components/angular-mocks/angular-mocks.js', 'webapp/bower_components/angular-mocks/angular-mocks.js',
'static/js/**/*.js', 'webapp/js/**/*.js',
'test/specs/**/*.js' 'test/specs/**/*.js'
], ],