diff --git a/Desktop/DesktopApp.js b/Desktop/DesktopApp.js index 13795715d..4e8afbaad 100644 --- a/Desktop/DesktopApp.js +++ b/Desktop/DesktopApp.js @@ -72,10 +72,13 @@ exports.newDesktopApp = function newDesktopApp() { /* TODO refactor this into something better */ - 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 preloader = require('./UI/WebAppPreLoader'); + + /* 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()*/ 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..c78ce9079 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,7 @@ let UI = { webApp: undefined } -let SA = { projects: {} } -/* -We will use this to load functions originally intended for Nodejs -*/ -let exports = {} +exports.SA = { projects: {} } + diff --git a/Desktop/UI/WebApp.js b/Desktop/UI/WebApp.js index f0d6afd9d..b4e634eff 100644 --- a/Desktop/UI/WebApp.js +++ b/Desktop/UI/WebApp.js @@ -1,12 +1,3 @@ -const reactReqs = { - - a: REQUIREJS([], () => {}), - React: require('react'), - ReactDOM: require('react-dom'), - ReactBase: require("../components/ReactBase") -} - - function newWebApp() { /* In it's current state of development, the Web App only has one module. @@ -30,10 +21,10 @@ function newWebApp() { setupRootObject(UI, 'UI') setupRootObject(SA, 'SA') await UI.projects.socialTrading.modules.webSocketsWebAppClient.initialize() - loadReactDom(); - // loadWUserProfileTimeline() - // loadWhoToFollow() - // setupEventHandlers() + // loadReactDom(); + loadWUserProfileTimeline() + loadWhoToFollow() + setupEventHandlers() } catch (err) { console.log('[ERROR] initialize -> err.stack = ' + err.stack) } diff --git a/Desktop/UI/WebAppPreLoader.js b/Desktop/UI/WebAppPreLoader.js index 548e3da05..5676c2925 100644 --- a/Desktop/UI/WebAppPreLoader.js +++ b/Desktop/UI/WebAppPreLoader.js @@ -1,29 +1,21 @@ - +loadSuperalgos(); + 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) - } + /* + 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 functionality issues.\n\nDetected Browser: " + browser.name + "\nVersion: " + browser.version) + } + */ loadGlobals() function loadGlobals() { - let path = "Globals.js" - REQUIREJS([path], onRequired) - function onRequired(pModule) { - setupEnvironment() - } - } - - function setupEnvironment() { - httpRequest(undefined, 'Environment', onResponse) - - function onResponse(err, file) { - UI.environment = JSON.parse(file) - setupClientNode() - } + let globals = require('./Globals'); + globals.UI.environment = require('../../Environment') + setupClientNode() } function setupClientNode() { diff --git a/Desktop/WebServer/index.html b/Desktop/WebServer/index.html deleted file mode 100644 index ab04c6658..000000000 --- a/Desktop/WebServer/index.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - - Superalgos Desktop - - - - - - - - - - -
- - - \ No newline at end of file diff --git a/Desktop/components/ReactBase.js b/Desktop/components/ReactBase.js deleted file mode 100644 index da695b918..000000000 --- a/Desktop/components/ReactBase.js +++ /dev/null @@ -1,16 +0,0 @@ -import React from 'react'; -import {Provider} from "react-redux"; -import reducers from "../store"; -import Root from "./Root"; - -const ReactBase = () => { - return ( - - - - - - ); -}; - -export default ReactBase; diff --git a/Desktop/components/Root.js b/Desktop/components/Root.js deleted file mode 100644 index dd45f133c..000000000 --- a/Desktop/components/Root.js +++ /dev/null @@ -1,31 +0,0 @@ -import React from 'react'; -import {BrowserRouter, Route, Routes} from 'react-router-dom'; -import App from './home/App'; -import UserProfile from "./userProfile/UserProfile"; -import NotFound from "./notFound/NotFound"; -import Feed from "./feed/Feed"; -import PostPlaceholder from "./postPlaceholder/PostPlaceholder"; - - -const Root = () => { - return ( - - - }> - }/> - }> - {/*}/>*/} - - }/> - - - } - /> - - ) -} - -export default Root; \ No newline at end of file diff --git a/Desktop/components/User/UserCard.css b/Desktop/components/User/UserCard.css deleted file mode 100644 index 2b98ba940..000000000 --- a/Desktop/components/User/UserCard.css +++ /dev/null @@ -1,17 +0,0 @@ -.followButton { - margin: 0.5rem; - width: 3rem; - max-height: 1.5rem; -} - -.userCard { - display: flex; - flex-direction: row; - align-items: center; - padding: 0.25rem 1rem; -} - -.avatar { - height: 3rem; - width: 3rem; -} \ No newline at end of file diff --git a/Desktop/components/User/UserCard.js b/Desktop/components/User/UserCard.js deleted file mode 100644 index ed3657c2e..000000000 --- a/Desktop/components/User/UserCard.js +++ /dev/null @@ -1,30 +0,0 @@ -import "./UserCard.css" -import React, {useEffect} from 'react'; -import {Button, Card, CardContent, CardMedia, Typography} from "@mui/material"; -import pic from "./../../images/superalgos.png" - -const UserCard = ({name, id,followCallback}) => { - - useEffect(() => { - console.log(`created user with id ${id}`) - }, [id]); - - return ( - - - - {name} - - - - ); -}; - -export default UserCard; diff --git a/Desktop/components/UsersSidebar/UsersSidebar.css b/Desktop/components/UsersSidebar/UsersSidebar.css deleted file mode 100644 index 5cd540978..000000000 --- a/Desktop/components/UsersSidebar/UsersSidebar.css +++ /dev/null @@ -1,4 +0,0 @@ -.showMore { - width: 100%; - text-align: center; -} diff --git a/Desktop/components/UsersSidebar/UsersSidebar.js b/Desktop/components/UsersSidebar/UsersSidebar.js deleted file mode 100644 index afd23ed51..000000000 --- a/Desktop/components/UsersSidebar/UsersSidebar.js +++ /dev/null @@ -1,23 +0,0 @@ -import './UsersSidebar.css'; -import {Stack} from "@mui/material"; -import SearchBox from "../searchBox/SearchBox"; -import SuggestedUsers from "../suggestedUsers/SuggestedUsers"; - - -const UsersSidebar = () => { - - const showMoreCallback = () => console.log("clicked show more"); - return ( - - - - - - ); -} - -export default UsersSidebar; diff --git a/Desktop/components/feed/Feed.css b/Desktop/components/feed/Feed.css deleted file mode 100644 index 7724e2fb7..000000000 --- a/Desktop/components/feed/Feed.css +++ /dev/null @@ -1,11 +0,0 @@ -.feed { - width: 40rem; - height: 95vh; - overflow: auto; - -ms-overflow-style: none; /* Hide scrollbar for IE and Edge */ - scrollbar-width: none; /* Hide scrollbar for Firefox */ -} - -.feed::-webkit-scrollbar { /* Hide scrollbar for Chrome, Safari and Opera */ - display: none; -} \ No newline at end of file diff --git a/Desktop/components/feed/Feed.js b/Desktop/components/feed/Feed.js deleted file mode 100644 index e731d6d2f..000000000 --- a/Desktop/components/feed/Feed.js +++ /dev/null @@ -1,14 +0,0 @@ -import './Feed.css'; -import PostPlaceholder from "../postPlaceholder/PostPlaceholder"; -import PostsFeed from "../postsFeed/PostsFeed"; - -const Feed = () => { - return ( -
- - -
- ); -} - -export default Feed; diff --git a/Desktop/components/home/App.css b/Desktop/components/home/App.css deleted file mode 100644 index a255b898a..000000000 --- a/Desktop/components/home/App.css +++ /dev/null @@ -1,7 +0,0 @@ -.app { - height: 100%; -} - -.middleSection{ - width: 40rem; -} \ No newline at end of file diff --git a/Desktop/components/home/App.js b/Desktop/components/home/App.js deleted file mode 100644 index 156b4ae3d..000000000 --- a/Desktop/components/home/App.js +++ /dev/null @@ -1,23 +0,0 @@ -import './App.css'; -import Sidebar from "../sidebar/Sidebar"; -import UsersSidebar from "../UsersSidebar/UsersSidebar"; -import {Stack} from "@mui/material"; -import {Outlet} from "react-router-dom"; - -function App() { - return ( -
- - - - - - - -
- ); -} - -export default App; diff --git a/Desktop/components/logo/Logo.css b/Desktop/components/logo/Logo.css deleted file mode 100644 index f35b42bc0..000000000 --- a/Desktop/components/logo/Logo.css +++ /dev/null @@ -1,10 +0,0 @@ -/*noinspection CssInvalidPropertyValue*/ -.logo { - display: inline-flex; - align-items: center; - height: 3rem; - width: 100%; -} -.icon { - margin: 0 0.5rem; -} \ No newline at end of file diff --git a/Desktop/components/logo/Logo.js b/Desktop/components/logo/Logo.js deleted file mode 100644 index dcf4ba457..000000000 --- a/Desktop/components/logo/Logo.js +++ /dev/null @@ -1,17 +0,0 @@ -import './Logo.css'; -import React from 'react'; -import {Avatar, Stack} from "@mui/material"; -import pic from "./../../images/superalgos.png" - - -const Logo = props => { - /* TODO add on click redirect to / */ - return ( - - -
SuperAlgos
- - ); -}; - -export default Logo; diff --git a/Desktop/components/notFound/NotFound.js b/Desktop/components/notFound/NotFound.js deleted file mode 100644 index fc3b64a78..000000000 --- a/Desktop/components/notFound/NotFound.js +++ /dev/null @@ -1,10 +0,0 @@ -import React, {useEffect} from 'react'; -import {useNavigate} from "react-router-dom"; - -const NotFound = () => { - let navigate = useNavigate(); - useEffect(() => navigate("/"), [navigate]) - return null; -}; - -export default NotFound; diff --git a/Desktop/components/post/Post.css b/Desktop/components/post/Post.css deleted file mode 100644 index cc9b51675..000000000 --- a/Desktop/components/post/Post.css +++ /dev/null @@ -1,32 +0,0 @@ -.post { - min-width: 5rem; /* todo needs to set a minimum width, but overriding from parent*/ - max-width: 100%; - min-height: 5rem; /* todo needs tbd. needed actually? */ - max-height: 100%; /* todo need to be 8rem, but is collapsing without scroll. need fix*/ - padding: 0.5rem; -} - -.postAvatarContainer { - display: flex; - justify-content: center; - align-items: center; - width: 3rem; - height: 3rem; -} -.postBody { - height: 12.5rem; - padding-left: 2.8rem; -} - -.postUserName { - padding: 0.75rem; - justify-content: center; - align-items: center; -} - -.postFooter { - justify-content: space-evenly; - padding: 0.15rem; - width: 100%; - display: flex; -} diff --git a/Desktop/components/post/Post.js b/Desktop/components/post/Post.js deleted file mode 100644 index 15096d30b..000000000 --- a/Desktop/components/post/Post.js +++ /dev/null @@ -1,62 +0,0 @@ -import "./Post.css" -import React from 'react'; -import {Avatar, Card, IconButton, Stack} from "@mui/material"; -import {Autorenew, ThumbDown, ThumbUp} from "@mui/icons-material"; -import pic from "./../../images/superalgos.png" - -const Post = () => { - - const userName = "User Name", - postBody = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."; - - function onButtonClick() { - console.log("Clicked the button"); - } - - return ( - - - - - - - {/*use props or local variables*/} - {userName} - - - - - - {/*use props or local variables*/} - {postBody} - - - {/* footer (buttons: like/dislike, repost) */} - { /* TODO remove unnecessary arrow function*/ - onButtonClick() - }} - > - - - {/* TODO remove unnecessary arrow function*/ - - onButtonClick() - }} - > - - - {/* TODO remove unnecessary arrow function*/ - onButtonClick() - }} - > - - - - - ); -}; - -export default Post; diff --git a/Desktop/components/postPlaceholder/PostPlaceholder.css b/Desktop/components/postPlaceholder/PostPlaceholder.css deleted file mode 100644 index eab70d064..000000000 --- a/Desktop/components/postPlaceholder/PostPlaceholder.css +++ /dev/null @@ -1,47 +0,0 @@ -.postPlaceholder { - width: 40rem; - padding: 0.5rem; -} - -.postPlaceholderContainer { - min-width: 100%; - max-width: 100%; -} - -.postPlaceholderInputBoxContainer { - -} - -.postPlaceholderAvatar { - display: flex; - justify-content: center; - align-items: center; - width: 3rem; - height: 3rem; -} - -.postPlaceholderTextField { - width: 90%; - border: 5px; -} - -.postPlaceholderInputBox { - width: auto; - padding: 0.5rem; -} - -.postFeedAccountCircle { - -} - -.postPlaceholderButtonStyle { - padding: 0.75rem; - display: flex; - width: auto; - justify-content: flex-end; -} - -.postPlaceholderButton { - height: 1.5rem; - width: 5rem; -} diff --git a/Desktop/components/postPlaceholder/PostPlaceholder.js b/Desktop/components/postPlaceholder/PostPlaceholder.js deleted file mode 100644 index 181ec65e9..000000000 --- a/Desktop/components/postPlaceholder/PostPlaceholder.js +++ /dev/null @@ -1,54 +0,0 @@ -import "./PostPlaceholder.css" -import React from 'react'; -import {Avatar, Button, Card, Stack, TextField, Typography} from "@mui/material"; -import pic from "./../../images/superalgos.png" - -const PostPlaceholder = () => { - - function onButtonClick() { - console.log("Clicked Post button"); - } - - return ( -
-

Posts

-
- - - - - - - - - - - - - - - -
-
- ); -}; - -export default PostPlaceholder; diff --git a/Desktop/components/postsFeed/PostsFeed.css b/Desktop/components/postsFeed/PostsFeed.css deleted file mode 100644 index 87203bb43..000000000 --- a/Desktop/components/postsFeed/PostsFeed.css +++ /dev/null @@ -1,4 +0,0 @@ -.postFeedContainer { - padding: 0.5rem ; - width: 100%; -} diff --git a/Desktop/components/postsFeed/PostsFeed.js b/Desktop/components/postsFeed/PostsFeed.js deleted file mode 100644 index 5eb3bcf30..000000000 --- a/Desktop/components/postsFeed/PostsFeed.js +++ /dev/null @@ -1,26 +0,0 @@ -import './PostsFeed.css'; -import React from 'react'; -import {Stack} from "@mui/material"; -import Post from "../post/Post"; - -const PostsFeed = () => { - const postFeed = [1, 2, 3, 4, 5]; - - const posts = postFeed.map( - value => { - return - } - ) - - return ( -
{/* todo margin appearing to the right of the div */} - - - {posts} - -
- ); -}; - -export default PostsFeed; \ No newline at end of file diff --git a/Desktop/components/searchBox/SearchBox.css b/Desktop/components/searchBox/SearchBox.css deleted file mode 100644 index 21b5110d5..000000000 --- a/Desktop/components/searchBox/SearchBox.css +++ /dev/null @@ -1,3 +0,0 @@ -.searchIcon { - margin: 1rem 0.5rem; -} \ No newline at end of file diff --git a/Desktop/components/searchBox/SearchBox.js b/Desktop/components/searchBox/SearchBox.js deleted file mode 100644 index 2d64998f8..000000000 --- a/Desktop/components/searchBox/SearchBox.js +++ /dev/null @@ -1,16 +0,0 @@ -import React from 'react'; -import {Box, TextField} from "@mui/material"; -import {Search} from "@mui/icons-material"; - -const SearchBox = () => { - return ( -
- - - - -
- ); -}; - -export default SearchBox; diff --git a/Desktop/components/showMoreUsers/ShowMoreUsers.js b/Desktop/components/showMoreUsers/ShowMoreUsers.js deleted file mode 100644 index ccf4128a5..000000000 --- a/Desktop/components/showMoreUsers/ShowMoreUsers.js +++ /dev/null @@ -1,16 +0,0 @@ -import React from 'react'; -import {Link} from "@mui/material"; - -const ShowMoreUsers = ({showMoreCallback}) => { - return ( - - Show more - - ); -}; - - -export default ShowMoreUsers; \ No newline at end of file diff --git a/Desktop/components/sidebar/Sidebar.css b/Desktop/components/sidebar/Sidebar.css deleted file mode 100644 index 0f6fac6c2..000000000 --- a/Desktop/components/sidebar/Sidebar.css +++ /dev/null @@ -1,3 +0,0 @@ -.sidebar{ - height: 100%; -} \ No newline at end of file diff --git a/Desktop/components/sidebar/Sidebar.js b/Desktop/components/sidebar/Sidebar.js deleted file mode 100644 index 63a9bcbe9..000000000 --- a/Desktop/components/sidebar/Sidebar.js +++ /dev/null @@ -1,42 +0,0 @@ -import './Sidebar.css'; -import {Divider, Stack} from "@mui/material"; -import SidebarItem from "../sidebarItem/SidebarItem"; -import Logo from "../logo/Logo"; -import HomeIcon from '@mui/icons-material/Home'; -import PostAddIcon from '@mui/icons-material/PostAdd'; -import PersonIcon from '@mui/icons-material/Person'; - -const Sidebar = props => { - const menuOptions = [{name: "Home", icon: HomeIcon}, - {name: "Profile", icon: PersonIcon}, - {name: "Post", icon: PostAddIcon} - /*, "Explore", "Notifications", "Messages", "Bookmarks", "Lists", "More"*/] - - const menuItems = menuOptions.map(option => { - return - }) - - return ( -
- - - }> - {menuItems} - - - - -
- ); -} - -export default Sidebar; diff --git a/Desktop/components/sidebarItem/SidebarItem.css b/Desktop/components/sidebarItem/SidebarItem.css deleted file mode 100644 index 66d219931..000000000 --- a/Desktop/components/sidebarItem/SidebarItem.css +++ /dev/null @@ -1,21 +0,0 @@ - -.sidebarItem { - /*TODO add on hover*/ - /*TODO add breakpoints*/ - width: 15vw; -} - - -.sidebarText { - /*TODO hide when too small*/ - - width: auto; - text-align: center; -} - -.sidebarIcon { - width: auto; - padding: 0 1rem; - -} - diff --git a/Desktop/components/sidebarItem/SidebarItem.js b/Desktop/components/sidebarItem/SidebarItem.js deleted file mode 100644 index 40cf0bc6e..000000000 --- a/Desktop/components/sidebarItem/SidebarItem.js +++ /dev/null @@ -1,22 +0,0 @@ -import './SidebarItem.css'; -import {Stack} from "@mui/material"; -import {useNavigate} from "react-router-dom"; - - -const SidebarItem = ({value, Icon}) => { - let navigate = useNavigate(); - const handleClick = () => { - navigate(`/${value}`) - } - - return ( -
- - -
{value}
- -
- ); -} - -export default SidebarItem; diff --git a/Desktop/components/suggestedUsers/SuggestedUsers.css b/Desktop/components/suggestedUsers/SuggestedUsers.css deleted file mode 100644 index e69de29bb..000000000 diff --git a/Desktop/components/suggestedUsers/SuggestedUsers.js b/Desktop/components/suggestedUsers/SuggestedUsers.js deleted file mode 100644 index e2cde9d4b..000000000 --- a/Desktop/components/suggestedUsers/SuggestedUsers.js +++ /dev/null @@ -1,32 +0,0 @@ -import "./SuggestedUsers.css" -import React, {useEffect} from 'react'; -import UserCard from "../User/UserCard"; -import ShowMoreUsers from "../showMoreUsers/ShowMoreUsers"; -import {Stack} from "@mui/material"; - - -const SuggestedUsers = ({showMoreCallback}) => { - const usersIds = [1, 2, 3, 4, 5]; - - - const users = usersIds.map(value => { - let callBack = () => console.log(`Clicked follow on user${value}`); - return - }) - - useEffect(() => { - console.log("SuggestedUsersConstructor called") - }, []); - - - return ( - - {users} - - - ); -}; -export default SuggestedUsers; diff --git a/Desktop/components/userProfile/UserProfile.css b/Desktop/components/userProfile/UserProfile.css deleted file mode 100644 index 1ff38e5f2..000000000 --- a/Desktop/components/userProfile/UserProfile.css +++ /dev/null @@ -1,41 +0,0 @@ -.userSection { - margin-top: 50px; -} - -.banner { - height: 10rem; -} - -.profileAvatar { - height: 7rem !important; - width: 7rem !important; - border-radius: 50%; -} - -.profilePicBG { - display: flex; - align-items: center; - justify-content: center; - background: none no-repeat scroll 0 0 #fff; - position: relative; - height: 8rem !important; - width: 8rem !important; - border-radius: 50%; -} - -.profileCard { - margin-top: -50px; - display: flex; - flex-direction: row; - height: 8rem; -} - -.profileSection { - width: 100%; - overflow: initial !important; /* TODO check this is needed */ - height: 15rem; -} - -.middleSection { - width: 40rem; -} \ No newline at end of file diff --git a/Desktop/components/userProfile/UserProfile.js b/Desktop/components/userProfile/UserProfile.js deleted file mode 100644 index d6ba38d64..000000000 --- a/Desktop/components/userProfile/UserProfile.js +++ /dev/null @@ -1,28 +0,0 @@ -import "./UserProfile.css" -import React from 'react'; -import UserProfileHeader from "../userProfileHeader/UserProfileHeader"; -import {Stack} from "@mui/material"; -import PostsFeed from "../postsFeed/PostsFeed"; - - -const UserProfile = () => { - - /*TODO finish this shit*/ - - let actualUser = 'Loui Molina'; - - return ( - - - - - - ); -}; - - -export default UserProfile; diff --git a/Desktop/components/userProfileHeader/UserProfileHeader.css b/Desktop/components/userProfileHeader/UserProfileHeader.css deleted file mode 100644 index e69de29bb..000000000 diff --git a/Desktop/components/userProfileHeader/UserProfileHeader.js b/Desktop/components/userProfileHeader/UserProfileHeader.js deleted file mode 100644 index 96a06df18..000000000 --- a/Desktop/components/userProfileHeader/UserProfileHeader.js +++ /dev/null @@ -1,30 +0,0 @@ -import React from 'react'; -import {Card, CardContent, CardMedia, Typography} from "@mui/material"; -import banner from "../../images/banner.jpg"; -import pfp from "../../images/pfp.png"; - -const UserProfileHeader = ({actualUser}) => { - return ( - - -
-
- -
- - {actualUser} - -
- - ); -}; - -export default UserProfileHeader; diff --git a/Desktop/public/favicon.ico b/Desktop/public/favicon.ico deleted file mode 100644 index cd2c5d6af..000000000 Binary files a/Desktop/public/favicon.ico and /dev/null differ diff --git a/Desktop/WebServer/Fonts/Saira-Condensed.woff2 b/Desktop/public/fonts/Saira-Condensed.woff2 similarity index 100% rename from Desktop/WebServer/Fonts/Saira-Condensed.woff2 rename to Desktop/public/fonts/Saira-Condensed.woff2 diff --git a/Desktop/WebServer/Fonts/Saira.woff2 b/Desktop/public/fonts/Saira.woff2 similarity index 100% rename from Desktop/WebServer/Fonts/Saira.woff2 rename to Desktop/public/fonts/Saira.woff2 diff --git a/Desktop/WebServer/Fonts/segoeui.woff b/Desktop/public/fonts/segoeui.woff similarity index 100% rename from Desktop/WebServer/Fonts/segoeui.woff rename to Desktop/public/fonts/segoeui.woff diff --git a/Desktop/WebServer/Images/favicon.ico b/Desktop/public/images/favicon.ico similarity index 100% rename from Desktop/WebServer/Images/favicon.ico rename to Desktop/public/images/favicon.ico diff --git a/Desktop/public/index.html b/Desktop/public/index.html index ecddaab42..81a214993 100644 --- a/Desktop/public/index.html +++ b/Desktop/public/index.html @@ -1,43 +1,32 @@ - - - - - - - - - - React App + + + + - - -
- + + +
diff --git a/Desktop/public/logo192.png b/Desktop/public/logo192.png deleted file mode 100644 index fc44b0a37..000000000 Binary files a/Desktop/public/logo192.png and /dev/null differ diff --git a/Desktop/public/logo512.png b/Desktop/public/logo512.png deleted file mode 100644 index a4e47a654..000000000 Binary files a/Desktop/public/logo512.png and /dev/null differ diff --git a/Desktop/src/components/ReactBase.js b/Desktop/src/components/ReactBase.js deleted file mode 100644 index da695b918..000000000 --- a/Desktop/src/components/ReactBase.js +++ /dev/null @@ -1,16 +0,0 @@ -import React from 'react'; -import {Provider} from "react-redux"; -import reducers from "../store"; -import Root from "./Root"; - -const ReactBase = () => { - return ( - - - - - - ); -}; - -export default ReactBase; diff --git a/Desktop/images/banner.jpg b/Desktop/src/images/images/banner.jpg similarity index 100% rename from Desktop/images/banner.jpg rename to Desktop/src/images/images/banner.jpg diff --git a/Desktop/images/pfp.png b/Desktop/src/images/images/pfp.png similarity index 100% rename from Desktop/images/pfp.png rename to Desktop/src/images/images/pfp.png diff --git a/Desktop/images/superalgos.png b/Desktop/src/images/images/superalgos.png similarity index 100% rename from Desktop/images/superalgos.png rename to Desktop/src/images/images/superalgos.png diff --git a/Desktop/src/index.js b/Desktop/src/index.js index 5e714912e..841a2a655 100644 --- a/Desktop/src/index.js +++ b/Desktop/src/index.js @@ -2,13 +2,25 @@ import './index.css'; import React from 'react'; import ReactDOM from 'react-dom'; import reportWebVitals from './reportWebVitals'; -import ReactBase from "./components/ReactBase"; +// import {SA, UI} from '../UI/Globals'; +// import {loadSuperalgos} from '../UI/WebAppPreLoader' +import {Provider} from "react-redux"; +import reducers from "./store"; +import Root from "./components/Root"; // const store = createStore(reducers); +// loadSuperalgos(); +// console.log(UI); +// console.log(SA); + ReactDOM.render( - , + + + + + , document.getElementById('root') ); diff --git a/Desktop/WebServer/css/main.css b/Desktop/src/main.css similarity index 98% rename from Desktop/WebServer/css/main.css rename to Desktop/src/main.css index 3dadc5d11..3434da2da 100644 --- a/Desktop/WebServer/css/main.css +++ b/Desktop/src/main.css @@ -1,3 +1,5 @@ +/* TODO migrate to react components*/ + /* latin */ @font-face { font-family: 'Saira'; @@ -21,11 +23,6 @@ font-weight: normal; font-style: normal; } - - .body{ - overflow-y: hidden; - overflow-x: hidden; - } .scroll-div { position:absolute; diff --git a/Desktop/store/index.js b/Desktop/store/index.js deleted file mode 100644 index 9874c25de..000000000 --- a/Desktop/store/index.js +++ /dev/null @@ -1,9 +0,0 @@ - -import { configureStore } from '@reduxjs/toolkit'; -import ExampleReducer from './slices/Example.slice' - -export default configureStore({ - reducer:{ - example: ExampleReducer - } - }) diff --git a/Desktop/store/slices/Example.slice.js b/Desktop/store/slices/Example.slice.js deleted file mode 100644 index 7e1d9b0c7..000000000 --- a/Desktop/store/slices/Example.slice.js +++ /dev/null @@ -1,21 +0,0 @@ -import { createSlice } from '@reduxjs/toolkit' - -export const ExampleSlice = createSlice({ - name: 'example', - initialState: { - exampleName:'', - token:'' - }, - reducers: { - exampleAction: (state, action) => { - state.userName = action.payload; - }, - }, - }) - - // Action creators are generated for each case reducer function - export const { exampleAction } = ExampleSlice.actions - - export default ExampleSlice.reducer - -