Commit a29c9a93 by Pragati Upadhyay

resolved conflicts

parents 7a221691 eecbefee
var getUserDetails = null var getUserDetails = null
!function () { !function () {
var origin = "https://test.begenieus.com" var origin = "https://begenieus.com"
var tutorShotId = null var tutorShotId = null
var imageNumber = 0; var imageNumber = 0;
var recording = false; var recording = false;
......
...@@ -6,7 +6,7 @@ var floatingBar = null; ...@@ -6,7 +6,7 @@ var floatingBar = null;
var startingOverlay = null; var startingOverlay = null;
var finalizingOverlay = null; var finalizingOverlay = null;
var overlayInterval = null; var overlayInterval = null;
const origin = "https://test.begenieus.com" const origin = "https://begenieus.com"
var userDetails = {}; var userDetails = {};
var btn = {}; var btn = {};
var tutorShotOid = null; var tutorShotOid = null;
...@@ -130,7 +130,7 @@ var webpageObserver = { disconnect() { } } ...@@ -130,7 +130,7 @@ var webpageObserver = { disconnect() { } }
margin-left: 5px; margin-left: 5px;
margin-right: 5px; margin-right: 5px;
} }
.tutor-shot .content .item { .tutor-shot .content .item {
all: unset; all: unset;
display: flex; display: flex;
...@@ -139,14 +139,14 @@ var webpageObserver = { disconnect() { } } ...@@ -139,14 +139,14 @@ var webpageObserver = { disconnect() { } }
transition: 0.3s; transition: 0.3s;
cursor: pointer; cursor: pointer;
} }
.tutor-shot .content .item .img { .tutor-shot .content .item .img {
all: unset; all: unset;
margin-right: 3px; margin-right: 3px;
filter: hue-rotate(335deg) brightness(0%) contrast(68%); filter: hue-rotate(335deg) brightness(0%) contrast(68%);
width: 20px; width: 20px;
} }
.tutor-shot .content .item .item-text { .tutor-shot .content .item .item-text {
all: unset; all: unset;
padding-top: 2px; padding-top: 2px;
...@@ -398,7 +398,7 @@ chrome.runtime.onMessage.addListener(async function (message, sender, sendRespon ...@@ -398,7 +398,7 @@ chrome.runtime.onMessage.addListener(async function (message, sender, sendRespon
window.location.reload() window.location.reload()
} else { } else {
window.open(`${origin}/tutor-shot-list`) window.open(`${origin}/tutor-shot-list`)
} }
reRenderFloatingBar(data) reRenderFloatingBar(data)
}, 2000) }, 2000)
reRenderFloatingBar(data) reRenderFloatingBar(data)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"manifest_version": 3, "manifest_version": 3,
"name": "Tutor Shot", "name": "Tutor Shot",
"version": "1.10", "version": "1.10",
"description": "Capture web-page screenshots instantly with a single click. They're saved to your account at https://test.begenieus.com .", "description": "Capture web-page screenshots instantly with a single click. They're saved to your account at https://begenieus.com .",
"permissions": [ "permissions": [
"activeTab", "activeTab",
"storage" "storage"
......
!function () { !function () {
const origin = "https://test.begenieus.com" const origin = "https://begenieus.com"
const api = axios.create({ const api = axios.create({
baseURL: `${origin}/api`, // the base URL for nodeserver is okay but NGINX is giving error baseURL: `${origin}/api`, // the base URL for nodeserver is okay but NGINX is giving error
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
'Content-Type': 'application/json', 'Content-Type': 'application/json',
}, },
}); });
var loginCount = 0; var loginCount = 0;
let recording = false; let recording = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment