toodles 1.1.1 → 1.2.1

raw patch · 5 files changed

+24/−39 lines, 5 files

Files

• README.md +20/−22
• src/Server.hs +1/−1
• toodles.cabal +2/−2
• web/html/index.html +1/−13
• web/js/app.js +0/−1

@@ -96,8 +96,16 @@ Submit a PR if you'd like a language to be added. There will eventually be support for this to be user configurable -### Running with Docker+### Installing with Scarf +[Scarf](https://scarf.sh) is the easiest way to get Toodles.++```bash+$ scarf install toodles+```++### Installing with Docker+ You can run a pre-built toodles for your current directory via docker:  ```bash@@ -105,38 +113,28 @@ $ docker run -it -v $(pwd):/repo -p 9001:9001 aviaviavi/toodles ``` -Just mount your project into the container's `/repo` and direct a port of your choice to the container's `9001`.+Just mount your project into the container's `/repo` and direct a port of your+choice to the container's `9001`. +### Building Toodles++Toodles builds with stack [stack](https://docs.haskellstack.org). Just a `stack+build` should do it. If you'd like to build toodles without cloning the source,+you can have stack build toodles with `stack install --resolver=lts-12.14`!++#### Building with Docker+ For convenience this repository also provides a `Dockerfile` to automatically build toodles.  ```bash # to build container run: $ cd /path/to/toodles/repo-$ docker build -t toodles .+$ docker build -t toodles Dockerfile.dev . # afterwards you can run the following command to execute toodles for the # directory you are currently in: $ docker run -it -v $(pwd):/repo -p 9001:9001 toodles -```--### Installing manually--The best way to install manually is with [stack](https://docs.haskellstack.org).-Just a `stack install --resolver=lts-12.14 toodles` and you're done! Alternatively, with GHC 8.4.3-you can use [cabal](https://www.haskell.org/cabal/download.html).--You'll also need to PyCrypto. If you have pip, you can run:--```bash-$ pip install pycrypto-```--If you've closed the toodles repo directly, you can also run--```bash-$ cd path/to/toodles-$ pip install -r requirements.txt ```  ### Running

@@ -293,7 +293,7 @@     then do       putStrLn "refreshing todo's"       userArgs <- toodlesArgs >>= setAbsolutePath-      sResults <- runFullSearch (userArgs { limit_results = if userLicense == Commercial then 0 else freeResultsLimit})+      sResults <- runFullSearch (userArgs { limit_results = 0 })       atomicModifyIORef' ref (const (Just sResults, sResults))     else       return $ fromMaybe (error "tried to read from the cache when there wasn't anything there") result

@@ -1,9 +1,9 @@ cabal-version: 1.12 name: toodles-version: 1.1.1+version: 1.2.1 license: MIT license-file: LICENSE-copyright: 2018 Avi Press+copyright: 2019 Avi Press maintainer: mail@avi.press author: Avi Press homepage: https://github.com/aviaviavi/toodles#readme

@@ -15,7 +15,7 @@             <div class="navbar-brand">                 <div class="navbar-item" href="#">                     <span><img src="/static/img/favicon.png" alt="favicon" height="25" width="25"></span>-                    <span class="toodles-nav-title-text">Toodles <span v-show="license == 'Commercial'">| Pro</span></span>+                    <span class="toodles-nav-title-text">Toodles</span>                 </div>                 <a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false" v-on:click="toggleMenuBurger">                     <span aria-hidden="true"></span>@@ -58,18 +58,6 @@                 </div>             </div>         </nav>--        <section v-show="license == 'BadLicense'" class="bad-license-banner is-fullwidth" >-            <div class="container">-                Your license file is invalid. <a v-on:click="getLicense">Try again</a>-            </div>-        </section>--        <section v-show="limited" class="warning-banner is-fullwidth" >-            <div class="container">-                The free edition of Toodles lets you manage up to 100 TODO's, so your results here are truncated. Please <a href="http://toodles.avi.press/#pricing">upgrade to Toodles Pro</a> in order to manage all of your code's TODO's.-            </div>-        </section>          <div class="modal">             <div class="modal-background" @click="closeModal"></div>

@@ -24,7 +24,6 @@     },     created: function() {       this.refresh()()-      return this.getLicense()     },     methods: {       // higher order for ease of calling from vue templates