fix #157

sneljo1 · Nov 16, 2018 · b6ebd03 · b6ebd03
1 parent f983148
commit b6ebd03
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 43 deletions.
diff --git a/src/renderer/_shared/PageHeader/PageHeader.scss b/src/renderer/_shared/PageHeader/PageHeader.scss
@@ -1,5 +1,4 @@
 @import "../../css/bootstrap.imports.scss";
-
 .page-header {
   padding: 20px 20px 15px 40px;
   h2 {
@@ -83,6 +82,7 @@
     }
     h2 {
       color: #fff;
+      user-select: text;
     }
     .header-content {
       position: relative;

diff --git a/src/renderer/_shared/TracksGrid/TrackgridItem/TrackGridItem.scss b/src/renderer/_shared/TracksGrid/TrackgridItem/TrackGridItem.scss
@@ -22,7 +22,6 @@
 .track-grid-item {
   padding: 10px;
   max-width: 260px;
-  margin: 0 auto;
   .trackCount {
     position: absolute;
     top: 0;
@@ -231,12 +230,12 @@
       content: '';
       border-radius: 0 0 .5rem .5rem;
       width: 100%;
-      height: 140%;
+      height: 190%;
       position: absolute;
       z-index: -1;
       left: 0;
       bottom: 0;
-      background: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, .55));
+      background: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, .65));
     }
     .actions-dropdown {
       .bp3-popover-target a {

diff --git a/src/renderer/_shared/TracksGrid/TrackgridItem/TrackGridItem.tsx b/src/renderer/_shared/TracksGrid/TrackgridItem/TrackGridItem.tsx
@@ -140,20 +140,38 @@ class TrackGridItem extends React.Component<AllProps> {
 
         if (!track || !track.user) return null;
 
+        const isLiked = track.type && track.type.indexOf('like') !== -1;
+
         return (
             <div className='trackFooter d-flex justify-content-between align-items-center'>
                 <div className='trackStats'>
                     {
-                        showInfo ? (<div>
-                            <div className='stat'>
-                                <i className='bx bxs-heart' />
-                                <span>{abbreviate_number(track.likes_count)}</span>
-                            </div>
-                            <div className='stat'>
-                                <i className='bx bx-repost' />
-                                <span>{abbreviate_number(track.reposts_count)}</span>
-                            </div>
-                        </div>) : null
+                        showInfo ? (
+                            <>
+                                <div className='stat'>
+                                    <i className='bx bxs-heart' />
+                                    <span>{abbreviate_number(track.likes_count)}</span>
+                                </div>
+                                <div className='stat'>
+                                    <i className='bx bx-repost' />
+                                    <span>{abbreviate_number(track.reposts_count)}</span>
+                                </div>
+                            </>
+                        ) : null
+                    }
+                    {
+                        isLiked && (
+                            <><span className='stat'><i className='bx bxs-heart text-danger' /> Liked</span></>
+                        )
+                    }
+
+                    {
+                        !showInfo && !isLiked && (
+                            <><span className='stat'>
+                                <i className={`bx bx-${track.sharing === 'public' ? 'lock-open' : 'lock'}`} />
+                                {track.sharing === 'public' ? 'Public' : 'Private'}</span>
+                            </>
+                        )
                     }
                 </div>
 
@@ -180,25 +198,6 @@ class TrackGridItem extends React.Component<AllProps> {
 
         const object_url = (track.kind === 'playlist' ? '/playlist/' : '/track/') + track.id;
 
-        // TODO check if liked playlists still work
-        if (track.type && track.type.indexOf('like') !== -1) {
-            return (
-                <div className='trackInfo flex align-items-center'>
-                    <i className='bx bxs-heart' />
-                    <div>
-                        <div className='trackTitle'>
-                            <Link to={object_url}>
-                                <TextShortener text={track.title} />
-                            </Link>
-                        </div>
-                        {
-                            this.renderArtist()
-                        }
-                    </div>
-                </div>
-            );
-        }
-
         return (
             <div className='trackInfo'>
                 <div className='trackTitle'>

diff --git a/src/renderer/pages/artist/ArtistPage.scss b/src/renderer/pages/artist/ArtistPage.scss
@@ -15,6 +15,7 @@
   padding: 30px 30px;
   font-size: .9rem;
   .artistInfo {
+    user-select: text;
     padding: 10px;
   }
 }

diff --git a/src/renderer/pages/track/TrackPage.scss b/src/renderer/pages/track/TrackPage.scss
@@ -18,7 +18,6 @@
 .trackDetails {
   background: #f7f7f7;
   padding-top: 1rem;
-
   .track-info {
     color: #6c757d;
     font-size: 1rem;
@@ -29,19 +28,17 @@
       display: inline-block;
     }
   }
-
   .taglist {
     .badge {
       background: $brand-grey-lighter;
       font-size: .9rem;
       margin-bottom: .2rem
     }
   }
-
-  .trackHeader, .tracktabs {
+  .trackHeader,
+  .tracktabs {
     flex-shrink: 0;
   }
-
   .trackPadding {
     padding: 20px 40px;
   }
@@ -51,25 +48,22 @@
   .track-comments {
     padding: 20px 40px;
   }
-
   .trackDescription {
     color: #3a3e43;
     background: #fbfbfb;
     padding: 2rem;
     border-radius: 1rem;
     margin-bottom: 2rem;
-
+    user-select: text;
     .descriptionInner.cut {
       max-height: 200px;
       overflow: hidden;
     }
-
     &.isOpen {
       max-height: 500px;
     }
   }
   .user_card_wrap {
     flex-grow: 0;
   }
-
-}
+}