From 94c45f2bddcc51c483e432c2b4dc9dfaf351411f Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 22 Oct 2021 18:32:04 +0200 Subject: [PATCH] User Profiles loaded both at the Network and Desktop --- Projects/Network/SA/Modules/UserProfiles.js | 2 +- Projects/ProjectsSchema.json | 38 ++++++++++--------- .../Social-Trading/DK/modules/SocialGraph.js | 6 ++- .../NT/Modules/Social-Graph/SocialGraph.js | 20 ---------- .../Modules/Social-Graph/BotProfile.js | 2 +- .../{NT => SA}/Modules/Social-Graph/Post.js | 0 .../Modules/Social-Graph/UserProfile.js | 2 +- 7 files changed, 27 insertions(+), 43 deletions(-) delete mode 100644 Projects/Social-Trading/NT/Modules/Social-Graph/SocialGraph.js rename Projects/Social-Trading/{NT => SA}/Modules/Social-Graph/BotProfile.js (98%) rename Projects/Social-Trading/{NT => SA}/Modules/Social-Graph/Post.js (100%) rename Projects/Social-Trading/{NT => SA}/Modules/Social-Graph/UserProfile.js (98%) diff --git a/Projects/Network/SA/Modules/UserProfiles.js b/Projects/Network/SA/Modules/UserProfiles.js index a4c73b8fd..346b0b604 100644 --- a/Projects/Network/SA/Modules/UserProfiles.js +++ b/Projects/Network/SA/Modules/UserProfiles.js @@ -43,7 +43,7 @@ exports.newNetworkModulesUserProfiles = function newNetworkModulesUserProfiles() let userProfileId = userProfilePlugin.id let userHandle = config.signature.message - let userProfile = NT.projects.socialTrading.modules.socialGraphUserProfile.newSocialTradingModulesSocialGraphUserProfile() + let userProfile = SA.projects.socialTrading.modules.socialGraphUserProfile.newSocialTradingModulesSocialGraphUserProfile() userProfile.initialize( userProfileId, userHandle, diff --git a/Projects/ProjectsSchema.json b/Projects/ProjectsSchema.json index 14d4f5fb6..f016a2013 100644 --- a/Projects/ProjectsSchema.json +++ b/Projects/ProjectsSchema.json @@ -1468,24 +1468,6 @@ "functionName": "newSocialTradingModulesQueriesEvents", "fileName": "Queries/Events.js" }, - { - "name": "User Profile", - "propertyName": "socialGraphUserProfile", - "functionName": "newSocialTradingModulesSocialGraphUserProfile", - "fileName": "Social-Graph/UserProfile.js" - }, - { - "name": "Bot Profile", - "propertyName": "socialGraphBotProfile", - "functionName": "newSocialTradingModulesSocialGraphBotProfile", - "fileName": "Social-Graph/BotProfile.js" - }, - { - "name": "Post", - "propertyName": "socialGraphPost", - "functionName": "newSocialTradingModulesSocialGraphPost", - "fileName": "Social-Graph/Post.js" - }, { "name": "Social Graph", "propertyName": "socialGraph", @@ -1533,6 +1515,26 @@ ] }, "SA": { + "modules": [ + { + "name": "User Profile", + "propertyName": "socialGraphUserProfile", + "functionName": "newSocialTradingModulesSocialGraphUserProfile", + "fileName": "Social-Graph/UserProfile.js" + }, + { + "name": "Bot Profile", + "propertyName": "socialGraphBotProfile", + "functionName": "newSocialTradingModulesSocialGraphBotProfile", + "fileName": "Social-Graph/BotProfile.js" + }, + { + "name": "Post", + "propertyName": "socialGraphPost", + "functionName": "newSocialTradingModulesSocialGraphPost", + "fileName": "Social-Graph/Post.js" + } + ], "globals": [ { "name": "Query Constants", diff --git a/Projects/Social-Trading/DK/modules/SocialGraph.js b/Projects/Social-Trading/DK/modules/SocialGraph.js index 0d24d40b2..3c4c040fb 100644 --- a/Projects/Social-Trading/DK/modules/SocialGraph.js +++ b/Projects/Social-Trading/DK/modules/SocialGraph.js @@ -14,6 +14,7 @@ exports.newSocialTradingModulesSocialGraph = function newSocialTradingModulesSoc no need to ask it to a network node. */ let thisObject = { + userProfiles: undefined, initialize: initialize, finalize: finalize } @@ -24,7 +25,8 @@ exports.newSocialTradingModulesSocialGraph = function newSocialTradingModulesSoc } - function initialize() { - + async function initialize() { + thisObject.userProfiles = SA.projects.network.modules.userProfiles.newNetworkModulesUserProfiles() + await thisObject.userProfiles.initialize() } } \ No newline at end of file diff --git a/Projects/Social-Trading/NT/Modules/Social-Graph/SocialGraph.js b/Projects/Social-Trading/NT/Modules/Social-Graph/SocialGraph.js deleted file mode 100644 index 864add3cd..000000000 --- a/Projects/Social-Trading/NT/Modules/Social-Graph/SocialGraph.js +++ /dev/null @@ -1,20 +0,0 @@ -exports.newSocialTradingModulesSocialGraph = function newSocialTradingModulesSocialGraph() { - /* - This object represent the entire Social Graph. - */ - let thisObject = { - - initialize: initialize, - finalize: finalize - } - - return thisObject - - function finalize() { - - } - - function initialize() { - - } -} \ No newline at end of file diff --git a/Projects/Social-Trading/NT/Modules/Social-Graph/BotProfile.js b/Projects/Social-Trading/SA/Modules/Social-Graph/BotProfile.js similarity index 98% rename from Projects/Social-Trading/NT/Modules/Social-Graph/BotProfile.js rename to Projects/Social-Trading/SA/Modules/Social-Graph/BotProfile.js index 2f1b41b47..8d2d3b07a 100644 --- a/Projects/Social-Trading/NT/Modules/Social-Graph/BotProfile.js +++ b/Projects/Social-Trading/SA/Modules/Social-Graph/BotProfile.js @@ -80,7 +80,7 @@ exports.newSocialTradingModulesSocialGraphBotProfile = function newSocialTrading if (thisObject.posts.get(emitterPostHash) !== undefined) { throw ('Post Already Exists.') } else { - let post = NT.projects.socialTrading.modules.socialGraphPost.newSocialTradingModulesSocialGraphPost() + let post = SA.projects.socialTrading.modules.socialGraphPost.newSocialTradingModulesSocialGraphPost() post.initialize( emitterUserProfileId, targetUserProfileId, diff --git a/Projects/Social-Trading/NT/Modules/Social-Graph/Post.js b/Projects/Social-Trading/SA/Modules/Social-Graph/Post.js similarity index 100% rename from Projects/Social-Trading/NT/Modules/Social-Graph/Post.js rename to Projects/Social-Trading/SA/Modules/Social-Graph/Post.js diff --git a/Projects/Social-Trading/NT/Modules/Social-Graph/UserProfile.js b/Projects/Social-Trading/SA/Modules/Social-Graph/UserProfile.js similarity index 98% rename from Projects/Social-Trading/NT/Modules/Social-Graph/UserProfile.js rename to Projects/Social-Trading/SA/Modules/Social-Graph/UserProfile.js index a54d0b6b2..187a4f17f 100644 --- a/Projects/Social-Trading/NT/Modules/Social-Graph/UserProfile.js +++ b/Projects/Social-Trading/SA/Modules/Social-Graph/UserProfile.js @@ -84,7 +84,7 @@ exports.newSocialTradingModulesSocialGraphUserProfile = function newSocialTradin if (thisObject.posts.get(emitterPostHash) !== undefined) { throw ('Post Already Exists.') } else { - let post = NT.projects.socialTrading.modules.socialGraphPost.newSocialTradingModulesSocialGraphPost() + let post = SA.projects.socialTrading.modules.socialGraphPost.newSocialTradingModulesSocialGraphPost() post.initialize( emitterUserProfileId, targetUserProfileId,