From 0d86ef1b9f5797e2150af98e942b7c0873d5e70b Mon Sep 17 00:00:00 2001 From: Josh Smith Date: Tue, 6 Dec 2016 16:51:45 -0800 Subject: [PATCH 1/2] Add terms of use and privacy policy drafts --- app/router.js | 2 + app/styles/main.scss | 14 ++ .../donation/donation-container.hbs | 7 +- app/templates/components/site-footer.hbs | 8 +- app/templates/privacy.hbs | 181 +++++++++++++++ app/templates/terms-of-use.hbs | 219 +++++++++++++++++- .../components/site-footer-test.js | 4 +- 7 files changed, 424 insertions(+), 11 deletions(-) create mode 100644 app/templates/privacy.hbs diff --git a/app/router.js b/app/router.js index 5642a3709..a55457692 100644 --- a/app/router.js +++ b/app/router.js @@ -91,6 +91,8 @@ AppRouter.map(function() { this.route('organization', function() { this.route('settings', function() { }); }); + + this.route('privacy'); this.route('terms-of-use'); }); diff --git a/app/styles/main.scss b/app/styles/main.scss index 1748fe519..565a28605 100644 --- a/app/styles/main.scss +++ b/app/styles/main.scss @@ -71,6 +71,15 @@ ul { margin: 0; padding: 0; list-style-type: none; + + &.bulleted { + list-style-type: disc; + margin-left: 30px; + + li { + margin-bottom: 0.5em; + } + } } .border-top { @@ -171,3 +180,8 @@ p.subtext { line-height: 2em; } } + +.legal { + margin: auto; + max-width: 600px; +} diff --git a/app/templates/components/donation/donation-container.hbs b/app/templates/components/donation/donation-container.hbs index 625183207..585b613c7 100644 --- a/app/templates/components/donation/donation-container.hbs +++ b/app/templates/components/donation/donation-container.hbs @@ -37,7 +37,8 @@ diff --git a/app/templates/components/site-footer.hbs b/app/templates/components/site-footer.hbs index a0c331c20..d76f2b416 100644 --- a/app/templates/components/site-footer.hbs +++ b/app/templates/components/site-footer.hbs @@ -24,13 +24,13 @@
  • team@codecorps.org
  • -{{!--
  • - Terms of Use +
  • + {{link-to 'Terms of Use' 'terms-of-use'}}
  • - Privacy Policy + {{link-to 'Privacy Policy' 'privacy'}}
  • - --}} +
  • Learn

    diff --git a/app/templates/privacy.hbs b/app/templates/privacy.hbs new file mode 100644 index 000000000..55c29530d --- /dev/null +++ b/app/templates/privacy.hbs @@ -0,0 +1,181 @@ + diff --git a/app/templates/terms-of-use.hbs b/app/templates/terms-of-use.hbs index 0a5e7b4b4..4d925aea1 100644 --- a/app/templates/terms-of-use.hbs +++ b/app/templates/terms-of-use.hbs @@ -1,2 +1,217 @@ -

    Terms of Use

    -

    Coming soon...

    + diff --git a/tests/integration/components/site-footer-test.js b/tests/integration/components/site-footer-test.js index 5833ed0c3..60840baeb 100644 --- a/tests/integration/components/site-footer-test.js +++ b/tests/integration/components/site-footer-test.js @@ -21,8 +21,8 @@ test('it renders all elements', function(assert) { assert.equal(this.$('ul.footer-columns > li:eq(1) li:eq(1)').text().trim(), 'Team'); assert.equal(this.$('ul.footer-columns > li:eq(2) li:eq(0)').text().trim(), 'team@codecorps.org'); - // assert.equal(this.$('ul.footer-columns > li:eq(2) li:eq(1)').text().trim(), 'Terms of Use'); - // assert.equal(this.$('ul.footer-columns > li:eq(2) li:eq(2)').text().trim(), 'Privacy Policy'); + assert.equal(this.$('ul.footer-columns > li:eq(2) li:eq(1)').text().trim(), 'Terms of Use'); + assert.equal(this.$('ul.footer-columns > li:eq(2) li:eq(2)').text().trim(), 'Privacy Policy'); assert.equal(this.$('ul.footer-columns > li:eq(2) li:eq(0) a').attr('href'), 'mailto:team@codecorps.org'); From 17b52c36408f3c88906014831b6551c676093e24 Mon Sep 17 00:00:00 2001 From: Josh Smith Date: Tue, 6 Dec 2016 23:12:20 -0800 Subject: [PATCH 2/2] Rename terms-of-use to terms --- app/router.js | 2 +- app/templates/components/donation/donation-container.hbs | 2 +- app/templates/components/site-footer.hbs | 2 +- app/templates/privacy.hbs | 4 ++-- app/templates/{terms-of-use.hbs => terms.hbs} | 0 tests/unit/routes/{terms-of-use-test.js => terms.js} | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename app/templates/{terms-of-use.hbs => terms.hbs} (100%) rename tests/unit/routes/{terms-of-use-test.js => terms.js} (72%) diff --git a/app/router.js b/app/router.js index a55457692..f731559d9 100644 --- a/app/router.js +++ b/app/router.js @@ -93,7 +93,7 @@ AppRouter.map(function() { }); this.route('privacy'); - this.route('terms-of-use'); + this.route('terms'); }); export default AppRouter; diff --git a/app/templates/components/donation/donation-container.hbs b/app/templates/components/donation/donation-container.hbs index 585b613c7..c6ac0862d 100644 --- a/app/templates/components/donation/donation-container.hbs +++ b/app/templates/components/donation/donation-container.hbs @@ -39,6 +39,6 @@ Your donation will repeat automatically each month. You can cancel your donation at any time. By making this donation, you agree to our - {{link-to "Terms of Use" "terms-of-use"}}. + {{link-to "Terms of Use" "terms"}}. Code Corps does not issue refunds on behalf of projects. diff --git a/app/templates/components/site-footer.hbs b/app/templates/components/site-footer.hbs index d76f2b416..9bb211cc7 100644 --- a/app/templates/components/site-footer.hbs +++ b/app/templates/components/site-footer.hbs @@ -25,7 +25,7 @@ team@codecorps.org
  • - {{link-to 'Terms of Use' 'terms-of-use'}} + {{link-to 'Terms of Use' 'terms'}}
  • {{link-to 'Privacy Policy' 'privacy'}} diff --git a/app/templates/privacy.hbs b/app/templates/privacy.hbs index 55c29530d..9a7c7cf6b 100644 --- a/app/templates/privacy.hbs +++ b/app/templates/privacy.hbs @@ -11,7 +11,7 @@

    We understand that providing information online involves a great deal of trust on your part. We take this trust very seriously, and make it a high priority to ensure the security and confidentiality of the personal information you provide to us when you this website (the “Site”) and services (together with the Site, the “Services”) offered by us.

    -

    As part of our {{#link-to 'terms-of-use'}}Terms of Use{{/link-to}}, this Privacy Notice describes the types of personal information we collect on Code Corps, how we may use that information and with whom we may share it. Our Privacy Notice also describes the measures we take to protect the security of the personal information. Before submitting your personal information to us, please read this policy carefully to learn about our privacy practices.

    +

    As part of our {{#link-to 'terms'}}Terms of Use{{/link-to}}, this Privacy Notice describes the types of personal information we collect on Code Corps, how we may use that information and with whom we may share it. Our Privacy Notice also describes the measures we take to protect the security of the personal information. Before submitting your personal information to us, please read this policy carefully to learn about our privacy practices.

    Information We Collect

    @@ -75,7 +75,7 @@
  • In connection with a corporate transaction, such as a divestiture, merger, consolidation, or asset sale, or bankruptcy; or
  • -
  • To investigate, prevent, or take action regarding illegal or suspected illegal activities, to protect and defend the rights, property, or safety of Code Corps, our customers, or others, and in connection with our {{#link-to 'terms-of-use'}}Terms of Use{{/link-to}} or other agreements.
  • +
  • To investigate, prevent, or take action regarding illegal or suspected illegal activities, to protect and defend the rights, property, or safety of Code Corps, our customers, or others, and in connection with our {{#link-to 'terms'}}Terms of Use{{/link-to}} or other agreements.
  • diff --git a/app/templates/terms-of-use.hbs b/app/templates/terms.hbs similarity index 100% rename from app/templates/terms-of-use.hbs rename to app/templates/terms.hbs diff --git a/tests/unit/routes/terms-of-use-test.js b/tests/unit/routes/terms.js similarity index 72% rename from tests/unit/routes/terms-of-use-test.js rename to tests/unit/routes/terms.js index 2421fe848..7955b39ae 100644 --- a/tests/unit/routes/terms-of-use-test.js +++ b/tests/unit/routes/terms.js @@ -1,6 +1,6 @@ import { moduleFor, test } from 'ember-qunit'; -moduleFor('route:terms-of-use', 'Unit | Route | terms of use', { +moduleFor('route:terms', 'Unit | Route | terms', { needs: ['service:metrics'] });