Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
6984013
updated dependencies
saimaz Jan 28, 2016
e08f64b
updated npm settings
saimaz Jan 28, 2016
c479eec
add ansistrano
Jan 28, 2016
c698558
changed logs dir in deploy shared list
saimaz Jan 28, 2016
9075c6c
updated default parameters
saimaz Jan 28, 2016
917dbe2
prepare structure for the new data
saimaz Feb 24, 2016
8b8f360
disabled tweets, facebook, language, currency
einorler Feb 24, 2016
5e94d06
added product list extension
saimaz Feb 24, 2016
0bfe7c2
added missing filters and fixed fronted for product show
saimaz Feb 24, 2016
ab88a7e
changed pictures in the main page
einorler Feb 25, 2016
6644327
commented out contentless links
einorler Feb 25, 2016
e5a6907
fixed the favicon issue
einorler Feb 25, 2016
806052a
removed extra space from the footer
einorler Feb 25, 2016
8c18237
added fixes for checkout functionality
saimaz Feb 26, 2016
8acb441
moved shop_url_origin to parameters
saimaz Feb 26, 2016
0394e4b
my-account instead of login for link
saimaz Feb 26, 2016
1feea2f
changed images, made links to the content
einorler Feb 26, 2016
7582f9c
added a successfully added to cart message
einorler Feb 26, 2016
0a6502c
added fixes for checkout functionality
saimaz Feb 26, 2016
0dffd2c
Added google analytics
saimaz Feb 28, 2016
9bcab69
fixed styling of the footer
einorler Feb 29, 2016
bc3dd0e
fixed links to fit new data model
einorler Feb 29, 2016
2859a8b
fixed mini cart
saimaz Feb 29, 2016
81e0083
added dedicated search action
saimaz Feb 29, 2016
92db08a
title should not be translated
saimaz Feb 29, 2016
534e88f
updated demo data
saimaz Feb 29, 2016
a5d79e9
added imprint information changed visa cards
einorler Feb 29, 2016
d0616b1
removed links from cart
einorler Mar 1, 2016
ffe740e
changed the logo
einorler Mar 1, 2016
0db7a0b
the link is set back where it was
einorler Mar 1, 2016
ebbc262
Text beautified
nakedmnd Mar 1, 2016
c9c3f88
Text beautified
nakedmnd Mar 1, 2016
ea111a4
Text beautified
nakedmnd Mar 1, 2016
8c2dc31
Section title changed
nakedmnd Mar 1, 2016
506fb7c
Text beautified
nakedmnd Mar 1, 2016
a59071a
Text beautified
nakedmnd Mar 1, 2016
7eafec5
increased font size
einorler Mar 1, 2016
770490a
fixed filters
saimaz Mar 1, 2016
bcaaea2
new demo data with filter values
saimaz Mar 1, 2016
12859bf
Add locale listener & according config for language routing.
ndinh215 Mar 7, 2016
4c21ebd
Add return & new line at the end of config.yml.
ndinh215 Mar 7, 2016
de239e2
Add France & German languages message files
Mar 8, 2016
67e75e0
Merge pull request #1 from ndinh215/fr-de_languages
ndinh215 Mar 8, 2016
9c8b914
Add classes mapping ES.
ndinh215 Mar 8, 2016
54c65a0
Add files of classes mapping ES.
ndinh215 Mar 8, 2016
a9b7dab
Process URL routing for all pages.
ndinh215 Mar 9, 2016
8b5eb92
Add extension for get language text from document
Mar 9, 2016
443423f
Merge pull request #2 from ndinh215/language-extension
ndinh215 Mar 9, 2016
0a85862
Set locale at route provider.
ndinh215 Mar 9, 2016
5c79c64
Design detail page.
theanh Mar 9, 2016
bbc369f
Process null url in url generator.
ndinh215 Mar 9, 2016
e5c9a8a
Allow change language for homepage
Mar 9, 2016
a2988b5
Using translation for category page
Mar 9, 2016
fb077f3
Merge pull request #4 from ndinh215/translation
ndinh215 Mar 9, 2016
fdfde80
Add function call api get product variant.
theanh Mar 9, 2016
7a7d5b3
Merge pull request #3 from ndinh215/product-detail
ndinh215 Mar 9, 2016
809ffb7
Fixed issues of mistype or wrong paths.
ndinh215 Mar 9, 2016
4a702a1
Update bootstrap path in ongr.scss
ndinh215 Mar 9, 2016
8945dd2
Get image thumbnail using iterator
Mar 9, 2016
72a86a5
Merge pull request #5 from ndinh215/product-images-iterator
ndinh215 Mar 10, 2016
7cb49c5
Hot fix product detail for deploying.
theanh Mar 10, 2016
a3bdd15
Merge pull request #6 from ndinh215/deploy
ndinh215 Mar 10, 2016
6ab4dde
Clean up SeoAwareTrait.
ndinh215 Mar 10, 2016
abbd432
Decode URI after get request path
Mar 10, 2016
1399156
Add translation for imprint page
Mar 10, 2016
1cc5d70
Merge pull request #10 from ndinh215/uri-decode_issue7
ndinh215 Mar 10, 2016
963d83b
Merge pull request #11 from ndinh215/imprint_issue8
ndinh215 Mar 10, 2016
25147ef
Add testing index with a locale.
ndinh215 Mar 10, 2016
8178804
Fix the issues of code convention.
ndinh215 Mar 10, 2016
0c1d0ab
Change product gallery when choose a variant.
theanh Mar 10, 2016
a914e6f
Merge pull request #12 from ndinh215/product_variants
ndinh215 Mar 10, 2016
857d7ff
Add 2 category & 3 product for demo data
Mar 10, 2016
4b5052b
Merge pull request #13 from ndinh215/demo-data
ndinh215 Mar 10, 2016
fecfd4a
Send locale to js.
theanh Mar 10, 2016
da33a19
Change product variant styles.
theanh Mar 10, 2016
0f8fa4a
Merge pull request #14 from ndinh215/product_variants
ndinh215 Mar 10, 2016
75374f3
Update correct variant images
Mar 10, 2016
e6ed6e6
Merge pull request #15 from ndinh215/variant-images
ndinh215 Mar 10, 2016
cff61fb
Fix the issues of code convention.
ndinh215 Mar 11, 2016
d9f3b03
Fix the issues of code convention.
ndinh215 Mar 11, 2016
8a12e53
Fix the issues of code convention.
ndinh215 Mar 11, 2016
c4c27dd
Add loading status while calling api.
theanh Mar 11, 2016
59cb6dc
Merge pull request #19 from ndinh215/issues_code_convention
ndinh215 Mar 11, 2016
023df59
Merge pull request #21 from ndinh215/product_detail_loading
ndinh215 Mar 11, 2016
51cbb47
Update demo data with real product
Mar 11, 2016
d7e0ee4
Merge pull request #22 from ndinh215/demo-data
ndinh215 Mar 11, 2016
7bd5fda
Get top products on home page.
theanh Mar 11, 2016
f510cc3
Merge pull request #24 from ndinh215/homepage
ndinh215 Mar 11, 2016
b2292be
Change home page with the correct style.
theanh Mar 11, 2016
e0a735d
Merge pull request #25 from ndinh215/homepage
ndinh215 Mar 11, 2016
36fc8e6
Using translation for search page
Mar 11, 2016
73f914f
Set filter field for color & material by locale
Mar 11, 2016
5e730db
Merge pull request #23 from ndinh215/search_multi-language_issue9
ndinh215 Mar 11, 2016
a68d210
Merge pull request #26 from ndinh215/color-material-filters_issue20
ndinh215 Mar 11, 2016
61cdea5
Change color, material filters from choice to multi choice.
theanh Mar 14, 2016
4403a39
Merge pull request #31 from ndinh215/filters_multi_choice
ndinh215 Mar 14, 2016
3fb8cfd
made data model for the variants
einorler May 3, 2016
29f26e3
made the filter in list work correctly
einorler May 3, 2016
6b7b8da
made products display with images and variants
einorler May 3, 2016
2fe0c6f
made variants selection in front end work as it should
einorler May 3, 2016
80a0883
updated documents to fit new data structure
einorler May 18, 2016
7bc98bd
removed fr locale from the shop
einorler May 18, 2016
a0e7989
implemented switching the variants
einorler May 18, 2016
4554b7b
included additional translations
einorler May 18, 2016
5ba949e
fixed other filter unsetting by pager
einorler May 18, 2016
20b11ee
implemented a range filter
einorler May 18, 2016
4ef00fd
implemented thumbnails for variant selection
einorler May 18, 2016
81d386c
made list display varianted items when filtering colors
einorler May 19, 2016
260f8a2
implemented people filter (problems with aggregations)
einorler May 19, 2016
49dae55
implemented sorting in product list
einorler May 20, 2016
d15db0b
fixed search
einorler May 20, 2016
ff9abe0
merged VN
einorler May 20, 2016
80e252e
implemented changing the number of items per page in front end
einorler May 24, 2016
4668be9
fixed dissapearance of parameters when going to another page
einorler May 24, 2016
0a087ca
updated first page to display nicer items instead of random ones
einorler May 24, 2016
c1295de
implemented multi currencies
einorler May 24, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@ gulp.task('scripts', function() {
dir.bootstrapJS + 'carousel.js',
dir.bootstrapJS + 'dropdown.js',
dir.bootstrapJS + 'tab.js',
// smooth products
dir.bower + 'smooth-products/js/smoothproducts.min.js',
// components
dir.assets + 'scripts/components/*.js',
// services
dir.assets + 'scripts/services/*.js',
// pages
dir.assets + 'scripts/pages/*.js',
// Main JS file
dir.assets + 'scripts/main.js'
])
Expand Down
3 changes: 3 additions & 0 deletions app/AppKernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ public function registerBundles()
new ONGR\RouterBundle\ONGRRouterBundle(),
new JMS\SerializerBundle\JMSSerializerBundle(),
new ONGR\ApiBundle\ONGRApiBundle(),
new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
new AppBundle\AppBundle(),
new Tedivm\StashBundle\TedivmStashBundle(),
new ONGR\CurrencyExchangeBundle\ONGRCurrencyExchangeBundle(),
];

if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
Expand Down
11 changes: 11 additions & 0 deletions app/Resources/data/demo_multi_languages.json

Large diffs are not rendered by default.

Binary file added app/Resources/images/dollar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/Resources/images/euro.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
33 changes: 33 additions & 0 deletions app/Resources/scripts/components/loader.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* This file is part of the ONGR package.
*
* (c) NFQ Technologies UAB <info@nfq.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

"strict mode";

(function($, window) {

var Loader = function(loaderContainer) {
var container = loaderContainer;
var loaderTmpl = "<div class='loader'>Loading</div>";

return {
start: function() {
$(container).append(loaderTmpl);
$(container).addClass('loader-container');
},
stop: function() {
$(container).find('.loader').remove();
$(container).removeClass('loader-container');
}
};
};

window.Ongr = window.Ongr || {};
window.Ongr.Components = {Loader: Loader};

})(jQuery, window);
8 changes: 5 additions & 3 deletions app/Resources/scripts/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* file that was distributed with this source code.
*/

(function($) {
(function($, Ongr) {
var ONGR = {
/**
* Global DOM selectors
Expand Down Expand Up @@ -61,6 +61,9 @@
this.bindFooterDropdown(g.footerDropdown);

this.bindScrollTop(g.scrollTop);

var product = Ongr.Pages.Product();
product.init();
},

/**
Expand Down Expand Up @@ -203,5 +206,4 @@
};

var App = Object.create(ONGR); App.init();
})(jQuery);

})(jQuery, Ongr);
36 changes: 36 additions & 0 deletions app/Resources/scripts/pages/product.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* This file is part of the ONGR package.
*
* (c) NFQ Technologies UAB <info@nfq.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

"strict mode";

(function($, window) {

var Product = function() {
var locale = appLocale;
var selectors = {
images: '.image-select',
mainImage: '.product-image',
};

var bindImageSlider = function(images, mainImage) {
$(images).on('click', function(){
$(mainImage).attr('src', $(this).attr('src'));
});
};
return {
init: function() {
bindImageSlider(selectors.images, selectors.mainImage);
}
};
};

window.Ongr = window.Ongr || {};
window.Ongr.Pages = {Product: Product};

})(jQuery, window);
49 changes: 49 additions & 0 deletions app/Resources/scripts/services/product.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/*
* This file is part of the ONGR package.
*
* (c) NFQ Technologies UAB <info@nfq.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

"strict mode";

(function($, window) {

var Product = function() {

var setApiGetProductUrl = function(id) {
return Routing.generate('ongr_api_v3_product_get',
{documentId: id}
);
};

var setApiGetProductVariantUrl = function(id) {
return Routing.generate('ongr_api_v3_product_get_variant',
{
documentId: id
}
);
};

return {
get: function(id) {
return $.ajax({
url: setApiGetProductUrl(id),
method: 'GET'
});
},
getVariants: function(id) {
return $.ajax({
url: setApiGetProductVariantUrl(id),
method: 'GET'
});
}
};
};

window.Ongr = window.Ongr || {};
window.Ongr.Services = {Product: Product};

})(jQuery, window);
69 changes: 69 additions & 0 deletions app/Resources/style/common/_loaders.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
%extend_loader_1 {
border-radius: 50%;
width: 2.5em;
height: 2.5em;
animation-fill-mode: both;
animation: load 1.8s infinite ease-in-out;
}

%extend_loader_2 {
content: '';
position: absolute;
top: 0;
}

@-webkit-keyframes load {
0% {
box-shadow: 0 2.5em 0 -1.3em $loader_color_base;
}
80% {
box-shadow: 0 2.5em 0 -1.3em $loader_color_base;
}
100% {
box-shadow: 0 2.5em 0 -1.3em $loader_color_base;
}
40% {
box-shadow: 0 2.5em 0 0 $loader_color_base;
}
}

@keyframes load {
0% {
box-shadow: 0 2.5em 0 -1.3em $loader_color_base;
}
80% {
box-shadow: 0 2.5em 0 -1.3em $loader_color_base;
}
100% {
box-shadow: 0 2.5em 0 -1.3em $loader_color_base;
}
40% {
box-shadow: 0 2.5em 0 0 $loader_color_base;
}
}

.loader-container {
position: relative;
opacity: $loader_opacity;
}

.loader {
@extend %extend_loader_1;
font-size: 10px;
margin: 30% auto;
position: relative;
text-indent: -9999em;
transform: translateZ(0);
animation-delay: -0.16s;
&:before {
@extend %extend_loader_1;
left: -3.5em;
animation-delay: -0.32s;
@extend %extend_loader_2;
}
&:after {
@extend %extend_loader_1;
left: 3.5em;
@extend %extend_loader_2;
}
}
27 changes: 27 additions & 0 deletions app/Resources/style/common/_variables.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
//colors
$color_storm_dust_approx: #666;
$color_mercury_approx: #e6e6e6;
$color_quicksand_approx: #c5988b;
$color_submarine_approx: #bdc2c9;
$color_tapa_approx: #7a7975;
$white: #fff;
$color_cinnabar_approx: #e1423c;
$color_bon_jour_approx: #e0e0e0;
$color_alto_approx: #ddd;
$color_gallery_approx: #eee;
$color_mango_tango: #E57300;

//fonts
$font_0: Georgia;
$font_1: Gerogia;
$font_base: 14px;

// padding
$padding-base: 1.5em;

// Loader
$loader_color_base: $color_mango_tango;
$loader_opacity : 0.5;

// pages
$body_background: #f9f9f9;
Loading