Add sslOnlyMiddleware to the Foundation

config/settings.yml

@@ -35,5 +35,4 @@ title: 00dani.me
 app-name: lebd
 username: dani
 repository: https://gitlab.com/00dani/lebd
-#analytics: UA-YOURCODE
 fb-app-id: "_env:FB_APP_ID:142105433189339"

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "lebd",
-  "version": "1.6.0",
+  "version": "1.6.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lebd",
-  "version": "1.6.0",
+  "version": "1.6.4",
   "description": "the codebase backing 00dani.me, an indieweb.org site",
   "repository": {
     "type": "git",

package.yaml

@@ -1,5 +1,5 @@
 name:    lebd
-version: "1.6.0"
+version: "1.6.4"
 
 dependencies:
 

src/Foundation.hs

@@ -67,6 +67,9 @@ mkYesodData "App" $(parseRoutesFile "config/routes")
 -- | A convenient synonym for creating forms.
 type Form x = Html -> MForm (HandlerT App IO) (FormResult x, Widget)
 
+sessionLifetime :: Int
+sessionLifetime = 120 -- minutes
+
 -- Please see the documentation for the Yesod typeclass. There are a number
 -- of settings which can be configured by overriding methods here.
 instance Yesod App where
@@ -77,7 +80,7 @@ instance Yesod App where
     -- Store session data on the client in encrypted cookies,
     -- default session idle timeout is 120 minutes
     makeSessionBackend _ = sslOnlySessions . strictSameSiteSessions $ Just <$> defaultClientSessionBackend
-        120    -- timeout in minutes
+        sessionLifetime
         "config/client_session_key.aes"
 
     -- Redirect static requests to a subdomain - this is recommended for best
@@ -97,7 +100,7 @@ instance Yesod App where
     --   b) Validates that incoming write requests include that token in either a header or POST parameter.
     -- To add it, chain it together with the defaultMiddleware: yesodMiddleware = defaultYesodMiddleware . defaultCsrfMiddleware
     -- For details, see the CSRF documentation in the Yesod.Core.Handler module of the yesod-core package.
-    yesodMiddleware = defaultYesodMiddleware . defaultCsrfMiddleware
+    yesodMiddleware = defaultYesodMiddleware . defaultCsrfMiddleware . sslOnlyMiddleware sessionLifetime
 
     defaultLayout widget = do
         master <- getYesod

src/Handler/Categories.hs

@@ -8,12 +8,15 @@ import Database.Esqueleto
 import Widget.Feed ( hFeed )
 import Model.Category ( Category, asTag )
 
+import qualified Data.Text as T
+
 getCategoryR :: Category -> Handler Html
 getCategoryR tag = do
+    title <- asks $ siteTitle . appSettings
     entries <- runDB . select . from $ \(entry `InnerJoin` category) -> do
         on $ entry ^. EntryId ==. category ^. EntryCategoryEntryId
         where_ $ category ^. EntryCategoryCategory ==. val tag
         return entry
     defaultLayout $ do
         setTitle . toHtml . asTag $ tag
-        hFeed entries
+        T.concat [asTag tag, " ~ ", title] `hFeed` entries

src/Handler/Entries.hs

@@ -20,10 +20,11 @@ getEntriesR :: K.EntryKind -> Handler Html
 getEntriesR kind = do
     entries <- runDB $ selectList [EntryKind ==. kind] [Desc EntryPublished]
     title <- asks $ siteTitle . appSettings
+    let myTitle = T.concat [K.pluralise kind, " ~ ", title]
     defaultLayout $ do
         setTitle . toHtml . K.pluralise $ kind
-        atomLink (FeedKindR kind) $ T.concat [K.pluralise kind, " ~ ", title]
+        FeedKindR kind `atomLink` myTitle
-        hFeed entries
+        hFeed myTitle entries
 
 getEntryR :: a -> EntryId -> Handler Html
 getEntryR _ = renderEntry <=< getCached

src/Settings.hs

@@ -58,11 +58,8 @@ data AppSettings = AppSettings
     , appSkipCombining          :: Bool
     -- ^ Perform no stylesheet/script combining
 
-    -- Example app-specific configuration values.
-    , appAnalytics              :: Maybe Text
-    -- ^ Google Analytics code
     , appFacebookId          :: Maybe Int
-    -- ^ Facebook app ID, also used for analytics.
+    -- ^ Facebook app ID.
 
     , siteTitle                 :: Text
     -- ^ Site-wide title.
@@ -97,7 +94,6 @@ instance FromJSON AppSettings where
         appMutableStatic          <- o .:? "mutable-static"   .!= defaultDev
         appSkipCombining          <- o .:? "skip-combining"   .!= defaultDev
 
-        appAnalytics              <- o .:? "analytics"
         appFacebookId             <- o .:? "fb-app-id"
         siteTitle                 <- o .: "title"
         siteUsername              <- o .: "username"

src/Widget/Feed.hs

@@ -4,5 +4,9 @@ module Widget.Feed ( hFeed ) where
 import Import
 import Widget.Entry ( hEntry )
 
-hFeed :: [Entity Entry] -> Widget
+import qualified Data.Text as T
-hFeed entries = $(widgetFile "mf2/h-feed")
+
+hFeed :: T.Text -> [Entity Entry] -> Widget
+hFeed name entries = do
+    mroute <- getCurrentRoute
+    $(widgetFile "mf2/h-feed")

templates/default-layout-wrapper.hamlet

@@ -25,14 +25,3 @@ $doctype 5
     <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous">
     <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous">
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous">
-    $maybe analytics <- appAnalytics $ appSettings master
-      <script>
-        if(!window.location.href.match(/localhost/)){
-            (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-            (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-            })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-            ga('create', '#{analytics}', 'auto');
-            ga('send', 'pageview');
-        }

templates/default-layout.cassius

@@ -7,6 +7,13 @@ a
     text-decoration: none
     line-height: 1
 
+code, kbd, pre, samp
+  font-family: Monoid, Hack, Inconsolata, Menlo, Monaco, Consolas, "Liberation Mono", monospace
+code, pre
+  color: #cccccc
+code
+  background-color: #141414
+
 body
   background-color: #1d1f21
   color: #c9cacc

templates/default-layout.hamlet

@@ -1,5 +1,5 @@
 <header>
-    <nav .navbar .navbar-expand-lg .navbar-dark.bg-dark>
+    <nav .navbar .navbar-expand-md .navbar-dark.bg-dark>
         <a .navbar-brand rel="home" href=@{HomeR}>#{siteTitle $ appSettings master}
         <button type="button" .navbar-toggler data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar" aria-label="Toggle navigation">
             <span .navbar-toggler-icon>

templates/home.cassius

@@ -2,7 +2,7 @@ body > main
   display: flex
   flex-direction: column
   align-items: center
-  > ol.h-feed
+  > div.h-feed
     flex: 1
     margin-bottom: 0
   > aside.author
@@ -16,7 +16,7 @@ body > main
   body > main
     flex-direction: row-reverse
     align-items: unset
-    > ol.h-feed
+    > div.h-feed
       margin-right: 2em
     > aside.author
       margin-bottom: 0

templates/home.hamlet

@@ -1,2 +1,2 @@
 <aside .author>^{hCard user}
-^{hFeed entries}
+^{hFeed title entries}

templates/mf2/h-feed.cassius

@@ -1,5 +1,5 @@
-ol.h-feed
+div.h-feed
-  list-style: none
+  > ol.list-unstyled
-  padding-left: 0
+    margin-bottom: 0
-  > li:not(:last-child)
+    > li:not(:last-child)
-    margin-bottom: 1em
+      margin-bottom: 1em

templates/mf2/h-feed.hamlet

@@ -1,3 +1,7 @@
-<ol .h-feed>
+<div .h-feed>
-  $forall entry <- entries
+  <span .p-name hidden>#{name}
-    <li>^{hEntry entry}
+  $maybe route <- mroute
+    <a .u-url href=@{route} hidden>
+  <ol .list-unstyled>
+    $forall entry <- entries
+      <li>^{hEntry entry}