Skip to content

Update meteor version and deps. Enable use of settings.json #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vjrj wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Update meteor version and deps. Enable use of settings.json #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
12cf21f
Update meteor from 1.2.1
vjrj Nov 29, 2017
9a94f36
Updated README.md
vjrj Nov 29, 2017
3fc7946
Updated README.md
vjrj Nov 29, 2017
c1c197b
Forking, after PR without success
vjrj Dec 3, 2017
5b993d4
Forking, after PR without success
vjrj Dec 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .npm/package/npm-shrinkwrap.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
# 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/. 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).

#### Installation

```
meteor add davidsichau:piwik
meteor add vjrj:piwik
```

#### Setup

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 = `<YOUR SECRET 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.
Expand Down
15 changes: 10 additions & 5 deletions package.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,22 @@ Package.describe({
// Short two-sentence summary.
summary: "Piwik tracking for Meteor.",
// Version number.
version: "0.2.1",
version: "0.3.1",
// 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 */
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']);
Expand All @@ -22,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"
});
4 changes: 2 additions & 2 deletions server/piwik.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down