Patch

Patched not-showing images in articles due to <br /> mishandling.
G-Yachts · Dec 4, 2024 · d948535 · d948535
1 parent ecd7dec
commit d948535
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 33 deletions.
diff --git a/web/actions/articles.ts b/web/actions/articles.ts
@@ -9,7 +9,7 @@ export const fetchArticle = async (id: string, locale: string) => {
   const { data } = await client.query({
     query: gql`
       query Article($id: String!, $locale: LocaleInputType!) {
-        Article(id: $id, locale: $locale) {
+        Article(id: $id, locale: $locale, limit: 0) {
           id
           title
           date

diff --git a/web/components/article/content.tsx b/web/components/article/content.tsx
@@ -19,7 +19,12 @@ export const ContentRenderer = ({
 };
 
 const renderNode = (node: ArticleContentBlock) => {
-  if (node.children.length === 1 && node.children[0].text === "") return <br />;
+  if (
+    node.children.length === 1 &&
+    node.children[0].text === "" &&
+    node.type != "upload"
+  )
+    return <br />;
   switch (node.type) {
     case "h1":
       return <h1>{node.children.map(renderLeaf)}</h1>;

diff --git a/web/components/yachts/yacht/details.tsx b/web/components/yachts/yacht/details.tsx
@@ -235,12 +235,14 @@ const Details = () => {
           }
         >
           <SwitchView props={{ view: "info", label: t("info") }} />
-          {(data.keyFeatures && data.keyFeatures.length > 0) ||
-          (data.customKeyFeatures && data.customKeyFeatures.length > 0) ? (
-            <SwitchView props={{ view: "features", label: t("features") }} />
-          ) : (
-            <></>
-          )}
+          {
+            /*(data.keyFeatures && data.keyFeatures.length > 0) ||*/
+            data.customKeyFeatures && data.customKeyFeatures.length > 0 ? (
+              <SwitchView props={{ view: "features", label: t("features") }} />
+            ) : (
+              <></>
+            )
+          }
           <button
             type={"button"}
             onClick={async () => {
@@ -316,33 +318,12 @@ const Details = () => {
                   ),
               )
             : view === "features" && (
-                <div
-                  className={"w-full grid grid-cols-2 md:grid-cols-3 gap-[2vh]"}
-                >
-                  {characteristics
-                    .filter(
-                      (property) =>
-                        property &&
-                        data.keyFeatures &&
-                        data.keyFeatures.includes(property.key),
-                    )
-                    .map(
-                      (property, i) =>
-                        property && (
-                          <div
-                            key={i}
-                            className={
-                              "flex flex-col justify-center items-start"
-                            }
-                          >
-                            <h3>{property.value}</h3>
-                            <p className={"text-rock-300"}>{property.label}</p>
-                          </div>
-                        ),
-                    )}
+                <div className={"w-full grid grid-cols-1 gap-[2vh]"}>
                   {data.customKeyFeatures &&
                     data.customKeyFeatures.map((customFeature, i) => (
-                      <h3 key={i}>{customFeature}</h3>
+                      <p key={i} className={"text-lg"}>
+                        {customFeature}
+                      </p>
                     ))}
                 </div>
               )}