From 065324e5d5988056c5673e0bb1b5fefa04ccdf38 Mon Sep 17 00:00:00 2001 From: yuliya Date: Wed, 13 Nov 2019 21:22:05 +0100 Subject: [PATCH 1/3] #62 vue-analytics added to package.json --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 4969ace88..f0938b121 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "clipboard": "^2.0.4", "sass-loader": "^7.3.1", "vue": "^2.5.2", + "vue-analytics": "^5.17.2", "vue-head": "^2.1.2", "vue-i18n": "^8.15.0" }, From b5b498fc11c8cfafc44385bff9c5766bcc8cdae5 Mon Sep 17 00:00:00 2001 From: yuliya Date: Wed, 13 Nov 2019 21:24:30 +0100 Subject: [PATCH 2/3] #62 google analytics initialized and event added to the license chooser and the help section --- src/App.vue | 4 ++ src/components/Chooser.vue | 5 ++ src/components/HelpSection.vue | 86 +++++++++++++++++++++++++--------- src/main.js | 9 ++++ 4 files changed, 83 insertions(+), 21 deletions(-) diff --git a/src/App.vue b/src/App.vue index 1a48a7961..a6c2573a7 100644 --- a/src/App.vue +++ b/src/App.vue @@ -62,6 +62,10 @@ export default { onLicenseUpdate(e) { this.selected = e } + }, + created: function() { + // send home to google analytics + this.$ga.page('/') } } diff --git a/src/components/Chooser.vue b/src/components/Chooser.vue index fcb3a0590..e236dce9c 100644 --- a/src/components/Chooser.vue +++ b/src/components/Chooser.vue @@ -52,6 +52,11 @@ export default { }, methods: { updateLicense() { + this.$ga.event({ + eventCategory: 'license', + eventAction: 'updated', + eventLabel: this.shortLicenseName + }) this.$emit('input', { shortName: this.shortLicenseName, fullName: this.fullLicenseName diff --git a/src/components/HelpSection.vue b/src/components/HelpSection.vue index 3c15db269..799dc3702 100644 --- a/src/components/HelpSection.vue +++ b/src/components/HelpSection.vue @@ -50,7 +50,7 @@

Creative Commons licenses can be represented by their names, their - associated icons, or both. For example, a CC BY-NC license, which + associated icons, or both. For example, a CC BY-NC license, which requires attribution, and prohibits commercial use could be represented by its: @@ -169,7 +169,7 @@


- For more information, please see + For more information, please see About the Licenses

@@ -186,16 +186,16 @@
  • - Legal Code:

    - Each license begins as a traditional legal tool, in the kind of - language and text formats that most lawyers know and love. We + Each license begins as a traditional legal tool, in the kind of + language and text formats that most lawyers know and love. We call this the Legal Code layer of each license.


  • - Human Readable:

    - Since most creators, educators, and scientists are not in fact lawyers, - we also make the licenses available in a format that normal people can read -- + Since most creators, educators, and scientists are not in fact lawyers, + we also make the licenses available in a format that normal people can read -- The Commons Deed (also known as the “human readable” version of the license). This is a handy reference for licensors and licensees, summarizing some of the most important terms and conditions. Think of the Commons Deed as a user-friendly @@ -211,14 +211,14 @@ software, we provide a "Machine Readable" version of the license.

    We developed a standardized way to describe licenses that software can - understand called CC Rights Expression language + understand called CC Rights Expression language (CC REL) to accomplish this.


    • - For more information, please see + For more information, please see About the Licenses

    @@ -232,12 +232,12 @@

    Our Public Domain Tools help authors keep and manage their copyright on terms they choose. Our public domain tools, on the other hand, enable - authors and copyright owners who want to dedicate their works to the + authors and copyright owners who want to dedicate their works to the worldwide public domain to do so.

    - For more information on CC's public domain tools, please see + For more information on CC's public domain tools, please see Our Public Domain Tools

    @@ -250,7 +250,7 @@

    There are a number of things you should consider before you apply - a Creative Commons license to your work, or before using Creative + a Creative Commons license to your work, or before using Creative Commons-licened material.

    @@ -262,7 +262,7 @@


    - For more information, please see + For more information, please see the CC wiki's page on Considerations for Licensors and Licensees. @@ -278,34 +278,34 @@

    Formally licensing your work is as easy as marking your work as being CC licensed, along with the specific license it is under. - This mark may be in the form of a watermark, or it may be somewhere - around where your work is hosted or shared. This mark may be as - simple as a bit of text stating the license, or as complex as + This mark may be in the form of a watermark, or it may be somewhere + around where your work is hosted or shared. This mark may be as + simple as a bit of text stating the license, or as complex as embedding the license information on your website.

    - If you are interested in embedding license information on your + If you are interested in embedding license information on your website, please see the "Have a Website?" dropdown at the bottom of this page for help.


    Recourse Options
    So what would I do if someone used my licensed work in a way - that the license does not permit? Well, there are lots of + that the license does not permit? Well, there are lots of recourse options, but here are the two main ones:

    • - Resolve the Dispute Amicably

      First, we encourage you to contact the alleged violator, and attempt to - resolve the dispute amicalbly. Most disagreements are solved + resolve the dispute amicalbly. Most disagreements are solved in this manner, and it saves everyone time and money.


    • - Litigation

      - If you determine that the disput cannot be resolved any other - way, you would then identify the alleged violation, contact a + If you determine that the disput cannot be resolved any other + way, you would then identify the alleged violation, contact a lawyer, and begin building a case.

      • @@ -338,7 +338,7 @@

      - For more information, please see + For more information, please see this page on Creative Commons licenses. @@ -383,6 +383,50 @@ export default { isModal5Active: false, isModal6Active: false } + }, + watch: { + isModal1Active: function() { + this.$ga.event({ + eventCategory: 'helpsection', + eventAction: 'clicked', + eventLabel: 'What Are Creative Commons Licenses?' + }) + }, + isModal2Active: function() { + this.$ga.event({ + eventCategory: 'helpsection', + eventAction: 'clicked', + eventLabel: 'How do the Licenses Work?' + }) + }, + isModal3Active: function() { + this.$ga.event({ + eventCategory: 'helpsection', + eventAction: 'clicked', + eventLabel: 'Want Public Domain Instead?' + }) + }, + isModal4Active: function() { + this.$ga.event({ + eventCategory: 'helpsection', + eventAction: 'clicked', + eventLabel: 'Considerations Before Licensing' + }) + }, + isModal5Active: function() { + this.$ga.event({ + eventCategory: 'helpsection', + eventAction: 'clicked', + eventLabel: 'How do I Formally License my Work?' + }) + }, + isModal6Active: function() { + this.$ga.event({ + eventCategory: 'helpsection', + eventAction: 'clicked', + eventLabel: 'The Six CC Licenses' + }) + } } } diff --git a/src/main.js b/src/main.js index 909e691f8..d32e749f0 100644 --- a/src/main.js +++ b/src/main.js @@ -1,6 +1,8 @@ // The Vue build version to load with the `import` command // (runtime-only or standalone) has been set in webpack.base.conf with an alias. + import Vue from 'vue' +import VueAnalytics from 'vue-analytics' import App from './App' import Buefy from 'buefy' import VueHead from 'vue-head' @@ -10,6 +12,13 @@ import 'bulma/css/bulma.min.css' import '@creativecommons/vocabulary/root.css' import '@creativecommons/vocabulary/vocabulary.css' +Vue.use(VueAnalytics, { + id: 'UA-XXX-X', + autoTracking: { + screenview: true + } +}) + Vue.config.productionTip = false Vue.use(Buefy) Vue.use(VueHead) From 993182bc28f6b99787650d83ec7630317a7f3603 Mon Sep 17 00:00:00 2001 From: yuliya Date: Wed, 13 Nov 2019 21:35:17 +0100 Subject: [PATCH 3/3] documentation updated --- README.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6b4f6ad91..8be28cbb6 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ $ npm run dev You should now have the application running and accessible at http://localhost:8080 (note: will run on a different port if 8080 is occupied, most common alternative port is 8081). ## Contributing -Before getting started on an issue, please comment on the issue you would like to work on to indicate that you are interested. Issues marked with the yellow `in progress` tag are already claimed, and are not up for grabs. +Before getting started on an issue, please comment on the issue you would like to work on to indicate that you are interested. Issues marked with the yellow `in progress` tag are already claimed, and are not up for grabs. If you create a PR for your work, but you are not finished yet, please include `WIP:` in the beginning of your PR title. When your work on your PR is completed and you are ready for a final review, please remove the `WIP:` prefix from the title to indicate that your work is done. @@ -43,6 +43,15 @@ To run e2e tests, you must have Java installed. [[download Java here](https://ja ## Deployment -The source files for the beta deployment are contained in the `./docs/` dir, and are live. Any changes to this dir's contents will be automatically deployed, so please take care when making modifications to this location. +The source files for the beta deployment are contained in the `./docs/` dir, and are live. Any changes to this dir's contents will be automatically deployed, so please take care when making modifications to this location. To update the dist bundle, run ```$ npm run build```, and copy the generated files from `./dist/` to `./docs/`, taking care to not delete the CNAME file in `./docs/`. + +Add your Google Analyitics id in `src/main.js`: + +```javascript +Vue.use(VueAnalytics, { + id: 'UA-XXX-X', + (...) +}) +```