Merge pull request #9 from dannyhp1/develop

dannyhp1 · web-flow · commit dbfb76d56a38 · 2019-11-28T13:59:35.000-08:00
Separated autocomplete with practice mode and added analytics.
diff --git a/public/index.html b/public/index.html
@@ -1,6 +1,16 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
+    <!-- Global site tag (gtag.js) - Google Analytics -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-129689668-4"></script>
+    <script>
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+
+      gtag('config', 'UA-129689668-4');
+    </script>
+
     <meta charset="utf-8" />
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
diff --git a/src/App/App.js b/src/App/App.js
@@ -25,7 +25,8 @@ class App extends Component {
       source: {'java': code['java'], 'python': code['python'], 'c_cpp': code['c_cpp']},
       results: [ ],
       disabled: false,
-      practice: false
+      practice: false,
+      autocomplete: true
     })
   }
 
@@ -53,6 +54,13 @@ class App extends Component {
     })
   }
 
+  onChangeAutocomplete = () => {
+    this.setState({
+      ...this.state,
+      autocomplete: !this.state.autocomplete
+    })
+  }
+
   setRunningStatus = () => {
     let currentResults = this.state.results;
     currentResults.unshift('Running your code...')
@@ -148,7 +156,7 @@ class App extends Component {
         <Grid container style={{ marginBottom: '1.5%' }}>
           <Grid item xs={6}>
             <CodeEditor 
-              autocomplete={!this.state.practice}
+              autocomplete={this.state.autocomplete}
               language={this.state.practice === true ? 'plain_text' : this.state.language} 
               source={this.state.source[this.state.language]} 
               onChange={this.onChangeCode} />
@@ -188,6 +196,18 @@ class App extends Component {
             </Button> */}
           </Grid>
           <Grid item xs={6} style={{ textAlign: 'right' }}>
+            <FormControlLabel
+                control={
+                  <Checkbox
+                    checked={this.state.autocomplete}
+                    onChange={this.onChangeAutocomplete}
+                    value='autocomplete'
+                    style={{ color: '#0269a4' }}
+                  />
+                }
+                label="Autocomplete"
+                style={{ marginRight: '2.5%' }}
+            />
             <FormControlLabel
                 control={
                   <Checkbox
@@ -197,7 +217,7 @@ class App extends Component {
                     style={{ color: '#0269a4' }}
                   />
                 }
-                label="Practice Mode"
+                label="Practice Format"
                 style={{ marginRight: '2.5%' }}
             />
           </Grid>
