Merge pull request #73 from shescoding/MiscFixes

Misc fixes

app/assets/stylesheets/contact.css.scss → app/assets/stylesheets/connect.css.scss

@@ -1,18 +1,18 @@
-// contact page
+// connect page
 $black: #1E2028;
 $green: #83C057;
 
-.contact-section-title {
+.connect-section-title {
     text-align: center;
     font-size: 36px;
 }
 
-.contact-section-body {
+.connect-section-body {
     font-size: 18px;
     padding-top: 30px;
 }
 
-.contact-button{
+.connect-button{
   font-family: ArcherBook;
 
 }

app/assets/stylesheets/resources.css.scss

@@ -157,7 +157,7 @@ $tag_grey: #808080;
           width: 35px;
           border: transparent;
           background-color: transparent;
-          background-image: asset_url('Heart-Asset-Yellow-outlined-17.png');
+          background-image: asset_url('resources/heart_yellow_outline.png');
           background-size: 15px;
           background-repeat: no-repeat;
           background-position: left;
@@ -168,7 +168,7 @@ $tag_grey: #808080;
         }
 
         .filled-heart {
-          background-image: asset_url('Heart-Asset-Yellow-16.png');
+          background-image: asset_url('resources/heart_yellow_full.png');
         }
 
         .heart:hover, .heart:focus {

app/assets/stylesheets/welcome.css.scss → app/assets/stylesheets/static_pages.css.scss

@@ -1,4 +1,4 @@
-// Place all the styles related to the welcome controller here.
+// Place all the styles related to the static_pages controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
 

app/controllers/static_pages_controller.rb

@@ -0,0 +1,11 @@
+class StaticPagesController < ApplicationController
+  def front_page
+  end
+
+  def about  
+  end
+
+  def how
+  end
+
+end

app/helpers/static_pages_helper.rb

@@ -0,0 +1,2 @@
+module StaticPagesHelper
+end

app/views/layouts/_footer.html.erb

@@ -8,11 +8,11 @@
       </ul>
 
       <ul class="ui-ul list-inline pull-right">
-        <li class="code-logo"><%= link_to image_tag("Code_Logo_white.png", size: "60x25"), "http://codedocumentary.com", target: "_blank" %></li>
+        <li class="code-logo"><%= link_to image_tag("footer/code_logo_footer.png", size: "60x25"), "http://codedocumentary.com", target: "_blank" %></li>
         <!-- Add some space -->
-        <li><%= link_to image_tag("github-16.png"), "https://github.com/shescoding", target: "_blank" %></li>
-        <li><%= link_to image_tag("assests-11.png"), "https://www.facebook.com/shescoding", target: "_blank" %></li>
-        <li><%= link_to image_tag("assests-12.png"), "https://twitter.com/shescoding", target: "_blank" %></li>
+        <li><%= link_to image_tag("footer/github.png"), "https://github.com/shescoding", target: "_blank" %></li>
+        <li><%= link_to image_tag("footer/facebook.png"), "https://www.facebook.com/shescoding", target: "_blank" %></li>
+        <li><%= link_to image_tag("footer/twitter.png"), "https://twitter.com/shescoding", target: "_blank" %></li>
       </ul>
     </div>
   </div>

app/views/layouts/_navbar.html.erb

@@ -9,7 +9,7 @@
         <span class="icon-bar"></span>
       </button>
       <a class="navbar-brand" href="/">
-        <%= image_tag('Logo-navbar.png') %>
+        <%= image_tag('navbar/logo_navbar_small.png') %>
       </a>
     </div>
     <div class="collapse navbar-collapse" id="navbar-links">
@@ -32,10 +32,10 @@
           <li><%= link_to "Team", "/team" %></li>
         <% end %>
 
-        <% if page == "Contact" %>
-          <li class="active"><%= link_to "Connect", "/contact" %></li>
+        <% if page == "Connect" %>
+          <li class="active"><%= link_to "Connect", "/connect" %></li>
         <% else %>
-          <li><%= link_to "Connect", "/contact" %></li>
+          <li><%= link_to "Connect", "/connect" %></li>
         <% end %>
       </ul>
     </div>

app/views/welcome/about.html.erb → app/views/static_pages/about.html.erb

@@ -1,7 +1,7 @@
 <%= render "layouts/navbar", page: "About" %>
 
 <div class="page">
-    <%= image_tag("about.png") %>
+    <%= image_tag("static_pages/about.png") %>
 </div>
 
 <div class='container'>
@@ -19,11 +19,11 @@
     </p>
     <br>
     <p>
-      She’s Coding is an open-source project developed in cooperation with the documentary film CODE: Debugging the Gender Gap [link]. She’s Coding provides education, resources, and actionable guidelines for anyone who wants to help bridge the gender gap in the field of computer science. Whether you’re a woman currently working in tech, a girl interested in learning to code, a male ally for women in computer science, or a company trying to find ways to increase diversity, you’ve come to the right place! We are continuously working on enhancing and improving our content – check back regularly and see what’s new!
+      She’s Coding is an open-source project developed in cooperation with the documentary film <%= link_to "CODE: Debugging the Gender Gap", "http://codedocumentary.com/", target: "_blank" %>. She’s Coding provides education, resources, and actionable guidelines for anyone who wants to help bridge the gender gap in the field of computer science. Whether you’re a woman currently working in tech, a girl interested in learning to code, a male ally for women in computer science, or a company trying to find ways to increase diversity, you’ve come to the right place! We are continuously working on enhancing and improving our content – check back regularly and see what’s new!
     </p>
     <br>
     <p>
-      She’s Coding was inspired by CODE: Debugging the Gender Gap documentary filmmakers, and was initiated by a team of engineers, marketers, and designers at JOLT Labs in Seattle, WA. JOLT Labs cares deeply about diversifying the workplace, not just because it’s the right thing to do…but because it’s the smart thing to do. Diverse teams produce better results!
+      She’s Coding was inspired by CODE: Debugging the Gender Gap documentary filmmakers, and was initiated by a team of engineers, marketers, and designers at <%= link_to "JOLT Labs", "http://joltlabs.com", target: "_blank" %> in Seattle, WA. JOLT Labs cares deeply about diversifying the workplace, not just because it’s the right thing to do…but because it’s the smart thing to do. Diverse teams produce better results!
     </p>
 
   </div>

app/views/welcome/contact.html.erb → app/views/static_pages/connect.html.erb

@@ -1,20 +1,20 @@
-<%= render "layouts/navbar", page: "Contact" %>
+<%= render "layouts/navbar", page: "Connect" %>
 
 <div class="page">
-    <%= image_tag("contact.png") %>
+    <%= image_tag("static_pages/connect.png") %>
 </div>
 
     <div class="container page">
-        <div class="contact-section-title">
+        <div class="connect-section-title">
           We would love to hear from you
         </div>
         <br>
-        <div class="contact-section-body">
+        <div class="connect-section-body">
           <p>
           	Whether you would like to contribute your skills and time to the development of She’s Coding, give us your feedback on the project, or tell us about an amazing resource we should include on the site, don’t hesitate to get in touch!			
           </p>
           <br>
-          <p>Contact us via email: <%= mail_to 'nathalie@shescoding.org', " She's Coding" %></p>
+          <p>Contact us via email: <%= mail_to 'info@shescoding.org', " She's Coding" %></p>
         </div>
     </div>
 

app/views/welcome/index.html.erb → app/views/static_pages/front_page.html.erb

@@ -16,21 +16,21 @@
         <div class="col-sm-4 ui-persona-col">
             <div class='ui-rectangle-box'>
                 <div class='ui-rectangle-content'>
-                    <%= link_to image_tag("Front-Page_She.png", class: "persona-img"), "resources/tags/women" %>
+                    <%= link_to image_tag("static_pages/front_page_she.png", class: "persona-img"), "resources/tags/women" %>
                 </div>
             </div>
         </div>
         <div class="col-sm-4 ui-persona-col">
             <div class='ui-rectangle-box'>
                 <div class='ui-rectangle-content'>
-                    <%= link_to image_tag("Front-Page_Company.png", class: "persona-img"), "resources/tags/companies" %>
+                    <%= link_to image_tag("static_pages/front_page_company.png", class: "persona-img"), "resources/tags/companies" %>
                 </div>
             </div>
         </div>
         <div class="col-sm-4 ui-persona-col">
             <div class='ui-rectangle-box'>
                 <div class='ui-rectangle-content'>
-                    <%= link_to image_tag("Front-Page_Supporter.png", class: "persona-img"), "resources/tags/supporters" %>
+                    <%= link_to image_tag("static_pages/front_page_supporter.png", class: "persona-img"), "resources/tags/supporters" %>
                 </div>
             </div>
         </div>

app/views/welcome/how.html.erb → app/views/static_pages/how.html.erb

@@ -1,7 +1,7 @@
 <%= render "layouts/navbar", page: "About" %>
 
 <div class="page">
-    <%= image_tag("how.png") %>
+    <%= image_tag("static_pages/how.png") %>
 </div>
 
 <div class='container'>
@@ -19,7 +19,7 @@
     </p>
     <br>
     <p>
-      Want to learn more or be a part of the she’s coding team? <%= link_to "Contact us", "/contact" %>, or check out our project management systems: <%= link_to "Github", "https://github.com/shescoding", target: "_blank" %>, <%= link_to "Google Group", "https://groups.google.com/forum/#!forum/shescoding", target: "_blank" %>, <%= link_to "Trello", "https://trello.com/shescoding", target: "_blank" %>, <%= link_to "Slack", "https://shescoding.slack.com/", target: "_blank" %>.
+      Want to learn more or be a part of the she’s coding team? <%= link_to "Connect with us", "/connect" %>, or check out our project management systems: <%= link_to "Github", "https://github.com/shescoding", target: "_blank" %>, <%= link_to "Google Group", "https://groups.google.com/forum/#!forum/shescoding", target: "_blank" %>, <%= link_to "Trello", "https://trello.com/shescoding", target: "_blank" %>, <%= link_to "Slack", "https://shescoding.slack.com/", target: "_blank" %>.
     </p>
   </div>
   <div class='how-section-title'>

app/views/welcome/team.html.erb → app/views/static_pages/team.html.erb

@@ -1,7 +1,7 @@
 <%= render "layouts/navbar", page: "Team" %>
 
 <div class="page">
-    <%= image_tag("team.png", class: "team-page-image") %>
+    <%= image_tag("static_pages/team.png", class: "team-page-image") %>
 </div>
 
 <div class="team-section">

config/routes.rb

@@ -1,24 +1,21 @@
 Rails.application.routes.draw do
 
-  get 'welcome/index'
-
-  resources :guides
-  resources :resources
-
-
-  get 'about',            to: "welcome#about"
-  get 'how',              to: "welcome#how"
+  # You can have the root of your site routed with "root"
+  root 'static_pages#front_page'
 
-  get 'resources/tags/:tag', to: 'resources#index', as: :tag
-  post 'resources/:id/like', to: 'resources#like', as: :like
+  resources :resources,       only: [:index]
+  get 'resources/tags/:tag',  to: 'resources#index',  as: :tag
+  post 'resources/:id/like',  to: 'resources#like',   as: :like
+
+  # Static pages
+  get 'about',            to: "static_pages#about"
+  get 'how',              to: "static_pages#how"
+  get 'team',             to: 'static_pages#team'
+  get 'connect',          to: 'static_pages#connect'
 
   # The priority is based upon order of creation: first created -> highest priority.
   # See how all your routes lay out with "rake routes".
 
-  # You can have the root of your site routed with "root"
-  root 'welcome#index'
-  get 'team'            => 'welcome#team',      as: :team_page
-  get 'contact'         => 'welcome#contact',   as: :contact_page
   # Example of regular route:
   #   get 'products/:id' => 'catalog#view'
 

db/seeds.rb

@@ -737,7 +737,7 @@
 	source: 'Ars Technica', public: true)
 res.categories << Category.find_or_create_by(name: 'Gender Discrimination')
 res.categories << Category.find_or_create_by(name: 'Fair Pay')
-res.categories << Category.find_or_create_by(name: 'Retaining women')
+res.categories << Category.find_or_create_by(name: 'Retaining Women')
 res.categories << Category.find_or_create_by(name: 'Career Advancement')
 res.categories << Category.find_or_create_by(name: 'Unconscious Bias')
 res.date = DateTime.parse('2015-4-5')