Skip to content

Commit

Permalink
Merge pull request #74 from wasedatime/staging
Browse files Browse the repository at this point in the history
Release: Course Evaluation & Recruitment page
  • Loading branch information
OscarWang114 authored Sep 7, 2020
2 parents 957f4e8 + 4934503 commit b0ae82e
Show file tree
Hide file tree
Showing 139 changed files with 3,469 additions and 1,694 deletions.
10 changes: 10 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
node_modules
client/build
client/node_modules
client/package-lock.json
client/package.json

*.enc
.all-contributorsrc
package-lock.json
package.json
58 changes: 58 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"arrowParens": "always",
"bracketSpacing": true,
"endOfLine": "lf",
"htmlWhitespaceSensitivity": "css",
"insertPragma": false,
"jsxBracketSameLine": false,
"jsxSingleQuote": false,
"printWidth": 80,
"proseWrap": "preserve",
"quoteProps": "as-needed",
"requirePragma": false,
"semi": true,
"singleQuote": false,
"tabWidth": 2,
"trailingComma": "es5",
"useTabs": false,
"vueIndentScriptAndStyle": false,
"parser": "babel",
"overrides": [
{
"files": "*.json",
"options": {
"parser": "json"
}
},
{
"files": "*.css",
"options": {
"parser": "css"
}
},
{
"files": "*.scss",
"options": {
"parser": "scss"
}
},
{
"files": "*.md",
"options": {
"parser": "markdown"
}
},
{
"files": "*.html",
"options": {
"parser": "html"
}
},
{
"files": ["*.yml", "*.yaml"],
"options": {
"parser": "yaml"
}
}
]
}
518 changes: 268 additions & 250 deletions client/README.md

Large diffs are not rendered by default.

153 changes: 153 additions & 0 deletions client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
"i18next": "^12.1.0",
"i18next-browser-languagedetector": "^2.2.4",
"i18next-xhr-backend": "^1.5.1",
"levenshtein-edit-distance": "^2.0.5",
"localforage": "^1.9.0",
"no-scroll": "^2.1.1",
"normalize-css": "^2.3.1",
"normalizr": "^3.2.4",
Expand All @@ -41,6 +43,7 @@
"redux": "^3.7.2",
"redux-logger": "^3.0.6",
"redux-thunk": "^2.2.0",
"semantic-ui-react": "^1.2.1",
"smoothscroll": "^0.4.0",
"stickybits": "^3.3.7",
"styled-components": "^3.4.9",
Expand Down
2 changes: 1 addition & 1 deletion client/public/google7567bc6a76d83989.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
google-site-verification: google7567bc6a76d83989.html
google-site-verification: google7567bc6a76d83989.html
25 changes: 23 additions & 2 deletions client/public/locales/en/translation.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"app": {
"courseChange": "Course change detected. If you added/deleted courses in another tab, please refresh this page to see the changes."
},
"common": {
"mon": "Mon",
"tue": "Tue",
Expand All @@ -10,9 +13,15 @@
},
"welcome": {
"welcome": "Welcome to WasedaTime!",
"newFeature": "New feature:",
"courseEvals": "Course Reviews",
"added": "is available!",
"returningUsers": "For returning users, your added courses are preserved.",
"next": "next",
"back": "back",
"done": "done",
"courseEvalsDetails1": "In syllabus search, course reivews can be",
"courseEvalsDetails2": "viewed by clicking the orange button.",
"Meet our developers!": "Meet our developers!",
"Founder": "Founder",
"Frontendtranslation": "Frontend & translation",
Expand All @@ -31,6 +40,7 @@
"timetable": "Timetable",
"syllabus": "Syllabus",
"roomfinder": "Rooms",
"joinus": "Join Us!",
"bus": "Bus",
"language": "Language"
},
Expand Down Expand Up @@ -94,6 +104,7 @@
"Others": "Others",
"IPSE": "IPSE",
"EN-based Undergrad Program": "EN-based Undergrad Program",
"IPSE/EN-based Undergrad Program": "IPSE / EN-based Undergrad Program",
"Filter by": "Filter by",
"semesterMap": {
"springSem": "Spring Semester",
Expand All @@ -103,15 +114,13 @@
"intensiveSpring": "Intensive: Spring",
"intensiveSummer": "Intensive: Summer",
"springSummer": "Spring & Summer",

"fallSem": "Fall Semester",
"fallQuart": "Fall Quarter",
"winterQuart": "Winter Quarter",
"intensiveFallSem": "Intensive: Fall Semester",
"intensiveFall": "Intensive: Fall",
"intensiveWinter": "Intensive: Winter",
"fallWinter": "Fall & Winter",

"intensiveSpringFallSem": "Intensive: Spring & Fall Semester",
"fullYear": "Full Year",
"undecided": "undecided"
Expand All @@ -127,6 +136,18 @@
"Course time": "Course time",
"langParam": "&pLng=en"
},
"courseEvals": {
"Reviews": "Reviews",
"Satisfaction": "Satisfaction",
"Difficulty": "Difficulty",
"Benefit": "Benefit",
"Related courses": "Related courses",
"Disclaimer": "The reviews do not represent the official position or opinion of WasedaTime.",
"Thank WTSA 1": "We appreciate",
"WTSA": "Waseda Taiwanese Student Association (WTSA)",
"Thank WTSA 2": "'s help for providing the reviews!",
"Related courses explanation": "Top 10 courses having the same course code and similar title"
},
"room": {
"Under Construction": "Under Construction",
"Want to help?": "Wanna build an amazing app with us?",
Expand Down
Loading

0 comments on commit b0ae82e

Please sign in to comment.