Skip to content

Commit

Permalink
Use latest Giraffe alpha and Giraffe.ViewEngine
Browse files Browse the repository at this point in the history
  • Loading branch information
@Krzysztof-Cieslak
Krzysztof-Cieslak committed Jun 23, 2020
1 parent 01cafc9 commit d1484a8
Show file tree
Hide file tree
Showing 14 changed files with 383 additions and 388 deletions.
2 changes: 2 additions & 0 deletions paket.dependencies
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ nuget System.Threading.Tasks.Dataflow >= 4.9
nuget BenchmarkDotNet

nuget Giraffe prerelease
nuget Giraffe.ViewEngine

nuget Microsoft.AspNetCore.Authentication.JwtBearer < 3.1
nuget Microsoft.AspNetCore.Authentication.Google < 3.1
nuget Microsoft.AspNetCore.Authentication.OpenIdConnect < 3.1
Expand Down
181 changes: 92 additions & 89 deletions paket.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,25 +38,27 @@ NUGET
FSharp.Core (>= 4.3.4)
Microsoft.IO.RecyclableMemoryStream (>= 1.2.2)
FSharp.Core (4.7.2)
Giraffe (5.0.0-alpha-001)
Giraffe (5.0.0-alpha-002)
FSharp.Core (>= 4.7.1)
Giraffe.ViewEngine (>= 1.0)
Microsoft.IO.RecyclableMemoryStream (>= 1.3.4)
Newtonsoft.Json (>= 12.0.3)
System.Text.Json (>= 4.7.2)
TaskBuilder.fs (>= 2.1)
Utf8Json (>= 1.3.7)
Giraffe.ViewEngine (1.0)
FSharp.Core (>= 4.7.1)
Grpc.AspNetCore.Server (2.29)
Grpc.Core.Api (>= 2.29)
Grpc.Net.Common (>= 2.29)
Grpc.Core.Api (2.29)
Grpc.Core.Api (2.30.0-pre1)
System.Memory (>= 4.5.3)
Grpc.Net.Client (2.29)
Grpc.Core.Api (>= 2.29)
Grpc.Net.Common (>= 2.29)
Grpc.Net.Client (2.30.0-pre1)
Grpc.Net.Common (>= 2.30.0-pre1)
Microsoft.Extensions.Logging.Abstractions (>= 2.1.1)
System.Diagnostics.DiagnosticSource (>= 4.5.1)
Grpc.Net.Common (2.29)
Grpc.Core.Api (>= 2.29)
Grpc.Net.Common (2.30.0-pre1)
Grpc.Core.Api (>= 2.30.0-pre1)
Iced (1.7)
Microsoft.AspNet.WebApi.Client (5.2.7)
Newtonsoft.Json (>= 10.0.1)
Expand Down Expand Up @@ -317,7 +319,7 @@ NUGET
Newtonsoft.Json (12.0.3)
Newtonsoft.Json.Bson (1.0.2)
Newtonsoft.Json (>= 12.0.1)
NSubstitute (4.2.1)
NSubstitute (4.2.2)
Castle.Core (>= 4.4)
System.Threading.Tasks.Extensions (>= 4.3)
Perfolizer (0.2.1)
Expand Down Expand Up @@ -628,118 +630,119 @@ STORAGE: NONE
RESTRICTION: == netstandard2.0
NUGET
remote: https://api.nuget.org/v3/index.json
BlackFox.VsWhere (1.0)
BlackFox.VsWhere (1.1)
FSharp.Core (>= 4.2.3)
Fake.Api.GitHub (5.20)
Microsoft.Win32.Registry (>= 4.7)
Fake.Api.GitHub (5.20.1)
FSharp.Core (>= 4.7.1)
Octokit (>= 0.47)
Fake.Core.CommandLineParsing (5.20)
Fake.Core.CommandLineParsing (5.20.1)
FParsec (>= 1.1.1)
FSharp.Core (>= 4.7.1)
Fake.Core.Context (5.20)
Fake.Core.Context (5.20.1)
FSharp.Core (>= 4.7.1)
Fake.Core.Environment (5.20)
Fake.Core.Environment (5.20.1)
FSharp.Core (>= 4.7.1)
Fake.Core.FakeVar (5.20)
Fake.Core.Context (>= 5.20)
Fake.Core.FakeVar (5.20.1)
Fake.Core.Context (>= 5.20.1)
FSharp.Core (>= 4.7.1)
Fake.Core.Process (5.20)
Fake.Core.Environment (>= 5.20)
Fake.Core.FakeVar (>= 5.20)
Fake.Core.String (>= 5.20)
Fake.Core.Trace (>= 5.20)
Fake.IO.FileSystem (>= 5.20)
Fake.Core.Process (5.20.1)
Fake.Core.Environment (>= 5.20.1)
Fake.Core.FakeVar (>= 5.20.1)
Fake.Core.String (>= 5.20.1)
Fake.Core.Trace (>= 5.20.1)
Fake.IO.FileSystem (>= 5.20.1)
FSharp.Core (>= 4.7.1)
System.Collections.Immutable (>= 1.7)
Fake.Core.ReleaseNotes (5.20)
Fake.Core.SemVer (>= 5.20)
Fake.Core.String (>= 5.20)
Fake.Core.ReleaseNotes (5.20.1)
Fake.Core.SemVer (>= 5.20.1)
Fake.Core.String (>= 5.20.1)
FSharp.Core (>= 4.7.1)
Fake.Core.SemVer (5.20)
Fake.Core.SemVer (5.20.1)
FSharp.Core (>= 4.7.1)
Fake.Core.String (5.20)
Fake.Core.String (5.20.1)
FSharp.Core (>= 4.7.1)
Fake.Core.Target (5.20)
Fake.Core.CommandLineParsing (>= 5.20)
Fake.Core.Context (>= 5.20)
Fake.Core.Environment (>= 5.20)
Fake.Core.FakeVar (>= 5.20)
Fake.Core.Process (>= 5.20)
Fake.Core.String (>= 5.20)
Fake.Core.Trace (>= 5.20)
Fake.Core.Target (5.20.1)
Fake.Core.CommandLineParsing (>= 5.20.1)
Fake.Core.Context (>= 5.20.1)
Fake.Core.Environment (>= 5.20.1)
Fake.Core.FakeVar (>= 5.20.1)
Fake.Core.Process (>= 5.20.1)
Fake.Core.String (>= 5.20.1)
Fake.Core.Trace (>= 5.20.1)
FSharp.Control.Reactive (>= 4.2)
FSharp.Core (>= 4.7.1)
Fake.Core.Tasks (5.20)
Fake.Core.Trace (>= 5.20)
Fake.Core.Tasks (5.20.1)
Fake.Core.Trace (>= 5.20.1)
FSharp.Core (>= 4.7.1)
Fake.Core.Trace (5.20)
Fake.Core.Environment (>= 5.20)
Fake.Core.FakeVar (>= 5.20)
Fake.Core.Trace (5.20.1)
Fake.Core.Environment (>= 5.20.1)
Fake.Core.FakeVar (>= 5.20.1)
FSharp.Core (>= 4.7.1)
Fake.Core.UserInput (5.20)
Fake.Core.UserInput (5.20.1)
FSharp.Core (>= 4.7.1)
Fake.Core.Xml (5.20)
Fake.Core.String (>= 5.20)
Fake.Core.Xml (5.20.1)
Fake.Core.String (>= 5.20.1)
FSharp.Core (>= 4.7.1)
Fake.DotNet.AssemblyInfoFile (5.20)
Fake.Core.Environment (>= 5.20)
Fake.Core.String (>= 5.20)
Fake.Core.Trace (>= 5.20)
Fake.IO.FileSystem (>= 5.20)
Fake.DotNet.AssemblyInfoFile (5.20.1)
Fake.Core.Environment (>= 5.20.1)
Fake.Core.String (>= 5.20.1)
Fake.Core.Trace (>= 5.20.1)
Fake.IO.FileSystem (>= 5.20.1)
FSharp.Core (>= 4.7.1)
Fake.DotNet.Cli (5.20)
Fake.Core.Environment (>= 5.20)
Fake.Core.Process (>= 5.20)
Fake.Core.String (>= 5.20)
Fake.Core.Trace (>= 5.20)
Fake.DotNet.MSBuild (>= 5.20)
Fake.DotNet.NuGet (>= 5.20)
Fake.IO.FileSystem (>= 5.20)
Fake.DotNet.Cli (5.20.1)
Fake.Core.Environment (>= 5.20.1)
Fake.Core.Process (>= 5.20.1)
Fake.Core.String (>= 5.20.1)
Fake.Core.Trace (>= 5.20.1)
Fake.DotNet.MSBuild (>= 5.20.1)
Fake.DotNet.NuGet (>= 5.20.1)
Fake.IO.FileSystem (>= 5.20.1)
FSharp.Core (>= 4.7.1)
Mono.Posix.NETStandard (>= 1.0)
Newtonsoft.Json (>= 12.0.3)
Fake.DotNet.MSBuild (5.20)
Fake.DotNet.MSBuild (5.20.1)
BlackFox.VsWhere (>= 1.0)
Fake.Core.Environment (>= 5.20)
Fake.Core.Process (>= 5.20)
Fake.Core.String (>= 5.20)
Fake.Core.Trace (>= 5.20)
Fake.IO.FileSystem (>= 5.20)
Fake.Core.Environment (>= 5.20.1)
Fake.Core.Process (>= 5.20.1)
Fake.Core.String (>= 5.20.1)
Fake.Core.Trace (>= 5.20.1)
Fake.IO.FileSystem (>= 5.20.1)
FSharp.Core (>= 4.7.1)
MSBuild.StructuredLogger (>= 2.1.117)
Fake.DotNet.NuGet (5.20)
Fake.Core.Environment (>= 5.20)
Fake.Core.Process (>= 5.20)
Fake.Core.SemVer (>= 5.20)
Fake.Core.String (>= 5.20)
Fake.Core.Tasks (>= 5.20)
Fake.Core.Trace (>= 5.20)
Fake.Core.Xml (>= 5.20)
Fake.IO.FileSystem (>= 5.20)
Fake.Net.Http (>= 5.20)
Fake.DotNet.NuGet (5.20.1)
Fake.Core.Environment (>= 5.20.1)
Fake.Core.Process (>= 5.20.1)
Fake.Core.SemVer (>= 5.20.1)
Fake.Core.String (>= 5.20.1)
Fake.Core.Tasks (>= 5.20.1)
Fake.Core.Trace (>= 5.20.1)
Fake.Core.Xml (>= 5.20.1)
Fake.IO.FileSystem (>= 5.20.1)
Fake.Net.Http (>= 5.20.1)
FSharp.Core (>= 4.7.1)
Newtonsoft.Json (>= 12.0.3)
NuGet.Protocol (>= 5.5.1)
Fake.DotNet.Paket (5.20)
Fake.Core.Process (>= 5.20)
Fake.Core.String (>= 5.20)
Fake.Core.Trace (>= 5.20)
Fake.DotNet.Cli (>= 5.20)
Fake.IO.FileSystem (>= 5.20)
Fake.DotNet.Paket (5.20.1)
Fake.Core.Process (>= 5.20.1)
Fake.Core.String (>= 5.20.1)
Fake.Core.Trace (>= 5.20.1)
Fake.DotNet.Cli (>= 5.20.1)
Fake.IO.FileSystem (>= 5.20.1)
FSharp.Core (>= 4.7.1)
Fake.IO.FileSystem (5.20)
Fake.Core.String (>= 5.20)
Fake.IO.FileSystem (5.20.1)
Fake.Core.String (>= 5.20.1)
FSharp.Core (>= 4.7.1)
Fake.Net.Http (5.20)
Fake.Core.Trace (>= 5.20)
Fake.Net.Http (5.20.1)
Fake.Core.Trace (>= 5.20.1)
FSharp.Core (>= 4.7.1)
Fake.Tools.Git (5.20)
Fake.Core.Environment (>= 5.20)
Fake.Core.Process (>= 5.20)
Fake.Core.SemVer (>= 5.20)
Fake.Core.String (>= 5.20)
Fake.Core.Trace (>= 5.20)
Fake.IO.FileSystem (>= 5.20)
Fake.Tools.Git (5.20.1)
Fake.Core.Environment (>= 5.20.1)
Fake.Core.Process (>= 5.20.1)
Fake.Core.SemVer (>= 5.20.1)
Fake.Core.String (>= 5.20.1)
Fake.Core.Trace (>= 5.20.1)
Fake.IO.FileSystem (>= 5.20.1)
FSharp.Core (>= 4.7.1)
FParsec (1.1.1)
FSharp.Core (>= 4.3.4)
Expand Down Expand Up @@ -1025,7 +1028,7 @@ STORAGE: SYMLINK
RESTRICTION: == netstandard2.0
NUGET
remote: https://api.nuget.org/v3/index.json
FSharp.Compiler.Service (36.0.1)
FSharp.Compiler.Service (36.0.3)
FSharp.Core (>= 4.6.2)
System.Buffers (>= 4.5)
System.Collections.Immutable (>= 1.5)
Expand Down
34 changes: 17 additions & 17 deletions sample/CsrfSample/CsrfSample.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,29 @@ open Saturn
open Giraffe.ResponseWriters
open Microsoft.Extensions.Logging

//TODO
// module Views =
// open Microsoft.AspNetCore.Http
// open Giraffe.GiraffeViewEngine
// open Saturn.CSRF.View.Giraffe

// let index (ctx: HttpContext) =
// body [] [
// h1 [] [
// rawText "Hello from static!"
// ]
// protectedForm ctx [ _action "/form"; _method "post" ] [
// input [_type "submit"; _value "Yay" ]
// ]
// ]

module Views =
open Microsoft.AspNetCore.Http
open Giraffe.ViewEngine
open Saturn.CSRF.View.Giraffe

let index (ctx: HttpContext) =
body [] [
h1 [] [
rawText "Hello from static!"
]
protectedForm ctx [ _action "/form"; _method "post" ] [
input [_type "submit"; _value "Yay" ]
]
]

/// There are two routes on this router: one retrieves the token(s) and tells you the form fields/request headers to send the request token on.
/// The other requires the token to be present before returning a success message to you.
let appRouter = router {
pipe_through protectFromForgery

//TODO
// get "/" (fun next ctx -> htmlView (Views.index ctx) next ctx)

get "/" (fun next ctx -> htmlView (Views.index ctx) next ctx)
get "/csrftoken" (fun next ctx -> json (CSRF.getRequestTokens ctx) next ctx)
post "/requiresToken" (text "you gave a token!")
post "/form" (fun next ctx -> json ctx.Request.Form next ctx)
Expand Down
4 changes: 2 additions & 2 deletions sample/Saturn.Sample/Saturn.Sample.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ let userController = controller {

let topRouter = router {
pipe_through headerPipe
//TODO
// not_found_handler (SiteMap.page)

not_found_handler (SiteMap.page)

get "/" helloWorld
get "/a" helloWorld2
Expand Down
6 changes: 2 additions & 4 deletions sample/TurbolinksSample/TurbolinksSample.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ let browser = pipeline {
}

let defaultView = router {
//TODO
// get "/" (htmlView Index.layout)
get "/" (htmlView Index.layout)
get "/index.html" (redirectTo false "/")
get "/default.html" (redirectTo false "/")
}
Expand All @@ -21,8 +20,7 @@ let browserRouter = router {
pipe_through browser

forward "" defaultView
//TODO
// forward "/otherView" (htmlView OtherView.layout)
forward "/otherView" (htmlView OtherView.layout)
}


Expand Down
Loading

0 comments on commit d1484a8

Please sign in to comment.