From 7ca94fb84f967fcfc741b7aa3662356e4fc0241f Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 22 Feb 2016 00:49:16 +0000 Subject: First stab at threepenny gui --- default.nix | 3 ++ shell.nix | 2 +- webgui/LICENSE | 27 ++++++++++++++ webgui/Setup.hs | 2 ++ webgui/shell.nix | 1 + webgui/src/Main.hs | 78 +++++++++++++++++++++++++++++++++++++++++ webgui/thermoprint-webgui.cabal | 30 ++++++++++++++++ webgui/thermoprint-webgui.nix | 17 +++++++++ 8 files changed, 159 insertions(+), 1 deletion(-) create mode 100644 webgui/LICENSE create mode 100644 webgui/Setup.hs create mode 120000 webgui/shell.nix create mode 100644 webgui/src/Main.hs create mode 100644 webgui/thermoprint-webgui.cabal create mode 100644 webgui/thermoprint-webgui.nix diff --git a/default.nix b/default.nix index 1dc1708..9800293 100644 --- a/default.nix +++ b/default.nix @@ -17,5 +17,8 @@ rec { inherit thermoprint-spec thermoprint-client; }; }; + thermoprint-webgui = haskellPackages.callPackage ./webgui/thermoprint-webgui.nix { + inherit thermoprint-bbcode thermoprint-client; + }; bbcode = haskellPackages.callPackage ./bbcode/bbcode.nix {}; } diff --git a/shell.nix b/shell.nix index f0a69b4..638a9df 100644 --- a/shell.nix +++ b/shell.nix @@ -6,7 +6,7 @@ let thermoprintPackages = builtins.attrValues (import ./default.nix {}); ghc = haskellPackages.ghcWithPackages (ps: thermoprintPackages ++ utilities ps ++ testDeps ps); - utilities = (ps: with ps; [ hlint cabal2nix ]); + utilities = (ps: with ps; [ hlint cabal2nix cabal-install ]); testDeps = (ps: with ps; [ temporary hspec ]); in pkgs.stdenv.mkDerivation rec { diff --git a/webgui/LICENSE b/webgui/LICENSE new file mode 100644 index 0000000..4ad71e2 --- /dev/null +++ b/webgui/LICENSE @@ -0,0 +1,27 @@ +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer exclusive Copyright and Related Rights (defined below) upon the creator and subsequent owner(s) (each and all, an "owner") of an original work of authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for the purpose of contributing to a commons of creative, cultural and scientific works ("Commons") that the public can reliably and without fear of later claims of infringement build upon, modify, incorporate in other works, reuse and redistribute as freely as possible in any form whatsoever and for any purposes, including without limitation commercial purposes. These owners may contribute to the Commons to promote the ideal of a free culture and the further production of creative, cultural and scientific works, or to gain reputation or greater distribution for their Work in part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any expectation of additional consideration or compensation, the person associating CC0 with a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright and Related Rights in the Work, voluntarily elects to apply CC0 to the Work and publicly distribute the Work under its terms, with knowledge of his or her Copyright and Related Rights in the Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be protected by copyright and related or neighboring rights ("Copyright and Related Rights"). Copyright and Related Rights include, but are not limited to, the following: + +the right to reproduce, adapt, distribute, perform, display, communicate, and translate a Work; +moral rights retained by the original author(s) and/or performer(s); +publicity and privacy rights pertaining to a person's image or likeness depicted in a Work; +rights protecting against unfair competition in regards to a Work, subject to the limitations in paragraph 4(a), below; +rights protecting the extraction, dissemination, use and reuse of data in a Work; +database rights (such as those arising under Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, and under any national implementation thereof, including any amended or successor version of such directive); and +other similar, equivalent or corresponding rights throughout the world based on applicable law or treaty, and any national implementations thereof. +2. Waiver. To the greatest extent permitted by, but not in contravention of, applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and unconditionally waives, abandons, and surrenders all of Affirmer's Copyright and Related Rights and associated claims and causes of action, whether now known or unknown (including existing as well as future claims and causes of action), in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each member of the public at large and to the detriment of Affirmer's heirs and successors, fully intending that such Waiver shall not be subject to revocation, rescission, cancellation, termination, or any other legal or equitable action to disrupt the quiet enjoyment of the Work by the public as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason be judged legally invalid or ineffective under applicable law, then the Waiver shall be preserved to the maximum extent permitted taking into account Affirmer's express Statement of Purpose. In addition, to the extent the Waiver is so judged Affirmer hereby grants to each affected person a royalty-free, non transferable, non sublicensable, non exclusive, irrevocable and unconditional license to exercise Affirmer's Copyright and Related Rights in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "License"). The License shall be deemed effective as of the date CC0 was applied by Affirmer to the Work. Should any part of the License for any reason be judged legally invalid or ineffective under applicable law, such partial invalidity or ineffectiveness shall not invalidate the remainder of the License, and in such case Affirmer hereby affirms that he or she will not (i) exercise any of his or her remaining Copyright and Related Rights in the Work or (ii) assert any associated claims and causes of action with respect to the Work, in either case contrary to Affirmer's express Statement of Purpose. + +4. Limitations and Disclaimers. + +No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, licensed or otherwise affected by this document. +Affirmer offers the Work as-is and makes no representations or warranties of any kind concerning the Work, express, implied, statutory or otherwise, including without limitation warranties of title, merchantability, fitness for a particular purpose, non infringement, or the absence of latent or other defects, accuracy, or the present or absence of errors, whether or not discoverable, all to the greatest extent permissible under applicable law. +Affirmer disclaims responsibility for clearing rights of other persons that may apply to the Work or any use thereof, including without limitation any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims responsibility for obtaining any necessary consents, permissions or other rights required for any use of the Work. +Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to this CC0 or use of the Work. \ No newline at end of file diff --git a/webgui/Setup.hs b/webgui/Setup.hs new file mode 100644 index 0000000..9a994af --- /dev/null +++ b/webgui/Setup.hs @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain diff --git a/webgui/shell.nix b/webgui/shell.nix new file mode 120000 index 0000000..314b0bf --- /dev/null +++ b/webgui/shell.nix @@ -0,0 +1 @@ +../shell.nix \ No newline at end of file diff --git a/webgui/src/Main.hs b/webgui/src/Main.hs new file mode 100644 index 0000000..d96083e --- /dev/null +++ b/webgui/src/Main.hs @@ -0,0 +1,78 @@ +module Main (main) where + +import qualified Graphics.UI.Threepenny as UI +import Graphics.UI.Threepenny.Core + +import Thermoprint.Client + +import qualified Options.Applicative as Opt +import System.Environment + +import Data.ByteString (ByteString) +import qualified Data.ByteString as BS +import qualified Data.ByteString.Char8 as CBS + +import Control.Applicative +import Control.Monad +import Data.Maybe +import Data.Monoid +import Text.Read + +main :: IO () +main = config >>= Opt.execParser . opts >>= flip startGUI setup + where + opts config = Opt.info (Opt.helper <*> config) + ( Opt.fullDesc + <> Opt.progDesc "Run a webgui to Thermoprint.Client" + ) + +config :: IO (Opt.Parser Config) +config = do + p <- fromMaybe 8023 . (readMaybe =<<) <$> lookupEnv portEnv + a <- fromMaybe "localhost" <$> lookupEnv hostEnv + return $ (\port addr -> defaultConfig { jsPort = port, jsAddr = addr }) + <$> optional (Opt.option Opt.auto $ port p) + <*> optional (fmap CBS.pack $ Opt.strOption $ addr a) + where + port def = Opt.long "port" + <> Opt.short 'p' + <> Opt.metavar "PORT" + <> Opt.help ("Port to bind to; default read from $" <> portEnv) + <> Opt.value def + <> Opt.showDefault + addr def = Opt.long "addr" + <> Opt.short 'a' + <> Opt.metavar "HOST" + <> Opt.help ("Host to listen on; default read from $" <> hostEnv) + <> Opt.value def + <> Opt.showDefault + hostEnv = "ADDR" + portEnv = "PORT" + +setup :: Window -> UI () +setup window = void $ do + return window # set UI.title "Thermoprint" + + title <- UI.input + # set UI.id_ "title" + content <- UI.textarea + # set UI.id_ "content" + draftTable <- UI.table + + saveBtn <- UI.button #+ [string "Save"] + discBtn <- UI.button #+ [string "Discard"] + prntBtn <- UI.button #+ [string "Print"] + + getBody window #+ [ row [ column [ UI.h1 #+ [string "Current draft"] + , row [UI.label # set text "Title" # set UI.for "title", element title] + , element content + , row [ element saveBtn + , element prntBtn + , element discBtn + ] + ] + , column [ UI.h1 #+ [string "Saved drafts"] + , element draftTable + ] + ] + ] diff --git a/webgui/thermoprint-webgui.cabal b/webgui/thermoprint-webgui.cabal new file mode 100644 index 0000000..51a302a --- /dev/null +++ b/webgui/thermoprint-webgui.cabal @@ -0,0 +1,30 @@ +-- Initial thermoprint-webgui.cabal generated by cabal init. For further +-- documentation, see http://haskell.org/cabal/users-guide/ + +name: thermoprint-webgui +version: 0.0.0 +synopsis: Threepenny interface for thermoprint-spec compliant servers +-- description: +homepage: http://dirty-haskell.org/tags/thermoprint.html +license: PublicDomain +license-file: LICENSE +author: Gregor Kleen +maintainer: aethoago@141.li +-- copyright: +category: Web +build-type: Simple +-- extra-source-files: +cabal-version: >=1.10 + +executable thermoprint-webgui + main-is: Main.hs + -- other-modules: + -- other-extensions: + build-depends: base >=4.8 && <4.9 + , thermoprint-bbcode >=1.0.0 && <2 + , thermoprint-client ==0.0.* + , threepenny-gui >=0.6.0 && <1 + , optparse-applicative >=0.12.1 && <1 + , bytestring >=0.10.6 && <1 + hs-source-dirs: src + default-language: Haskell2010 \ No newline at end of file diff --git a/webgui/thermoprint-webgui.nix b/webgui/thermoprint-webgui.nix new file mode 100644 index 0000000..0450eae --- /dev/null +++ b/webgui/thermoprint-webgui.nix @@ -0,0 +1,17 @@ +{ mkDerivation, base, bytestring, optparse-applicative, stdenv +, thermoprint-bbcode, thermoprint-client, threepenny-gui +}: +mkDerivation { + pname = "thermoprint-webgui"; + version = "0.0.0"; + src = ./.; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring optparse-applicative thermoprint-bbcode + thermoprint-client threepenny-gui + ]; + homepage = "http://dirty-haskell.org/tags/thermoprint.html"; + description = "Threepenny interface for thermoprint-spec compliant servers"; + license = stdenv.lib.licenses.publicDomain; +} -- cgit v1.2.3