j-maas · j-maas · Apr 11, 2020 · Apr 11, 2020 · Apr 11, 2020 · Apr 11, 2020
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,6 +9,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+      with:
+        submodules: true
     - name: Use Node.js LTS
       uses: actions/setup-node@v1
       with:

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -9,6 +9,9 @@ jobs:
     steps:
       - name: Checkout 🛎️
         uses: actions/checkout@v2
+        with:
+          persist-credentials: false
+          submodules: true
 
       - name: Install and Build
         run: |

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "submodules/elm-dropbox"]
+	path = submodules/elm-dropbox
+	url = https://github.com/Y0hy0h/elm-dropbox.git
diff --git a/README.md b/README.md
@@ -1,8 +1,9 @@
 # Recipe Box
 
 ## Getting started
-1. `npm install` to install dependencies.
-2. `npm run watch` to start a server that makes the app available at http://localhost:8000.
+1. Ensure that the [Git submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules) are initialized: `git submodule update --init`
+2. `npm install` to install dependencies.
+3. `npm run watch` to start a server that makes the app available at http://localhost:8000.
 
 Tests can be run with `npm run test`.
 
@@ -35,16 +36,18 @@ To build everything, run `npm run build` and deploy the `dist` folder.
   - [ ] Add indicator to top of files that explains how to view the recipes for people who do not know what to do with the files.
   - [ ] Add WebDav integration (for NextCloud).
   - [ ] Add DropBox integration.
+    - [ ] Show name of account when logged in.
 - Overview
   - [ ] Filter recipes.
   - [ ] Search by ingredient.
+  - [ ] For duplicated titles, show file name as additional info.
 - Recipe
   - [x] Indicate how many ingredients there are in ingredient heading.
   - [x] Show quantities in method. This is helpful when assembling ingredients while cooking.
   - [ ] Highlight occurrences of ingredients on hover.
   - [ ] Prevent display from turning off while cooking. (Wake Lock API (in draft) is only reasonable implementation.)
     - [x] Workaround: Allow playing a soothing YouTube video in a loop.
-    - [ ] Offer customization of what video to play.
+    - [x] Offer customization of what video to play.
   - [ ] Allow setting portions.
   - [ ] Embed timers.
   - [ ] Instead of brute deletion, have a bin to protect against accidental deletion.
@@ -60,6 +63,8 @@ To build everything, run `npm run build` and deploy the `dist` folder.
   - [ ] Prevent multiple repetitions of context explanations. (E.g., when a quantity is empty, there is a problem for an expected float and an expected text that are listed separately.)
   - [ ] Highlight errors in textarea. (See https://codersblock.com/blog/highlight-text-inside-a-textarea/)
   - [ ] Allow named sections representing steps that have individual ingredient lists for preparation.
+- Settings
+  - [ ] Offer reset to default value.
 - [ ] Make it work offline. (Using a service worker.)
 - [x] Increase font size slightly.
 - [ ] Fix highlight on real button differing from link button.

diff --git a/dist/index.html b/dist/index.html
@@ -17,21 +17,28 @@
 <body>
     <div id="elm"></div>
     <script>
-        var recipes = [];
-        var recipeChecks = [];
+        var recipesDict = {};
         var recipePrefix = "recipe:"
         var checksPrefix = "recipeChecks:"
+        function push(fileName, key, item) {
+            recipesDict[fileName] = recipesDict[fileName] || { code: null, checks: [] };
+            recipesDict[fileName][key] = item;
+        }
         for (var i = 0; i < localStorage.length; i++) {
             var key = localStorage.key(i);
             if (key.startsWith(recipePrefix)) {
-                recipes.push(localStorage.getItem(key));
+                var fileName = key.slice(recipePrefix.length);
+                var entry = JSON.parse(localStorage.getItem(key));
+                push(fileName, "fileName", fileName)
+                push(fileName, "code", entry.code);
+                push(fileName, "revision", entry.revision);
             } else if (key.startsWith(checksPrefix)) {
-                var title = key.slice(checksPrefix.length);
-                recipeChecks.push([title, JSON.parse(localStorage.getItem(key))]);
+                var fileName = key.slice(checksPrefix.length);
+                push(fileName, "checks", JSON.parse(localStorage.getItem(key)));
             }
         }
+        var recipes = Object.values(recipesDict);
         console.info("Loaded " + recipes.length + " recipes.");
-        console.info("Loaded check marks for " + recipeChecks.length + " recipes.");
 
         var shoppingListKey = "shoppingList";
         function getShoppingList() {
@@ -61,25 +68,29 @@
         }
 
         var settingsKey = "settings";
-        var settings = JSON.parse(localStorage.getItem(settingsKey)) || {
-            wakeVideoId: null
-        };
+        var settings = JSON.parse(localStorage.getItem(settingsKey));
         console.info("Loaded settings:", settings);
 
+        var nonceKey = "nonce";
+        var nonce = localStorage.getItem(nonceKey);
+        if (nonce) {
+            console.info("Loaded nonce.");
+        }
+
         var app = Elm.Main.init({
             node: document.getElementById('elm'),
             flags: {
                 recipes,
-                recipeChecks,
                 shoppingList,
                 language,
                 settings,
+                nonce,
             }
         });
 
-        function saveRecipe(title, code) {
-            console.info("Saving recipe with title '" + title + "'.")
-            localStorage.setItem(recipeKeyFromTitle(title), code);
+        function saveRecipe(title, code, revision) {
+            console.info("Saving recipe with title '" + title + "' and revision '" + revision + "'.")
+            localStorage.setItem(recipeKeyFromTitle(title), JSON.stringify({ code, revision }));
         }
 
         function removeRecipe(title) {
@@ -115,8 +126,22 @@
             localStorage.setItem(settingsKey, JSON.stringify(settings));
         }
 
+        function generateNonce() {
+            var characterset = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_-";
+            var random = crypto.getRandomValues(new Uint8Array(64));
+            var nonce = "";
+            random.forEach(number => {
+                index = number % characterset.length;
+                nonce += characterset[index];
+            });
+            localStorage.setItem(nonceKey, nonce);
+
+            console.info("Generated and stored nonce.");
+            app.ports.nonceGenerated.send(nonce);
+        }
+
         app.ports.saveRecipe.subscribe(function (data) {
-            saveRecipe(data.title, data.code);
+            saveRecipe(data.title, data.code, data.revision);
         });
         app.ports.removeRecipe.subscribe(function (title) {
             removeRecipe(title);
@@ -133,6 +158,9 @@
         app.ports.saveSettings.subscribe(function (settings) {
             saveSettings(settings);
         })
+        app.ports.generateNonce.subscribe(function () {
+            generateNonce();
+        });
     </script>
 </body>
 

diff --git a/elm.json b/elm.json
@@ -1,35 +1,43 @@
 {
     "type": "application",
     "source-directories": [
-        "src"
+        "src",
+        "submodules/elm-dropbox/src"
     ],
     "elm-version": "0.19.1",
     "dependencies": {
         "direct": {
+            "Chadtech/elm-relational-database": "1.2.2",
+            "NoRedInk/elm-json-decode-pipeline": "1.0.0",
             "elm/browser": "1.0.2",
             "elm/core": "1.0.5",
             "elm/html": "1.0.0",
+            "elm/http": "2.0.0",
             "elm/json": "1.1.3",
             "elm/parser": "1.1.0",
+            "elm/regex": "1.0.0",
+            "elm/time": "1.0.0",
             "elm/url": "1.0.0",
-            "elm-community/list-extra": "8.2.3",
-            "rtfeldman/elm-css": "16.0.1",
+            "elm-community/json-extra": "4.3.0",
+            "elm-community/list-extra": "8.2.4",
+            "elm-community/string-extra": "4.0.1",
+            "rtfeldman/elm-css": "16.1.0",
+            "rtfeldman/elm-iso8601-date-strings": "1.1.3",
             "tricycle/elm-embed-youtube": "1.1.2"
         },
         "indirect": {
-            "Skinney/murmur3": "2.0.8",
-            "elm/regex": "1.0.0",
-            "elm/time": "1.0.0",
+            "elm/bytes": "1.0.8",
+            "elm/file": "1.0.5",
+            "elm/random": "1.0.0",
             "elm/virtual-dom": "1.0.2",
+            "krisajenkins/remotedata": "6.0.1",
             "rtfeldman/elm-hex": "1.0.0"
         }
     },
     "test-dependencies": {
         "direct": {
             "elm-explorations/test": "1.2.2"
         },
-        "indirect": {
-            "elm/random": "1.0.0"
-        }
+        "indirect": {}
     }
-}
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,11 +7,11 @@
   },
   "devDependencies": {
     "elm-live": "^4.0.2",
-    "terser": "^4.6.10"
+    "terser": "^5.3.1"
   },
   "scripts": {
     "test": "elm-test",
     "build": "elm make src/Main.elm --output dist/elm.min.js --optimize && terser dist/elm.min.js --output dist/elm.min.js --compress pure_funcs=[F2,F3,F4,F5,F6,F7,F8,F9,A2,A3,A4,A5,A6,A7,A8,A9],pure_getters,keep_fargs=false,unsafe_comps,unsafe --mangle",
     "watch": "elm-live src/Main.elm --dir ./dist --start-page index.html -- --output dist/elm.min.js"
   }
-}
+}