Merge pull request #1821 from RTICWDT/dev

Merge from dev to staging
RTICWDT · Dec 2, 2020 · d154984ec01e7101881f44ce6427fecd01404d6a · d154984
2 parents 23854b0 + ccd3119
commit d154984ec01e7101881f44ce6427fecd01404d6a
diff --git a/.cfignore b/.cfignore
@@ -0,0 +1,4 @@
+node_modules
+output
+__tests__
+test
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,7 +8,7 @@ buildtest: &buildtest
     - run:
         name: Install Headless Chrome dependencies
         command: |
-          sudo apt-get install -yq \
+          sudo apt-get update && sudo apt-get install -yq \
           gconf-service libasound2 libatk1.0-0 libatk-bridge2.0-0 libc6 libcairo2 libcups2 libdbus-1-3 \
           libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 \
           libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 \
@@ -40,7 +40,7 @@ buildtest: &buildtest
 
     - run:
         name: Wait for Federalist Build
-        command: ./test/ci.sh
+        command: ./__tests__/utility/ci.sh
 
     - run:
         name: Wait Buffer for browser testing
@@ -66,6 +66,7 @@ jobs:
         environment:
           TEST_REPORTS_CI: test/reports
 
+
 workflows:
   version: 2
   build:

diff --git a/.env.example b/.env.example
@@ -0,0 +1,6 @@
+API_BASE_URL=
+API_KEY=
+API_SIGNUP_KEY=
+BASEURL=http://localhost:4000
+RECAPTCHA_SITE_KEY=
+API_KEY_GOOGLE_MAPS=
diff --git a/.gitignore b/.gitignore
@@ -9,10 +9,12 @@ index.html.*
 build.log
 js/picc.js*
 js/app.js*
+js/app.*.js
 .DS_Store
 css/fonts/material*
 css/fonts/fa*
 css/app.css
+css/app.*.css
 output/*.png
 .jekyll-cache
 __tests__/reports/*

diff --git a/.idea/.gitignore b/.idea/.gitignore
@@ -0,0 +1,5 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
@@ -0,0 +1,45 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <JSCodeStyleSettings version="0">
+      <option name="FORCE_SEMICOLON_STYLE" value="true" />
+      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
+      <option name="USE_DOUBLE_QUOTES" value="false" />
+      <option name="FORCE_QUOTE_STYlE" value="true" />
+      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
+      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
+      <option name="SPACES_WITHIN_IMPORTS" value="true" />
+    </JSCodeStyleSettings>
+    <TypeScriptCodeStyleSettings version="0">
+      <option name="FORCE_SEMICOLON_STYLE" value="true" />
+      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
+      <option name="USE_DOUBLE_QUOTES" value="false" />
+      <option name="FORCE_QUOTE_STYlE" value="true" />
+      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
+      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
+      <option name="SPACES_WITHIN_IMPORTS" value="true" />
+    </TypeScriptCodeStyleSettings>
+    <codeStyleSettings language="HTML">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="JavaScript">
+      <option name="SOFT_MARGINS" value="0" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="TypeScript">
+      <option name="SOFT_MARGINS" value="0" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="JSHint" enabled="true" level="ERROR" enabled_by_default="true" />
+  </profile>
+</component>
diff --git a/.idea/jsLinters/jshint.xml b/.idea/jsLinters/jshint.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JSHintConfiguration" version="2.10.2" use-config-file="true" use-custom-config-file="true" custom-config-file-path="$PROJECT_DIR$/.jshintrc">
+    <option bitwise="true" />
+    <option browser="true" />
+    <option curly="true" />
+    <option eqeqeq="true" />
+    <option forin="true" />
+    <option maxerr="50" />
+    <option noarg="true" />
+    <option noempty="true" />
+    <option nonew="true" />
+    <option strict="true" />
+    <option undef="true" />
+  </component>
+</project>
diff --git a/.idea/misc.xml b/.idea/misc.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+  <component name="ProjectPlainTextFileTypeManager">
+    <file url="file://$PROJECT_DIR$/js/app.js" />
+    <file url="file://$PROJECT_DIR$/js/app.js" />
+    <file url="file://$PROJECT_DIR$/js/picc-analytics.js" />
+    <file url="file://$PROJECT_DIR$/js/picc.js" />
+  </component>
+</project>
diff --git a/.idea/modules.xml b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/shadow-scorecard.iml" filepath="$PROJECT_DIR$/.idea/shadow-scorecard.iml" />
+    </modules>
+  </component>
+</project>
diff --git a/.idea/shadow-scorecard.iml b/.idea/shadow-scorecard.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/_site" />
+      <excludeFolder url="file://$MODULE_DIR$/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/css/fonts" />
+      <excludeFolder url="file://$MODULE_DIR$/css/vendor" />
+      <excludeFolder url="file://$MODULE_DIR$/js/vendor" />
+      <excludeFolder url="file://$MODULE_DIR$/output" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/test" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
diff --git a/404.html b/404.html
@@ -3,5 +3,11 @@
 ---
 <div id="app">
   <!-- Pass other variables as props-->
-  <four-oh-four page-permalink="{{ page.permalink }}" base-url="{{site.baseurl}}"   />
+  <four-oh-four page-permalink="{{ page.permalink }}"
+                base-url="{{site.baseurl}}"
+                :compare-schools="compareSchools"
+                :compare-fields-of-study="compareFieldsOfStudy"
+                @compare-update-selection="refreshCompareSchools"
+                @toggle-compare-school="toggleCompareItem"
+  />
 </div>
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,14 @@
+FROM ruby:2.6.5-alpine
+
+RUN apk add --update g++ gcc make musl-dev git
+
+RUN mkdir /myapp
+WORKDIR /myapp
+COPY Gemfile /myapp/Gemfile
+COPY Gemfile.lock /myapp/Gemfile.lock
+RUN bundle install
+
+COPY . /myapp
+EXPOSE 4000
+
+CMD ["jekyll", "serve", "--host", "0.0.0.0", "--baseurl", "''", "-w", "--trace"]
diff --git a/README.md b/README.md
@@ -15,6 +15,30 @@ This repo contains the front end of a web app with its API created by an instanc
 
 
 ## Installation
+Create a local development environment using Docker containers or with a traditional
+unix system.
+
+### Docker Container
+- Copy `.env.example` to `.env`
+- Add values to `.env`
+- In App Root: Start Docker Containers 
+  - `docker-compose up`
+  - You can start it with `docker-compose up -d` to detach the process from the current shell if desired. 
+- Wait for output:
+```
+web_1   |     Server address: http://0.0.0.0:4000/
+web_1   |   Server running... press ctrl-c to stop.
+```
+- Start a new cli tab/window (if not running detached)
+- **Only on first run:** Install Dependencies in `node` container
+  - `docker-compose exec node npm install`
+  - Wait
+- Launch webpack with watch on the `node` container:
+  - `docker-compose exec node npm run watch`
+  - Wait for: `Entrypoint main = app.js app.js.map`
+- Site will be available at: `http://localhost:4000/`
+
+### Traditional Unix Development Environment
 This site is made with [Jekyll]. Once you've got [Ruby] on your computer, you
 can run:
 

diff --git a/Staticfile b/Staticfile
@@ -0,0 +1 @@
+root: _site
diff --git a/Staticfile.auth b/Staticfile.auth
@@ -0,0 +1,2 @@
+test_user:{SHA}L6IYUcwmuX2V7Uy06Zk5TLFuyLE=
+csadmin:{SHA}C3IvisTtMSGcV7+Mya6gzMJ64Do=
diff --git a/__tests__/e2e/PageIndex_test.js b/__tests__/e2e/PageIndex_test.js
@@ -111,7 +111,8 @@ Scenario('Test Show Me Options: Simple Elements', (I) => {
 Scenario('Test Custom Search', (I) => {
   I.amOnPage(BASE_URL);
 
-  I.click(locate('.v-tab').withText("Custom Search"));
+  I.click(locate('.v-tab').withText("Search Schools"));
+  I.click(locate('button').withText('Custom Search'));
 
   I.seeElement(locate(".v-window-item p").withText("Location"));
   I.click('#search-from-location-select');

diff --git a/__tests__/e2e/PageSchoolFields_test.js b/__tests__/e2e/PageSchoolFields_test.js
@@ -69,8 +69,8 @@ Scenario('Visit page and test compare functionality', (I) => {
 
   I.click(locate('.school-heading button').withText('Compare'));
   I.wait(1);
-  I.seeElement('#compare-header');
-  I.click('#compare-header');
-  I.seeElement('#compare_schools-content');
-  I.seeElement(locate('#compare_schools-content label').withText('Yale University'));
+  //I.seeElement('#compare-header');
+  //I.click('#compare-header');
+  I.seeElement('#compare-schools-content');
+  I.seeElement(locate('#compare-schools-content label').withText('Yale University'));
 });
diff --git a/__tests__/e2e/PageSchool_test.js b/__tests__/e2e/PageSchool_test.js
@@ -38,13 +38,13 @@ Scenario('Visit page and see all major page components.', (I) => {
   I.seeElement(locate('.school-key_figures li.icon-medium').withText('Medium'));
 
   //Hero Stats
-  I.seeElement('#school-completion-rate-donut canvas#doughnut-chart');
+  I.seeElement('#school-completion-rate-bar canvas#horizontalbar-chart');
   I.seeElement('#school-salary-after-complete .range-container .range-chart');
   I.seeElement(locate('#school-avg-cost h2').at(2));
 
   // Check number of expansion panels.
   I.seeNumberOfVisibleElements(".v-expansion-panel",7);
-  I.click(locate('.v-expansion-panel').at('1'));
+  I.click(locate('.v-expansion-panel').at('2'));
   I.seeElement('#costs-content');
 
   // Sidebar conent
@@ -58,8 +58,8 @@ Scenario('Visit page and test compare functionality', (I) => {
 
   I.click(locate('#school-sub-nav-header button').withText('Compare'));
   I.wait(1);
-  I.seeElement('#compare-header');
-  I.click('#compare-header');
-  I.seeElement('#compare_schools-content');
-  I.seeElement(locate('#compare_schools-content label').withText('Yale University'));
+  //I.seeElement('#compare-header');
+  //I.click('#compare-header');
+  I.seeElement('#compare-schools-content');
+  I.seeElement(locate('#compare-schools-content label').withText('Yale University'));
 });
diff --git a/__tests__/e2e/PageSearch_test.js b/__tests__/e2e/PageSearch_test.js
@@ -108,16 +108,17 @@ Scenario('Add schools to compare, Items appear in compare drawer, Remove from co
   // Add items to compare search
   I.click(locate(".search-result-card button").at(1));
   // I.click(locate(".search-result-card button").at(2));
-
+
+  I.waitForElement("#compare-schools-content",2);
+
   // Wait for compare element to show in DOM.
-  I.waitForElement('#compare-header',2);
+  // I.waitForElement('#compare-header',2);
 
   // Show Modal
-  I.click('#compare-header');
-  I.waitForElement("#compare_schools-content",2);
+  // I.click('#compare-header');
 
   // // Check total number of compare schools.
-  // I.seeNumberOfElements(locate('#compare_schools-content input'),2);
+  I.seeNumberOfElements(locate('#compare-schools-content .v-input--checkbox'), 1);
 
   // // Remove from compare
   // I.click(locate('#compare_schools-content input').first());

diff --git a/__tests__/utility/url.js b/__tests__/utility/url.js
@@ -10,7 +10,14 @@ if (branch === 'master') {
   url = 'https://collegescorecard.ed.gov';
 } else if (branch && user && repo) {
   var path = [user, repo, branch].join('/');
-  url = 'https://federalist-c15eda78-ad4f-46bc-ac6b-eb043d9f3780.app.cloud.gov/preview/' + path.toLowerCase();
+  if(repo=='private-scorecard')
+  {
+    url = 'https://federalist-a267b602-ea49-4771-8115-ea94f984a5ca.app.cloud.gov/preview/' + path.toLowerCase();
+  }
+  else
+  {
+    url = 'https://federalist-c15eda78-ad4f-46bc-ac6b-eb043d9f3780.app.cloud.gov/preview/' + path.toLowerCase();
+  }
 }
 
 if (module.parent) {

diff --git a/_config.yml b/_config.yml
@@ -13,7 +13,7 @@ baseurl:
 url: https://collegescorecard.ed.gov
 
 # app version number
-version: v2.3.3
+version: v2.4.0
 
 # Build settings
 markdown: kramdown
@@ -91,3 +91,9 @@ exclude:
   - webpack.vue.config.js
   - steps.d.ts
   - steps_file.js
+  - package-lock.json
+  - manifest.yml
+  - localstorage_helper.js
+  - jsconfig.json
+  - Dockerfile
+  - docker-compose.yml