Merge branch 'staging' into upgrade-react-piece-by-piece

Author: jmkulwik

.drone.yml

@@ -36,11 +36,10 @@ steps:
 
 - name: unit-tests
   image: wintercdo/code-dot-org:0.7
+  pull: always
   volumes:
   - name: rbenv
-    path: /home/circleci/.rbenv/versions/2.5.0/lib/ruby/gems/2.5.0
-  - name: yarncache
-    path: /home/circleci/.cache
+    path: /home/circleci/.rbenv
   - name: mysql
     path: /var/lib/mysql
   environment:
@@ -52,17 +51,14 @@ steps:
     - pwd
     - sudo chown -R circleci:circleci .
     - # cache is restored to source directory, so we need to copy it into the right place
-    - cp -rn "$(pwd)/home/circleci/.rbenv/versions/2.5.0/lib/ruby/gems/2.5.0" /home/circleci/.rbenv/versions/2.5.0/lib/ruby/gems || true
-    - cp -rn "$(pwd)/home/circleci/.cache" /home/circleci || true
+    - cp -rn "$(pwd)/home/circleci/.rbenv" /home/circleci || true
     - /entrypoint.sh docker/unit_tests.sh
 
 - name: update-cache
   image: plugins/s3-cache
   volumes:
   - name: rbenv
-    path: /home/circleci/.rbenv/versions/2.5.0/lib/ruby/gems/2.5.0
-  - name: yarncache
-    path: /home/circleci/.cache
+    path: /home/circleci/.rbenv
   settings:
     pull: true
     rebuild: true
@@ -71,17 +67,13 @@ steps:
     secret_key:
       from_secret: S3_CACHE_SECRET_KEY
     mount:
-      - /home/circleci/.rbenv/versions/2.5.0/lib/ruby/gems/2.5.0
-      - apps/node_modules
-      - /home/circleci/.cache
+      - /home/circleci/.rbenv
 
 volumes:
 - name: rbenv
   temp: {}
 - name: mysql
   temp: {}
-- name: yarncache
-  temp: {}
 
 trigger:
   event:
@@ -149,6 +141,6 @@ trigger:
 #     - pull_request
 ---
 kind: signature
-hmac: 41f0921ccaed873a43f2608c4cabddf3911828cfc8044955f4420bf9fbaa8b98
+hmac: a37b3ff8767d1c25c2bd719f6372de50b2bfdef6c26cfb06075b5fcc05785a64
 
 ...

apps/src/code-studio/header.js

@@ -3,7 +3,6 @@
 import $ from 'jquery';
 import _ from 'lodash';
 import progress from './progress';
-import Dialog from './LegacyDialog';
 import { getStore } from '../redux';
 import { shareProject } from './headerShare';
 import { convertBlocksXml } from '../craft/code-connection/utils';
@@ -406,26 +405,6 @@ header.showProjectHeader = function () {
     e.stopPropagation(); // Clicks inside the popup shouldn't close it.
   });
 
-  $('.project_delete').click(function (e) {
-    e.preventDefault(); // Don't change the hash.
-    var dialog = new Dialog({body: '<img class="modal-image" src="' + appOptions.skin.staticAvatar + '">' +
-        '<div id="confirm-delete" class="modal-content">' +
-        '<p class="dialog-title">' + dashboard.i18n.t('project.delete_confirm_title') + '</p>' +
-        '<p>' + dashboard.i18n.t('project.delete_confirm_text') + '</p>' +
-        '<button id="again-button">' + dashboard.i18n.t('project.cancel') + '</button>' +
-        '<button id="continue-button" style="float: right">' + dashboard.i18n.t('project.delete') + '</button></div>'
-    });
-    dialog.show();
-    $('#confirm-delete #continue-button').click(function () {
-      dashboard.project.delete(function () {
-        location.href = dashboard.project.appToProjectUrl();
-      });
-    });
-    $('#confirm-delete #again-button').click(function () {
-      dialog.hide();
-    });
-  });
-
   $('.project_new').click(dashboard.project.createNew);
 
   $(document).on('click', '.project_list', function () {

apps/src/code-studio/pd/application/teacher1920/Section1AboutYou.jsx

@@ -16,6 +16,7 @@ import {
   Button
 } from 'react-bootstrap';
 import SchoolAutocompleteDropdown from '@cdo/apps/templates/SchoolAutocompleteDropdown';
+import queryString from 'query-string';
 import {styles} from "./TeacherApplicationConstants";
 import _ from 'lodash';
 
@@ -76,13 +77,27 @@ export default class Section1AboutYou extends LabeledFormComponent {
   }
 
   render() {
+    const nominated = queryString.parse(window.location.search).nominated;
+
     return (
       <FormGroup>
-        <p>
-          Thanks for your interest in the Code.org Professional Learning Program!
-          This application should take 10 - 15 minutes to complete. Fields marked with a
-          {' '}<span style={{color: "red"}}>*</span>{' '} are required.
-        </p>
+
+        {!nominated && (
+          <p>
+            Thanks for your interest in the Code.org Professional Learning Program!
+            This application should take 10 - 15 minutes to complete. Fields marked with a
+            {' '}<span style={{color: "red"}}>*</span>{' '} are required.
+          </p>
+        )}
+        {nominated && (
+          <p>
+            Congratulations on your nomination for a scholarship to the Code.org Professional
+            Learning Program! This application should take 10 - 15 minutes to complete. Fields
+            marked with a {' '}<span style={{color: "red"}}>*</span>{' '} are required. We will
+            let your local partner know that you’ve been nominated as they consider your application
+            for the regional scholarships or discounts they have available.
+          </p>
+        )}
         <p>
           If you need more information about the program before you apply,
           please visit
@@ -100,6 +115,20 @@ export default class Section1AboutYou extends LabeledFormComponent {
           </a>
         </p>
 
+        {nominated && (
+          <div>
+            <h4>When will I hear back about the scholarships and discounts?</h4>
+            <p>
+              In most regions, applications are accepted on a rolling basis. And in
+              most cases, our local partner will get back to you within 2 weeks
+              to let you know your application status. Even if you don’t get selected
+              for the scholarship, you will still be able to attend if you are an
+              eligible teacher and your school can pay a discounted price (thanks
+              to our generous donors).
+            </p>
+          </div>
+        )}
+
         <h3>Section 1: {SectionHeaders.section1AboutYou}</h3>
 
         {this.radioButtonsFor("country")}