184772251 back to top

.github/workflows/pull_request_template.md

@@ -0,0 +1,31 @@
+### [Pivotal Tracker Link][tracker]
+
+<!-- Complete this section filling in the link to a tracker story. -->
+[tracker]: https://www.pivotaltracker.com/story/show/your-story-id
+
+## What this PR does:
+<!-- Complete the following sentence: -->
+
+This pull request fixes|implements (pick one...) ______.
+
+### Include screenshots, videos, etc.
+
+#### Who authored this PR?
+<!-- Tag the names of any other contributors -->
+
+
+### How should this PR be tested?
+
+* Is there a deploy we can view?
+* What do the specs/features test?
+* Are there edge cases to watch out for?
+
+#### Are there any complications to deploying this?
+
+<!-- Data migrations, upgrades, etc. -->
+
+### Checklist:
+
+- [ ] Has this been deployed to a staging environment or reviewed by a customer?
+- [ ] Tag someone for code review (either a coach / team member)
+- [ ] I have renamed the branch to match PivotTracker's suggested one (necessary for BlueJay) (e.g. `michael/12345-add-new-feature` Any branch name will do as long as the story ID is there. You can use `git checkout -b [new-branch-name]`)

.gitignore

@@ -40,3 +40,5 @@
 
 # Ignore application configuration
 /config/application.yml
+
+/app/views/.DS_Store

Gemfile

@@ -35,6 +35,8 @@ gem 'bootstrap', '~> 5.0.0'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
 
+gem 'jquery-rails'
+
 # Use for Google Oauth 2.0
 gem 'omniauth-google-oauth2'
 

Gemfile.lock

@@ -158,6 +158,10 @@ GEM
       reline (>= 0.3.0)
     jbuilder (2.10.2)
       activesupport (>= 5.0.0)
+    jquery-rails (4.5.1)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
     jwt (2.3.0)
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
@@ -182,6 +186,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 +371,9 @@ GEM
     zeitwerk (2.5.4)
 
 PLATFORMS
+  arm64-darwin-20
+  arm64-darwin-21
+  arm64-darwin-22
   x86_64-darwin-20
   x86_64-darwin-21
   x86_64-linux
@@ -385,6 +394,7 @@ DEPENDENCIES
   figaro
   guard-rspec
   jbuilder (~> 2.10.1)
+  jquery-rails
   omniauth-google-oauth2
   omniauth-rails_csrf_protection
   pg

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>
 

app/assets/stylesheets/application.scss

@@ -1,4 +1,5 @@
 @import "bootstrap";
+
 /*
  * This is a manifest file that'll be compiled into application.css, which will include all the files
  * listed below.
@@ -14,6 +15,18 @@
  *= require_tree .
  *= require_self
  */
+body {
+  display: flex;
+  flex-direction: column;
+  min-height: 100vh;
+  margin: 0;
+  padding: 0;
+}
+
+main {
+  flex-grow: 1;
+}
+
 h1 {
   font-family: 'Poppins', sans-serif;
   font-style: normal;
@@ -22,16 +35,19 @@ h1 {
   line-height: 120%;
   color: #04021D;
 }
+
 h2 {
   font-family: 'Poppins', sans-serif;
   font-style: normal;
   font-weight: 600;
 }
+
 h3 {
   font-family: 'Poppins', sans-serif;
   font-style: normal;
   font-weight: 500;
 }
+
 p {
   font-family: 'Poppins', sans-serif;
   font-style: normal;
@@ -41,47 +57,161 @@ p {
   /* Text / Dark - 60% */
   color: #686777;
 }
+
+li {
+  text-align: match-parent;
+}
+
 button {
   font-family: 'Poppins', sans-serif;
   font-style: normal;
   font-weight: 500;
   font-size: 16px;
   line-height: 24px;
 }
+
 b {
   font-family: 'Poppins', sans-serif;
   font-style: normal;
   font-weight: bolder;
   color: #262626;
 }
+
 .btn-primary {
   background: #554AF0;
   border-radius: 12px;
-
 }
+
 .btn-primary:hover {
   background-color: #2112ee !important;
 }
+
 .btn-secondary {
   background: #eaeaea;
   border-radius: 12px;
   border-color: #eaeaea;
   color: #554AF0;
 }
+
 .form-text {
   font-family: 'Poppins', sans-serif;
   font-style: normal;
   font-weight: 400;
 }
+
 .form-label {
   font-family: 'Poppins', sans-serif;
   font-style: normal;
   font-weight: 500;
 }
-.name-display{
+
+.name-display {
   color: #554AF0;
 }
+
 .form-select {
   text-align-last: center;
 }
 
+#footer {
+  background-color: #003262;
+  box-sizing: border-box;
+  color: #ccc;
+  margin: 36px 0;
+  margin-bottom: 0;
+  font-size: 13px;
+  display: block;
+}
+
+.element-invisible {
+  position: absolute !important;
+  clip: rect(1px 1px 1px 1px);
+  clip: rect(1px, 1px, 1px, 1px);
+  overflow: hidden;
+  height: 1px;
+}
+
+.social-links ul li {
+  display: inline;
+  margin: 10px;
+  font-size: 18px;
+}
+
+.nav-pills>li+li {
+  margin-left: 2px;
+  float: left;
+}
+
+.nav>li {
+  position: relative;
+  display: block;
+}
+
+.nav-active {
+  color: white;
+}
+
+.nav-dull {
+  color: grey;
+}
+
+ul.nav,
+ul.navl li,
+ul.dropdown-menu,
+ul.dropdown-menu li {
+  list-style: none outside none !important;
+}
+
+.cry {
+  margin: 0;
+  padding: 0;
+  background: #003262;
+}
+
+#primary-nav>ul>li.menu-fields-menu-link {
+  position: static;
+}
+
+#primary-nav>ul>li.menu-fields-menu-link>.dropdown-menu {
+  left: 0;
+  padding: 0;
+  width: 100%;
+}
+
+#primary-nav>ul>li.menu-fields-menu-link>.dropdown-menu>li>.openberkeley-megamenu {
+  padding: 20px;
+  width: 100%;
+}
+
+.leaf a {
+  color: #999;
+  /* Set the generic color to a lighter gray */
+  transition: color 0.3s;
+  /* Add a transition effect for smooth color change */
+  text-decoration: none;
+  float: left;
+}
+
+.leaf a:hover {
+  color: #555;
+  /* Slightly darken the color when hovered over */
+}
+
+#footer-bottom ul li {
+  display: grid;
+}
+
+#footer-bottom {
+  margin-top: -15px;
+}
+
+.berkeley-color {
+  background-color: #003262;
+}
+
+.btn-back-to-top {
+  position: fixed;
+  bottom: 20px;
+  right: 20px;
+  display: none;
+}

app/controllers/courses_controller.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class CoursesController < ApplicationController
+    before_action :require_login
+
+    def index
+    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

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

app/javascript/application.js

@@ -5,4 +5,5 @@ import "controllers"
 //= require jquery_ujs
 //= require bootstrap-sprockets
 //= require turbolinks
-//= require_tree .
+//= require_tree .
+//= require backtotop.js

app/javascript/backtotop.js

@@ -0,0 +1,17 @@
+$(document).ready(function() {
+    $('.btn-back-to-top').hide();
+
+    // show or hide button depending on scroll position
+    $(window).scroll(function() {
+        if ($(this).scrollTop() > 10) {
+            $('.btn-back-to-top').fadeIn();
+        } else {
+            $('.btn-back-to-top').fadeOut();
+        }
+    });
+
+    $('.btn-back-to-top').click(function() {
+        $('body, html').animate({scrollTop: 0}, 400);
+        return false;
+    })
+})