kurbezz/browser-wakatime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18 from mabasic/heartbeat

Browse Source 
Minor optimizations.
This commit is contained in:
Mario Bašić
2015-06-07 21:54:20 +02:00
parent e14e0ca070 a2ed4e5acd
commit 8c300f6e4e
20 changed files with 450 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -27,3 +27,5 @@ node_modules
.DS_Store
vendor/
.idea

15
README.md
View File

@@ -19,11 +19,11 @@ Installation
## Screenshots
![SC closed](./sc_3_closed.png)
![SC closed](./screenshots/sc_3_closed.png)
![SC open](./sc_3_open.png)
![SC open](./screenshots/sc_3_open.png)
![Options SC](./sc_2-options.png)
![Options SC](./screenshots/sc_4-options.png)
## Development instructions
@@ -55,10 +55,11 @@ gulp watch
### Load unpacked in Chrome
1. Go to `Settings` -> `Extensions`
2. Enable `Developer mode`
3. Click `Load unpacked extension...`
4. Select repository directory
1. Clone repository to disk
2. Go to `Settings` -> `Extensions`
3. Enable `Developer mode`
4. Click `Load unpacked extension...`
5. Select repository directory
### Issues

3
assets/js/UrlHelper.js
View File

@@ -1,7 +1,6 @@
class UrlHelper {
static getDomainFromUrl(url)
{
static getDomainFromUrl(url) {
var parts = url.split('/');
return parts[0] + "//" + parts[2];

67
assets/js/WakaTime.js
View File

@@ -1,9 +1,7 @@
var UrlHelper = require('./UrlHelper');
var $ = require('jquery');
var currentTimestamp = require('./helpers/currentTimestamp');
var changeExtensionIcon = require('./helpers/changeExtensionIcon');
import UrlHelper from './UrlHelper.js';
import $ from 'jquery';
import currentTimestamp from './helpers/currentTimestamp.js';
import changeExtensionIcon from './helpers/changeExtensionIcon.js';
class WakaTime {
@@ -18,10 +16,9 @@ class WakaTime {
/**
* Checks if the user is logged in.
*
* @return $.promise()
* @returns {*}
*/
checkAuth()
{
checkAuth() {
var deferredObject = $.Deferred();
$.ajax({
@@ -46,14 +43,11 @@ class WakaTime {
/**
* Depending on various factors detects the current active tab URL or domain,
* and sends it to WakaTime for logging.
*
* @return null
*/
recordHeartbeat()
{
recordHeartbeat() {
this.checkAuth().done(data => {
if(data !== false){
if (data !== false) {
// User is logged in.
// Change extension icon to default color.
@@ -61,8 +55,7 @@ class WakaTime {
chrome.idle.queryState(this.detectionIntervalInSeconds, (newState) => {
if(newState === 'active')
{
if (newState === 'active') {
// Get current tab URL.
chrome.tabs.query({active: true}, (tabs) => {
this.sendHeartbeat(tabs[0].url);
@@ -83,13 +76,13 @@ class WakaTime {
/**
* Creates payload for the heartbeat and returns it as JSON.
*
* @param string entity
* @param string type 'domain' or 'url'
* @param boolean debug = false
* @return JSON
* @param entity
* @param type
* @param debug
* @returns {*}
* @private
*/
_preparePayload(entity, type, debug = false)
{
_preparePayload(entity, type, debug = false) {
return JSON.stringify({
entity: entity,
type: type,
@@ -98,18 +91,19 @@ class WakaTime {
});
}
/**
* Returns a promise with logging type variable.
*
* @return $.promise
* @returns {*}
* @private
*/
_getLoggingType()
{
_getLoggingType() {
var deferredObject = $.Deferred();
chrome.storage.sync.get({
loggingType: this.loggingType
}, function(items) {
}, function (items) {
deferredObject.resolve(items.loggingType);
});
@@ -120,20 +114,21 @@ class WakaTime {
* Given the entity and logging type it creates a payload and
* sends an ajax post request to the API.
*
* @param string entity
* @return null
* @param entity
*/
sendHeartbeat(entity)
{
sendHeartbeat(entity) {
var payload = null;
this._getLoggingType().done((loggingType) => {
// Get only the domain from the entity.
// And send that in heartbeat
if(loggingType == 'domain') {
if (loggingType == 'domain') {
var domain = UrlHelper.getDomainFromUrl(entity);
var payload = this._preparePayload(domain, 'domain');
payload = this._preparePayload(domain, 'domain');
console.log(payload);
@@ -142,7 +137,7 @@ class WakaTime {
}
// Send entity in heartbeat
else if (loggingType == 'url') {
var payload = this._preparePayload(entity, 'url');
payload = this._preparePayload(entity, 'url');
console.log(payload);
@@ -155,9 +150,9 @@ class WakaTime {
/**
* Sends AJAX request with payload to the heartbeat API as JSON.
*
* @param JSON payload
* @param string method = 'POST'
* @return $.promise
* @param payload
* @param method
* @returns {*}
*/
sendAjaxRequestToApi(payload, method = 'POST') {

4
assets/js/app.js
View File

@@ -2,8 +2,8 @@
global.jQuery = require('jquery');
require('bootstrap');
var React = require('react');
var WakaTime = require('./components/WakaTime.react');
import React from 'react';
import WakaTime from './components/WakaTime.react.js';
React.render(
<WakaTime />,

41
assets/js/components/MainList.react.js
View File

@@ -1,14 +1,11 @@
var React = require('react');
import React from 'react';
class MainList extends React.Component
{
componentDidMount()
{
class MainList extends React.Component {
componentDidMount() {
}
_openOptionsPage()
{
_openOptionsPage() {
if (chrome.runtime.openOptionsPage) {
// New way to open options pages, if supported (Chrome 42+).
chrome.runtime.openOptionsPage();
@@ -18,21 +15,22 @@ class MainList extends React.Component
}
}
render()
{
render() {
var loginLogoutButton = () => {
if(this.props.loggedIn === true)
{
if (this.props.loggedIn === true) {
return (
<div>
<a target="_blank" href="https://wakatime.com/settings/rules" className="list-group-item">
<i className="fa fa-fw fa-filter"></i> Custom Rules
<i className="fa fa-fw fa-filter"></i>
Custom Rules
</a>
<a target="_blank" href="https://wakatime.com/dashboard" className="list-group-item">
<i className="fa fa-fw fa-tachometer"></i> Dashboard
<i className="fa fa-fw fa-tachometer"></i>
Dashboard
</a>
<a href="#" className="list-group-item" onClick={this.props.logoutUser}>
<i className="fa fa-fw fa-sign-out"></i> Logout
<i className="fa fa-fw fa-sign-out"></i>
Logout
</a>
</div>
);
@@ -40,14 +38,14 @@ class MainList extends React.Component
return (
<a target="_blank" href="https://wakatime.com/login" className="list-group-item">
<i className="fa fa-fw fa-sign-in"></i> Login
<i className="fa fa-fw fa-sign-in"></i>
Login
</a>
);
};
var signedInAs = () => {
if(this.props.loggedIn === true)
{
if (this.props.loggedIn === true) {
return (
<div className="panel panel-default">
<div className="panel-body">
@@ -56,7 +54,9 @@ class MainList extends React.Component
<img className="img-circle" width="48" height="48" src={this.props.user.photo} />
</div>
<div className="col-xs-10">
Signed in as <b>{this.props.user.full_name}</b><br />
Signed in as
<b>{this.props.user.full_name}</b>
<br />
{this.props.user.email}
</div>
</div>
@@ -66,14 +66,15 @@ class MainList extends React.Component
}
};
return(
return (
<div>
{signedInAs()}
<div className="list-group">
<a href="#" className="list-group-item" onClick={this._openOptionsPage}>
<i className="fa fa-fw fa-cogs"></i> Options
<i className="fa fa-fw fa-cogs"></i>
Options
</a>
{loginLogoutButton()}

4
assets/js/components/Navbar.react.js
View File

@@ -1,6 +1,6 @@
var React = require('react');
import React from 'react';
class Navbar extends React.Component{
class Navbar extends React.Component {
render() {
return (

43
assets/js/components/WakaTime.react.js
View File

@@ -1,15 +1,11 @@
var React = require("react");
var $ = require('jquery');
import React from "react";
import $ from 'jquery';
import NavBar from './NavBar.react.js';
import MainList from './MainList.react.js';
import changeExtensionIcon from '../helpers/changeExtensionIcon.js';
import WakaTimeOriginal from '../WakaTime.js';
var NavBar = require('./NavBar.react');
var MainList = require('./MainList.react');
var changeExtensionIcon = require('../helpers/changeExtensionIcon');
var WakaTimeOriginal = require('../WakaTime');
class WakaTime extends React.Component
{
class WakaTime extends React.Component {
logoutUserUrl = 'https://wakatime.com/logout';
state = {
@@ -21,12 +17,11 @@ class WakaTime extends React.Component
loggedIn: false
};
componentDidMount()
{
componentDidMount() {
chrome.storage.sync.get({
theme: 'light'
}, function(items) {
if(items.theme == 'light') {
}, function (items) {
if (items.theme == 'light') {
changeExtensionIcon();
}
else {
@@ -38,7 +33,7 @@ class WakaTime extends React.Component
wakatime.checkAuth().done(data => {
if(data !== false){
if (data !== false) {
this.setState({
user: {
@@ -50,21 +45,15 @@ class WakaTime extends React.Component
});
changeExtensionIcon();
}
else {
changeExtensionIcon('red');
//TODO: Redirect user to wakatime login page.
//
}
});
}
logoutUser()
{
logoutUser() {
var deferredObject = $.Deferred();
$.ajax({
@@ -86,8 +75,7 @@ class WakaTime extends React.Component
return deferredObject.promise();
}
_logoutUser()
{
_logoutUser() {
this.logoutUser().done(() => {
this.setState({
@@ -104,9 +92,8 @@ class WakaTime extends React.Component
});
}
render()
{
return(
render() {
return (
<div>
<NavBar />
<div className="container">

14
assets/js/events.js
View File

@@ -1,4 +1,4 @@
var WakaTime = require('./WakaTime');
import WakaTime from "./WakaTime.js";
/**
* Whenever an alarms sets off, this function
@@ -29,9 +29,9 @@ chrome.alarms.create('heartbeatAlarm', {periodInMinutes: 2});
/**
* Whenever a active tab is changed it records a heartbeat with that tab url.
*/
chrome.tabs.onActivated.addListener(function(activeInfo) {
chrome.tabs.onActivated.addListener(function (activeInfo) {
chrome.tabs.get(activeInfo.tabId, function(tab) {
chrome.tabs.get(activeInfo.tabId, function (tab) {
console.log('recording a heartbeat - active tab changed');
@@ -46,15 +46,13 @@ chrome.tabs.onActivated.addListener(function(activeInfo) {
* Whenever any tab is updated it checks if the updated tab is the tab that is
* currently active and if it is, then it records a heartbeat.
*/
chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab) {
chrome.tabs.onUpdated.addListener(function (tabId, changeInfo, tab) {
if(changeInfo.status === 'complete')
{
if (changeInfo.status === 'complete') {
// Get current tab URL.
chrome.tabs.query({active: true}, (tabs) => {
// If tab updated is the same as active tab
if(tabId == tabs[0].id)
{
if (tabId == tabs[0].id) {
console.log('recording a heartbeat - tab updated');
var wakatime = new WakaTime;

5
assets/js/helpers/changeExtensionIcon.js
View File

@@ -1,13 +1,10 @@
/**
* It changes the extension icon color.
* Supported values are: 'red', 'white' and ''.
*
* @param string color = ''
* @return null
*/
export default function changeExtensionIcon(color = '') {
if(color !== ''){
if (color !== '') {
color = '-' + color;
}

2
assets/js/helpers/currentTimestamp.js
View File

@@ -1,7 +1,5 @@
/**
* Returns UNIX timestamp
*
* @return integer
*/
export default function(){
return Math.round((new Date()).getTime() / 1000);

21
assets/js/options.js
View File

@@ -2,16 +2,13 @@
global.jQuery = require('jquery');
require('bootstrap');
var $ = require('jquery');
import $ from "jquery";
function detectCheckedRadio(name)
{
for(var i = 0; i < document.getElementsByName(name).length; i++)
{
function detectCheckedRadio(name) {
for (var i = 0; i < document.getElementsByName(name).length; i ++) {
var button = document.getElementsByName(name)[i];
if(button.checked === true)
{
if (button.checked === true) {
return button.value;
}
}
@@ -29,14 +26,14 @@ function save_options(e) {
theme: theme,
blacklist: blacklist,
loggingType: loggingType
}, function() {
}, function () {
// Update status to let user know options were saved.
var status = $('#status');
status.html('<strong>Well done!</strong> Options have been saved.');
status.fadeIn(1500, function() {
setTimeout(function() {
status.fadeOut(1500, function() {
status.fadeIn(1500, function () {
setTimeout(function () {
status.fadeOut(1500, function () {
status.html('');
});
}, 750);
@@ -53,7 +50,7 @@ function restore_options() {
theme: 'light',
blacklist: '',
loggingType: 'domain'
}, function(items) {
}, function (items) {
document.getElementById('theme').value = items.theme;
document.getElementById('blacklist').value = items.blacklist;
document.getElementById(items.loggingType + 'Type').checked = true;

317
public/js/bundle.js
View File

@@ -3,16 +3,23 @@
/* This is a fix for Bootstrap requiring jQuery */
'use strict';
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
var _react = require('react');
var _react2 = _interopRequireDefault(_react);
var _componentsWakaTimeReactJs = require('./components/WakaTime.react.js');
var _componentsWakaTimeReactJs2 = _interopRequireDefault(_componentsWakaTimeReactJs);
global.jQuery = require('jquery');
require('bootstrap');
var React = require('react');
var WakaTime = require('./components/WakaTime.react');
React.render(React.createElement(WakaTime, null), document.getElementById('wakatime'));
_react2['default'].render(_react2['default'].createElement(_componentsWakaTimeReactJs2['default'], null), document.getElementById('wakatime'));
}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
},{"./components/WakaTime.react":6,"bootstrap":9,"jquery":22,"react":178}],2:[function(require,module,exports){
},{"./components/WakaTime.react.js":6,"bootstrap":9,"jquery":22,"react":178}],2:[function(require,module,exports){
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -52,14 +59,25 @@ Object.defineProperty(exports, '__esModule', {
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
var UrlHelper = require('./UrlHelper');
var _UrlHelperJs = require('./UrlHelper.js');
var $ = require('jquery');
var _UrlHelperJs2 = _interopRequireDefault(_UrlHelperJs);
var currentTimestamp = require('./helpers/currentTimestamp');
var changeExtensionIcon = require('./helpers/changeExtensionIcon');
var _jquery = require('jquery');
var _jquery2 = _interopRequireDefault(_jquery);
var _helpersCurrentTimestampJs = require('./helpers/currentTimestamp.js');
var _helpersCurrentTimestampJs2 = _interopRequireDefault(_helpersCurrentTimestampJs);
var _helpersChangeExtensionIconJs = require('./helpers/changeExtensionIcon.js');
var _helpersChangeExtensionIconJs2 = _interopRequireDefault(_helpersChangeExtensionIconJs);
var WakaTime = (function () {
function WakaTime() {
@@ -73,12 +91,18 @@ var WakaTime = (function () {
_createClass(WakaTime, [{
key: 'checkAuth',
/**
* Checks if the user is logged in.
*
* @returns {*}
*/
value: function checkAuth() {
var _this = this;
var deferredObject = $.Deferred();
var deferredObject = _jquery2['default'].Deferred();
$.ajax({
_jquery2['default'].ajax({
url: this.currentUserApiUrl,
dataType: 'json',
success: function success(data) {
@@ -97,6 +121,11 @@ var WakaTime = (function () {
}
}, {
key: 'recordHeartbeat',
/**
* Depending on various factors detects the current active tab URL or domain,
* and sends it to WakaTime for logging.
*/
value: function recordHeartbeat() {
var _this2 = this;
@@ -104,22 +133,15 @@ var WakaTime = (function () {
if (data !== false) {
console.log('user is logged id.');
// User is logged in.
changeExtensionIcon();
console.log('recording heartbeat.');
// Change extension icon to default color.
(0, _helpersChangeExtensionIconJs2['default'])();
chrome.idle.queryState(_this2.detectionIntervalInSeconds, function (newState) {
console.log(newState);
if (newState === 'active') {
// Get current tab URL.
chrome.tabs.query({ active: true }, function (tabs) {
console.log(tabs[0].url);
_this2.sendHeartbeat(tabs[0].url);
});
}
@@ -127,31 +149,44 @@ var WakaTime = (function () {
} else {
// User is not logged in.
changeExtensionIcon('red');
console.log('user is not logged id.');
//TODO: Redirect user to wakatime login page.
//
// Change extension icon to red color.
(0, _helpersChangeExtensionIconJs2['default'])('red');
}
});
}
}, {
key: '_preparePayload',
/**
* Creates payload for the heartbeat and returns it as JSON.
*
* @param entity
* @param type
* @param debug
* @returns {*}
* @private
*/
value: function _preparePayload(entity, type) {
var debug = arguments[2] === undefined ? false : arguments[2];
return JSON.stringify({
entity: entity,
type: type,
time: currentTimestamp(),
time: (0, _helpersCurrentTimestampJs2['default'])(),
is_debugging: debug
});
}
}, {
key: '_getLoggingType',
/**
* Returns a promise with logging type variable.
*
* @returns {*}
* @private
*/
value: function _getLoggingType() {
var deferredObject = $.Deferred();
var deferredObject = _jquery2['default'].Deferred();
chrome.storage.sync.get({
loggingType: this.loggingType
@@ -163,48 +198,60 @@ var WakaTime = (function () {
}
}, {
key: 'sendHeartbeat',
/**
* Given the entity and logging type it creates a payload and
* sends an ajax post request to the API.
*
* @param entity
*/
value: function sendHeartbeat(entity) {
var _this3 = this;
this._getLoggingType().done(function (loggingType) {
var payload = null;
if (loggingType == 'domain') {
console.log('sending entity with type domain');
this._getLoggingType().done(function (loggingType) {
// Get only the domain from the entity.
// And send that in heartbeat
console.log(UrlHelper.getDomainFromUrl(entity));
if (loggingType == 'domain') {
var domain = UrlHelper.getDomainFromUrl(entity);
var domain = _UrlHelperJs2['default'].getDomainFromUrl(entity);
var payload = _this3._preparePayload(domain, 'domain');
payload = _this3._preparePayload(domain, 'domain');
console.log(payload);
//this.sendAjaxRequestToApi(payload);
} else if (loggingType == 'url') {
console.log('sending entity with type url');
_this3.sendAjaxRequestToApi(payload);
}
// Send entity in heartbeat
var payload = _this3._preparePayload(entity, 'url');
else if (loggingType == 'url') {
payload = _this3._preparePayload(entity, 'url');
console.log(payload);
//this.sendAjaxRequestToApi(payload);
_this3.sendAjaxRequestToApi(payload);
}
});
}
}, {
key: 'sendAjaxRequestToApi',
/**
* Sends AJAX request with payload to the heartbeat API as JSON.
*
* @param payload
* @param method
* @returns {*}
*/
value: function sendAjaxRequestToApi(payload) {
var _this4 = this;
var method = arguments[1] === undefined ? 'POST' : arguments[1];
var deferredObject = $.Deferred();
var deferredObject = _jquery2['default'].Deferred();
$.ajax({
_jquery2['default'].ajax({
url: this.heartbeatApiUrl,
dataType: 'json',
contentType: 'application/json',
@@ -235,7 +282,7 @@ module.exports = exports['default'];
//default
},{"./UrlHelper":2,"./helpers/changeExtensionIcon":7,"./helpers/currentTimestamp":8,"jquery":22}],4:[function(require,module,exports){
},{"./UrlHelper.js":2,"./helpers/changeExtensionIcon.js":7,"./helpers/currentTimestamp.js":8,"jquery":22}],4:[function(require,module,exports){
'use strict';
Object.defineProperty(exports, '__esModule', {
@@ -244,11 +291,15 @@ Object.defineProperty(exports, '__esModule', {
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; }
var React = require('react');
var _react = require('react');
var _react2 = _interopRequireDefault(_react);
var MainList = (function (_React$Component) {
function MainList() {
@@ -282,64 +333,64 @@ var MainList = (function (_React$Component) {
var loginLogoutButton = function loginLogoutButton() {
if (_this.props.loggedIn === true) {
return React.createElement(
return _react2['default'].createElement(
'div',
null,
React.createElement(
_react2['default'].createElement(
'a',
{ target: '_blank', href: 'https://wakatime.com/settings/rules', className: 'list-group-item' },
React.createElement('i', { className: 'fa fa-fw fa-filter' }),
' Custom Rules'
_react2['default'].createElement('i', { className: 'fa fa-fw fa-filter' }),
'Custom Rules'
),
React.createElement(
_react2['default'].createElement(
'a',
{ target: '_blank', href: 'https://wakatime.com/dashboard', className: 'list-group-item' },
React.createElement('i', { className: 'fa fa-fw fa-tachometer' }),
' Dashboard'
_react2['default'].createElement('i', { className: 'fa fa-fw fa-tachometer' }),
'Dashboard'
),
React.createElement(
_react2['default'].createElement(
'a',
{ href: '#', className: 'list-group-item', onClick: _this.props.logoutUser },
React.createElement('i', { className: 'fa fa-fw fa-sign-out' }),
' Logout'
_react2['default'].createElement('i', { className: 'fa fa-fw fa-sign-out' }),
'Logout'
)
);
}
return React.createElement(
return _react2['default'].createElement(
'a',
{ target: '_blank', href: 'https://wakatime.com/login', className: 'list-group-item' },
React.createElement('i', { className: 'fa fa-fw fa-sign-in' }),
' Login'
_react2['default'].createElement('i', { className: 'fa fa-fw fa-sign-in' }),
'Login'
);
};
var signedInAs = function signedInAs() {
if (_this.props.loggedIn === true) {
return React.createElement(
return _react2['default'].createElement(
'div',
{ className: 'panel panel-default' },
React.createElement(
_react2['default'].createElement(
'div',
{ className: 'panel-body' },
React.createElement(
_react2['default'].createElement(
'div',
{ className: 'row' },
React.createElement(
_react2['default'].createElement(
'div',
{ className: 'col-xs-2' },
React.createElement('img', { className: 'img-circle', width: '48', height: '48', src: _this.props.user.photo })
_react2['default'].createElement('img', { className: 'img-circle', width: '48', height: '48', src: _this.props.user.photo })
),
React.createElement(
_react2['default'].createElement(
'div',
{ className: 'col-xs-10' },
'Signed in as ',
React.createElement(
'Signed in as',
_react2['default'].createElement(
'b',
null,
_this.props.user.full_name
),
React.createElement('br', null),
_react2['default'].createElement('br', null),
_this.props.user.email
)
)
@@ -348,18 +399,18 @@ var MainList = (function (_React$Component) {
}
};
return React.createElement(
return _react2['default'].createElement(
'div',
null,
signedInAs(),
React.createElement(
_react2['default'].createElement(
'div',
{ className: 'list-group' },
React.createElement(
_react2['default'].createElement(
'a',
{ href: '#', className: 'list-group-item', onClick: this._openOptionsPage },
React.createElement('i', { className: 'fa fa-fw fa-cogs' }),
' Options'
_react2['default'].createElement('i', { className: 'fa fa-fw fa-cogs' }),
'Options'
),
loginLogoutButton()
)
@@ -368,7 +419,7 @@ var MainList = (function (_React$Component) {
}]);
return MainList;
})(React.Component);
})(_react2['default'].Component);
exports['default'] = MainList;
module.exports = exports['default'];
@@ -382,11 +433,15 @@ Object.defineProperty(exports, "__esModule", {
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; }
var React = require("react");
var _react = require("react");
var _react2 = _interopRequireDefault(_react);
var Navbar = (function (_React$Component) {
function Navbar() {
@@ -402,68 +457,68 @@ var Navbar = (function (_React$Component) {
_createClass(Navbar, [{
key: "render",
value: function render() {
return React.createElement(
return _react2["default"].createElement(
"nav",
{ className: "navbar navbar-default", role: "navigation" },
React.createElement(
_react2["default"].createElement(
"div",
{ className: "container-fluid" },
React.createElement(
_react2["default"].createElement(
"div",
{ className: "navbar-header" },
React.createElement(
_react2["default"].createElement(
"button",
{ type: "button", className: "navbar-toggle collapsed", "data-toggle": "collapse", "data-target": "#bs-example-navbar-collapse-1" },
React.createElement(
_react2["default"].createElement(
"span",
{ className: "sr-only" },
"Toggle navigation"
),
React.createElement("i", { className: "fa fa-fw fa-cogs" })
_react2["default"].createElement("i", { className: "fa fa-fw fa-cogs" })
),
React.createElement(
_react2["default"].createElement(
"a",
{ target: "_blank", className: "navbar-brand", href: "https://wakatime.com" },
"WakaTime",
React.createElement("img", { src: "graphics/wakatime-logo-48.png" })
_react2["default"].createElement("img", { src: "graphics/wakatime-logo-48.png" })
)
),
React.createElement(
_react2["default"].createElement(
"div",
{ className: "collapse navbar-collapse", id: "bs-example-navbar-collapse-1" },
React.createElement(
_react2["default"].createElement(
"ul",
{ className: "nav navbar-nav" },
React.createElement(
_react2["default"].createElement(
"li",
{ className: "dropdown" },
React.createElement(
_react2["default"].createElement(
"a",
{ href: "#", className: "dropdown-toggle", "data-toggle": "dropdown", role: "button", "aria-expanded": "false" },
React.createElement("i", { className: "fa fa-fw fa-info" }),
_react2["default"].createElement("i", { className: "fa fa-fw fa-info" }),
"About",
React.createElement("span", { className: "caret" })
_react2["default"].createElement("span", { className: "caret" })
),
React.createElement(
_react2["default"].createElement(
"ul",
{ className: "dropdown-menu", role: "menu" },
React.createElement(
_react2["default"].createElement(
"li",
null,
React.createElement(
_react2["default"].createElement(
"a",
{ target: "_blank", href: "https://github.com/wakatime/chrome-wakatime/issues" },
React.createElement("i", { className: "fa fa-fw fa-bug" }),
_react2["default"].createElement("i", { className: "fa fa-fw fa-bug" }),
"Report an Issue"
)
),
React.createElement(
_react2["default"].createElement(
"li",
null,
React.createElement(
_react2["default"].createElement(
"a",
{ target: "_blank", href: "https://github.com/wakatime/chrome-wakatime" },
React.createElement("i", { className: "fa fa-fw fa-github" }),
_react2["default"].createElement("i", { className: "fa fa-fw fa-github" }),
"View on GitHub"
)
)
@@ -477,7 +532,7 @@ var Navbar = (function (_React$Component) {
}]);
return Navbar;
})(React.Component);
})(_react2["default"].Component);
exports["default"] = Navbar;
module.exports = exports["default"];
@@ -491,19 +546,35 @@ Object.defineProperty(exports, '__esModule', {
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; }
var React = require('react');
var $ = require('jquery');
var _react = require('react');
var NavBar = require('./NavBar.react');
var MainList = require('./MainList.react');
var _react2 = _interopRequireDefault(_react);
var changeExtensionIcon = require('../helpers/changeExtensionIcon');
var _jquery = require('jquery');
var WakaTimeOriginal = require('../WakaTime');
var _jquery2 = _interopRequireDefault(_jquery);
var _NavBarReactJs = require('./NavBar.react.js');
var _NavBarReactJs2 = _interopRequireDefault(_NavBarReactJs);
var _MainListReactJs = require('./MainList.react.js');
var _MainListReactJs2 = _interopRequireDefault(_MainListReactJs);
var _helpersChangeExtensionIconJs = require('../helpers/changeExtensionIcon.js');
var _helpersChangeExtensionIconJs2 = _interopRequireDefault(_helpersChangeExtensionIconJs);
var _WakaTimeJs = require('../WakaTime.js');
var _WakaTimeJs2 = _interopRequireDefault(_WakaTimeJs);
var WakaTime = (function (_React$Component) {
function WakaTime() {
@@ -535,13 +606,13 @@ var WakaTime = (function (_React$Component) {
theme: 'light'
}, function (items) {
if (items.theme == 'light') {
changeExtensionIcon();
(0, _helpersChangeExtensionIconJs2['default'])();
} else {
changeExtensionIcon('white');
(0, _helpersChangeExtensionIconJs2['default'])('white');
}
});
var wakatime = new WakaTimeOriginal();
var wakatime = new _WakaTimeJs2['default']();
wakatime.checkAuth().done(function (data) {
@@ -556,13 +627,9 @@ var WakaTime = (function (_React$Component) {
loggedIn: true
});
changeExtensionIcon();
(0, _helpersChangeExtensionIconJs2['default'])();
} else {
changeExtensionIcon('red');
//TODO: Redirect user to wakatime login page.
//
(0, _helpersChangeExtensionIconJs2['default'])('red');
}
});
}
@@ -571,9 +638,9 @@ var WakaTime = (function (_React$Component) {
value: function logoutUser() {
var _this2 = this;
var deferredObject = $.Deferred();
var deferredObject = _jquery2['default'].Deferred();
$.ajax({
_jquery2['default'].ajax({
url: this.logoutUserUrl,
method: 'GET',
success: function success() {
@@ -606,26 +673,26 @@ var WakaTime = (function (_React$Component) {
loggedIn: false
});
changeExtensionIcon('red');
(0, _helpersChangeExtensionIconJs2['default'])('red');
});
}
}, {
key: 'render',
value: function render() {
return React.createElement(
return _react2['default'].createElement(
'div',
null,
React.createElement(NavBar, null),
React.createElement(
_react2['default'].createElement(_NavBarReactJs2['default'], null),
_react2['default'].createElement(
'div',
{ className: 'container' },
React.createElement(
_react2['default'].createElement(
'div',
{ className: 'row' },
React.createElement(
_react2['default'].createElement(
'div',
{ className: 'col-md-12' },
React.createElement(MainList, { user: this.state.user, logoutUser: this._logoutUser.bind(this), loggedIn: this.state.loggedIn })
_react2['default'].createElement(_MainListReactJs2['default'], { user: this.state.user, logoutUser: this._logoutUser.bind(this), loggedIn: this.state.loggedIn })
)
)
)
@@ -634,18 +701,15 @@ var WakaTime = (function (_React$Component) {
}]);
return WakaTime;
})(React.Component);
})(_react2['default'].Component);
exports['default'] = WakaTime;
module.exports = exports['default'];
},{"../WakaTime":3,"../helpers/changeExtensionIcon":7,"./MainList.react":4,"./NavBar.react":5,"jquery":22,"react":178}],7:[function(require,module,exports){
},{"../WakaTime.js":3,"../helpers/changeExtensionIcon.js":7,"./MainList.react.js":4,"./NavBar.react.js":5,"jquery":22,"react":178}],7:[function(require,module,exports){
/**
* It changes the extension icon color.
* Supported values are: 'red', 'white' and ''.
*
* @param string color = ''
* @return null
*/
'use strict';
@@ -671,6 +735,9 @@ function changeExtensionIcon() {
module.exports = exports['default'];
},{}],8:[function(require,module,exports){
/**
* Returns UNIX timestamp
*/
"use strict";
Object.defineProperty(exports, "__esModule", {

89
public/js/events.js
View File

@@ -1,7 +1,11 @@
(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
'use strict';
var WakaTime = require('./WakaTime');
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
var _WakaTimeJs = require('./WakaTime.js');
var _WakaTimeJs2 = _interopRequireDefault(_WakaTimeJs);
/**
* Whenever an alarms sets off, this function
@@ -17,7 +21,7 @@ function resolveAlarm(alarm) {
console.log('recording a heartbeat - alarm triggered');
var wakatime = new WakaTime();
var wakatime = new _WakaTimeJs2['default']();
wakatime.recordHeartbeat();
}
@@ -38,7 +42,7 @@ chrome.tabs.onActivated.addListener(function (activeInfo) {
console.log('recording a heartbeat - active tab changed');
var wakatime = new WakaTime();
var wakatime = new _WakaTimeJs2['default']();
wakatime.recordHeartbeat();
});
@@ -57,7 +61,7 @@ chrome.tabs.onUpdated.addListener(function (tabId, changeInfo, tab) {
if (tabId == tabs[0].id) {
console.log('recording a heartbeat - tab updated');
var wakatime = new WakaTime();
var wakatime = new _WakaTimeJs2['default']();
wakatime.recordHeartbeat();
}
@@ -65,7 +69,7 @@ chrome.tabs.onUpdated.addListener(function (tabId, changeInfo, tab) {
}
});
},{"./WakaTime":3}],2:[function(require,module,exports){
},{"./WakaTime.js":3}],2:[function(require,module,exports){
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -105,14 +109,25 @@ Object.defineProperty(exports, '__esModule', {
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
var UrlHelper = require('./UrlHelper');
var _UrlHelperJs = require('./UrlHelper.js');
var $ = require('jquery');
var _UrlHelperJs2 = _interopRequireDefault(_UrlHelperJs);
var currentTimestamp = require('./helpers/currentTimestamp');
var changeExtensionIcon = require('./helpers/changeExtensionIcon');
var _jquery = require('jquery');
var _jquery2 = _interopRequireDefault(_jquery);
var _helpersCurrentTimestampJs = require('./helpers/currentTimestamp.js');
var _helpersCurrentTimestampJs2 = _interopRequireDefault(_helpersCurrentTimestampJs);
var _helpersChangeExtensionIconJs = require('./helpers/changeExtensionIcon.js');
var _helpersChangeExtensionIconJs2 = _interopRequireDefault(_helpersChangeExtensionIconJs);
var WakaTime = (function () {
function WakaTime() {
@@ -130,14 +145,14 @@ var WakaTime = (function () {
/**
* Checks if the user is logged in.
*
* @return $.promise()
* @returns {*}
*/
value: function checkAuth() {
var _this = this;
var deferredObject = $.Deferred();
var deferredObject = _jquery2['default'].Deferred();
$.ajax({
_jquery2['default'].ajax({
url: this.currentUserApiUrl,
dataType: 'json',
success: function success(data) {
@@ -160,8 +175,6 @@ var WakaTime = (function () {
/**
* Depending on various factors detects the current active tab URL or domain,
* and sends it to WakaTime for logging.
*
* @return null
*/
value: function recordHeartbeat() {
var _this2 = this;
@@ -172,7 +185,7 @@ var WakaTime = (function () {
// User is logged in.
// Change extension icon to default color.
changeExtensionIcon();
(0, _helpersChangeExtensionIconJs2['default'])();
chrome.idle.queryState(_this2.detectionIntervalInSeconds, function (newState) {
@@ -187,7 +200,7 @@ var WakaTime = (function () {
// User is not logged in.
// Change extension icon to red color.
changeExtensionIcon('red');
(0, _helpersChangeExtensionIconJs2['default'])('red');
}
});
}
@@ -197,10 +210,11 @@ var WakaTime = (function () {
/**
* Creates payload for the heartbeat and returns it as JSON.
*
* @param string entity
* @param string type 'domain' or 'url'
* @param boolean debug = false
* @return JSON
* @param entity
* @param type
* @param debug
* @returns {*}
* @private
*/
value: function _preparePayload(entity, type) {
var debug = arguments[2] === undefined ? false : arguments[2];
@@ -208,7 +222,7 @@ var WakaTime = (function () {
return JSON.stringify({
entity: entity,
type: type,
time: currentTimestamp(),
time: (0, _helpersCurrentTimestampJs2['default'])(),
is_debugging: debug
});
}
@@ -218,10 +232,11 @@ var WakaTime = (function () {
/**
* Returns a promise with logging type variable.
*
* @return $.promise
* @returns {*}
* @private
*/
value: function _getLoggingType() {
var deferredObject = $.Deferred();
var deferredObject = _jquery2['default'].Deferred();
chrome.storage.sync.get({
loggingType: this.loggingType
@@ -238,21 +253,22 @@ var WakaTime = (function () {
* Given the entity and logging type it creates a payload and
* sends an ajax post request to the API.
*
* @param string entity
* @return null
* @param entity
*/
value: function sendHeartbeat(entity) {
var _this3 = this;
var payload = null;
this._getLoggingType().done(function (loggingType) {
// Get only the domain from the entity.
// And send that in heartbeat
if (loggingType == 'domain') {
var domain = UrlHelper.getDomainFromUrl(entity);
var domain = _UrlHelperJs2['default'].getDomainFromUrl(entity);
var payload = _this3._preparePayload(domain, 'domain');
payload = _this3._preparePayload(domain, 'domain');
console.log(payload);
@@ -260,7 +276,7 @@ var WakaTime = (function () {
}
// Send entity in heartbeat
else if (loggingType == 'url') {
var payload = _this3._preparePayload(entity, 'url');
payload = _this3._preparePayload(entity, 'url');
console.log(payload);
@@ -274,18 +290,18 @@ var WakaTime = (function () {
/**
* Sends AJAX request with payload to the heartbeat API as JSON.
*
* @param JSON payload
* @param string method = 'POST'
* @return $.promise
* @param payload
* @param method
* @returns {*}
*/
value: function sendAjaxRequestToApi(payload) {
var _this4 = this;
var method = arguments[1] === undefined ? 'POST' : arguments[1];
var deferredObject = $.Deferred();
var deferredObject = _jquery2['default'].Deferred();
$.ajax({
_jquery2['default'].ajax({
url: this.heartbeatApiUrl,
dataType: 'json',
contentType: 'application/json',
@@ -316,13 +332,10 @@ module.exports = exports['default'];
//default
},{"./UrlHelper":2,"./helpers/changeExtensionIcon":4,"./helpers/currentTimestamp":5,"jquery":6}],4:[function(require,module,exports){
},{"./UrlHelper.js":2,"./helpers/changeExtensionIcon.js":4,"./helpers/currentTimestamp.js":5,"jquery":6}],4:[function(require,module,exports){
/**
* It changes the extension icon color.
* Supported values are: 'red', 'white' and ''.
*
* @param string color = ''
* @return null
*/
'use strict';
@@ -350,8 +363,6 @@ module.exports = exports['default'];
},{}],5:[function(require,module,exports){
/**
* Returns UNIX timestamp
*
* @return integer
*/
"use strict";

10
public/js/options.js
View File

@@ -3,11 +3,15 @@
/* This is a fix for Bootstrap requiring jQuery */
'use strict';
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
var _jquery = require('jquery');
var _jquery2 = _interopRequireDefault(_jquery);
global.jQuery = require('jquery');
require('bootstrap');
var $ = require('jquery');
function detectCheckedRadio(name) {
for (var i = 0; i < document.getElementsByName(name).length; i++) {
var button = document.getElementsByName(name)[i];
@@ -32,7 +36,7 @@ function save_options(e) {
loggingType: loggingType
}, function () {
// Update status to let user know options were saved.
var status = $('#status');
var status = (0, _jquery2['default'])('#status');
status.html('<strong>Well done!</strong> Options have been saved.');
status.fadeIn(1500, function () {

0
sc_1.png → screenshots/sc_1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

0
sc_2-options.png → screenshots/sc_2-options.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

0
sc_3_closed.png → screenshots/sc_3_closed.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 40 KiB

0
sc_3_open.png → screenshots/sc_3_open.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB

BIN
screenshots/sc_4-options.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB