From 213899eef55d9e2eea4feeac009d6cb7e8e8bb19 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Fri, 9 Dec 2022 12:51:40 +0100 Subject: [PATCH 1/7] chore(ghc): disable almost all warnings, even under flag pedantic --- package.yaml | 7 ++----- src/Handler/Course/List.hs | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package.yaml b/package.yaml index df5990b79..8d0734a51 100644 --- a/package.yaml +++ b/package.yaml @@ -245,10 +245,8 @@ default-extensions: - StandaloneKindSignatures - NoStarIsType ghc-options: - - -Wall + - -w - -Wmissing-home-modules - - -Wredundant-constraints - - -Widentities - -Wincomplete-uni-patterns - -fno-warn-type-defaults - -fno-warn-unrecognised-pragmas @@ -258,8 +256,7 @@ ghc-options: - -freduction-depth=0 when: - condition: flag(pedantic) - ghc-options: - - -Werror + ghc-options: - -fwarn-tabs - condition: flag(dev) then: diff --git a/src/Handler/Course/List.hs b/src/Handler/Course/List.hs index c92fcc25e..d4c4a94d0 100644 --- a/src/Handler/Course/List.hs +++ b/src/Handler/Course/List.hs @@ -294,6 +294,7 @@ makeCourseTable colChoices psValidator' = do getCourseListR :: Handler Html getCourseListR = do + varNotUsed <- return "just a test to see whether warnings are disabled properly" muid <- maybeAuthId let colonnade = widgetColonnade $ mconcat [ colCourse -- colCourseDescr -- 2.39.2 From acb52c51f429b35f91c9c8a491af6b353c9b5e75 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Fri, 9 Dec 2022 16:42:39 +0100 Subject: [PATCH 2/7] fix(build): hlint did not like unnecessary monadic code --- src/Handler/Course/List.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Handler/Course/List.hs b/src/Handler/Course/List.hs index d4c4a94d0..2cd7f36ab 100644 --- a/src/Handler/Course/List.hs +++ b/src/Handler/Course/List.hs @@ -294,7 +294,7 @@ makeCourseTable colChoices psValidator' = do getCourseListR :: Handler Html getCourseListR = do - varNotUsed <- return "just a test to see whether warnings are disabled properly" + let varNotUsed = "just a test to see whether warnings are disabled properly" muid <- maybeAuthId let colonnade = widgetColonnade $ mconcat [ colCourse -- colCourseDescr -- 2.39.2 From 18af47b6d573263ea1a3e810a4c102d16e288c64 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Wed, 14 Dec 2022 09:37:59 +0100 Subject: [PATCH 3/7] chore(ui): remove asidenav --- assets/fraport_logo_text.svg.rej | 7 + frontend/src/app.sass | 37 +- frontend/src/utils/asidenav/asidenav.js | 96 ----- frontend/src/utils/asidenav/asidenav.md | 21 - .../src/utils/asidenav/asidenav.md.license | 3 - frontend/src/utils/asidenav/asidenav.sass | 376 ------------------ frontend/src/utils/asidenav/asidenav.spec.js | 31 -- frontend/src/utils/navbar/navbar.sass | 19 +- frontend/src/utils/utils.js | 2 - src/Foundation/SiteLayout.hs | 5 +- templates/default-layout.hamlet | 2 - templates/widgets/asidenav/asidenav.hamlet | 55 --- .../widgets/breadcrumbs/breadcrumbs.hamlet | 6 +- templates/widgets/navbar/navbar.hamlet | 5 + 14 files changed, 39 insertions(+), 626 deletions(-) create mode 100644 assets/fraport_logo_text.svg.rej delete mode 100644 frontend/src/utils/asidenav/asidenav.js delete mode 100644 frontend/src/utils/asidenav/asidenav.md delete mode 100644 frontend/src/utils/asidenav/asidenav.md.license delete mode 100644 frontend/src/utils/asidenav/asidenav.sass delete mode 100644 frontend/src/utils/asidenav/asidenav.spec.js delete mode 100644 templates/widgets/asidenav/asidenav.hamlet diff --git a/assets/fraport_logo_text.svg.rej b/assets/fraport_logo_text.svg.rej new file mode 100644 index 000000000..44fda6c97 --- /dev/null +++ b/assets/fraport_logo_text.svg.rej @@ -0,0 +1,7 @@ +diff a/assets/fraport_logo_text.svg b/assets/fraport_logo_text.svg (rejected hunks) +@@ -1,3 +1,3 @@ +- ++ +
- -
- #{logo} - - -
- $if null favouriteTerms && is _Just muid -
- _{MsgFavouritesEmptyTip} - $else - $forall tid <- favouriteTerms -
-

-
- _{ShortTermIdentifier tid} -
- #{toPathPiece tid} - $forall favReason <- sortOn Down universeF - $if not (null $ favouriteTermReason tid favReason) -

- _{favReason} -