Merge branch 'feature/directlink' into dev

llaske · May 4, 2024 · e9a9e80 · e9a9e80
2 parents 70facc1 + a49463c
commit e9a9e80
Show file tree

Hide file tree

Showing 77 changed files with 1,075 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- Launch activity directly from url of CLI
+
 ### Fixed
 - Images go under each other while editing in Fototoon #1552
 - Missalignment of icons and text in Fototoon activity "clean all" button #1596

diff --git a/activities/Abacus.activity/lib/sugar-web/activity/activity.js b/activities/Abacus.activity/lib/sugar-web/activity/activity.js
@@ -52,6 +52,23 @@ define(["sugar-web/activity/shortcut",
 
         datastoreObject = new datastore.DatastoreObject();
 
+        datastore.localStorage.load(function() {
+            var preferences = datastore.localStorage.getValue('sugar_settings');
+            if (preferences != null && preferences.name !== undefined) {
+                return;
+            }
+            if (window.location.protocol != "file:") {
+                location.href = window.location.protocol + "//" + window.location.host + "?redirect=" + encodeURIComponent(window.location.href);
+            } else {
+                let server = window.location.pathname.substring(0, window.location.pathname.indexOf("index.html"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                location.href = server + "/index.html?redirect=" + encodeURIComponent(window.location.href);
+            }
+            return;
+        });
+
         var activityButton = document.getElementById("activity-button");
 
         var activityPalette = new activitypalette.ActivityPalette(

diff --git a/activities/Abecedarium.activity/lib/sugar-web/activity/activity.js b/activities/Abecedarium.activity/lib/sugar-web/activity/activity.js
@@ -52,6 +52,23 @@ define(["sugar-web/activity/shortcut",
 
         datastoreObject = new datastore.DatastoreObject();
 
+        datastore.localStorage.load(function() {
+            var preferences = datastore.localStorage.getValue('sugar_settings');
+            if (preferences != null && preferences.name !== undefined) {
+                return;
+            }
+            if (window.location.protocol != "file:") {
+                location.href = window.location.protocol + "//" + window.location.host + "?redirect=" + encodeURIComponent(window.location.href);
+            } else {
+                let server = window.location.pathname.substring(0, window.location.pathname.indexOf("index.html"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                location.href = server + "/index.html?redirect=" + encodeURIComponent(window.location.href);
+            }
+            return;
+        });
+
         var activityButton = document.getElementById("activity-button");
 
         var activityPalette = new activitypalette.ActivityPalette(

diff --git a/activities/ActivityTemplate/VanillaJS/lib/sugar-web/activity/activity.js b/activities/ActivityTemplate/VanillaJS/lib/sugar-web/activity/activity.js
@@ -52,6 +52,23 @@ define(["sugar-web/activity/shortcut",
 
         datastoreObject = new datastore.DatastoreObject();
 
+        datastore.localStorage.load(function() {
+            var preferences = datastore.localStorage.getValue('sugar_settings');
+            if (preferences != null && preferences.name !== undefined) {
+                return;
+            }
+            if (window.location.protocol != "file:") {
+                location.href = window.location.protocol + "//" + window.location.host + "?redirect=" + encodeURIComponent(window.location.href);
+            } else {
+                let server = window.location.pathname.substring(0, window.location.pathname.indexOf("index.html"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                location.href = server + "/index.html?redirect=" + encodeURIComponent(window.location.href);
+            }
+            return;
+        });
+
         var activityButton = document.getElementById("activity-button");
 
         var activityPalette = new activitypalette.ActivityPalette(

diff --git a/activities/ActivityTemplate/VueJS/lib/sugar-web/activity/activity.js b/activities/ActivityTemplate/VueJS/lib/sugar-web/activity/activity.js
@@ -52,6 +52,23 @@ define(["sugar-web/activity/shortcut",
 
         datastoreObject = new datastore.DatastoreObject();
 
+        datastore.localStorage.load(function() {
+            var preferences = datastore.localStorage.getValue('sugar_settings');
+            if (preferences != null && preferences.name !== undefined) {
+                return;
+            }
+            if (window.location.protocol != "file:") {
+                location.href = window.location.protocol + "//" + window.location.host + "?redirect=" + encodeURIComponent(window.location.href);
+            } else {
+                let server = window.location.pathname.substring(0, window.location.pathname.indexOf("index.html"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                location.href = server + "/index.html?redirect=" + encodeURIComponent(window.location.href);
+            }
+            return;
+        });
+
         var activityButton = document.getElementById("activity-button");
 
         var activityPalette = new activitypalette.ActivityPalette(

diff --git a/activities/Blockrain.activity/lib/sugar-web/activity/activity.js b/activities/Blockrain.activity/lib/sugar-web/activity/activity.js
@@ -52,6 +52,23 @@ define(["sugar-web/activity/shortcut",
 
         datastoreObject = new datastore.DatastoreObject();
 
+        datastore.localStorage.load(function() {
+            var preferences = datastore.localStorage.getValue('sugar_settings');
+            if (preferences != null && preferences.name !== undefined) {
+                return;
+            }
+            if (window.location.protocol != "file:") {
+                location.href = window.location.protocol + "//" + window.location.host + "?redirect=" + encodeURIComponent(window.location.href);
+            } else {
+                let server = window.location.pathname.substring(0, window.location.pathname.indexOf("index.html"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                location.href = server + "/index.html?redirect=" + encodeURIComponent(window.location.href);
+            }
+            return;
+        });
+
         var activityButton = document.getElementById("activity-button");
 
         var activityPalette = new activitypalette.ActivityPalette(

diff --git a/activities/Calculate.activity/lib/sugar-web/activity/activity.js b/activities/Calculate.activity/lib/sugar-web/activity/activity.js
@@ -52,6 +52,23 @@ define(["sugar-web/activity/shortcut",
 
         datastoreObject = new datastore.DatastoreObject();
 
+        datastore.localStorage.load(function() {
+            var preferences = datastore.localStorage.getValue('sugar_settings');
+            if (preferences != null && preferences.name !== undefined) {
+                return;
+            }
+            if (window.location.protocol != "file:") {
+                location.href = window.location.protocol + "//" + window.location.host + "?redirect=" + encodeURIComponent(window.location.href);
+            } else {
+                let server = window.location.pathname.substring(0, window.location.pathname.indexOf("index.html"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                location.href = server + "/index.html?redirect=" + encodeURIComponent(window.location.href);
+            }
+            return;
+        });
+
         var activityButton = document.getElementById("activity-button");
 
         var activityPalette = new activitypalette.ActivityPalette(

diff --git a/activities/Calligra.activity/lib/sugar-web/activity/activity.js b/activities/Calligra.activity/lib/sugar-web/activity/activity.js
@@ -52,6 +52,23 @@ define(["sugar-web/activity/shortcut",
 
         datastoreObject = new datastore.DatastoreObject();
 
+        datastore.localStorage.load(function() {
+            var preferences = datastore.localStorage.getValue('sugar_settings');
+            if (preferences != null && preferences.name !== undefined) {
+                return;
+            }
+            if (window.location.protocol != "file:") {
+                location.href = window.location.protocol + "//" + window.location.host + "?redirect=" + encodeURIComponent(window.location.href);
+            } else {
+                let server = window.location.pathname.substring(0, window.location.pathname.indexOf("index.html"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                location.href = server + "/index.html?redirect=" + encodeURIComponent(window.location.href);
+            }
+            return;
+        });
+
         var activityButton = document.getElementById("activity-button");
 
         var activityPalette = new activitypalette.ActivityPalette(

diff --git a/activities/Chart.activity/lib/sugar-web/activity/activity.js b/activities/Chart.activity/lib/sugar-web/activity/activity.js
@@ -52,6 +52,23 @@ define(["sugar-web/activity/shortcut",
 
         datastoreObject = new datastore.DatastoreObject();
 
+        datastore.localStorage.load(function() {
+            var preferences = datastore.localStorage.getValue('sugar_settings');
+            if (preferences != null && preferences.name !== undefined) {
+                return;
+            }
+            if (window.location.protocol != "file:") {
+                location.href = window.location.protocol + "//" + window.location.host + "?redirect=" + encodeURIComponent(window.location.href);
+            } else {
+                let server = window.location.pathname.substring(0, window.location.pathname.indexOf("index.html"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                location.href = server + "/index.html?redirect=" + encodeURIComponent(window.location.href);
+            }
+            return;
+        });
+
         var activityButton = document.getElementById("activity-button");
 
         var activityPalette = new activitypalette.ActivityPalette(

diff --git a/activities/Chat.activity/lib/sugar-web/activity/activity.js b/activities/Chat.activity/lib/sugar-web/activity/activity.js
@@ -52,6 +52,23 @@ define(["sugar-web/activity/shortcut",
 
         datastoreObject = new datastore.DatastoreObject();
 
+        datastore.localStorage.load(function() {
+            var preferences = datastore.localStorage.getValue('sugar_settings');
+            if (preferences != null && preferences.name !== undefined) {
+                return;
+            }
+            if (window.location.protocol != "file:") {
+                location.href = window.location.protocol + "//" + window.location.host + "?redirect=" + encodeURIComponent(window.location.href);
+            } else {
+                let server = window.location.pathname.substring(0, window.location.pathname.indexOf("index.html"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                location.href = server + "/index.html?redirect=" + encodeURIComponent(window.location.href);
+            }
+            return;
+        });
+
         var activityButton = document.getElementById("activity-button");
 
         var activityPalette = new activitypalette.ActivityPalette(

diff --git a/activities/Chess.activity/lib/sugar-web/activity/activity.js b/activities/Chess.activity/lib/sugar-web/activity/activity.js
@@ -52,6 +52,23 @@ define(["sugar-web/activity/shortcut",
 
         datastoreObject = new datastore.DatastoreObject();
 
+        datastore.localStorage.load(function() {
+            var preferences = datastore.localStorage.getValue('sugar_settings');
+            if (preferences != null && preferences.name !== undefined) {
+                return;
+            }
+            if (window.location.protocol != "file:") {
+                location.href = window.location.protocol + "//" + window.location.host + "?redirect=" + encodeURIComponent(window.location.href);
+            } else {
+                let server = window.location.pathname.substring(0, window.location.pathname.indexOf("index.html"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                location.href = server + "/index.html?redirect=" + encodeURIComponent(window.location.href);
+            }
+            return;
+        });
+
         var activityButton = document.getElementById("activity-button");
 
         var activityPalette = new activitypalette.ActivityPalette(

diff --git a/activities/Clock.activity/lib/sugar-web/activity/activity.js b/activities/Clock.activity/lib/sugar-web/activity/activity.js
@@ -52,6 +52,23 @@ define(["sugar-web/activity/shortcut",
 
         datastoreObject = new datastore.DatastoreObject();
 
+        datastore.localStorage.load(function() {
+            var preferences = datastore.localStorage.getValue('sugar_settings');
+            if (preferences != null && preferences.name !== undefined) {
+                return;
+            }
+            if (window.location.protocol != "file:") {
+                location.href = window.location.protocol + "//" + window.location.host + "?redirect=" + encodeURIComponent(window.location.href);
+            } else {
+                let server = window.location.pathname.substring(0, window.location.pathname.indexOf("index.html"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                location.href = server + "/index.html?redirect=" + encodeURIComponent(window.location.href);
+            }
+            return;
+        });
+
         var activityButton = document.getElementById("activity-button");
 
         var activityPalette = new activitypalette.ActivityPalette(

diff --git a/activities/ColorMyWorld.activity/lib/sugar-web/activity/activity.js b/activities/ColorMyWorld.activity/lib/sugar-web/activity/activity.js
@@ -52,6 +52,23 @@ define(["sugar-web/activity/shortcut",
 
         datastoreObject = new datastore.DatastoreObject();
 
+        datastore.localStorage.load(function() {
+            var preferences = datastore.localStorage.getValue('sugar_settings');
+            if (preferences != null && preferences.name !== undefined) {
+                return;
+            }
+            if (window.location.protocol != "file:") {
+                location.href = window.location.protocol + "//" + window.location.host + "?redirect=" + encodeURIComponent(window.location.href);
+            } else {
+                let server = window.location.pathname.substring(0, window.location.pathname.indexOf("index.html"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                location.href = server + "/index.html?redirect=" + encodeURIComponent(window.location.href);
+            }
+            return;
+        });
+
         var activityButton = document.getElementById("activity-button");
 
         var activityPalette = new activitypalette.ActivityPalette(

diff --git a/activities/Constellation.activity/lib/sugar-web/activity/activity.js b/activities/Constellation.activity/lib/sugar-web/activity/activity.js
@@ -52,6 +52,23 @@ define(["sugar-web/activity/shortcut",
 
         datastoreObject = new datastore.DatastoreObject();
 
+        datastore.localStorage.load(function() {
+            var preferences = datastore.localStorage.getValue('sugar_settings');
+            if (preferences != null && preferences.name !== undefined) {
+                return;
+            }
+            if (window.location.protocol != "file:") {
+                location.href = window.location.protocol + "//" + window.location.host + "?redirect=" + encodeURIComponent(window.location.href);
+            } else {
+                let server = window.location.pathname.substring(0, window.location.pathname.indexOf("index.html"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                location.href = server + "/index.html?redirect=" + encodeURIComponent(window.location.href);
+            }
+            return;
+        });
+
         var activityButton = document.getElementById("activity-button");
 
         var activityPalette = new activitypalette.ActivityPalette(

diff --git a/activities/Curriculum.activity/lib/sugar-web/activity/activity.js b/activities/Curriculum.activity/lib/sugar-web/activity/activity.js
@@ -52,6 +52,23 @@ define(["sugar-web/activity/shortcut",
 
         datastoreObject = new datastore.DatastoreObject();
 
+        datastore.localStorage.load(function() {
+            var preferences = datastore.localStorage.getValue('sugar_settings');
+            if (preferences != null && preferences.name !== undefined) {
+                return;
+            }
+            if (window.location.protocol != "file:") {
+                location.href = window.location.protocol + "//" + window.location.host + "?redirect=" + encodeURIComponent(window.location.href);
+            } else {
+                let server = window.location.pathname.substring(0, window.location.pathname.indexOf("index.html"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                location.href = server + "/index.html?redirect=" + encodeURIComponent(window.location.href);
+            }
+            return;
+        });
+
         var activityButton = document.getElementById("activity-button");
 
         var activityPalette = new activitypalette.ActivityPalette(

diff --git a/activities/DollarStreet.activity/lib/sugar-web/activity/activity.js b/activities/DollarStreet.activity/lib/sugar-web/activity/activity.js
@@ -52,6 +52,23 @@ define(["sugar-web/activity/shortcut",
 
         datastoreObject = new datastore.DatastoreObject();
 
+        datastore.localStorage.load(function() {
+            var preferences = datastore.localStorage.getValue('sugar_settings');
+            if (preferences != null && preferences.name !== undefined) {
+                return;
+            }
+            if (window.location.protocol != "file:") {
+                location.href = window.location.protocol + "//" + window.location.host + "?redirect=" + encodeURIComponent(window.location.href);
+            } else {
+                let server = window.location.pathname.substring(0, window.location.pathname.indexOf("index.html"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                location.href = server + "/index.html?redirect=" + encodeURIComponent(window.location.href);
+            }
+            return;
+        });
+
         var activityButton = document.getElementById("activity-button");
 
         var activityPalette = new activitypalette.ActivityPalette(

diff --git a/activities/EbookReader.activity/lib/sugar-web/activity/activity.js b/activities/EbookReader.activity/lib/sugar-web/activity/activity.js
@@ -52,6 +52,23 @@ define(["sugar-web/activity/shortcut",
 
         datastoreObject = new datastore.DatastoreObject();
 
+        datastore.localStorage.load(function() {
+            var preferences = datastore.localStorage.getValue('sugar_settings');
+            if (preferences != null && preferences.name !== undefined) {
+                return;
+            }
+            if (window.location.protocol != "file:") {
+                location.href = window.location.protocol + "//" + window.location.host + "?redirect=" + encodeURIComponent(window.location.href);
+            } else {
+                let server = window.location.pathname.substring(0, window.location.pathname.indexOf("index.html"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                server = server.substring(0, server.lastIndexOf("/"));
+                location.href = server + "/index.html?redirect=" + encodeURIComponent(window.location.href);
+            }
+            return;
+        });
+
         var activityButton = document.getElementById("activity-button");
 
         var activityPalette = new activitypalette.ActivityPalette(