Merge branch 'master' of https://github.com/Rajan/lesspod

Author: Rajan

README.md

@@ -62,8 +62,20 @@ $ npm install
 $ npm run dev
 ```
 
+
+#### Running the vuejs client in another commandline window: http://localhost:3000
+
+```
+$ cd client/react
+$ npm install
+$ npm run start
+```
+
+Keep things as simple to understand for others as possible. Also, add comments to any code being contributed.
+=======
 To deploy Vuejs client to Firebase 
 
+
 1. Create a Firebase project and enable email auth, create firestore db, enable storage etc.
 2. Execute npm init with all options ON.
 3. Add firebase properties in the /client/vue/src/config.js

client/react/package-lock.json

@@ -25,11 +25,7 @@ import { STTButton } from './components/ScrollToTopButton';
 import "react-image-gallery/styles/css/image-gallery.css";
 
 // google analytics for react
-
 import ReactGA from 'react-ga';
-ReactGA.initialize('UA-125120010-1');
-ReactGA.pageview('/home');
-
 
 
 const styles = {
@@ -64,6 +60,10 @@ class App extends Component {
         settingsStore.global = response.data.global;
         settingsStore.landingPage = response.data.landingPage;
         settingsStore.footer = response.data.footer;
+		
+		if (settingsStore.global.trackerID != '') {
+			ReactGA.initialize(settingsStore.global.trackerID);
+		}
       }
     });
 
@@ -93,6 +93,9 @@ class App extends Component {
   };
 
   render() {
+	if (settingsStore.global.trackerID != '') {
+		ReactGA.pageview(window.location.pathname);
+	}
     return (
       <div>
         <CustomFavicon />

client/react/src/App.js

@@ -53,6 +53,7 @@ class SettingsForm extends React.Component {
     disableNewRegistrations: false,
     squareLogoURL: '',
     horizontalLogoURL: '',
+	trackerID: 'GA tracker ID',
     isSaving: false,
   };
 
@@ -121,6 +122,7 @@ class SettingsForm extends React.Component {
       horizontalLogoURL,
       disableBlogMenu,
       disableNewRegistrations,
+	  trackerID,
     } = this.state;
 
     return (
@@ -302,6 +304,26 @@ class SettingsForm extends React.Component {
               </label>
             </div>
           </div>
+		  
+
+		  <div className="field">
+            <label className="label">Google Analytics tracker ID</label>
+            <div className="control has-icons-left">
+              <input
+                className="input"
+                type="name"
+                id="trackerID"
+                name="trackerID"
+                value={trackerID}
+                placeholder="e.g. UA-123456789-1"
+                onChange={this.handleInputChange}
+              />
+              {/* <span className="icon is-small is-left">
+              <i className="fa fa-user-circle" />
+            </span> */}
+            </div>
+          </div>
+
           <div className="field is-grouped" style={{ marginTop: '2rem' }}>
             <div className="control">
               <div

client/react/src/components/SettingsTabs/GlobalSettingsForm.jsx

@@ -8,6 +8,7 @@ const settingsStore = store({
     disableNewRegistrations: false,
     squareLogoURL: '',
     horizontalLogoURL: '',
+	trackerID: '',
   },
   landingPage: {
     headline: 'Headline',