From 9b96309216095d59ec1502b6836a0e9e9f336c98 Mon Sep 17 00:00:00 2001 From: Ivan Diaz Date: Sat, 26 Dec 2015 22:43:39 +0000 Subject: [PATCH 1/9] README.md edited online with Bitbucket --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index 030a4c0b..8a420eed 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,16 @@ OpenSupports v4.0 ============ +### Getting up and running FRONT-END +1) Clone this repo +2) Install node `sudo apt-get install node` +3) Install npm `sudo apt-get install npm` +4) Install gulp `sudo npm install -g gulp` +5) Go to repo `cd os4-react` +6) Install npm dependences `sudo npm install` +7) Run `gulp dev` + + ### Getting up and running 1. [Create MySQL Database](#markdown-header-create-mysql-database) From 5a55a0f8bc3f58dec41b2b5e3388276e8c53b76b Mon Sep 17 00:00:00 2001 From: Ivan Diaz Date: Sat, 26 Dec 2015 22:46:48 +0000 Subject: [PATCH 2/9] README.md edited online with Bitbucket --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 8a420eed..781e859b 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,13 @@ OpenSupports v4.0 ============ ### Getting up and running FRONT-END -1) Clone this repo -2) Install node `sudo apt-get install node` -3) Install npm `sudo apt-get install npm` -4) Install gulp `sudo npm install -g gulp` -5) Go to repo `cd os4-react` -6) Install npm dependences `sudo npm install` -7) Run `gulp dev` +1. Clone this repo +2. Install node `sudo apt-get install node` +3. Install npm `sudo apt-get install npm` +4. Install gulp `sudo npm install -g gulp` +5. Go to repo `cd os4-react` +6. Install npm dependences `sudo npm install` +7. Run `gulp dev` ### Getting up and running From b4c2cea6512bd67da557a9e4b309dbc4dee374cb Mon Sep 17 00:00:00 2001 From: Ivan Diaz Date: Sat, 26 Dec 2015 22:57:34 +0000 Subject: [PATCH 3/9] README.md edited online with Bitbucket --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 781e859b..85e4479f 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,9 @@ OpenSupports v4.0 ============ ### Getting up and running FRONT-END +0. update `sudo apt-get update` 1. Clone this repo -2. Install node `sudo apt-get install node` +2. Install node `sudo apt-get install nodejs` 3. Install npm `sudo apt-get install npm` 4. Install gulp `sudo npm install -g gulp` 5. Go to repo `cd os4-react` From e8488c0fa69a279ff6d17e4cefa69d4abec2ab7b Mon Sep 17 00:00:00 2001 From: Ivan Diaz Date: Sat, 26 Dec 2015 23:24:05 +0000 Subject: [PATCH 4/9] README.md edited online with Bitbucket --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 85e4479f..5d9dc8a1 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ OpenSupports v4.0 3. Install npm `sudo apt-get install npm` 4. Install gulp `sudo npm install -g gulp` 5. Go to repo `cd os4-react` -6. Install npm dependences `sudo npm install` +6. Install npm dependences `sudo npm install` o agregar carpeta node modules 7. Run `gulp dev` From f69c8ecaad1aac7887652a90e9cd70de7dbd348d Mon Sep 17 00:00:00 2001 From: Ivan Diaz Date: Sat, 26 Dec 2015 23:27:38 +0000 Subject: [PATCH 5/9] README.md edited online with Bitbucket --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5d9dc8a1..09aa01a3 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ OpenSupports v4.0 3. Install npm `sudo apt-get install npm` 4. Install gulp `sudo npm install -g gulp` 5. Go to repo `cd os4-react` -6. Install npm dependences `sudo npm install` o agregar carpeta node modules +6. Install npm dependences `sudo npm install` o agregar carpeta node_modules y descomprimir el zip 7. Run `gulp dev` From f1629d838651d26d00190253dd31a02cd6e815e5 Mon Sep 17 00:00:00 2001 From: Ivan Diaz Date: Sat, 26 Dec 2015 23:51:43 +0000 Subject: [PATCH 6/9] README.md edited online with Bitbucket --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 09aa01a3..d1b52b8e 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ OpenSupports v4.0 3. Install npm `sudo apt-get install npm` 4. Install gulp `sudo npm install -g gulp` 5. Go to repo `cd os4-react` -6. Install npm dependences `sudo npm install` o agregar carpeta node_modules y descomprimir el zip +6. agregar carpeta node_modules, descomprimir el zip y hacer `sudo npm rebuild node-sass` 7. Run `gulp dev` From 0a94a001d4990bc3d1c153805938b638bb2656d6 Mon Sep 17 00:00:00 2001 From: Ivan Diaz Date: Sat, 26 Dec 2015 21:33:01 -0300 Subject: [PATCH 7/9] [Max-Red] - Create icon component --- src/app/main/main-layout-header.js | 3 ++- src/core-components/drop-down.js | 3 +-- src/core-components/icon.js | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 src/core-components/icon.js diff --git a/src/app/main/main-layout-header.js b/src/app/main/main-layout-header.js index cfaf9de5..23dceac7 100644 --- a/src/app/main/main-layout-header.js +++ b/src/app/main/main-layout-header.js @@ -5,6 +5,7 @@ import CommonActions from 'actions/common-actions'; import Button from 'core-components/button'; import DropDown from 'core-components/drop-down'; +import Icon from 'core-components/icon'; var languageList = ['English', 'Spanish', 'Portuguese', 'German', 'Turkish', 'Indian']; var codeLanguages = { @@ -35,7 +36,7 @@ var MainLayoutHeader = React.createClass({ return { content: ( - {item} + {item} ) }; diff --git a/src/core-components/drop-down.js b/src/core-components/drop-down.js index ede063f2..d1c74041 100644 --- a/src/core-components/drop-down.js +++ b/src/core-components/drop-down.js @@ -4,7 +4,6 @@ import _ from 'lodash'; import {Motion, spring} from 'react-motion'; import callback from 'lib/callback'; -import getIcion from 'lib/callback'; var DropDown = React.createClass({ @@ -44,7 +43,7 @@ var DropDown = React.createClass({ return { defaultStyle: closedStyle, style: (this.state.opened) ? openedStyle : closedStyle - } + }; }, render() { diff --git a/src/core-components/icon.js b/src/core-components/icon.js new file mode 100644 index 00000000..e78adedb --- /dev/null +++ b/src/core-components/icon.js @@ -0,0 +1,19 @@ +import React from 'react'; + + + +var Icon = React.createClass({ + + propTypes: { + name: React.PropTypes.string.isRequired + }, + + render() { + return ( + + ); + } + +}); + +export default Icon; \ No newline at end of file From 298fd463b149e49fe1feec698c0edbc1708899dc Mon Sep 17 00:00:00 2001 From: Ivan Diaz Date: Sat, 26 Dec 2015 21:47:28 -0300 Subject: [PATCH 8/9] [Max-Red] - Remove extra lines --- src/core-components/icon.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/core-components/icon.js b/src/core-components/icon.js index e78adedb..bb4cb283 100644 --- a/src/core-components/icon.js +++ b/src/core-components/icon.js @@ -1,7 +1,5 @@ import React from 'react'; - - var Icon = React.createClass({ propTypes: { From 99054bc2a0f5226dd4eb508ec9c2161f49efee4e Mon Sep 17 00:00:00 2001 From: Ivan Diaz Date: Tue, 29 Dec 2015 15:44:08 +0000 Subject: [PATCH 9/9] [Ivan Diaz] - README.md Update frontend installation guide --- README.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d1b52b8e..c56417db 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,17 @@ OpenSupports v4.0 ### Getting up and running FRONT-END 0. update `sudo apt-get update` 1. Clone this repo -2. Install node `sudo apt-get install nodejs` +2. Install node 4.x version + `sudo apt-get install curl` + `curl -sL https://deb.nodesource.com/setup_4.x | sudo -E bash -` + `sudo apt-get install -y nodejs` 3. Install npm `sudo apt-get install npm` 4. Install gulp `sudo npm install -g gulp` 5. Go to repo `cd os4-react` -6. agregar carpeta node_modules, descomprimir el zip y hacer `sudo npm rebuild node-sass` -7. Run `gulp dev` - +6. Install dependences `sudo npm install` +7. Rebuild node-sass `sudo npm rebuild node-sass` +8. Run `gulp dev` +9. Go to the main app: `http://localhost:3000/app` or the component demo `http://localhost:3000/demo` ### Getting up and running