Merge branch 'master' of https://github.com/beingfranklin/GB-Holidays

beingfranklin · Dec 3, 2020 · 8b321c2 · 8b321c2
2 parents 9b48633 + 5f1ef25
commit 8b321c2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/app/Main.hs b/app/Main.hs
@@ -20,9 +20,10 @@ main = do
                     print "Saving on DB"
                     conn <- initialiseDB
                     insertDB conn recs 
-                    insertLB conn recs 
-                    insertSB conn recs 
+                    insertSB conn recs
+                    insertLB conn recs  
                     print "Done!"
+
 
         -- P.S It Outputs the haskell datatype we specified
 
diff --git a/dist-newstyle/cache/config b/dist-newstyle/cache/config
diff --git a/src/Parse.hs b/src/Parse.hs
@@ -28,8 +28,13 @@ data HolidayRecord = HolidayRecord {
     global::Bool
 } deriving (Show, Generic)
 
+
 -- data CountryRecord = CountryRecord {
 --     countryCode' :: String
+
+-- data CountriesRecord = CountriesRecord {
+--     countryCode' :: String,
+--      global::Bool
 -- } deriving (Show, Generic)
 
 -- data Country_holidaysRecord = Country_holidaysRecord {
@@ -40,12 +45,5 @@ data HolidayRecord = HolidayRecord {
 instance FromJSON HolidayRecord
 instance ToJSON HolidayRecord
 
--- data OuterRecords = OuterRecords{
---     records :: [InnerRecord]
--- }deriving (Show, Generic)
-
--- instance FromJSON OuterRecords
--- instance ToJSON OuterRecords
-
 parse :: L8.ByteString -> Either String [HolidayRecord]
-parse json = eitherDecode json :: Either String [HolidayRecord]
+parse json = eitherDecode json :: Either String [HolidayRecord]