v2.4.3

Author: stairman06

CHANGELOG.md

@@ -2,6 +2,19 @@
 
 Changelogs for development versions are located in their corresponding branch.
 
+## 2.4.3
+
+#### Released 2020-05-18
+
+### Features
+
+- New, experimental privacy-respecting analytics
+- New hover effect on buttons and cards
+
+### Changed
+
+- Small UI improvements
+
 ## 2.4.2
 
 #### Released 2020-05-11

src/index.js

@@ -21,6 +21,7 @@ import FSU from './util/fsu';
 import dropdownArrow from './component/customdropdown/img/arrow.png';
 import theemeraldtreeLogo from './page/settings/img/theemeraldtree-logo.png';
 import checkmark from './component/checkbox/checkmark.png';
+import Analytics from './util/analytics';
 
 const logger = logInit('index');
 
@@ -112,6 +113,8 @@ async function load() {
       Global.scanProfiles();
 
       ProfilesManager.updateReloadListeners();
+
+      Analytics.send('launch');
     }
   } catch (e) {
     logger.error('Something went wrong[1]');

src/manager/settingsManager.js

@@ -4,6 +4,8 @@ import path from 'path';
 import { remote } from 'electron';
 import LauncherManager from './launcherManager';
 import logInit from '../util/logger';
+import ToastManager from './toastManager';
+import Global from '../util/global';
 
 const logger = logInit('SettingsManager');
 
@@ -68,6 +70,13 @@ const SettingsManager = {
           this.currentSettings.mcAccount = Object.keys(LauncherManager.getMCAccounts())[0];
         }
 
+        if (this.currentSettings.analyticsEnabled === undefined && fs.existsSync(Global.PROFILES_PATH)) {
+          logger.info('Showing analytics message');
+          this.currentSettings.analyticsEnabled = true;
+          ToastManager.createToast('Analytics', 'Minecraft Manager 2.4.3 includes new privacy-respecting analytics. If you want to turn them off, go to Settings');
+          this.save();
+        }
+
         logger.info('Finished loading settings');
         resolve();
       });

src/page/settings/pages/general.jsx

@@ -184,6 +184,10 @@ export default function General() {
           <Checkbox checked={SettingsManager.currentSettings.checkToastNews} lighter onClick={checkToastNewsClick} />
           <Detail>check for news on startup</Detail>
         </InputContainer>
+        <InputContainer>
+          <Checkbox checked={SettingsManager.currentSettings.analyticsEnabled} lighter onClick={() => toggleSetting('analyticsEnabled')} />
+          <Detail>enable anonymous, privacy-respecting analytics</Detail>
+        </InputContainer>
         <InputContainer>
           <Checkbox checked={SettingsManager.currentSettings.closeOnLaunch} lighter onClick={closeOnLaunchClick} />
           <Detail>close minecraft manager on profile launch</Detail>

src/page/welcome/welcome.jsx

@@ -17,6 +17,10 @@ import NavContext from '../../navContext';
 import tipShare from './img/tip-share.png';
 import tipRightClick from './img/tip-right-click.png';
 import LauncherManager from '../../manager/launcherManager';
+import InputContainer from '../editprofile/components/inputcontainer';
+import Checkbox from '../../component/checkbox/checkbox';
+import Detail from '../../component/detail/detail';
+import Analytics from '../../util/analytics';
 
 const { dialog } = require('electron').remote;
 
@@ -118,6 +122,7 @@ function WelcomePage({ history }) {
   const [mcExe, setMCExe] = useState(Global.getDefaultMCExePath());
   const [step, setStep] = useState(0);
   const [preparing, setPreparing] = useState(false);
+  const [analyticsEnabled, setAnalyticsEnabled] = useState(true);
 
   useEffect(() => {
     nav.header.setTitle('welcome');
@@ -146,7 +151,12 @@ function WelcomePage({ history }) {
     SettingsManager.setMCExe(mcExe);
 
     SettingsManager.currentSettings.mcAccount = Object.keys(LauncherManager.getMCAccounts())[0];
+    SettingsManager.currentSettings.analyticsEnabled = analyticsEnabled;
+    SettingsManager.currentSettings.lastVersion = Global.MCM_VERSION;
     SettingsManager.save();
+
+    if (analyticsEnabled) Analytics.send('first-install');
+
     const mcl = path.join(LibrariesManager.getLibrariesPath(), '/minecraftmanager');
     if (!fs.existsSync(mcl)) {
       fs.mkdirSync(mcl);
@@ -188,6 +198,10 @@ function WelcomePage({ history }) {
     }
   };
 
+  const analyticsClick = () => {
+    setAnalyticsEnabled(!analyticsEnabled);
+  }
+
   return (
     <>
       <Content>
@@ -283,6 +297,27 @@ function WelcomePage({ history }) {
             )}
 
             {step === 4 && (
+              <>
+                <Spacing />
+                <Title>Analytics</Title>
+
+                <p>
+                  Minecraft Manager contains anonymous, privacy-respecting analytics. <br />
+                  Would you like these to be enabled?
+                </p>
+
+                <InputContainer>
+                  <Checkbox lighter checked={analyticsEnabled} onClick={analyticsClick} />
+                  <Detail>Enable Analytics</Detail>
+                </InputContainer>
+
+                <GB onClick={nextStep} color="green">
+                  continue
+                </GB>
+              </>
+            )}
+
+            {step === 5 && (
               <>
                 <Spacing />
                 <Title>You're all set!</Title>
@@ -300,7 +335,7 @@ function WelcomePage({ history }) {
               </>
             )}
 
-            {step === 5 && (
+            {step === 6 && (
               <>
                 <Spacing />
                 <Title>tips and tricks</Title>
@@ -318,7 +353,7 @@ function WelcomePage({ history }) {
               </>
             )}
 
-            {step === 6 && (
+            {step === 7 && (
               <>
                 <Spacing />
                 <Title>tips and tricks</Title>

src/util/analytics.js

@@ -0,0 +1,24 @@
+import HTTPRequest from '../host/httprequest';
+import SettingsManager from '../manager/settingsManager';
+import logInit from './logger';
+
+// Privacy-respecting Analytics
+// https://github.com/theemeraldtree/analytics
+
+const logger = logInit('Analytics');
+
+const Analytics = {
+  send: (type) => {
+    try {
+      if (SettingsManager.currentSettings.analyticsEnabled) {
+        logger.info(`Sending ${type} analytic`);
+        HTTPRequest.get(`https://github.com/theemeraldtree/analytics/releases/download/minecraftmanager/${type}`);
+      }
+    } catch (e) {
+      logger.error(`Unable to send ${type} analytic`);
+      logger.error(e);
+    }
+  }
+};
+
+export default Analytics;

src/util/global.js

@@ -12,6 +12,7 @@ import OMAFFileAsset from '../type/omafFileAsset';
 import FileScanner from './fileScanner';
 import World from '../type/world';
 import logInit from './logger';
+import Analytics from './analytics';
 
 const semver = require('semver');
 const { remote } = require('electron');
@@ -36,8 +37,8 @@ const Global = {
     versions: {}
   },
 
-  MCM_VERSION: '2.4.3-work',
-  MCM_RELEASE_DATE: 'WIP',
+  MCM_VERSION: '2.4.3',
+  MCM_RELEASE_DATE: '5/18/2020',
 
   OMAF_VERSION: '1.0.0',
 
@@ -95,6 +96,7 @@ const Global = {
   checkChangelog() {
     const version = SettingsManager.currentSettings.lastVersion;
     if (!version || (semver.gt(this.MCM_VERSION, version) && this.MCM_VERSION.indexOf('beta') === -1)) {
+      Analytics.send('update');
       ToastManager.createToast(
         `Welcome to ${this.MCM_VERSION}`,
         `<a href="https://github.com/theemeraldtree/minecraft-manager/blob/v${this.MCM_VERSION}/CHANGELOG.md">View the changelog here</a>`