saasbook · EthanqX · Feb 18, 2023 · Feb 18, 2023 · Feb 18, 2023 · Feb 18, 2023
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -40,3 +40,8 @@
 
 # Ignore application configuration
 /config/application.yml
+
+# Ignore all the DS_Stores
+.DS_Store
+app/views/.DS_Store
+app/.DS_Store
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -182,6 +182,8 @@ GEM
     multi_xml (0.6.0)
     nenv (0.3.0)
     nio4r (2.5.8)
+    nokogiri (1.13.1-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.13.1-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.13.1-x86_64-linux)
@@ -365,6 +367,8 @@ GEM
     zeitwerk (2.5.4)
 
 PLATFORMS
+  arm64-darwin-20
+  arm64-darwin-21
   x86_64-darwin-20
   x86_64-darwin-21
   x86_64-linux

diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
-[![Bluejay Dashboard](https://img.shields.io/badge/Bluejay-Dashboard_)](http://dashboard.bluejay.governify.io/dashboard/script/dashboardLoader.js?dashboardURL=https://reporter.bluejay.governify.io/api/v4/dashboards/tpa-CS169L-22-GH-ryan-garay89_berkeley-reentry-student-program/main)
+[![Bluejay Dashboard](https://img.shields.io/badge/Bluejay-Dashboard_04-blue.svg)](http://dashboard.bluejay.governify.io/dashboard/script/dashboardLoader.js?dashboardURL=https://reporter.bluejay.governify.io/api/v4/dashboards/tpa-CS169L-23-GH-cs169_berkeley-reentry-student-program/main)
 
-![build](https://github.com/ryan-garay89/berkeley-reentry-student-program/actions/workflows/main.yml/badge.svg)
+![build](https://github.com/cs169/berkeley-reentry-student-program/actions/workflows/main.yml/badge.svg)
 
-<a href="https://codeclimate.com/github/ryan-garay89/berkeley-reentry-student-program/test_coverage"><img src="https://api.codeclimate.com/v1/badges/edec3c54a12ea7c8914c/test_coverage" /></a>
+<a href="https://codeclimate.com/github/cs169/berkeley-reentry-student-program/test_coverage"><img src="https://api.codeclimate.com/v1/badges/c34db83045f2d3756e29/test_coverage" /></a>
 
-<a href="https://codeclimate.com/github/ryan-garay89/berkeley-reentry-student-program/maintainability"><img src="https://api.codeclimate.com/v1/badges/edec3c54a12ea7c8914c/maintainability" /></a>
+<a href="https://codeclimate.com/github/cs169/berkeley-reentry-student-program/maintainability"><img src="https://api.codeclimate.com/v1/badges/c34db83045f2d3756e29/maintainability" /></a>
 
 <a href="https://www.pivotaltracker.com/n/projects/2553425"><img src="https://user-images.githubusercontent.com/67244883/154180887-f803124e-0156-4322-899d-ba475139d60d.png" /></a>
 

diff --git a/app/.DS_Store b/app/.DS_Store
diff --git a/app/controllers/scholarships_controller.rb b/app/controllers/scholarships_controller.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class ScholarshipsController < ApplicationController
+  before_action :require_login
+
+  def index
+    # redirect_to "https://reentry.berkeley.edu/services/scholarships"
+  end
+
+  def require_login
+    unless session.key?(:current_user_id) && Student.find_by_id(session[:current_user_id])
+      redirect_to root_path, flash: { error: "Please log in first!" }
+    end
+  end
+end
diff --git a/app/views/.DS_Store b/app/views/.DS_Store
diff --git a/app/views/pages/index.html.erb b/app/views/pages/index.html.erb
@@ -22,6 +22,7 @@
           <p class="lead mb-4">Check-in using this application, find and make appointments with staff, find news and updates &#x1F4AB</p>
           <%= link_to "Check-in to Berkeley </br> Reentry Student Center".html_safe, checkin_path, class: "btn btn-primary mt-1 btn-lg px-4 gap-3" %>
           <%= link_to "Make an Appointment </br> With a Counselor".html_safe, appointments_path, class: "btn btn-primary mt-1 btn-lg px-4 gap-3" %>
+          <%= link_to "Re-entry Scholarships" .html_safe, scholarships_path, class: "btn btn-primary mt-1 btn-lg px-4 gap-3"%>
         </div>
         <%= link_to "Edit Profile Information".html_safe, user_profile_edit_path(:edit_profile => true), class: "btn btn-secondary btn-lg px-4 my-4 gap-3" %>
       <% end %>

diff --git a/app/views/scholarships/index.html.erb b/app/views/scholarships/index.html.erb
@@ -0,0 +1,108 @@
+<div class="container">
+<br></br><h1 class="display-5 fw-bold" style="color:#4169E1" align = "center">Scholarships &amp; Awards</h1><br></br>
+  <div class="row">
+    <h3 class="col-6-sm">Scholarship Opportunities</h3>
+    <p>The Re-entry Student Program offers two scholarships: <strong>Crankstart</strong> for newly admitted students, 
+       and Osher for continuing students.  Applications for these scholarships are open during each fall term 
+       and typically have deadlines around the end of September/early October.</p>
+    <p class="fw-bold">Fall 2023 Crankstart & Osher Scholarships:  TBA</p>
+  </div>
+<br></br>
+  <div class="row">
+    <div class="card">
+      <h4 class="card-header">Crankstart Re-entry Scholarship</h4>
+      <div class="card-body">
+        <div class="card-text">
+          <p>The Crankstart Re-entry Scholarship provides up to $5,000 awards to ten first-semester 
+             (if you began taking courses during summer, you may still apply) undergraduate re-entry students 
+             who demonstrate the potential and capacity to positively contribute to society beyond Berkeley.
+          </p>
+          <p>Applicants must meet the following criteria:
+            <ul>
+              <li>UC Berkeley re-entry Students having experienced a cumulative gap in their education of five or more years</li>
+              <li>Undergraduates pursuing their first baccalaureate degrees</li>
+              <li>Anticipate workforce participation for a significant period of time subsequent to graduation</li>
+              <li>All applicants must have filed a FAFSA and be eligible to receive federal aid, Dream aid included</li>
+              <li>Hold a minimum cumulative grade point average of 3.0 from all colleges attended</li>
+            </ul>
+          </p>
+          <p>Your application must include: 
+            <ol>
+              <li>A personal essay of no more than 3 pages (single or double-spaced accepted) 
+                  describing what it means to be a re-entry student, highlighting your personal achievements 
+                  through your work, school, family or community service in spite of obstacles and explain 
+                  how your leadership and perseverance made a difference. Please address the interruption to 
+                  your college academics and your plans for employment upon completion of all your schooling 
+                  as part of the essay. At the top of each page of your essay, print your full legal name.</li>
+              <li>Copies of transcripts from all colleges attended (unofficial accepted)</li>
+              <li>No more than 2 letters of recommendation* (can be from, for example, a former instructor, 
+                  supervisor or mentor who can speak to your ability to apply your Berkeley education to future 
+                  contributions to society)</li>
+            </ol>
+          </p>
+          <%= link_to "Apply for the Crankstart Re-entry Scholarship here!",
+              "https://docs.google.com/forms/d/e/1FAIpQLSf_LvWvao0BBYmTwWMgqtcBgt3b6zavP9ZDVbva9PtYjqKWVg/viewform?usp=sf_link", 
+              class: "btn btn-outline-info",
+              target: "_blank"%>
+        </div>
+      </div>
+    </div>
+  </div>
+  <br></br>
+  <div class="row">
+    <div class="card">
+      <h4 class="card-header">Osher Re-entry Scholarship</h4>
+      <div class="card-body">
+        <div class="card-text">
+          <p>The Osher Re-entry Scholarship Program awards several continuing (completed at least one semester at Berkeley) 
+          undergraduate re-entry students who demonstrate the potential and capacity to positively contribute to society 
+          beyond Berkeley with awards up to $5,000 for the academic year.
+          </p>
+          <p>Applicants must meet the following criteria:
+            <ul>
+              <li>Must be an undergraduate re-entry student at UC Berkeley who has experienced a considerable gap in the pursuit of 
+                  her or his education and who can look forward to significant years of workforce participation</li>
+              <li>Must have completed at least one regular term (fall or spring) at UC Berkeley</li>
+              <li>Must have a minimum cumulative grade point average of 3.0 from all colleges attended</li>
+              <li>All applicants must have completed a FAFSA and be eligible to receive financial aid, Dream aid included</li>
+            </ul>
+          </p>
+          <p>Your application must include: 
+            <ol>
+              <li>A personal essay of no more than 3 pages (single or double-spaced accepted) describing what it means to be 
+                a re-entry student, highlighting your personal achievements through your work, school, family or community service 
+                in spite of obstacles and explain how your leadership and perseverance made a difference. Please address the 
+                interruption to your college academics and your plans for employment upon completion of all your schooling as part 
+                of the essay. At the top of each page of your essay, print your full legal name.</li>
+              <li>Copies of transcripts from all colleges attended (unofficial accepted)</li>
+              <li>No more than 2 letters of recommendation* (can be from, for example, a former instructor, supervisor or mentor 
+                  who can speak to your ability to apply your Berkeley education to future contributions to society)</li>
+            </ol>
+          </p>
+          <%= link_to "Apply for the Osher Re-entry Scholarship here!",
+              "https://docs.google.com/forms/d/e/1FAIpQLSc7cIvvPNFeG-Fe7sE-aOaL4fieL74PjBGAVFPDHL-ddfeTaA/viewform?usp=sf_link", 
+              class: "btn btn-outline-info",
+              target: "_blank"%>
+        </div>
+      </div>
+    </div>
+  </div>
+  <hr class="col mt-5 mx-auto"/>
+  <h3 class="col-6-sm">Leadership Award</h3>
+  <div class="row">
+    <p>The Re-entry Student Program Leadership Award fund is designed to provide support to Re-entry Student Program 
+       peer advisors, advocates and interns. Student leaders will propose a service leadership project that will not only 
+       enhance your leadership in our campus community, but also advance our commitment of better meeting the current needs 
+       of re-entry students at Berkeley.
+    </p>
+    <p class="font-italic">Note: these funds are intended to support you and your educational expenses—this is not a program 
+      budget for your project.</p>
+  </div>
+
+
+</div>
+<hr class="col mt-5 mx-auto"/>
+<div class="col-lg-6 mt-5 mx-auto" align="center">
+  <%= link_to "Back", root_path, method: :get, class:"btn btn-secondary btn-lg my-4" %>
+</div>
+</div>
diff --git a/config/routes.rb b/config/routes.rb
@@ -10,6 +10,8 @@
   post "checkin", to: "checkin#create"
   #appointments page
   get 'appointments', to: "appointments#advisors"
+  # scholarships page
+  get 'scholarships', to: "scholarships#index"
   # the admin dashboard
   get 'admins', to: 'admins#index'
   get 'view_checkin_records', to: 'admins#view_checkin_records'

diff --git a/db/schema.rb b/db/schema.rb
diff --git a/features/scholarship.feature b/features/scholarship.feature
@@ -0,0 +1,20 @@
+Feature: view scholarship information
+
+    As a logged-in student, I want to be able to go to the scholarships page,
+    so that I can view scholarship information
+
+Background: logged in student, on landing page
+    Given I logged in as a "Student"
+    And I am on the landing page
+
+Scenario: student should be able to see a link to scholarship information
+    Then I should got "Re-entry Scholarships"
+
+Scenario: student should be redirected to the scholarships page after clicking "Re-entry Scholarships"
+    When I click "Re-entry Scholarships"
+    Then I should be on the scholarships page
+
+Scenario: student should be able to go back to the landing page from scholarships page
+    When I click "Re-entry Scholarships"
+    And I click "Back"
+    Then I should be on the landing page
diff --git a/features/support/paths.rb b/features/support/paths.rb
@@ -20,6 +20,7 @@ def path_to(page_name)
     when /^the checkin page$/ then checkin_path
     when /^the confirm page$/ then login_confirm_path
     when /^the admin dashboard$/ then admins_path
+    when /^the scholarships page$/ then scholarships_path
 
     # Add more mappings here.
     # Here is an example that pulls values out of the Regexp:

diff --git a/info.yml b/info.yml
@@ -1,34 +1,28 @@
 project:
   name: 'berkeley-reentry-student-program'
-  owner: 'Reentry Student Program'
-  teamId: 'berkeley-reentry-student-program'
+  owner: 'CS169L-23'
+  teamId: '04'
   identities:
     pivotal: 'https://www.pivotaltracker.com/n/projects/2553425'
-    heroku: 'https://berkeley-reentry.herokuapp.com/'
-    codeclimate: 'https://codeclimate.com/github/ryan-garay89/berkeley-reentry-student-program'
+    heroku: 'https://sp23-04-reentry-project.herokuapp.com'
+    codeclimate: 'https://codeclimate.com/github/cs169/berkeley-reentry-student-program'
   members:
     member1:
-      name: 'Ryan'
-      surname: 'Garay'
-      githubUsername: 'ryan-garay89'  
+      name: 'Keagan'
+      surname: 'Wilson'
+      githubUsername: 'gekerd'  
+      pivotalUsername: 'keaganwilson'
+      herokuEmail: 'keaganwilson@berkeley.edu'
     member2:
-      name: 'Elizabeth'
-      surname: 'Herrmann'
-      githubUsername: 'eherrmann2023'  
+      name: 'Max'
+      surname: 'Yang'
+      githubUsername: 'MaxYang24'  
     member3:
-      name: 'Erin'
-      surname: 'Kraemer'
-      githubUsername: 'erinkraemer'  
+      name: 'Siddharth'
+      surname: 'Manchkanti'
+      githubUsername: 'smanchkanti'  
     member4:
-      name: 'Michelle'
-      surname: 'Kroll'
-      githubUsername: 'michellekroll'  
-    member5:
-      name: 'Kin Long'
-      surname: 'Lo'
-      githubUsername: 'KLongLo'  
-    member6:
-      name: 'Haolan'
-      surname: 'Mo'
-      githubUsername: 'HaolanMo'  
+      name: 'Ethan'
+      surname: 'Xu'
+      githubUsername: 'EthanqX'  
 
diff --git a/spec/factories/scholarships.rb b/spec/factories/scholarships.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+    factory :scholarship do
+      Time.zone = 'Pacific Time (US & Canada)'
+      time { Time.now }
+      association :student, factory: :student
+    end
+  end