diff options
| author | Horus_Arch | 2015-02-18 17:03:41 +0100 |
|---|---|---|
| committer | Horus_Arch | 2015-02-18 17:03:41 +0100 |
| commit | cb5f3037bb18403433c2cfd0271f6bea76906aca (patch) | |
| tree | 448397529fdbd1660b12001918289e04aa1c7ea6 /app | |
| parent | d6ab45e8ec5f26004b4efc07383245051d546bf3 (diff) | |
| download | statuspage-cb5f3037bb18403433c2cfd0271f6bea76906aca.tar.gz | |
Reimplementation with gorilla toolkit.
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/app.go | 11 | ||||
| -rw-r--r-- | app/controllers/db.go | 38 | ||||
| -rw-r--r-- | app/controllers/utilities.go | 96 | ||||
| -rw-r--r-- | app/init.go | 38 | ||||
| -rw-r--r-- | app/views/App/Index.html | 23 | ||||
| -rw-r--r-- | app/views/debug.html | 64 | ||||
| -rw-r--r-- | app/views/errors/404.html | 20 | ||||
| -rw-r--r-- | app/views/errors/500.html | 16 | ||||
| -rw-r--r-- | app/views/flash.html | 18 | ||||
| -rw-r--r-- | app/views/footer.html | 5 | ||||
| -rw-r--r-- | app/views/header.html | 17 |
11 files changed, 0 insertions, 346 deletions
diff --git a/app/controllers/app.go b/app/controllers/app.go deleted file mode 100644 index e76d76b..0000000 --- a/app/controllers/app.go +++ /dev/null @@ -1,11 +0,0 @@ -package controllers - -import "github.com/revel/revel" - -type App struct { - *revel.Controller -} - -func (c App) Index() revel.Result { - return c.Render() -} diff --git a/app/controllers/db.go b/app/controllers/db.go deleted file mode 100644 index e96cb63..0000000 --- a/app/controllers/db.go +++ /dev/null @@ -1,38 +0,0 @@ -package controllers - -import ( - "github.com/jinzhu/gorm" - _ "github.com/mattn/go-sqlite3" - "github.com/revel/revel" - "time" -) - -/* Maybe worth saving uptime history? */ - -type Hosts struct { - Id int64 - UserId int64 - Url string - Protocoll string // e.g. http - Private bool - Response int64 - Date time.Time - Success bool - Include string // Website must include this string - Except string // Website must not include this string - Reason string // Include, Exclude, Connection failure - Alert bool // True to send alert on failure - CreatedAt time.Time - DeletedAt time.Time - UpdatedAt time.Time -} - -type User struct { - Id int64 - Name string - Email string - Password string - CreatedAt time.Time - DeletedAt time.Time - UpdatedAt time.Time -} diff --git a/app/controllers/utilities.go b/app/controllers/utilities.go deleted file mode 100644 index 99720b8..0000000 --- a/app/controllers/utilities.go +++ /dev/null @@ -1,96 +0,0 @@ -package controllers - -import ( - "crypto/md5" - "fmt" - // "github.com/garyburd/redigo/redis" - "github.com/revel/revel" - "golang.org/x/crypto/bcrypt" - "io" - "io/ioutil" - "math/rand" - "net/http" - "time" -) - -// Returns the content of a webpage as string -func HttpGet(url string) (http.Header, string, error) { - response, err := http.Get(url) - if err != nil { - return nil, "Get request failed.", err - } - - defer response.Body.Close() - contents, err := ioutil.ReadAll(response.Body) - if err != nil { - return nil, "Reading body failed.", err - } - - return response.Header, string(contents), nil -} - -// Hashs and returns a string (md5) -func Hash(content string) string { - h := md5.New() - io.WriteString(h, content) - hash := fmt.Sprintf("%x", h.Sum(nil)) - - return hash -} - -// Creates a random string -func RandomKey() string { - letters := []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789") - key := make([]rune, 40) - for i := range key { - key[i] = letters[rand.Intn(len(letters))] - } - - return string(key) -} - -var pool = newPool() - -/* -// Creates a pool with connections to Redis -func newPool() *redis.Pool { - return &redis.Pool{ - MaxIdle: 3, - IdleTimeout: 240 * time.Second, - Dial: func() (redis.Conn, error) { - //c, err := redis.Dial("tcp", ":6379") - c, err := redis.Dial("tcp", revel.Config.StringDefault("redis.server", "127.0.0.1")+":"+revel.Config.StringDefault("redis.port", "6379")) - if err != nil { - return nil, err - } - return c, err - }, - TestOnBorrow: func(c redis.Conn, t time.Time) error { - _, err := c.Do("PING") - return err - }, - } -} -*/ - -// Hashs password with bcrypt and returns the string -func HashPassword(password string) (string, error) { - if password == "" { - return "", nil - } - p := []byte(password) - hash, err := bcrypt.GenerateFromPassword(p, 10) - if err != nil { - return "", err - } - return string(hash), nil -} - -// Verify password and hash -func VerifyPassword(password, hash string) (bool, error) { - err := bcrypt.CompareHashAndPassword([]byte(hash), []byte(password)) - if err != nil { - return false, err - } - return true, nil -} diff --git a/app/init.go b/app/init.go deleted file mode 100644 index 2305d73..0000000 --- a/app/init.go +++ /dev/null @@ -1,38 +0,0 @@ -package app - -import "github.com/revel/revel" - -func init() { - // Filters is the default set of global filters. - revel.Filters = []revel.Filter{ - revel.PanicFilter, // Recover from panics and display an error page instead. - revel.RouterFilter, // Use the routing table to select the right Action - revel.FilterConfiguringFilter, // A hook for adding or removing per-Action filters. - revel.ParamsFilter, // Parse parameters into Controller.Params. - revel.SessionFilter, // Restore and write the session cookie. - revel.FlashFilter, // Restore and write the flash cookie. - revel.ValidationFilter, // Restore kept validation errors and save new ones from cookie. - revel.I18nFilter, // Resolve the requested language - HeaderFilter, // Add some security based headers - revel.InterceptorFilter, // Run interceptors around the action. - revel.CompressFilter, // Compress the result. - revel.ActionInvoker, // Invoke the action. - } - - // register startup functions with OnAppStart - // ( order dependent ) - // revel.OnAppStart(InitDB) - // revel.OnAppStart(FillCache) -} - -// TODO turn this into revel.HeaderFilter -// should probably also have a filter for CSRF -// not sure if it can go in the same filter or not -var HeaderFilter = func(c *revel.Controller, fc []revel.Filter) { - // Add some common security headers - c.Response.Out.Header().Add("X-Frame-Options", "SAMEORIGIN") - c.Response.Out.Header().Add("X-XSS-Protection", "1; mode=block") - c.Response.Out.Header().Add("X-Content-Type-Options", "nosniff") - - fc[0](c, fc[1:]) // Execute the next filter stage. -} diff --git a/app/views/App/Index.html b/app/views/App/Index.html deleted file mode 100644 index deb2304..0000000 --- a/app/views/App/Index.html +++ /dev/null @@ -1,23 +0,0 @@ -{{set . "title" "Home"}} -{{template "header.html" .}} - -<header class="hero-unit" style="background-color:#A9F16C"> - <div class="container"> - <div class="row"> - <div class="hero-text"> - <h1>It works!</h1> - <p></p> - </div> - </div> - </div> -</header> - -<div class="container"> - <div class="row"> - <div class="span6"> - {{template "flash.html" .}} - </div> - </div> -</div> - -{{template "footer.html" .}} diff --git a/app/views/debug.html b/app/views/debug.html deleted file mode 100644 index f3975b7..0000000 --- a/app/views/debug.html +++ /dev/null @@ -1,64 +0,0 @@ -<style type="text/css"> - #sidebar { - position: absolute; - right: 0px; - top:69px; - max-width: 75%; - z-index: 1000; - background-color: #fee; - border: thin solid grey; - padding: 10px; - } - #toggleSidebar { - position: absolute; - right: 0px; - top: 50px; - background-color: #fee; - } - -</style> -<div id="sidebar" style="display:none;"> - <h4>Available pipelines</h4> - <dl> - {{ range $index, $value := .}} - <dt>{{$index}}</dt> - <dd>{{$value}}</dd> - {{end}} - </dl> - <h4>Flash</h4> - <dl> - {{ range $index, $value := .flash}} - <dt>{{$index}}</dt> - <dd>{{$value}}</dd> - {{end}} - </dl> - - <h4>Errors</h4> - <dl> - {{ range $index, $value := .errors}} - <dt>{{$index}}</dt> - <dd>{{$value}}</dd> - {{end}} - </dl> -</div> -<a id="toggleSidebar" href="#" class="toggles"><i class="icon-chevron-left"></i></a> - -<script> - $sidebar = 0; - $('#toggleSidebar').click(function() { - if ($sidebar === 1) { - $('#sidebar').hide(); - $('#toggleSidebar i').addClass('icon-chevron-left'); - $('#toggleSidebar i').removeClass('icon-chevron-right'); - $sidebar = 0; - } - else { - $('#sidebar').show(); - $('#toggleSidebar i').addClass('icon-chevron-right'); - $('#toggleSidebar i').removeClass('icon-chevron-left'); - $sidebar = 1; - } - - return false; - }); -</script> diff --git a/app/views/errors/404.html b/app/views/errors/404.html deleted file mode 100644 index ebdfe10..0000000 --- a/app/views/errors/404.html +++ /dev/null @@ -1,20 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> - <head> - <title>Not found</title> - </head> - <body> -{{if eq .RunMode "dev"}} -{{template "errors/404-dev.html" .}} -{{else}} - {{with .Error}} - <h1> - {{.Title}} - </h1> - <p> - {{.Description}} - </p> - {{end}} -{{end}} - </body> -</html> diff --git a/app/views/errors/500.html b/app/views/errors/500.html deleted file mode 100644 index 0cef4de..0000000 --- a/app/views/errors/500.html +++ /dev/null @@ -1,16 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>Application error</title> - </head> - <body> - {{if eq .RunMode "dev"}} - {{template "errors/500-dev.html" .}} - {{else}} - <h1>Oops, an error occured</h1> - <p> - This exception has been logged. - </p> - {{end}} - </body> -</html> diff --git a/app/views/flash.html b/app/views/flash.html deleted file mode 100644 index 9c9ade9..0000000 --- a/app/views/flash.html +++ /dev/null @@ -1,18 +0,0 @@ -{{if .flash.success}} -<div class="alert alert-success"> - {{.flash.success}} -</div> -{{end}} - -{{if or .errors .flash.error}} -<div class="alert alert-error"> - {{if .flash.error}} - {{.flash.error}} - {{end}} - <ul style="margin-top:10px;"> - {{range .errors}} - <li>{{.}}</li> - {{end}} - </ul> -</div> -{{end}} diff --git a/app/views/footer.html b/app/views/footer.html deleted file mode 100644 index 8db95e5..0000000 --- a/app/views/footer.html +++ /dev/null @@ -1,5 +0,0 @@ - {{if eq .RunMode "dev"}} - {{template "debug.html" .}} - {{end}} - </body> -</html> diff --git a/app/views/header.html b/app/views/header.html deleted file mode 100644 index 01637f4..0000000 --- a/app/views/header.html +++ /dev/null @@ -1,17 +0,0 @@ -<!DOCTYPE html> - -<html> - <head> - <title>{{.title}}</title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <link rel="stylesheet" type="text/css" href="/public/css/bootstrap.css"> - <link rel="shortcut icon" type="image/png" href="/public/img/favicon.png"> - <script src="/public/js/jquery-1.9.1.min.js" type="text/javascript" charset="utf-8"></script> - {{range .moreStyles}} - <link rel="stylesheet" type="text/css" href="/public/{{.}}"> - {{end}} - {{range .moreScripts}} - <script src="/public/{{.}}" type="text/javascript" charset="utf-8"></script> - {{end}} - </head> - <body> |
