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;
......
...@@ -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
......
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