Bugfix 32 broken agreement link (#42)

* introduce a configurationSvc that can be used in front end to customize behavior of Quepid. In this case, to customize showing the terms and conditions checkbox and link * remove old keys that aren't in heroku, but add new ones that need to be * let folks know these exist by adding to example * Fixes #44
o19s · Dec 19, 2019 · 34ca11c · 34ca11c
1 parent 012e5ec
commit 34ca11c
Show file tree

Hide file tree

Showing 12 changed files with 92 additions and 12 deletions.
diff --git a/.env.example b/.env.example
@@ -21,3 +21,8 @@ QUEPID_DOMAIN=localhost
 
 INTERCOM_APP_ID=
 INTERCOM_API_KEY=
+
+# Used to insert web links if populated.
+TC_URL=
+PRIVACY_URL=
+COOKIES_URL=
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Update Elasticsearch logo.  https://github.com/o19s/quepid/pull/38 by @moshebla
 * Remove sqlite from gem, no longer used.  https://github.com/o19s/quepid/pull/41 by @epugh fixes https://github.com/o19s/quepid/issues/40
 * Better look and UI experience for the dev panel.  https://github.com/o19s/quepid/pull/39 by @moshebla
+* Show or don't show the T&C's link based on the Quepid configuration.  https://github.com/o19s/quepid/pull/42 by @epugh fixes https://github.com/o19s/quepid/issues/44 by @flaxsearch.
 
 ## 6.0.2 - 11/26/2019
 * Deprecate www.quepid.com/support in favor of linking to wiki.  https://github.com/o19s/quepid/pull/18 by @epugh fixes https://github.com/o19s/quepid/issues/17

diff --git a/README.md b/README.md
@@ -410,7 +410,8 @@ Check out the [App Structure](docs/app_structure.md) file for more info on how Q
 
 # Legal Pages
 
-If you would like to have legal pages linked in the footer of the app, add the following `ENV` vars:
+If you would like to have legal pages linked in the footer of the app, similar to behavior on http://app.quepid.com, 
+add the following `ENV` vars:
 
 ```
 TC_URL      # terms and condition

diff --git a/app.json b/app.json
@@ -58,10 +58,13 @@
     "SIDEKIQ_CONCURRENCY": {
       "required": true
     },
-    "STRIPE_PUBLISHABLE_KEY": {
+    "TC_URL": {
       "required": true
     },
-    "STRIPE_SECRET_KEY": {
+    "PRIVACY_URL": {
+      "required": true
+    },
+    "COOKIES_URL": {
       "required": true
     }
   },

diff --git a/app/assets/javascripts/controllers/signup.js b/app/assets/javascripts/controllers/signup.js
@@ -4,7 +4,13 @@ angular.module('QuepidSecureApp')
   .controller('SignupCtrl', [
     '$scope', '$location',
     'signupSvc',
-    function ($scope, $location, signupSvc) {
+    'configurationSvc',
+    function ($scope, $location, signupSvc, configurationSvc) {
+      $scope.hasTermsAndConditions = configurationSvc.hasTermsAndConditions();
+      if (configurationSvc.hasTermsAndConditions()){
+        $scope.termsAndConditionsUrl = configurationSvc.getTermsAndConditionsUrl();
+      }
+
       $scope.submit = function (agree, name, username, pass, confirm) {
         $scope.warnAgree    = false;
         $scope.warnEmail    = false;
@@ -13,12 +19,13 @@ angular.module('QuepidSecureApp')
         $scope.warnErr      = false;
         $scope.warnName     = false;
 
+
         if ( !name ) {
           $scope.warnName = true;
           return;
         }
 
-        if( !agree ) {
+        if( $scope.hasTermsAndConditions && !agree ) {
           $scope.warnAgree = true;
           return;
         }

diff --git a/app/assets/javascripts/secure.js b/app/assets/javascripts/secure.js
@@ -27,6 +27,7 @@
 //= require utilitiesModule
 //= require secureApp
 //= require app
+//= require services/configurationSvc
 //= require services/secureRedirectSvc
 //= require services/loginSvc
 //= require services/userSvc

diff --git a/app/assets/javascripts/services/configurationSvc.js b/app/assets/javascripts/services/configurationSvc.js
@@ -0,0 +1,26 @@
+'use strict';
+
+angular.module('UtilitiesModule')
+  .service('configurationSvc', [
+    '$window', '$log',
+    function ConfigurationSvc() {
+      var termsAndConditionsUrl;
+
+      this.setTermsAndConditionsUrl = function (url) {
+        termsAndConditionsUrl = url;
+      };
+      this.hasTermsAndConditions = function () {
+        if (angular.isUndefined(termsAndConditionsUrl) || termsAndConditionsUrl === ''){
+          return false;
+        }
+        else {
+          return true;
+        }
+
+      };
+
+      this.getTermsAndConditionsUrl = function () {
+        return termsAndConditionsUrl;
+      };
+    }
+  ]);
diff --git a/app/assets/templates/views/signup.html b/app/assets/templates/views/signup.html
@@ -98,11 +98,11 @@ <h2>Signup to get started!</h2>
              />
           </div>
 
-          <div class="checkbox">
+          <div class="checkbox" ng-show="hasTermsAndConditions">
             <label>
-              <input type="checkbox" ng-model="agree" required />
+              <input type="checkbox" ng-model="agree" required ng-if="hasTermsAndConditions"/>
               Agree to
-              <a href="/agreement">terms &amp; conditions</a>?
+              <a ng-href="{{ termsAndConditionsUrl }}" target="_blank">terms &amp; conditions</a>?
             </label>
           </div>
 

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -7,7 +7,7 @@
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <title>Quepid -- Relevant Search Solved</title>
-<meta name="description" content="Tired of irrelevant search results? Use Quepid products & services to help improve the quality and relevancy of your search results.">
+<meta name="description" content="Tired of irrelevant search results? Use Quepid to help improve the quality and relevancy of your search results.">
 <meta name="viewport" content="width=device-width">
 
 <%= stylesheet_link_tag 'application', media: 'all' %>

diff --git a/app/views/layouts/home.html.erb b/app/views/layouts/home.html.erb
@@ -7,7 +7,7 @@
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <title>Quepid -- Relevant Search Solved</title>
-<meta name="description" content="Tired of irrelevant search results? Use Quepid products & services to help improve the quality and relevancy of your search results.">
+<meta name="description" content="Tired of irrelevant search results? Use Quepid to help improve the quality and relevancy of your search results.">
 <meta name="viewport" content="width=device-width">
 
 <%= stylesheet_link_tag 'application', media: 'all' %>

diff --git a/app/views/layouts/secure.html.erb b/app/views/layouts/secure.html.erb
@@ -7,7 +7,7 @@
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <title>Quepid -- Relevant Search Solved</title>
-<meta name="description" content="Tired of irrelevant search results? Use Quepid products & services to help improve the quality and relevancy of your search results.">
+<meta name="description" content="Tired of irrelevant search results? Use Quepid to help improve the quality and relevancy of your search results.">
 <meta name="viewport" content="width=device-width">
 
 <%= stylesheet_link_tag 'secure', media: 'all' %>
@@ -28,17 +28,19 @@
 
   <script>
     angular.module('QuepidSecureApp')
-      .run(function($log, userSvc, secureRedirectSvc) {
+      .run(function($log, userSvc, secureRedirectSvc, configurationSvc) {
         var appDebug  = '<%= Rails.env == 'development' ? 'true' : 'false' %>';
         var debugPort = '<%= request.port %>';
 
         if (appDebug === 'true') {
           $log.debug("Activate debug mode");
           secureRedirectSvc.debugServer(debugPort);
         }
+        configurationSvc.setTermsAndConditionsUrl('<%= ENV['TC_URL'] %>');
       });
   </script>
 
+
   <%= render 'layouts/common_js' %>
 </body>
 </html>
diff --git a/spec/javascripts/angular/services/configurationSvc_spec.js b/spec/javascripts/angular/services/configurationSvc_spec.js
@@ -0,0 +1,34 @@
+'use strict';
+
+describe('Service: ConfigurationSvc', function () {
+
+  // load the service's module
+  beforeEach(module('UtilitiesModule'));
+
+  // instantiate service
+  var configurationSvc, windowMocker;
+  beforeEach(function(){
+    inject(function (_configurationSvc_) {
+      configurationSvc = _configurationSvc_;
+    });
+  });
+
+  it('exists', function () {
+    expect(!!configurationSvc).toBe(true);
+  });
+
+  it('reports if terms and conditions url was set', function () {
+    configurationSvc.setTermsAndConditionsUrl('https://quepid.com/agreement');
+    expect(configurationSvc.hasTermsAndConditions()).toBe(true);
+    expect(configurationSvc.getTermsAndConditionsUrl()).toEqual('https://quepid.com/agreement');
+  });
+
+  it('reports it doesnt have terms and conditions if not set, or blank', function () {
+
+    expect(configurationSvc.hasTermsAndConditions()).toBe(false);
+    configurationSvc.setTermsAndConditionsUrl('');
+    expect(configurationSvc.hasTermsAndConditions()).toBe(false);
+
+  });
+
+});