From 12cf21f7ad3032a649e11770c18da882ee79b846 Mon Sep 17 00:00:00 2001 From: vjrj Date: Wed, 29 Nov 2017 19:46:00 +0100 Subject: [PATCH 1/5] Update meteor from 1.2.1 --- README.md | 4 +++- package.js | 7 ++++++- server/piwik.js | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c7f6256..d06c6a0 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # davidsichau:piwik Meteor package that allows you to use Piwik Analytics with your application. -An improved fork of https://github.com/appjitsu/piwik/. Thanks for the great work. +An improved fork of https://github.com/appjitsu/piwik/ and https://github.com/davidsichau/piwik/. Thanks for the great work. This package uses piwik-tracker (https://www.npmjs.com/package/piwik-tracker). @@ -21,6 +21,8 @@ PIWIK_TOKEN = `` ``` +or via [settings.json](https://github.com/vjrj/piwik/blob/master/settings.json). + #### Usage On the client serveral helpers functions are provided to track different statistics. diff --git a/package.js b/package.js index 6efd45b..2698810 100644 --- a/package.js +++ b/package.js @@ -13,7 +13,12 @@ Package.describe({ /* This defines your actual package */ Package.onUse(function (api) { - api.versionsFrom('1.1.0.2'); + api.versionsFrom('1.2.1'); + api.use([ + 'ecmascript', + 'check' + ]); + var both = ["client", "server"]; api.addFiles(['client/piwik.js'], ['client']); diff --git a/server/piwik.js b/server/piwik.js index f1a43ec..8e14d34 100644 --- a/server/piwik.js +++ b/server/piwik.js @@ -1,7 +1,7 @@ var PiwikTracker = Npm.require('piwik-tracker'); -var site_id = process.env.PIWIK_SITE_ID; -var piwik_url = process.env.PIWIK_URL; +var site_id = process.env.PIWIK_SITE_ID || Meteor.settings.piwik.site_id ; +var piwik_url = process.env.PIWIK_URL || Meteor.settings.piwik.url; //stup for development settings From 9a94f369491546080ab2b9eac9918acf45e78dda Mon Sep 17 00:00:00 2001 From: vjrj Date: Wed, 29 Nov 2017 19:47:19 +0100 Subject: [PATCH 2/5] Updated README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d06c6a0..952ecd8 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ PIWIK_TOKEN = `` ``` -or via [settings.json](https://github.com/vjrj/piwik/blob/master/settings.json). +or via [settings.json](https://github.com/davidsichau/piwik/blob/master/settings.json). #### Usage From 3fc794651e241a7fba076330d8032f2f9b2e3d7c Mon Sep 17 00:00:00 2001 From: vjrj Date: Wed, 29 Nov 2017 19:48:16 +0100 Subject: [PATCH 3/5] Updated README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 952ecd8..94b76f7 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # davidsichau:piwik Meteor package that allows you to use Piwik Analytics with your application. -An improved fork of https://github.com/appjitsu/piwik/ and https://github.com/davidsichau/piwik/. Thanks for the great work. +An improved fork of https://github.com/appjitsu/piwik/. Thanks for the great work. This package uses piwik-tracker (https://www.npmjs.com/package/piwik-tracker). From c1c197b8ea4a0a0cba3cf27e81aa08a728d3ff5d Mon Sep 17 00:00:00 2001 From: vjrj Date: Sun, 3 Dec 2017 17:03:57 +0100 Subject: [PATCH 4/5] Forking, after PR without success --- README.md | 6 +++--- package.js | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 94b76f7..d424e62 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # davidsichau:piwik Meteor package that allows you to use Piwik Analytics with your application. -An improved fork of https://github.com/appjitsu/piwik/. Thanks for the great work. +An improved fork of https://github.com/appjitsu/piwik/ and https://github.com/DavidSichau/piwik/ . Thanks for the great work. This package uses piwik-tracker (https://www.npmjs.com/package/piwik-tracker). @@ -15,8 +15,8 @@ meteor add davidsichau:piwik Add the following Environmentsvariables ``` -PIWIK_SITE_ID = `http://your_piwik_server_url/piwik.php"` -PIWIK_URL = `0` +PIWIK_URL = `http://your_piwik_server_url/piwik.php"` +PIWIK_SITE_ID = `0` PIWIK_TOKEN = `` ``` diff --git a/package.js b/package.js index 2698810..fbe5020 100644 --- a/package.js +++ b/package.js @@ -3,12 +3,12 @@ Package.describe({ // Short two-sentence summary. summary: "Piwik tracking for Meteor.", // Version number. - version: "0.2.1", + version: "0.3.0", // Optional. Default is package directory name. - name: "davidsichau:piwik", + name: "vjrj:piwik", documentation: 'README.md', - git: 'https://github.com/DavidSichau/piwik' + git: 'https://github.com/vjrj/piwik' }); /* This defines your actual package */ @@ -27,5 +27,5 @@ Package.onUse(function (api) { /* This lets you use npm packages in your package*/ Npm.depends({ - "piwik-tracker": "0.1.1" + "piwik-tracker": "1.0.0" }); From 5b993d467c7334caeb429f52fbc298f09c332115 Mon Sep 17 00:00:00 2001 From: vjrj Date: Sun, 3 Dec 2017 18:18:16 +0100 Subject: [PATCH 5/5] Forking, after PR without success --- .npm/package/npm-shrinkwrap.json | 4 +++- README.md | 6 +++--- package.js | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.npm/package/npm-shrinkwrap.json b/.npm/package/npm-shrinkwrap.json index 1a320fd..7af2ca8 100644 --- a/.npm/package/npm-shrinkwrap.json +++ b/.npm/package/npm-shrinkwrap.json @@ -1,7 +1,9 @@ { "dependencies": { "piwik-tracker": { - "version": "0.1.1" + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/piwik-tracker/-/piwik-tracker-1.0.0.tgz", + "from": "piwik-tracker@1.0.0" } } } diff --git a/README.md b/README.md index d424e62..479fa02 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# davidsichau:piwik +# vjrj:piwik Meteor package that allows you to use Piwik Analytics with your application. An improved fork of https://github.com/appjitsu/piwik/ and https://github.com/DavidSichau/piwik/ . Thanks for the great work. @@ -8,7 +8,7 @@ This package uses piwik-tracker (https://www.npmjs.com/package/piwik-tracker). #### Installation ``` -meteor add davidsichau:piwik +meteor add vjrj:piwik ``` #### Setup @@ -21,7 +21,7 @@ PIWIK_TOKEN = `` ``` -or via [settings.json](https://github.com/davidsichau/piwik/blob/master/settings.json). +or via [settings.json](https://github.com/vjrj/piwik/blob/master/settings.json). #### Usage diff --git a/package.js b/package.js index fbe5020..09a515c 100644 --- a/package.js +++ b/package.js @@ -3,7 +3,7 @@ Package.describe({ // Short two-sentence summary. summary: "Piwik tracking for Meteor.", // Version number. - version: "0.3.0", + version: "0.3.1", // Optional. Default is package directory name. name: "vjrj:piwik", documentation: 'README.md',