From 61eb09df8ce200124bddb8b18d6d713b8e1755dc Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 13 Jan 2021 17:49:43 +0100 Subject: [PATCH 1/3] Default branch to develop --- Projects/Superalgos/UI/Globals/Docs.js | 2 +- Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js | 4 ++-- README.md | 7 +++++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Projects/Superalgos/UI/Globals/Docs.js b/Projects/Superalgos/UI/Globals/Docs.js index 63b869099..f8953019b 100644 --- a/Projects/Superalgos/UI/Globals/Docs.js +++ b/Projects/Superalgos/UI/Globals/Docs.js @@ -2,7 +2,7 @@ function newSuperalgosGlobalsDocs() { thisObject = { NEW_PARAGRAPH_TEXT: "Left click and Edit to enter edit mode and change this text. ENTER to write new paragraphs. ESC to exit edit mode.", DEFAULT_LANGUAGE: 'EN', - DEFAULT_ACTIVE_BRANCH: 'master', + DEFAULT_CURRENT_BRANCH: 'develop', DEFAULT_CONTRIBUTIONS_BRANCH: 'develop', DOCS_SPACE_WIDTH: 900 } diff --git a/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js b/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js index 06ee1fcce..74b880fe5 100644 --- a/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js +++ b/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js @@ -89,8 +89,8 @@ function newSuperalgosDocSpace() { if (window.localStorage.getItem('Current Branch') !== null && window.localStorage.getItem('Current Branch') !== undefined && window.localStorage.getItem('Current Branch') !== 'undefined') { UI.projects.superalgos.spaces.docsSpace.currentBranch = window.localStorage.getItem('Current Branch') } else { - window.localStorage.setItem('Current Branch', UI.projects.superalgos.globals.docs.DEFAULT_ACTIVE_BRANCH) - UI.projects.superalgos.spaces.docsSpace.currentBranch = UI.projects.superalgos.globals.docs.DEFAULT_ACTIVE_BRANCH + window.localStorage.setItem('Current Branch', UI.projects.superalgos.globals.docs.DEFAULT_CURRENT_BRANCH) + UI.projects.superalgos.spaces.docsSpace.currentBranch = UI.projects.superalgos.globals.docs.DEFAULT_CURRENT_BRANCH } } diff --git a/README.md b/README.md index 186b3ed8a..8faa7252c 100644 --- a/README.md +++ b/README.md @@ -70,6 +70,13 @@ For example, if your Github username is John, the command will look like this: git clone https://github.com/John/Superalgos ``` +**6.** Switch to the develop branch running this command: + +``` +git checkout develop +``` + + ## Instalation Notes **1.** You need to make a fork so that you may contribute work. Superalgos is a Community project and you are expected to contribute, like everyone else. You don't need to be a technical person to contribute. Fixing a typo in the docs or translating a paragraph into your native language are valuable contributions too. Superalgos has built-in features that make contributing easy. Help make Superalgos better and Superalgos will better serve you! [Free-riding is not cool](https://en.wikipedia.org/wiki/Free-rider_problem), particularly on free, open-source, Community-driven projects. From 97682a7812a7b55a5a98c9fb0fa03713f4fc0817 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 13 Jan 2021 17:56:23 +0100 Subject: [PATCH 2/3] Fixes the readme --- README.md | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 8faa7252c..428a5af08 100644 --- a/README.md +++ b/README.md @@ -70,13 +70,6 @@ For example, if your Github username is John, the command will look like this: git clone https://github.com/John/Superalgos ``` -**6.** Switch to the develop branch running this command: - -``` -git checkout develop -``` - - ## Instalation Notes **1.** You need to make a fork so that you may contribute work. Superalgos is a Community project and you are expected to contribute, like everyone else. You don't need to be a technical person to contribute. Fixing a typo in the docs or translating a paragraph into your native language are valuable contributions too. Superalgos has built-in features that make contributing easy. Help make Superalgos better and Superalgos will better serve you! [Free-riding is not cool](https://en.wikipedia.org/wiki/Free-rider_problem), particularly on free, open-source, Community-driven projects. @@ -91,15 +84,23 @@ git checkout develop ![Run the system](https://docs.superalgos.org/images/how-to/run-the-system-01.gif) -**1.** To run the Superalgos client, change to the Superalgos directory/folder and type: +**1.** To run the Superalgos client, change to the Superalgos directory/folder. + +**2.** Switch to the develop branch running this command: + +``` +git checkout develop +``` + +**3.** Run this command: ``` node run ``` -**2.** The command launches your default browser to load the UI. If Chrome is not your default browser, copy the URL, close the browser, open Chrome, and paste the URL. Be patient... it takes a few seconds to fully load the UI. +**4.** The command launches your default browser to load the UI. If Chrome is not your default browser, copy the URL, close the browser, open Chrome, and paste the URL. Be patient... it takes a few seconds to fully load the UI. -**3.** A Welcome Tutorial pops-up automatically. You must do this Tutorial to finish the setup and to learn the basics. It's the ultimate onboarding experience, superior to all other resources available, including videos and the docs. +**5.** A Welcome Tutorial pops-up automatically. You must do this Tutorial to finish the setup and to learn the basics. It's the ultimate onboarding experience, superior to all other resources available, including videos and the docs. ## Usage Notes From 984ebade8d582d3a8f925bc07a1293d0e2dbe51e Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 13 Jan 2021 17:59:25 +0100 Subject: [PATCH 3/3] Fixes the readme 2 --- README.md | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 428a5af08..262db9ac3 100644 --- a/README.md +++ b/README.md @@ -70,6 +70,12 @@ For example, if your Github username is John, the command will look like this: git clone https://github.com/John/Superalgos ``` +**6.** Change to the Superalgos directory/folder and run this commmand to switch to the develop branch. + +``` +git checkout develop +``` + ## Instalation Notes **1.** You need to make a fork so that you may contribute work. Superalgos is a Community project and you are expected to contribute, like everyone else. You don't need to be a technical person to contribute. Fixing a typo in the docs or translating a paragraph into your native language are valuable contributions too. Superalgos has built-in features that make contributing easy. Help make Superalgos better and Superalgos will better serve you! [Free-riding is not cool](https://en.wikipedia.org/wiki/Free-rider_problem), particularly on free, open-source, Community-driven projects. @@ -84,23 +90,15 @@ git clone https://github.com/John/Superalgos ![Run the system](https://docs.superalgos.org/images/how-to/run-the-system-01.gif) -**1.** To run the Superalgos client, change to the Superalgos directory/folder. - -**2.** Switch to the develop branch running this command: - -``` -git checkout develop -``` - -**3.** Run this command: +**1.** To run the Superalgos client, from inside the Superalgos directory/folder, run this command: ``` node run ``` -**4.** The command launches your default browser to load the UI. If Chrome is not your default browser, copy the URL, close the browser, open Chrome, and paste the URL. Be patient... it takes a few seconds to fully load the UI. +**2.** The command launches your default browser to load the UI. If Chrome is not your default browser, copy the URL, close the browser, open Chrome, and paste the URL. Be patient... it takes a few seconds to fully load the UI. -**5.** A Welcome Tutorial pops-up automatically. You must do this Tutorial to finish the setup and to learn the basics. It's the ultimate onboarding experience, superior to all other resources available, including videos and the docs. +**3.** A Welcome Tutorial pops-up automatically. You must do this Tutorial to finish the setup and to learn the basics. It's the ultimate onboarding experience, superior to all other resources available, including videos and the docs. ## Usage Notes