changed profile handling

Handler/Profile.hs

@@ -1,13 +1,18 @@
 module Handler.Profile where
 
 import Import
+import Data.Maybe
 
 getProfileR :: UserId -> Handler Html
-getProfileR userId = error "reworking logic" -- do
+getProfileR user = do
---  msu <- lookupSession "id"
+  owner <- runDB $ get user
---  case msu of
+  ownerName <- lift $ pure $ userName $ fromJust owner
---    Just tempUserId -> do
+  userAlbums <- runDB $ selectList [AlbumOwner ==. user] [Desc AlbumTitle]
---      userId <- Key $ PersistInt64 $ fromIntegral tempUserId
+  recentMedia <- (runDB $ selectList [MediumOwner ==. user] [Desc MediumTime])
---      userMedia <- runDB $ selectList [MediumOwner ==. userId] [Desc MediumTime]
+  msu <- lookupSession "userId"
---      defaultLayout $ do
+  case msu of
---        $(widgetFile "profile")
+    Just tempUserId -> do
+      userId <- lift $ pure $ getUserIdFromText tempUserId
+      presence <- lift $ pure $ (Key userId) == user
+      defaultLayout $ do
+        $(widgetFile "profile")

config/models

@@ -12,6 +12,7 @@ Album
     title Text
     owner UserId
     content [MediumId]
+    samplePic MediumId Maybe
     deriving
 Medium
     title Text

templates/profile.hamlet

@@ -1,14 +1,17 @@
 $newline always
-<h3>Profile of #{username}
+<h3>Profile of #{ownerName}
 
-$if msu == (Just username)
+$if null userAlbums
-  Coming soon: create new album
+  This user has no albums yet
-  <br>
-
-$if null userMedia
-  Dieser Benutzer hat noch keine Medien hochgeladen.
 $else
-  Neueste Medien:
+  Albums of this user:
-  $forall (Entity mediaId medium) <- userMedia
+  $forall (Entity albumId album) <- userAlbums
     <div class="thumbnails">
-      <div class="single">
+
+$if null recentMedia
+  This user has not uploaded any images
+$else
+  Newest images:
+  $forall (Entity mediaId medium) <- take 10 recentMedia
+    <div class="thumbnails">
+      <img src=#{mediumPath medium}>