mitchell/mywebsite
1
0
Fork 0
mirror of https://github.com/mgerb/mywebsite synced 2026-01-10 18:02:51 +00:00
Code Issues Releases Wiki Activity

updated header

Browse Source
This commit is contained in:
mgerb42
2016-12-08 03:08:33 +01:00
parent 9c2e7bd754
commit d2cc34d3a0
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/js/components/Header.js
View File

@@ -1,18 +1,20 @@
import React from 'react'; import React from 'react';
import {bubble} from '../../assets/js/bubble'; //import {bubble} from '../../assets/js/bubble';
import '../../assets/scss/Header.scss'; import '../../assets/scss/Header.scss';
export default class Header extends React.Component { export default class Header extends React.Component {
/*
componentDidMount() { componentDidMount() {
bubble(); bubble();
//insert this:
<canvas id="canvas" width="854" height="709"></canvas>
} }
*/
render() { render() {
return ( return (
<header id="header" class="Header"> <header id="header" class="Header"/>
<canvas id="canvas" width="854" height="709"></canvas>
</header>
) )
} }
} }

16
server/mywebsite.go
View File

@@ -1,34 +1,38 @@
package main package main
import ( import (
"github.com/NYTimes/gziphandler"
"log" "log"
"net/http" "net/http"
"strconv" "strconv"
"github.com/NYTimes/gziphandler"
"mywebsite/server/controller/api" "mywebsite/server/controller/api"
"mywebsite/server/db" "mywebsite/server/db"
"mywebsite/server/route" "mywebsite/server/route"
"mywebsite/server/utils" "mywebsite/server/utils"
) )
func main(){ func main() {
configurations := utils.ReadConfig() configurations := utils.ReadConfig()
db.Configure(configurations.Database) db.Configure(configurations.Database)
api.Configure(configurations.Api) api.Configure(configurations.Api)
db.Mongo.Connect() db.Mongo.Connect()
//register middleware //register middleware
handle := gziphandler.GzipHandler(route.Routes()) handle := gziphandler.GzipHandler(route.Routes())
log.Println("Starting Server...") log.Println("Starting Server...")
log.Println(http.ListenAndServe(":"+strconv.Itoa(configurations.Port), handle))
/* enable for TLS support
go func(){ go func(){
log.Println(http.ListenAndServe(":"+strconv.Itoa(configurations.Port), handle)) log.Println(http.ListenAndServe(":"+strconv.Itoa(configurations.Port), handle))
}() }()
if configurations.TLSCertFile != "" && configurations.TLSKeyFile != "" { if configurations.TLSCertFile != "" && configurations.TLSKeyFile != "" {
log.Println(http.ListenAndServeTLS(":"+strconv.Itoa(configurations.TLSPort), configurations.TLSCertFile, configurations.TLSKeyFile, handle)) log.Println(http.ListenAndServeTLS(":"+strconv.Itoa(configurations.TLSPort), configurations.TLSCertFile, configurations.TLSKeyFile, handle))
} }
*/
} }