Fixes #10

Author: root

appinfo/info.xml

@@ -5,14 +5,14 @@
     <name>Cookbook</name>
     <summary>An integrated cookbook using schema.org JSON files files as recipes</summary>
     <description><![CDATA[A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.]]></description>
-    <version>0.1.4</version>
+    <version>0.1.5</version>
     <licence>agpl</licence>
     <author mail="[email protected]" >Jeppe Zapp</author>
     <namespace>Cookbook</namespace>
     <category>organization</category>
     <bugs>https://github.com/mrzapp/nextcloud-cookbook/issues</bugs>
     <dependencies>
-        <nextcloud min-version="14" max-version="17"/>
+        <nextcloud min-version="14" max-version="18"/>
     </dependencies>
     <navigations>
         <navigation>

css/style.css

@@ -9,6 +9,21 @@
  * Navigation
  */
 #app-navigation {}
+    #app-navigation .app-navigation-create {
+        padding: 10px;
+    }
+        
+        #app-navigation .app-navigation-create .button {
+            width: 100%;
+            padding: 6px 12px;
+            padding-left: 12px;
+            padding-left: 34px;
+            margin: 0;
+            border-radius: var(--border-radius);
+            background-position: left 9px center;
+            z-index: 2;
+        }
+
     #app-navigation .app-navigation-new {
         display: flex;
     }

js/script.js

@@ -31,8 +31,8 @@ Cookbook.prototype = {
             url: this._baseUrl + '/update',
             method: 'POST',
             data: json
-        }).done(function () {
-            deferred.resolve();
+        }).done(function (response) {
+            deferred.resolve(response);
         }).fail(function () {
             deferred.reject();
         });
@@ -125,13 +125,13 @@ var Content = function (cookbook) {
      */
     self.render = function () {
         var recipeId = cookbook.getActiveId();
-        var isEditor = location.hash.indexOf('|edit') > -1;
+        var isEditor = location.hash.indexOf('|edit') > -1 || location.hash === '#new';
 
-        if(!recipeId) {
+        if(!recipeId && !isEditor) {
             $('#app-content-wrapper').html('Please pick a recipe');
         } else {
             $.ajax({
-                url: cookbook._baseUrl + '/' + (isEditor ? 'edit' : 'recipe') + '?id=' + recipeId,
+                url: cookbook._baseUrl + '/' + (isEditor ? 'edit' : 'recipe') + (isEditor && !recipeId ? '?new' : '?id=' + recipeId),
                 method: 'GET',
             })
             .done(function (html) {
@@ -192,12 +192,13 @@ var Content = function (cookbook) {
         var data = $(e.currentTarget).serialize();
 
         cookbook.update(data)
-        .then(function() {
-            location.hash = location.hash.replace(/[^0-9]+/g, '');
+        .then(function(id) {
+            location.hash = id;
 
             self.render();
+            nav.render();
         })
-        .catch(function(e) {
+        .fail(function(e) {
             alert('Could not update recipe');
 
             if(e && e instanceof Error) { throw e; }
@@ -221,7 +222,16 @@ var Nav = function (cookbook) {
             self.render();
         });
     };
-    
+   
+    /**
+     * Event: Create new recipe
+     */
+    self.onCreateNewRecipe = function(e) {
+        e.preventDefault();
+
+        location.hash = 'new';
+    }
+
     /**
      * Event: Submit new recipe
      */
@@ -313,7 +323,7 @@ var Nav = function (cookbook) {
         })
         .done(function(html) {
             $('#app-navigation #recipes').html(html);
-
+            
             $('#app-navigation #recipes .button-edit button').click(self.onEditRecipe);
 
             $('#app-navigation #recipes .button-delete button').click(self.onDeleteRecipe);
@@ -327,6 +337,10 @@ var Nav = function (cookbook) {
         // Change recipe folder
         $('#recipe-folder').off('click');
         $('#recipe-folder').click(self.onChangeRecipeFolder);
+        
+        // Create a new recipe
+        $('#create-recipe').off('submit');
+        $('#create-recipe').submit(self.onCreateNewRecipe);
 
         // Add a new recipe
         $('#add-recipe').off('submit');

lib/Controller/PageController.php

@@ -69,12 +69,17 @@ public function recipe() {
      * @NoCSRFRequired
      */
     public function edit() {
-        if(!isset($_GET['id'])) {
-            return new DataResponse('Paramater "id" is required', 400);
+        if(!isset($_GET['id']) && !isset($_GET['new'])) {
+            return new DataResponse('Paramater "id" or "new" is required', 400);
         }
 
         try {
-            $recipe = $this->service->getRecipeById($_GET['id']);
+            $recipe = [];
+
+            if(isset($_GET['id'])) {
+                $recipe = $this->service->getRecipeById($_GET['id']);
+            }
+
             $response = new TemplateResponse('cookbook', 'content/edit', $recipe);
             $response->renderAs('blank');
 

lib/Controller/RecipeController.php

@@ -111,7 +111,7 @@ public function update() {
 
         $file = $this->service->addRecipe($json);
 
-        return new DataResponse($file->getContent(), Http::STATUS_OK, [ 'Content-Type' => 'application/json' ]);
+        return new DataResponse($file->getId(), Http::STATUS_OK, [ 'Content-Type' => 'application/json' ]);
     }
 
     /**

templates/navigation/index.php

@@ -1,3 +1,7 @@
+<form id="create-recipe" class="app-navigation-create">
+    <button type="submit" title="Create recipe" class="button icon-add">Create recipe</button>
+</form>
+
 <form id="add-recipe" class="app-navigation-new">
     <input name="url" placeholder="Recipe URL">
     <button type="submit" title="Download recipe">