diff --git a/css/flippy.css b/css/flippy.css index bb07f64..6a8e3af 100644 --- a/css/flippy.css +++ b/css/flippy.css @@ -68,8 +68,8 @@ flippy.fancy { position: relative; font-size: .8em; cursor: pointer; - width: 250px; - height: 250px; + width: 150px; + height: 150px; } flippy.fancy img { height: 100%; diff --git a/img/cards/barrel.png b/img/cards/barrel.png new file mode 100644 index 0000000..3f721de Binary files /dev/null and b/img/cards/barrel.png differ diff --git a/img/cards/butterfly.png b/img/cards/butterfly.png new file mode 100644 index 0000000..6070dea Binary files /dev/null and b/img/cards/butterfly.png differ diff --git a/img/cards/carrot.png b/img/cards/carrot.png new file mode 100644 index 0000000..ec4ce41 Binary files /dev/null and b/img/cards/carrot.png differ diff --git a/img/cards/cheese.png b/img/cards/cheese.png new file mode 100644 index 0000000..554ce56 Binary files /dev/null and b/img/cards/cheese.png differ diff --git a/img/cards/cherry.png b/img/cards/cherry.png new file mode 100644 index 0000000..2562f4d Binary files /dev/null and b/img/cards/cherry.png differ diff --git a/img/cards/cloud.png b/img/cards/cloud.png new file mode 100644 index 0000000..5587a02 Binary files /dev/null and b/img/cards/cloud.png differ diff --git a/img/cards/dwarf.png b/img/cards/dwarf.png new file mode 100644 index 0000000..6ee91b7 Binary files /dev/null and b/img/cards/dwarf.png differ diff --git a/img/cards/ghost.png b/img/cards/ghost.png new file mode 100644 index 0000000..6ecfb83 Binary files /dev/null and b/img/cards/ghost.png differ diff --git a/img/cards/images.txt b/img/cards/images.txt new file mode 100644 index 0000000..31829cb --- /dev/null +++ b/img/cards/images.txt @@ -0,0 +1,12 @@ +Images available under CC + +barrel - http://pixabay.com/en/barrel-keg-wood-vintage-wooden-575341/ +butterfly - http://pixabay.com/en/animal-butterfly-insect-nature-156895/ +carrot - http://pixabay.com/en/carrot-vegetable-food-fresh-575529/ +cherry - http://pixabay.com/en/cherry-stem-fruit-red-ripe-fresh-575547/ +cheese - http://pixabay.com/en/swiss-cheese-swiss-cheese-food-575542/ +cloud - http://pixabay.com/en/weather-clouds-fog-weather-forecast-157120/ +dwarf - http://pixabay.com/en/gnome-statue-decoration-dwarf-elf-575475/ +ghost - http://pixabay.com/en/ghost-spooky-white-ghostly-scary-156656/ +rose - http://pixabay.com/en/flower-red-rose-blossom-nature-156608/ +sun - http://pixabay.com/en/sun-weather-weather-forecast-sunny-157126/ \ No newline at end of file diff --git a/img/cards/rose.png b/img/cards/rose.png new file mode 100644 index 0000000..620361d Binary files /dev/null and b/img/cards/rose.png differ diff --git a/img/cards/sun.png b/img/cards/sun.png new file mode 100644 index 0000000..fdbe327 Binary files /dev/null and b/img/cards/sun.png differ diff --git a/index.html b/index.html index f53d6fe..a7deb46 100644 --- a/index.html +++ b/index.html @@ -56,7 +56,8 @@ - {{card.cardId}} + +
{{card.card['en-US']}}
diff --git a/js/pexeso-controller.js b/js/pexeso-controller.js index 3fdc8e1..df4e274 100644 --- a/js/pexeso-controller.js +++ b/js/pexeso-controller.js @@ -8,6 +8,9 @@ angular.module('app', ['angular-flippy', 'level-selector', 'level-complete']) // How many cards must be found as the same. $scope.chainLength = 2; + // Whic card types are active + $scope.currentCardTypes = [ 'picture', 'picture' ]; + /** * Level descriptor: * @@ -71,50 +74,55 @@ angular.module('app', ['angular-flippy', 'level-selector', 'level-complete']) }; $scope.basicCards = { - 'printer' : { - 'cs-CZ': 'tiskárna', - 'en-US': 'house', - 'sk-SK': 'tlačiareň' + 'cherry' : { + 'cs-CZ': 'třešnička', + 'en-US': 'cherry', + 'sk-SK': 'čerešňa' }, - 'toner' : { - 'cs-CZ': 'toner', - 'en-US': 'toner', - 'sk-SK': 'toner' + 'cheese' : { + 'cs-CZ': 'sýr', + 'en-US': 'cheese', + 'sk-SK': 'syr' + }, + 'carrot' : { + 'cs-CZ': 'mrkev', + 'en-US': 'carrot', + 'sk-SK': 'mrkva' }, - 'finisher': { - 'cs-CZ': 'finisher', - 'en-US': 'finisher', - 'sk-SK': 'finisher' + 'dwarf': { + 'cs-CZ': 'trpaslík', + 'en-US': 'dwarf', + 'sk-SK': 'trpaslík' }, - 'paper': { - 'cs-CZ': 'papír', - 'en-US': 'paper', - 'sk-SK': 'papier' + 'barrel': { + 'cs-CZ': 'sud', + 'en-US': 'barrel', + 'sk-SK': 'sud' }, - 'black': { - 'cs-CZ': 'černá', - 'en-US': 'black', - 'sk-SK': 'čierna' + 'butterfly': { + 'cs-CZ': 'motýl', + 'en-US': 'butterfly', + 'sk-SK': 'motýľ' }, - 'white': { - 'cs-CZ': 'bílá', - 'en-US': 'white', - 'sk-SK': 'biela' + 'ghost': { + 'cs-CZ': 'duch', + 'en-US': 'ghost', + 'sk-SK': 'duch' }, - 'color': { - 'cs-CZ': 'barva', - 'en-US': 'color', - 'sk-SK': 'farba' + 'rose': { + 'cs-CZ': 'růže', + 'en-US': 'rose', + 'sk-SK': 'ruža' }, - 'duplexPrint': { - 'cs-CZ': 'oboustranný tisk', - 'en-US': 'duplex print', - 'sk-SK': 'obostranná tlač' + 'sun': { + 'cs-CZ': 'slunce', + 'en-US': 'sun', + 'sk-SK': 'slnko' }, - 'stapler': { - 'cs-CZ': 'sešívačka', - 'en-US': 'stapler', - 'sk-SK': 'zošívačka' + 'cloud': { + 'cs-CZ': 'oblak', + 'en-US': 'cloud', + 'sk-SK': 'oblak' } }; @@ -122,33 +130,7 @@ angular.module('app', ['angular-flippy', 'level-selector', 'level-complete']) $scope.cards = $scope.basicCards; $scope.maxSelected = 2; - $scope.board = [ - { - cardId:'house', - index:1, - state: 'solved' - }, { - cardId: 'dog', - index:1, - state: 'mystery' - }, { - cardId:'house', - index:2, - state: 'solved' - }, { - cardId:'printer', - index:1, - state: 'mystery' - }, { - cardId: 'dog', - index:2, - state: 'mystery' - },{ - cardId:'printer', - index:2, - state: 'mystery' - } - ]; + $scope.board = []; /** * Generate playing card object. @@ -157,6 +139,7 @@ angular.module('app', ['angular-flippy', 'level-selector', 'level-complete']) return { cardId: cardId, card: card, + cardType: 'picture', index: index, state: 'mystery', flipState: '' @@ -179,7 +162,8 @@ angular.module('app', ['angular-flippy', 'level-selector', 'level-complete']) var card = fullStack[cardIndex]; fullStack.splice(cardIndex, 1); for (var instanceIndex = 0; instanceIndex < $scope.chainLength; instanceIndex++) { - var tempCard = $scope.getCard(card, card.cardId, instanceIndex + 1) + var tempCard = $scope.getCard(card, card.cardId, instanceIndex + 1); + tempCard.cardType = $scope.currentCardTypes[instanceIndex]; stack.push(tempCard); } } @@ -299,6 +283,7 @@ angular.module('app', ['angular-flippy', 'level-selector', 'level-complete']) $scope.initLevel = function(event, args) { $scope.levelIndex = args.levelIndex; $scope.currentLevel = $scope.levels[$scope.levelIndex]; + $scope.currentCardTypes = $scope.currentLevel.cardTypes; $scope.generateBoard($scope.currentLevel.totalCards); $scope.isLevelVisible = true; };