@blinkk/root-cms 1.0.0-beta.12 → 1.0.0-beta.14

package/dist/ui/ui.css

@@ -608,9 +608,9 @@
   border: 1px solid #dedede;
   aspect-ratio: 16/9;
   width: 100%;
-  overflow: hidden;
   padding: 10px;
   margin-bottom: 10px;
+  position: relative;
 }
 .DocEditor__ImageField__imagePreview__image img {
   display: block;
@@ -619,6 +619,16 @@
   object-fit: contain;
   object-position: center;
 }
+.DocEditor__ImageField__imagePreview__dimens {
+  position: absolute;
+  top: -1px;
+  right: -1px;
+  padding: 4px 8px;
+  background: black;
+  color: white;
+  font-size: 8px;
+  font-weight: 700;
+}
 .DocEditor__ImageField__imagePreview__image__alt {
   margin-top: 4px;
 }
@@ -823,6 +833,50 @@
   margin-top: 16px;
   max-width: 70ch;
 }
+.ProjectPage__section {
+  margin-top: 60px;
+}
+.ProjectPage__section__title {
+  margin-bottom: 20px;
+}
+.ProjectPage__collectionList {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  gap: 12px;
+  max-width: 580px;
+}
+.ProjectPage__collectionList__collection {
+  display: grid;
+  grid-template-columns: 20px 1fr;
+  align-items: center;
+  padding: 8px 12px;
+  column-gap: 12px;
+  row-gap: 4px;
+  width: 100%;
+  background: transparent;
+  border: 2px solid black;
+  border-radius: 8px;
+  cursor: pointer;
+  font-size: 14px;
+  font-weight: 500;
+  text-decoration: none;
+  transition: background-color 0.18s ease;
+  position: relative;
+}
+.ProjectPage__collectionList__collection:hover {
+  background-color: var(--button-background-hover);
+}
+.ProjectPage__collectionList__collection:active {
+  background-color: var(--button-background-active);
+}
+.ProjectPage__collectionList__collection__icon {
+  margin-top: 2px;
+}
+.ProjectPage__collectionList__collection__desc {
+  grid-column: 2 / span 1;
+  font-size: 12px;
+}
 
 /* ui/pages/NotFoundPage/NotFoundPage.css */
 .NotFoundPage {

package/dist/ui/ui.js

@@ -39866,7 +39866,7 @@ ${content}</tr>
   // package.json
   var package_default = {
     name: "@blinkk/root-cms",
-    version: "1.0.0-beta.12",
+    version: "1.0.0-beta.14",
     author: "s@blinkk.com",
     license: "MIT",
     engines: {
@@ -39917,7 +39917,6 @@ ${content}</tr>
       "cookie-parser": "^1.4.6",
       dotenv: "^16.0.0",
       "dts-dom": "^3.7.0",
-      esbuild: "^0.17.12",
       "firebase-admin": "^11.5.0",
       "js-beautify": "^1.14.7",
       kleur: "^4.1.5",
@@ -39944,6 +39943,7 @@ ${content}</tr>
       "@types/marked": "^4.0.8",
       "@types/node": "^18.11.8",
       concurrently: "^7.6.0",
+      esbuild: "0.17.12",
       firebase: "^9.17.2",
       marked: "^4.2.12",
       preact: "*",
@@ -39956,7 +39956,7 @@ ${content}</tr>
       vitest: "^0.18.1"
     },
     peerDependencies: {
-      "@blinkk/root": "1.0.0-beta.12",
+      "@blinkk/root": "1.0.0-beta.14",
       "firebase-admin": ">=11",
       preact: "*"
     }
@@ -41797,7 +41797,7 @@ ${content}</tr>
         const img2 = await uploadFileToGCS(file);
         props.draft.updateKey(props.deepKey, img2);
         setImg((currentImg) => {
-          return Object.assign({}, img2, { alt: currentImg.alt || "" });
+          return Object.assign({}, img2, { alt: currentImg?.alt || "" });
         });
         setLoading(false);
       } catch (err) {
@@ -41824,14 +41824,17 @@ ${content}</tr>
     }
     return /* @__PURE__ */ o4("div", { className: "DocEditor__ImageField", children: [
       img && img.src ? /* @__PURE__ */ o4("div", { className: "DocEditor__ImageField__imagePreview", children: [
-        /* @__PURE__ */ o4("div", { className: "DocEditor__ImageField__imagePreview__image", children: /* @__PURE__ */ o4(
-          "img",
-          {
-            src: img.gciUrl || img.src,
-            width: img.width,
-            height: img.height
-          }
-        ) }),
+        /* @__PURE__ */ o4("div", { className: "DocEditor__ImageField__imagePreview__image", children: [
+          /* @__PURE__ */ o4(
+            "img",
+            {
+              src: img.gciUrl || img.src,
+              width: img.width,
+              height: img.height
+            }
+          ),
+          /* @__PURE__ */ o4("div", { className: "DocEditor__ImageField__imagePreview__dimens", children: `${img.width}x${img.height}` })
+        ] }),
         /* @__PURE__ */ o4(
           TextInput,
           {
@@ -42459,8 +42462,10 @@ ${content}</tr>
         if (!iframeWindow) {
           return;
         }
-        const currentPath = iframeWindow.location.pathname;
-        setIframeUrl(`${domain2}${currentPath}`);
+        if (!iframeWindow.location.href.startsWith("about:blank")) {
+          const currentPath = iframeWindow.location.pathname;
+          setIframeUrl(`${domain2}${currentPath}`);
+        }
       }
       iframe.addEventListener("load", onIframeLoad);
       return () => {
@@ -42596,9 +42601,37 @@ ${content}</tr>
     return /* @__PURE__ */ o4(Layout, { children: /* @__PURE__ */ o4("div", { className: "ProjectPage", children: [
       /* @__PURE__ */ o4(Heading, { size: "h1", children: "Project Home" }),
       /* @__PURE__ */ o4(Text2, { as: "p", children: "This page is currently under construction, but the current idea is to have collaborative features here, such as a shared whiteboard (e.g. Notion style) that can be used to provide an overview of the project, timelines and milestones, important links (e.g. Figma), etc." }),
-      /* @__PURE__ */ o4(Text2, { as: "p", children: "There should also be a dashboard here that shows upcoming scheduled releases, and maybe common user controls like a share box." })
+      /* @__PURE__ */ o4(Text2, { as: "p", children: "There should also be a dashboard here that shows upcoming scheduled releases, and maybe common user controls like a share box." }),
+      /* @__PURE__ */ o4("div", { className: "ProjectPage__section", children: [
+        /* @__PURE__ */ o4(Heading, { className: "ProjectPage__section__title", size: "h2", children: "Content" }),
+        /* @__PURE__ */ o4(ProjectPage.CollectionList, {})
+      ] })
     ] }) });
   }
+  ProjectPage.CollectionList = () => {
+    const collections = Object.keys(window.__ROOT_CTX.collections).map((id2) => {
+      return {
+        ...window.__ROOT_CTX.collections[id2],
+        id: id2
+      };
+    });
+    return /* @__PURE__ */ o4("div", { className: "ProjectPage__collectionList", children: [
+      collections.map((collection) => /* @__PURE__ */ o4(
+        "a",
+        {
+          className: "ProjectPage__collectionList__collection",
+          href: `/cms/content/${collection.id}`,
+          children: [
+            /* @__PURE__ */ o4("div", { className: "ProjectPage__collectionList__collection__icon", children: /* @__PURE__ */ o4(IconFolder, { size: 20, strokeWidth: "1.75" }) }),
+            /* @__PURE__ */ o4("div", { className: "ProjectPage__collectionList__collection__name", children: collection.name || collection.id }),
+            /* @__PURE__ */ o4("div", { className: "ProjectPage__collectionList__collection__desc", children: collection.description || "" })
+          ]
+        },
+        collection.id
+      )),
+      collections.length === 0 && /* @__PURE__ */ o4("div", { className: "ProjectPage__collectionList__collections__empty", children: "No collections match your query." })
+    ] });
+  };
 
   // ui/pages/NotFoundPage/NotFoundPage.tsx
   function NotFoundPage() {
@@ -42889,7 +42922,7 @@ ${content}</tr>
   function loginRedirect() {
     let originalUrl = window.location.pathname;
     if (window.location.search) {
-      originalUrl = `originalUrl?${window.location.search}`;
+      originalUrl = `${originalUrl}?${window.location.search}`;
     }
     const params = new URLSearchParams({ continue: originalUrl });
     window.location.replace(`/cms/login?${params.toString()}`);
@@ -42907,7 +42940,30 @@ ${content}</tr>
     const root = document.getElementById("root");
     root.innerHTML = "";
     P(/* @__PURE__ */ o4(App, {}), root);
+    updateSession(user);
   });
+  async function updateSession(user) {
+    const idToken = await user.getIdToken();
+    const res = await fetch("/cms/login", {
+      method: "PUT",
+      headers: {
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({ idToken })
+    });
+    if (res.status !== 200) {
+      console.error("login failed");
+      console.log(res);
+      return;
+    }
+    const data = await res.json();
+    if (!data.success) {
+      console.error("login failed");
+      console.log(res);
+      return;
+    }
+    console.log("updated user session");
+  }
 })();
 /*! Bundled license information:
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blinkk/root-cms",
-  "version": "1.0.0-beta.12",
+  "version": "1.0.0-beta.14",
   "author": "s@blinkk.com",
   "license": "MIT",
   "engines": {
@@ -38,7 +38,6 @@
     "cookie-parser": "^1.4.6",
     "dotenv": "^16.0.0",
     "dts-dom": "^3.7.0",
-    "esbuild": "^0.17.12",
     "firebase-admin": "^11.5.0",
     "js-beautify": "^1.14.7",
     "kleur": "^4.1.5",
@@ -49,7 +48,7 @@
   "//": "NOTE(stevenle): due to compat issues with mantine and preact, mantine is pinned to v4.2.12",
   "devDependencies": {
     "@babel/core": "^7.17.9",
-    "@blinkk/root": "1.0.0-beta.12",
+    "@blinkk/root": "1.0.0-beta.14",
     "@emotion/react": "^11.10.5",
     "@firebase/rules-unit-testing": "^2.0.3",
     "@mantine/core": "4.2.12",
@@ -65,6 +64,7 @@
     "@types/marked": "^4.0.8",
     "@types/node": "^18.11.8",
     "concurrently": "^7.6.0",
+    "esbuild": "0.17.12",
     "firebase": "^9.17.2",
     "marked": "^4.2.12",
     "preact": "*",
@@ -77,7 +77,7 @@
     "vitest": "^0.18.1"
   },
   "peerDependencies": {
-    "@blinkk/root": "1.0.0-beta.12",
+    "@blinkk/root": "1.0.0-beta.14",
     "firebase-admin": ">=11",
     "preact": "*"
   },