diff --git a/src/reducers/reducer_decks.js b/src/reducers/reducer_decks.js index bd91c42..8686469 100644 --- a/src/reducers/reducer_decks.js +++ b/src/reducers/reducer_decks.js @@ -2,4 +2,326 @@ import { deckData } from "../data/file"; export default function() { return deckData(); +<<<<<<< HEAD + + + +// Javascript: Common built-in methods + + {title: 'Javascript: Common built-in methods', image: '../style/images/js.png', + cards: [ + {q: 'Returns the character at the specified index?', a: 'charAt()' + }, + {q: 'Combines the text of two strings and returns a new string?', a: 'concat()' + }, + {q: 'Calls a function for each element in the array?', a: 'forEach()' + }, + {q: 'Returns the index within the calling String object of the first occurrence of the specified value?', a: 'indexOf()' + }, + {q: 'Returns the length of the string?', a: 'length()' + }, + {q: 'Removes the last element from an array and returns that element?', a: 'pop()' + }, + {q: 'Adds one or more elements to the end of an array and returns the new length of the array?', a: 'push()' + }, + {q: 'Reverses the order of the elements of an array?', a: 'reverse()' + }, + {q: 'Sorts the elements of an array?', a: 'sort()' + }, + {q: 'Returns the characters in a string beginning at the specified location?', a: 'substr()' + }, + {q: 'Returns the calling string value converted to lower case?', a: 'toLowerCase()' + }, + {q: 'Returns the calling string value converted to upper case?', a: 'toUpperCase()' + }, + {q: 'Returns the string representation of the numbers value?', a: 'toString() ' + } + ]}, + + +// CSS + {title: 'CSS', image: '../style/images/css3.svg', + cards: [ + {q: 'What is CSS?', a: 'Cascading Style Sheets, fondly referred to as CSS, is a simple design language intended to simplify the process of making web pages presentable.' + }, + {q: 'What are the components of a CSS Style?', a: 'Selector − an HTML tag like

or \nProperty − attribute of HTML tag, ex. color, border \nValue − assigned to properties, ex. color property can have red or #F1F1F1' + }, + {q: 'What is type selector?', a: 'matches the name of an element type. To give a color to all level 1 headings −\nh1 {\ncolor:\n#36CFFF;\n}' + }, + {q: 'What is universal selector?', a: 'matches the name of any element type −\n* { \ncolor: #000000; \n}' + }, + {q: 'What is Descendant Selector?', a: 'apply a style rule to a particular element only when it lies inside a particular element. As given in the following example, style rule will apply to element only when it lies inside