mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-10-02 08:22:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #581 from bradrydzewski/master

Browse source 
moving websockets to subrouter
This commit is contained in:
Brad Rydzewski 2014-10-16 12:43:51 -07:00
commit 6a6cef157f
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
server/app/styles/drone.less
View file

@ -1039,6 +1039,7 @@ nav {
color:#666; color:#666;
line-height:22px; line-height:22px;
font-size:14px; font-size:14px;
word-break: break-all;
} }
} }

4
server/app/views/repo_edit.html
View file

@ -87,7 +87,7 @@
<h2>Status Badge</h2> <h2>Status Badge</h2>
</div> </div>
<div class="pure-u-1"> <div class="pure-u-1">
<div class="markdown">{{ repo | badgeMarkdown }}</div> <pre class="markdown">{{ repo | badgeMarkdown }}</pre>
</div> </div>
</div> </div>
</section> </section>
@ -97,7 +97,7 @@
<div class="pure-u-1"> <div class="pure-u-1">
<div> <div>
<h2>Public Key</h2> <h2>Public Key</h2>
<pre class="key">{{ repo.public_key }}</pre> <pre class="key">{{ repo.public_key }}</pre>
</div> </div>
</div> </div>
</div> </div>

7
server/router/router.go
View file

@ -11,8 +11,6 @@ func New() *web.Mux {
mux := web.New() mux := web.New()
mux.Get("/api/logins", handler.GetLoginList) mux.Get("/api/logins", handler.GetLoginList)
mux.Get("/api/stream/stdout/:id", handler.WsConsole)
mux.Get("/api/stream/user", handler.WsUser)
mux.Get("/api/auth/:host", handler.GetLogin) mux.Get("/api/auth/:host", handler.GetLogin)
mux.Post("/api/auth/:host", handler.GetLogin) mux.Post("/api/auth/:host", handler.GetLogin)
mux.Get("/api/badge/:host/:owner/:name/status.svg", handler.GetBadge) mux.Get("/api/badge/:host/:owner/:name/status.svg", handler.GetBadge)
@ -21,6 +19,11 @@ func New() *web.Mux {
mux.Put("/api/hook/:host", handler.PostHook) mux.Put("/api/hook/:host", handler.PostHook)
mux.Post("/api/hook/:host", handler.PostHook) mux.Post("/api/hook/:host", handler.PostHook)
streams := web.New()
streams.Get("/api/stream/stdout/:id", handler.WsConsole)
streams.Get("/api/stream/user", handler.WsUser)
mux.Handle("/api/stream/*", streams)
repos := web.New() repos := web.New()
repos.Use(middleware.SetRepo) repos.Use(middleware.SetRepo)
repos.Use(middleware.RequireRepoRead) repos.Use(middleware.RequireRepoRead)