@raketa-cloud/admin 0.0.10 → 0.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raketa-cloud/admin",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "main": "src/index.js",
   "scripts": {
     "dev": "npx tailwindcss -i ./src/styles/application.css -o ../../apps/admin/static/application.css --watch",

package/src/cloud/PageRevisions.js

@@ -3,13 +3,13 @@ import {
   DeletePageDocument,
   LockPageRevisionDocument,
   MergePageRevisionDocument,
-  PageByIdDocument,
   PageRevisionDocument,
   PageRevisionsDocument,
   StartPageRevisionDocument,
   UnlockPageRevisionDocument,
   UpdatePageDocument,
   UpdatePageWidgetsDocument,
+  ReopenPageChangeDocument,
 } from "./documents/pagesDocuments";
 
 export default class PageRevisions extends RaketaClient {
@@ -132,4 +132,18 @@ export default class PageRevisions extends RaketaClient {
 
     return { revision, errors };
   }
+
+  async revert(pageId, version, locale) {
+    const {
+      reopenPageChange: { revision, errors, pageErrors },
+    } = await this.query(ReopenPageChangeDocument, {
+      input: {
+        pageId,
+        locale,
+        version,
+      },
+    });
+
+    return { revision, errors, pageErrors };
+  }
 }

package/src/cloud/Pages.js

@@ -3,6 +3,10 @@ import {
   CreatePageDocument,
   PageByIdDocument,
   PagesDocument,
+  ClonePageDocument,
+  DeletePageDocument,
+  TranslatePageDocument,
+  ChangePageSlugDocument,
 } from "./documents/pagesDocuments";
 
 export default class Pages extends RaketaClient {
@@ -60,4 +64,68 @@ export default class Pages extends RaketaClient {
 
     return { page, errors };
   }
+
+  async clone(id, locale) {
+    const {
+      clonePage: { errors, page },
+    } = await this.query(ClonePageDocument, {
+      input: { id: id, locale: locale },
+    });
+
+    return { page, errors };
+  }
+
+  async delete(id, locale, redirect) {
+    const input = {
+      id,
+      locale,
+    };
+
+    if (redirect) {
+      input.redirect = redirect;
+    }
+
+    const {
+      deletePage: { errors, page },
+    } = await this.query(DeletePageDocument, { input });
+
+    return { page, errors };
+  }
+
+  async translate(id, locale, params) {
+    params.widgets = JSON.stringify(params.widgets);
+    params.settings = JSON.stringify(params.settings);
+
+    const {
+      translatePage: { errors, page },
+    } = await this.query(TranslatePageDocument, {
+      input: {
+        locale,
+        sourcePageId: id,
+        page: params,
+      },
+    });
+
+    return { page, errors };
+  }
+
+  async updateSlug(id, slug, locale, redirect) {
+    const input = {
+      id,
+      slug,
+      locale,
+    };
+
+    if (redirect) {
+      input.redirect = redirect;
+    }
+
+    const {
+      changePageSlug: { errors, page },
+    } = await this.query(ChangePageSlugDocument, {
+      input,
+    });
+
+    return { page, errors };
+  }
 }

package/src/handlers/PageCloneHandler.js

@@ -1,7 +1,7 @@
 const create = async (ctx) => {
   const { parent_id } = ctx.params;
 
-  const { errors } = await ctx.client.clonePage.clone(parent_id, ctx.locale);
+  const { errors } = await ctx.client.pages.clone(parent_id, ctx.locale);
 
   if (errors) {
     throw new Error(`Error cloning page: ${JSON.stringify(errors)}`);

package/src/handlers/PageCloneHandler.test/create.test.js

@@ -1,4 +1,4 @@
-import ClonePage from "../../cloud/ClonePage";
+import Pages from "../../cloud/Pages";
 import PageCloneHandler from "../PageCloneHandler";
 
 import Factory from "../../../../../apps/admin/test/factory";
@@ -7,7 +7,7 @@ import { testConfig } from "../../../../../apps/admin/test/handlersHelper";
 function buildCtx(page) {
   return {
     client: {
-      clonePage: new ClonePage(testConfig, "token"),
+      pages: new Pages(testConfig, "token"),
     },
     params: { parent_id: page.id },
     locale: "en",
@@ -20,7 +20,7 @@ describe("Clone page", () => {
     const ctx = buildCtx(page);
 
     const mockClone = jest
-      .spyOn(ctx.client.clonePage, "clone")
+      .spyOn(ctx.client.pages, "clone")
       .mockImplementation(() => page);
 
     const result = await PageCloneHandler.create(ctx);
@@ -38,7 +38,7 @@ describe("Clone page", () => {
     const ctx = buildCtx(page);
 
     const mockClone = jest
-      .spyOn(ctx.client.clonePage, "clone")
+      .spyOn(ctx.client.pages, "clone")
       .mockImplementation(() => ({
         page: null,
         errors: [{ key: "generalError", message: "some error" }],

package/src/handlers/PageDeleteHandler.js

@@ -39,7 +39,7 @@ const create = async (ctx) => {
     };
   }
 
-  const { errors } = await ctx.client.deletePage.delete(
+  const { errors } = await ctx.client.pages.delete(
     page.id,
     ctx.locale,
     redirect
@@ -50,7 +50,7 @@ const create = async (ctx) => {
       assigns: {
         deleteAction: { ...params, id: page.id },
         errors: {
-          deleteAction: ctx.client.deletePage.formatErrors(errors, "redirect"),
+          deleteAction: ctx.client.pages.formatErrors(errors, "redirect"),
         },
         _translations: [],
       },

package/src/handlers/PageDeleteHandler.test/create.test.js

@@ -1,6 +1,5 @@
 import PageDeleteHandler from "../PageDeleteHandler";
 import Pages from "../../cloud/Pages";
-import DeletePage from "../../cloud/DeletePage";
 import Factory from "../../../../../apps/admin/test/factory";
 import { testConfig } from "../../../../../apps/admin/test/handlersHelper";
 
@@ -8,7 +7,6 @@ function buildCtx(page, updateSettings) {
   return {
     client: {
       pages: new Pages(testConfig, "token"),
-      deletePage: new DeletePage(testConfig, "token"),
     },
     params: { parent_id: page.id },
     resourceParams: {
@@ -32,7 +30,7 @@ describe("Page delete", () => {
       .mockImplementation(() => page);
 
     const mockDelete = jest
-      .spyOn(ctx.client.deletePage, "delete")
+      .spyOn(ctx.client.pages, "delete")
       .mockImplementation(() => ({ page, errors: null }));
 
     const result = await PageDeleteHandler.create(ctx);
@@ -63,7 +61,7 @@ describe("Page delete", () => {
       .mockImplementation(() => page);
 
     const mockDelete = jest
-      .spyOn(ctx.client.deletePage, "delete")
+      .spyOn(ctx.client.pages, "delete")
       .mockImplementation(() => ({
         page: null,
         errors: [

package/src/handlers/PageTranslationsHandler.js

@@ -41,9 +41,9 @@ const create = async (ctx) => {
   const { target_locale, translation } = ctx.resourceParams;
   translation.meta_image = JSON.parse(translation.meta_image);
 
-  const { errors } = await ctx.client.pageTranslations.create(
-    target_locale,
+  const { errors } = await ctx.client.pages.translate(
     parent_id,
+    target_locale,
     {
       title: translation.title,
       slug: translation.slug,

package/src/handlers/PageURLsHandler.js

@@ -41,7 +41,7 @@ const create = async (ctx) => {
     };
   }
 
-  const { errors } = await ctx.client.changePageURL.update(
+  const { errors } = await ctx.client.pages.updateSlug(
     parent_id,
     change.slug,
     ctx.locale,

package/src/handlers/PageURLsHandler.test/create.test.js

@@ -1,6 +1,5 @@
 import PageURLsHandler from "../PageURLsHandler";
 import Pages from "../../cloud/Pages";
-import ChangePageURL from "../../cloud/ChangePageURL";
 import Factory from "../../../../../apps/admin/test/factory";
 import { testConfig } from "../../../../../apps/admin/test/handlersHelper";
 
@@ -8,7 +7,6 @@ function buildCtx(page, updateSettings) {
   return {
     client: {
       pages: new Pages(testConfig, "token"),
-      changePageURL: new ChangePageURL(testConfig, "token"),
     },
     params: { parent_id: page.id },
     resourceParams: {
@@ -32,7 +30,7 @@ describe("Page change url", () => {
       .mockImplementation(() => page);
 
     const mockChange = jest
-      .spyOn(ctx.client.changePageURL, "update")
+      .spyOn(ctx.client.pages, "updateSlug")
       .mockImplementation(() => ({ page, errors: null }));
 
     const result = await PageURLsHandler.create(ctx);
@@ -67,7 +65,7 @@ describe("Page change url", () => {
       .mockImplementation(() => page);
 
     const mockChange = jest
-      .spyOn(ctx.client.changePageURL, "update")
+      .spyOn(ctx.client.pages, "updateSlug")
       .mockImplementation(() => ({
         page: null,
         errors: [{ codes: [], key: "slug", message: "has already been taken" }],
@@ -105,7 +103,7 @@ describe("Page change url", () => {
       .mockImplementation(() => page);
 
     const mockChange = jest
-      .spyOn(ctx.client.changePageURL, "update")
+      .spyOn(ctx.client.pages, "updateSlug")
       .mockImplementation(() => ({
         page: null,
         errors: [

package/src/handlers/RevertPageRevisionHandler.js

@@ -2,7 +2,7 @@ const create = async (ctx) => {
   const { parent_id } = ctx.params;
   const { version } = ctx.resourceParams;
 
-  const { errors, pageErrors } = await ctx.client.revertPageRevision.create(
+  const { errors, pageErrors } = await ctx.client.pageRevisions.revert(
     parent_id,
     Number.parseInt(version, 10),
     ctx.locale

package/src/handlers/RevertPageRevisionHandler.test/create.test.js

@@ -1,11 +1,11 @@
 import RevertPageRevisionHandler from "../RevertPageRevisionHandler";
-import RevertPageRevision from "../../cloud/RevertPageRevision";
+import PageRevisions from "../../cloud/PageRevisions";
 import { testConfig } from "../../../../../apps/admin/test/handlersHelper";
 
 function buildCtx(pageID, version) {
   return {
     client: {
-      revertPageRevision: new RevertPageRevision(testConfig, "token"),
+      pageRevisions: new PageRevisions(testConfig, "token"),
     },
     params: { parent_id: pageID },
     resourceParams: { version },
@@ -20,7 +20,7 @@ describe("Page revision revert", () => {
     const ctx = buildCtx(pageId, version);
 
     const mockRevert = jest
-      .spyOn(ctx.client.revertPageRevision, "create")
+      .spyOn(ctx.client.pageRevisions, "revert")
       .mockImplementation(() => ({
         revision: {},
         errors: null,
@@ -43,7 +43,7 @@ describe("Page revision revert", () => {
     const errors = [{ key: "generalError", message: "Some error" }];
 
     const mockRevert = jest
-      .spyOn(ctx.client.revertPageRevision, "create")
+      .spyOn(ctx.client.pageRevisions, "revert")
       .mockImplementation(() => ({
         revision: null,
         errors: errors,
@@ -64,7 +64,7 @@ describe("Page revision revert", () => {
     const errors = [{ key: "generalError", message: "Some error" }];
 
     const mockRevert = jest
-      .spyOn(ctx.client.revertPageRevision, "create")
+      .spyOn(ctx.client.pageRevisions, "revert")
       .mockImplementation(() => ({
         revision: null,
         errors: null,

package/src/index.js

@@ -17,14 +17,9 @@ export { default as Settings } from "./cloud/Settings";
 export { default as SettingsGeneralHandler } from "./handlers/SettingsGeneralHandler";
 export { default as SettingsLayoutHandler } from "./handlers/SettingsLayoutHandler";
 export { default as SettingsMetaHandler } from "./handlers/SettingsMetaHandler";
-export { default as ChangePageURL } from "./cloud/ChangePageURL";
-export { default as ClonePage } from "./cloud/ClonePage";
-export { default as DeletePage } from "./cloud/DeletePage";
 export { default as PageChanges } from "./cloud/PageChanges";
 export { default as PageRevisions } from "./cloud/PageRevisions";
-export { default as PageTranslations } from "./cloud/PageTranslations";
 export { default as Pages } from "./cloud/Pages";
-export { default as RevertPageRevision } from "./cloud/RevertPageRevision";
 export { default as PageCloneHandler } from "./handlers/PageCloneHandler";
 export { default as PageDeleteHandler } from "./handlers/PageDeleteHandler";
 export { default as PageRevisionsCodesHandler } from "./handlers/PageRevisionsCodesHandler";

package/src/routeNestedCollection.js

@@ -16,7 +16,7 @@ const routeNestedCollection = (adapter, parent, resource, handler) => {
       "GET",
       `/${parent}/:parent_id/${resource}`,
       resource,
-      resource,
+      `${parent}/${resource}`,
       "index",
       index,
       before_filter,
@@ -26,7 +26,7 @@ const routeNestedCollection = (adapter, parent, resource, handler) => {
       "GET",
       `/${parent}/:parent_id/${resource}/new`,
       resource,
-      resource,
+      `${parent}/${resource}`,
       "create_form",
       create_form,
       before_filter,
@@ -36,7 +36,7 @@ const routeNestedCollection = (adapter, parent, resource, handler) => {
       "GET",
       `/${resource}/:id`,
       resource,
-      resource,
+      `${parent}/${resource}`,
       "show",
       show,
       before_filter,
@@ -46,7 +46,7 @@ const routeNestedCollection = (adapter, parent, resource, handler) => {
       "GET",
       `/${resource}/:id/edit`,
       resource,
-      resource,
+      `${parent}/${resource}`,
       "edit_form",
       edit_form,
       before_filter,
@@ -56,7 +56,7 @@ const routeNestedCollection = (adapter, parent, resource, handler) => {
       "POST",
       `/${parent}/:parent_id/${resource}`,
       resource,
-      resource,
+      `${parent}/${resource}`,
       "create_form",
       create,
       before_filter,
@@ -66,7 +66,7 @@ const routeNestedCollection = (adapter, parent, resource, handler) => {
       "PUT",
       `/${resource}/:id`,
       resource,
-      resource,
+      `${parent}/${resource}`,
       "update",
       update,
       before_filter,
@@ -76,7 +76,7 @@ const routeNestedCollection = (adapter, parent, resource, handler) => {
       "DELETE",
       `/${resource}/:id`,
       resource,
-      resource,
+      `${parent}/${resource}`,
       "destroy",
       destroy,
       before_filter,

package/src/routePages.js

@@ -23,7 +23,7 @@ function routePages(adapter) {
   routeNestedCollection(
     adapter,
     "pages",
-    "page_translations",
+    "translations",
     PageTranslationsHandler
   );
   routeNestedCollection(
@@ -65,18 +65,18 @@ function routePages(adapter) {
   routeNestedCollection(
     adapter,
     "page_revisions",
-    "page_lock",
+    "locks",
     PageRevisionsLockHandler
   );
   routeNestedCollection(
     adapter,
     "page_revisions",
-    "page_unlock",
+    "unlocks",
     PageRevisionsUnlockHandler
   );
   routeNestedCollection(adapter, "pages", "clones", PageCloneHandler);
-  routeNestedCollection(adapter, "pages", "page_urls", PageURLsHandler);
-  routeNestedCollection(adapter, "pages", "page_deletes", PageDeleteHandler);
+  routeNestedCollection(adapter, "pages", "urls", PageURLsHandler);
+  routeNestedCollection(adapter, "pages", "deletes", PageDeleteHandler);
   routeNestedCollection(
     adapter,
     "pages",
@@ -86,7 +86,7 @@ function routePages(adapter) {
   routeNestedCollection(
     adapter,
     "page_revisions",
-    "page_publish",
+    "publishes",
     PublishPageRevisionHandler
   );
   routeNestedMember(

package/src/setupCloud.js

@@ -3,12 +3,7 @@ import Settings from "./cloud/Settings";
 import Tags from "./cloud/Tags";
 import Pages from "./cloud/Pages";
 import PageRevisions from "./cloud/PageRevisions";
-import PageTranslations from "./cloud/PageTranslations";
 import PageChanges from "./cloud/PageChanges";
-import ClonePage from "./cloud/ClonePage";
-import DeletePage from "./cloud/DeletePage";
-import ChangePageURL from "./cloud/ChangePageURL";
-import RevertPageRevision from "./cloud/RevertPageRevision";
 
 function setupCloud(ctx, getConfig) {
   if (!ctx?.authentication?.token) return;
@@ -23,21 +18,7 @@ function setupCloud(ctx, getConfig) {
     getConfig,
     ctx.authentication.token
   );
-  ctx.client.pageTranslations = new PageTranslations(
-    getConfig,
-    ctx.authentication.token
-  );
   ctx.client.pageChanges = new PageChanges(getConfig, ctx.authentication.token);
-  ctx.client.clonePage = new ClonePage(getConfig, ctx.authentication.token);
-  ctx.client.deletePage = new DeletePage(getConfig, ctx.authentication.token);
-  ctx.client.changePageURL = new ChangePageURL(
-    getConfig,
-    ctx.authentication.token
-  );
-  ctx.client.revertPageRevision = new RevertPageRevision(
-    getConfig,
-    ctx.authentication.token
-  );
 }
 
 export default setupCloud;

package/src/tests/routeNestedCollection.test.js

@@ -37,7 +37,7 @@ describe("routeNestedCollection", () => {
         "GET",
         "/orders/:parent_id/line_items",
         "line_items",
-        "line_items",
+        "orders/line_items",
         "index",
         OrdersHandler.index,
       ],
@@ -45,7 +45,7 @@ describe("routeNestedCollection", () => {
         "GET",
         "/orders/:parent_id/line_items/new",
         "line_items",
-        "line_items",
+        "orders/line_items",
         "create_form",
         OrdersHandler.create_form,
       ],
@@ -53,7 +53,7 @@ describe("routeNestedCollection", () => {
         "GET",
         "/line_items/:id",
         "line_items",
-        "line_items",
+        "orders/line_items",
         "show",
         OrdersHandler.show,
       ],
@@ -61,7 +61,7 @@ describe("routeNestedCollection", () => {
         "GET",
         "/line_items/:id/edit",
         "line_items",
-        "line_items",
+        "orders/line_items",
         "edit_form",
         OrdersHandler.edit_form,
       ],
@@ -69,7 +69,7 @@ describe("routeNestedCollection", () => {
         "POST",
         "/orders/:parent_id/line_items",
         "line_items",
-        "line_items",
+        "orders/line_items",
         "create_form",
         OrdersHandler.create,
       ],
@@ -77,7 +77,7 @@ describe("routeNestedCollection", () => {
         "PUT",
         "/line_items/:id",
         "line_items",
-        "line_items",
+        "orders/line_items",
         "update",
         OrdersHandler.update,
       ],
@@ -85,7 +85,7 @@ describe("routeNestedCollection", () => {
         "DELETE",
         "/line_items/:id",
         "line_items",
-        "line_items",
+        "orders/line_items",
         "destroy",
         OrdersHandler.destroy,
       ],
@@ -105,7 +105,7 @@ describe("routeNestedCollection", () => {
         "GET",
         "/orders/:parent_id/line_items",
         "line_items",
-        "line_items",
+        "orders/line_items",
         "index",
         OrdersHandlerWithFilters.index,
         OrdersHandlerWithFilters.before_filter,
@@ -115,7 +115,7 @@ describe("routeNestedCollection", () => {
         "GET",
         "/orders/:parent_id/line_items/new",
         "line_items",
-        "line_items",
+        "orders/line_items",
         "create_form",
         OrdersHandlerWithFilters.create_form,
         OrdersHandlerWithFilters.before_filter,
@@ -125,7 +125,7 @@ describe("routeNestedCollection", () => {
         "GET",
         "/line_items/:id",
         "line_items",
-        "line_items",
+        "orders/line_items",
         "show",
         OrdersHandlerWithFilters.show,
         OrdersHandlerWithFilters.before_filter,
@@ -135,7 +135,7 @@ describe("routeNestedCollection", () => {
         "GET",
         "/line_items/:id/edit",
         "line_items",
-        "line_items",
+        "orders/line_items",
         "edit_form",
         OrdersHandlerWithFilters.edit_form,
         OrdersHandlerWithFilters.before_filter,
@@ -145,7 +145,7 @@ describe("routeNestedCollection", () => {
         "POST",
         "/orders/:parent_id/line_items",
         "line_items",
-        "line_items",
+        "orders/line_items",
         "create_form",
         OrdersHandlerWithFilters.create,
         OrdersHandlerWithFilters.before_filter,
@@ -155,7 +155,7 @@ describe("routeNestedCollection", () => {
         "PUT",
         "/line_items/:id",
         "line_items",
-        "line_items",
+        "orders/line_items",
         "update",
         OrdersHandlerWithFilters.update,
         OrdersHandlerWithFilters.before_filter,
@@ -165,7 +165,7 @@ describe("routeNestedCollection", () => {
         "DELETE",
         "/line_items/:id",
         "line_items",
-        "line_items",
+        "orders/line_items",
         "destroy",
         OrdersHandlerWithFilters.destroy,
         OrdersHandlerWithFilters.before_filter,

package/src/views/{page_lock → page_revisions/locks}/create_form.ejs

@@ -6,7 +6,7 @@
   <div class="grid gap-4 md:grid-cols-3">
     <div>
       <% form_for({ lock_settings }, errors, (f) => { %>
-      <form action="<%= `/${_context.locale}/page_revisions/${lock_settings.revision.id}/page_lock` %>" method="POST" class="form">
+      <form action="<%= `/${_context.locale}/page_revisions/${lock_settings.revision.id}/locks` %>" method="POST" class="form">
         <%- f.field('lock_settings.message', { as: 'textarea', label: 'Lock Message', required: true }) %>
         <div class="form-actions">
           <div class="btn-toolbar">
@@ -32,4 +32,4 @@
       </div>
     </div>
   </div>
-</div>
+</div>

package/src/views/{page_publish → page_revisions/publishes}/_form.ejs

@@ -1,5 +1,5 @@
 <% form_for({ publishing }, errors, (f) => { %>
-<form action="<%= `/${_context.locale}/page_revisions/${publishing.id}/page_publish` %>" method="post" class="form">
+<form action="<%= `/${_context.locale}/page_revisions/${publishing.id}/publishes` %>" method="post" class="form">
   <%- f.field('publishing.title'), { required: true } %>
   <%- f.field('publishing.description', { as: "textarea" }) %>
   <%- f.field('publishing.visibility', { as: 'select', required: true, options: visibilityOptions }) %>

package/src/views/page_revisions/publishes/create_form.ejs

@@ -0,0 +1,10 @@
+<div class="page-wrapper">
+  <div class="page-title">
+    <h1 class="heading-1">Publish revision</h1>
+  </div>
+
+  <div class="grid gap-4 md:grid-cols-3">
+    <%- include('_form.ejs') %>
+  </div>
+</div>
+

package/src/views/{page_deletes → pages/deletes}/create_form.ejs

@@ -6,7 +6,7 @@
   <div class="grid gap-4 md:grid-cols-3">
     <div>
       <% form_for({ deleteAction }, errors, (f) => { %>
-      <form action="<%= `/${_context.locale}/pages/${deleteAction.id}/page_deletes` %>" method="POST" class="form">
+      <form action="<%= `/${_context.locale}/pages/${deleteAction.id}/deletes` %>" method="POST" class="form">
         <%- f.field('deleteAction.redirect', { as: 'select', required: true,options: [['301', 'Redirect to another page'], ['404', 'Return 404'],['410', 'Return 410']] }) %>
         <%- f.field('deleteAction.destination', {label: 'Destination URL', required: true}) %>
 
@@ -52,4 +52,4 @@
   })
 
   document.getElementById("f_redirect").addEventListener("change", onDestinationChange)
-</script>
+</script>

package/src/views/pages/index.ejs

@@ -102,7 +102,7 @@
               <img title="<%= name %>" src="<%= flag %>" alt="<%= name %>" class="size-6 rounded-full border dark:border-neutral-700" />
             </a>
             <% } else { %>
-            <a href="<%= `/${_context.locale}/pages/${item.id}/page_translations/new?target_locale=${key}` %>">
+            <a href="<%= `/${_context.locale}/pages/${item.id}/translations/new?target_locale=${key}` %>">
               <img title="<%= name %>" src="<%= flag %>" alt="<%= name %>" class="<%= [" transition-all ease-in-out duration-300 size-6 rounded-full border hover:opacity-100 dark:border-neutral-700", key === _context.locale ? "opacity-100" : "opacity-10"].join(" ") %>" />
             </a>
             <% } %>
@@ -158,4 +158,4 @@
   searchToggle.addEventListener('click', () => {
     sidebar.classList.toggle('hidden');
   });
-</script>
+</script>

package/src/views/pages/show.ejs

@@ -12,7 +12,7 @@
           <img title="<%= name %>" src="<%= flag %>" alt="<%= name %>" class="size-6 rounded-full border dark:border-neutral-700" />
         </a>
         <% } else { %>
-        <a href="<%= `/${_context.locale}/pages/${page.id}/page_translations/new?target_locale=${key}` %>">
+        <a href="<%= `/${_context.locale}/pages/${page.id}/translations/new?target_locale=${key}` %>">
           <img title="<%= name %>" src="<%= flag %>" alt="<%= name %>" class="<%= [" transition-all ease-in-out duration-300 size-6 rounded-full border hover:opacity-100 dark:border-neutral-700", key === _context.locale ? "opacity-100" : "opacity-10"].join(" ") %>" />
         </a>
         <% } %>
@@ -27,7 +27,7 @@
         </button>
       </form>
 
-      <a href="<%= `/${_context.locale}/pages/${page.id}/page_urls/new` %>" class="btn-text has-icon">
+      <a href="<%= `/${_context.locale}/pages/${page.id}/urls/new` %>" class="btn-text has-icon">
         <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
           <path stroke-linecap="round" stroke-linejoin="round" d="M13.19 8.688a4.5 4.5 0 0 1 1.242 7.244l-4.5 4.5a4.5 4.5 0 0 1-6.364-6.364l1.757-1.757m13.35-.622 1.757-1.757a4.5 4.5 0 0 0-6.364-6.364l-4.5 4.5a4.5 4.5 0 0 0 1.242 7.244" />
         </svg>
@@ -45,7 +45,7 @@
         </button>
       </form>
 
-      <a href="<%= `/${_context.locale}/pages/${page.id}/page_deletes/new` %>" class="btn-danger has-icon">
+      <a href="<%= `/${_context.locale}/pages/${page.id}/deletes/new` %>" class="btn-danger has-icon">
         <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
           <path stroke-linecap="round" stroke-linejoin="round" d="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0" />
         </svg>
@@ -125,7 +125,7 @@
                 Edit content
               </a>
 
-              <a href="<%= `/${_context.locale}/page_revisions/${revision.id}/page_publish/new` %>" class="btn-text has-icon <%= revision.meta && revision.meta.locked ? 'cursor-not-allowed text-gray-400 pointer-events-none' : '' %>">
+              <a href="<%= `/${_context.locale}/page_revisions/${revision.id}/publishes/new` %>" class="btn-text has-icon <%= revision.meta && revision.meta.locked ? 'cursor-not-allowed text-gray-400 pointer-events-none' : '' %>">
                 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
                   <path stroke-linecap="round" stroke-linejoin="round" d="M15.59 14.37a6 6 0 0 1-5.84 7.38v-4.8m5.84-2.58a14.98 14.98 0 0 0 6.16-12.12A14.98 14.98 0 0 0 9.631 8.41m5.96 5.96a14.926 14.926 0 0 1-5.841 2.58m-.119-8.54a6 6 0 0 0-7.381 5.84h4.8m2.581-5.84a14.927 14.927 0 0 0-2.58 5.84m2.699 2.7c-.103.021-.207.041-.311.06a15.09 15.09 0 0 1-2.448-2.448 14.9 14.9 0 0 1 .06-.312m-2.24 2.39a4.493 4.493 0 0 0-1.757 4.306 4.493 4.493 0 0 0 4.306-1.758M16.5 9a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0Z" />
                 </svg>
@@ -160,14 +160,14 @@
                   </a>
 
                   <% if (revision.meta && revision.meta.locked) { %>
-                  <form action="<%= `/${_context.locale}/page_revisions/${revision.id}/page_unlock` %>" method="post" class="inline-flex gap-2 items-center">
+                  <form action="<%= `/${_context.locale}/page_revisions/${revision.id}/unlocks` %>" method="post" class="inline-flex gap-2 items-center">
                     <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
                       <path stroke-linecap="round" stroke-linejoin="round" d="M13.5 10.5V6.75a4.5 4.5 0 1 1 9 0v3.75M3.75 21.75h10.5a2.25 2.25 0 0 0 2.25-2.25v-6.75a2.25 2.25 0 0 0-2.25-2.25H3.75a2.25 2.25 0 0 0-2.25 2.25v6.75a2.25 2.25 0 0 0 2.25 2.25Z" />
                     </svg>
                     <%- f.submit('Unlock', { class: 'btn-text' }) %>
                   </form>
                   <% } else { %>
-                  <a href="<%= `/${_context.locale}/page_revisions/${revision.id}/page_lock/new` %>" class="btn-text has-icon">
+                  <a href="<%= `/${_context.locale}/page_revisions/${revision.id}/locks/new` %>" class="btn-text has-icon">
                     <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
                       <path stroke-linecap="round" stroke-linejoin="round" d="M16.5 10.5V6.75a4.5 4.5 0 1 0-9 0v3.75m-.75 11.25h10.5a2.25 2.25 0 0 0 2.25-2.25v-6.75a2.25 2.25 0 0 0-2.25-2.25H6.75a2.25 2.25 0 0 0-2.25 2.25v6.75a2.25 2.25 0 0 0 2.25 2.25Z" />
                     </svg>
@@ -278,4 +278,4 @@
       </tbody>
     </table>
   </div>
-</div>
+</div>

package/src/views/{page_translations → pages/translations}/_form.ejs

@@ -1,5 +1,5 @@
 <% form_for({ translation }, errors, (f) => { %>
-<form action="<%= `/${_context.locale}/pages/${page.id}/page_translations` %>" method="post" class="form">
+<form action="<%= `/${_context.locale}/pages/${page.id}/translations` %>" method="post" class="form">
   <input type="hidden" name="target_locale" value="<%= targetLocale %>" />
 
   <%- f.field('translation.title', { required: true }) %>
@@ -73,4 +73,4 @@
   })
 
   document.getElementById("f_visibility").addEventListener("change", onVisibilityChange)
-</script>
+</script>

package/src/views/{page_urls → pages/urls}/create_form.ejs

@@ -5,7 +5,7 @@
 
   <div class="grid gap-4 md:grid-cols-3">
     <% form_for({ change }, errors, (f) => { %>
-    <form action="<%= `/${_context.locale}/pages/${change.id}/page_urls` %>" method="post" class="form">
+    <form action="<%= `/${_context.locale}/pages/${change.id}/urls` %>" method="post" class="form">
       <%- f.field('change.slug', { label: "URL", required: true }) %>
       <%- f.field('change.redirect', { as: "checkbox", value: "1", label: "Create 301 redirect for the old URL" }) %>
 
@@ -28,4 +28,4 @@
       </div>
     </div>
   </div>
-</div>
+</div>

package/src/cloud/ChangePageURL.js

@@ -1,24 +0,0 @@
-import RaketaClient from "./RaketaClient";
-import { ChangePageSlugDocument } from "./documents/pagesDocuments";
-
-export default class ChangePageURL extends RaketaClient {
-  async update(id, slug, locale, redirect) {
-    const input = {
-      id,
-      slug,
-      locale,
-    };
-
-    if (redirect) {
-      input.redirect = redirect;
-    }
-
-    const {
-      changePageSlug: { errors, page },
-    } = await this.query(ChangePageSlugDocument, {
-      input,
-    });
-
-    return { page, errors };
-  }
-}

package/src/cloud/ClonePage.js

@@ -1,14 +0,0 @@
-import RaketaClient from "./RaketaClient";
-import { ClonePageDocument } from "./documents/pagesDocuments";
-
-export default class ClonePage extends RaketaClient {
-  async clone(id, locale) {
-    const {
-      clonePage: { errors, page },
-    } = await this.query(ClonePageDocument, {
-      input: { id: id, locale: locale },
-    });
-
-    return { page, errors };
-  }
-}

package/src/cloud/DeletePage.js

@@ -1,35 +0,0 @@
-import RaketaClient from "./RaketaClient";
-import {
-  DeletePageDocument,
-  PageByIdDocument,
-} from "./documents/pagesDocuments";
-
-export default class DeletePage extends RaketaClient {
-  async find(id, locale) {
-    const { page: item } = await this.query(PageByIdDocument, {
-      input: {
-        id,
-        locale,
-      },
-    });
-
-    return item;
-  }
-
-  async delete(id, locale, redirect) {
-    const input = {
-      id,
-      locale,
-    };
-
-    if (redirect) {
-      input.redirect = redirect;
-    }
-
-    const {
-      deletePage: { errors, page },
-    } = await this.query(DeletePageDocument, { input });
-
-    return { page, errors };
-  }
-}

package/src/cloud/PageTranslations.js

@@ -1,22 +0,0 @@
-import RaketaClient from "./RaketaClient";
-import { TranslatePageDocument } from "./documents/pagesDocuments";
-
-export default class PageTranslations extends RaketaClient {
-  async create(locale, sourcePageId, params) {
-    console.log(params);
-    params.widgets = JSON.stringify(params.widgets);
-    params.settings = JSON.stringify(params.settings);
-    console.log(params);
-    const {
-      translatePage: { errors, page },
-    } = await this.query(TranslatePageDocument, {
-      input: {
-        locale,
-        sourcePageId,
-        page: params,
-      },
-    });
-
-    return { page, errors };
-  }
-}

package/src/cloud/RevertPageRevision.js

@@ -1,18 +0,0 @@
-import RaketaClient from "./RaketaClient";
-import { ReopenPageChangeDocument } from "./documents/pagesDocuments";
-
-export default class RevertPageRevision extends RaketaClient {
-  async create(pageId, version, locale) {
-    const {
-      reopenPageChange: { revision, errors, pageErrors },
-    } = await this.query(ReopenPageChangeDocument, {
-      input: {
-        pageId,
-        locale,
-        version,
-      },
-    });
-
-    return { revision, errors, pageErrors };
-  }
-}

package/src/views/page_publish/create_form.ejs

@@ -1,11 +0,0 @@
-<div class="flex w-full">
-  <div class="flex items-center justify-between mt-6 mb-4">
-    <div class="flex items-center gap-2">
-      <h1 class="heading-1">Publish revision</h1>
-    </div>
-  </div>
-</div>
-
-<div class="grid gap-4 md:grid-cols-3">
-  <%- include('_form.ejs') %>
-</div>