Merge pull request #518 from matematikk-mooc/KURSP-1159-one-theme

Kursp 1159 one theme

src/js/account-theme.js

@@ -0,0 +1,115 @@
+import LoginDirectLink from '../vue/components/login-choice/LoginDirectLink.vue';
+import { createApp } from 'vue';
+import utilRoot from './utilRoot';
+
+var udirDesignLoaded;
+
+
+jQuery.extend({
+  getScript: function (url, callback) {
+    var head = document.getElementsByTagName("head")[0];
+    var script = document.createElement("script");
+    script.src = url;
+
+    // Handle Script loading
+    {
+      var done = false;
+
+      // Attach handlers for all browsers
+      script.onload = script.onreadystatechange = function () {
+        if (
+          !done &&
+          (!this.readyState ||
+            this.readyState == "loaded" ||
+            this.readyState == "complete")
+        ) {
+          done = true;
+          if (callback) callback();
+
+          // Handle memory leak in IE
+          script.onload = script.onreadystatechange = null;
+        }
+      };
+    }
+
+    head.appendChild(script);
+
+    // We handle everything using the script element injection
+    return undefined;
+  },
+});
+
+jQuery(document).ready(function ($) {
+  console.log("START.");
+
+  var redirected = false;
+
+  // Redirect if necessary
+  if (document.location.pathname == "/search/all_courses" && document.location.search.includes('?enroll_code')) {
+    window.location.href = '/courses' + document.location.search;
+    redirected = true;
+  } else if (document.location.pathname == "/login/canvas") {
+    if (document.referrer.includes("/logout")) {
+      window.location.href = '/search/all_courses';
+      redirected = true;
+    } else if (!document.referrer.includes("/login/canvas")) {
+      $(".ic-Login").hide();
+      $("#f1_container").hide(); // Small screens
+      redirected = utilRoot.redirectFeideAuthIfEnrollReferrer();
+      if (!redirected) {
+        if (!document.location.search.includes("normalLogin=1")) {
+          document.getElementById('wrapper').remove();
+          let parent = document.getElementById('application');
+          let login = document.createElement('div');
+          login.id = 'login-component';
+          let customLogin = createApp(LoginDirectLink);
+          parent.appendChild(login);
+          customLogin.mount("#login-component");
+        } else {
+          $(".ic-Login").show();
+          $("#f1_container").show(); // Small screens
+        }
+      }
+    }
+  } else if (document.location.pathname == "/courses") {
+    redirected = utilRoot.redirectToEnrollIfCodeParamPassed();
+  } else if (document.location.href.indexOf('?login_success=1') != -1) {
+    window.location.href = '/search/all_courses';
+  } else if (document.location.pathname == "/") {
+    setTimeout(function () {
+      if (!$(".ic-DashboardCard__header_hero").length) {
+        let html = `
+        <div class="card card-body">
+        <h3>Er det tomt her?</h3>
+          <p>Dersom du har valgt å logge inn med Feide og ikke finner innholdet ditt kan det hende det er fordi du
+          vanligvis har logget på med en annen bruker ved å bruke epost og passord. Logg ut og inn igjen ved å benytte "Ikke Feide" - knappen.
+          </p>
+          <img src="${SERVER}bitmaps/nyinnlogging.png" width="70%" alt="Ny innloggingsskjerm"/>
+        </div>
+        `;
+        document.getElementById('dashboard-activity').insertAdjacentHTML('beforebegin', html);
+      }
+    }, 1000)
+  }
+
+  if (!redirected) {
+    if (window.udirDesignLoaded === undefined) {
+      window.udirDesignLoaded = true;
+      console.log("Loading udir design.");
+
+      var filename = SERVER + DESIGNCSS;
+
+      var fileref = document.createElement("link")
+      fileref.setAttribute("rel", "stylesheet")
+      fileref.setAttribute("type", "text/css")
+      fileref.setAttribute("href", filename)
+      fileref.onload = (_) => {
+        $.getScript(SERVER + DESIGNJS);
+      }
+      document.getElementsByTagName("head")[0].appendChild(fileref)
+    } else {
+      console.log("Udir design already loaded.");
+    }
+  }
+
+});

src/js/main.js

@@ -52,7 +52,7 @@ jQuery(function($) {
     if (document.location.search === '?mmpf') {
       mmooc.powerFunctions.show(parentId);
     } else {
-      window.location.href = '/courses?design=udir';
+      window.location.href = '/courses';
     }
   });
 

src/js/modules/courselist.js

@@ -23,7 +23,7 @@ export default (function () {
             var myCoursesWithSettings = util.mapCourseSettings(courses, allCoursesSettings.result);
 
             if (courses.length == 0) {
-              window.location.href = "/search/all_courses?design=udir";
+              window.location.href = "/search/all_courses";
             } else {
 
 

src/js/modules/coursepage.js

@@ -19,14 +19,12 @@ export default (function() {
     showCourseInvitation: function () {
       if (!util.isAuthenticated()) {
         var enrollButton = $(".course_enrollment_link");
-        var linkToSelectedCourse = window.location.href.split('/');
-        var selectedCourseId = linkToSelectedCourse[linkToSelectedCourse.length - 1];
 
         if (enrollButton) {
           enrollButton.text('Enroll this course');
           enrollButton.click(function (e) {
             e.preventDefault();
-                  window.location.href = '/search/all_courses' + '?design=udir' + '#' + selectedCourseId;
+                  window.location.href = '/search/all_courses';
           })
         }
       }

src/js/modules/enroll.js

@@ -4,7 +4,6 @@ import LoggedInLandingPage from "../../vue/pages/LoggedInLandingPage.vue";
 import NotLoggedInPage from "../../vue/pages/NotLoggedInPage.vue";
 import api from "../api/api";
 import { createApp } from "vue/dist/vue.runtime.esm-bundler.js";
-import { hrefQueryString } from "../settingsRoot";
 import kpasApi from "../api/kpas-api";
 import settings from "../settings";
 import util from "./util";
@@ -60,7 +59,7 @@ export default (function () {
         if ($this.hasClass('btn-primary')){
           var _href = $this.attr("href");
         }else {
-          var _href = $this.attr("href") + hrefQueryString;
+          var _href = $this.attr("href");
         }
 
         const urlParamsObj = utilRoot.urlParamsToObject();

src/js/modules/util.js

@@ -1,5 +1,3 @@
-import { hrefAmpQueryString, hrefQueryString } from "../settingsRoot";
-
 import  api from '../api/api.js'
 import settings from "../settings";
 
@@ -477,7 +475,7 @@ export default (function () {
           $this.remove();
         }
         else{
-          $this.attr("href", _href + hrefAmpQueryString);
+          $this.attr("href", _href);
         }
       });
     },
@@ -488,7 +486,7 @@ export default (function () {
       });
     },
     getLinkToAvailableCourses: function () {
-      var linkToAvailableCourses = "/search/all_courses" + hrefQueryString;
+      var linkToAvailableCourses = "/search/all_courses";
       //ETH20190409 By making sure the root account loads our design, we do not need a front page.
       /*
               if (allCoursesFrontpageCourseID > 0) {

src/js/settingsRoot.js

@@ -1,10 +1,6 @@
 
 var settingsRoot = {
-
-    hrefQueryString: "?design=udir",
-    hrefAmpQueryString: "&design=udir",
     feideEnrollRefferers: [
-      "design=udir",
       "enroll_code",
       "kslaring.no"
     ],