summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew <saintruler@gmail.com>2020-11-27 17:50:54 +0400
committerAndrew <saintruler@gmail.com>2020-11-27 17:50:54 +0400
commit1cc6cfef971ccb3c1d70f2a5570e445556e4f6fb (patch)
tree4773f8178225068e19bd7418622f8dd9084543ac
parentfb7e450d917ec87202f9de019238b78c1b645328 (diff)
Changed directory structure
-rw-r--r--Main.hs12
-rw-r--r--Web/Http.hs (renamed from Http.hs)2
-rw-r--r--Web/Request.hs (renamed from Request.hs)4
-rw-r--r--Web/Response.hs (renamed from Response.hs)2
-rw-r--r--Web/Router.hs (renamed from Router.hs)8
-rw-r--r--Web/Utils.hs (renamed from Utils.hs)4
-rw-r--r--Web/Views.hs (renamed from Views.hs)6
-rw-r--r--haskell-web.cabal2
8 files changed, 20 insertions, 20 deletions
diff --git a/Main.hs b/Main.hs
index ced8f22..86bc37e 100644
--- a/Main.hs
+++ b/Main.hs
@@ -1,11 +1,11 @@
module Main where
-import Response
-import Request
-import Router
-import Views
-import Utils
-import Http
+import Web.Response
+import Web.Request
+import Web.Router
+import Web.Views
+import Web.Utils
+import Web.Http
table = [ Route indexGet "/" GET
, Route helloGet "/hello" GET ]
diff --git a/Http.hs b/Web/Http.hs
index f8da91f..92cb043 100644
--- a/Http.hs
+++ b/Web/Http.hs
@@ -1,4 +1,4 @@
-module Http where
+module Web.Http where
import Data.Text (Text)
diff --git a/Request.hs b/Web/Request.hs
index ad63909..38f91b5 100644
--- a/Request.hs
+++ b/Web/Request.hs
@@ -1,6 +1,6 @@
-module Request where
+module Web.Request where
-import Http
+import Web.Http
-- Request query url method
data Request = Request [QueryPair] String Method
diff --git a/Response.hs b/Web/Response.hs
index be347c1..b08efb9 100644
--- a/Response.hs
+++ b/Web/Response.hs
@@ -1,4 +1,4 @@
-module Response where
+module Web.Response where
data Response
= HtmlResponse Int String -- Код возврата, содержимое HTML
diff --git a/Router.hs b/Web/Router.hs
index 17ee11c..af5bd96 100644
--- a/Router.hs
+++ b/Web/Router.hs
@@ -1,8 +1,8 @@
-module Router where
+module Web.Router where
-import Response
-import Request
-import Http
+import Web.Response
+import Web.Request
+import Web.Http
-- Route callback url method
data Route = Route (Request -> IO Response) String Method
diff --git a/Utils.hs b/Web/Utils.hs
index ba6fbac..3449f21 100644
--- a/Utils.hs
+++ b/Web/Utils.hs
@@ -1,4 +1,4 @@
-module Utils (parseQs, parseHttp) where
+module Web.Utils (parseQs, parseHttp) where
import Network.HTTP.Types.URI as URI
import qualified Data.ByteString as S
@@ -8,7 +8,7 @@ import qualified Data.Text as T
import Data.Text.Encoding (encodeUtf8, decodeUtf8)
import Data.Text (Text)
-import Http
+import Web.Http
-- Query string parser
diff --git a/Views.hs b/Web/Views.hs
index 9d2594e..b6ae013 100644
--- a/Views.hs
+++ b/Web/Views.hs
@@ -1,9 +1,9 @@
-module Views where
+module Web.Views where
import System.IO
-import Request
-import Response
+import Web.Request
+import Web.Response
indexGet (Request query url method) =
return $ HtmlResponse 200 "<strong>index</strong>"
diff --git a/haskell-web.cabal b/haskell-web.cabal
index a1a49db..e37184c 100644
--- a/haskell-web.cabal
+++ b/haskell-web.cabal
@@ -12,7 +12,7 @@ build-type: Simple
executable haskell-web
main-is: Main.hs
other-modules:
- Http, Request, Response, Router, Utils, Views
+ Web.Http, Web.Request, Web.Response, Web.Router, Web.Utils, Web.Views
-- other-extensions:
build-depends:
base >=4.14 && <4.15, text, http-types, bytestring