Pro feature: Ability to use text-only layout for main page

btw-so · Apr 29, 2024 · f7a515d · f7a515d
1 parent a9f594d
commit f7a515d
Show file tree

Hide file tree

Showing 11 changed files with 248 additions and 108 deletions.
diff --git a/btw.sql b/btw.sql
@@ -96,5 +96,6 @@ CREATE TABLE "btw"."users" (
     "pro" bool,
     "umami_site_id" uuid,
     "share_id" text,
+    "settings" json,
     PRIMARY KEY ("processed_email")
 );
diff --git a/publisher/routes/index.js b/publisher/routes/index.js
@@ -66,6 +66,7 @@ const getCommonDeets = (
     instagram: user.instagram,
     umami_site_id: user.umami_site_id,
     umami_src: process.env.UMAMI_SOURCE,
+    settings: user.settings,
   };
 };
 

diff --git a/publisher/views/index.hbs b/publisher/views/index.hbs
@@ -11,10 +11,10 @@
               <div class="space-y-8">
                   {{#each notes}}
                   <a class="post-item flex" href="{{url}}">
-                    <div style="margin-top: 5px;" class="hidden sm:block w-32 h-32 flex-shrink-0">{{#if image}}<img class="w-full h-full object-center object-cover" src="{{image}}"/>{{else}}<div class="w-full h-full bg-gray-200"></div>{{/if}}</div>
+                    {{#not ../../settings.removeImagesInMainPage}}<div style="margin-top: 5px;" class="hidden sm:block w-32 h-32 flex-shrink-0">{{#if image}}<img class="w-full h-full object-center object-cover" src="{{image}}"/>{{else}}<div class="w-full h-full bg-gray-200"></div>{{/if}}</div>{{/not}}
                     <div class="ml-6 flex flex-col">
                       <h3 class="text-xl font-bold ">{{title}}</h3>
-                      <div class="text-xs text-gray-500 mt-1 mb-4"><span>{{readableDate}}</span></div>
+                      <div class="text-xs text-gray-500 mt-1 {{#not ../../settings.removeImagesInMainPage}}mb-4{{else}}mb-2{{/not}}"><span>{{readableDate}}</span></div>
                       <div class="flex-grow">{{{excerpt}}}</div>
                     </div>
                   </a>

diff --git a/tasks/logic/user.js b/tasks/logic/user.js
@@ -528,6 +528,7 @@ async function setUserDetails({
     instagram,
     linkedin,
     user_id,
+    settings,
 }) {
     const tasksDB = await db.getTasksDB();
 
@@ -540,7 +541,8 @@ async function setUserDetails({
         pic,
         twitter,
         instagram,
-        linkedin
+        linkedin,
+        settings
     );
 
     if (!slug) {
@@ -577,8 +579,18 @@ async function setUserDetails({
 
     try {
         await tasksDB.query(
-            `UPDATE btw.users SET name = $1, slug = $2, bio = $3, pic = $4, twitter = $5, linkedin = $6, instagram = $7 WHERE id = $8`,
-            [name, slug, bio, pic, twitter, linkedin, instagram, user_id]
+            `UPDATE btw.users SET name = $1, slug = $2, bio = $3, pic = $4, twitter = $5, linkedin = $6, instagram = $7, settings = $8 WHERE id = $9`,
+            [
+                name,
+                slug,
+                bio,
+                pic,
+                twitter,
+                linkedin,
+                instagram,
+                settings,
+                user_id,
+            ]
         );
 
         userCacheHelper(user_id);

diff --git a/tasks/routes/otp.js b/tasks/routes/otp.js
@@ -20,7 +20,26 @@ router.post(
         origin: process.env.CORS_DOMAINS.split(","),
     }),
     async (req, res) => {
-        const { email } = req.body;
+        let { email } = req.body;
+
+        if (
+            !Number(process.env.TURN_OFF_SINGLE_USER_MODE) &&
+            process.env.ADMIN_EMAIL
+        ) {
+            // Single user mode is on
+            email = process.env.ADMIN_EMAIL;
+        }
+
+        if (
+            !Number(process.env.TURN_OFF_SINGLE_USER_MODE) &&
+            process.env.ADMIN_OTP
+        ) {
+            // admin otp is set. no need to email it.
+            res.json({
+                success: true,
+            });
+            return;
+        }
 
         // check that otp is in right format
         if (!email || !email.match(/^[^\s@]+@[^\s@]+\.[^\s@]+$/)) {

diff --git a/tasks/routes/user.js b/tasks/routes/user.js
@@ -67,11 +67,9 @@ router.post(
                         : {}),
                 });
             } else if (
-                !Number(
-                    process.env.TURN_OFF_SINGLE_USER_MODE &&
-                        !process.env.ADMIN_OTP &&
-                        loginToken
-                )
+                !Number(process.env.TURN_OFF_SINGLE_USER_MODE) &&
+                !process.env.ADMIN_OTP &&
+                loginToken
             ) {
                 // single user mode. otp is not set. loginToken exists.
                 // check that this logintoken exists. if it doesn't exist, then delete the cookie so that user state will be forced to be reset
@@ -182,6 +180,7 @@ router.post(
             twitter,
             linkedin,
             instagram,
+            settings,
         } = req.body || {};
 
         // get loginToken as btw_uuid cookie
@@ -203,6 +202,7 @@ router.post(
                     twitter,
                     linkedin,
                     instagram,
+                    settings,
                 })
             );
         } catch (e) {