feat: Updates HackathonManager to 2.1

* Fixed issue on desktop

* Map overflow scroll

Signed-off-by: Peter Kos <[email protected]>

* Fix scroll issue

Signed-off-by: Peter Kos <[email protected]>

* Fixed toggle button; fits screen, sidebar width

Sidebar width is better
Toggle button fills height of navbar

Signed-off-by: Peter Kos <[email protected]>

* fix: Allows optional assets to be unset

* Fixes test

* feat: Redesigns OAuth2 portal (#404)

* feat: Redesigns OAuth2 portal

* fix: Some Hound issues

* Changes application verbiage

* Fixes ID issue

* Fixes table link and sign out button

* Peter's wishes

* fix: Fixes MyMLH branding in config (#412)

* feat(settings): Simplifies Config (#409)

* feat(settings): Simplifies Config

* Resolves Hound issues

* Update app/views/manage/configs/index.html.haml

Co-authored-by: Peter Kos <[email protected]>

* design: Increases the font-weight and reorganizes the page

* fix: Hound issues

Co-authored-by: Peter Kos <[email protected]>

* feat: Adds support for digital-only hackathons (#395)

* feat: Adds support for digital-only hackathons

* fix: Provides clarity for what is removed from digital hackathons

Co-authored-by: Peter Kos <[email protected]>

* feat: Adds GitHub Action for releases (#426)

* feat: Adds GitHub Action CI testing (#423)

* feat: Adds GitHub Action CI testing

* fix: Adds sudo

* refactor: Changes naming

* Removes travis.yml

* docs: Adds ruby version comment

* feat: Adds Legal Agreements object for dynamic agreements (#429)

* feat: Adds Legal Agreements object for dynamic agreements

* fix: Fixes several bugs with agreement error checking

* fix: Fixes several Hound issues

* fix: Fixes some more Hound issues

* Update app/views/application/_unaccepted_agreements_notice.html.haml

Co-authored-by: Peter Kos <[email protected]>

* fix: Fixes Peter's requests

* Fix agreement checkbox wrap with small names

Signed-off-by: Peter Kos <[email protected]>

* Fix straggling merge conflict error

Signed-off-by: Peter Kos <[email protected]>

* Removed agreements card

Signed-off-by: Peter Kos <[email protected]>

* Force validation for agreement on questionnaire pg

FRONTEND

Signed-off-by: Peter Kos <[email protected]>

Co-authored-by: Peter Kos <[email protected]>

* refactor: Changes hackathon_manager to HackathonManager (#417)

Co-authored-by: Peter Kos <[email protected]>

* feat: Adds GitLab VCS URL support (#415)

* feat: Adds GitLab VCS URL support

* fix: Corrects Bitbucket capitalization

* Update schema.rb

Removes events

* Update test/models/questionnaire_test.rb

Co-authored-by: Peter Kos <[email protected]>

* Update test/models/questionnaire_test.rb

Co-authored-by: Peter Kos <[email protected]>

Co-authored-by: Peter Kos <[email protected]>

* fix: Fixes pluralization of "Callback URL" (#421)

* fix: Fixes pluralization of "Callback URL"

* refactor: Adds "(s)" to Callback URLs

Co-authored-by: Peter Kos <[email protected]>

* refactor: Removes legal section from config (#440)

* refactor: Removes legal section from config

* refactor: Removes agreement asset from locals

* Removes additional PDF asset messages

Co-authored-by: Peter Kos <[email protected]>

* fix(map): changed map overflow from scroll to auto (#428)

changed the map div from overflow scroll to overflow auto so that the
scroll bars do not show up when the map is large enough to not need them

Co-authored-by: Peter Kos <[email protected]>

* build(deps-dev): Bump semantic-release from 17.2.1 to 17.2.3 (#435)

Bumps [semantic-release](https://github.com/semantic-release/semantic-release) from 17.2.1 to 17.2.3.
- [Release notes](https://github.com/semantic-release/semantic-release/releases)
- [Commits](semantic-release/semantic-release@v17.2.1...v17.2.3)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Peter Kos <[email protected]>

Co-authored-by: Peter Kos <[email protected]>
Co-authored-by: JeremyRudman <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Author: 4 people

.github/workflows/build.yml

@@ -0,0 +1,61 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Build - 2.6, 2.5
+
+on:
+  pull_request:
+    branches: [ master, "2.1" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: [2.6.6, 2.5.8]
+    env:
+      DATABASE_URL: mysql2://[email protected]:3800/myapp_test
+    steps:
+    - uses: actions/checkout@v2
+    - name: Start MySQL
+      uses: cbaudouinjr/[email protected]
+      with:
+        host port: 3800
+        container port: 3800
+        mysql timezone: America/New_York
+        mysql version: '5.7'
+        mysql database: 'myapp_test'
+    - name: Update and install packages
+      run: |
+          sudo apt-get update
+          sudo apt-get install -y libtool
+          sudo apt-get install -y libyaml-dev
+          sudo apt-get install -y build-essential
+          sudo apt-get install -y libxslt-dev
+          sudo apt-get install -y libxml2-dev
+          sudo apt-get install -y default-libmysqlclient-dev
+          sudo apt-get install -y default-mysql-client
+    - name: Set up Ruby
+      env:
+        ImageOS: ubuntu18
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+    # This version tag came with the Ruby build script built by GitHub. @v1 does not work.
+      uses: ruby/setup-ruby@21351ecc0a7c196081abca5dc55b08f085efe09a
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+    - name: Install gems
+      run: |
+          gem install pkg-config
+          bundle config build.nokogiri --use-system-libraries
+          bundle install
+    - name: Run migrations
+      run: |
+          bin/rails db:migrate
+    - name: Run tests
+      run: bundle exec rake

.github/workflows/release.yml

@@ -0,0 +1,22 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Publish New Release
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  publish:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js
+      uses: actions/setup-node@v1
+      with:
+        node-version: '14.x'
+    - run: yarn install
+    - run: yarn semantic-release

.gitignore

@@ -38,3 +38,6 @@
 
 # macOS
 .DS_Store
+
+# Redis
+dump.rdb

.travis.yml

@@ -18,6 +18,9 @@ $form-spacing-horizontal: 9px
   .section-title
     margin: 12px 0 5px
 
+#disclaimer.alert
+  border: 2px solid var(--alert--border)
+
 fieldset
   margin: 25px 0 0
   border: 1px solid #aaa
@@ -91,6 +94,10 @@ hr
   margin-left: -1 * $form-spacing-horizontal
   margin-right: -1 * $form-spacing-horizontal
 
+.actions
+  display: flex
+  justify-content: flex-end
+
 .input
   flex: 1 1 600px
   display: flex

app/assets/stylesheets/forms/_forms.sass

@@ -23,11 +23,19 @@ $account-nav-padding-vert: 15px
 .header-nav
   display: flex
   align-items: center
+  width: 100%
   .button
     margin-right: 10px
     &:last-child
       margin-right: 0
 
+.header-nav.start
+  justify-content: flex-start
+  flex-shrink: 2
+
+.header-nav.end
+  justify-content: flex-end
+  
 .account-nav
   @include css4
     border-bottom: 1px solid var(--account-nav--border-color)

app/assets/stylesheets/general/_header.sass

@@ -31,47 +31,6 @@ $grey-med: #999
 .CodeMirror
   font-size: 12px
 
-// .manage
-//   padding-left: 20px
-//   padding-right: 20px
-//   padding-top: 50px
-
-//   .container-half, .container-full
-//     max-width: none
-//     @media (max-width: 600px)
-//       padding-left: 0
-//       padding-right: 0
-//   .container-half
-//     display: inline-block
-//     width: 49.6% // weird issue with percentaces
-//     vertical-align: top
-//     @media (max-width: 600px)
-//       width: 100%
-//   .container-full
-//     display: inline-block
-//     width: 100%
-//     vertical-align: top
-//     margin: 0
-
-// #manageNav
-//   z-index: 1
-//   width: 100%
-//   background: $black
-//   color: $white
-//   padding: 16px 20px 6px
-//   p, a
-//     margin: 0 5px 10px
-//   p
-//     color: $primary
-//     display: inline-block
-//     margin-top: 0
-//     &:first-child
-//       margin-right: 10px
-//   a
-//     color: $white
-//     display: inline-block
-//     &:hover
-//       color: darken($grey-light, 5%)
 .center
   text-align: center
 
@@ -96,6 +55,8 @@ $grey-med: #999
 
 #map
   text-align: center
+  overflow: auto
+  width: 100%
 
 .dashboard-container-title
   border-bottom: 3px solid #e5e5e5
@@ -164,16 +125,17 @@ $grey-med: #999
     display: inherit
 
 .navbar-mobile-toggle--active
-  color: black !important
-  background: #eee
+  background: #eeeeee
+  .fa
+    color: black !important
 
 .sidebar-mobile
   display: block !important
   bottom: auto
 
-
 .sidebar-mobile .sidebar-sticky
-  height: auto
+  height: calc(100vh - 2.25rem)
+  overflow: scroll
 
 
 /*

app/assets/stylesheets/manage.sass

@@ -1,6 +1,3 @@
-body {
-  font-size: 0.875rem;
-}
 
 /*
  * Sidebar
@@ -12,14 +9,14 @@ body {
   bottom: 0;
   left: 0;
   z-index: 5; /* Behind the navbar */
-  padding: 48px 0 0; /* Height of navbar */
+  padding: 2.25rem 0 0; /* Height of navbar */
   box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.1);
 }
 
 .sidebar-sticky {
   position: relative;
   top: 0;
-  height: calc(100vh - 48px);
+  height: calc(100vh - 2.25rem);
   padding-top: 0.5rem;
   overflow-x: hidden;
   overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
@@ -83,11 +80,11 @@ body {
 .navbar-brand {
   padding-top: 0.75rem;
   padding-bottom: 0.75rem;
+  text-overflow: ellipsis;
+  overflow: hidden;
   font-size: 1rem;
   background-color: rgba(0, 0, 0, 0.25);
   box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.25);
-  text-overflow: ellipsis;
-  overflow: hidden;
 }
 
 .navbar .form-control {

app/assets/stylesheets/manage/dashboard.css

@@ -0,0 +1,66 @@
+class Manage::AgreementsController < Manage::ApplicationController
+  before_action :require_director
+  before_action :set_agreement, only: [:show, :edit, :update, :destroy]
+
+  respond_to :html, :json
+
+  # GET /agreements
+  def index
+    @agreements = Agreement.all
+  end
+
+  # GET /agreements/new
+  def new
+    @agreement = Agreement.new
+  end
+
+  # GET /agreements/1/edit
+  def edit
+  end
+
+  # POST /agreements
+  def create
+    if !agreement_params['agreement_url'].start_with?('http://', 'https://')
+      flash[:alert] = "Agreement URL must start with http:// or https://"
+      redirect_to new_manage_agreement_path
+    else
+      @agreement = Agreement.new(agreement_params)
+      @agreement.save
+      flash[:notice] = "#{@agreement.name} was successfully created."
+      redirect_to manage_agreements_path
+    end
+  end
+
+  # PATCH/PUT /agreements/1
+  def update
+    if !agreement_params['agreement_url'].nil? && !agreement_params['agreement_url'].start_with?('http://', 'https://')
+      flash[:alert] = "Agreement URL must start with http:// or https://"
+      redirect_to edit_manage_agreement_url
+    else
+      @agreement.update_attributes(agreement_params)
+      flash[:notice] = nil
+      redirect_to manage_agreements_path
+    end
+  end
+
+  # DELETE /agreements/1
+  def destroy
+    @agreement.destroy
+    flash[:notice] = 'Agreement was successfully destroyed.'
+    respond_with(:manage, @agreement, location: manage_agreements_path)
+  end
+
+  private
+
+  # Use callbacks to share common setup or constraints between actions.
+  def set_agreement
+    @agreement = Agreement.find(params[:id])
+  end
+
+  # Only allow a trusted parameter "white list" through.
+  def agreement_params
+    params.require(:agreement).permit(
+      :name, :agreement_url
+    )
+  end
+end

app/controllers/manage/agreements_controller.rb

@@ -12,6 +12,7 @@ def datatable
   end
 
   def show
+    @agreements = Agreement.all
     respond_with(:manage, @questionnaire)
   end