diff --git a/components/header/header.scss b/components/header/header.scss
index 1da50a3..4b0c6bd 100644
--- a/components/header/header.scss
+++ b/components/header/header.scss
@@ -28,21 +28,40 @@
}
- .cart-cta {
+ .ctas {
position: absolute;
top: 20px;
- right: 70px;
+ left: 20px;
font-size: $font-34;
- padding: 0 4px !important;
+ padding: 0 !important;
color: $black;
- .counter {
- position: absolute;
- left: 50%;
- top: 14px;
- transform: translateX(-50%);
- @include font-style($font-sans, 'semibold', $font-14);
+ .cart-cta,
+ .account-cta {
+ position: relative;
+ display: inline-flex;
+ padding: 0 4px !important;
+ color: $black;
+
+ .counter {
+ position: absolute;
+ left: 10px;
+ top: 14px;
+ width: 22px;
+ text-align: center;
+ @include font-style($font-sans, 'semibold', $font-14);
+ }
+
+ .label {
+ display: none;
+ height: 15px;
+ line-height: 15px;
+ margin: 12px 0 auto 0;
+ text-transform: uppercase;
+ @include font-style($font-sans, 'regular', $font-12);
+ }
}
+
}
@@ -147,6 +166,16 @@
.logo {
max-height: 70px;
}
+
+ .ctas {
+ .cart-cta,
+ .account-cta {
+ .label {
+ display: block;
+ }
+ }
+ }
+
.menu-container {
.menu-label {
//display: block;
diff --git a/components/sectionHeader/sectionHeader.html b/components/sectionHeader/sectionHeader.html
index 336f807..aa766ec 100644
--- a/components/sectionHeader/sectionHeader.html
+++ b/components/sectionHeader/sectionHeader.html
@@ -13,6 +13,9 @@
case 'produrre':
$section_label = 'produrre';
break;
+ case 'account':
+ $section_label = 'account';
+ break;
case 'acquistare':
case 'carrello':
case 'checkout':
diff --git a/components/thankyou/thankyou.html b/components/thankyou/thankyou.html
index 9670404..17147a1 100644
--- a/components/thankyou/thankyou.html
+++ b/components/thankyou/thankyou.html
@@ -2,14 +2,6 @@
@include('components/breadcrumb/breadcrumb.php');
setlocale(LC_MONETARY, 'it_IT.UTF-8');
- $url = $_SERVER[REQUEST_URI];
- $url_components = parse_url($url);
- parse_str($url_components['query'], $params);
-
- if(isset($params['token'])) {
- $q = mysqli_query($conn, "UPDATE orders SET status = 'PAID' WHERE token = '".$params['token']."'");
- }
-
?>
diff --git a/components/thankyou/thankyou.js b/components/thankyou/thankyou.js
index 4b801b3..4fca50d 100644
--- a/components/thankyou/thankyou.js
+++ b/components/thankyou/thankyou.js
@@ -1,5 +1,20 @@
$(document).ready( () => {
console.log('Load component - thankyou')
+ const component = $('.component-thankyou')
-})
\ No newline at end of file
+ if(component.length) {
+ const data = sessionStorage.getItem('order') ? JSON.parse(sessionStorage.getItem('order')) : null
+ if(!data) {
+ window.location='/'
+ } else {
+
+ const urlParams = new URLSearchParams(window.location.search)
+ Apis.saveOrder(data.profile, data.cartItems, data.token, data.uid, data.amount, urlParams.has('token')).then( (e) => {
+ sessionStorage.removeItem('order')
+ }).catch( (error) => {
+ console.error(error)
+ })
+ }
+ }
+})
diff --git a/deploy.sh b/deploy.sh
index d3649d5..6106c7b 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -14,6 +14,6 @@ do
done
cd ..
-rsync -avz --delete --exclude '/cgi-bin/conn.conn' --exclude '/api/config.php' -e "ssh -i ./auth/marketmind.pem" ./public/* ubuntu@18.194.83.82:/var/www/iolovolio.com/
-rsync -avz --delete -e "ssh -i ./auth/marketmind.pem" ./admin/* ubuntu@18.194.83.82:/var/www/iolovolio.com/admin/
+rsync -avz --delete --exclude '/cgi-bin/conn.conn' --exclude '/admin/.htaccess' --exclude '/api' -e "ssh -i ./auth/marketmind.pem" ./public/* ubuntu@18.194.83.82:/var/www/iolovolio.com/
+rsync -avz --delete --exclude '/config.php' --exclude '/vendor' -e "ssh -i ./auth/marketmind.pem" ./api/* ubuntu@18.194.83.82:/var/www/iolovolio.com/api/
diff --git a/images/logo.png b/images/logo.png
index af7721f..060ed38 100644
Binary files a/images/logo.png and b/images/logo.png differ
diff --git a/pages/account.ejs b/pages/account.ejs
new file mode 100644
index 0000000..f44f653
--- /dev/null
+++ b/pages/account.ejs
@@ -0,0 +1,2 @@
+
+${require('../components/account/account.html')}
diff --git a/pages/index.ejs b/pages/index.ejs
index 388e9df..1dff8f3 100644
--- a/pages/index.ejs
+++ b/pages/index.ejs
@@ -14,8 +14,25 @@
if(@$_GET['q']){ $GLOBALS['getQ'] = explode("/",$_GET['q']); }
+ if($_POST['login_usr'] && $_POST['login_pwd']) {
+ $q = mysqli_query($conn, "SELECT * FROM users WHERE email = '".trim($_POST['login_usr'])."' AND
+ password = '".md5(trim($_POST['login_pwd']))."'");
+ $r = mysqli_fetch_array($q);
+
+ if(mysqli_num_rows($q)) {
+ $_SESSION['AUTH'] = $r;
+ } else {
+ unset($_SESSION['AUTH']);
+ }
+ }
+
if($getQ[0]!="iolovolio"){ $isHome = false; }
if($getQ[0]=="thankyou"){ unset($_SESSION['CART']); }
+ if($getQ[0]=="logout"){
+ unset($_SESSION['CART']);
+ unset($_SESSION['AUTH']);
+ header("location: /");
+ }
?>
diff --git a/src/fonts/icomoon.eot b/src/fonts/icomoon.eot
index e57b369..d00b629 100644
Binary files a/src/fonts/icomoon.eot and b/src/fonts/icomoon.eot differ
diff --git a/src/fonts/icomoon.svg b/src/fonts/icomoon.svg
index 9191f2d..da25eb6 100644
--- a/src/fonts/icomoon.svg
+++ b/src/fonts/icomoon.svg
@@ -15,4 +15,5 @@
+
\ No newline at end of file
diff --git a/src/fonts/icomoon.ttf b/src/fonts/icomoon.ttf
index a7b0aec..6fb6c01 100644
Binary files a/src/fonts/icomoon.ttf and b/src/fonts/icomoon.ttf differ
diff --git a/src/fonts/icomoon.woff b/src/fonts/icomoon.woff
index db838a3..087bd7a 100644
Binary files a/src/fonts/icomoon.woff and b/src/fonts/icomoon.woff differ
diff --git a/src/fonts/selection.json b/src/fonts/selection.json
index a9237db..c881a5f 100644
--- a/src/fonts/selection.json
+++ b/src/fonts/selection.json
@@ -1 +1 @@
-{"IcoMoonType":"selection","icons":[{"icon":{"paths":["M498.102 56.824c-115.187 0-211.767 96.565-211.767 215.468h-167.207v78.016h0.363v538.852h-0.363v78.016h784.003v-7.693h1.742v-687.408h-78.016v0.218h-113.213c0-118.903-100.353-215.468-215.541-215.468zM498.102 131.139c78.030 0 141.226 63.124 141.226 141.154h-278.679c0-78.030 59.422-141.154 137.453-141.154zM197.579 350.308h88.756v55.736h74.314v-55.736h278.679v55.736h74.314v-55.736h113.213v538.852h-629.278z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["buy"],"grid":0},"attrs":[{}],"properties":{"order":117,"id":0,"name":"buy","prevSize":32,"code":59648},"setIdx":0,"setId":0,"iconIdx":0},{"icon":{"paths":["M976.53 470.996v81.976h-929.060v-81.976z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["minus"],"grid":0},"attrs":[{}],"properties":{"order":118,"id":1,"name":"minus","prevSize":32,"code":59649},"setIdx":0,"setId":0,"iconIdx":1},{"icon":{"paths":["M471.011 47.47h81.976v929.060h-81.976z","M976.53 470.996v81.976h-929.060v-81.976z"],"attrs":[{},{}],"isMulticolor":false,"isMulticolor2":false,"tags":["plus"],"grid":0},"attrs":[{},{}],"properties":{"order":147,"id":2,"name":"plus","prevSize":32,"code":59650},"setIdx":0,"setId":0,"iconIdx":2},{"icon":{"paths":["M811.532 154.58l57.959 57.973-657.024 656.865-57.959-57.973z","M869.43 811.521l-57.973 57.959-656.865-657.024 57.973-57.959z"],"attrs":[{},{}],"tags":["close"],"grid":0,"isMulticolor":false,"isMulticolor2":false},"attrs":[{},{}],"properties":{"order":148,"id":7,"prevSize":32,"code":59655,"name":"close"},"setIdx":0,"setId":0,"iconIdx":3},{"icon":{"paths":["M90.513 253.965l-47.292 47.292 468.778 468.778 468.778-468.778-47.292-47.292-421.487 421.487z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["angle-down"],"grid":0},"attrs":[{}],"properties":{"order":119,"id":3,"name":"angle-down","prevSize":32,"code":59651},"setIdx":0,"setId":0,"iconIdx":4},{"icon":{"paths":["M933.487 770.035l47.292-47.292-468.778-468.778-468.778 468.778 47.292 47.292 421.487-421.487z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["angle-top"],"grid":0},"attrs":[{}],"properties":{"order":122,"id":4,"prevSize":32,"code":59652,"name":"angle-top"},"setIdx":0,"setId":0,"iconIdx":5},{"icon":{"paths":["M253.965 933.487l47.292 47.292 468.778-468.778-468.778-468.778-47.292 47.292 421.487 421.487z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["angle-right"],"grid":0},"attrs":[{}],"properties":{"order":120,"id":5,"prevSize":32,"code":59653,"name":"angle-right"},"setIdx":0,"setId":0,"iconIdx":6},{"icon":{"paths":["M770.035 90.513l-47.292-47.292-468.778 468.778 468.778 468.778 47.292-47.292-421.487-421.487z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["angle-left"],"grid":0},"attrs":[{}],"properties":{"order":121,"id":6,"prevSize":32,"code":59654,"name":"angle-left"},"setIdx":0,"setId":0,"iconIdx":7}],"height":1024,"metadata":{"name":"icomoon"},"preferences":{"showGlyphs":true,"showQuickUse":false,"showQuickUse2":true,"showSVGs":true,"fontPref":{"prefix":"icon-","metadata":{"fontFamily":"icomoon"},"metrics":{"emSize":1024,"baseline":6.25,"whitespace":50},"embed":false,"autoHost":true},"imagePref":{"prefix":"icon-","png":true,"useClassSelector":true,"color":0,"bgColor":16777215,"classSelector":".icon"},"historySize":50,"showCodes":true,"gridSize":16,"quickUsageToken":{"UntitledProject":"ZjQ5ODNjZDkzZGRhNGRlZDg3YmQ2Njc5YTQyNWU2Y2QjMSMxNTY0MDUxMDkxIyMj"},"showGrid":false}}
\ No newline at end of file
+{"IcoMoonType":"selection","icons":[{"icon":{"paths":["M511.999 177.555c94.616 0 172.93 78.305 172.93 172.93s-78.307 172.93-172.93 172.93c-94.616 0-172.93-78.304-172.93-172.93s78.304-172.93 172.93-172.93zM511.999 95.989c-140.299 0-254.496 114.197-254.496 254.496s114.197 254.496 254.496 254.496c140.3 0 254.497-114.197 254.497-254.496s-114.197-254.496-254.497-254.496z","M512.003 653.915c94.616 0 205.553 22.841 231.652 189.241h-463.307c29.361-166.4 137.038-189.241 231.653-189.241zM512.003 565.817c-179.45 0-323.009 88.098-323.009 362.164h646.029c0-274.072-143.559-362.164-323.008-362.164z"],"attrs":[{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["user"]},"attrs":[{},{}],"properties":{"order":471,"id":8,"name":"user","prevSize":32,"code":59656},"setIdx":0,"setId":0,"iconIdx":0},{"icon":{"paths":["M498.102 56.824c-115.187 0-211.767 96.565-211.767 215.468h-167.207v78.016h0.363v538.852h-0.363v78.016h784.003v-7.693h1.742v-687.408h-78.016v0.218h-113.213c0-118.903-100.353-215.468-215.541-215.468zM498.102 131.139c78.030 0 141.226 63.124 141.226 141.154h-278.679c0-78.030 59.422-141.154 137.453-141.154zM197.579 350.308h88.756v55.736h74.314v-55.736h278.679v55.736h74.314v-55.736h113.213v538.852h-629.278z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["buy"],"grid":0},"attrs":[{}],"properties":{"order":117,"id":0,"name":"buy","prevSize":32,"code":59648},"setIdx":0,"setId":0,"iconIdx":1},{"icon":{"paths":["M976.53 470.996v81.976h-929.060v-81.976z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["minus"],"grid":0},"attrs":[{}],"properties":{"order":118,"id":1,"name":"minus","prevSize":32,"code":59649},"setIdx":0,"setId":0,"iconIdx":2},{"icon":{"paths":["M471.011 47.47h81.976v929.060h-81.976z","M976.53 470.996v81.976h-929.060v-81.976z"],"attrs":[{},{}],"isMulticolor":false,"isMulticolor2":false,"tags":["plus"],"grid":0},"attrs":[{},{}],"properties":{"order":147,"id":2,"name":"plus","prevSize":32,"code":59650},"setIdx":0,"setId":0,"iconIdx":3},{"icon":{"paths":["M811.532 154.58l57.959 57.973-657.024 656.865-57.959-57.973z","M869.43 811.521l-57.973 57.959-656.865-657.024 57.973-57.959z"],"attrs":[{},{}],"isMulticolor":false,"isMulticolor2":false,"tags":["close"],"grid":0},"attrs":[{},{}],"properties":{"order":148,"id":3,"prevSize":32,"code":59655,"name":"close"},"setIdx":0,"setId":0,"iconIdx":4},{"icon":{"paths":["M90.513 253.965l-47.292 47.292 468.778 468.778 468.778-468.778-47.292-47.292-421.487 421.487z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["angle-down"],"grid":0},"attrs":[{}],"properties":{"order":119,"id":4,"name":"angle-down","prevSize":32,"code":59651},"setIdx":0,"setId":0,"iconIdx":5},{"icon":{"paths":["M933.487 770.035l47.292-47.292-468.778-468.778-468.778 468.778 47.292 47.292 421.487-421.487z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["angle-top"],"grid":0},"attrs":[{}],"properties":{"order":122,"id":5,"prevSize":32,"code":59652,"name":"angle-top"},"setIdx":0,"setId":0,"iconIdx":6},{"icon":{"paths":["M253.965 933.487l47.292 47.292 468.778-468.778-468.778-468.778-47.292 47.292 421.487 421.487z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["angle-right"],"grid":0},"attrs":[{}],"properties":{"order":120,"id":6,"prevSize":32,"code":59653,"name":"angle-right"},"setIdx":0,"setId":0,"iconIdx":7},{"icon":{"paths":["M770.035 90.513l-47.292-47.292-468.778 468.778 468.778 468.778 47.292-47.292-421.487-421.487z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["angle-left"],"grid":0},"attrs":[{}],"properties":{"order":121,"id":7,"prevSize":32,"code":59654,"name":"angle-left"},"setIdx":0,"setId":0,"iconIdx":8}],"height":1024,"metadata":{"name":"icomoon"},"preferences":{"showGlyphs":true,"showQuickUse":false,"showQuickUse2":true,"showSVGs":true,"fontPref":{"prefix":"icon-","metadata":{"fontFamily":"icomoon"},"metrics":{"emSize":1024,"baseline":6.25,"whitespace":50},"embed":false,"autoHost":true},"imagePref":{"prefix":"icon-","png":true,"useClassSelector":true,"color":0,"bgColor":16777215,"classSelector":".icon"},"historySize":50,"showCodes":true,"gridSize":16,"quickUsageToken":{"UntitledProject":"ZjQ5ODNjZDkzZGRhNGRlZDg3YmQ2Njc5YTQyNWU2Y2QjMSMxNTY0MDUxMDkxIyMj"},"showGrid":false}}
\ No newline at end of file
diff --git a/src/js/index.js b/src/js/index.js
index 90fb28d..d814ace 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -141,14 +141,15 @@ window.Apis.checkout = (cart, token) => {
-window.Apis.saveOrder = (profile, cart, token, uid, total) => {
+window.Apis.saveOrder = (profile, cart, token, uid, total, paid = false) => {
const body = {
uid: uid,
token: token,
cart: cart,
profile: profile,
- total: total
+ total: total,
+ paid: paid
}
return new Promise((resolve, reject) => {
diff --git a/src/scss/forms.scss b/src/scss/forms.scss
index 3c23456..f9473b8 100644
--- a/src/scss/forms.scss
+++ b/src/scss/forms.scss
@@ -79,6 +79,10 @@ input[type=number] {
box-shadow: unset;
text-transform: initial !important;
+ &:disabled {
+ opacity: .5;
+ }
+
}
select,
@@ -88,6 +92,10 @@ select,
background-size: auto 30%;
background-repeat: no-repeat;
background-position: right 10px center;
+ &.input-small {
+ padding: 3px 10px;
+ font-size: $font-12;
+ }
}
.input-text {
@@ -96,7 +104,7 @@ select,
&.input-small {
padding: 3px 10px;
- font-style: $font-14;
+ font-size: $font-14;
}
}
diff --git a/src/scss/icons.scss b/src/scss/icons.scss
index 31958c7..541dbdb 100644
--- a/src/scss/icons.scss
+++ b/src/scss/icons.scss
@@ -25,6 +25,9 @@
}
+.icon-user:before {
+ content: "\e908";
+}
.icon-buy:before {
content: "\e900";
}
diff --git a/src/scss/main.scss b/src/scss/main.scss
index 83a31dc..7589adb 100644
--- a/src/scss/main.scss
+++ b/src/scss/main.scss
@@ -24,3 +24,4 @@
@import "./components/cart/cart.scss";
@import "./components/checkout/checkout.scss";
@import "./components/thankyou/thankyou.scss";
+@import "./components/account/account.scss";
diff --git a/webpack.config.js b/webpack.config.js
index bb4d359..35025a5 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -15,6 +15,7 @@ const componentPath = path.join(__dirname, './components')
const imagesPath = path.join(__dirname, './images')
const binsPath = path.join(__dirname, './cgi-bin')
const apisPath = path.join(__dirname, './api')
+const adminPath = path.join(__dirname, './admin')
const assetsPath = path.join(__dirname, './assets')
const docsPath = path.join(__dirname, './docs')
const srcPath = './src'
@@ -73,8 +74,13 @@ module.exports = (env) => {
},
{
context: apisPath,
- from: '*.*',
+ from: '**/*',
to: distPath + '/api',
+ },
+ {
+ context: adminPath,
+ from: '*.*',
+ to: distPath + '/admin',
}
]
})