Merge branch 'master' into feat/pagination

merged master into this to avoid databas conflicts when switching between master and feat/pagination
2018-04-12 21:26:13 +02:00 · 2018-04-12 21:26:13 +02:00 · 2a1c805d85
commit 2a1c805d85
parent 796f4d0832 8c427c9e83
13 changed files with 131 additions and 79 deletions
--- a/.gitignore
+++ b/.gitignore
@ -25,6 +25,7 @@ uniworx.nix
 .gup/
 .dbsettings.yml
 *.kate-swp
+.kateproject
 src/Handler/Assist.bak
 src/Handler/Course.SnapCustom.hs
 *.orig
--- a/.kateproject
+++ b/.kateproject
@ -1,4 +0,0 @@
-{
-  "name": "ReWorX"
-, "files": [ { "git": 1, "filters": ["*.hs", "*.hamlet", "*.lucius", "*.cassius", "*.julius"], "recursive": 1 } ]
-}
--- a/fill-db.hs
+++ b/fill-db.hs
@ -12,6 +12,7 @@ import Data.Time

 main :: IO ()
 main = db $ do
+  defaultFavourites <- getsYesod $ appDefaultFavourites . appSettings
  now <- liftIO getCurrentTime
  let
    summer2017 = TermIdentifier 2017 Summer
@ -23,6 +24,7 @@ main = db $ do
    , userMatrikelnummer = Nothing
    , userEmail  = "G.Kleen@campus.lmu.de"
    , userDisplayName = "Gregor Kleen"
+    , userMaxFavourites = 6
    }
  fhamann <- insert User
    { userPlugin = "LDAP"
@ -30,6 +32,7 @@ main = db $ do
    , userMatrikelnummer = Nothing
    , userEmail  = "felix.hamann@campus.lmu.de"
    , userDisplayName = "Felix Hamann"
+    , userMaxFavourites = defaultFavourites
    }
  jost <- insert User
    { userPlugin = "LDAP"
@ -37,6 +40,7 @@ main = db $ do
    , userMatrikelnummer = Nothing
    , userEmail  = "jost@tcs.ifi.lmu.de"
    , userDisplayName = "Steffen Jost"
+    , userMaxFavourites = 14
    }
  void . insert $ Term
    { termName     = summer2017
@ -91,6 +95,9 @@ main = db $ do
    , courseHasRegistration = True
    , courseRegisterFrom = Just now
    , courseRegisterTo = Just ((3600 * 24 * 60) `addUTCTime` now )
+    , courseDeregisterUntil = Nothing
+    , courseRegisterSecret  = Nothing
+    , courseMaterialFree    = True
    }
  insert_ $ CourseEdit jost now ffp
  void . insert $ DegreeCourse ffp sdBsc sdInf
@ -112,6 +119,9 @@ main = db $ do
    , courseHasRegistration = False
    , courseRegisterFrom = Nothing
    , courseRegisterTo = Nothing
+    , courseDeregisterUntil = Nothing
+    , courseRegisterSecret  = Nothing
+    , courseMaterialFree    = True
    }
  insert_ $ CourseEdit fhamann now eip
  void . insert $ DegreeCourse eip sdBsc sdInf
@ -128,6 +138,9 @@ main = db $ do
    , courseHasRegistration = True
    , courseRegisterFrom = Just now
    , courseRegisterTo = Just ((3600 * 24 * 60) `addUTCTime` now )
+    , courseDeregisterUntil = Nothing
+    , courseRegisterSecret  = Nothing
+    , courseMaterialFree    = True
    }
  insert_ $ CourseEdit fhamann now ixd
  void . insert $ DegreeCourse ixd sdBsc sdInf
@ -144,6 +157,9 @@ main = db $ do
    , courseHasRegistration = False
    , courseRegisterFrom = Nothing
    , courseRegisterTo = Nothing
+    , courseDeregisterUntil = Nothing
+    , courseRegisterSecret  = Nothing
+    , courseMaterialFree    = True
    }
  insert_ $ CourseEdit fhamann now ux3
  void . insert $ DegreeCourse ux3 sdBsc sdInf
@ -160,6 +176,9 @@ main = db $ do
    , courseHasRegistration = False
    , courseRegisterFrom = Nothing
    , courseRegisterTo = Nothing
+    , courseDeregisterUntil = Nothing
+    , courseRegisterSecret  = Nothing
+    , courseMaterialFree    = True
    }
  insert_ $ CourseEdit jost now pmo
  void . insert $ DegreeCourse pmo sdBsc sdInf
@ -176,6 +195,9 @@ main = db $ do
    , courseHasRegistration = False
    , courseRegisterFrom = Nothing
    , courseRegisterTo = Nothing
+    , courseDeregisterUntil = Nothing
+    , courseRegisterSecret  = Nothing
+    , courseMaterialFree    = True
    }
  insert_ $ CourseEdit gkleen now dbs
  void . insert $ DegreeCourse dbs sdBsc sdInf
--- a/11
+++ b/11
@ -58,10 +58,13 @@ Course
    termId       TermId
    schoolId     SchoolId    
    capacity     Int Maybe    
-    hasRegistration Bool -- canRegisterNow = hasRegistration && maybe False (<= currentTime) registerFrom && maybe True (>= currentTime) registerTo
-    registerFrom UTCTime Maybe
-    registerTo   UTCTime Maybe
-    CourseTermShort termId shorthand
+    hasRegistration  Bool -- canRegisterNow = hasRegistration && maybe False (<= currentTime) registerFrom && maybe True (>= currentTime) registerTo
+    registerFrom     UTCTime Maybe
+    registerTo       UTCTime Maybe
+    deregisterUntil  UTCTime Maybe
+    registerSecret   Text Maybe        -- Falls ein Passwort erforderlich ist
+    materialFree     Bool default=true
+    CourseTermShort  termId shorthand
 CourseEdit
    user         UserId
    time         UTCTime
--- a/run.sh
+++ b/run.sh
@ -0,0 +1 @@
+start.sh
--- a/shell.nix
+++ b/shell.nix
@ -1,11 +1,11 @@
-{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc822" }:
+{ nixpkgs ? import <nixpkgs> {}, compiler ? null }:

 let
  inherit (nixpkgs) pkgs;

  haskellPackages = if isNull compiler
                       then pkgs.haskellPackages
-                       else pkgs.haskell.packages.${compiler};
+                       else pkgs.haskell.packages."${compiler}";

  drv = haskellPackages.callPackage ./uniworx.nix {};

--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@ -47,6 +47,8 @@ import qualified Data.Text.Encoding as Text
 import Data.Conduit (($$))
 import Data.Conduit.List (sourceList)

+import qualified Database.Esqueleto as E
+
 import Control.Monad.Except (MonadError(..), runExceptT)
 import Control.Monad.Trans.Maybe (MaybeT(..))

@ -153,16 +155,17 @@ instance Yesod UniWorX where
        case route of
          CourseR tid csh _  | "updateFavourite" `elem` attrs -> do
            uid <- MaybeT maybeAuthId
+            $(logDebug) "Favourites save"
            now <- liftIO $ getCurrentTime
            void . lift . runDB . runMaybeT $ do
              cid  <- MaybeT . getKeyBy $ CourseTermShort tid csh
              user <- MaybeT $ get uid
-              -- update Favorites
+              -- update Favourites
              lift $ upsertBy
                      (UniqueCourseFavourite uid cid)
                      (CourseFavourite uid now cid)
                      [CourseFavouriteTime =. now]
-              -- prune Favorites to user-defined size
+              -- prune Favourites to user-defined size
              oldFavs <- lift $ selectKeysList
                                  [ CourseFavouriteUser ==. uid]
                                  [ Desc CourseFavouriteTime
@ -340,7 +343,7 @@ instance YesodBreadcrumbs UniWorX where
  breadcrumb SubmissionListR = return ("Abgaben", Just HomeR)
  breadcrumb (SubmissionR _) = return ("Abgabe", Just SubmissionListR)

-  breadcrumb HomeR = return ("ReWorX", Nothing)
+  breadcrumb HomeR = return ("UniworkY", Nothing)
  breadcrumb (AuthR _) = return ("Login", Just HomeR)
  breadcrumb ProfileR = return ("Profile", Just HomeR)
  breadcrumb  _ = return ("home", Nothing)
@ -404,7 +407,7 @@ defaultLinkLayout = defaultMenuLayout . (defaultLinks ++)
 defaultMenuLayout :: [MenuTypes] -> Widget -> Handler Html
 defaultMenuLayout menu widget = do
    master <- getYesod
-    mmsgs <- getMessages
+    mmsgs  <- getMessages

    mcurrentRoute <- getCurrentRoute

@ -413,6 +416,17 @@ defaultMenuLayout menu widget = do

    menuTypes <- filterM (menuItemAccessCallback . menuItem) menu

+    -- Lookup Favourites if possible
+    favourites <- do
+      muid <- maybeAuthId
+      case muid of
+        Nothing    -> return []
+        (Just uid) -> runDB . E.select . E.from $ \(course `E.InnerJoin` courseFavourite) -> do
+          E.on (course E.^. CourseId E.==. courseFavourite E.^. CourseFavouriteCourse)
+          E.where_ (courseFavourite E.^. CourseFavouriteUser E.==. E.val uid)
+          E.orderBy [ E.asc $ course E.^. CourseShorthand ]
+          return course
+
    -- We break up the default layout into two components:
    -- default-layout is the contents of the body tag, and
    -- default-layout-wrapper is the entire page. Since the final
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@ -189,6 +189,9 @@ courseEditHandler course = do
            , courseHasRegistration = cfHasReg   res
            , courseRegisterFrom    = cfRegFrom  res
            , courseRegisterTo      = cfRegTo    res
+            , courseDeregisterUntil = Nothing -- TODO
+            , courseRegisterSecret  = Nothing -- TODO
+            , courseMaterialFree    = True    -- TODO
            }
          case insertOkay of
            (Just cid) -> do
@ -232,16 +235,19 @@ courseEditHandler course = do
 --                   , CourseChanged      =. now
 --                   ]
                _updOkay <- replace cid (  -- TODO replaceUnique requires Eq?!
-                    Course { courseName            = cfName     res
-                           , courseDescription     = cfDesc     res
-                           , courseLinkExternal    = cfLink     res
-                           , courseShorthand       = cfShort    res
-                           , courseTermId          = cfTerm     res
-                           , courseSchoolId        = cfSchool   res
-                           , courseCapacity        = cfCapacity res
-                           , courseHasRegistration = cfHasReg   res
-                           , courseRegisterFrom    = cfRegFrom  res
-                           , courseRegisterTo      = cfRegTo    res
+                    Course  {  courseName            = cfName     res
+                            ,  courseDescription     = cfDesc     res
+                            ,  courseLinkExternal    = cfLink     res
+                            ,  courseShorthand       = cfShort    res
+                            ,  courseTermId          = cfTerm     res
+                            ,  courseSchoolId        = cfSchool   res
+                            ,  courseCapacity        = cfCapacity res
+                            ,  courseHasRegistration = cfHasReg   res
+                            ,  courseRegisterFrom    = cfRegFrom  res
+                            ,  courseRegisterTo      = cfRegTo    res
+                            ,  courseDeregisterUntil = Nothing -- TODO
+                            ,  courseRegisterSecret  = Nothing -- TODO
+                            ,  courseMaterialFree    = True    -- TODO
                    }
                  )
                insert_ $ CourseEdit aid now cid
--- a/src/Handler/Home.hs
+++ b/src/Handler/Home.hs
@ -43,7 +43,7 @@ getHomeR :: Handler Html
 getHomeR = do
  (btnWdgt, btnEnctype) <- generateFormPost (buttonForm :: Form CreateButton)
  defaultLayout $ do
-    setTitle "Willkommen zum ReWorX Test!"
+    setTitle "Willkommen zum UniworkY Test!"
    $(widgetFile "home")


--- a/stack.nix
+++ b/stack.nix
@ -2,12 +2,13 @@

 let
  inherit (nixpkgs) haskell pkgs;
+  haskellPackages = if ghc.version == pkgs.haskellPackages.ghc.version then pkgs.haskellPackages else pkgs.haskell.packages."ghc${builtins.replaceStrings ["."] [""] ghc.version}";
 in haskell.lib.buildStackProject {
  inherit ghc;
  name = "stackenv";
  buildInputs = (with pkgs;
    [ postgresql zlib openldap cyrus_sasl.dev
-    ]) ++ (with haskell.packages."ghc${builtins.replaceStrings ["."] [""] ghc.version}";
+    ]) ++ (with haskellPackages;
    [ yesod-bin
    ]);
 }
--- a/templates/home.hamlet
+++ b/templates/home.hamlet
@ -1,5 +1,5 @@
 <div .container>
-  <h1>ReWorX - Demo
+  <h1>UniworkY - Demo
  <h3>
    Testumgebung für die Re-Implementierung von <a href="https://uniworx.ifi.lmu.de/">UniWorX</a>
  <p>
--- a/templates/widgets/asidenav.hamlet
+++ b/templates/widgets/asidenav.hamlet
@ -1,7 +1,7 @@
 $newline never
 <aside .main__aside>
  <div .asidenav>
-    <div .asidenav__box--dont-hide>
+    <div .asidenav__box>
      <ul .asidenav__list>
        $forall menuType <- menuTypes
          $case menuType
@ -13,14 +13,20 @@ $newline never
                  <div .asidenav__link-label>#{label}
            $of _

-    <div .asidenav__box--dont-hide>
+    <div .asidenav__box>
      <h3 .asidenav__box-title>
        WiSe 17/18
      <ul .asidenav__list>
+        $forall (Entity _ Course{..}) <- favourites
+          <li .asidenav__list-item>
+            <a .asidenav__link-wrapper href=@{CourseR courseTermId courseShorthand CourseShowR}>
+              <div .asidenav__link-shorthand>#{courseShorthand}
+              <div .asidenav__link-label>#{courseName}
+
        <li .asidenav__list-item>
          <a .asidenav__link-wrapper href="/course/S2018/ixd/show">
-            <div .asidenav__link-triple>IXD
-            <div .asidenav__link-label>Interaction Design
+            <div .asidenav__link-shorthand>EXAMPLE
+            <div .asidenav__link-label>Beispiel-Kurs
          <ul .asidenav__nested-list>
            <li .asidenav__list-item>
              <a .asidenav__link-wrapper href="/course/S2018/ixd/ex">Übungsblätter
@ -28,21 +34,5 @@ $newline never
              <a .asidenav__link-wrapper href="/course/S2018/ixd/show">Klausuren
            <li .asidenav__list-item>
              <a .asidenav__link-wrapper href="/course/S2018/ixd/show">Übungsgruppen
-        <li .asidenav__list-item>
-          <a .asidenav__link-wrapper href="/course/S2018/ffp/show">
-            <div .asidenav__link-triple>FFP
-            <div .asidenav__link-label>Fortgeschrittene Funktionale Programmierung
-          <ul .asidenav__nested-list>
-            <li .asidenav__list-item>
-              <a .asidenav__link-wrapper href="/course/S2018/ffp/ex">Abgaben
-            <li .asidenav__list-item>
-              <a .asidenav__link-wrapper href="/course/S2018/ffp/show">Klausuren
-        <li .asidenav__list-item>
-          <a .asidenav__link-wrapper href="/course/S2018/dbs/show">
-            <div .asidenav__link-triple>DBS
-            <div .asidenav__link-label>Datenbanksysteme
-          <ul .asidenav__nested-list>
-            <li .asidenav__list-item>
-              <a .asidenav__link-wrapper href="/course/S2018/dbs/ex">Übungsgruppen

  <div .asidenav__toggler>
--- a/templates/widgets/asidenav.lucius
+++ b/templates/widgets/asidenav.lucius
@ -24,19 +24,31 @@
    width: 50px;
    padding: 0;
  }
-}
-.main__aside--collapsed .asidenav__box {
-  opacity: 0;
-}
-.main__aside--collapsed .asidenav__box--dont-hide {
-  opacity: 1;
-}

-.main__aside--collapsed:not(.main__aside--transitioning) .asidenav__box {
-  height: 0;
-  padding: 0;
-  margin: 0;
-  visibility: hidden;
+  .asidenav__link-wrapper {
+    .asidenav__link-shorthand {
+      display: flex;
+      position: static;
+      background-color: var(--darkbase);
+      color: var(--whitebase);
+      height: 50px;
+      width: 50px;
+      text-align: center;
+      opacity: 1;
+      font-size: 16px;
+      line-height: 1em;
+      margin-right: 13px;
+      flex-shrink: 0;
+      outline: 1px solid white;
+      text-transform: uppercase;
+      word-break: break-all;
+      align-items: center;
+      justify-content: center;
+    }
+    .asidenav__link-label {
+      padding-left: 0;
+    }
+  }
 }

 .asidenav {
@ -63,13 +75,6 @@
    right: 12px !important;
  }
 }
-.asidenav__box {
-  margin: 10px 0;
-  padding: 10px 0;
-  width: 100%;
-  border-bottom: 4px solid var(--whitebase);
-  background-color: var(--darkbase);
-}

 .asidenav__box-title {
  padding: 7px 13px;
@ -79,6 +84,7 @@
  }
 }

+/* hover sub-menus */
 .asidenav__nested-list {
  position: absolute;
  top: 0;
@ -86,7 +92,9 @@
  color: var(--fontbase);
  transform: translateX(0);
  opacity: 0;
-  transition: all .2s ease;
+  transition: all .2s ease-out;
+  width: 0;
+  overflow: hidden;
  z-index: -1;

  .asidenav__list-item {
@ -125,6 +133,7 @@
    .asidenav__nested-list {
      transform: translateX(100%);
      opacity: 1;
+      width: 200px;
    }

    .asidenav__link-wrapper,
@ -132,8 +141,9 @@
      color: white;
    }

-    .asidenav__link-triple {
-      transform: scale(1.2, 1);
+    .asidenav__link-shorthand {
+      transform: scale(1.05, 1.0);
+      transform-origin: right;
    }
  }
 }
@ -160,17 +170,25 @@
    width: 50px;
  }

-  .asidenav__link-triple {
-    background-color: var(--darkbase);
-    color: var(--whitebase);
-    height: 50px;
-    width: 50px;
-    display: inline-block;
+  .asidenav__link-shorthand {
+    display: block;
+    position: absolute;
+    color: var(--greybase);
    line-height: 50px;
-    text-align: center;
-    margin-right: 13px;
-    flex-shrink: 0;
-    outline: 1px solid white;
+    opacity: 0.3;
+    right: 10px;
+    top: 0;
+    font-size: 40px;
+    text-transform: uppercase;
+    transition: transform .2s ease;
+  }
+
+  .asidenav__link-label {
+    padding-left: 13px;
+  }
+
+  .glyphicon + .asidenav__link-label {
+    padding-left: 0;
  }
 }