Revert "Revert "Merge branch 'main' into development""

This reverts commit 421b3b8.

.github/workflows/workflow.yml

@@ -0,0 +1,14 @@
+name: Notify users based on issue labels
+
+on:
+  issues:
+      types: [labeled]
+
+jobs:
+  notify:
+    runs-on: ubuntu-latest
+    steps:
+        - uses: jenschelkopf/[email protected]
+          with:
+             recipients: |
+                  feature=@ThomBurns

Gemfile

@@ -122,6 +122,5 @@ gem 'rack-mini-profiler'
 gem 'stackprof'
 
 gem 'intercom', '~> 3.9.0'
-gem 'newrelic_rpm'
 
 gem 'open3'

Gemfile.lock

@@ -635,7 +635,6 @@ DEPENDENCIES
   memory_profiler
   meta_request
   mysql2
-  newrelic_rpm
   nokogiri
   oink
   omniauth (~> 1.9.2)

README.md

@@ -1,3 +1,5 @@
+[![Coverage Status](https://coveralls.io/repos/github/benwbrum/fromthepage/badge.svg?branch=master)](https://coveralls.io/github/benwbrum/fromthepage?branch=master) [![Build Status](https://travis-ci.com/benwbrum/fromthepage.svg?branch=main)](https://travis-ci.com/benwbrum/fromthepage)
+
 FromThePage is an open-source tool that allows volunteers to collaborate to transcribe handwritten documents.
 
 ### Features

app/assets/stylesheets/sections/home.scss

@@ -19,18 +19,32 @@ a.button.big.learn-more {
   background: $footerBg image-url('static/home/header.jpg') no-repeat center bottom;
   background-size: cover;
   .wrapper {
-    display: flex;
-    padding: 0 20px;
+    position: relative;
     min-height: 517px;
-    align-items: center;
-    justify-content: center;
+    padding: 0;
+
+    &:after {
+      width: 0;
+      content: '';
+      height: 100%;
+      display: inline-block;
+      vertical-align: middle;
+    }
   }
   &_box {
+    position: absolute;
+    top: 50%;
+    transform: translateY(-50%);
     color: #FFF;
     padding: 60px;
     text-align: left;
     max-width: $widthMax;
+    line-height: normal;
+    display: inline-block;
+    vertical-align: middle;
     background: rgba(#100, 0.6);
+    margin: 0 auto;
+    padding: 60px;
 
     &_title {
       margin: 0;
@@ -71,26 +85,18 @@ a.button.big.learn-more {
   padding: 10px 0 40px 0;
 
   h2 {
-    margin: 0 auto;
-    max-width: 800px;
     font-size: 24px;
     color: $bodyFgDark;
-    line-height: normal;
   }
 }
 
 .advantages {
   @include highlightBox;
 
-  &_list {
-    margin: 0;
-    padding: 0;
-    display: flex;
-    list-style: none;
-    justify-content: space-between;
-  }
-  &_list_item {
-    flex: 0 1 31%;
+  .justified_box {
+    width: 30%;
+    position: relative;
+    box-sizing: border-box;
     padding: 0 0 $gapSize 0;
   }
   &_title {
@@ -102,16 +108,15 @@ a.button.big.learn-more {
   &_text {
     margin: 0.5em 0;
     color: $bodyFg;
-    line-height: 1.3;
-    min-height: 5.2em;
     font-size: $fontSizeStrong;
   }
   ul {
-    list-style-type: disc;
+    list-style: none;
     font-size: $fontSizeBig;
-    margin: 15px 0 0 1em;
+    margin-top: 24px;
+    margin-left: 0;
     li {
-      margin-top: 5px;
+      padding-top: 10px;
     }
   }
   .start {
@@ -134,18 +139,13 @@ a.button.big.learn-more {
 
 .quotes {
   padding-top: 55px;
-
-  &_list {
-    margin: 0;
-    padding: 0;
-    display: flex;
+  ol {
     list-style: none;
-    justify-content: space-between;
   }
-  &_list_item {
-    flex: 0 1 31%;
-    display: flex;
-    flex-direction: column;
+  .justified_box {
+    width: 30%;
+    position: relative;
+    box-sizing: border-box;
     padding: 0 0 $gapSize 0;
   }
   h2 {
@@ -155,9 +155,8 @@ a.button.big.learn-more {
   }
   blockquote {
     margin: 0;
-    display: flex;
-    flex: 1 1 auto;
     p {
+      min-height: 130px;
       color: $bodyFg;
       margin: 0 0 20px 0;
       padding: $gapSize;
@@ -179,10 +178,9 @@ a.button.big.learn-more {
   }
   cite {
     line-height: 2;
-    margin-top: 5px;
-    min-height: 48px;
     font-style: normal;
     color: $bodyFgFaded;
+    margin-top: $gapSize;
     display: inline-block;
     small {
       display: block;

app/views/dashboard/_owner_header.html.slim

@@ -46,17 +46,9 @@
       span 
         | 
         =t('.since', date: l(current_user.start_date.to_date))
-    -unless (current_user.paid_date == nil)
-      span 
-        | · 
-        =t('.current_subscription_expires', date: l(current_user.paid_date.to_date))
     span 
       | · 
       =t('.total_pages', pages: current_user.page_count)
-    -if (current_user.account_type == 'Trial') 
-      span 
-        | ·  
-        =t('.to_upgrade_contact')
 
 section.owner-counters
   .counter(data-prefix="#{number_with_delimiter @collections.length}") =t('.collection', count: @collections.length)

app/views/devise/registrations/new.html.slim

@@ -2,6 +2,10 @@
 
 section.signon
   h1= t('devise.sign_up')
+
+  p Please fill in the following information to create a new FromThePage account. 
+  p By registering with this website you certify that you are at least 13 years of age or have parental permission.
+
   =form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
     =devise_error_messages!
     .signon_field
@@ -36,4 +40,4 @@ section.signon
   hr
   =render 'devise/shared/links'
 -unless MIXPANEL_ID.blank?
-  javascript:  mixpanel.track("Sign Up");
+  javascript:  mixpanel.track("Sign Up");

app/views/devise/sessions/new.html.slim

@@ -38,12 +38,6 @@ section.signon
 
     = link_to t('.sign_up_now'), new_user_registration_path, class: 'button big'
 
-  section#free_trial.signup-links
-    h2= t('.start_free_trial')
-    p= t('.start_free_trial_message')
-
-    =link_to t('.start_free_trial'), users_new_trial_path, class: 'button big'
-
   hr.clearfix
 
 -unless MIXPANEL_ID.blank?