From b8d88b9cc5c050919d298cfe49d4aa1962307b61 Mon Sep 17 00:00:00 2001 From: sachinganesh Date: Fri, 28 Apr 2023 15:43:17 +0530 Subject: [PATCH] code added --- dist/Js/auth/apiservice.js | 19 +++--- dist/Js/auth/login.js | 2 + dist/Js/components/authloader/authloader.js | 8 +-- dist/Js/myaccount/Address.js | 12 ++-- dist/Js/myaccount/Profile.js | 4 +- dist/Js/myaccount/myaccount_warrenty.js | 2 +- dist/Js/myaccount/orderdetails.js | 10 +-- dist/Js/navbar.js | 9 ++- dist/Js/orderDetails/order_summary.js | 6 +- dist/Js/productdetails/productdetails.js | 20 +++++- dist/Js/products/products.js | 23 +++++++ dist/Js/shoppingcart/addtocart.js | 2 +- dist/Js/shoppingcart/select_delivery.js | 14 ++--- dist/Js/utils/helpers.js | 8 +-- dist/Js/warranty.js | 8 +-- dist/css/style.css | 53 ++++++++++++++++ index.html | 2 +- login.html | 7 ++- press.html | 11 +++- productdetails.html | 68 +++++++++++++-------- ramproducts.html | 10 +-- selectdelivery.html | 2 +- shopping-cart.html | 7 ++- storageproducts.html | 9 ++- 24 files changed, 223 insertions(+), 93 deletions(-) diff --git a/dist/Js/auth/apiservice.js b/dist/Js/auth/apiservice.js index 3fecafa..cabc3ae 100644 --- a/dist/Js/auth/apiservice.js +++ b/dist/Js/auth/apiservice.js @@ -1,10 +1,15 @@ //let SERVERNAME = 'https://anwi.bizgaze.app'; -let SERVERNAME = 'http://beta.bizgaze.com'; -const STAT = 'b276960fddf84e8cb63de6e32d31529b'; +//let SERVERNAME = 'http://beta.bizgaze.com'; + let SERVERNAME = 'http://localhost:3088'; +//template +const STAT = '8041f78ba55b4847bc4aacaeae9d24ef'; + +//live +//const STAT = '0c7ef2b000ca431290065753dfda56fe'; function imgServerNameBuild(path){ - return `${SERVERNAME}/${path}`; + return `https://appassets.bizgaze.app/${path}`; } @@ -54,10 +59,10 @@ async function postAPIService(url,data={}){ url:`${SERVERNAME}/${url}`, method:'post', data:data, - headers: { - 'Authorization': `Basic b67607dd-283e-478e-b2cf-35736e8bad69`, - 'Content-Type': 'application/json' - }, + // headers: { + // 'Authorization': `Basic b67607dd-283e-478e-b2cf-35736e8bad69`, + // 'Content-Type': 'application/json' + // }, } let response = await axios(config); diff --git a/dist/Js/auth/login.js b/dist/Js/auth/login.js index 158bd8e..d93ba1c 100644 --- a/dist/Js/auth/login.js +++ b/dist/Js/auth/login.js @@ -107,6 +107,8 @@ function initLogin() { $('.error_msg').show(); $('.error_msg .error_msg_res').html(`User doesn't exists with the email, Sign Up `); $(".register_sectionbtn").click(function(){ + + $(".login_section").css("display","none"); $(".register_section").css("display","block"); $(".login_section").find("#User_Email").removeClass("is-invalid"); diff --git a/dist/Js/components/authloader/authloader.js b/dist/Js/components/authloader/authloader.js index fafb152..1b63a57 100644 --- a/dist/Js/components/authloader/authloader.js +++ b/dist/Js/components/authloader/authloader.js @@ -19,10 +19,10 @@ template.innerHTML = ` .loader{ transition: all 0.7s ease-in-out; - border:10px solid #ebebeb; - border-bottom-color:#26B8BF; - width: 100px; - height: 100px; + border:5px solid #ebebeb; + border-bottom-color:black; + width: 20px; + height: 20px; border-radius:50%; -webkit-font-smoothing: antialiased !important; margin:30px 0px; diff --git a/dist/Js/myaccount/Address.js b/dist/Js/myaccount/Address.js index b076302..f67c064 100644 --- a/dist/Js/myaccount/Address.js +++ b/dist/Js/myaccount/Address.js @@ -12,7 +12,7 @@ async function addressDetails() { console.log(cookieRes); const { errorMsg, isError, response } = await API_SERVICES_ACTIONS.getAPIService( - `apis/v4/bizgaze/integrations/products/getbillinginfo/contactid/${cookieRes.userId}` + `apis/v4/bizgaze/integrations/anwiauth/getbillinginfo/contactid/${cookieRes.userId}` ); let res = JSON.parse(response.result); debugger; @@ -138,7 +138,7 @@ async function addressDetails() { }); async function getCountryStateCurrency() { const countryRes = await API_SERVICES_ACTIONS.getAPIService( - "apis/v4/bizgaze/integrations/products/getcountry" + "apis/v4/bizgaze/integrations/anwiauth/getcountry" ); if (countryRes.isError) { alert("something went wrong"); @@ -157,7 +157,7 @@ async function addressDetails() { } } const stateRes = await API_SERVICES_ACTIONS.getAPIService( - `apis/v4/bizgaze/integrations/products/getcities/countryid/${countryID}` + `apis/v4/bizgaze/integrations/anwiauth/getcities/countryid/${countryID}` ); if (stateRes.isError) { @@ -186,7 +186,7 @@ async function addressDetails() { }); const currencyRes = await API_SERVICES_ACTIONS.getAPIService( - "apis/v4/bizgaze/integrations/products/getcurrencies" + "apis/v4/bizgaze/integrations/anwiauth/getcurrencies" ); if (currencyRes.isError) { @@ -209,7 +209,7 @@ async function addressDetails() { async function getCountryId() { const countryRes = await API_SERVICES_ACTIONS.getAPIService( - "apis/v4/bizgaze/integrations/products/getcountry" + "apis/v4/bizgaze/integrations/anwiauth/getcountry" ); if (countryRes.isError) { @@ -280,7 +280,7 @@ async function addressDetails() { let { userId, name } = cookieRes; const { errorMsg, isError, response } = await API_SERVICES_ACTIONS.getAPIService( - `apis/v4/bizgaze/integrations/products/getbillinginfo/contactid/${cookieRes.userId}` + `apis/v4/bizgaze/integrations/anwiauth/getbillinginfo/contactid/${cookieRes.userId}` ); let resAnwi = JSON.parse(response.result); console.log(resAnwi, "befores"); diff --git a/dist/Js/myaccount/Profile.js b/dist/Js/myaccount/Profile.js index cf0134c..598301f 100644 --- a/dist/Js/myaccount/Profile.js +++ b/dist/Js/myaccount/Profile.js @@ -5,7 +5,7 @@ function myProfile() { let cookieRes = COOKIE_HELPER_ACTIONS.getCookie(); console.log(cookieRes); const { errorMsg, isError, response } = await API_SERVICES_ACTIONS.getAPIService( - `apis/v4/bizgaze/integrations/products/getbillinginfo/contactid/${cookieRes.userId}` + `apis/v4/bizgaze/integrations/anwiauth/getbillinginfo/contactid/${cookieRes.userId}` ); let res = JSON.parse(response.result); debugger; @@ -134,7 +134,7 @@ function myProfile() { let { userId, name } = cookieRes; const { errorMsg, isError, response } = await API_SERVICES_ACTIONS.getAPIService( - `apis/v4/bizgaze/integrations/products/getbillinginfo/contactid/${cookieRes.userId}` + `apis/v4/bizgaze/integrations/anwiauth/getbillinginfo/contactid/${cookieRes.userId}` ); let resAnwi = JSON.parse(response.result); console.log(resAnwi, "previous profilesave"); diff --git a/dist/Js/myaccount/myaccount_warrenty.js b/dist/Js/myaccount/myaccount_warrenty.js index 97ebed3..884dee5 100644 --- a/dist/Js/myaccount/myaccount_warrenty.js +++ b/dist/Js/myaccount/myaccount_warrenty.js @@ -21,7 +21,7 @@ $('.warranty_serialNumber_submit').click(async function () { debugger let url = `${port}/apis/v4/Bizgaze/integrations/products/warrantyservice/serialno/${serial_no_inp}`; console.log(url); - const STAT = `05b2f2ca510344968c65e1ebf49a5595` + // const STAT = `05b2f2ca510344968c65e1ebf49a5595` const config = { url, method: "get", diff --git a/dist/Js/myaccount/orderdetails.js b/dist/Js/myaccount/orderdetails.js index 026432d..4bb1930 100644 --- a/dist/Js/myaccount/orderdetails.js +++ b/dist/Js/myaccount/orderdetails.js @@ -3,17 +3,19 @@ async function bindOrderDetails() { // validatesession() debugger let cookieRes = COOKIE_HELPER_ACTIONS.getCookie(); -let { userId} = cookieRes; -// let userId = '106631380000095'; -let port = "https://anwi.bizgaze.app"; + let { userId} = cookieRes; + //let userId = '106631380000048'; + debugger; +let port = SERVERNAME; // let port = "http://localhost:3088"; let url = `${port}/apis/v4/Bizgaze/integrations/products/salesorderdetailsbyorgid/organizationid/${userId}`; + // /apis/v4/bizgaze/integrations/products/salesorderdetailsbyorgid/phonenumber/ // https://anwi.bizgaze.app/apis/v4/Bizgaze/integrations/products/salesorderdetailsbyorgid/organizationid/{organizationid} const config = { url, method: "get", headers: { - 'Authorization': `stat 05b2f2ca510344968c65e1ebf49a5595 `, + 'Authorization': `stat ${STAT} `, 'Content-Type': 'application/json' } }; diff --git a/dist/Js/navbar.js b/dist/Js/navbar.js index 0f0340f..5ffd261 100644 --- a/dist/Js/navbar.js +++ b/dist/Js/navbar.js @@ -1,7 +1,10 @@ navINIT(); function navINIT() { - loadCart(); + if(!window.location.href.includes('orderconfirmation')){ + loadCart(); + } + function loadHelper(src = './dist/js/utils/helpers.js'){ if ($(`script[src="${src}"]`).length > 0) { return new Promise((resolve) => resolve()); @@ -59,7 +62,7 @@ function navINIT() {