From c600f77b846601a9f687ccb5ff51a8bced9f5379 Mon Sep 17 00:00:00 2001 From: Axel Date: Tue, 30 Nov 2021 14:33:18 -0300 Subject: [PATCH] Refactor frontend Add express server for desktop backend --- Desktop/DesktopApp.js | 30 +++-- Desktop/UI/Globals.js | 5 +- Desktop/UI/WebApp.js | 2 +- Desktop/UI/WebAppLoader.js | 8 +- Desktop/UI/WebAppPreLoader.js | 115 +++--------------- .../Fonts}/Saira-Condensed.woff2 | Bin .../fonts => WebServer/Fonts}/Saira.woff2 | Bin .../fonts => WebServer/Fonts}/segoeui.woff | Bin .../images => WebServer/Images}/favicon.ico | Bin Desktop/{src => WebServer/css}/main.css | 7 +- Desktop/WebServer/index.html | 10 ++ Desktop/backend/src/index.js | 42 +++++++ Desktop/frontend/api/service.js | 28 +++++ Desktop/{ => frontend}/config/env.js | 0 .../{ => frontend}/config/getHttpsConfig.js | 0 Desktop/{ => frontend}/config/modules.js | 0 Desktop/{ => frontend}/config/paths.js | 0 Desktop/{ => frontend}/config/pnpTs.js | 0 .../{ => frontend}/config/webpack.config.js | 0 .../config/webpackDevServer.config.js | 0 Desktop/{ => frontend}/public/index.html | 0 Desktop/{ => frontend}/public/manifest.json | 0 Desktop/{ => frontend}/public/robots.txt | 0 Desktop/{ => frontend}/scripts/build.js | 0 Desktop/{ => frontend}/scripts/start.js | 0 Desktop/{ => frontend}/scripts/test.js | 0 Desktop/{ => frontend}/src/components/Root.js | 0 .../src/components/User/UserCard.css | 0 .../src/components/User/UserCard.js | 2 +- .../components/UsersSidebar/UsersSidebar.css | 0 .../components/UsersSidebar/UsersSidebar.js | 0 .../src/components/feed/Feed.css | 0 .../src/components/feed/Feed.js | 0 .../src/components/home/App.css | 0 .../{ => frontend}/src/components/home/App.js | 4 + .../src/components/logo/Logo.css | 0 .../src/components/logo/Logo.js | 2 +- .../src/components/notFound/NotFound.js | 0 .../src/components/post/Post.css | 0 .../src/components/post/Post.js | 2 +- .../postPlaceholder/PostPlaceholder.css | 0 .../postPlaceholder/PostPlaceholder.js | 2 +- .../src/components/postsFeed/PostsFeed.css | 0 .../src/components/postsFeed/PostsFeed.js | 0 .../src/components/searchBox/SearchBox.css | 0 .../src/components/searchBox/SearchBox.js | 0 .../components/showMoreUsers/ShowMoreUsers.js | 0 .../src/components/sidebar/Sidebar.css | 0 .../src/components/sidebar/Sidebar.js | 0 .../components/sidebarItem/SidebarItem.css | 0 .../src/components/sidebarItem/SidebarItem.js | 0 .../suggestedUsers/SuggestedUsers.css | 0 .../suggestedUsers/SuggestedUsers.js | 0 .../components/userProfile/UserProfile.css | 0 .../src/components/userProfile/UserProfile.js | 0 .../userProfileHeader/UserProfileHeader.css | 0 .../userProfileHeader/UserProfileHeader.js | 0 Desktop/{ => frontend}/src/images/banner.jpg | Bin .../src/images/images/banner.jpg | Bin .../{ => frontend}/src/images/images/pfp.png | Bin .../src/images/images/superalgos.png | Bin Desktop/{ => frontend}/src/images/pfp.jpg | Bin .../{ => frontend}/src/images/superalgos.png | Bin Desktop/{ => frontend}/src/index.css | 0 Desktop/{ => frontend}/src/index.js | 12 +- Desktop/{ => frontend}/src/reportWebVitals.js | 0 Desktop/{ => frontend}/src/store/index.js | 0 .../src/store/slices/Globals.js | 0 .../DK/modules/httpInterface.js | 3 +- 69 files changed, 139 insertions(+), 135 deletions(-) rename Desktop/{public/fonts => WebServer/Fonts}/Saira-Condensed.woff2 (100%) rename Desktop/{public/fonts => WebServer/Fonts}/Saira.woff2 (100%) rename Desktop/{public/fonts => WebServer/Fonts}/segoeui.woff (100%) rename Desktop/{public/images => WebServer/Images}/favicon.ico (100%) rename Desktop/{src => WebServer/css}/main.css (98%) create mode 100644 Desktop/WebServer/index.html create mode 100644 Desktop/backend/src/index.js create mode 100644 Desktop/frontend/api/service.js rename Desktop/{ => frontend}/config/env.js (100%) rename Desktop/{ => frontend}/config/getHttpsConfig.js (100%) rename Desktop/{ => frontend}/config/modules.js (100%) rename Desktop/{ => frontend}/config/paths.js (100%) rename Desktop/{ => frontend}/config/pnpTs.js (100%) rename Desktop/{ => frontend}/config/webpack.config.js (100%) rename Desktop/{ => frontend}/config/webpackDevServer.config.js (100%) rename Desktop/{ => frontend}/public/index.html (100%) rename Desktop/{ => frontend}/public/manifest.json (100%) rename Desktop/{ => frontend}/public/robots.txt (100%) rename Desktop/{ => frontend}/scripts/build.js (100%) rename Desktop/{ => frontend}/scripts/start.js (100%) rename Desktop/{ => frontend}/scripts/test.js (100%) rename Desktop/{ => frontend}/src/components/Root.js (100%) rename Desktop/{ => frontend}/src/components/User/UserCard.css (100%) rename Desktop/{ => frontend}/src/components/User/UserCard.js (94%) rename Desktop/{ => frontend}/src/components/UsersSidebar/UsersSidebar.css (100%) rename Desktop/{ => frontend}/src/components/UsersSidebar/UsersSidebar.js (100%) rename Desktop/{ => frontend}/src/components/feed/Feed.css (100%) rename Desktop/{ => frontend}/src/components/feed/Feed.js (100%) rename Desktop/{ => frontend}/src/components/home/App.css (100%) rename Desktop/{ => frontend}/src/components/home/App.js (81%) rename Desktop/{ => frontend}/src/components/logo/Logo.css (100%) rename Desktop/{ => frontend}/src/components/logo/Logo.js (88%) rename Desktop/{ => frontend}/src/components/notFound/NotFound.js (100%) rename Desktop/{ => frontend}/src/components/post/Post.css (100%) rename Desktop/{ => frontend}/src/components/post/Post.js (98%) rename Desktop/{ => frontend}/src/components/postPlaceholder/PostPlaceholder.css (100%) rename Desktop/{ => frontend}/src/components/postPlaceholder/PostPlaceholder.js (97%) rename Desktop/{ => frontend}/src/components/postsFeed/PostsFeed.css (100%) rename Desktop/{ => frontend}/src/components/postsFeed/PostsFeed.js (100%) rename Desktop/{ => frontend}/src/components/searchBox/SearchBox.css (100%) rename Desktop/{ => frontend}/src/components/searchBox/SearchBox.js (100%) rename Desktop/{ => frontend}/src/components/showMoreUsers/ShowMoreUsers.js (100%) rename Desktop/{ => frontend}/src/components/sidebar/Sidebar.css (100%) rename Desktop/{ => frontend}/src/components/sidebar/Sidebar.js (100%) rename Desktop/{ => frontend}/src/components/sidebarItem/SidebarItem.css (100%) rename Desktop/{ => frontend}/src/components/sidebarItem/SidebarItem.js (100%) rename Desktop/{ => frontend}/src/components/suggestedUsers/SuggestedUsers.css (100%) rename Desktop/{ => frontend}/src/components/suggestedUsers/SuggestedUsers.js (100%) rename Desktop/{ => frontend}/src/components/userProfile/UserProfile.css (100%) rename Desktop/{ => frontend}/src/components/userProfile/UserProfile.js (100%) rename Desktop/{ => frontend}/src/components/userProfileHeader/UserProfileHeader.css (100%) rename Desktop/{ => frontend}/src/components/userProfileHeader/UserProfileHeader.js (100%) rename Desktop/{ => frontend}/src/images/banner.jpg (100%) rename Desktop/{ => frontend}/src/images/images/banner.jpg (100%) rename Desktop/{ => frontend}/src/images/images/pfp.png (100%) rename Desktop/{ => frontend}/src/images/images/superalgos.png (100%) rename Desktop/{ => frontend}/src/images/pfp.jpg (100%) rename Desktop/{ => frontend}/src/images/superalgos.png (100%) rename Desktop/{ => frontend}/src/index.css (100%) rename Desktop/{ => frontend}/src/index.js (64%) rename Desktop/{ => frontend}/src/reportWebVitals.js (100%) rename Desktop/{ => frontend}/src/store/index.js (100%) rename Desktop/{ => frontend}/src/store/slices/Globals.js (100%) diff --git a/Desktop/DesktopApp.js b/Desktop/DesktopApp.js index ceddff1da..93e4f79e3 100644 --- a/Desktop/DesktopApp.js +++ b/Desktop/DesktopApp.js @@ -53,23 +53,23 @@ exports.newDesktopApp = function newDesktopApp() { /* This is where we will process all the messages comming from our web app. */ - thisObject.webAppInterface = DK.projects.socialTrading.modules.webAppInterface.newSocialTradingModulesWebAppInterface() + thisObject.webAppInterface = DK.projects.socialTrading.modules.webAppInterface.newSocialTradingModulesWebAppInterface() // this sends events to the p2p network /* This is where we will process all the events comming from the p2p network. */ - thisObject.p2pNetworkInterface = DK.projects.socialTrading.modules.p2pNetworkInterface.newSocialTradingModulesP2PNetworkInterface() + thisObject.p2pNetworkInterface = DK.projects.socialTrading.modules.p2pNetworkInterface.newSocialTradingModulesP2PNetworkInterface() // this receives events from p2p network /* This is the Personal Social Graph for the user running this App. */ - thisObject.socialGraph = DK.projects.socialTrading.modules.socialGraph.newSocialTradingModulesSocialGraph() + thisObject.socialGraph = DK.projects.socialTrading.modules.socialGraph.newSocialTradingModulesSocialGraph() // await thisObject.socialGraph.initialize() - /* + /* /!* These are the Network Interfaces by which the Web App interacts with this Desktop Client. - */ + *!/ thisObject.webSocketsInterface = DK.projects.socialTrading.modules.webSocketsInterface.newDesktopModulesWebSocketsInterface() thisObject.webSocketsInterface.initialize() console.log('Desktop Client Web Sockets Interface ......................................... Listening at port ' + JSON.parse(DK.desktopApp.p2pNetworkClient.node.config).webSocketsPort) - +*/ /* TODO refactor this into something better */ @@ -77,13 +77,21 @@ exports.newDesktopApp = function newDesktopApp() { require('./src/UI/WebAppPreLoader').loadSuperalgos(); */ - /* let react = require('./scripts/start'); - react.start(JSON.parse(DK.desktopApp.p2pNetworkClient.node.config).webPort); + + +/* + + thisObject.httpInterface = DK.projects.socialTrading.modules.httpInterface.newDesktopModulesHttpInterface() + thisObject.httpInterface.initialize() + + let react = require('./frontend/scripts/start'); + react.start(JSON.parse(DK.desktopApp.p2pNetworkClient.node.config).webPort+1); */ - /* thisObject.httpInterface = DK.projects.socialTrading.modules.httpInterface.newDesktopModulesHttpInterface() - thisObject.httpInterface.initialize()*/ - console.log('Desktop Client Http Interface ................................................ Listening at port ' + JSON.parse(DK.desktopApp.p2pNetworkClient.node.config).webPort) + let express = require("./UI/WebAppPreLoader") + express.loadSuperalgos(+JSON.parse(DK.desktopApp.p2pNetworkClient.node.config).webPort + +2); + + console.log('Desktop Client Http Interface ................................................ Listening at port ' + JSON.parse(DK.desktopApp.p2pNetworkClient.node.config).webPort) } } } diff --git a/Desktop/UI/Globals.js b/Desktop/UI/Globals.js index 3d3b69587..08c8e9c05 100644 --- a/Desktop/UI/Globals.js +++ b/Desktop/UI/Globals.js @@ -1,6 +1,6 @@ /* Root object*/ /* Root objects*/ -let UI = { +exports.UI = { projects: {}, schemas: { projectSchema: undefined }, environment: undefined, @@ -8,10 +8,9 @@ let UI = { webApp: undefined } -let SA = { projects: {} } +exports.SA = { projects: {} } /* We will use this to load functions originally intended for Nodejs */ -let exports = {} diff --git a/Desktop/UI/WebApp.js b/Desktop/UI/WebApp.js index cb4b4da43..f39391b17 100644 --- a/Desktop/UI/WebApp.js +++ b/Desktop/UI/WebApp.js @@ -117,7 +117,7 @@ function newWebApp() { await UI.projects.socialTrading.modules.webSocketsWebAppClient.sendMessage( JSON.stringify(query) ) - .then(addToContentDiv) + .then(console.log) .catch(onError) function onError(errorMessage) { diff --git a/Desktop/UI/WebAppLoader.js b/Desktop/UI/WebAppLoader.js index ce4e46b77..080f84655 100644 --- a/Desktop/UI/WebAppLoader.js +++ b/Desktop/UI/WebAppLoader.js @@ -1,5 +1,5 @@ -function newWebAppLoader() { +exports.newWebAppLoader = ({port, SA, UI}) => { let thisObject = { loadModules: loadModules @@ -89,7 +89,7 @@ function newWebAppLoader() { for (let i = 0; i < modulesArray.length; i++) { let path = modulesArray[i] - REQUIREJS([path], onRequired) + UI.projects = require(path); function onRequired(pModule) { try { @@ -98,8 +98,8 @@ function newWebAppLoader() { if (downloadedCounter === modulesArray.length) { setTimeout(() => { - UI.webApp = newWebApp() - UI.webApp.initialize() + UI.webApp = require("../backend/src/index"); + UI.webApp.startExpress(); }, 500) } diff --git a/Desktop/UI/WebAppPreLoader.js b/Desktop/UI/WebAppPreLoader.js index 548e3da05..a8fb3549e 100644 --- a/Desktop/UI/WebAppPreLoader.js +++ b/Desktop/UI/WebAppPreLoader.js @@ -1,111 +1,30 @@ - -function loadSuperalgos() { - - let browser = checkBrowserVersion() - if ((browser.name !== "Chrome" && browser.name !== "Safari") || (browser.name === "Chrome" && parseInt(browser.version) < 85) || (browser.name === "Safari" && parseInt(browser.version) < 13)) { - alert("Superalgos is officially supported on Google Chrome 85 or Safari 13.1 and above. Your browser version has been detected as potentially beneath this. If you continue you may experience some functionaility issues.\n\nDetected Browser: " + browser.name + "\nVersion: " + browser.version) - } +exports.loadSuperalgos = (port) => { loadGlobals() function loadGlobals() { - let path = "Globals.js" - REQUIREJS([path], onRequired) - - function onRequired(pModule) { - setupEnvironment() - } + let {UI} = require('./Globals'); + setupEnvironment(UI); } - function setupEnvironment() { - httpRequest(undefined, 'Environment', onResponse) - - function onResponse(err, file) { - UI.environment = JSON.parse(file) - setupClientNode() - } + function setupEnvironment(UI) { + let ENVIRONMENT = require('../../Environment'); + UI.environment = ENVIRONMENT.newEnvironment(); + setupClientNode(UI); } - function setupClientNode() { - httpRequest(undefined, 'ClientNode', onResponse) - - function onResponse(err, file) { - UI.clientNode = JSON.parse(file) - setupProjectsSchema() - } + function setupClientNode(UI) { + UI.clientNode = DK.desktopApp.p2pNetworkClient.node; + setupProjectsSchema(UI); } - function setupProjectsSchema() { - httpRequest(undefined, 'ProjectsSchema', onResponse) - - function onResponse(err, file) { - UI.schemas.projectSchema = JSON.parse(file) - loadModules() - } + function setupProjectsSchema(UI) { + UI.schemas.projectSchema = require('../../Projects/ProjectsSchema.json'); + loadModules(UI) } - function loadModules() { - let path = "WebAppLoader.js" - REQUIREJS([path], onRequired) - - function onRequired(pModule) { - let APP_LOADER_MODULE = newWebAppLoader() - APP_LOADER_MODULE.loadModules() - } + function loadModules(UI) { + let APP_LOADER_MODULE = require('./WebAppLoader'); + APP_LOADER_MODULE.newWebAppLoader({port, SA, UI}).loadModules(); } -} - -function httpRequest(pContentToSend, pPath, callBackFunction) { - let xmlHttpRequest = new XMLHttpRequest() - xmlHttpRequest.onreadystatechange = function () { - if (this.readyState === 4 && this.status === 200) { - try { - callBackFunction(undefined, xmlHttpRequest.responseText) - } catch (err) { - console.log('[ERROR] httpRequest -> httpRequest -> err.stack = ' + err.stack) - console.log('[ERROR] httpRequest -> httpRequest -> pContentToSend = ' + pContentToSend) - console.log('[ERROR] httpRequest -> httpRequest -> pPath = ' + pPath) - console.log('[ERROR] httpRequest -> httpRequest -> xmlHttpRequest.responseText = ' + xmlHttpRequest.responseText) - console.log('[ERROR] httpRequest -> httpRequest -> callBackFunction = ' + callBackFunction) - - } - return - } else if (this.readyState === 4 && this.status === 404) { - callBackFunction({ result: "Fail", message: xmlHttpRequest.responseText.trim(), code: xmlHttpRequest.responseText.trim() }) - return - } - } - - if (pContentToSend === undefined) { - xmlHttpRequest.open("GET", pPath, true) - xmlHttpRequest.send() - } else { - try { - let blob = new Blob([pContentToSend], { type: 'text/plain' }) - xmlHttpRequest.open("POST", pPath, true) - xmlHttpRequest.send(blob) - } catch (err) { - if (ERROR_LOG === true) { console.log("[ERROR] callServer -> err.message = " + err.message) } - callBackFunction({ result: "Fail", message: err.message }) - } - } -} - -function checkBrowserVersion() { - - let ua = navigator.userAgent, tem, M = ua.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))\/?\s*(\d+)/i) || [] - if (/trident/i.test(M[1])) { - tem = /\brv[ :]+(\d+)/g.exec(ua) || [] - return { name: 'IE', version: (tem[1] || '') } - } - if (M[1] === 'Chrome') { - tem = ua.match(/\bOPR|Edge\/(\d+)/) - if (tem != null) { return { name: 'Opera', version: tem[1] } } - } - M = M[2] ? [M[1], M[2]] : [navigator.appName, navigator.appVersion, '-?'] - if ((tem = ua.match(/version\/(\d+)/i)) != null) { M.splice(1, 1, tem[1]) } - return { - name: M[0], - version: M[1] - } -} +} \ No newline at end of file diff --git a/Desktop/public/fonts/Saira-Condensed.woff2 b/Desktop/WebServer/Fonts/Saira-Condensed.woff2 similarity index 100% rename from Desktop/public/fonts/Saira-Condensed.woff2 rename to Desktop/WebServer/Fonts/Saira-Condensed.woff2 diff --git a/Desktop/public/fonts/Saira.woff2 b/Desktop/WebServer/Fonts/Saira.woff2 similarity index 100% rename from Desktop/public/fonts/Saira.woff2 rename to Desktop/WebServer/Fonts/Saira.woff2 diff --git a/Desktop/public/fonts/segoeui.woff b/Desktop/WebServer/Fonts/segoeui.woff similarity index 100% rename from Desktop/public/fonts/segoeui.woff rename to Desktop/WebServer/Fonts/segoeui.woff diff --git a/Desktop/public/images/favicon.ico b/Desktop/WebServer/Images/favicon.ico similarity index 100% rename from Desktop/public/images/favicon.ico rename to Desktop/WebServer/Images/favicon.ico diff --git a/Desktop/src/main.css b/Desktop/WebServer/css/main.css similarity index 98% rename from Desktop/src/main.css rename to Desktop/WebServer/css/main.css index 3434da2da..3dadc5d11 100644 --- a/Desktop/src/main.css +++ b/Desktop/WebServer/css/main.css @@ -1,5 +1,3 @@ -/* TODO migrate to react components*/ - /* latin */ @font-face { font-family: 'Saira'; @@ -23,6 +21,11 @@ font-weight: normal; font-style: normal; } + + .body{ + overflow-y: hidden; + overflow-x: hidden; + } .scroll-div { position:absolute; diff --git a/Desktop/WebServer/index.html b/Desktop/WebServer/index.html new file mode 100644 index 000000000..698cedc49 --- /dev/null +++ b/Desktop/WebServer/index.html @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Desktop/backend/src/index.js b/Desktop/backend/src/index.js new file mode 100644 index 000000000..3df385bc4 --- /dev/null +++ b/Desktop/backend/src/index.js @@ -0,0 +1,42 @@ +exports.startExpress = (port, SA, UI) => { + const express = require("express"); + const app = express(); + const newSocialTradingModulesWebAppInterface = DK.projects.socialTrading.modules.webAppInterface.newSocialTradingModulesWebAppInterface(); + +// define a route handler for the default home page + app.get("/health-check", (req, res) => { + res.send("all good"); + }); + + app.get("/profiles", async (req, res) => { + let userProfileTimeLine = loadUserProfileTimeline(SA, UI); + res.send(userProfileTimeLine); + }) + +// start the Express server + app.listen(port, () => { + console.log(`server started at http://localhost:${port} `); + }); + + + async function loadUserProfileTimeline(SA, UI) { + + let queryMessage = { + queryType: SA.projects.socialTrading.globals.queryTypes.UNFOLLOWED_USER_PROFILES, + emitterUserProfileId: undefined, + initialIndex: SA.projects.socialTrading.globals.queryConstants.INITIAL_INDEX_FIRST, + amountRequested: 3, + direction: SA.projects.socialTrading.globals.queryConstants.DIRECTION_UP + } + + let query = { + requestType: 'Query', + queryMessage: JSON.stringify(queryMessage) + } + + let profiles = await newSocialTradingModulesWebAppInterface.messageReceived( + JSON.stringify(query) + ); + return profiles; + } +} \ No newline at end of file diff --git a/Desktop/frontend/api/service.js b/Desktop/frontend/api/service.js new file mode 100644 index 000000000..b6f478683 --- /dev/null +++ b/Desktop/frontend/api/service.js @@ -0,0 +1,28 @@ +const baseURL = 'http://localhost:33249' +const GET = 'GET' +const POST = 'POST' +const DELETE = 'DELETE' +const UPDATE = 'UPDATE' + +function getProfiles(){ + return call('/profiles', GET); +} + +function getClientNode(){ + return call('/ClientNode', GET); +} + +function call(endpoint, method, body){ + return new Promise(async(resolve, reject) => { + fetch(baseURL + endpoint, { method:method, body:body }) + .then(response => resolve(response)) + .catch(error => reject(error)) + }) + +} + +export { + getProfiles, + getClientNode +} + diff --git a/Desktop/config/env.js b/Desktop/frontend/config/env.js similarity index 100% rename from Desktop/config/env.js rename to Desktop/frontend/config/env.js diff --git a/Desktop/config/getHttpsConfig.js b/Desktop/frontend/config/getHttpsConfig.js similarity index 100% rename from Desktop/config/getHttpsConfig.js rename to Desktop/frontend/config/getHttpsConfig.js diff --git a/Desktop/config/modules.js b/Desktop/frontend/config/modules.js similarity index 100% rename from Desktop/config/modules.js rename to Desktop/frontend/config/modules.js diff --git a/Desktop/config/paths.js b/Desktop/frontend/config/paths.js similarity index 100% rename from Desktop/config/paths.js rename to Desktop/frontend/config/paths.js diff --git a/Desktop/config/pnpTs.js b/Desktop/frontend/config/pnpTs.js similarity index 100% rename from Desktop/config/pnpTs.js rename to Desktop/frontend/config/pnpTs.js diff --git a/Desktop/config/webpack.config.js b/Desktop/frontend/config/webpack.config.js similarity index 100% rename from Desktop/config/webpack.config.js rename to Desktop/frontend/config/webpack.config.js diff --git a/Desktop/config/webpackDevServer.config.js b/Desktop/frontend/config/webpackDevServer.config.js similarity index 100% rename from Desktop/config/webpackDevServer.config.js rename to Desktop/frontend/config/webpackDevServer.config.js diff --git a/Desktop/public/index.html b/Desktop/frontend/public/index.html similarity index 100% rename from Desktop/public/index.html rename to Desktop/frontend/public/index.html diff --git a/Desktop/public/manifest.json b/Desktop/frontend/public/manifest.json similarity index 100% rename from Desktop/public/manifest.json rename to Desktop/frontend/public/manifest.json diff --git a/Desktop/public/robots.txt b/Desktop/frontend/public/robots.txt similarity index 100% rename from Desktop/public/robots.txt rename to Desktop/frontend/public/robots.txt diff --git a/Desktop/scripts/build.js b/Desktop/frontend/scripts/build.js similarity index 100% rename from Desktop/scripts/build.js rename to Desktop/frontend/scripts/build.js diff --git a/Desktop/scripts/start.js b/Desktop/frontend/scripts/start.js similarity index 100% rename from Desktop/scripts/start.js rename to Desktop/frontend/scripts/start.js diff --git a/Desktop/scripts/test.js b/Desktop/frontend/scripts/test.js similarity index 100% rename from Desktop/scripts/test.js rename to Desktop/frontend/scripts/test.js diff --git a/Desktop/src/components/Root.js b/Desktop/frontend/src/components/Root.js similarity index 100% rename from Desktop/src/components/Root.js rename to Desktop/frontend/src/components/Root.js diff --git a/Desktop/src/components/User/UserCard.css b/Desktop/frontend/src/components/User/UserCard.css similarity index 100% rename from Desktop/src/components/User/UserCard.css rename to Desktop/frontend/src/components/User/UserCard.css diff --git a/Desktop/src/components/User/UserCard.js b/Desktop/frontend/src/components/User/UserCard.js similarity index 94% rename from Desktop/src/components/User/UserCard.js rename to Desktop/frontend/src/components/User/UserCard.js index ed3657c2e..3b5e32bc2 100644 --- a/Desktop/src/components/User/UserCard.js +++ b/Desktop/frontend/src/components/User/UserCard.js @@ -1,7 +1,7 @@ import "./UserCard.css" import React, {useEffect} from 'react'; import {Button, Card, CardContent, CardMedia, Typography} from "@mui/material"; -import pic from "./../../images/superalgos.png" +import pic from "../../images/superalgos.png" const UserCard = ({name, id,followCallback}) => { diff --git a/Desktop/src/components/UsersSidebar/UsersSidebar.css b/Desktop/frontend/src/components/UsersSidebar/UsersSidebar.css similarity index 100% rename from Desktop/src/components/UsersSidebar/UsersSidebar.css rename to Desktop/frontend/src/components/UsersSidebar/UsersSidebar.css diff --git a/Desktop/src/components/UsersSidebar/UsersSidebar.js b/Desktop/frontend/src/components/UsersSidebar/UsersSidebar.js similarity index 100% rename from Desktop/src/components/UsersSidebar/UsersSidebar.js rename to Desktop/frontend/src/components/UsersSidebar/UsersSidebar.js diff --git a/Desktop/src/components/feed/Feed.css b/Desktop/frontend/src/components/feed/Feed.css similarity index 100% rename from Desktop/src/components/feed/Feed.css rename to Desktop/frontend/src/components/feed/Feed.css diff --git a/Desktop/src/components/feed/Feed.js b/Desktop/frontend/src/components/feed/Feed.js similarity index 100% rename from Desktop/src/components/feed/Feed.js rename to Desktop/frontend/src/components/feed/Feed.js diff --git a/Desktop/src/components/home/App.css b/Desktop/frontend/src/components/home/App.css similarity index 100% rename from Desktop/src/components/home/App.css rename to Desktop/frontend/src/components/home/App.css diff --git a/Desktop/src/components/home/App.js b/Desktop/frontend/src/components/home/App.js similarity index 81% rename from Desktop/src/components/home/App.js rename to Desktop/frontend/src/components/home/App.js index 156b4ae3d..c56fae951 100644 --- a/Desktop/src/components/home/App.js +++ b/Desktop/frontend/src/components/home/App.js @@ -3,8 +3,12 @@ import Sidebar from "../sidebar/Sidebar"; import UsersSidebar from "../UsersSidebar/UsersSidebar"; import {Stack} from "@mui/material"; import {Outlet} from "react-router-dom"; +import {getProfiles} from '../../../api/service' function App() { + getProfiles().then( response => { + console.log(response) + }); return (
diff --git a/Desktop/src/components/logo/Logo.css b/Desktop/frontend/src/components/logo/Logo.css similarity index 100% rename from Desktop/src/components/logo/Logo.css rename to Desktop/frontend/src/components/logo/Logo.css diff --git a/Desktop/src/components/logo/Logo.js b/Desktop/frontend/src/components/logo/Logo.js similarity index 88% rename from Desktop/src/components/logo/Logo.js rename to Desktop/frontend/src/components/logo/Logo.js index dcf4ba457..9d5084500 100644 --- a/Desktop/src/components/logo/Logo.js +++ b/Desktop/frontend/src/components/logo/Logo.js @@ -1,7 +1,7 @@ import './Logo.css'; import React from 'react'; import {Avatar, Stack} from "@mui/material"; -import pic from "./../../images/superalgos.png" +import pic from "../../images/superalgos.png" const Logo = props => { diff --git a/Desktop/src/components/notFound/NotFound.js b/Desktop/frontend/src/components/notFound/NotFound.js similarity index 100% rename from Desktop/src/components/notFound/NotFound.js rename to Desktop/frontend/src/components/notFound/NotFound.js diff --git a/Desktop/src/components/post/Post.css b/Desktop/frontend/src/components/post/Post.css similarity index 100% rename from Desktop/src/components/post/Post.css rename to Desktop/frontend/src/components/post/Post.css diff --git a/Desktop/src/components/post/Post.js b/Desktop/frontend/src/components/post/Post.js similarity index 98% rename from Desktop/src/components/post/Post.js rename to Desktop/frontend/src/components/post/Post.js index aee503089..545b02be5 100644 --- a/Desktop/src/components/post/Post.js +++ b/Desktop/frontend/src/components/post/Post.js @@ -2,7 +2,7 @@ import "./Post.css" import React, {useState} from 'react'; import {Avatar, Card, IconButton, Stack, Typography} from "@mui/material"; import {Autorenew, ThumbDown, ThumbUp} from "@mui/icons-material"; -import pic from "./../../images/superalgos.png" +import pic from "../../images/superalgos.png" const Post = () => { diff --git a/Desktop/src/components/postPlaceholder/PostPlaceholder.css b/Desktop/frontend/src/components/postPlaceholder/PostPlaceholder.css similarity index 100% rename from Desktop/src/components/postPlaceholder/PostPlaceholder.css rename to Desktop/frontend/src/components/postPlaceholder/PostPlaceholder.css diff --git a/Desktop/src/components/postPlaceholder/PostPlaceholder.js b/Desktop/frontend/src/components/postPlaceholder/PostPlaceholder.js similarity index 97% rename from Desktop/src/components/postPlaceholder/PostPlaceholder.js rename to Desktop/frontend/src/components/postPlaceholder/PostPlaceholder.js index 181ec65e9..ac8d359bb 100644 --- a/Desktop/src/components/postPlaceholder/PostPlaceholder.js +++ b/Desktop/frontend/src/components/postPlaceholder/PostPlaceholder.js @@ -1,7 +1,7 @@ import "./PostPlaceholder.css" import React from 'react'; import {Avatar, Button, Card, Stack, TextField, Typography} from "@mui/material"; -import pic from "./../../images/superalgos.png" +import pic from "../../images/superalgos.png" const PostPlaceholder = () => { diff --git a/Desktop/src/components/postsFeed/PostsFeed.css b/Desktop/frontend/src/components/postsFeed/PostsFeed.css similarity index 100% rename from Desktop/src/components/postsFeed/PostsFeed.css rename to Desktop/frontend/src/components/postsFeed/PostsFeed.css diff --git a/Desktop/src/components/postsFeed/PostsFeed.js b/Desktop/frontend/src/components/postsFeed/PostsFeed.js similarity index 100% rename from Desktop/src/components/postsFeed/PostsFeed.js rename to Desktop/frontend/src/components/postsFeed/PostsFeed.js diff --git a/Desktop/src/components/searchBox/SearchBox.css b/Desktop/frontend/src/components/searchBox/SearchBox.css similarity index 100% rename from Desktop/src/components/searchBox/SearchBox.css rename to Desktop/frontend/src/components/searchBox/SearchBox.css diff --git a/Desktop/src/components/searchBox/SearchBox.js b/Desktop/frontend/src/components/searchBox/SearchBox.js similarity index 100% rename from Desktop/src/components/searchBox/SearchBox.js rename to Desktop/frontend/src/components/searchBox/SearchBox.js diff --git a/Desktop/src/components/showMoreUsers/ShowMoreUsers.js b/Desktop/frontend/src/components/showMoreUsers/ShowMoreUsers.js similarity index 100% rename from Desktop/src/components/showMoreUsers/ShowMoreUsers.js rename to Desktop/frontend/src/components/showMoreUsers/ShowMoreUsers.js diff --git a/Desktop/src/components/sidebar/Sidebar.css b/Desktop/frontend/src/components/sidebar/Sidebar.css similarity index 100% rename from Desktop/src/components/sidebar/Sidebar.css rename to Desktop/frontend/src/components/sidebar/Sidebar.css diff --git a/Desktop/src/components/sidebar/Sidebar.js b/Desktop/frontend/src/components/sidebar/Sidebar.js similarity index 100% rename from Desktop/src/components/sidebar/Sidebar.js rename to Desktop/frontend/src/components/sidebar/Sidebar.js diff --git a/Desktop/src/components/sidebarItem/SidebarItem.css b/Desktop/frontend/src/components/sidebarItem/SidebarItem.css similarity index 100% rename from Desktop/src/components/sidebarItem/SidebarItem.css rename to Desktop/frontend/src/components/sidebarItem/SidebarItem.css diff --git a/Desktop/src/components/sidebarItem/SidebarItem.js b/Desktop/frontend/src/components/sidebarItem/SidebarItem.js similarity index 100% rename from Desktop/src/components/sidebarItem/SidebarItem.js rename to Desktop/frontend/src/components/sidebarItem/SidebarItem.js diff --git a/Desktop/src/components/suggestedUsers/SuggestedUsers.css b/Desktop/frontend/src/components/suggestedUsers/SuggestedUsers.css similarity index 100% rename from Desktop/src/components/suggestedUsers/SuggestedUsers.css rename to Desktop/frontend/src/components/suggestedUsers/SuggestedUsers.css diff --git a/Desktop/src/components/suggestedUsers/SuggestedUsers.js b/Desktop/frontend/src/components/suggestedUsers/SuggestedUsers.js similarity index 100% rename from Desktop/src/components/suggestedUsers/SuggestedUsers.js rename to Desktop/frontend/src/components/suggestedUsers/SuggestedUsers.js diff --git a/Desktop/src/components/userProfile/UserProfile.css b/Desktop/frontend/src/components/userProfile/UserProfile.css similarity index 100% rename from Desktop/src/components/userProfile/UserProfile.css rename to Desktop/frontend/src/components/userProfile/UserProfile.css diff --git a/Desktop/src/components/userProfile/UserProfile.js b/Desktop/frontend/src/components/userProfile/UserProfile.js similarity index 100% rename from Desktop/src/components/userProfile/UserProfile.js rename to Desktop/frontend/src/components/userProfile/UserProfile.js diff --git a/Desktop/src/components/userProfileHeader/UserProfileHeader.css b/Desktop/frontend/src/components/userProfileHeader/UserProfileHeader.css similarity index 100% rename from Desktop/src/components/userProfileHeader/UserProfileHeader.css rename to Desktop/frontend/src/components/userProfileHeader/UserProfileHeader.css diff --git a/Desktop/src/components/userProfileHeader/UserProfileHeader.js b/Desktop/frontend/src/components/userProfileHeader/UserProfileHeader.js similarity index 100% rename from Desktop/src/components/userProfileHeader/UserProfileHeader.js rename to Desktop/frontend/src/components/userProfileHeader/UserProfileHeader.js diff --git a/Desktop/src/images/banner.jpg b/Desktop/frontend/src/images/banner.jpg similarity index 100% rename from Desktop/src/images/banner.jpg rename to Desktop/frontend/src/images/banner.jpg diff --git a/Desktop/src/images/images/banner.jpg b/Desktop/frontend/src/images/images/banner.jpg similarity index 100% rename from Desktop/src/images/images/banner.jpg rename to Desktop/frontend/src/images/images/banner.jpg diff --git a/Desktop/src/images/images/pfp.png b/Desktop/frontend/src/images/images/pfp.png similarity index 100% rename from Desktop/src/images/images/pfp.png rename to Desktop/frontend/src/images/images/pfp.png diff --git a/Desktop/src/images/images/superalgos.png b/Desktop/frontend/src/images/images/superalgos.png similarity index 100% rename from Desktop/src/images/images/superalgos.png rename to Desktop/frontend/src/images/images/superalgos.png diff --git a/Desktop/src/images/pfp.jpg b/Desktop/frontend/src/images/pfp.jpg similarity index 100% rename from Desktop/src/images/pfp.jpg rename to Desktop/frontend/src/images/pfp.jpg diff --git a/Desktop/src/images/superalgos.png b/Desktop/frontend/src/images/superalgos.png similarity index 100% rename from Desktop/src/images/superalgos.png rename to Desktop/frontend/src/images/superalgos.png diff --git a/Desktop/src/index.css b/Desktop/frontend/src/index.css similarity index 100% rename from Desktop/src/index.css rename to Desktop/frontend/src/index.css diff --git a/Desktop/src/index.js b/Desktop/frontend/src/index.js similarity index 64% rename from Desktop/src/index.js rename to Desktop/frontend/src/index.js index d7f9b6349..21ebe21b0 100644 --- a/Desktop/src/index.js +++ b/Desktop/frontend/src/index.js @@ -5,17 +5,7 @@ import {Provider} from "react-redux"; import reducers from "./store"; import Root from "./components/Root"; -/* - TODO save -exports.UI = { - projects: {}, - schemas: { projectSchema: undefined }, - environment: undefined, - clientNode: undefined, - webApp: undefined -} -exports.SA = { projects: {} } -*/ + ReactDOM.render( diff --git a/Desktop/src/reportWebVitals.js b/Desktop/frontend/src/reportWebVitals.js similarity index 100% rename from Desktop/src/reportWebVitals.js rename to Desktop/frontend/src/reportWebVitals.js diff --git a/Desktop/src/store/index.js b/Desktop/frontend/src/store/index.js similarity index 100% rename from Desktop/src/store/index.js rename to Desktop/frontend/src/store/index.js diff --git a/Desktop/src/store/slices/Globals.js b/Desktop/frontend/src/store/slices/Globals.js similarity index 100% rename from Desktop/src/store/slices/Globals.js rename to Desktop/frontend/src/store/slices/Globals.js diff --git a/Projects/Social-Trading/DK/modules/httpInterface.js b/Projects/Social-Trading/DK/modules/httpInterface.js index 639e1e360..b531961a2 100644 --- a/Projects/Social-Trading/DK/modules/httpInterface.js +++ b/Projects/Social-Trading/DK/modules/httpInterface.js @@ -24,7 +24,8 @@ exports.newDesktopModulesHttpInterface = function newDesktopModulesHttpInterface if (process.argv.includes("noBrowser")) { //Running Client only with no UI. } else { - SA.nodeModules.open('http://localhost:' + port) + // no ui needed + // SA.nodeModules.open('http://localhost:' + port) } }