Squashed commit of shoppinglist_v2

cookbook/templates/base.html

@@ -67,7 +67,7 @@
     </button>
 
     {% if not request.user.is_authenticated or request.user.userpreference.theme == request.user.userpreference.TANDOOR %}
-        <a class="navbar-brand p-0 me-2 justify-content-center" href="/" aria-label="Tandoor">
+        <a class="navbar-brand p-0 me-2 justify-content-center" href="{% base_path request 'base' %}" aria-label="Tandoor">
             <img class="brand-icon" src="{% static 'assets/brand_logo.png' %}" alt="" style="height: 5vh;">
         </a>
     {% endif %}

cookbook/templates/shopping_list.html

@@ -834,7 +834,7 @@
                 this.$http.get('{% url 'api:recipe-detail' 123456 %}'.replace('123456', recipe.id)).then((response) => {
                     for (let s of response.data.steps) {
                         for (let i of s.ingredients) {
-                            if (!i.is_header && i.food !== null && i.food.ignore_shopping === false) {
+                            if (!i.is_header && i.food !== null && i.food.food_onhand === false) {
                                 this.shopping_list.entries.push({
                                     'list_recipe': slr.id,
                                     'food': i.food,

cookbook/templates/url_import.html

@@ -76,6 +76,7 @@
                     <option value="CHEFTAP">Cheftap</option>
                     <option value="CHOWDOWN">Chowdown</option>
                     <option value="COOKBOOKAPP">CookBookApp</option>
+                    <option value="COPYMETHAT">CopyMeThat</option>
                     <option value="DOMESTICA">Domestica</option>
                     <option value="MEALIE">Mealie</option>
                     <option value="MEALMASTER">Mealmaster</option>