Integration 0.12 with flat-pages 0.1.5

.meteor/packages

@@ -71,3 +71,5 @@ reactioncommerce:reaction-sample-data   # default Reaction data
 # Themes
 reactioncommerce:default-theme          # default Reaction theme
 #my:custom-theme
+
+ramusus:reaction-flat-pages

.meteor/versions

@@ -37,6 +37,7 @@ cfs:base-package@0.0.30
 cfs:collection@0.5.5
 cfs:collection-filters@0.2.4
 cfs:data-man@0.0.6
+cfs:ejson-file@0.0.0
 cfs:file@0.1.17
 cfs:filesystem@0.1.2
 cfs:graphicsmagick@0.0.18
@@ -99,7 +100,7 @@ localstorage@1.0.5
 logging@1.0.8
 matb33:collection-hooks@0.8.1
 mdg:validated-method@1.0.2
-mdg:validation-error@0.2.0
+mdg:validation-error@0.4.0
 meteor@1.1.10
 meteor-base@1.0.1
 meteorhacks:fast-render@2.13.0
@@ -133,6 +134,7 @@ ordered-dict@1.0.4
 promise@0.5.1
 raix:eventemitter@0.1.3
 raix:ui-dropped-event@0.0.7
+ramusus:reaction-flat-pages@0.1.5
 random@1.0.5
 rate-limit@1.0.0
 react@0.1.10
@@ -148,7 +150,7 @@ reactioncommerce:launchdock-connect@0.2.1
 reactioncommerce:reaction-accounts@1.7.0
 reactioncommerce:reaction-analytics@1.2.3
 reactioncommerce:reaction-analytics-libs@1.1.0
-reactioncommerce:reaction-auth-net@0.6.0
+reactioncommerce:reaction-auth-net@0.6.1
 reactioncommerce:reaction-braintree@1.5.3
 reactioncommerce:reaction-catalog@0.2.2
 reactioncommerce:reaction-checkout@1.0.0
@@ -160,7 +162,7 @@ reactioncommerce:reaction-inventory@0.2.3
 reactioncommerce:reaction-layout@1.0.0
 reactioncommerce:reaction-logger@0.1.0
 reactioncommerce:reaction-orders@1.0.0
-reactioncommerce:reaction-paymentmethod@0.0.4
+reactioncommerce:reaction-paymentmethod@0.0.5
 reactioncommerce:reaction-paypal@1.3.0
 reactioncommerce:reaction-product-variant@1.0.0
 reactioncommerce:reaction-router@1.1.0

packages/reaction-accounts/server/methods/accounts.js

@@ -34,8 +34,8 @@ Accounts.registerLoginHandler(function (options) {
 Accounts.onCreateUser(function (options, user) {
   const shop = ReactionCore.getCurrentShop();
   const shopId = shop._id;
-  const defaultVisitorRole =  ["anonymous", "guest", "product", "tag", "index", "cart/checkout", "cart/completed"];
-  const defaultRoles =  ["guest", "account/profile", "product", "tag", "index", "cart/checkout", "cart/completed"];
+  const defaultVisitorRole =  ["anonymous", "guest", "product", "page", "tag", "index", "cart/checkout", "cart/completed"];
+  const defaultRoles =  ["guest", "account/profile", "product", "page", "tag", "index", "cart/checkout", "cart/completed"];
   let roles = {};
   let additionals = {
     profile: {}

packages/reaction-i18n/private/data/i18n/en.json

@@ -12,6 +12,8 @@
           "dashboardLabel": "Dashboard",
           "ordersLabel": "Orders",
           "addProductLabel": "Add Product",
+          "addPageLabel": "Add Page",
+          "flatPagesLabel": "Flat pages",
           "accountsLabel": "Accounts"
         },
         "dashboard": {
@@ -38,6 +40,8 @@
           "coreDescription": "Reaction core shop configuration",
           "genericPaymentLabel": "Generic Payment",
           "genericPaymentDescription": "Generic Payment Method",
+          "flatPagesLabel": "Flat Pages",
+          "flatPagesDescription": "Easily add flat pages anywhere into Reaction",
           "i18NLabel": "i18n",
           "i18NTitle": "i18n",
           "i18NDescription": "Internationalization utilities",
@@ -80,6 +84,7 @@
           "utilities": "Utilities"
         },
         "settings": {
+          "flatPagesLabel": "Flat Pages",
           "accountSettingsLabel": "Account Settings",
           "addShopMemberLabel": "Add Shop Member",
           "authorizenetSettingsLabel": "Authorize.net Settings",
@@ -612,6 +617,24 @@
           "unknownError": "Unknown error"
         }
       },
+      "pageDetail": {
+        "pageManagement": "Page management",
+        "makeInvisible": "Make invisible",
+        "isNotVisible": "This page is not visible to customers.",
+        "makeItVisible": "You can make it visible",
+        "whenYouAreDone": "when you're done editing.",
+        "notFoundTitle": "Oops!",
+        "notFoundError": "This is no the page you were looking for.",
+        "publishPageVisible": "is now visible",
+        "publishPageHidden": "is now hidden",
+        "noTitle": "No title"
+      },
+      "pageDetailEdit": {
+        "title": "Page title",
+        "pageTitle": "Page subtitle",
+        "content": "Add a page content",
+        "handle": "Add address of page"
+      },
       "error": {
         "nameRequired": "Name is required.",
         "isRequired": "{{field}} is required.",

packages/reaction-i18n/private/data/i18n/ru.json

@@ -12,6 +12,8 @@
           "dashboardLabel": "Панель управления",
           "ordersLabel": "Заказы",
           "addProductLabel": "Создать продукт",
+          "addPageLabel": "Создать страницу",
+          "flatPagesLabel": "Простые страницы",
           "accountsLabel": "Пользователи"
         },
         "dashboard": {
@@ -36,6 +38,8 @@
           "coreDescription": "Базовые настройки Reaction",
           "genericPaymentLabel": "Образец платёжной системы",
           "genericPaymentDescription": "Тестирование платежей. Образец для портирования любых Платёжных систем",
+          "flatPagesLabel": "Простые страницы",
+          "flatPagesDescription": "Управление простыми страницами в Reaction",
           "i18NLabel": "i18n",
           "i18NTitle": "i18n",
           "i18NDescription": "Интернационализация",
@@ -75,6 +79,7 @@
           "utilities": "Утилиты"
         },
         "settings": {
+          "flatPagesLabel": "Простые страницы",
           "accountSettingsLabel": "Настройки учетных записей",
           "addShopMemberLabel": "Добавить сотрудника",
           "authorizenetSettingsLabel": "Настройки Authorize.net",
@@ -594,6 +599,24 @@
           "unknownError": "Неизвестная ошибка"
         }
       },
+      "pageDetail": {
+        "pageManagement": "Управление страницей",
+        "makeInvisible": "Сделать невидимой",
+        "isNotVisible": "Эта страница невидима для покупателей.",
+        "makeItVisible": "Вы можете сделать его видимой",
+        "whenYouAreDone": "когда закончите редактирование.",
+        "notFoundTitle": "Упс!",
+        "notFoundError": "Страница не найдена.",
+        "publishPageVisible": "теперь виден",
+        "publishPageHidden": "теперь скрыт",
+        "noTitle": "Без заголовка"
+      },
+      "pageDetailEdit": {
+        "title": "Название",
+        "pageTitle": "Другое название",
+        "content": "Добавьте содержимое страницы",
+        "handle": "Укажите адрес страницы"
+      },
       "error": {
         "nameRequired": "Название обязательно.",
         "isRequired": "Поле \"{{field}}\" обязательно.",

packages/reaction-layout/client/templates/layout/createContentMenu/createContentMenu.js

@@ -28,6 +28,19 @@ Template.createContentMenu.helpers({
               }
             }
           });
+        } else if (item.route === "/pages/createPage") {
+          Meteor.call("ReactionFlatPages.methods.createPage", (error, pageId) => {
+            if (Meteor.isClient) {
+              if (error) {
+                throw new Meteor.Error("createProduct error", error);
+              } else if (pageId) {
+                // go to new page
+                ReactionRouter.go("page", {
+                  handle: pageId
+                });
+              }
+            }
+          });
         }
       }
     };

packages/reaction-sample-data/private/data/Shops.json

@@ -3056,6 +3056,7 @@
     "anonymous",
     "guest",
     "product",
+    "page",
     "tag",
     "index",
     "cart/checkout",
@@ -3065,6 +3066,7 @@
     "account/profile",
     "guest",
     "product",
+    "page",
     "tag",
     "index",
     "cart/checkout",

packages/reaction-schemas/common/schemas/shops.js

@@ -243,11 +243,11 @@ ReactionCore.Schemas.Shop = new SimpleSchema({
   },
   "defaultVisitorRole": {
     type: [String],
-    defaultValue: ["anonymous", "guest", "product", "tag", "index", "cart/checkout", "cart/completed"]
+    defaultValue: ["anonymous", "guest", "product", "page", "tag", "index", "cart/checkout", "cart/completed"]
   },
   "defaultRoles": {
     type: [String],
-    defaultValue: ["guest", "account/profile", "product", "tag", "index", "cart/checkout", "cart/completed"]
+    defaultValue: ["guest", "account/profile", "product", "page", "tag", "index", "cart/checkout", "cart/completed"]
   },
   "layout": {
     type: [ReactionCore.Schemas.Layout],