Skip to content

Commit

Permalink
copy edits, project rename
Browse files Browse the repository at this point in the history
  • Loading branch information
radames committed Jan 8, 2020
1 parent 3182b88 commit b833142
Show file tree
Hide file tree
Showing 15 changed files with 32 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
key: ${{ secrets.key }}
port: ${{ secrets.PORT }}
script: |
cd static/talking-to-your-teen
cd static/note-to-parents
git fetch && git reset --hard FETCH_HEAD && git clean -df
6 changes: 3 additions & 3 deletions components/Custom/ShareContainer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,24 @@
</li>
<li>
<a
class="icon"
@click="facebookThis"
class="icon"
>
<span class="share icon-facebook-inverted" />
</a>
</li>
<li>
<a
class="icon"
@click="tweetMessage"
class="icon"
>
<span class="share icon-twitter-inverted" />
</a>
</li>
<li>
<a
class="icon"
@click="emailThis"
class="icon"
>
<span class="share icon-email-inverted" />
</a>
Expand Down
2 changes: 1 addition & 1 deletion components/Footer/FooterEmailSubscribe.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<h3 class="title">
Get Fresh Updates
</h3>
<form class="mc-form" method="POST" action="" @submit.prevent="submit">
<form @submit.prevent="submit" class="mc-form" method="POST" action="">
<input
v-model="email"
class="text email"
Expand Down
6 changes: 3 additions & 3 deletions components/Header/FeatureHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
${headerData.featureImage}x1875.jpg 1875w,
`"
:data-src="`${headerData.featureImage}x1875.jpg`"
alt="Elva dressed as a fairy"
@load="updateHeaderHeight"

alt="Elva dressed as a fairy"
class="img-fluid lazyload"
@load="updateHeaderHeight"
>
<div class="title">
<h2> {{ headerData.title }}</h2>
Expand Down Expand Up @@ -68,7 +68,7 @@ header {
left: 0;
height: 100%;
width: 45%;
background-color:rgba($green, 0.65);
background-color:rgba($blue, 0.65);
z-index: 0;
}
}
Expand Down
6 changes: 3 additions & 3 deletions components/Header/MenuHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
</a>
</div>
<button
class="hamburger"
@click="toggleMenu()"
class="hamburger"
>
<span />
<span />
Expand All @@ -38,8 +38,8 @@
class="icon-join-us"
/>
<button
class="icon-search"
@click="toggleSeach()"
class="icon-search"
/>
</div>
</div>
Expand All @@ -54,8 +54,8 @@
</form>
</div>
<button
class="icon-close"
@click="toggleSeach()"
class="icon-close"
/>
</div>
</header>
Expand Down
4 changes: 2 additions & 2 deletions components/RelatedPosts/RelatedPosts.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<div
v-for="post in postsData"
:key="post.id"
class="postElement"
:style="{ borderColor: post.acf.secondary_color }"
class="postElement"
>
<div class="postInner">
<div class="section">
Expand All @@ -19,8 +19,8 @@
<div class="section">
<a :href="post.link">
<img
class="img-fluid postImage lazyload"
:data-src="post.episode_featured_image"
class="img-fluid postImage lazyload"
>
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion components/RelatedPosts/RelatedPostsContainer.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<template>
<div>
<RelatedPosts
class="row"
:posts-data="postsData"
class="row"
/>
</div>
</template>
Expand Down
2 changes: 1 addition & 1 deletion data/data.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"content":{"opening":"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus varius sapien ac nunc mattis sagittis. Phasellus faucibus turpis sed dolor convallis ornare. Phasellus ante lorem, fermentum et rutrum eget, ultricies in nisi. Aenean non pharetra sapien. Morbi eu ante finibus dolor efficitur ultrices. Vivamus blandit ultricies ante, in ultrices orci malesuada vel. Ut eu dolor sit amet massa convallis rutrum. Ut lorem tellus, convallis eget pharetra et, vehicula a urna. Nullam id leo urna. In ut mi ipsum.\n","credits":"Lauren Barbra, Lauren's Mom, Sydney Livingston, Zoe Harwood, Devin Glover, Marjerrie Masicat, Radamés Anja\n","scenarios":[{"title":"Scenario 1\n","text":"Teen: “Hey mom, why’d you go through my phone? I told you nothing happened last night. If you had just asked, I would have let you look through it.”\n","img":"tempimg.jpg\n","options":[{"option":"YELLING “I had to! You seemed upset when you came home.”\n","result":"Both the teen and parent are stressed and upset. The teen loses trust and respect for the parent and they give each other the silent treatment.\n","img":"tempimg.jpg\n"},{"option":"calmly “I’m sorry. I was just worried about you. Next time I’ll talk to you first.”\n","result":"Teen understands and is forgiving. Teen opens up about what happened to make them look so upset. Parent learns a lesson about boundaries.\n","img":"tempimg.jpg\n"}]},{"title":"Scenario 2\n","text":"Your teen wants to go out to the movies with friends for a midnight showing of their favorite series. You say…\n","img":"tempimg.jpg\n","options":[{"option":"“I’m sorry, I'll have to put my foot down and say no. It’s just not safe enough in the city at night to be going to a movie.”\n","result":"They stop telling you about plans they make because they sense you you don’t try to trust their decisions.\n","img":"tempimg.jpg\n"},{"option":"“If you create a plan for how you’re gonna get there and the precautions you’ll take to stay safe and in touch with me, then we can continue this conversation.”\n","result":"Your teen learns how to make plans before approaching you for permission to go out, and they trust that you’ll understand how important it is for you to have new experiences with your friends.\n","img":"tempimg.jpg\n"}]},{"title":"Scenario 3\n","text":"Teen: “I feel like you don’t pay enough attention to me. It’s beginning to affect me because I feel neglected.”\n","img":"tempimg.jpg\n","options":[{"option":"“You don’t ever come to me, so how would I know? Don’t you ever talk to me in that tone.”\n","result":"Your teen will shut down. They will stop confiding in you and keep hiding their feelings about the relationship they have with you.\n","img":"tempimg.jpg\n"},{"option":"“I didn’t realize that was how you felt. How could we work on this together?”\n","result":"You will have a good conversation about the issue at hand. Doing so will create better communication between the two of you and a stronger relationship.\n","img":"tempimg.jpg\n"}]},{"title":"Scenario 4\n","text":"Teen: “I’m really stressed out about my upcoming test in calculus. I haven’t been doing so well in this class and I don’t know what to do.”\n","img":"tempimg.jpg\n","options":[{"option":"“You just need to study and try harder, that’s all.”\n","result":"The teen continues to do poorly in calculus and doesn’t bother coming back to you for help or advice.\n","img":"tempimg.jpg\n"},{"option":"“Is there a specific part that you are struggling with? Is there anything I could do to help you out?”\n","result":"Your teen opens up about their issues with calculus and begins to understand that you care not just about their grades.\n","img":"tempimg.jpg\n"}]},{"title":"Scenario 5\n","text":"Teen: “Sometimes, it’s like I’m in my own world because it feels like no one is listening or no one cares to even understand me.”\n","img":"tempimg.jpg\n","options":[{"option":"“What do you mean you’re in your own world? There are so many people around you! Are you criticizing how I raised you? I haven’t done anything wrong. I always listen to you! This conversation is OVER. Go to your room.”\n","result":"Both you and your teen are upset. They don’t take a chance to let you know how they are feeling about things ever again. You assume everything is alright.\n","img":"tempimg.jpg\n"},{"option":"“Thank you for letting me know how you feel. Let’s talk about it. I want to hear you out.”\n","result":"You and your teen become more open and they feel less isolated since they know they can come to you for advice.\n","img":"tempimg.jpg\n"}]},{"title":"Scenario 6\n","text":"On your only off day of the month, your teen comes up to you and asks if you want to hang out with them. Teen : “Hey Mom, I saw this flyer about the Art and Soul festival and it seems really cool! Do you think we could go?”\n","img":"tempimg.jpg\n","options":[{"option":"“I’m sorry. Those kinds of scenes are too crowded and noisy for me, and I’m not that interested in it anyway. I need to lay low this weekend. Mommy is just too tired.”\n","result":"Your teen will feel as though you don’t want to spend time with them at all, because you decided not to do anything with them for the weekend. You could have suggested another idea to hang out and do something more mellow that you’re both interested in, but instead you shut it down. Now the teen feels unwanted and will decide not to come to you with ideas for spending time together.\n","img":"tempimg.jpg\n"},{"option":"“Okay, we can go! Maybe for just a couple of hours? And then we can go somewhere less crowded, like grab ice cream?”\n","result":"The teen is happy and will enjoy the weekend with you, in part because you both compromised. Your teen will feel that you want to spend time with them and will continue to suggest fun activities for you to do together, because they know they’ll be heard.\n","img":"tempimg.jpg\n"}]},{"title":"Scenario 7\n","text":"Your teen is talking about their class schedule for the upcoming school year. They’re really confused about why they need to take trigonometry. They think that schools should just get rid of math all together and they should get to choose what they want to learn.\n","img":"tempimg.jpg\n","options":[{"option":"You interrupt them midway through their explanation and tell them: “The choice shouldn’t be yours because a lot of kids would not be ready to make that decision. It would be chaos!”\n","result":"The teen will want to end the conversation or an unnecessary argument will start, because you didn't let them complete their statement and yelled your opinion at them, rather than hearing them all the way through.\n","img":"tempimg.jpg\n"},{"option":"You listen to explanation all the way through and relate to their feelings — maybe saying, “I hated math, too!” or “That’s how I felt about French.” And then you go on: “But structure is necessary. It’s good to be exposed to everything because you won’t know what you like until you try it.”\n","result":"The teen will try to understand your point because you fully listened to their viewpoint and showed some understanding of theirs by creating a connection. The young person will continue having conversations like this with you because they know they’ll be heard and can trust that their opinion will be respected.\n","img":"tempimg.jpg\n"}]}]}}
{"content":{"opening":"No offense to parents out there, but even the best of you can shut us down when we need you the most. We know (most of) you don’t mean it! So we put together this little guide on how to talk and listen in ways that’ll convince us you have our backs. Pick which response you’d have to each scenario and see how your actions affect what we do next.\n","credits":"Lauren Barbra, Sydney Livingston, Zoe Harwood, Naomi N. Burks, M.A., Devin Glover, Marjerrie Masicat, Radamés Ajna\n","scenarios":[{"title":"Scenario 1\n","text":"Me: “Hey mom, why’d you go through my phone? I told you nothing happened last night. If you had just asked, I would have let you look through it.”\n","img":"tempimg.jpg\n","options":[{"option":"YELLING “I had to! You seemed upset when you came home.”\n","result":"We’re both stressed and upset. I lose trust and respect for you and we give each other the silent treatment.\n","img":"tempimg.jpg\n"},{"option":"calmly “I’m sorry. I was just worried about you. Next time I’ll talk to you first.”\n","result":"I understand and forgive you, and I open up about what happened that made me appear so upset. You learn a lesson about boundaries.\n","img":"tempimg.jpg\n"}]},{"title":"Scenario 2\n","text":"I want to go out to the movies with friends for a midnight showing of my favorite series.\n","img":"tempimg.jpg\n","options":[{"option":"“I’m sorry, I'll have to put my foot down and say no. It’s just not safe enough in the city at night to be going to a movie.”\n","result":"I stop telling you about plans I make because I sense you don’t trust my decisions.\n","img":"tempimg.jpg\n"},{"option":"“If you create a plan for how you’re gonna get there and the precautions you’ll take to stay safe and in touch with me, then we can continue this conversation.”\n","result":"I learn how to make plans before approaching you for permission to go out, and I trust that you’ll understand how important it is for me to have new experiences with my friends.\n","img":"tempimg.jpg\n"}]},{"title":"Scenario 3\n","text":"Me: “I feel like you don’t pay enough attention to me. It’s beginning to affect me because I feel neglected.”\n","img":"tempimg.jpg\n","options":[{"option":"“You don’t ever come to me, so how would I know? Don’t you ever talk to me in that tone.”\n","result":"I will shut down and stop confiding in you. And I’ll keep hiding my true feelings about our relationship.\n","img":"tempimg.jpg\n"},{"option":"“I didn’t realize that was how you felt. How could we work on this together?”\n","result":"We have a good conversation about the issue at hand. Doing so will create better communication between the us and a stronger relationship.\n","img":"tempimg.jpg\n"}]},{"title":"Scenario 4\n","text":"Me: “I’m really stressed out about my upcoming test in calculus. I haven’t been doing so well in this class and I don’t know what to do.”\n","img":"tempimg.jpg\n","options":[{"option":"“You just need to study and try harder, that’s all.”\n","result":"I continue to do poorly in calculus and doesn’t bother coming back to you for help or advice.\n","img":"tempimg.jpg\n"},{"option":"“Is there a specific part that you are struggling with? Is there anything I could do to help you out?”\n","result":"I open up about my issues with calculus and begin to understand that you care not just about my grades.\n","img":"tempimg.jpg\n"}]},{"title":"Scenario 5\n","text":"Me: “Sometimes, it’s like I’m in my own world because it feels like no one is listening or no one cares to even understand me.”\n","img":"tempimg.jpg\n","options":[{"option":"“What do you mean you’re in your own world? There are so many people around you! Are you criticizing how I raised you? I haven’t done anything wrong. I always listen to you! This conversation is OVER. Go to your room.”\n","result":"Once again, we’re both upset. I don’t take a chance to let you know how I’m feeling about things ever again. You assume everything is alright.\n","img":"tempimg.jpg\n"},{"option":"“Thank you for letting me know how you feel. Let’s talk about it. I want to hear you out.”\n","result":"We become more open with each other, and I feel less isolated since I know I can come to you for advice.\n","img":"tempimg.jpg\n"}]},{"title":"Scenario 6\n","text":"On your only off day of the month, I come up to you and ask if you want to hang out. Me : “Hey Dad, I saw this flyer about the Art and Soul festival and it seems really cool! Do you think we could go?”\n","img":"tempimg.jpg\n","options":[{"option":"“I’m sorry. Those kinds of scenes are too crowded and noisy for me, and I’m not that interested in it anyway. I need to lay low this weekend. Daddy is just too tired.”\n","result":"I feel as though you don’t want to spend time with me at all, because you decided not to do anything with me for the weekend. You could have suggested another idea to hang out and do something more mellow that we’re both interested in, but instead you shut it down. Now I feel unwanted and will decide not to come to you with ideas for spending time together.\n","img":"tempimg.jpg\n"},{"option":"“Okay, we can go! Maybe for just an hour? And then we can go somewhere less crowded, like grab ice cream?”\n","result":"I’m happy and will enjoy the weekend with you, in part because we both compromised. I will feel that you want to spend time with me and will continue to suggest fun activities for us to do together, because I know I’ll be heard.\n","img":"tempimg.jpg\n"}]},{"title":"Scenario 7\n","text":"I’m talking about my class schedule for the upcoming school year. I’m really confused about why I need to take trigonometry. I think schools should just get rid of math altogether and I should get to choose what I want to learn.\n","img":"tempimg.jpg\n","options":[{"option":"You interrupt me midway through me explanation and tell me: “The choice shouldn’t be yours because a lot of kids would not be ready to make that decision. It would be chaos!”\n","result":"I will want to end the conversation or an unnecessary argument will start, because you didn't let me complete me statement and yelled your opinion at me, rather than hearing me all the way through.\n","img":"tempimg.jpg\n"},{"option":"You listen to the explanation all the way through and relate to my feelings — maybe saying, “Math wasn’t my favorite either!” or “That’s how I felt about French.” And then you go on: “But structure is necessary. It’s good to be exposed to everything because you won’t know what you like until you try it.”\n","result":"I’ll try to understand your point because you fully listened to my critique and showed some understanding of by creating a connection. I will continue having conversations like this with you because I know I’ll be heard and can trust that my opinion will be respected.\n","img":"tempimg.jpg\n"}]}]}}
7 changes: 7 additions & 0 deletions pages/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
:key="`${scenario.title}-${index}`"
:scenario="scenario"
/>
<div role="credits" class="credits">
<strong>Credits: </strong> {{ articleData.credits }}
</div>
</article>
<ShareContainer />
<RelatedPostsContainer />
Expand Down Expand Up @@ -63,4 +66,8 @@ export default {
<style lang="scss" scoped>
@import "~@/css/vars";
@import "~@/css/base";
.credits{
font-size: 0.8rem;
}
</style>
21 changes: 10 additions & 11 deletions post.config.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
export default {
'baseURL': '/talking-to-your-teen',
'title': 'Do\'s and Don\'ts of Talking to Your Teen',
'baseURL': '/note-to-parents',
'title': 'Note To Parents: What *Not* To Say',
'author': '',
'publishDate': 'Dec. 1, 2019',
'publishDate': 'Jan. 10, 2020',
'location': 'Oakland, CA',
'description': `SEO friendly Description`,
'url': 'https://interactive.yr.media/talking-to-your-teen',
'featureImage': 'https://interactive.yr.media/college-app-guide/images/college-guide-featurex1875.jpg',
'featureImagePath': 'images/template-feature-image',
'featureImageDescription': 'Woman looking at kiosk.',
'featureImageCaption': '(Photo: Andersen Ross Photography Inc/Getty Images)',

'wpPostSlug': 'talking-to-your-teen',
'description': `Hey parents: if you think it's hard raising teenagers, try being one! We thought we'd make your jobs a little easier by sharing these tips on what to say — and NOT to say — when we come to you and want to talk.`,
'url': 'https://interactive.yr.media/note-to-parents',
'featureImage': 'https://interactive.yr.media/note-to-parents/images/note_to_parents-what_not_to_say-FEATUREx1875.jpg',
'featureImagePath': 'images/note_to_parents-what_not_to_say-FEATURE',
'featureImageDescription': 'I warned you before - Upset young father talking with his son.',
'featureImageCaption': '(Photo: Georgijevic/Getty Images)',
'wpPostSlug': 'note-to-parents',
'wpPostID': '62949',
// you might not need to change
'fbAppID': '73080818131',
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit b833142

Please sign in to comment.