fixed font naming; padding migration; some safe side checks

Author: Rajat Saxena

apps/web/.migrations/02-06-25_10-21-unset-paddings-page.js

@@ -0,0 +1,121 @@
+/**
+ * Run the following script OR use the following MongoDB command:
+ * db.pages.updateMany({}, { $unset: { "layout.$[].settings.horizontalPadding": "", "layout.$[].settings.verticalPadding": "", "draftLayout.$[].settings.horizontalPadding": "", "draftLayout.$[].settings.verticalPadding": "" } })
+ */
+import mongoose from "mongoose";
+import { nanoid } from "nanoid";
+
+function generateUniqueId() {
+    return nanoid();
+}
+
+mongoose.connect(process.env.DB_CONNECTION_STRING, {
+    useNewUrlParser: true,
+    useUnifiedTopology: true,
+});
+
+const WidgetSchema = new mongoose.Schema({
+    widgetId: { type: String, required: true, default: generateUniqueId },
+    name: { type: String, required: true },
+    deleteable: { type: Boolean, required: true, default: true },
+    shared: { type: Boolean, required: true, default: false },
+    settings: mongoose.Schema.Types.Mixed,
+});
+
+const MediaSchema = new mongoose.Schema({
+    mediaId: { type: String, required: true },
+    originalFileName: { type: String, required: true },
+    mimeType: { type: String, required: true },
+    size: { type: Number, required: true },
+    access: { type: String, required: true, enum: ["public", "private"] },
+    thumbnail: String,
+    caption: String,
+    file: String,
+});
+
+const PageSchema = new mongoose.Schema(
+    {
+        domain: { type: mongoose.Schema.Types.ObjectId, required: true },
+        pageId: { type: String, required: true },
+        type: {
+            type: String,
+            required: true,
+            enum: ["product", "site", "blog", "community"],
+            default: "product",
+        },
+        creatorId: { type: String, required: true },
+        name: { type: String, required: true },
+        layout: { type: [WidgetSchema], default: [] },
+        draftLayout: { type: [WidgetSchema], default: [] },
+        entityId: { type: String },
+        deleteable: { type: Boolean, required: true, default: false },
+        title: { type: String },
+        description: String,
+        socialImage: MediaSchema,
+        robotsAllowed: { type: Boolean, default: true },
+        draftTitle: String,
+        draftDescription: String,
+        draftSocialImage: MediaSchema,
+        draftRobotsAllowed: Boolean,
+        deleted: { type: Boolean, default: false },
+    },
+    {
+        timestamps: true,
+    },
+);
+
+PageSchema.index(
+    {
+        domain: 1,
+        pageId: 1,
+    },
+    { unique: true },
+);
+
+const Page = mongoose.model("Page", PageSchema);
+
+const unsetPaddings = async (page) => {
+    console.log(`Unsetting paddings for domain: ${page.domain}`);
+
+    // Update layout widgets
+    if (page.layout && page.layout.length > 0) {
+        page.layout.forEach((widget) => {
+            if (widget.settings) {
+                delete widget.settings.horizontalPadding;
+                delete widget.settings.verticalPadding;
+            }
+        });
+    }
+
+    // Update draftLayout widgets
+    if (page.draftLayout && page.draftLayout.length > 0) {
+        page.draftLayout.forEach((widget) => {
+            if (widget.settings) {
+                delete widget.settings.horizontalPadding;
+                delete widget.settings.verticalPadding;
+            }
+        });
+    }
+
+    page.markModified("layout");
+    page.markModified("draftLayout");
+    await page.save();
+    console.log(`Updated paddings for domain: ${page.domain}\n`);
+};
+
+const migratePaddings = async () => {
+    const pages = await Page.find({});
+    for (const page of pages) {
+        try {
+            await unsetPaddings(page);
+        } catch (error) {
+            console.error(`Error updating paddings for domain: ${page.domain}`);
+            console.error(error);
+        }
+    }
+};
+
+(async () => {
+    await migratePaddings();
+    mongoose.connection.close();
+})();

apps/web/lib/theme-styles.ts

@@ -6,9 +6,16 @@ function formatHSL(hsl: HSL): string {
 }
 
 export function generateThemeStyles(theme: Theme): string {
-    const { colors } = theme.theme;
+    const { colors } = theme?.theme;
+    if (!colors) {
+        return "";
+    }
+
     const lightColors = colors.light;
     const darkColors = colors.dark;
+    if (!lightColors || !darkColors) {
+        return "";
+    }
 
     return `
         :root {

packages/page-primitives/src/themes/classic.ts

@@ -93,93 +93,93 @@ const themeStyles: ThemeStyle = {
     },
     typography: {
         preheader: {
-            fontFamily: "font-sans",
+            fontFamily: "font-inter",
             fontSize: "text-sm",
             fontWeight: "font-medium",
             lineHeight: "leading-normal",
             letterSpacing: "tracking-wide",
             textTransform: "uppercase",
         },
         header1: {
-            fontFamily: "font-sans",
+            fontFamily: "font-inter",
             fontSize: "text-4xl",
             fontWeight: "font-bold",
             lineHeight: "leading-tight",
             letterSpacing: "tracking-tight",
         },
         header2: {
-            fontFamily: "font-sans",
+            fontFamily: "font-inter",
             fontSize: "text-3xl",
             fontWeight: "font-bold",
             lineHeight: "leading-tight",
             letterSpacing: "tracking-tight",
         },
         header3: {
-            fontFamily: "font-sans",
+            fontFamily: "font-inter",
             fontSize: "text-2xl",
             fontWeight: "font-semibold",
             lineHeight: "leading-snug",
             letterSpacing: "tracking-normal",
         },
         header4: {
-            fontFamily: "font-sans",
+            fontFamily: "font-inter",
             fontSize: "text-xl",
             fontWeight: "font-semibold",
             lineHeight: "leading-snug",
             letterSpacing: "tracking-normal",
         },
         subheader1: {
-            fontFamily: "font-sans",
+            fontFamily: "font-inter",
             fontSize: "text-lg",
             fontWeight: "font-medium",
             lineHeight: "leading-relaxed",
             letterSpacing: "tracking-normal",
         },
         subheader2: {
-            fontFamily: "font-sans",
+            fontFamily: "font-inter",
             fontSize: "text-base",
             fontWeight: "font-medium",
             lineHeight: "leading-relaxed",
             letterSpacing: "tracking-normal",
         },
         text1: {
-            fontFamily: "font-sans",
+            fontFamily: "font-inter",
             fontSize: "text-base",
             fontWeight: "font-normal",
             lineHeight: "leading-relaxed",
             letterSpacing: "tracking-normal",
         },
         text2: {
-            fontFamily: "font-sans",
+            fontFamily: "font-inter",
             fontSize: "text-sm",
             fontWeight: "font-normal",
             lineHeight: "leading-relaxed",
             letterSpacing: "tracking-normal",
         },
         caption: {
-            fontFamily: "font-sans",
+            fontFamily: "font-inter",
             fontSize: "text-xs",
             fontWeight: "font-normal",
             lineHeight: "leading-relaxed",
             letterSpacing: "tracking-normal",
         },
         link: {
-            fontFamily: "font-sans",
+            fontFamily: "font-inter",
             fontSize: "text-base",
             fontWeight: "font-normal",
             lineHeight: "leading-relaxed",
             letterSpacing: "tracking-normal",
             textDecoration: "no-underline",
         },
         button: {
-            fontFamily: "font-sans",
+            fontFamily: "font-inter",
             fontSize: "text-base",
             fontWeight: "font-medium",
             lineHeight: "leading-normal",
             letterSpacing: "tracking-normal",
         },
         input: {
-            fontFamily: "font-sans",
+            fontFamily: "font-inter",
             fontSize: "text-sm",
             fontWeight: "font-normal",
             lineHeight: "leading-normal",