Commit 18fa0db7 authored by Przemyslaw Kaminski's avatar Przemyslaw Kaminski

[static] fix API ordering

Static (at root) has to be last so that API matches.
parent 3991d01e
...@@ -318,9 +318,8 @@ type GargPrivateAPI' = ...@@ -318,9 +318,8 @@ type GargPrivateAPI' =
--------------------------------------------------------------------- ---------------------------------------------------------------------
type API = SwaggerAPI type API = SwaggerAPI
:<|> FrontEndAPI
-- :<|> Get '[HTML] Html
:<|> GargAPI :<|> GargAPI
:<|> FrontEndAPI
-- This is the concrete monad. It needs to be used as little as possible, -- This is the concrete monad. It needs to be used as little as possible,
-- instead, prefer GargServer, GargServerT, GargServerC. -- instead, prefer GargServer, GargServerT, GargServerC.
...@@ -340,9 +339,8 @@ server :: forall env. EnvC env => env -> IO (Server API) ...@@ -340,9 +339,8 @@ server :: forall env. EnvC env => env -> IO (Server API)
server env = do server env = do
-- orchestrator <- scrapyOrchestrator env -- orchestrator <- scrapyOrchestrator env
pure $ schemaUiServer swaggerDoc pure $ schemaUiServer swaggerDoc
:<|> frontEndServer
-- :<|> serverStatic
:<|> hoistServerWithContext (Proxy :: Proxy GargAPI) (Proxy :: Proxy AuthContext) transform serverGargAPI :<|> hoistServerWithContext (Proxy :: Proxy GargAPI) (Proxy :: Proxy AuthContext) transform serverGargAPI
:<|> frontEndServer
where where
transform :: forall a. GargServerM env GargError a -> Handler a transform :: forall a. GargServerM env GargError a -> Handler a
transform = Handler . withExceptT showAsServantErr . (`runReaderT` env) transform = Handler . withExceptT showAsServantErr . (`runReaderT` env)
...@@ -416,13 +414,6 @@ addWithForm cid = ...@@ -416,13 +414,6 @@ addWithForm cid =
serveJobsAPI $ serveJobsAPI $
JobFunction (\i log -> New.addToCorpusWithForm cid i (liftIO . log)) JobFunction (\i log -> New.addToCorpusWithForm cid i (liftIO . log))
serverStatic :: Server (Get '[HTML] Html)
serverStatic = $(do
let path = "purescript-gargantext/dist/index.html"
Just s <- liftIO (fileTypeToFileTree (FileTypeFile path))
fileTreeToServer s
)
--------------------------------------------------------------------- ---------------------------------------------------------------------
--gargMock :: Server GargAPI --gargMock :: Server GargAPI
--gargMock = mock apiGarg Proxy --gargMock = mock apiGarg Proxy
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment