update readme version 0.0.3

fxnoob · Mar 13, 2019 · d81ea30 · d81ea30
1 parent a0527c3
commit d81ea30
Show file tree

Hide file tree

Showing 30 changed files with 79 additions and 65 deletions.
diff --git a/.babelrc b/.babelrc
diff --git a/.env b/.env
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
diff --git a/README.md b/README.md
diff --git a/_config.yml b/_config.yml
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/popup-page/App.jsx b/popup-page/App.jsx
diff --git a/popup-page/components/button.jsx b/popup-page/components/button.jsx
diff --git a/popup-page/components/header.jsx b/popup-page/components/header.jsx
diff --git a/popup-page/components/home.jsx b/popup-page/components/home.jsx
@@ -45,71 +45,30 @@ export class Home extends React.Component {
         closeAllParticlebutton: false,
         restoreAllParticlebutton: false
     };
-    handleIncludeUrlChange() {
-        console.log("this.state.checkBox", this.state.checkBox);
+    componentDidMount() {
+        //check if current tab is in hidden mode if yes then get settings
         urlUtilController.getCurrentOpenedTabHostName()
+            .then((domain)=>{
+                console.log(domain);
+                if(domain!== undefined)
+                    return dBController.get(domain);
+                throw new Error("undefined error");
+            })
             .then((res)=>{
-                if(this.state.checkBox=== false) {
-                    console.log("checkbox not checked" , this.state.checkBox);
-                    let putData = {};
-                    putData[res] = "getCurrentOpenedTabHostName";
-                    dBController.set(putData).then((resss)=>{
-                        console.log("" , resss);
-                        const checkBoxVal = this.state.checkBox;
-                        let checkBoxLabel = (checkBoxVal===false)?"This Domain is in Hidden mode":"Select this domain to hide from history.";
-                        this.setState({checkBox: !this.state.checkBox , checkBoxLabelValue: checkBoxLabel});
-                    }).catch((ee)=>{
-                    });
-                }
-                else {
-                    dBController.remove(res).then((res_str)=>{
-                        console.log("remove",res);
-                        this.setState({checkBox: false,checkBoxLabelValue: "Select this domain to hide from history."});
-                    })
-                }
+                console.log("getCurrentOpenedTabHostName",res);
+                const key = Object.keys(res);
+                return (key.length > 0) ? 1 : 0;
+            })
+            .then((res)=>{
+                console.log(res);
+                if(res===1)
+                    this.setState({checkBox: true, checkBoxLabelValue: "This Domain is in Hidden mode"});
+                else
+                    this.setState({checkBox: false, checkBoxLabelValue: "Select this domain to hide from history."});
             })
             .catch((e)=>{
-                alert(e);
-                this.setState({checkBox: false});
+                console.log(e);
             });
-            if(this.state.checkBox === true) {
-                this.setState({showCloseAlltab:true});
-                chrome.browserAction.setBadgeText({text: '♥'});
-            }
-            else {
-                    /*
-                    * check if any other incognito tab is opened
-                    */
-                    chrome.browserAction.setBadgeText({text: ''});
-            }
-    }
-    constructor(props){
-        super(props);
-        this.handleCloseAll = this.handleCloseAll.bind(this);
-        this.handleRestoreAll = this.handleRestoreAll.bind(this);
-        this.handleIncludeUrlChange = this.handleIncludeUrlChange.bind(this);
-    }
-    componentDidMount() {
-        //check if current tab is in hidden mode if yes then get settings
-        urlUtilController.getCurrentOpenedTabHostName()
-        .then((domain)=>{
-            if(domain!== undefined)
-                return dBController.get(domain);
-        })
-        .then((res)=>{
-            console.log("getCurrentOpenedTabHostName",res);
-            const key = Object.keys(res);
-            return (key.length > 0) ? 1 : 0;
-        })
-        .then((res)=>{
-            console.log(res);
-            if(res===1)
-                this.setState({checkBox: true, checkBoxLabelValue: "This Domain is in Hidden mode"});
-            else
-                this.setState({checkBox: false, checkBoxLabelValue: "Select this domain to hide from history."});
-        }).catch((e)=>{
-            alert(e);
-        });
         //check if there any closed_tabs session is in the storage
         dBController.get("restore_tabs_url_list").then((dbres)=>{
             if(dbres.restore_tabs_url_list.length>0)
@@ -132,6 +91,42 @@ export class Home extends React.Component {
                 console.log("checkIfIncognitoTabIsOpened",e);
             });
     }
+    constructor(props){
+        super(props);
+        this.handleCloseAll = this.handleCloseAll.bind(this);
+        this.handleRestoreAll = this.handleRestoreAll.bind(this);
+        this.handleIncludeUrlChange = this.handleIncludeUrlChange.bind(this);
+    }
+    handleIncludeUrlChange() {
+        urlUtilController.getCurrentOpenedTabHostName()
+            .then((res)=>{
+                if (this.state.checkBox === false) {
+                    /** when  check box is selected */
+                    let putData = {};
+                    putData[res] = res;
+                    dBController.set(putData).then((resss)=>{
+                            this.setState({checkBox: !this.state.checkBox , checkBoxLabelValue: "This Domain is in Hidden mode.",showCloseAlltab: true});
+                            chrome.browserAction.setBadgeText({text: '♥'});
+                            urlUtilController.getCurrentOpenedTabUrl()
+                                .then(url=>{
+                                    urlUtilController.removeUrlFromHistory(url).then((res_str)=>{}).catch((e)=>{});
+                                })
+                                .catch(e=> {
+                                    console.log(e);
+                                });
+                    }).catch((ee)=>{});
+                } else {
+                    /** when  check box is unchecked */
+                    this.setState({checkBox: !this.state.checkBox , checkBoxLabelValue: "Select this domain to hide from history."});
+                    chrome.browserAction.setBadgeText({text: ''});
+                }
+            })
+            .catch(e=> {
+                /** TABS which are not accessed from chrome extension eg. blank tab , chrome store webpage etc. */
+                this.setState({checkBoxLabelValue: "This url can't be taken in Incognito mode"});
+            })
+    }
+
     handleCloseAll(){
         this.setState({closeAllParticlebutton: true,restoreAllParticlebutton: false});
         urlUtilController.closeAllCurrentBlockedUrlTabs()
@@ -204,8 +199,12 @@ export class Home extends React.Component {
                       </FormGroup>
                   </Typography>
               </Paper>}
+              <Divider variant="middle" />
+              <div>
+                  Creator @<a href="https://github.com/fxnoob/" target="_blank">fxnoob</a> made with ♥ and this <a href="https://github.com/fxnoob/chrome-extension-boilerplate" target="_blank">chrome extension boilerplate</a> at <a href="https://github.com/nosemantic/" target="_blank">nosemantic</a>
+              </div>
           </div>
         );
     }
 }
-export default withStyles(styles)(Home);
+export default withStyles(styles)(Home);
diff --git a/popup-page/components/index.jsx b/popup-page/components/index.jsx
diff --git a/popup-page/components/particles.jsx b/popup-page/components/particles.jsx
diff --git a/popup-page/popup.html b/popup-page/popup.html
diff --git a/src/app/_locales/en/messages.json b/src/app/_locales/en/messages.json
diff --git a/src/app/images/favicon.ico b/src/app/images/favicon.ico
diff --git a/src/app/images/icon-128.png b/src/app/images/icon-128.png
diff --git a/src/app/images/icon-16.png b/src/app/images/icon-16.png
diff --git a/src/app/images/icon-32.png b/src/app/images/icon-32.png
diff --git a/src/app/manifest.json b/src/app/manifest.json
diff --git a/src/app/popup.html b/src/app/popup.html
diff --git a/src/app/styles/main.css b/src/app/styles/main.css
diff --git a/src/background.js b/src/background.js
diff --git a/src/background.test.js b/src/background.test.js
diff --git a/src/data/websites.json b/src/data/websites.json
diff --git a/src/utils/db.js b/src/utils/db.js
@@ -9,7 +9,7 @@ export default class Db {
     set(params) {
         return new Promise((resolve, reject) => {
             try {
-                    chrome.storage.sync.set(params, function(){
+                    chrome.storage.sync.set(params, ()=>{
                     resolve(params);
                 });
             }
@@ -25,7 +25,7 @@ export default class Db {
     get(params) {
         return new Promise((resolve, reject) => {
             try {
-                chrome.storage.sync.get(params, function(items){
+                chrome.storage.sync.get(params, (items)=>{
                    if(items === undefined)
                        reject("Error");
                    else
@@ -53,4 +53,4 @@ export default class Db {
             }
         })
     }
-}
+}
diff --git a/src/utils/urlutil.js b/src/utils/urlutil.js
@@ -189,6 +189,21 @@ export default class urlUtil {
             }
         });
     }
+    getCurrentOpenedTabUrl() {
+        return new Promise((resolve, reject) => {
+            try {
+                chrome.tabs.query({active: true, currentWindow: true }, (tabs)=>{
+                    if(tabs[0].url === undefined || tabs[0].url === null)
+                        reject("Null or Undefined url");
+                    else
+                        resolve(tabs[0].url);
+                });
+            }
+            catch (e) {
+                reject(e);
+            }
+        });
+    }
     /*
    * set badge on action icon
    * */
@@ -214,4 +229,4 @@ export default class urlUtil {
             });
         });
     }
-};
+};
diff --git a/src/utils/urlutil.test.js b/src/utils/urlutil.test.js
diff --git a/webpack.config.js b/webpack.config.js