Merge pull request #59 from SparkEdUAB/add-stats

Added stats
SparkEdUAB · Feb 11, 2019 · 2f26bb8 · 2f26bb8
2 parents 8e0539e + c9c5a7b
commit 2f26bb8
Show file tree

Hide file tree

Showing 50 changed files with 3,878 additions and 1,736 deletions.
diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -34,6 +34,7 @@ rules:
   # overwrite some rules  
   semi: 'error'
   no-unexpected-multiline: 2
+  object-curly-newline: 0
   no-throw-literal: 0
   no-underscore-dangle: 0
   import/no-named-as-default: 0

diff --git a/client/main.css b/client/main.css
@@ -199,7 +199,7 @@
 #dashtweek {
   padding-bottom: 75px;
   padding-top: 25px;
-  background-color: #1e4847;
+  /* background-color: #1e4847; */
   margin-top: 10px;
   font-size: 30px;
   color: white;
@@ -215,7 +215,7 @@
   top: 23px;
 }
 .notification-item {
-  color: #0893d2;
+  /* color: #0893d2; */
   padding: 10px;
 }
 .notification-date {
@@ -661,3 +661,7 @@ nav ul a:hover {
   background-color: #276a76;
   will-change: left, right;
 }
+
+.slider .indicators {
+  display: none;
+}
diff --git a/client/main.js b/client/main.js
@@ -1,5 +1,7 @@
 // Essential for the roles package to initialise and check if the user is in roles for real
 import { Roles } from 'meteor/alanning:roles';
+import { Meteor } from 'meteor/meteor';
+import { Session } from 'meteor/session';
 import 'materialize-css/dist/css/materialize.min.css';
 import 'materialize-css/dist/js/materialize';
 import '../imports/ui/stylesheets/wizard.css';
@@ -17,6 +19,15 @@ import '../i18n/es.i18n.json';
 import '../i18n/fr.i18n.json';
 // import { La }
 
+Meteor.startup(() => {
+  Session.setPersistent({
+    main: '#005555',
+    isDark: false,
+    mainDark: '#212121',
+    bodyBackground: '',
+  });
+});
+
 FlowRouter.wait();
 
 Tracker.autorun(() => {

diff --git a/client/routes.js b/client/routes.js
@@ -17,6 +17,7 @@ import EditResources from '../imports/ui/components/Dashboard/EditResources.jsx'
 import NotFound from '../imports/ui/components/layouts/NotFound';
 import OverView from '../imports/ui/components/Dashboard/Statistics/Overview.jsx';
 import UserStatistics from '../imports/ui/components/Dashboard/Statistics/UserStatistics';
+import Stats from '../imports/ui/components/Dashboard/Statistics/Stats';
 import AllTopics from '../imports/ui/components/Dashboard/AllTopics.jsx';
 import Feedback from '../imports/ui/components/Dashboard/Feedback.jsx';
 import Additional from '../imports/ui/components/Dashboard/Additional.jsx';
@@ -53,7 +54,9 @@ const adminRoutes = FlowRouter.group({
     () => {
       if (!(Meteor.loggingIn() || Meteor.userId())) {
         return FlowRouter.go('/login');
-      } else if (!Roles.userIsInRole(Meteor.userId(), ['content-manager', 'admin'])) {
+      } else if (
+        !Roles.userIsInRole(Meteor.userId(), ['content-manager', 'admin'])
+      ) {
         return FlowRouter.go('/');
       }
     },
@@ -258,6 +261,12 @@ adminRoutes.route('/dashboard/settings', {
     mount(WrappedSidenav, { yield: <Institution /> });
   },
 });
+adminRoutes.route('/dashboard/stats', {
+  name: 'Stats',
+  action() {
+    mount(WrappedSidenav, { yield: <Stats /> });
+  },
+});
 
 adminRoutes.route('/dashboard/view_resource/:_id', {
   name: 'DisplayResource',

diff --git a/imports/api/accounts/account.test.js b/imports/api/accounts/account.test.js
diff --git a/imports/api/accounts/methods.test.js b/imports/api/accounts/methods.test.js
diff --git a/imports/api/accounts/sum.js b/imports/api/accounts/sum.js
diff --git a/imports/api/settings/methods.js b/imports/api/settings/methods.js
@@ -119,4 +119,20 @@ Meteor.methods({
       },
     );
   },
+  // prevent Updating when user is not logged in
+  setDarkMode(isSet) {
+    check(isSet, Boolean);
+    if (this.userId) {
+      return _Settings.update(
+        {},
+        {
+          $set: {
+            isDark: isSet,
+          },
+        },
+        // { upsert: true },
+      );
+    }
+    throw new Meteor.Error('Auth', 'You are not authenticated');
+  },
 });
diff --git a/imports/startup/server/init.js b/imports/startup/server/init.js
@@ -5,11 +5,13 @@ import { _Settings } from '../../api/settings/settings';
   The file contains the initial database of the Institution and the users
 */
 
+// eslint-disable-next-line func-names
 Meteor.startup(() => {
   // initialize the main color
   if (!_Settings.find().count()) {
     _Settings.insert({
       main: '#006b76',
+      mainDark: '#0c0c0c',
     });
   }
 });
diff --git a/imports/ui/components/Accounts/ManageAccounts.jsx b/imports/ui/components/Accounts/ManageAccounts.jsx
@@ -21,6 +21,7 @@ import * as config from '../../../../config.json';
 import { formatText } from '../../utils/utils';
 import PasswordEdit from '../Utilities/Modal/PasswordEdit.jsx';
 import { checkPassword } from './AccountFunction';
+import { ThemeContext } from '../../containers/AppWrapper'
 
 const T = i18n.createComponent();
 
@@ -251,37 +252,45 @@ export class ManageAccounts extends React.Component {
     } = this.state;
 
     return (
+      <ThemeContext.Consumer>
+        {
+          ({ state }) => (
       <div>
-        {/* <Header /> */}
-
         <MainModal
           show={isOpen}
           onClose={this.close}
           subFunc={this.handleSubmit}
           title={title}
           confirm={confirm}
           reject={reject}
-        >
+          >
           {modalType === 'edit' ? (
-            <AccountEditModal email={email} fname={fname} />
-          ) : modalType === 'roles' ? (
-            <div className="input-field">
-              <UserRoles value={this.state.role} />
+            <AccountEditModal email={email} fname={fname} color={ state.isDark ? '#F5FAF8' : '#000000' } />
+            ) : modalType === 'roles' ? (
+              <div className="input-field">
+              <UserRoles value={this.state.role}
+                color={ state.isDark ? '#F5FAF8' : '#000000' } />
             </div>
           ) :
             modalType === 'pass' ? (
               <PasswordEdit password={password}
-                passwordConfirm={passwordConfirm}
-                validatePassword={this.validatePassword}
-                confirmPassword={this.confirmPassword}
-                error={error}
-                />
-            ) :
+              passwordConfirm={passwordConfirm}
+              validatePassword={this.validatePassword}
+              confirmPassword={this.confirmPassword}
+              error={error}
+              color={ state.isDark ? '#F5FAF8' : '#000000' }
+              />
+              ) :
             <span />
           }
         </MainModal>
         <div className='m1' />
-        <div className="col m9 s11">
+        <div className="col m9 s11"
+              style={{
+                backgroundColor: state.isDark ? state.mainDark : '#FFFFFF',
+                color: state.isDark ? '#F5FAF8' : '#000000',
+              }}
+        >
           <div className="row">
             <div>
               <h4>
@@ -292,17 +301,18 @@ export class ManageAccounts extends React.Component {
               <SearchField
                 action={'/dashboard/accounts'}
                 name={'accounts'}
+                color={ state.isDark ? '#F5FAF8' : '#000000' }
                 placeholder={'search user by name,email'}
                 query={'q'}
-              />
+                />
             </div>
           </div>
           <div className="row">
             <div className="col m3 s3">
               <button
                 className="btn red darken-3"
                 onClick={e => this.openModal('delete', e)}
-              >
+                >
                 {' '}
                 <T>common.actions.delete</T>
               </button>
@@ -320,7 +330,7 @@ export class ManageAccounts extends React.Component {
                   <button
                     className="btn grey darken-3"
                     onClick={e => this.openModal('suspend', e)}
-                  >
+                    >
                     {' '}
                     Suspend
                   </button>
@@ -334,7 +344,7 @@ export class ManageAccounts extends React.Component {
               <button
                 className="btn green darken-3"
                 onClick={e => this.openModal('roles', e)}
-              >
+                >
                 {' '}
                 <T>common.actions.changeRole</T>
               </button>
@@ -343,7 +353,7 @@ export class ManageAccounts extends React.Component {
               <button
                 className="btn teal "
                 onClick={e => this.openModal('pass', e)}
-              >
+                >
                 {' '}
                 <T>Change Password</T>
               </button>
@@ -390,7 +400,7 @@ export class ManageAccounts extends React.Component {
                 } else if (status === 2) {
                   statusIcon = 'fa-ban ';
                 }
-
+                
                 return (
                   <tr key={user._id}>
                     <td>{count++}</td>
@@ -408,7 +418,7 @@ export class ManageAccounts extends React.Component {
                         href=""
                         onClick={e => this.openModal('edit', user._id, email, user.profile.name, e)}
                         className="fa fa-pencil"
-                      />
+                        />
                     </td>
                     <td onClick={handleCheckboxChange.bind(this, user._id)}>
                     <label htmlFor={user._id}>
@@ -426,10 +436,13 @@ export class ManageAccounts extends React.Component {
             itemPerPage={limit}
             query={getQuery(queryParams, true)}
             totalResults={this.props.count}
-          />{' '}
+            />{' '}
         </div>
         {/* </div> */}
       </div>
+    )
+  }
+</ThemeContext.Consumer>
     );
   }
 }