Villefort 0.1.1.6 → 0.1.1.7

raw patch · 5 files changed

+14/−47 lines, 5 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

Files

• Villefort.cabal +1/−1
• src/Villefort/Database.hs +9/−5
• src/Villefort/Definitions.hs +2/−1
• templates/header +1/−39
• templates/modal.ts +1/−1

@@ -1,5 +1,5 @@ name:                Villefort-version:             0.1.1.6+version:             0.1.1.7 synopsis: Villefort is a task manager and time tracker written in haskell. description: Villefort is a browser based time tracker. homepage:            https://github.com/Chrisr850/Villefort#readme

@@ -22,12 +22,16 @@  path' ::  (MonadReader VConfig m, MonadIO m) => m FilePath path' = do+  env <- ask+  let s = showDatabase env   args <- liftIO $ getArgs-  if length args > 1 then-    if args !! 0 == "--custom"-    then return $ args !! 1-    else liftIO $ getDataDir-    else liftIO $ getDataDir+  let cont = do+        if length args > 1 then+         if args !! 0 == "--custom" then+           return $ args !! 1+         else liftIO $ getDataDir+         else liftIO $ getDataDir+  if s then (liftIO $ putStrLn =<< getDataDir) >> cont else cont      getDb :: (MonadReader VConfig m, MonadIO m) => m Connection   --getDb =  (++ "/data/todo.db") <$> liftIO path' >>= \path -> liftIO $   connectSqlite3 path

@@ -7,7 +7,8 @@   weekly :: Weekly,   port :: Int,   noCustom :: Bool,-  dataBasePath :: Maybe String+  dataBasePath :: Maybe String,+  showDatabase :: Bool   }  data Weekly = Weekly {

@@ -8,9 +8,6 @@   <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>   <script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>   <style>-   -   -    /*     .btn-due7{     background: #750787;     color: #ffffff;@@ -43,42 +40,7 @@     background: #E40303;     color: #ffffff;     }-    */-  .btn-due11{ background: #3F51B5; color: #ffffff;}.btn-due10{ background: #E8EAF6; color: #ffffff;}.btn-due9{ background: #C5CAE9; color: #ffffff;}.btn-due8{ background: #9FA8DA; color: #ffffff;}.btn-due7{ background: #7986CB; color: #ffffff;}.btn-due6{ background: #5C6BC0; color: #ffffff;}.btn-due5{ background: #3F51B5; color: #ffffff;}.btn-due4{ background: #3949AB; color: #ffffff;}.btn-due3{ background: #303F9F; color: #ffffff;}.btn-due2{ background: #283593; color: #ffffff;}.btn-due1{ background: #1A237E; color: #ffffff;}-    /*-    .btn-due7{-    background: #311B92;-    color: #ffffff;-    }-    .btn-due6{-    background: #750787;-    color: #ffffff;-    }-    .btn-due5{-background: #008026;-    color: #ffffff;-    }-    .btn-due4{-background: #004DFF;-    color: #ffffff;-    }-    .btn-due3{ -background: #008026;-    color: #ffffff;-    }-    .btn-due2{-background: #FFED00;-    color: #ffffff;-    }-    .btn-due1{-background: #FF8C00;-    color: #ffffff;-    }-    .btn-due0{-    background: #311B92;-    color: #ffffff;-    }-    */+         </style>  <div class="page">

@@ -1,4 +1,4 @@-<div class="buttonl"> + <div class="buttonl">   <button type="button" class="btn btn-info } btn-lg" data-toggle="modal" data-target="#myModal}"> } </button> </div>   <!-- Modal -->