From c222eda2abc2ac88b64595032ad46e0d5fb66b8c Mon Sep 17 00:00:00 2001 From: AlexCanCode Date: Thu, 6 Dec 2018 19:00:56 -0700 Subject: [PATCH 1/5] change page name from Tips for Requesting to Tools for Tenants --- .../Informational/RequestRecyclingTips.js | 51 ---------- .../Informational/ToolsForTenants.js | 97 +++++++++++++++++++ client/src/components/Navigation/Navbar.js | 2 +- client/src/routes.js | 4 +- 4 files changed, 100 insertions(+), 54 deletions(-) delete mode 100644 client/src/components/Informational/RequestRecyclingTips.js create mode 100644 client/src/components/Informational/ToolsForTenants.js diff --git a/client/src/components/Informational/RequestRecyclingTips.js b/client/src/components/Informational/RequestRecyclingTips.js deleted file mode 100644 index 77e6d665..00000000 --- a/client/src/components/Informational/RequestRecyclingTips.js +++ /dev/null @@ -1,51 +0,0 @@ -import React from 'react'; -import { Grid, Row, Col, PageHeader } from 'react-bootstrap'; -import CollapsePanel from '../UtilComponents/CollapsePanel'; - -const RequestRecyclingTips = () => ( -
- - - - - Tips for Requesting Service - - -
  • - Make an appointment with your property manager or landlord to talk about your - campaign -
    • -
  • - Print out the signatures and find neighbors who are interested in going to the - meeting with you -
    • -
  • Listen to your property manager's feedback or concerns
    • -
  • Let us know what they said!
    • - - } - defaultExpanded - /> - - Boo! Why? Fill out{' '} - - this survey - {' '} - and tell us what the roadblockers towards getting recycling services were. -

    - } - /> - -     -     -
    -); -export default RequestRecyclingTips; diff --git a/client/src/components/Informational/ToolsForTenants.js b/client/src/components/Informational/ToolsForTenants.js new file mode 100644 index 00000000..a4312b54 --- /dev/null +++ b/client/src/components/Informational/ToolsForTenants.js @@ -0,0 +1,97 @@ +import React from 'react'; +import { Grid, Row, Col, PageHeader } from 'react-bootstrap'; +import CollapsePanel from '../UtilComponents/CollapsePanel'; + +const ToolsForTenants = () => ( +
    + + + + Tools for Residents +
    +

    + Recycling fact sheet: +

    +

    Useful facts that to help convince neighbors to support recycling intiatives.

    + +

    + Posters and flyers: +

    +

    For publicizing campaigns.

    + +

    + Campaing management sheet: +

    +

    + This sheet guides campaign managers through the process, acting as a sort of + "checklist". It is not required, but is a useful way to visualize the process. +

    + +

    + Signature sheet: +

    +

    Sheet to be printed and hung in select areas along with posters.

    + +

    + "How we did it" Case Study: +

    +

    Stories of other residents succesfully campaigning for service.

    + +

    + Recycling Guidelines from Denver: +

    +

    + For both successful and ongoing campaigns. Note the types of materials that could be + recycled. +

    +
    + + + How much time will I need to dedicate? +

    (give a baseline or minimum)

    +
    + } + defaultExpanded + /> + + +
  • + Make an appointment with your property manager or landlord to talk about your + campaign +
    • +
  • + Print out the signatures and find neighbors who are interested in going to the + meeting with you +
    • +
  • Listen to your property manager's feedback or concerns
    • +
  • Let us know what they said!
    • + + } + /> + + Boo! Why? Fill out{' '} + + this survey + {' '} + and tell us what the roadblockers towards getting recycling services were. +

    + } + /> + + + + +); +export default ToolsForTenants; diff --git a/client/src/components/Navigation/Navbar.js b/client/src/components/Navigation/Navbar.js index bf6f1dc2..0827ba80 100644 --- a/client/src/components/Navigation/Navbar.js +++ b/client/src/components/Navigation/Navbar.js @@ -53,7 +53,7 @@ const NavBar = ({ Property Manager Resources - Tips for Requesting + Tools for Tenants diff --git a/client/src/routes.js b/client/src/routes.js index d71e1e56..52c29d3f 100644 --- a/client/src/routes.js +++ b/client/src/routes.js @@ -9,7 +9,7 @@ import CreateCampaignStep2 from './components/CreateCampaignStep2'; import CreateCampaignStep3 from './components/CreateCampaignStep3'; import HowItWorks from './components/HowItWorks/HowItWorks'; import CampaignContainer from './containers/CampaignContainer'; -import RequestRecyclingTips from './components/Informational/RequestRecyclingTips'; +import ToolsForTenants from './components/Informational/ToolsForTenants'; import DenverInfo from './components/Informational/DenverInfo'; import ManagerResources from './components/Informational/ManagerResources'; import DenverLearnMore from './components/Informational/DenverLearnMore'; @@ -49,7 +49,7 @@ export default ( /> callback(null, RequestRecyclingTips)} + getComponent={(location, callback) => callback(null, ToolsForTenants)} /> Date: Thu, 6 Dec 2018 19:02:14 -0700 Subject: [PATCH 2/5] change name from tips for requesting to Tools for Tenants --- .../stylesheets/components/_ToolsForTenants.scss | 15 +++++++++++++++ client/src/stylesheets/main.scss | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 client/src/stylesheets/components/_ToolsForTenants.scss diff --git a/client/src/stylesheets/components/_ToolsForTenants.scss b/client/src/stylesheets/components/_ToolsForTenants.scss new file mode 100644 index 00000000..07b01517 --- /dev/null +++ b/client/src/stylesheets/components/_ToolsForTenants.scss @@ -0,0 +1,15 @@ +@import "../base/colors"; +@import '../base/fonts'; + +.page-header { + text-align: center; +} + +h1 { + font-family: "Dancing Script"; +} + +strong { + font-weight: bold; +} + diff --git a/client/src/stylesheets/main.scss b/client/src/stylesheets/main.scss index f771bfdd..adc756c9 100644 --- a/client/src/stylesheets/main.scss +++ b/client/src/stylesheets/main.scss @@ -45,7 +45,8 @@ 'components/TenantOrPMChoice', 'components/RecyclingInfo', 'components/AdminAddSigantureModal', - 'components/NotFound'; + 'components/NotFound', + 'components/ToolsForTenants'; //Do not change the order of these imports: From 182fc7b9994b6c1bab492361f5098ca6a9e9c660 Mon Sep 17 00:00:00 2001 From: AlexCanCode Date: Thu, 6 Dec 2018 19:25:19 -0700 Subject: [PATCH 3/5] style text and add faqs --- .../Informational/ToolsForTenants.js | 21 +++++++++++++++++-- .../components/_ToolsForTenants.scss | 14 ++++++++++++- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/client/src/components/Informational/ToolsForTenants.js b/client/src/components/Informational/ToolsForTenants.js index a4312b54..25fa9b8c 100644 --- a/client/src/components/Informational/ToolsForTenants.js +++ b/client/src/components/Informational/ToolsForTenants.js @@ -50,8 +50,25 @@ const ToolsForTenants = () => ( titleText={'FAQs'} body={
    - How much time will I need to dedicate? -

    (give a baseline or minimum)

    +
    + How much time will I need to dedicate? +

    (give a baseline or minimum)

    +
    + +
    + How can I get people to sign the petition? +

    + (Ideas of where to post locally; digtially post; attending resident meetings and + mixers(if there are ones), newsletter, etc.) +

    +
    + +
    + How should I ask my neighbors to get involved? +

    + (Provide fact sheet; examples from case studies; door-to-door flyering, etc.){' '} +

    +
    } defaultExpanded diff --git a/client/src/stylesheets/components/_ToolsForTenants.scss b/client/src/stylesheets/components/_ToolsForTenants.scss index 07b01517..e4f68825 100644 --- a/client/src/stylesheets/components/_ToolsForTenants.scss +++ b/client/src/stylesheets/components/_ToolsForTenants.scss @@ -6,10 +6,22 @@ } h1 { - font-family: "Dancing Script"; + background-color: white; + color: $dark-blue; + padding: 1% 0; +} + +.info-text > p { + font-style: italic; +} + +.faq-div { + margin-top: 2%; } strong { font-weight: bold; } + + From 378eb6298fb22c2a46b3dafddf500da539ffb60b Mon Sep 17 00:00:00 2001 From: AlexCanCode Date: Thu, 6 Dec 2018 19:35:24 -0700 Subject: [PATCH 4/5] adjust paragraph margin --- client/src/stylesheets/components/_ToolsForTenants.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/client/src/stylesheets/components/_ToolsForTenants.scss b/client/src/stylesheets/components/_ToolsForTenants.scss index e4f68825..2c257929 100644 --- a/client/src/stylesheets/components/_ToolsForTenants.scss +++ b/client/src/stylesheets/components/_ToolsForTenants.scss @@ -13,6 +13,7 @@ h1 { .info-text > p { font-style: italic; + margin-top: .25%; } .faq-div { From 5eb5699b457b7982190aa865f9c62058da17c75e Mon Sep 17 00:00:00 2001 From: AlexCanCode Date: Thu, 6 Dec 2018 20:04:05 -0700 Subject: [PATCH 5/5] add Footer --- client/src/components/Informational/ToolsForTenants.js | 3 +++ client/src/stylesheets/components/_ToolsForTenants.scss | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/client/src/components/Informational/ToolsForTenants.js b/client/src/components/Informational/ToolsForTenants.js index 25fa9b8c..72c4ffe7 100644 --- a/client/src/components/Informational/ToolsForTenants.js +++ b/client/src/components/Informational/ToolsForTenants.js @@ -1,6 +1,7 @@ import React from 'react'; import { Grid, Row, Col, PageHeader } from 'react-bootstrap'; import CollapsePanel from '../UtilComponents/CollapsePanel'; +import Footer from '../Footer/Footer'; const ToolsForTenants = () => (
    @@ -109,6 +110,8 @@ const ToolsForTenants = () => ( +
    +
    ); export default ToolsForTenants; diff --git a/client/src/stylesheets/components/_ToolsForTenants.scss b/client/src/stylesheets/components/_ToolsForTenants.scss index 2c257929..6b91c2f1 100644 --- a/client/src/stylesheets/components/_ToolsForTenants.scss +++ b/client/src/stylesheets/components/_ToolsForTenants.scss @@ -24,5 +24,9 @@ strong { font-weight: bold; } +.spacer { + margin: 5%; +} +