minor fixes

app/scripts/components/reader/reading_controller.js

@@ -66,9 +66,14 @@ export default [
         s.searchData = searchData = null
         s.loading = true
         s.first_load = false
-        const onFirstLoad = _.once(() =>
-            $timeout(() => $("html, body").animate({ scrollLeft: "1000px" }, 1000), 0)
-        )
+        const onFirstLoad = _.once(() => {
+            // only if screen is small
+            if ($(window).width() < 768) {
+                $timeout(() => $("html, body").animate({ scrollLeft: "1000px" }, 1000), 0)
+            } else {
+                $timeout(() => $("html, body").animate({ scrollTop: "1000px" }, 1000), 0)
+            }
+        })
         s.showPopup = false
         s.error = false
         s.show_chapters = false // index modal
@@ -175,10 +180,9 @@ export default [
         }
 
         const onKeyDown = function (event) {
-            let abort = event.metaKey || event.ctrlKey || event.altKey || $("input:focus").length
+            let abort = event.metaKey || event.ctrlKey || $("input:focus").length
 
             let isToggleOpen = [79, 129].includes(event.which)
-            console.log("🚀 ~ file: reading_controller.js:181 ~ isToggleOpen:", isToggleOpen)
             if (!isToggleOpen) {
                 abort = abort || $("body.modal-open").length
             }
@@ -187,43 +191,43 @@ export default [
                 return
             }
             s.$apply(function () {
-                switch (event.which) {
-                    case 78: // n
+                switch (event.key) {
+                    case "n":
                         s.nextPage()
                         break
-                    case 39: // arrow right
+                    case "ArrowRight":
                         if (
                             $rootElement.prop("scrollWidth") - $window.scrollX ===
                             $($window).width()
                         ) {
                             s.nextPage()
                         }
                         break
-                    case 70: // f
+                    case "f":
                         s.prevPage()
                         break
-                    case 37: // arrow left
+                    case "ArrowLeft":
                         if ($window.scrollX < 10) {
                             s.prevPage()
                         }
                         break
-                    case 126: // f15
-                    case 68: // d
+                    case "F15":
+                    case "d":
                         s.pageix = s.pageix - 10
                         s.pageToLoad = s.pageix
                         break
-                    case 127: // f16
-                    case 77: // m
+                    case "F16":
+                    case "m":
                         s.pageix = s.pageix + 10
                         s.pageToLoad = s.pageix
                         break
-                    case 128: // f17
-                    case 73: // i
+                    case "F17":
+                    case "i":
                         navigator.clipboard.writeText(s.editorLbWorkId || s.workinfo.lbworkid)
                         s.$emit("notify", "Kopierade lbworkid")
                         break
-                    case 129: // f18
-                    case 79: // o
+                    case "F18":
+                    case "o":
                         s.show_about = !s.show_about
                         break
                 }

app/scripts/controllers.js

@@ -7,6 +7,28 @@ const c = (window.c =
     typeof console !== "undefined" && console !== null ? console : { log: _.noop })
 const littb = angular.module("littbApp")
 
+document.addEventListener("keydown", function (event) {
+    let abort = event.metaKey || event.ctrlKey || $("input:focus").length
+
+    if (abort) {
+        return
+    }
+
+    switch (event.key) {
+        case "F19":
+        case "®":
+            if (location.host == "localhost:9000") {
+                location.host = "litteraturbanken.se:80"
+            } else {
+                location.hostname =
+                    location.hostname == "litteraturbanken.se"
+                        ? "red.Litteraturbanken.se"
+                        : "litteraturbanken.se"
+            }
+            break
+    }
+})
+
 function sortObjectKeys(obj) {
     // Separate keys into two arrays based on their type
     let simpleKeys = []

app/scripts/library_controller.js

@@ -38,6 +38,7 @@ littb.component("keywordSelect", {
         <option value="texttype:herdaminne">Herdaminnen</option>
         
         <option value='keyword:Barnlitteratur'>Barn- och ungdomslitteratur</option>
+        <option value='keyword:Flickböcker'>Flickböcker</option>
         <option value='source:bibliotekariesidor'>Bibliotekariesidorna</option>
         <option value='source:diktensmuseum'>Diktens museum</option>
         <option value='keyword:Dramawebben'>Dramawebben</option>

app/views/dramaweb.html

@@ -28,6 +28,8 @@ <h2>Fri svensk dramatik <br>hos Litteraturbanken</h2>
         <div class="page_content" ng-switch="showpage">
 
             <div ng-switch-when="pjäser">
+                <p class="max-w-prose mb-8">I Dramawebben hittar du pjäser som har mer metadata, till exempel information om hur många roller det är. Det finns många fler pjäser i Litteraturbanken som du kan hitta i <a href="/bibliotek?keywords=texttype:drama;dramasamling&visa=works&sort=titlar">Biblioteket</a>.</p>
+
 
                 <div class="controls">
                     <div class="btn-group">

app/views/reader.html

@@ -89,9 +89,9 @@
 
         <div class="pager_ctrls" ng-click="resetHitMarkings()">
 
-            <a class="prev_part" ng-href="{{getPrevPartUrl()}}" ng-class="{disabled : !getPrevPartUrl()}">Gå bakåt en del</a>
+            <a class="prev_part" title="Kortkommando: 'd'" ng-href="{{getPrevPartUrl()}}" ng-class="{disabled : !getPrevPartUrl()}">Gå bakåt en del</a>
             <br>
-            <a class="next_part" ng-class="{disabled : !getNextPartUrl()}" ng-href="{{getNextPartUrl()}}">Gå till nästa del</a>
+            <a class="next_part" title="Kortkommando: 'm'" ng-class="{disabled : !getNextPartUrl()}" ng-href="{{getNextPartUrl()}}">Gå till nästa del</a>
             <br>
             <a ng-href="{{getFirstPageUrl()}}" ng-class="{disabled : isBeforeStartpage(pageix)}"
                 > <!-- ng-click="gotopage(startpage, $event)" -->
@@ -108,12 +108,11 @@
             </form>
 
 
-            <a class="" rel="prev" ng-class="{disabled : pageix == 0}" ng-href="{{getPrevPageUrl()}}" ng-click="prevPage($event)">
-
+            <a class="" rel="prev" ng-class="{disabled : pageix == 0}" ng-href="{{getPrevPageUrl()}}" ng-click="prevPage($event)" title="Kortkommando: 'f'">
                 <button class="submit btn navicon left" ng-click="$close()">
                     <i class="fa fa-angle-left "></i></button>
             </a>
-            <a class="" rel="next" ng-href="{{getNextPageUrl()}}" ng-click="nextPage($event)" ng-class="{disabled : pagename == endpage}">
+            <a class="" rel="next" ng-href="{{getNextPageUrl()}}" ng-click="nextPage($event)" ng-class="{disabled : pagename == endpage}" title="Kortkommando: 'n'">
                 <button class="submit btn navicon right" ng-click="$close()">
                     <i class="fa fa-angle-right right"></i>
                 </button>

app/views/search.html

@@ -100,6 +100,7 @@ <h1>Textsökning <span class="hidden lg:inline"><span class="star">*</span> <spa
                             <option value="texttype:roman">Romaner</option>
                             <option value="texttype:herdaminne">Herdaminnen</option>
                             <option value='keyword:Barnlitteratur'>Barn- och ungdomslitteratur</option>
+                            <option value='keyword:Flickböcker'>Flickböcker</option>
                             <option value='keyword:Finlandssvenskt'>Finlandssvensk litteratur</option>
                             <option value='keyword:Humor'>Humor</option>
                             <option value='keyword:Sapmi'>Sápmi</option>

package.json

@@ -60,7 +60,7 @@
         "optimize-css-assets-webpack-plugin": "^5.0.3",
         "postcss": "^8.2.15",
         "postcss-loader": "4.0.3",
-        "protractor": "latest",
+        "protractor": "^7.0.0",
         "protractor-html-screenshot-reporter": "0.0.21",
         "raw-loader": "^4.0.2",
         "requirejs": "^2.1.15",
@@ -86,7 +86,5 @@
     "optionalDependencies": {
         "axios": "^0.21.0"
     },
-    "resolutions": {
-        "protractor/webdriver-manager": "12.1.8"
-    }
+    "resolutions": {}
 }

stage.sh

@@ -1,3 +1,4 @@
 #!/bin/sh
-rsync --delete -r dist/* lb-apache:/home/johan/sites/red.lb.se && \
-yarn test
+rsync --delete -r dist/* lb-apache:/home/johan/sites/red.lb.se &&
+    rsync --delete -r dist/* lb-webserver-a:/home/johan/sites/red.lb.se &&
+    yarn test

tailwind.config.js

@@ -0,0 +1,37 @@
+/*
+ ** TailwindCSS Configuration File
+ **
+ ** Docs: https://tailwindcss.com/docs/configuration
+ ** Default: https://github.com/tailwindcss/tailwindcss/blob/master/stubs/defaultConfig.stub.js
+ */
+module.exports = {
+    purge: {
+        content: ["./app/**/*.js", "./app/**/*.html"],
+        layers: ["utilities"]
+    },
+    theme: {
+        extend: {
+            opacity: {
+                85: "0.85",
+                90: "0.90"
+            },
+            colors: {
+                // neutral gray
+                gray: {
+                    100: "#f5f5f5",
+                    200: "#eeeeee",
+                    300: "#e0e0e0",
+                    400: "#bdbdbd",
+                    500: "#9e9e9e",
+                    600: "#757575",
+                    700: "#616161",
+                    800: "#424242",
+                    900: "#212121"
+                },
+                primary: "#7A1400"
+            }
+        }
+    },
+    variants: {},
+    plugins: []
+}

yarn.lock

@@ -6526,7 +6526,7 @@ protractor-html-screenshot-reporter@0.0.21:
     mkdirp "~0.3.5"
     underscore "~1.6.0"
 
-protractor@latest:
+protractor@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/protractor/-/protractor-7.0.0.tgz#c3e263608bd72e2c2dc802b11a772711a4792d03"
   integrity sha512-UqkFjivi4GcvUQYzqGYNe0mLzfn5jiLmO8w9nMhQoJRLhy2grJonpga2IWhI6yJO30LibWXJJtA4MOIZD2GgZw==
@@ -8369,7 +8369,7 @@ webdriver-js-extender@2.1.0:
     "@types/selenium-webdriver" "^3.0.0"
     selenium-webdriver "^3.0.1"
 
-webdriver-manager@12.1.8, webdriver-manager@^12.1.7:
+webdriver-manager@^12.1.7:
   version "12.1.8"
   resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.8.tgz#5e70e73eaaf53a0767d5745270addafbc5905fd4"
   integrity sha512-qJR36SXG2VwKugPcdwhaqcLQOD7r8P2Xiv9sfNbfZrKBnX243iAkOueX1yAmeNgIKhJ3YAT/F2gq6IiEZzahsg==