diff --git a/Contributors.md b/Contributors.md index 7a9d4bc5464..95124c921e7 100644 --- a/Contributors.md +++ b/Contributors.md @@ -2,23 +2,28 @@ - [Shashi Srinath](https://github.com/profghost) - [Elizabeth Onder](https://github.com/eonder) -- [Christian Salinas] (https://github.com/CTSalinas) +- [Christian Salinas](https://github.com/CTSalinas) - [ilyes hamrouni](https://github.com/ilyes-hamrouni) - [Amit Pareek](https://github.com/amit0021) - [Tanveer Ahmed](https://github.com/Tan66) - [Apurv Mishra](https://github.com/apurvmishra99) +- [Rajesh Mainali](https://github.com/Stereoraj) - SteveFFresno - alonzo church +- [Apoorva Teli](https://github.com/apoorvateli) +- [UTKARSH AGRAWAL](https://github.com/wompowe) PEACE!! - [Abdullah Mohamed](https://github.com/0xCC00FFEE) -- [Rishikesh Jadhav] (https://github.com/rishikeshjadhav) +- [Rishikesh Jadhav](https://github.com/rishikeshjadhav) - [Akash Barve](https://github.com/AkashBarve) -- Avanti Prasanna +- [Avanti Prasanna](https://github.com/avantiprasanna) - [Rafal Cieslinski](https://github.com/Bitz3d) - Josh Friesen +- Padmashantha Rajapakshe - [kholood Eassa](https://github.com/kholood-ea) - [Patrick O'Neill](https://github.com/howelloneill) - [Siva Kumar Lakkoju](https://github.com/sivakumar97) -- [Thibault d'Aboville] (https://github.com/ThibaultDBVLL) +- [Paulo Ricardo Kenshun Nakaima](https://github.com/guimpo) +- [Thibault d'Aboville](https://github.com/ThibaultDBVLL) - [Bayartsogt Erdenebat](https://github.com/BunnyMN) - [Barkshire Purringtonn](https://github.com/barkshire) - [Beatrice Olivera](https://github.com/beatriceo) @@ -39,6 +44,7 @@ - [Bachir Amadou](https://github.com/BachAmadou/first-contributions) - [Nibraas Khan](https://github.com/nibraaska) - [Andrew Albert](https://github.com/andyalbert) +- [Humayun Tanwar](https://github.com/humayuntanwar) - [Cemil Oten](https://github.com/cemiloten) - [Mahendren S](https://github.com/smahe) - [Nicolas Chiaramello](https://github.com/96nico) @@ -54,7 +60,7 @@ - [Aman Sharma](https://github.com/algomaster99/) - [Corey Russ](https://github.com/cruss13) - [Neutrix](https://github.com/NeuTrix) -- [Nukeproof21] (https://github.com/Nukeproof21 +- [Nukeproof21](https://github.com/Nukeproof21 - [ElMitch](https://github.com/ElMitch) - [JustinStanger](https://github.com/JStanger13) - nini faroux @@ -75,7 +81,7 @@ - [Abubakar Sambo](https://github.com/saslamp) - [Shorya Agarwal](https://github.com/kinochi) - [Taylor Murray](https://github.com/murraytay) -- Christopher Tang +- [Christopher Tang](https://github.com/chrtang-exp) - Hemant Mishra - [Epaphradito Lugayavu](http://github.com/paphra) - [Aunik Ahmed](https://github.com/aunik22) @@ -123,8 +129,8 @@ - Lionel Ortega - [Henry Scheible](https://github.com/bubsy2103h) - [Mohita Chaudhary](https://github.com/mohita02) -- [wongsiewyuei](https:/github.com/wongsiewyuei) -- [yati padia](https:??github.com/yati1998) +- [wongsiewyuei](https://github.com/wongsiewyuei) +- [yati padia](https://github.com/yati1998) - [Tanuj Nagpal](https://github.com/Tanuj69) - [Shradha Sharma](https://github.com/Shradha27) - [Abhith Krishna](https//github.com/donosco98) @@ -171,6 +177,7 @@ - [Jasper Martin](https://github.com/jaspervanbrian) - [vishal](https://github.com/cyberne7work) - Manasa Devarapalli +- [Piyush Singh](https://github.com/piyush-kgp) - [SummerPines](https://githum.com/summerpines) - [Oisin Quinn](https://github.com/oisinq) - [Kengo Wada](https://github.com/KengoWada) @@ -393,7 +400,7 @@ - [Shubham Patraf](https://github.com/Shubham189) - [Ben Trono](https://github.com/BT-VT) - [Gegory Leleytner](https://github.com/RunFMe) -- [Owen Gifford] (https://github.com/oweng2018) +- [Owen Gifford](https://github.com/oweng2018) - [Avijit Roy](https://github.com/avijitpunk) - [James Farrell](https://github.com/wopps) - [Yashwanth Manchikatla](https://github.com/yashwanthmanchikatla) @@ -460,7 +467,7 @@ - [Ibadullah Khan](https://github.com/ibadullah25) - [Lane Schmidt](https://github.com/spoiledgoods) - [Alvin Chipmunk](https://github.com) -- [FilWil] (https://github.com/FilWil) +- [FilWil](https://github.com/FilWil) - [Philip Mutua](https://github.com/pmutua) - [Juan Dougnac](http://github.com/jdougnac) - [Baptistemz](https://github.com/baptistemz) @@ -588,7 +595,7 @@ - [Zakaria Soufiani](https://github.com/zakaria-soufiani) - [Eduard Barata](https://github.com/bar-alex) - [Richard Placide](https://github.com/richardplacide) --[Sun B] +- [Sun B] - [Jake Frn](https://github.com/jakefrn) - [Napat](https://github.com/napatwongchr) - [Eric Audran](https://github.com/Nevosis) @@ -633,6 +640,7 @@ - [Jayakrishnan](https://github.com/JAYKRISHNAN) - [EvanDCP](https://github.com/EvanDCP) - [VinothKumar](https://github.com/Vinoth18) +- [LarryHastings](https://github.com/hastings360) - [HallLinux](https://github.com/HallLinux) - [Jon Johnson](https://github.com/jonjohnson34) - [Brandon Brigance](https://github.com/b-random) @@ -1243,7 +1251,7 @@ - [savli](https://github.com/savli) - [Limarenko Denis](https://github.com/LimarenkoDenis) - [Laura Sprauer](https://github.com/laurasprauer) -- [Hermes Esp?nola](https://github.com/hermesespinola) +- [Hermes Espinola](https://github.com/hermesespinola) - [Thirdoptics](https://github.com/Thirdoptics) - [Balazs Weirich](https://github.com/wbali) - [Margaret Tavares](https://github.com/margotavares) @@ -1637,6 +1645,7 @@ - [Rishabh Chauhan](https://github.com/rishabhc32) - [Cole Mortensen](https://github.com/magicole) - [Kent Mok](https://github.com/kmok23) +- [Artemiy Pospelov](https://github.com/1estart) - [Rahul Kumar](https://github.com/r5k5) - [Paulo Lima](https://github.com/pbruny) - [Sergei Tomin](https://github.com/driver-by) @@ -2397,7 +2406,7 @@ - [Adam Romlein](https://github.com/romleiaj) - [Raghav Shrivastava](https://github.com/raghav1810) - [Jayesh Yeola](https://github.com/JayeshYeola) -[Aruparna Maity](https://github.com/AruparnaMaity) +- [Aruparna Maity](https://github.com/AruparnaMaity) - [Rebecca Newborn](https://github.com/rebeccanewborn) - [Meggan M Green](https://github.com/meggangreen) - [Shabbir Ahmed](https://github.com/samax-mw) @@ -2561,6 +2570,7 @@ - [th3r1singking](https://github.com/th3r1singking) - [Joshua Kennedy](https://github.com/joshkennede) - [Tom Zhang](https://github.com/TomZhangg) +- Ron Lester Crisostomo - [Melissa Lucas](https://github.com/mlucas2218) - [Kyle OBrien](https://github.com/webbhostnet) - [Firas Omrane](https://github.com/firou1925) @@ -2995,6 +3005,7 @@ - [Peter Vlasveld](https://github.com/Fizzizist) - [Jon Mabale](https://github.com/jonmabale) - [Kat Batuigas](https://github.com/kbatuigas) +- [Danny Tran](https://github.com/dtran007) - [Kaue Silva](https://github.com/klolivei) - [Omry Zur](https://github.com/zomry1) - [Karl Roldan](https://github.com/karlfroldan) @@ -4394,7 +4405,7 @@ - [Robert Gough](https://github.com/rg-2) - [Silverio Gonzalez](https://github.com/silveriogonzalezolea) - [Justin Gaskins](https://github.com/jgaskins331) -- [Nevaan Perera] (https://github.com/nevaan9) +- [Nevaan Perera](https://github.com/nevaan9) - [Ramadan35](https://github.com/ramadan35) - [Renee](https://github.com/ReneeAB) - [xiajingwang](https:github.com/xiajingwang) @@ -4921,7 +4932,7 @@ - [Sagar Jani](https://github.com/alwaysreadytolearn) - [Nikita Tonkoshur](https://github.com/bloodwithmilk25) - Hammerhead -- Joshua Riley +- [Joshua Riley](https://github.com/JoshRiley) - [Zhenyu Yang](https://github.com/shrimpie) - [Flower17](https://github.com/flower17) - [Sabique Ahmed Khan](https://github.com/sabique) @@ -5080,7 +5091,7 @@ - [Bhavya Srivastava](https://github.com/bhavya17037) - [Stone Teele](https://github.com/stoneteele) - [Michael Santana](https://github.com/santanamichael211) -- [Brittnee Keller] (https://github.com/bkeller108) +- [Brittnee Keller](https://github.com/bkeller108) - [Lin Yang](https://github.com/darktef) - [Thales Gomes](https://github.com/thalesg) - [Sergio Henrique Menta Garcia](https://github.com/SergioHenrique19) @@ -5111,4 +5122,9 @@ - [muphi](https://github.com/muphi) - [Jaret Screws](https://github.com/jaretscrews) - [Sami Perälahti](https://github.com/SamiNami) -- [Vinicius de Souza Augutis] (https://github.com/viniciusaugutis) +- [Vinicius de Souza Augutis](https://github.com/viniciusaugutis) +- [Jonata William](https://github.com/jonatawilliam) +- [Lori Godoy](https://github.com/kuneho-yellow/) +- [Caio Thizio](https://github.com/caiothizio) +- [kachomsky](https://github.com/kachomsky) +- [Joao Salgado](https://github.com/joao-salgado) diff --git a/README.md b/README.md index c7f2651b8b3..83621b96c41 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,8 @@ Reading articles & watching tutorials can help, but what's better than actually fork this repository +[🇮🇳](translations/README.hi.md) [🇲🇲](translations/README.mm_unicode.md) [🇮🇩](translations/README.id.md) [🇫🇷](translations/README.fr.md) [🇪🇸](translations/README.es.md) [🇳🇱](translations/README.nl.md) [🇷🇺](translations/README.ru.md) [🇯🇵](translations/README.ja.md) [🇻🇳](translations/README.vn.md) [🇵🇱](translations/README.pl.md) [🇮🇷](translations/README.fa.md) [🇮🇷](translations/README.fa.en.md) [🇰🇷 🇰🇵](translations/README.ko.md) [🇩🇪](translations/README.de.md) [🇨🇳](translations/README.chs.md) [🇹🇼](translations/README.cht.md) [🇬🇷](translations/README.gr.md) [🇺🇦](translations/README.ua.md) [🇧🇷](translations/README.pt_br.md) [🇵🇹](translations/README.pt-pt.md) [🇮🇹](translations/README.it.md) [🇹🇭](translations/README.th.md) [🏴󠁥󠁳󠁧󠁡󠁿](translations/README.gl.md) [🇵🇰](translations/README.ur.md) [:bangladesh:](translations/README.bn.md) [:moldova: :romania:](translations/README.ro.md) [:uk:](translations/README.md) [🇹🇷](translations/README.tr.md) + If you don't have git on your machine, [install it]( https://help.github.com/articles/set-up-git/). ## Fork this repository diff --git a/additional-material/git_workflow_scenarios/removing-branch-from-your-repository.md b/additional-material/git_workflow_scenarios/removing-branch-from-your-repository.md index ca42ff63a9c..e65eea7f3e3 100644 --- a/additional-material/git_workflow_scenarios/removing-branch-from-your-repository.md +++ b/additional-material/git_workflow_scenarios/removing-branch-from-your-repository.md @@ -2,7 +2,7 @@ If you have followed the tutorial up-to-now, our `` branch has finished its purpose, it is time to delete it from your local machine's repo. This isn't necessary, but the name of this branch shows its rather special purpose. Its life can be made correspondingly short. -First, let's merge your `` to your master, so to go your master branch: +First, let's merge your `` to your master, so to go to your master branch: ``` git checkout master ``` diff --git a/additional-material/translations/moving-a-commit-to-a-different-branch.hi.md b/additional-material/translations/moving-a-commit-to-a-different-branch.hi.md new file mode 100644 index 00000000000..59164dd5eaf --- /dev/null +++ b/additional-material/translations/moving-a-commit-to-a-different-branch.hi.md @@ -0,0 +1,25 @@ +# एक कमिट शाखा को एक अलग शाखा में ले जाना +क्या होगा यदि आप कोई बदलाव कमिट करते हैं, और फिर महसूस करें कि आप एक अलग शाखा में आए हैं? +आप इसे कैसे बदल सकते हैं? यह ट्यूटोरियल कवर करता है। + +## सबसे मौजूदा काम को मौजूदा शाखा में ले जाना +ऐसा करने के लिए, टाइप करें: + +``` git reset HEAD~ --soft ```- अंतिम कमिट को पूर्ववत करता है, लेकिन उपलब्ध परिवर्तनों को छोड़ दें। +``` git stash ```- निर्देशिका की स्थिति रिकॉर्ड करता है। + +``` git checkout name-of-the-correct-branch ``` - दूसरी शाखा में स्विच करता है। +``` git stash pop ``` - आखिरी स्टेशेड स्टेटस को हटा देता है। +``` git add ``` - या अलग-अलग फाइलों को एक साथ स्टेज करने का प्रयास करें। +``` git commit -m "आपका संदेश यहां" ``` - परिवर्तनों को सुरक्षित कर देता है और कमिट करता है। + +अब आपके परिवर्तन सही शाखा पर हैं + + +### सबसे पुराना काम एक नई शाखा में ले जाना +ऐसा करने के लिए, टाइप करें: +``` git branch newbranch```- एक नई शाखा बनाता है। सभी कमिट को सुरक्षित कर देता है। +``` git reset --hard HEAD~#``` - मास्टर को वापस #कमिट में ले जाएं। याद रखें, यह काम मास्टर से जा चूका होगा +``` git checkout newbranch``` - आपके द्वारा बनाई गई शाखा में जाता है। इसमें सभी कमिट होंगे। + +याद रखें: कोई भी बदलाव कमिट नहीं किया गया तो खो जाएगा। \ No newline at end of file diff --git a/additional-material/translations/removing-branch-from-your-repository.hi.md b/additional-material/translations/removing-branch-from-your-repository.hi.md new file mode 100644 index 00000000000..ff85d35d181 --- /dev/null +++ b/additional-material/translations/removing-branch-from-your-repository.hi.md @@ -0,0 +1,31 @@ +# अपने रिपॉजिटरी से एक शाखा निकालें + +यदि आपने अब तक ट्यूटोरियल का पालन किया है, तो हमारी `` शाखा ने अपना उद्देश्य पूरा कर लिया है, अब यह आपके स्थानीय मशीन के रेपो से इसे हटाने का समय है। यह आवश्यक नहीं है, लेकिन इस शाखा का नाम इसके बजाय विशेष उद्देश्य दिखाता है। इसका जीवन संगत रूप से छोटा हो सकता है। + +सबसे पहले, अपने मास्टर में अपने `` को मर्ज करें, इसलिए अपनी मास्टर शाखा पर जाएं: +``` +git checkout master +``` + +मास्टर में ``मर्ज करें: +``` +git merge master +``` + +अपने स्थानीय मशीन के रेपो से `` निकालें: +``` +git branch -d +``` + +अब आपने अपनी स्थानीय मशीन की `` शाखा हटा दी है और सब कुछ साफ़ सुथरा लग रहा है। +हालांकि, इस समय, आपके पास अभी भी आपके गिटहब फोर्क में `` शाखा होनी चाहिए। हालांकि, इससे पहले कि आप इसे हटा दें, याद रखें कि आपने इस रिमोट शाखा से अपने रेपो को "पुल रिक्वेस्ट" भेजा है। इसलिए जब तक कि मैं इसे मर्ज नहीं करता हूं, इस शाखा को न हटाएं। + +हालांकि, अगर मैंने आपकी शाखा मर्ज कर ली है और आप रिमोट शाखा को हटाना चाहते हैं, तो इसका उपयोग करें: +``` +git push origin --delete +``` + +अब, आप जानते हैं कि अपनी शाखाओं को कैसे साफ किया जाए। +समय के साथ, मेरे सार्वजनिक रिपो में कई रेपो जोड़े जाएंगे। और आपकी स्थानीय मशीन और आपके गिटहब फर्क की मास्टर शाखाएं अद्यतित नहीं होंगी। तो अपने रेपोसिटोरिएस को मेरे साथ सिंक्रनाइज़ करने के लिए, नीचे दिए गए चरणों का पालन करें। + +#### [अपने फोर्क को रिपॉजिटरी के साथ सिंक रखना] (keeping-your-fork-synced-with-this-repository.md) \ No newline at end of file diff --git a/app/package.json b/app/package.json index 5fd4b551fa6..b49c035682f 100644 --- a/app/package.json +++ b/app/package.json @@ -11,6 +11,7 @@ "sw-precache": "^5.2.0" }, "dependencies": { + "lodash": "^4.17.10", "react": "^15.4.0", "react-dom": "^15.4.0", "react-select": "^1.0.0-rc.10" diff --git a/app/src/components/ProjectList/CardsContainer.css b/app/src/components/ProjectList/CardsContainer.css deleted file mode 100644 index 706be1b9089..00000000000 --- a/app/src/components/ProjectList/CardsContainer.css +++ /dev/null @@ -1,8 +0,0 @@ -.Container-layout{ - background: #f7f7fc; - display: flex; - flex-wrap: wrap; - justify-content: center; - padding: 1vw; - overflow: hidden; -} diff --git a/app/src/components/ProjectList/CardsContainer.jsx b/app/src/components/ProjectList/CardsContainer.jsx index 10c4be1bf2d..e2c5409ae11 100644 --- a/app/src/components/ProjectList/CardsContainer.jsx +++ b/app/src/components/ProjectList/CardsContainer.jsx @@ -1,66 +1,133 @@ import React from 'react'; import Select from 'react-select'; +import each from 'lodash/each' + import Card from './ProjectsCards'; import projectList from './listOfProjects'; -import './CardsContainer.css'; + +import './css/cards-container.css'; +import './css/search.css'; import 'react-select/dist/react-select.css'; export default class CardsContainer extends React.Component { constructor(props) { super(props); + this.state = { value: [], filterList: projectList } + this.setTags = new Set(); this.filterOptions = []; + this.valueList = []; + for (let i = 0; i < projectList.length; i++) { + if (projectList[i].tags) { + projectList[i].tags.forEach(tag => { + projectList[i].tags.sort() this.setTags.add(tag.toLowerCase()) }) } } + this.setTags.forEach(v => this.filterOptions.push({ value: v, label: v })); this.handleSelectChange = this.handleSelectChange.bind(this); + this.handleChange = this.handleChange.bind(this); } + handleSelectChange(value) { + + this.value = value; this.setState({ value }); this.handleFilterListUpdate(value); } + handleFilterListUpdate(value) { - if (value.length === 0) { + + let updatedList = []; + + // If no filters + if ((!value || value.length === 0) && (this.inputValue === null || this.inputValue.length === 0)) { return this.setState({ filterList: projectList }); } - let valueList = []; - let updatedList = []; - value.map(v => { - return valueList.push(v.value) - }); - projectList.map(project => { - if (!project.tags) return; - let lowerCaseTags = project.tags.map(v => v.toLowerCase()) - if (valueList.every(v => lowerCaseTags.includes(v))) { - updatedList.push(project); - } - }) - this.setState({ filterList: updatedList}); + // If tags filter applied + if (value && value.length > 0) { + const valueList = []; + + value.map(v => { + return valueList.push(v.value) + }); + + each(projectList, (project) => { + + if (!project.tags) return; + + let lowerCaseTags = project.tags.map(v => v.toLowerCase()) + if (valueList.every(v => lowerCaseTags.includes(v))) { + + updatedList.push(project); + } + }) + } + + // If search input value is not empty + if (this.inputValue && this.inputValue.length > 0) { + + const searchedList = [] + each(((updatedList.length > 0) ? updatedList : projectList), (project) => { + + if (project.name.toLowerCase().includes(this.inputValue) + || project.description.toLowerCase().includes(this.inputValue) + || project.tags.toString().toLowerCase().includes(this.inputValue)) { + + searchedList.push(project) + } + }); + + updatedList = searchedList; + } + + this.setState({ filterList: updatedList }); } + + // Search input handler + handleChange(event) { + + this.inputValue = event.currentTarget.value; + + this.inputValue = this.inputValue.trim(); + this.inputValue = this.inputValue.toLowerCase(); + + this.handleFilterListUpdate(this.value) + } + render() { + return (
- +
+
+