@griddo/ax 1.60.9 → 1.61.2

package/src/routes/multisite.tsx

@@ -8,6 +8,7 @@ import UserCreate from "../modules/Users/UserCreate";
 import UserEdit from "../modules/Users/UserEdit";
 import Editor from "./../modules/GlobalEditor";
 import GlobalSettings from "./../modules/GlobalSettings";
+import AnalyticsSettings from "../modules/Analytics";
 
 export default [
   { path: "/sites", component: Sites, name: "Sites", showInNav: true, icon: "Project" },
@@ -27,11 +28,28 @@ export default [
     hideNav: true,
   },
   {
-    path: `/settings/robots`,
-    component: GlobalSettings,
+    path: `/settings`,
+    component: null,
     name: "Settings",
     showInNav: true,
     icon: "Settings",
+    routesGroups: [
+      {
+        name: "Settings",
+        routes: [
+          {
+            path: `/settings/robots`,
+            component: GlobalSettings,
+            name: "SEO tools",
+          },
+          {
+            path: `/settings/analytics`,
+            component: AnalyticsSettings,
+            name: "Analytics tools",
+          }
+        ]
+      }
+    ]
   },
   {
     path: `/settings/redirects`,

package/src/schemas/pages/GlobalPage.tsx

@@ -43,84 +43,95 @@ export default {
       ],
     },
     {
-      title: "seo",
+      title: "SEO & Analytics",
       fields: [
         {
-          title: "Meta title",
-          type: "TextField",
-          key: "metaTitle",
-        },
-        {
-          title: "Meta description",
-          type: "TextArea",
-          key: "metaDescription",
-        },
-        {
-          title: "Meta robots index",
-          type: "RadioGroup",
-          key: "isIndexed",
-          options: [
-            {
-              value: true,
-              title: "Index",
-              name: "index",
-            },
-            {
-              value: false,
-              title: "No index",
-              name: "noindex",
-            },
-          ],
-        },
-        {
-          title: "Meta robots follow",
-          type: "RadioGroup",
-          key: "follow",
-          options: [
-            {
-              value: true,
-              title: "Follow",
-              name: "follow",
-            },
-            {
-              value: false,
-              title: "No follow",
-              name: "nofollow",
-            },
-          ],
-        },
-        {
-          title: "Meta robots advanced",
-          type: "CheckGroup",
-          key: "metasAdvanced",
-          options: [
+          title: "SEO Data",
+          type: "FieldGroup",
+          key: "seoData",
+          fields: [
             {
-              value: "noimageindex",
-              title: "No image index",
-              name: "noimage",
+              title: "Meta title",
+              type: "TextField",
+              key: "metaTitle",
             },
             {
-              value: "nosnippet",
-              title: "No snippet",
-              name: "nosnippet",
+              title: "Meta description",
+              type: "TextArea",
+              key: "metaDescription",
             },
             {
-              value: "noodp",
-              title: "No ODP",
-              name: "noodp",
+              title: "Meta robots index",
+              type: "RadioGroup",
+              key: "isIndexed",
+              options: [
+                {
+                  value: true,
+                  title: "Index",
+                  name: "index",
+                },
+                {
+                  value: false,
+                  title: "No index",
+                  name: "noindex",
+                },
+              ],
             },
             {
-              value: "noarchive",
-              title: "No archive",
-              name: "noarchive",
+              title: "Meta robots follow",
+              type: "RadioGroup",
+              key: "follow",
+              options: [
+                {
+                  value: true,
+                  title: "Follow",
+                  name: "follow",
+                },
+                {
+                  value: false,
+                  title: "No follow",
+                  name: "nofollow",
+                },
+              ],
             },
             {
-              value: "noTranslate",
-              title: "No translate",
-              name: "noTranslate",
+              title: "Meta robots advanced",
+              type: "CheckGroup",
+              key: "metasAdvanced",
+              options: [
+                {
+                  value: "noimageindex",
+                  title: "No image index",
+                  name: "noimage",
+                },
+                {
+                  value: "nosnippet",
+                  title: "No snippet",
+                  name: "nosnippet",
+                },
+                {
+                  value: "noodp",
+                  title: "No ODP",
+                  name: "noodp",
+                },
+                {
+                  value: "noarchive",
+                  title: "No archive",
+                  name: "noarchive",
+                },
+                {
+                  value: "noTranslate",
+                  title: "No translate",
+                  name: "noTranslate",
+                },
+              ],
             },
           ],
         },
+        {
+          type: "AnalyticsField",
+          key: "dimensions",
+        },
         {
           title: "Social Media",
           type: "FieldGroup",

package/src/schemas/pages/Page.tsx

@@ -51,89 +51,100 @@ export default {
       ],
     },
     {
-      title: "seo",
+      title: "SEO & Analytics",
       fields: [
         {
-          title: "Meta title",
-          type: "TextField",
-          key: "metaTitle",
-        },
-        {
-          title: "Meta description",
-          type: "TextArea",
-          key: "metaDescription",
-        },
-        {
-          title: "Canonical URL",
-          type: "TextField",
-          key: "canonicalURL",
-        },
-        {
-          title: "Meta robots index",
-          type: "RadioGroup",
-          key: "isIndexed",
-          options: [
-            {
-              value: true,
-              title: "Index",
-              name: "index",
-            },
-            {
-              value: false,
-              title: "No index",
-              name: "noindex",
-            },
-          ],
-        },
-        {
-          title: "Meta robots follow",
-          type: "RadioGroup",
-          key: "follow",
-          options: [
-            {
-              value: true,
-              title: "Follow",
-              name: "follow",
-            },
+          title: "SEO Data",
+          type: "FieldGroup",
+          key: "seoData",
+          fields: [
             {
-              value: false,
-              title: "No follow",
-              name: "nofollow",
+              title: "Meta title",
+              type: "TextField",
+              key: "metaTitle",
             },
-          ],
-        },
-        {
-          title: "Meta robots advanced",
-          type: "CheckGroup",
-          key: "metasAdvanced",
-          options: [
             {
-              value: "noimageindex",
-              title: "No image index",
-              name: "noimage",
+              title: "Meta description",
+              type: "TextArea",
+              key: "metaDescription",
             },
             {
-              value: "nosnippet",
-              title: "No snippet",
-              name: "nosnippet",
+              title: "Canonical URL",
+              type: "TextField",
+              key: "canonicalURL",
             },
             {
-              value: "noodp",
-              title: "No ODP",
-              name: "noodp",
+              title: "Meta robots index",
+              type: "RadioGroup",
+              key: "isIndexed",
+              options: [
+                {
+                  value: true,
+                  title: "Index",
+                  name: "index",
+                },
+                {
+                  value: false,
+                  title: "No index",
+                  name: "noindex",
+                },
+              ],
             },
             {
-              value: "noarchive",
-              title: "No archive",
-              name: "noarchive",
+              title: "Meta robots follow",
+              type: "RadioGroup",
+              key: "follow",
+              options: [
+                {
+                  value: true,
+                  title: "Follow",
+                  name: "follow",
+                },
+                {
+                  value: false,
+                  title: "No follow",
+                  name: "nofollow",
+                },
+              ],
             },
             {
-              value: "noTranslate",
-              title: "No translate",
-              name: "noTranslate",
+              title: "Meta robots advanced",
+              type: "CheckGroup",
+              key: "metasAdvanced",
+              options: [
+                {
+                  value: "noimageindex",
+                  title: "No image index",
+                  name: "noimage",
+                },
+                {
+                  value: "nosnippet",
+                  title: "No snippet",
+                  name: "nosnippet",
+                },
+                {
+                  value: "noodp",
+                  title: "No ODP",
+                  name: "noodp",
+                },
+                {
+                  value: "noarchive",
+                  title: "No archive",
+                  name: "noarchive",
+                },
+                {
+                  value: "noTranslate",
+                  title: "No translate",
+                  name: "noTranslate",
+                },
+              ],
             },
           ],
         },
+        {
+          type: "AnalyticsField",
+          key: "dimensions",
+        },
         {
           title: "Social Media",
           type: "FieldGroup",
@@ -177,5 +188,6 @@ export default {
     socialTitle: "",
     socialDescription: "",
     socialImage: {},
+    dimensions: {},
   },
 };

package/src/types/index.tsx

@@ -10,6 +10,7 @@ import { IUsersState } from "@ax/containers/Users/reducer";
 import { IGalleryState } from "@ax/containers/Gallery/reducer";
 import { IDomainsState } from "@ax/containers/Domains/reducer";
 import { IRedirectsState } from "@ax/containers/Redirects/reducer";
+import { IAnalyticsState } from "@ax/containers/Analytics/reducer";
 
 export interface IBreadcrumbItem {
   editorID: number;
@@ -88,7 +89,7 @@ export interface IAPIPage {
   draftFromPage: number | null;
   liveChanged: boolean;
   templateId: string;
-  structuredDataContent: Record<string, []>
+  structuredDataContent: Record<string, []>;
 }
 
 export interface IPage extends IAPIPage {
@@ -185,6 +186,7 @@ export interface IRootState {
   gallery: IGalleryState;
   domains: IDomainsState;
   redirects: IRedirectsState;
+  analytics: IAnalyticsState;
 }
 
 export interface IStyledProps {
@@ -618,7 +620,7 @@ export interface IDataPackConfigImport {
 export interface IModal {
   isOpen: boolean;
   toggleModal: () => void;
-  mainModalAction: { title: string; onClick: () => void };
+  mainModalAction?: { title: string; onClick: () => void };
   secondaryModalAction?: { title: string; onClick: () => void };
 }
 
@@ -683,7 +685,27 @@ export interface IRedirect {
   id?: number;
   from: string;
   to: { pageId?: number; url: string; linkTo?: number; href?: string };
-  site?: { siteId: number | null; siteName: string | null };
+  site?: { siteId: number | null; siteName: string | null; siteUrl: string | null };
+  domain?: string;
+}
+
+export interface IAnalytics {
+  scriptCode: string;
+  dimensions: IDimension[];
+  groups: IDimensionsGroup[];
+}
+
+export interface IDimension {
+  id?: number;
+  name: string;
+  values: string;
+}
+
+export interface IDimensionsGroup {
+  id?: number;
+  name: string;
+  dimensions: string;
+  templates?: string;
 }
 
 export type Field =