From 8bec5007bcc72cc8ecb478f4c64ff659b8054d0e Mon Sep 17 00:00:00 2001 From: GochoMugo Date: Mon, 25 Apr 2016 22:51:32 +0300 Subject: [PATCH 01/11] Add auto-linking for Markdown content issue: #11 --- engine/pages.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/engine/pages.js b/engine/pages.js index 41558ca..8be9234 100644 --- a/engine/pages.js +++ b/engine/pages.js @@ -20,7 +20,10 @@ var showdown = require('showdown'); // module variables -var converter = new showdown.Converter(); +var converter = new showdown.Converter({ + simplifiedAutoLink: true, + tables: true, +}); /** From 86404bbab21ca5fbe9c1998a379b24dd4eadd09c Mon Sep 17 00:00:00 2001 From: GochoMugo Date: Mon, 25 Apr 2016 22:54:55 +0300 Subject: [PATCH 02/11] Move the raw md pages to docs/ Placing them in docs/ allows them to be easily discoverable. References: ---------- * issue #2 --- {web/_raw => docs}/news.md | 0 web/_raw/tcs.md => docs/terms-and-conditions.md | 0 routes/public.js | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename {web/_raw => docs}/news.md (100%) rename web/_raw/tcs.md => docs/terms-and-conditions.md (100%) diff --git a/web/_raw/news.md b/docs/news.md similarity index 100% rename from web/_raw/news.md rename to docs/news.md diff --git a/web/_raw/tcs.md b/docs/terms-and-conditions.md similarity index 100% rename from web/_raw/tcs.md rename to docs/terms-and-conditions.md diff --git a/routes/public.js b/routes/public.js index 20dd971..dd62711 100644 --- a/routes/public.js +++ b/routes/public.js @@ -115,14 +115,14 @@ router // News page router.get("/news", function(req, res, next) { - var filepath = path.resolve(__dirname, '../web/_raw/news.md'); + var filepath = path.resolve(__dirname, '../docs/news.md'); return renderMarkdownPage(req, res, next, filepath); }); // Terms and conditions router.use('/tcs', function(req, res, next) { - var filepath = path.resolve(__dirname, '../web/_raw/tcs.md'); + var filepath = path.resolve(__dirname, '../docs/terms-and-conditions.md'); return renderMarkdownPage(req, res, next, filepath); }); From 70556341c8de203d0203c1d934b421bdd8204ad9 Mon Sep 17 00:00:00 2001 From: GochoMugo Date: Mon, 25 Apr 2016 23:04:54 +0300 Subject: [PATCH 03/11] Fix typos in markdown content --- docs/news.md | 10 ++++------ docs/terms-and-conditions.md | 4 ++-- web/_sass/content.sass | 7 +++---- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/docs/news.md b/docs/news.md index a07d012..069ce35 100644 --- a/docs/news.md +++ b/docs/news.md @@ -1,7 +1,5 @@ -
-

Terms and Conditions 2016-04-23

+

Terms and Conditions 2016-04-23

- We have added a page detailing the Terms and Conditions, subject to - application users. Please read through it and understand. It can be - found at http://mmtc.forfuture.co.ke/tcs -
+We have added a page detailing the Terms and Conditions, subject to +application users. Please read through it and understand. It can be +found at http://mmtc.forfuture.co.ke/tcs . diff --git a/docs/terms-and-conditions.md b/docs/terms-and-conditions.md index aae8678..87367b0 100644 --- a/docs/terms-and-conditions.md +++ b/docs/terms-and-conditions.md @@ -1,10 +1,10 @@ # terms and conditions -Your usage of this application, at http://mmtc.forfuture.co.ke, assumes your +Your usage of this application, at http://mmtc.forfuture.co.ke , assumes your acceptance of these terms and conditions. 1. **Source Code**: The source code for this application is available on - Github at https://github.com/forfuturellc/mmtc-ke. Proceed to the code + Github at https://github.com/forfuturellc/mmtc-ke . Proceed to the code repository for more information on licensing. Auditing of the source code is highly welcome. 1. **Accuracy of Results**: We do **not** guarantee the accuracy of any diff --git a/web/_sass/content.sass b/web/_sass/content.sass index 7011dde..b8eb75e 100644 --- a/web/_sass/content.sass +++ b/web/_sass/content.sass @@ -5,7 +5,6 @@ text-align: left -.post - h2 small - color: grey - font-size: 12px +h2 small + color: grey + font-size: 12px From f7860c1fc982688e08de97f8d40f37d4876f8dc2 Mon Sep 17 00:00:00 2001 From: GochoMugo Date: Thu, 16 Jun 2016 12:23:58 +0300 Subject: [PATCH 04/11] [web] Track page views with Google Analytics --- CHANGELOG.md | 6 ++++++ docs/news.md | 9 +++++++++ docs/terms-and-conditions.md | 6 +++++- web/_includes/scripts.html | 12 ++++++++++++ 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a6d444c..07cd517 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased][Unreleased] +Added: + +* Tracking page views with [Google Analytics][analytics] + +[analytics]:https://analytics.google.com + ## [0.2.0][0.2.0] - 2016-04-24 diff --git a/docs/news.md b/docs/news.md index 069ce35..2816ea8 100644 --- a/docs/news.md +++ b/docs/news.md @@ -1,3 +1,12 @@ +

Updated Terms and Conditions 2016-06-16

+ +We have updated our Terms and Conditions to reflect our change +in **Privacy Policy**. This is to inform you that we are tracking +page views using [Google Analytics][analytics]. + +[analytics]:https://analytics.google.com + +

Terms and Conditions 2016-04-23

We have added a page detailing the Terms and Conditions, subject to diff --git a/docs/terms-and-conditions.md b/docs/terms-and-conditions.md index 87367b0..74d1f72 100644 --- a/docs/terms-and-conditions.md +++ b/docs/terms-and-conditions.md @@ -13,7 +13,8 @@ acceptance of these terms and conditions. reasons such as software crashes and development work. 1. **Privacy Policy**: We do **not** use cookies or collect any personal information, except that submitted directly in the various forms made - available in the application itself. + available in the application itself. However, we track page views using + [Google Analytics][analytics]. 1. **Copyright**: Any brand names and trademarks used in the application belong to the respective companies. 1. **Service Abuse**: Any actions you undertake against this application @@ -22,3 +23,6 @@ acceptance of these terms and conditions. For any copyright-related and other legal issues may be addressed to Forfuture, LLC at we {at} forfuture {dot} co {dot} ke. + + +[analytics]:https://analytics.google.com diff --git a/web/_includes/scripts.html b/web/_includes/scripts.html index 2d19c56..b4cb3dc 100644 --- a/web/_includes/scripts.html +++ b/web/_includes/scripts.html @@ -3,3 +3,15 @@ {% set defaultJSURL = '/js/index.js' %} + +{# Google analytics #} + From 6c30188582513e92ddfb168f803d4bfdf0cbe108 Mon Sep 17 00:00:00 2001 From: GochoMugo Date: Thu, 16 Jun 2016 13:12:51 +0300 Subject: [PATCH 05/11] [web] Add minor UI polishes Summary: * alert message if there are no USSD codes * fix positioning of the label in forms * fix uncertain page width --- CHANGELOG.md | 4 ++++ web/_includes/transaction.html | 8 ++++++-- web/_includes/ussd_codes.html | 7 +++++++ web/_layouts/default.html | 2 +- web/_sass/_layout.sass | 8 ++++++++ 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07cd517..c6c0d91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ Added: * Tracking page views with [Google Analytics][analytics] +Changed: + +* Minor UI polishes + [analytics]:https://analytics.google.com diff --git a/web/_includes/transaction.html b/web/_includes/transaction.html index 1e92900..01ecb4c 100644 --- a/web/_includes/transaction.html +++ b/web/_includes/transaction.html @@ -13,7 +13,9 @@ {% else %}
- +
+ +
@@ -22,7 +24,9 @@
- +
+ +