diff --git a/Villefort.cabal b/Villefort.cabal --- a/Villefort.cabal +++ b/Villefort.cabal @@ -1,7 +1,7 @@ name: Villefort -version: 0.1.0.4 +version: 0.1.0.5 synopsis: Villefort is a task manager and time tracker written in haskell. -description: It is based off of a sqlite database and has the ability to add new tasks +description: Villefort is powered by a sqlite homepage: https://github.com/Chrisr850/Villefort#readme license: BSD3 license-file: LICENSE @@ -13,6 +13,9 @@ extra-source-files: README.md cabal-version: >=1.10 data-files: data/todo.db + , templates/*.html + , templates/*.ts + , js.js library hs-source-dirs: src @@ -35,7 +38,8 @@ executable Villefort hs-source-dirs: app main-is: Main.hs - ghc-options: -threaded -rtsopts -with-rtsopts=-N + ghc-options: -threaded -rtsopts -with-rtsopts=-N + other-modules: Paths_Villefort build-depends: base , Villefort , scotty >= 0.11.0 && < 0.12 diff --git a/app/Main.hs b/app/Main.hs --- a/app/Main.hs +++ b/app/Main.hs @@ -13,7 +13,7 @@ import Database import Todo import Stats - +import Paths_Villefort @@ -38,8 +38,8 @@ makeNewPage = do - path <- path - rawhtml <- liftIO $ readFile (path ++ "templates/add.html") + path <- getDataFileName "templates/add.html" + rawhtml <- liftIO $ readFile path let split = splitOn "?" rawhtml subjects <- getSubjects let radiobuttons = map makeRadio subjects @@ -98,8 +98,8 @@ get "/js-chart-widgets.min.js" $ do - path <-liftIO $ path - file (path ++ "js.js") + path <- liftIO $ getDataFileName "js.js" + file path get "/stat" $ do page <- liftIO $ genStats diff --git a/js.js b/js.js new file mode 100644 --- /dev/null +++ b/js.js @@ -0,0 +1,19 @@ +(function(){var s,m,o,A,p,B,C,w,D,E,t,u,x,F,q=Array.prototype.slice,n=Object.prototype.hasOwnProperty,y=function(b,a){function c(){this.constructor=b}for(var d in a)if(n.call(a,d))b[d]=a[d];c.prototype=a.prototype;b.prototype=new c;b.__super__=a.prototype;return b};p=function(){return function(b,a){this.x=b;this.y=a}}();B=function(){function b(a,c,d,f){this.x=a;this.y=c;this.w=d;this.h=f}b.prototype.translated=function(a){return new b(this.x+a.x,this.y+a.y,this.w,this.h)};b.prototype.scaled=function(a){return new b(this.x, +this.y,this.w*a,this.h*a)};b.prototype.center=function(){return new p(this.x+this.w/2,this.y+this.h/2)};b.prototype.centeredAt=function(a){return new b(a.x-this.w/2,a.y-this.h/2,this.w,this.h)};b.prototype.centeredIn=function(a){return this.centeredAt(a.center())};return b}();E=function(b,a,c){return new B(b.x+(a.x-b.x)*c,b.y+(a.y-b.y)*c,b.w+(a.w-b.w)*c,b.h+(a.h-b.h)*c)};D=function(b,a,c){return new p(b.x+(a.x-b.x)*c,b.y+(a.y-b.y)*c)};A=function(){function b(a){this.e=a}b.prototype.getKeycode=function(){return this.e.charCode|| +this.e.keyCode};b.prototype.isRightButton=function(){if(this.e.which)return this.e.which===3;else if(e.button)return this.e.button===2};b.prototype.getPos=function(){if(this.e.pageX||this.e.pageY)return new p(this.e.pageX,this.e.pageY);else if(this.e.clientX||this.e.clientY)return new p(this.e.clientX+document.body.scrollLeft+document.documentElement.scrollLeft,this.e.clientY+document.body.scrollTop+document.documentElement.scrollTop)};b.prototype.controlDown=function(){return this.e.ctrlKey};b.prototype.altDown= +function(){return this.e.altKey};b.prototype.shiftDown=function(){return this.e.shiftKey};b.prototype.metaDown=function(){return this.e.metaKey};b.prototype.stop=function(){if(this.e.stopPropagation)this.e.stopPropagation();else this.e.cancelBubble=true;return this.e.preventDefault?this.e.preventDefault():(this.e.returnValue=false)};return b}();o=function(){function b(){var a,c,d,f,g,h,j,i,k;a=arguments[0];c=2<=arguments.length?q.call(arguments,1):[];this._=g=document.createElement(a);h=0;for(i=c.length;h< +i;h++){a=c[h];if(typeof a==="string")g.className=a;else if(a instanceof Array){j=0;for(k=a.length;j1)a=1;this.f(this.transition(a));if(a<1)return setTimeout(function(){return c.step()},0)};return b}();(function(){return function(b,a){var c,d,f,g,h,j,i,k;d=a.duration;k=a.transition;g=a.oncomplete;h=a.opacity;i=a.rect;j=a.pos;c=a.background;b instanceof Array||(b=[b]);f=0;new C(d,k,function(l){var r,v,G;f++;v=0;for(G= +b.length;va)a=h}c=I("#FFFFFF",c,0,a);i=j*k+1*(k+1);a=j*7+8;h=s();h.setStyles({width:i+"px",height:a+"px",position:"relative",background:"#999999"});this.appendChild(h);a={};i=new Date; +g=i.getDay();d=6-(7+g-1)%7;i=new Date(i.getTime()+864E5*d);for(d=g=k-1;g<=0?d<=0:d>=0;g<=0?d++:d--)for(l=6;l>=0;l--){a[J(i)]=""+d+":"+l;i=new Date(i.getTime()-864E5)}i={};for(d=0;0<=k?dk;0<=k?d++:d--)for(l=0;l<7;l++){g=s();g.setStyles({width:j+"px",height:j+"px",background:"#FFFFFF",position:"absolute",left:1+(j+1)*d+"px",top:1+(j+1)*l+"px",zIndex:2});i[""+d+":"+l]=g;h.appendChild(g)}j=0;for(k=f.length;j>= \path -> readFile (path ++ "templates/modal.ts") >>= \rawModal -> return (Data.List.Split.splitOn "}" rawModal) +--getModal = path >>= \path -> readFile (path ++ "templates/modal.ts") >>= \rawModal -> return (Data.List.Split.splitOn "}" rawModal) +getModal = getDataFileName "templates/modal.ts" >>= \path -> readFile path>>= \rawModal -> return (Data.List.Split.splitOn "}" rawModal) daysTilDue date = do c <- getCurrentTime @@ -88,7 +91,8 @@ tasks <- qetTasks' path <- path modals <- sequence $ Prelude.map genModal' tasks - header <- readFile (path ++ "templates/index.html") + path <- getDataFileName "templates/index.html" + header <- readFile path let body = Prelude.concat modals return (header ++ body) diff --git a/templates/add.html b/templates/add.html new file mode 100644 --- /dev/null +++ b/templates/add.html @@ -0,0 +1,73 @@ + +Villefort + + + + + + + + + + + +
+

Villefort

+ + +
+
+
+ + +
+
+
+ + + + + +

New TODO

+
+
+
Title: +
+
Description: +
+
Subjects:
+
New Subject
+ + + ? +
Date: +
+
+
+
+ diff --git a/templates/index.html b/templates/index.html new file mode 100644 --- /dev/null +++ b/templates/index.html @@ -0,0 +1,109 @@ + +Villefort + + + + + + + + + +
+

Villefort

+ + +
+
+
+
+ + +
+ +
+
+ +
+ diff --git a/templates/modal.ts b/templates/modal.ts new file mode 100644 --- /dev/null +++ b/templates/modal.ts @@ -0,0 +1,36 @@ +
+ +
+ + + + + diff --git a/templates/test.html b/templates/test.html new file mode 100644 --- /dev/null +++ b/templates/test.html @@ -0,0 +1,21 @@ + + + + + New Subject
+ + + +