adds volunteer opportunities page, updates about and faq pages #215

arshiamufti · 2016-06-05T20:23:25Z

addresses #102 and my bad for not making PR from feature branch :(

fboxwala · 2016-06-06T00:07:33Z

content/pages/volunteers.md

+Title: Volunteer Opportunities
+Category: pages
+Summary: Volunteer opportunities available with WiCS undergraduate.
+


You will need to add a status: hidden metadata line here, otherwise we break the navbar which is a continuing issue we should probably fix

Not really much to fix there. We can't change the default on that.

I believe that we do not want category or summary metadata here since those wouldn't ever get exposed anyways.

What does Category: pages do exactly? I only added because I saw other pages (mua.md, office-policy.md etc) had them as well. (I'll take them out now)

files that we add can be of different types (note that I'm kinda bs-ing this but I think this is how it works)

the events show up on the home page and under the events tab

pages are like top level thing that usually show up in our nav bar (calendar, contact us, policies, etc)

you want this to be a page because it serves the same kind of purpose as the 'contact us' page, but if you don't put status:hidden it shows up by default in the nav bar and we're having crowding problems there so the status:hidden makes it a page but a hidden page

oh, Elana said you don't even need the category or summary metadata - wanna get rid of those 2 lines?

O.o I meant to remove it but I guess I forgot. Will do.

fboxwala · 2016-07-07T15:20:21Z

@wics-uw/contributors SO okay, I have said this a few times to people individually but I want everyone to see and understand - do not ever git pull. When you edit the commit history and try to push your branch, git will suggest that you do a git pull and that if you do not git pull you will not be able to push your branch. This is not true. What you need to do usually is this:

git fetch upstream
git rebase upstream/master
git push -f origin HEAD

If you are not sure how to proceed then ping me or Melted or Evy or e# or post in #wics-sys and we will help you out.

When you git pull you get weird stuff happening like with Arshia's commit history right now.
(sorry to call you out like this Arshia but this is a perfect learning opportunity and I didn't want to pass it up.)

Moral of the story: when working on a public shared git repository, never ever ever git pull no matter how badly git wants you to.

arshiamufti · 2016-07-07T15:39:15Z

Imo it's useful to add this^ to the readme of the website too.

evykassirer · 2016-07-08T19:36:53Z

content/pages/volunteers.md

+* We’ll help you advertise it, book rooms for it, order food for it under our budget.
+* **Commitment:** 5-6 hours spread out over around 10 days.
+* Here are some examples of what you can do:
+    - Bring in a potential speaker to give a talk.


nit: can you start this list with lower case and not end in periods, like the list directly above it?

evykassirer · 2016-07-08T19:49:41Z

other than line length and the extra metadata, it's looking good to me!

evykassirer · 2016-07-10T22:47:17Z

this is almost done - when can you make the final changes by?

evykassirer · 2016-07-12T02:53:11Z

content/pages/about.md

@@ -41,4 +41,6 @@ but let us know if you would like to
 + Represent undergraduate interests on the Women in Computer Science Committee
 + Represent WiCS at student government meetings

+You can **sign up** or read more about our volunteer opportunities [here]({filename}/pages/volunteers.md).


this line is still too long

evykassirer · 2016-07-12T02:54:46Z

last two lines need to be shorter, otherwise all ready! so hyped to merge this!!!

arshiamufti · 2016-07-12T03:00:53Z

should be fixed now (i think)

evykassirer · 2016-07-12T03:10:03Z

content/pages/volunteers.md

+### Run an event with us!
+
+* **You** have to reach out to us [by
+* email](mailto:wics-ugrad@lists.uwaterloo.ca) with an event that you’d like to


the * at the beginning of this line breaks this (see https://wics-site-pr-215.herokuapp.com/volunteer-opportunities/) 😢

ackkkk my bad >:(

evykassirer · 2016-07-12T04:01:38Z

OKAY looks good!! can you squash the commits now?

arshiamufti · 2016-07-12T04:03:56Z

will do
(clicking on the heroku link prompts me for log in..?)

evykassirer · 2016-07-12T04:07:22Z

you were probably clicking on the wrong link (don't click deployed, click wics-site-pr-215)

try this one https://wics-site-pr-215.herokuapp.com/

arshiamufti · 2016-07-12T17:35:03Z

i squashed a thing did it work?

evykassirer · 2016-07-12T18:00:34Z

content/pages/faq.md

+read about our current volunteer opportunities
+[here]({filename}/pages/volunteers.md)!
+
+## Do you have resources to learn more about women in tech? ##


oh dang this shouldn't be here

oh i think i accidentally formatted some other stuff. Uh what should I do to fix it?

formatted what other stuff?

the problem I saw was that the resources question was duplicated - so to fix it you can just delete one of the duplicated paragraphs

evykassirer · 2016-07-12T18:01:40Z

yeah it's all one commit!

but you actually have something else to fix woops
so fix it and then squash and hopefully that's it

fixes tabbing, improves content in volunteer page fixes line width and formatting in bullet points fixes line length in about and faq pages fixes syntax error on volunteer page removes duplicate FAQ

evykassirer · 2016-07-13T20:25:17Z

content/pages/faq.md

@@ -8,7 +8,8 @@ out]({filename}/pages/contact.md) to us!

 ## What does &ldquo;women-only&rdquo; mean? ##

-Our women-only events are open to cis and trans women, and non-binary individuals.
+Our women-only events are open to cis and trans women, and non-binary


it's kinda weird that there were changes about non volunteer stuff in this diff, but I don't think it's a huge deal and it's nice to have the line lengths adjusted better

evykassirer · 2016-07-13T20:29:46Z

looks 💯 good to me!

🎉 🎆 🎈 ❗ 😃 💯 🚀

thanks for all your work on this @arshiamufti ❤️ twas a big task you took on

I'm so excited to have this information on our website

ehashman temporarily deployed to wics-site-pr-215 June 6, 2016 00:01 Inactive

fboxwala reviewed Jun 6, 2016
View reviewed changes

evykassirer mentioned this pull request Jul 7, 2016

add comment about NOT pulling into the readme #234

Closed

arshiamufti force-pushed the master branch from 8c91ba0 to 5ec45d8 Compare July 7, 2016 20:39

ehashman closed this Jul 8, 2016

ehashman reopened this Jul 8, 2016

ehashman temporarily deployed to wics-site-pr-215 July 8, 2016 19:32 Inactive

evykassirer reviewed Jul 8, 2016
View reviewed changes

ehashman temporarily deployed to wics-site-pr-215 July 11, 2016 14:07 Inactive

arshiamufti force-pushed the master branch from 5ec45d8 to 9767073 Compare July 12, 2016 02:14

ehashman temporarily deployed to wics-site-pr-215 July 12, 2016 02:52 Inactive

evykassirer reviewed Jul 12, 2016
View reviewed changes

ehashman temporarily deployed to wics-site-pr-215 July 12, 2016 03:05 Inactive

evykassirer reviewed Jul 12, 2016
View reviewed changes

ehashman temporarily deployed to wics-site-pr-215 July 12, 2016 03:57 Inactive

arshiamufti force-pushed the master branch from f086e13 to 4165417 Compare July 12, 2016 17:34

evykassirer reviewed Jul 12, 2016
View reviewed changes

ehashman temporarily deployed to wics-site-pr-215 July 12, 2016 18:03 Inactive

arshiamufti force-pushed the master branch from 4165417 to 4e92b0c Compare July 13, 2016 19:46

adds volunteer opportunities page, updates about and faq pages

cd881b1

fixes tabbing, improves content in volunteer page fixes line width and formatting in bullet points fixes line length in about and faq pages fixes syntax error on volunteer page removes duplicate FAQ

arshiamufti force-pushed the master branch from 4e92b0c to cd881b1 Compare July 13, 2016 19:47

evykassirer reviewed Jul 13, 2016
View reviewed changes

ehashman temporarily deployed to wics-site-pr-215 July 13, 2016 20:26 Inactive

evykassirer merged commit 38921ef into wics-uw:master Jul 13, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

adds volunteer opportunities page, updates about and faq pages #215

adds volunteer opportunities page, updates about and faq pages #215

arshiamufti commented Jun 5, 2016 •

edited

Loading

fboxwala Jun 6, 2016

ehashman Jun 7, 2016

arshiamufti Jul 7, 2016 •

edited

Loading

evykassirer Jul 7, 2016

evykassirer Jul 8, 2016

arshiamufti Jul 8, 2016

fboxwala commented Jul 7, 2016

arshiamufti commented Jul 7, 2016

evykassirer Jul 8, 2016

evykassirer commented Jul 8, 2016

evykassirer commented Jul 10, 2016

evykassirer Jul 12, 2016

evykassirer commented Jul 12, 2016

arshiamufti commented Jul 12, 2016

evykassirer Jul 12, 2016 •

edited

Loading

arshiamufti Jul 12, 2016

evykassirer commented Jul 12, 2016

arshiamufti commented Jul 12, 2016

evykassirer commented Jul 12, 2016 •

edited

Loading

arshiamufti commented Jul 12, 2016

evykassirer Jul 12, 2016

arshiamufti Jul 12, 2016

evykassirer Jul 12, 2016

evykassirer commented Jul 12, 2016

evykassirer Jul 13, 2016

evykassirer commented Jul 13, 2016

adds volunteer opportunities page, updates about and faq pages #215

adds volunteer opportunities page, updates about and faq pages #215

Conversation

arshiamufti commented Jun 5, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

arshiamufti Jul 7, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fboxwala commented Jul 7, 2016

arshiamufti commented Jul 7, 2016

Choose a reason for hiding this comment

evykassirer commented Jul 8, 2016

evykassirer commented Jul 10, 2016

Choose a reason for hiding this comment

evykassirer commented Jul 12, 2016

arshiamufti commented Jul 12, 2016

evykassirer Jul 12, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

evykassirer commented Jul 12, 2016

arshiamufti commented Jul 12, 2016

evykassirer commented Jul 12, 2016 • edited Loading

arshiamufti commented Jul 12, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

evykassirer commented Jul 12, 2016

Choose a reason for hiding this comment

evykassirer commented Jul 13, 2016

arshiamufti commented Jun 5, 2016 •

edited

Loading

arshiamufti Jul 7, 2016 •

edited

Loading

evykassirer Jul 12, 2016 •

edited

Loading

evykassirer commented Jul 12, 2016 •

edited

Loading