Skip to content

Commit

Permalink
Update website
Browse files Browse the repository at this point in the history
Signed-off-by: Vishal Rana <[email protected]>
  • Loading branch information
vishr committed Jan 10, 2017
1 parent 73b7eca commit 35742c9
Show file tree
Hide file tree
Showing 33 changed files with 51 additions and 56 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016 LabStack
Copyright (c) 2017 LabStack

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion website/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ googleAnalytics = "UA-85059636-2"
[permalinks]
guide = "/guide/:filename"
middleware = "/middleware/:filename"
recipes = "/recipes/:filename"
examples = "/examples/:filename"
[params]
description = "Echo is a high performance, extensible, minimalist web framework for Go (Golang)."
13 changes: 13 additions & 0 deletions website/content/examples.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
+++
title = "Examples"
description = "Echo examples"
type = "examples"
[menu.main]
name = "Examples"
pre = "<i class='fa fa-code'></i>"
weight = 2
identifier = "examples"
url = "/examples"
+++

<script>location = '/examples/hello-world';</script>
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title = "Auto TLS Example"
description = "Automatic TLS certificates from Let's Encrypt example for Echo"
[menu.main]
name = "Auto TLS"
parent = "recipes"
parent = "examples"
weight = 2
+++

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description = "CORS example for Echo"
[menu.main]
name = "CORS"
identifier = "middleware-cors"
parent = "recipes"
parent = "examples"
weight = 3
+++

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title = "CRUD Example"
description = "CRUD (Create, read, update and delete) example for Echo"
[menu.main]
name = "CRUD"
parent = "recipes"
parent = "examples"
weight = 2
+++

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title = "Embed Resources Example"
description = "Embed resources example for Echo"
[menu.main]
name = "Embed Resources"
parent = "recipes"
parent = "examples"
weight = 14
+++

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title = "File Upload Example"
description = "File upload example for Echo"
[menu.main]
name = "File Upload"
parent = "recipes"
parent = "examples"
weight = 7
+++

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title = "Google App Engine Example"
description = "Google App Engine example for Echo"
[menu.main]
name = "Google App Engine"
parent = "recipes"
parent = "examples"
weight = 12
+++

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title = "Graceful Shutdown Example"
description = "Graceful shutdown example for Echo"
[menu.main]
name = "Graceful Shutdown"
parent = "recipes"
parent = "examples"
weight = 13
+++

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title = "Hello World Example"
description = "Hello world example for Echo"
[menu.main]
name = "Hello World"
parent = "recipes"
parent = "examples"
weight = 1
+++

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title = "HTTP/2 Example"
description = "HTTP/2 example for Echo"
[menu.main]
name = "HTTP/2"
parent = "recipes"
parent = "examples"
weight = 3
+++

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title = "JSONP Example"
description = "JSONP example for Echo"
[menu.main]
name = "JSONP"
parent = "recipes"
parent = "examples"
weight = 6
+++

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description = "JWT example for Echo"
[menu.main]
name = "JWT"
identifier = "recipe-jwt"
parent = "recipes"
parent = "examples"
weight = 11
+++

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title = "Middleware Example"
description = "Middleware example for Echo"
[menu.main]
name = "Middleware"
parent = "recipes"
parent = "examples"
weight = 3
+++

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title = "Streaming Response Example"
description = "Streaming response example for Echo"
[menu.main]
name = "Streaming Response"
parent = "recipes"
parent = "examples"
weight = 3
+++

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title = "Subdomains Example"
description = "Subdomains example for Echo"
[menu.main]
name = "Subdomains"
parent = "recipes"
parent = "examples"
weight = 10
+++

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title = "Twitter Like API Example"
description = "Twitter Like API example for Echo"
[menu.main]
name = "Twitter"
parent = "recipes"
parent = "examples"
weight = 2
+++

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title = "WebSocket Example"
description = "WebSocket example for Echo"
[menu.main]
name = "WebSocket"
parent = "recipes"
parent = "examples"
weight = 5
+++

Expand Down
2 changes: 1 addition & 1 deletion website/content/guide.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
+++
title = "Guide"
description = "Guide"
description = "Echo guide"
type = "guide"
[menu.main]
name = "Guide"
Expand Down
4 changes: 2 additions & 2 deletions website/content/guide/migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ description = "Migration"
- Dropped support for `fasthttp`
- Dropped deprecated API
- Moved `Logger` interface to root level
- Moved website and recipes to the main repo
- Moved website and examples to the main repo
- Updated docs and fixed numerous issues

## [Recipes](/recipes/hello-world)
## [Examples](/examples/hello-world)
2 changes: 1 addition & 1 deletion website/content/guide/response.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ func(c echo.Context) error {
Go type into JSON and send it as JSONP payload constructed using a callback, with
status code.

[*Example*](/recipes/jsonp)
[*Example*](/examples/jsonp)

## Send XML

Expand Down
4 changes: 2 additions & 2 deletions website/content/middleware.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
+++
title = "Middleware"
description = "Middleware"
description = "Echo middleware"
type = "middleware"
[menu.main]
name = "Middleware"
Expand Down Expand Up @@ -105,4 +105,4 @@ e.Use(middleware.LoggerWithConfig(middleware.LoggerConfig{

Example above skips Logger middleware when request host starts with localhost.

## [Writing Custom Middleware]({{< ref "recipes/middleware.md">}})
## [Writing Custom Middleware]({{< ref "examples/middleware.md">}})
2 changes: 1 addition & 1 deletion website/content/middleware/jwt.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ DefaultJWTConfig = JWTConfig{
}
```

## [Recipe]({{< ref "recipes/jwt.md">}})
## [Recipe]({{< ref "examples/jwt.md">}})
13 changes: 0 additions & 13 deletions website/content/recipes.md

This file was deleted.

5 changes: 2 additions & 3 deletions website/layouts/_default/single.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{{ partial "head.html" . }}
<body>
<link rel="stylesheet" href="https://cdn.labstack.com/styles/docs.css">
<body class="docs">
{{ partial "topnav.html" . }}
<div class="w3-container w3-content">
{{ partial "sidenav.html" . }}
<div class="main">
{{ partial "ad.html" }}
<div class="w3-row-padding">
<div class="w3-row">
<div class="w3-col s12 m10 l10">
{{ partial "notice.html" }}
<article class="content">
Expand Down
4 changes: 1 addition & 3 deletions website/layouts/partials/footer.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<footer class="w3-container w3-content w3-padding-48 w3-center footer">
<p>
<strong>Echo</strong> by <a href="https://labstack.com">LabStack</a> © 2016 LabStack. All Rights Reserved.
<strong>Echo</strong> by <a href="https://labstack.com">LabStack</a> © 2017 LabStack. All Rights Reserved.
</p>
<p>
<a class="icon" href="https://labstack.com/blog">
Expand Down Expand Up @@ -30,5 +30,3 @@
</script>
<script src="https://cdn.labstack.com/scripts/prism.js"></script>
<script src="https://cdn.labstack.com/scripts/base.js"></script>
<script src="https://cdn.labstack.com/scripts/docs.js"></script>
<script src="/scripts/main.js"></script>
4 changes: 1 addition & 3 deletions website/layouts/partials/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,10 @@
{{ if ne .URL "/" }}{{ .Title }} | {{ end }}{{ .Site.Title }}
</title>
<link rel="stylesheet" href="https://unpkg.com/[email protected]/css/font-awesome.min.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css">
<!--<link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css">-->
<link rel="stylesheet" href="https://cdn.labstack.com/styles/w3.css">
<link rel="stylesheet" href="https://cdn.labstack.com/styles/prism.css">
<link rel="stylesheet" href="https://cdn.labstack.com/styles/base.css">
<link rel="stylesheet" href="https://cdn.labstack.com/styles/ad.css">
<link rel="stylesheet" href="/styles/main.css">
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
Expand Down
4 changes: 2 additions & 2 deletions website/layouts/partials/notice.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div class="w3-panel w3-pale-green w3-leftbar w3-border-green">
<!--<div class="w3-panel w3-pale-green w3-leftbar w3-border-green">
<h3>
Check out our new project <a href="https://armor.labstack.com">Armor</a>
</h3>
<p>
Uncomplicated, modern HTTP server, supports HTTP/2 and auto TLS
</p>
</div>
</div>-->
9 changes: 4 additions & 5 deletions website/layouts/partials/sidenav.html
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
<nav class="w3-sidenav w3-border-right collapse">
<span class="w3-closenav w3-xxlarge hide-large" onclick="closeSidenav()">&times;</span>
<nav class="w3-sidenav w3-border-right">
<button class="w3-btn w3-white w3-border w3-border-theme w3-round-xlarge" onclick="location.href='/support-echo';">
<i class="fa fa-heart" aria-hidden="true"></i> Support Echo
</button>
{{ $currentNode := . }}
<div class="menu hide-large">
<div class="menu">
{{ range .Site.Menus.main }}
<a{{ if or ($currentNode.HasMenuCurrent "main" .) ($currentNode.IsMenuCurrent "main" .) }} class="active"{{ end }} href="{{ .URL }}">
<div class="w3-xlarge w3-padding-top">{{ .Name }}</div>
{{ .Name }}
</a>
{{ end }}
</div>
<div class="sub-menu">
{{ if .IsPage }}
{{ range where .Site.Menus.main "Identifier" .Type }}
<div class="w3-xlarge w3-padding-top">{{ .Pre }} {{ .Name }}</div>
<h3>{{ .Pre }} {{ .Name }}</h3>
{{ range .Children }}
<a{{ if $currentNode.IsMenuCurrent "main" . }} class="active"{{ end }} href="{{ .URL }}">
{{ .Name }}
Expand Down
4 changes: 3 additions & 1 deletion website/layouts/partials/topnav.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
<a{{ if or ($currentNode.HasMenuCurrent "main" .) ($currentNode.IsMenuCurrent "main" .) }} class="active"{{ end }} href="{{ .URL }}">{{ .Name }}</a>
{{ end }}
</span>
<span class="w3-xxlarge hide-large" onclick="openSidenav()">&#9776;</span>
<button class="hamburger hide-large" onclick="toggleSidenav()">
<span></span>
</button>
</nav>
</div>
Empty file removed website/static/scripts/main.js
Empty file.
1 change: 0 additions & 1 deletion website/static/styles/main.css

This file was deleted.

0 comments on commit 35742c9

Please sign in to comment.