diff --git a/client/js/components/Header.js b/client/js/components/Header.js
index 0257a8b..e665b32 100644
--- a/client/js/components/Header.js
+++ b/client/js/components/Header.js
@@ -1,18 +1,20 @@
import React from 'react';
-import {bubble} from '../../assets/js/bubble';
+//import {bubble} from '../../assets/js/bubble';
import '../../assets/scss/Header.scss';
export default class Header extends React.Component {
+ /*
componentDidMount() {
bubble();
+ //insert this:
+
}
+ */
render() {
return (
-
+
)
}
}
diff --git a/server/mywebsite.go b/server/mywebsite.go
index 0e233f4..20d46e0 100644
--- a/server/mywebsite.go
+++ b/server/mywebsite.go
@@ -1,34 +1,38 @@
package main
import (
+ "github.com/NYTimes/gziphandler"
"log"
"net/http"
"strconv"
- "github.com/NYTimes/gziphandler"
-
+
"mywebsite/server/controller/api"
"mywebsite/server/db"
"mywebsite/server/route"
"mywebsite/server/utils"
)
-func main(){
+func main() {
configurations := utils.ReadConfig()
db.Configure(configurations.Database)
api.Configure(configurations.Api)
db.Mongo.Connect()
-
+
//register middleware
handle := gziphandler.GzipHandler(route.Routes())
-
+
log.Println("Starting Server...")
+ log.Println(http.ListenAndServe(":"+strconv.Itoa(configurations.Port), handle))
+
+ /* enable for TLS support
go func(){
log.Println(http.ListenAndServe(":"+strconv.Itoa(configurations.Port), handle))
}()
-
+
if configurations.TLSCertFile != "" && configurations.TLSKeyFile != "" {
log.Println(http.ListenAndServeTLS(":"+strconv.Itoa(configurations.TLSPort), configurations.TLSCertFile, configurations.TLSKeyFile, handle))
}
+ */
}