bad things

roshie548 · Apr 6, 2020 · 0111eb6 · 0111eb6
1 parent b0901b5
commit 0111eb6
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 25 deletions.
diff --git a/.env b/.env
@@ -0,0 +1 @@
+INLINE_RUNTIME_CHUNK=false;
diff --git a/public/manifest.json b/public/manifest.json
@@ -19,5 +19,5 @@
         "scripts": [ "background.js" ],
         "persistent": true
     },
-    "content_security_policy": "script-src 'self' 'sha256-CMyYic0d7L0Q9AwjGU0n6buHFRR6bU3TOAe0P7DEJrk'; object-src 'self'"
-}
+    "content_security_policy": "script-src 'self' 'sha256-CMyYic0d7L0Q9AwjGU0n6buHFRR6bU3TOAe0P7DEJrk'"
+}
diff --git a/src/App.js b/src/App.js
@@ -16,7 +16,8 @@ class App extends React.Component {
 		    elapsedminutes: 0,
         block: false,
         signedIn: false,
-        websites: []
+        websites: [],
+        timerStart: false
 	  }
 
 	this.updateMinutes.bind(this);
@@ -26,18 +27,31 @@ class App extends React.Component {
 
 
   }
+
+
   updateMinutes = (minutes) => {
 	this.setState({elapsedminutes: this.state.elapsedminutes + minutes})
   }
 
   blockSites = (details) => {
+    //return { redirectUrl: "https://www.coolmathgames.com"};
     return { redirectUrl: chrome.runtime.getURL("blocked.html") };
   }
 
   signIn = () => {
     this.setState({signedIn: true});
   }
 
+  activateTimer = () => {
+    this.setState({timerStart: true});
+    this.block()
+  }
+
+  deactivateTimer = () => {
+    this.setState({timerStart: false});
+    this.unblock()
+  }
+
   block() {
     chrome.webRequest.onBeforeRequest.addListener(
       this.blockSites,
@@ -46,14 +60,12 @@ class App extends React.Component {
   }
   makeSiteList() {
     const finalList = []
-    const webList = ["facebook.com", "poptropica.com", "neopets.com"]
-    for (const link of webList) {
+    for (const link of this.state.websites) {
       finalList.push("*://*."+link+"/*")
     }
-    
+
     return finalList;
   }
-
   unblock() {
     chrome.webRequest.onBeforeRequest.removeListener(this.blockSites);
   }
@@ -64,6 +76,7 @@ class App extends React.Component {
 
 
   render() {
+
     if (this.state.signedIn) {
       return (
       <div className="App">
@@ -72,9 +85,10 @@ class App extends React.Component {
 
           <Reward minutes = {this.state.elapsedminutes}/>{"\n"}
           <Timer updateMinutes = {this.updateMinutes}
-                 startMin = {this.startTime_min}
-                 startSec = {this.startTime_sec}/>
-          <Settings addWebsite={this.addWebsite}
+                 activateTimer = {this.activateTimer}
+                 deactivateTimer = {this.deactivateTimer}/>
+          <Settings websites = {this.state.websites}
+                    addWebsite={this.addWebsite}
                     block={this.block}
                     unblock={this.unblock}/>
 

diff --git a/src/Settings.jsx b/src/Settings.jsx
@@ -8,7 +8,6 @@ class Settings extends React.Component {
     this.handleSubmit = this.handleSubmit.bind(this);
     this.state = {
       display: false,
-      websites: ["facebook.com", "instagram.com"],
       type_box: ''
     }
   }
@@ -18,7 +17,7 @@ class Settings extends React.Component {
     }
 
   handleSubmit(event) {
-      this.setState({websites: this.state.websites.concat([this.state.type_box])});
+      this.props.addWebsite(this.state.type_box);
       event.preventDefault();
 
   }
@@ -34,18 +33,8 @@ class Settings extends React.Component {
   }
 
   render() {
-    // if (!this.state.display) { //display the settings button only
-    //   return (
-    //     // <div>
-    //     //     <button class="open"><img src="https://image.flaticon.com/icons/svg/1827/1827870.svg" onClick={this.displaySettings}/></button>
-    //     // </div>
-    //   );
-    // }
-
-    // else {
-      var webList = this.state.websites.map((w) =>
-        <li>{w}</li>
-      );
+      var webList = this.props.websites ? this.props.websites.map((w) =>
+        <li>{w}</li>) : null;
       return (
         <div className="Settings">
             <img src= 'https://image.flaticon.com/icons/svg/1827/1827870.svg' onClick={this.closeSettings}/>

diff --git a/src/Timer.jsx b/src/Timer.jsx
@@ -18,6 +18,7 @@ class Timer extends React.Component {
 
   startTimer() {
     this.setState({active: true})
+    this.props.activateTimer();
     return;
   }
 
@@ -30,7 +31,9 @@ class Timer extends React.Component {
      timeSet: false
    }))
 
-    clearInterval(this.myInterval)
+    clearInterval(this.myInterval);
+    this.props.deactivateTimer();
+
     return;
   }
 
@@ -96,6 +99,9 @@ class Timer extends React.Component {
 
   render() {
     const {min,hr} = this.state;
+    if (min===0 && hr===0) {
+      this.props.deactivateTimer();
+    }
     return (
 
       <div className="Timer">