From 9f4edfaf0267b8613d81997e64eaf885ea7d6d38 Mon Sep 17 00:00:00 2001 From: Lucy Cifferello <12953208+elvece@users.noreply.github.com> Date: Fri, 16 Jun 2023 12:49:00 -0600 Subject: [PATCH] fix compilation error --- config/routes | 18 +++++++++--------- src/Application.hs | 2 +- src/Foundation.hs | 2 -- src/Handler/Root.hs | 7 ++++--- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/config/routes b/config/routes index 85c7873..a1ade99 100644 --- a/config/routes +++ b/config/routes @@ -1,8 +1,8 @@ -/ RootR GET +/ RootR GET -- EOS API V0 -/eos/v0/latest EosVersionR GET -- get eos information -/eos/v0/eos.img EosR GET -- get eos.img +/eos/v0/latest EosVersionR GET -- get eos information +/eos/v0/eos.img EosR GET -- get eos.img -- PACKAGE API V0 /package/#ApiVersion/info InfoR GET -- get all marketplace categories @@ -17,9 +17,9 @@ /package/#ApiVersion/version/#PkgId PkgVersionR GET -- get most recent appId version -- ADMIN API V0 -/admin/v0/upload PkgUploadR POST !admin -/admin/v0/eos-upload EosUploadR POST !admin -/admin/v0/index PkgIndexR POST !admin -/admin/v0/deindex PkgDeindexR GET POST !admin -/admin/v0/category/#Text CategoryR POST DELETE !admin -/admin/v0/categorize/#Text/#PkgId PkgCategorizeR POST DELETE !admin \ No newline at end of file +/admin/v0/upload PkgUploadR POST !admin +/admin/v0/eos-upload EosUploadR POST !admin +/admin/v0/index PkgIndexR POST !admin +/admin/v0/deindex PkgDeindexR GET POST !admin +/admin/v0/category/#Text CategoryR POST DELETE !admin +/admin/v0/categorize/#Text/#PkgId PkgCategorizeR POST DELETE !admin \ No newline at end of file diff --git a/src/Application.hs b/src/Application.hs index 0e4c0a2..d1a90ed 100644 --- a/src/Application.hs +++ b/src/Application.hs @@ -186,8 +186,8 @@ import Handler.Admin ( postPkgUploadR, ) import Handler.Eos (getEosR, getEosVersionR) +import Handler.Root(getRootR) import Handler.Package -import Handler.Root import Lib.Ssl ( doesSslNeedRenew, renewSslCerts, diff --git a/src/Foundation.hs b/src/Foundation.hs index f458522..39c1c2b 100644 --- a/src/Foundation.hs +++ b/src/Foundation.hs @@ -153,8 +153,6 @@ import Yesod.Persist.Core ( import Database.Persist ((==.)) import Database.Persist (selectFirst) import Database.Persist (entityVal) -import Handler.Root - -- | The foundation datatype for your application. This can be a good place to -- keep settings and values requiring initialization before your application diff --git a/src/Handler/Root.hs b/src/Handler/Root.hs index 1b21c53..949f85e 100644 --- a/src/Handler/Root.hs +++ b/src/Handler/Root.hs @@ -1,6 +1,7 @@ module Handler.Root where import Startlude +import Yesod +import Foundation - -getRootR :: Handler () -getRootR = notImplemented +getRootR :: HandlerFor RegistryCtx () +getRootR = notImplemented \ No newline at end of file