Skip to content

Commit

Permalink
Placido-Shop v-2.1.6
Browse files Browse the repository at this point in the history
the header is no longer configured to be fixed when scrolling
fixed product links bug on facebook
correction of the bug during a real payment: wrong table name
  • Loading branch information
Raf-sns committed Dec 11, 2022
1 parent 061a653 commit 90a6cae
Show file tree
Hide file tree
Showing 12 changed files with 170 additions and 164 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@


/README.md
/READ_ME.txt
2 changes: 2 additions & 0 deletions .htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ Header set X-XSS-Protection "1; mode=block"
## do not cache if these files are already cached
SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip


## manage very olds browsers
BrowserMatch ^Mozilla/4 gzip-only-text/html
BrowserMatch ^Mozilla/4\.0[678] no-gzip
Expand Down Expand Up @@ -126,6 +127,7 @@ Header append Vary User-Agent env=!dont-vary
</IfModule>
## END Cache-Control Headers


#################
### END CACHE ###
#################
Expand Down
4 changes: 2 additions & 2 deletions API/api.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"LANG_BACK": "en",
"LANG_FRONT": "en",
"LANG_LOCALE": "en_US",
"LAST_UPDATE": "Monday, December 5, 2022 at 5:20 AM",
"LAST_UPDATE": "Sunday, December 11, 2022 at 10:45 PM",
"LOGO": "logo-shop-alhnzivtfyqrcswogebdxmukpj-0-1670200102.png",
"LOGO_SN": "logo-sn-wnrbfzqchoiykdtaegpumxjvls-0-1670213667.png",
"LOGO_SN_SIZE": 900,
Expand All @@ -31,6 +31,6 @@
},
"TIMEZONE": "America\/Los_Angeles",
"TOKEN_TIME": 7200,
"VERSION": "2.1.5",
"VERSION": "2.1.6",
"WEBSITE_TITLE": "Placido-Shop"
}
56 changes: 27 additions & 29 deletions CSS/api.css
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ ul#select_nb_options {
align-content: center;
}
.head_text {
padding: 0% 20px 0 26px;
padding: 0 26px 0;
line-height: 26px;
}
.info_slider_prod {
Expand Down Expand Up @@ -331,45 +331,43 @@ img.first_img {
}
/* INLINE PRODUCTS */
.prods_inl .box_gen {
background: var(--bkg-products);
width: 100%;
display: flex;
flex-direction: row;
flex-wrap: nowrap;
justify-content: space-between;
align-items: flex-start;
margin: 0 0 16px;
padding: 10px;
background: var(--bkg-products);
width: 100%;
display: flex;
flex-direction: row;
flex-wrap: nowrap;
justify-content: space-between;
align-items: flex-start;
margin: 0 0 16px;
padding: 10px;
}
.prods_inl .box_product {
width: 200px;
margin: 0;
width: 200px;
margin: 0;
}
.prods_inl .show_info_product {

margin: 0;
margin: 0;
}
#products_view.prods_inl img {
margin: 0 0 0 0 !important;
min-width: 200px;
margin: 0 0 0 0 !important;
min-width: 200px;
}
.prods_inl .cont_title_descr {
width: 40%;
width: 40%;
}
.prods_inl .prod_title {
display: block;
font-size: var(--text-large);
margin: 10px auto 0 16px;
color: var(--color-text);
font-weight: 400;
min-width: 375px;
display: block;
font-size: var(--text-large);
margin: 10px auto 0 16px;
color: var(--color-text);
font-weight: 400;
min-width: 375px;
}
.prods_inl .cont_prod_infos {
width: 23%;
width: 23%;
}
/* END INLINE PRODUCTS */
/* END PRODUCTS CSS */

/* single product thumbnails */
img.other_imgs {
width: 100px;
Expand Down Expand Up @@ -448,10 +446,10 @@ img.other_imgs {
.slider_short_text {
display: none;
}
/* not show -> button display products */
#products_display {
display: none;
}
/* not show -> button display products */
#products_display {
display: none;
}
}
/* END media querys 900px */
/* media querys 768px */
Expand Down
68 changes: 33 additions & 35 deletions CSS/shop.css
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
/* ________ GLOBAL SHOP CSS ________ */
/* i. - This file will never updated */

body {
background: url(../img/background.jpg), no-repeat;
background-size: auto;
background-attachment: fixed;
/* minium font size */
/* minium font size */
font-size: 16px;
/* "Open Sans" is downloaded otherwise use system font */
font-family: "Open Sans", system-ui, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
/* "Open Sans" is downloaded otherwise use system font */
font-family: "Open Sans", system-ui, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
}
/* i. :ROOT vars -> use it like :
.my_text {
Expand Down Expand Up @@ -303,40 +302,40 @@ span.erase_search {
}
/* STATIC PAGES */
#page {
background: var(--bkg-content);
padding: 2% 4% 4%;
color: var(--color-text);
background: var(--bkg-content);
padding: 2% 4% 4%;
color: var(--color-text);
}
#page h2 {
font-size: var(--text-xxlarge);
margin: 10px 0 50px;
color: var(--color-text);
font-weight: 500 !important;
font-size: var(--text-xxlarge);
margin: 10px 0 50px;
color: var(--color-text);
font-weight: 500 !important;
}
#page h3 {
font-size: var(--text-xlarge);
margin: 36px 0 0;
color: var(--color-text);
font-weight: 500;
font-size: var(--text-xlarge);
margin: 36px 0 0;
color: var(--color-text);
font-weight: 500;
}
#page p {
margin: 26px 0 0;
font-size: var(--text-large);
color: var(--color-text);
margin: 26px 0 0;
font-size: var(--text-large);
color: var(--color-text);
}
#page strong {
font-size: var(--text-large);
font-weight: 500;
font-size: var(--text-large);
font-weight: 500;
}
#page ul {
padding: 0;
margin: 16px 0 42px;
padding: 0;
margin: 16px 0 42px;
}
#page li {
list-style-type: none;
font-size: var(--text);
border-bottom: none;
margin: 1% 2% 0;
list-style-type: none;
font-size: var(--text);
border-bottom: none;
margin: 1% 2% 0;
}
/* <HEADER> */
/* header bar - all but not slider OR jumbo text */
Expand Down Expand Up @@ -377,7 +376,7 @@ h1#title_shop {
margin: 0 auto 0 4%;
font-size: 40px;
font-weight: 400;
line-height: 48px;
line-height: 48px;
}
/* A - 2 - CART BTN + MENU BTN */
#cart_container {}
Expand Down Expand Up @@ -568,10 +567,10 @@ footer hr {
line-height: 32px;
}
#page h2 {
font-size: var(--text-xxlarge);
margin: 10px 0 0;
text-align: left !important;
}
font-size: var(--text-xxlarge);
margin: 10px 0 0;
text-align: left !important;
}
#toast-container>.toast {
width: 97% !important;
}
Expand Down Expand Up @@ -617,10 +616,9 @@ footer hr {
/* end media querys 768px */
/* media querys 580px */
@media all and (max-width: 580px) {

h1#title_shop {
font-size: 30px;
}
h1#title_shop {
font-size: 30px;
}
}
/* media querys 580px */
/* ________ GLOBAL SHOP CSS ________ */
14 changes: 7 additions & 7 deletions INSTALL/placido-tables.sql
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
-- https://www.phpmyadmin.net/
--
-- Hôte : localhost:3306
-- Généré le : lun. 05 déc. 2022 à 02:17
-- Généré le : Dim 11 déc. 2022 à 22:42
-- Version du serveur : 10.5.18-MariaDB
-- Version de PHP : 7.4.30

Expand Down Expand Up @@ -40,7 +40,7 @@ CREATE TABLE `admins` (
--

INSERT INTO `admins` (`id`, `mail`, `passw`, `name`) VALUES
(0, '[email protected]', '$2y$10$zLZOUnbeh7t/gB4FQApwYuejeAy5F3mF3cc7zJJxsosoTe4I/iReW', 'Admin');
(0, '[email protected]', '$2y$10$Z3/XcJVvyVTy.e6xSmLNKOYFIssjN6zjtCEo0id/YKiS6zFOXcj26', 'Admin');

-- --------------------------------------------------------

Expand Down Expand Up @@ -550,7 +550,7 @@ ALTER TABLE `user_shop`
-- AUTO_INCREMENT pour la table `categories`
--
ALTER TABLE `categories`
MODIFY `cat_id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=59;
MODIFY `cat_id` int(11) NOT NULL AUTO_INCREMENT;

--
-- AUTO_INCREMENT pour la table `customers`
Expand All @@ -562,7 +562,7 @@ ALTER TABLE `customers`
-- AUTO_INCREMENT pour la table `messages`
--
ALTER TABLE `messages`
MODIFY `mess_id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=4;
MODIFY `mess_id` int(11) NOT NULL AUTO_INCREMENT;

--
-- AUTO_INCREMENT pour la table `new_sales`
Expand All @@ -574,13 +574,13 @@ ALTER TABLE `new_sales`
-- AUTO_INCREMENT pour la table `products`
--
ALTER TABLE `products`
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=57;
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;

--
-- AUTO_INCREMENT pour la table `products_imgs`
--
ALTER TABLE `products_imgs`
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=142;
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;

--
-- AUTO_INCREMENT pour la table `sold_products`
Expand All @@ -592,7 +592,7 @@ ALTER TABLE `sold_products`
-- AUTO_INCREMENT pour la table `static_pages`
--
ALTER TABLE `static_pages`
MODIFY `page_id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=46;
MODIFY `page_id` int(11) NOT NULL AUTO_INCREMENT;
COMMIT;

/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
Expand Down
2 changes: 1 addition & 1 deletion JS/api_loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ $(function(){
// end splash screen

// enable sticky_header
$.sticky_header_init = true;
$.sticky_header_init = false;

// check cart in memory
$.check_cart_in_memory();
Expand Down
4 changes: 3 additions & 1 deletion JS/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -1769,10 +1769,12 @@ $.extend({
sticky_header_init : false,
sticky_header : function(){


// no sticky header
if( $.sticky_header_init == false ){
return;
}
// NO STICKY HEADER IN CONTEXT

// if orientation == 'landscape' on mobile + NOT IN CART -> this bad UX
if( $(window).width() < 800
|| ( $(window).width() < 800 && window.screen.orientation.type == 'landscape-primary' )
Expand Down
7 changes: 1 addition & 6 deletions JS/tools.js
Original file line number Diff line number Diff line change
Expand Up @@ -321,16 +321,11 @@ $.extend({

event.preventDefault();

// include header bar pdding
var pad_top = ( $('#featured_products').is(':visible') == true )
? $('#header_bar').outerHeight(true)
: 0;

var speed = 700; // Durée de l'animation (en ms)

// animate the scroll
$('html, body')
.animate( { scrollTop: Math.round($(elem).offset().top-pad_top) }, speed );
.animate( { scrollTop: Math.round($(elem).offset().top) }, speed );

},
/**
Expand Down
Loading

0 comments on commit 90a6cae

Please sign in to comment.