fix(Album View): Move header below and condense

danactive · Jun 30, 2020 · aaf35f0 · aaf35f0
1 parent 1f24e07
commit aaf35f0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/ui/app/components/PhotoHeader/index.jsx b/ui/app/components/PhotoHeader/index.jsx
@@ -1,11 +1,13 @@
 import React from 'react';
 
 function titleCase(str) {
-  return str
-    .toLowerCase()
-    .split(' ')
-    .map(word => word.charAt(0).toUpperCase() + word.slice(1))
-    .join(' ');
+  return decodeURI(
+    str
+      .toLowerCase()
+      .split(' ')
+      .map(word => word.charAt(0).toUpperCase() + word.slice(1))
+      .join(' '),
+  );
 }
 
 function LinkToReference({ reference } = {}) {
@@ -37,14 +39,12 @@ function LinkToReference({ reference } = {}) {
 function PhotoHeader({ currentMemory }) {
   if (!currentMemory || currentMemory === null) return null;
 
-  const { city, description, location, reference } = currentMemory;
+  const { city, location, reference } = currentMemory;
 
   return [
-    <h1 key="headerCity">{city}</h1>,
-    <h2 key="headerLocation">{location}</h2>,
-    <p key="headerDescription">{description}</p>,
-    <p key="reference">
-      <LinkToReference reference={reference} />
+    <h4 key="headerCity">{city}</h4>,
+    <p key="headerLocation">
+      {location} <LinkToReference reference={reference} />
     </p>,
   ];
 }

diff --git a/ui/app/containers/AlbumViewPage/index.jsx b/ui/app/containers/AlbumViewPage/index.jsx
@@ -84,11 +84,8 @@ function AlbumViewPage({
       <Helmet>
         <title>{`${albumName}  Album`}</title>
       </Helmet>
-
-      <PhotoHeader currentMemory={currentMemory} />
-
       <SplitScreen currentMemory={currentMemory} memories={memories} />
-
+      <PhotoHeader currentMemory={currentMemory} />
       <InfiniteThumbs
         error={albumError}
         items={memories}