Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add sat subjects #575

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added public/static/question_images/sat_math_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/question_images/sat_math_10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/question_images/sat_math_11.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/question_images/sat_math_12.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/question_images/sat_math_13.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/question_images/sat_math_14.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/question_images/sat_math_15.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/question_images/sat_math_16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/question_images/sat_math_17.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/question_images/sat_math_18.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/question_images/sat_math_19.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/question_images/sat_math_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/question_images/sat_math_20.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/question_images/sat_math_21.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/question_images/sat_math_22.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/question_images/sat_math_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/question_images/sat_math_4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/question_images/sat_math_5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/question_images/sat_math_6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/question_images/sat_math_7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/question_images/sat_math_8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/question_images/sat_math_9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions src/utils/topics.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,13 @@ export const topics = {
collegeSkills: { displayName: "College Counseling Skills" }
},
displayName: "UPchieve Training"
},
sat: {
subtopics: {
satMath: { displayName: "SAT Math" },
satReading: { displayName: "SAT Reading" }
},
displayName: "Standardized Testing"
}
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ export default {
};

const cards = Object.entries(topics)
.filter(([key]) => key !== "training")
// @note: temporarily hide SAT card
.filter(([key]) => key !== "training" && key !== "sat")
.map(([key, topicObj]) => {
return {
title: topicObj.displayName,
Expand Down
10 changes: 10 additions & 0 deletions src/views/ReviewMaterialsView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,20 @@ export default {
}
];
break;
case "satReading":
this.reviewMaterials = [
{
title: "SAT Reading Review Guide",
pdf: require(`../assets/review_materials/satReading/sat-reading-review-guide.pdf`),
image: require(`../assets/review_materials/satReading/sat-reading-review-guide.png`)
}
];
break;
case "chemistry":
case "environmentalScience":
case "calculusBC":
case "calculusAB":
case "satMath":
this.reviewMaterials = [];
break;
// case for a user entering a subject that we do not support
Expand Down
7 changes: 6 additions & 1 deletion src/views/SessionView/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,12 @@ export default {
}),

auxiliaryType() {
const documentEditorSubTopics = ["planning", "essays", "applications"];
const documentEditorSubTopics = [
"planning",
"essays",
"applications",
"satReading"
];
if (documentEditorSubTopics.includes(this.session.subTopic))
return "DOCUMENT";
else return "WHITEBOARD";
Expand Down
9 changes: 5 additions & 4 deletions src/views/TrainingView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ export default {
subjectTypes: [
{ displayName: "Math", key: "math" },
{ displayName: "Science", key: "science" },
{ displayName: "College Counseling", key: "college" }
// { displayName: "Standardized Testing", key: "sat" }
{ displayName: "College Counseling", key: "college" },
{ displayName: "Standardized Testing", key: "sat" }
],
currentSubjectType: "math",
math: {
Expand Down Expand Up @@ -285,8 +285,9 @@ export default {
},
sat: {
training: [
{ displayName: "UPchieve 101", key: "upchieve101" },
{ displayName: "SAT Strategies ", key: "satStrategies" }
{ displayName: "UPchieve 101", key: "upchieve101" }
// Hide until SAT Strategies is completed
// { displayName: "SAT Strategies ", key: "satStrategies" }
],
certifications: [
{
Expand Down