72 frame additions and revisions

.eslintignore

@@ -1,5 +1,13 @@
-coverage
 dist
 docs
 tmp
 tests/*
+package.json
+bower.json
+testem.js
+config/environment.js
+bower_components
+node_modules
+blueprints
+vendor
+helpers.js

.eslintrc.js

@@ -21,6 +21,7 @@ module.exports = {
         'PipeSDK': false
     },
     rules: { // 'warn', 'error', or 'off'
-        'no-console': 'off' // allow console.log
+        'no-console': 'off', // allow console.log
+        'indent': ['warn', 4]
     }
 };

.gitignore

@@ -9,7 +9,9 @@
 /bower_components
 
 # misc
-/.sass-cache
+app/styles/.sass-cache
+app/styles/app.css
+app/styles/app.css.map
 /connect.lock
 /coverage/*
 /libpeerconnection.log
@@ -25,6 +27,7 @@ scripts/env
 
 migration/output/*
 
-themes/lookit/assets/screenshots/*
-
 /ssl
+
+# tools
+.idea/*

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "docs"]
+	path = docs
+	url = https://github.com/lookit/lookit-frameplayer-docs.git

app/components/consent-template001/template.hbs

@@ -0,0 +1,54 @@
+<div class="center-text">
+    <span class="exp-text-medium">
+        Consent to participate in non-biomedical research: {{experiment.name}}
+    </span>
+</div>
+
+<br>
+<div class="video-consent-body">
+
+    <p> Study researchers led by {{PIName}} at {{institution}} are running this study, "{{experiment.name}}," on Lookit. </p>
+
+    <p class="exp-text-medium"> Purpose </p>
+    <p> {{purpose}} </p>
+
+    <p class="exp-text-medium"> Procedures </p>
+    <p> This study takes about {{experiment.duration}} to complete. {{procedures}} </p>
+
+    <p class="exp-text-medium"> Participation </p>
+    <p> You and your child are free to choose whether to be in this study. If you and your child choose to participate, it's okay to stop at any point during the session. Please do pause or stop the session if your child becomes very fussy or does not want to participate! If this is a study with multiple sessions, it's okay not to complete all the sessions.</p>
+
+    <p class="exp-text-medium"> Payment </p>
+    <p> {{payment}} </p>
+
+    <p class="exp-text-medium"> Data collection and webcam recording </p>
+    <p> During the session, you and your child will be recorded via your computer's webcam and microphone. Video recordings and other data you enter are sent securely to our lab. At the end of the session, you will be prompted to choose a privacy level for your webcam recordings. You will have the option to withdraw your video data at this point. </p>
+    <p>Data is stored securely on Lookit servers and by researchers. However, there is always a small risk that data transmitted over the internet may be intercepted or that the security of stored data may be compromised.</p>
+    <p>No video clips will be published or shared unless you allow this when selecting a privacy level. If we do not receive a consent recording (the video you'll make to the right) for this session and cannot verify that you agreed to participate, no other video from your session will be viewed.</p>
+
+    <p class="exp-text-medium"> Use of data by study researchers </p>
+    <p>The research group led by {{PIName}} at {{institution}} will have access to video and other data collected during this session. We will also have access to your account profile, demographic survey, and the child profile for the child who is participating, including changes you make in the future to any of this information. We may study your child's responses in connection with his or her previous responses to this or other studies run by our group, siblings' responses to this or other studies run by our group, or demographic survey responses.</p>
+    {{#if datause}}
+        <p>
+            {{datause}}
+        </p>
+    {{/if}}
+
+    <p class="exp-text-medium"> Use of data by Lookit </p>
+    <p> Because this study is being run on the Lookit platform, researchers working on the Lookit project at MIT will also have access to the data collected during this session, in addition to your account data, child profiles, and demographic survey responses. This data may be used by Lookit to detect and fix technical problems or identify new features that would be helpful; provide support to study researchers; assess data quality (for instance, how well an observer can tell which direction children are looking); evaluate the site's success in reaching a diverse population; and characterize family engagement (for instance, looking at what aspects of a study make parents more interested in coming back later). </p>
+
+    <p class="exp-text-medium"> Publication of results </p>
+    <p> The results of the research may be presented at scientific meetings or published in scientific journals. Raw data (for instance, looking times to the left and right of the screen) may be published when it cannot identify children. We never publish children's birthdates or names, and we never publish your demographic data in conjunction with your child's video. </p>
+
+    {{#if additional_segments}}
+        {{#each additional_segments as |segment|}}
+            <p class="exp-text-medium"> {{segment.title}} </p>
+            <p> {{exp-format segment.text}} </p>
+        {{/each}}
+    {{/if}}
+
+    <p class="exp-text-medium"> Researcher contact information </p>
+    <p> This study is run by {{PIName}} at {{institution}}. If you or your child have any questions or concerns about this study, or in the very unlikely event of a research-related injury, please contact {{PIContact}}. </p>
+    <p>If you or your child have any questions or concerns about the Lookit platform, please contact Kim Scott at kimscott@mit.edu or 617 324 4859.</p>
+
+</div>

app/components/consent-template002/template.hbs

@@ -0,0 +1,65 @@
+<div class="center-text">
+    <span class="exp-text-medium">
+        Consent to participate in research: {{experiment.name}}
+    </span>
+</div>
+
+<br>
+<div class="video-consent-body">
+
+    <p> Researchers led by {{PIName}} at {{institution}} are running this study, "{{experiment.name}}," on Lookit. </p>
+
+    <p class="exp-text-medium"> Purpose </p>
+    <p> {{purpose}} </p>
+
+    <p class="exp-text-medium"> Procedures </p>
+    <p> This study takes about {{experiment.duration}} to complete. {{procedures}} </p>
+
+    <p class="exp-text-medium"> Participation </p>
+    <p> You and your child are free to choose whether to be in this study. If you and your child choose to participate, it's okay to stop at any point during the session. Please pause or stop the session if your child becomes very fussy or does not want to participate! If this is a study with multiple sessions, it's okay not to complete all the sessions.</p>
+
+    <p class="exp-text-medium"> Payment </p>
+    <p> {{payment}} </p>
+
+    <p class="exp-text-medium"> Data collection and webcam recording </p>
+    <p> During the session, you and your child will be recorded via your computer's webcam and microphone. Video recordings and other data you enter are sent securely to the Lookit platform and stored indefinitely. At the end of the session, you will be prompted to choose a privacy level for your webcam recordings. You will have the option to withdraw your video data at this point. You can view your past recordings on Lookit under "Studies" -> "Your past studies" at any time.</p>
+    <p>Data is stored securely on Lookit servers and by researchers. However, there is always a small risk that data transmitted over the internet may be intercepted or that the security of stored data may be compromised.</p>
+    <p>No video clips will be published or shared unless you allow this when selecting a privacy level. If we do not receive a consent recording (the video you'll make to the right) for this session and cannot verify that you agreed to participate, no other video from your session will be viewed.</p>
+
+    <p class="exp-text-medium"> Use of data by study researchers </p>
+    <p>The research group led by {{PIName}} at {{institution}} will have access to video and other data collected during this session. We will also have access to your account profile, demographic survey, and the child profile for the child who is participating, including changes you make in the future to any of this information. We may study your child's responses in connection with his or her previous responses to this or other studies run by our group, siblings' responses to this or other studies run by our group, or demographic survey responses.</p>
+    {{#if datause}}
+        <p>
+            {{datause}}
+        </p>
+    {{/if}}
+
+    <p class="exp-text-medium"> Use of data by Lookit </p>
+    <p> Because this study is being run on the Lookit platform, researchers working on the Lookit project at MIT will also have access to the data collected during this session, in addition to your account data, child profiles, and demographic survey responses. This data may be used by Lookit to detect and fix technical problems or identify new features that would be helpful; provide support to study researchers; assess data quality (for instance, how well an observer can tell which direction children are looking); evaluate the site's success in reaching a diverse population; and characterize family engagement (for instance, looking at what aspects of a study make parents more interested in coming back later). </p>
+
+    <p class="exp-text-medium"> Publication of results </p>
+    <p> The results of the research may be presented at scientific meetings or published in scientific journals. Raw data (for instance, looking times to the left and right of the screen) may be published when it cannot identify children. We never publish children's birthdates or names, and we never publish your demographic data in conjunction with your child's video. </p>
+
+    {{#if additional_segments}}
+        {{#each additional_segments as |segment|}}
+            <p class="exp-text-medium"> {{segment.title}} </p>
+            <p> {{exp-format segment.text}} </p>
+        {{/each}}
+    {{/if}}
+
+    <p class="exp-text-medium"> Rights of research subjects </p>
+    <p> {{research_rights_statement}} </p>
+
+    {{#if gdpr}}
+        <p class="exp-text-medium"> General Data Protection Regulation (GDPR) information </p>
+        <p> As part of your participation, we will collect certain personal information about you, including: {{gdpr_personal_data}}. In addition, we will collect special category data, your personal information that is especially sensitive: {{gdpr_sensitive_data}}</p>
+
+        <p>Your personal information will be transferred to the United States. You understand that the data protection and privacy laws of the United States may not offer you the same level of protection as those in your country of origin.</p>
+    {{/if}}
+
+
+    <p class="exp-text-medium"> Researcher contact information </p>
+    <p> This study is run by {{PIName}} at {{institution}}. If you or your child have any questions or concerns about this study, or in the very unlikely event of a research-related injury, please contact {{PIContact}}. </p>
+    <p>If you or your child have any questions or concerns about the Lookit platform, please contact Kim Scott at kimscott@mit.edu or 617 324 4859.</p>
+
+</div>

app/components/consent-template003/template.hbs

@@ -0,0 +1,65 @@
+<div class="center-text">
+    <span class="exp-text-medium">
+        Consent to participate in research: {{experiment.name}}
+    </span>
+</div>
+
+<br>
+<div class="video-consent-body">
+
+    <p> Researchers led by {{PIName}} at {{institution}} are running this study, "{{experiment.name}}," on Lookit. </p>
+
+    <p class="exp-text-medium"> Purpose </p>
+    <p> {{purpose}} </p>
+
+    <p class="exp-text-medium"> Procedures </p>
+    <p> This study takes about {{experiment.duration}} to complete. {{procedures}} </p>
+
+    <p class="exp-text-medium"> Participation </p>
+    <p> You and your child are free to choose whether to be in this study. If you and your child choose to participate, it's okay to stop at any point during the session. Please pause or stop the session if your child becomes very fussy or does not want to participate! If this is a study with multiple sessions, it's okay not to complete all the sessions.</p>
+
+    <p class="exp-text-medium"> Benefits, risks, and payment </p>
+    <p> {{payment}} </p>
+
+    <p class="exp-text-medium"> Data collection and webcam recording </p>
+    <p> During the session, you and your child will be recorded via your computer's webcam and microphone. Video recordings and other data you enter are sent securely to the Lookit platform and stored indefinitely. At the end of the session, you will be prompted to choose a privacy level for your webcam recordings. You will have the option to withdraw your video data at this point. You can view your past recordings on Lookit under "Studies" -> "Your past studies" at any time.</p>
+    <p>Data is stored securely on Lookit servers and by researchers. However, there is always a small risk that data transmitted over the internet may be intercepted or that the security of stored data may be compromised.</p>
+    <p>No video clips will be published or shared unless you allow this when selecting a privacy level. If we do not receive a consent recording (the video you'll make to the right) for this session and cannot verify that you agreed to participate, no other video from your session will be viewed.</p>
+
+    <p class="exp-text-medium"> Use of data by study researchers </p>
+    <p>The research group led by {{PIName}} at {{institution}} will have access to video and other data collected during this session. We will also have access to your account profile, demographic survey, and the child profile for the child who is participating, including changes you make in the future to any of this information. We may study your child's responses in connection with his or her previous responses to this or other studies run by our group, siblings' responses to this or other studies run by our group, or demographic survey responses.</p>
+    {{#if datause}}
+        <p>
+            {{datause}}
+        </p>
+    {{/if}}
+
+    <p class="exp-text-medium"> Use of data by Lookit </p>
+    <p> Because this study is being run on the Lookit platform, researchers working on the Lookit project at MIT will also have access to the data collected during this session, in addition to your account data, child profiles, and demographic survey responses. This data may be used by Lookit to detect and fix technical problems or identify new features that would be helpful; provide support to study researchers; assess data quality (for instance, how well an observer can tell which direction children are looking); evaluate the site's success in reaching a diverse population; and characterize family engagement (for instance, looking at what aspects of a study make parents more interested in coming back later). </p>
+
+    <p class="exp-text-medium"> Publication of results </p>
+    <p> The results of the research may be presented at scientific meetings or published in scientific journals. Raw data (for instance, looking times to the left and right of the screen) may be published when it cannot identify children. We never publish children's birthdates or names, and we never publish your demographic data in conjunction with your child's video. </p>
+
+    {{#if additional_segments}}
+        {{#each additional_segments as |segment|}}
+            <p class="exp-text-medium"> {{segment.title}} </p>
+            <p> {{exp-format segment.text}} </p>
+        {{/each}}
+    {{/if}}
+
+    <p class="exp-text-medium"> Rights of research subjects </p>
+    <p> {{research_rights_statement}} </p>
+
+    {{#if gdpr}}
+        <p class="exp-text-medium"> General Data Protection Regulation (GDPR) information </p>
+        <p> As part of your participation, we will collect certain personal information about you, including: {{gdpr_personal_data}}. In addition, we will collect special category data, your personal information that is especially sensitive: {{gdpr_sensitive_data}}</p>
+
+        <p>Your personal information will be transferred to the United States. You understand that the data protection and privacy laws of the United States may not offer you the same level of protection as those in your country of origin.</p>
+    {{/if}}
+
+
+    <p class="exp-text-medium"> Researcher contact information </p>
+    <p> This study is run by {{PIName}} at {{institution}}. If you or your child have any questions or concerns about this study, or in the very unlikely event of a research-related injury, please contact {{PIContact}}. </p>
+    <p>If you or your child have any questions or concerns about the Lookit platform, please contact Kim Scott at kimscott@mit.edu or 617 324 4859.</p>
+
+</div>

app/components/exp-exit-survey/component.js

@@ -8,14 +8,14 @@ import moment from 'moment';
 import ExpFrameBaseComponent from '../exp-frame-base/component';
 import FullScreen from '../../mixins/full-screen';
 
+// Regular comment syntax to omit from docs
 /*
  * @module exp-player
- * @submodule frames
+ * @submodule frames-deprecated
  */
 
-// Use regular comment syntax here to exclude from docs for clarity
 /*
-This is the exit survey used by "Your baby the physicist". Use the updated frame {{#crossLink "Exp-lookit-exit-survey"}}{{/crossLink}} instead.
+This is the exit survey used by "Your baby the physicist". For new studies, use the updated frame {{#crossLink "Exp-lookit-exit-survey"}}{{/crossLink}} instead.
 
 @class Exp-exit-survey
 @extends Exp-frame-base
@@ -48,8 +48,6 @@ export default ExpFrameBaseComponent.extend(Validations, FullScreen, {
     fullScreenElementId: 'experiment-player',
     frameSchemaProperties: {},
     meta: {
-        name: 'ExpExitSurvey',
-        description: 'Exit survey for Lookit.',
         data: {
             type: 'object',
             properties: {
@@ -154,8 +152,6 @@ export default ExpFrameBaseComponent.extend(Validations, FullScreen, {
 
     progressValue: Ember.computed('currentSessionsCompleted', 'idealSessionsCompleted', function() {
         return Math.min(100, Math.ceil((this.get('currentSessionsCompleted') / this.get('idealSessionsCompleted')) * 100));
-    }),
-    willRender() {
-        this.send('exitFullscreen');
-    }
+    })
+
 });