-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #521 from matematikk-mooc/dev
Dev
- Loading branch information
Showing
31 changed files
with
3,934 additions
and
4,102 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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."); | ||
| } | ||
| } | ||
|
|
||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.