Merge pull request #2 from oppia/develop

update

.circleci/config.yml

@@ -56,10 +56,26 @@ jobs:
       - run: sudo pip install pyyaml
       - run:
           name: Run lint tests
+          # All the python scripts should behave as modules. Files like the
+          # pre_commit_linter and third_party_size_check need to import other
+          # Python files and that is only possible if we treat it as a module.
           command: |
             bash scripts/install_third_party.sh
-            python scripts/third_party_size_check.py
-            python scripts/pre_commit_linter.py --path=. --verbose
+            python -m scripts.third_party_size_check
+            python -m scripts.pre_commit_linter --path=. --verbose
+
+  typescript_tests:
+    <<: *job_defaults
+    steps:
+      - checkout
+      - run: date +%F > date
+      - restore_cache:
+          <<: *restore_cache
+      - run:
+          name: Run typescript tests
+          command: |
+            bash scripts/install_third_party.sh
+            python -m scripts.typescript_checks
 
   frontend_tests:
     <<: *job_defaults
@@ -68,6 +84,7 @@ jobs:
       - run: date +%F > date
       - restore_cache:
           <<: *restore_cache
+      - run: sudo pip install pyyaml
       - run:
           name: Run frontend tests
           command: |
@@ -86,6 +103,7 @@ jobs:
       - run: date +%F > date
       - restore_cache:
           <<: *restore_cache
+      - run: sudo pip install pyyaml
       - run:
           name: Run backend tests
           command: |
@@ -110,6 +128,9 @@ workflows:
       - lint_tests:
           requires:
             - setup
+      - typescript_tests:
+          requires:
+            - setup
       - frontend_tests:
           requires:
             - setup

.coveragerc

@@ -5,3 +5,8 @@ omit =
     */third_party/*
     */usr/*
     *_test.py
+    *core/tests/*
+    *__init__.py
+    # TODO(#7419): Remove python_utils from the list once the codebase is
+    # run under Python 3.
+    python_utils.py

.eslintignore

@@ -1,8 +1,8 @@
 core/templates/dev/head/expressions/ExpressionParserService.js
 backend_prod_files/*
 core/tests/protractor.conf.js
-extensions/interactions/LogicProof/static/js/generatedDefaultData.js
-extensions/interactions/LogicProof/static/js/generatedParser.js
+extensions/interactions/LogicProof/static/js/generatedDefaultData.ts
+extensions/interactions/LogicProof/static/js/generatedParser.ts
 integrations/*
 integrations_dev/*
 assets/scripts/*

.eslintrc

@@ -8,7 +8,8 @@
   ],
   "plugins": [
     "angular",
-    "html"
+    "html",
+    "@typescript-eslint"
   ],
   "overrides": [{
     // We exclude test files from dependency injection format checks because
@@ -118,8 +119,10 @@
     ],
     "max-len": [
       "error",
-      "code": 80,
-      "ignoreUrls": true
+      {
+        "code": 80,
+        "ignoreUrls": true
+      }
     ],
     "no-compare-neg": "off",
     "no-console": [
@@ -186,10 +189,9 @@
         "keywords": true
       }
     ],
-    "semi": [
-      "error",
-      "always"
-    ],
+    // The following must be off so that we can enable
+    // "@typescript-eslint/semi", which checks semicolons in TS files.
+    "semi": "off",
     "space-before-blocks": [
       "error",
       "always"
@@ -216,6 +218,14 @@
         "nonwords": false,
       }
     ],
+    "switch-colon-spacing": [
+      "error",
+      {
+        "after": true,
+        "before": false
+      }
+    ],
+    "@typescript-eslint/semi": ["error"],
     "wrap-iife": [
       "error",
       "any"

.github/CODEOWNERS

@@ -14,6 +14,7 @@
 # Angular Migration team
 /typings/ @ankita240796
 /tsconfig.json @ankita240796
+/tsconfig-for-compile-check.json @ankita240796
 
 
 # Answer classification team.
@@ -44,6 +45,14 @@
 /core/templates/dev/head/pages/collection-player-page/ @kevinlee12
 
 
+# Community contribution project
+/core/controllers/community_dashboard*.py @DubeySandeep
+/core/domain/opportunity_domain*.py @DubeySandeep
+/core/domain/opportunity_services*.py @DubeySandeep
+/core/storage/opportunity/ @DubeySandeep
+/core/templates/dev/head/pages/community-dashboard-page/ @DubeySandeep
+
+
 # Core documentation
 /AUTHORS @seanlip
 /CHANGELOG @seanlip
@@ -89,6 +98,7 @@
 /core/templates/dev/head/css/.stylelintrc @kevinlee12
 /tox.ini @kevinlee12
 /scripts/ @kevinlee12
+/ubuntu_dockerfile @ezl-13 @kevinlee12
 /Vagrantfile @kevinlee12
 
 
@@ -145,25 +155,27 @@
 
 
 # Global components and filters.
+/core/templates/dev/head/components/button-directives/exploration-embed-button.service.ts @ankita240796
+/core/templates/dev/head/components/button-directives/exploration-embed-button.directive.html @ankita240796
+/core/templates/dev/head/components/button-directives/social-buttons.directive.ts @ankita240796
+/core/templates/dev/head/components/button-directives/social-buttons.directive.html @ankita240796
 /core/templates/dev/head/components/common-layout-directives/common-elements/alert-message.directive.ts @ankita240796
 /core/templates/dev/head/components/common-layout-directives/common-elements/attribution-guide.directive.html @ankita240796
 /core/templates/dev/head/components/common-layout-directives/common-elements/attribution-guide.directive.ts @ankita240796
 /core/templates/dev/head/components/common-layout-directives/common-elements/background-banner.directive.ts @ankita240796
 /core/templates/dev/head/components/common-layout-directives/common-elements/background-banner.directive.html @ankita240796
-/core/templates/dev/head/components/button-directives/exploration-embed-button.service.ts @ankita240796
-/core/templates/dev/head/components/button-directives/exploration-embed-button.directive.html @ankita240796
+/core/templates/dev/head/components/common-layout-directives/common-elements/lazy-loading.directive.html @ankita240796
+/core/templates/dev/head/components/common-layout-directives/common-elements/lazy-loading.directive.ts @ankita240796
 /core/templates/dev/head/components/common-layout-directives/common-elements/loading-dots.directive.ts @ankita240796
 /core/templates/dev/head/components/common-layout-directives/common-elements/loading-dots.directive.html @ankita240796
 /core/templates/dev/head/components/common-layout-directives/common-elements/promo-bar.directive.ts @ankita240796
 /core/templates/dev/head/components/common-layout-directives/common-elements/promo-bar.directive.html @ankita240796
 /core/templates/dev/head/components/common-layout-directives/common-elements/sharing-links.directive.html @ankita240796
 /core/templates/dev/head/components/common-layout-directives/common-elements/sharing-links.directive.ts @ankita240796
-/core/templates/dev/head/components/button-directives/social-buttons.directive.ts @ankita240796
-/core/templates/dev/head/components/button-directives/social-buttons.directive.html @ankita240796
 /core/templates/dev/head/components/profile-link-directives/ @ankita240796
 /core/templates/dev/head/components/summary-tile/ @ankita240796
-/core/templates/dev/head/directives/focus-on.directive*.ts @ankita240796
 /core/templates/dev/head/directives/angular-html-bind.directive*.ts @ankita240796
+/core/templates/dev/head/directives/focus-on.directive*.ts @ankita240796
 /core/templates/dev/head/filters/ @ankita240796
 
 
@@ -185,6 +197,7 @@
 /core/templates/dev/head/services/contextual/UrlService*.ts @ankita240796
 /core/templates/dev/head/services/contextual/DeviceInfoService*.ts @ankita240796
 /core/templates/dev/head/services/contextual/WindowDimensionsService*.ts @ankita240796
+/core/templates/dev/head/services/contextual/WindowRefService.ts @YashJipkate
 
 
 # Global stylesheet.
@@ -259,6 +272,8 @@
 /core/templates/dev/head/components/concept-card/ @sophiewu6 @vinitamurthi
 /core/templates/dev/head/components/entity-creation-services/question-creation.service.ts @aks681 @vinitamurthi
 /core/templates/dev/head/components/score-ring/ @vinitamurthi
+/core/templates/dev/head/components/skill-mastery/ @sophiewu6 @vinitamurthi
+/core/templates/dev/head/components/skills-mastery-list/ @sophiewu6 @vinitamurthi
 /core/templates/dev/head/domain/question/ @aks681 @vinitamurthi
 /core/templates/dev/head/pages/practice-session-page/ @vinitamurthi
 /core/templates/dev/head/pages/review-test-page/ @sophiewu6 @vinitamurthi
@@ -274,6 +289,7 @@
 /core/domain/skill*.py @aks681
 /core/storage/skill/ @aks681
 /core/templates/dev/head/components/entity-creation-services/skill-creation.service.ts @aks681
+/core/templates/dev/head/components/rubrics-editor/ @aks681
 /core/templates/dev/head/domain/skill/ @aks681
 /core/templates/dev/head/pages/skill-editor-page/ @aks681
 
@@ -295,8 +311,10 @@
 /core/domain/topic*.py @aks681
 /core/storage/topic/ @aks681
 /core/templates/dev/head/components/entity-creation-services/topic-creation.service.ts.ts @aks681
+/core/templates/dev/head/domain/subtopic_viewer/ @aks681
 /core/templates/dev/head/domain/topic/ @aks681
 /core/templates/dev/head/domain/topic_viewer @aks681
+/core/templates/dev/head/pages/subtopic-viewer-page/ @aks681
 /core/templates/dev/head/pages/topic-editor-page/ @aks681
 /core/templates/dev/head/pages/topic-viewer-page/ @aks681
 
@@ -325,9 +343,13 @@
 /core/platform/ @seanlip @DubeySandeep
 /core/templates/dev/head/App*.ts @ankita240796
 /core/templates/dev/head/app.constants.ts @ankita240796
+/core/templates/dev/head/app.constants.ajs.ts @ankita240796
 /core/templates/dev/head/combined-tests.spec.ts @ankita240796
-/core/templates/dev/head/pages/interaction-specs.constants.ts @vojtechjelinek @Jamesjay4199
+/core/templates/dev/head/pages/interaction-specs.constants.ajs.ts @vojtechjelinek @Jamesjay4199
 /core/templates/dev/head/I18nFooter.ts @DubeySandeep
+/core/templates/dev/head/i18n-footer.directive.html @DubeySandeep
+/core/templates/dev/head/services/contextual/DocumentAttributeCustomizationService.ts @YashJipkate
+/core/templates/dev/head/services/contextual/MetaTagCustomizationService.ts @YashJipkate
 /core/templates/dev/head/services/TranslationFileHashLoaderService.ts @DubeySandeep
 
 
@@ -342,6 +364,7 @@
 /core/templates/dev/head/domain/utilities/ @DubeySandeep
 /schema_utils*.py @seanlip @DubeySandeep
 /utils*.py @aks681
+/python_utils*.py @lilithxxx
 
 
 # Restricted pages.
@@ -361,6 +384,7 @@
 
 # Rich text editor team.
 /core/templates/dev/head/components/ck-editor-helpers/ck-editor-4-rte.directive.ts @aks681
+/core/templates/dev/head/components/ck-editor-helpers/ck-editor-5-rte.directive.ts @aks681 @NishealJ
 /core/templates/dev/head/directives/mathjax-bind.directive.ts @aks681
 /core/templates/dev/head/mathjaxConfig.ts @aks681
 /core/templates/dev/head/components/ck-editor-helpers/ck-editor-4-widgets.initializer.ts @aks681
@@ -435,6 +459,7 @@
 /core/templates/dev/head/pages/profile-page/ @kevinlee12
 /core/templates/dev/head/services/UserService*.ts @kevinlee12
 
+/core/templates/dev/head/services/services.constants.ajs.ts @kevinlee12
 /core/templates/dev/head/services/services.constants.ts @kevinlee12
 
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -14,7 +14,7 @@
 - [ ] The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
 - [ ] The PR explanation includes the words "Fixes #bugnum: ..." (or "Fixes part of #bugnum" if the PR only partially fixes an issue).
 - [ ] The linter/Karma presubmit checks have passed.
-  - These should run automatically, but if not, you can manually trigger them locally using `python scripts/pre_commit_linter.py` and `bash scripts/run_frontend_tests.sh`.
+  - These should run automatically, but if not, you can manually trigger them locally using `python -m scripts.pre_commit_linter` and `bash scripts/run_frontend_tests.sh`.
 - [ ] The PR is made from a branch that's **not** called "develop".
 - [ ] The PR has an appropriate "PROJECT: ..." label (Please add this label for the first-pass review of the PR).
 - [ ] The PR has an appropriate "CHANGELOG: ..." label (If you are unsure of which label to add, ask the reviewers for guidance).

.gitignore

@@ -10,6 +10,7 @@ third_party/*
 assets/hashes.js
 backend_prod_files/*
 local_compiled_js/*
+local_compiled_js_for_test/*
 core/templates/prod/*
 core/templates/dev/head/dist/*
 core/tests/.browserstack.env
@@ -21,6 +22,7 @@ coverage.xml
 .vscode/*
 libpeerconnection.log
 tsc_output_log.txt
+dev_output.txt
 tmpcompiledjs*
 uploads/*
 env/

app_dev.yaml

@@ -139,6 +139,39 @@ handlers:
   secure: always
 
 # STATIC PAGES.
+- url: /about
+  static_files: core/templates/dev/head/dist/about-page.mainpage.html
+  upload: core/templates/dev/head/dist/about-page.mainpage.html
+  http_headers:
+    Pragma: no-cache
+    Strict-Transport-Security: "max-age=31536000; includeSubDomains"
+    X-Content-Type-Options: "nosniff"
+    X-Frame-Options: "DENY"
+    X-Xss-Protection: "1; mode=block"
+  secure: always
+  expiration: "0"
+- url: /contact
+  static_files: core/templates/dev/head/dist/contact-page.mainpage.html
+  upload: core/templates/dev/head/dist/contact-page.mainpage.html
+  http_headers:
+    Pragma: no-cache
+    Strict-Transport-Security: "max-age=31536000; includeSubDomains"
+    X-Content-Type-Options: "nosniff"
+    X-Frame-Options: "DENY"
+    X-Xss-Protection: "1; mode=block"
+  secure: always
+  expiration: "0"
+- url: /donate
+  static_files: core/templates/dev/head/dist/donate-page.mainpage.html
+  upload: core/templates/dev/head/dist/donate-page.mainpage.html
+  http_headers:
+    Pragma: no-cache
+    Strict-Transport-Security: "max-age=31536000; includeSubDomains"
+    X-Content-Type-Options: "nosniff"
+    X-Frame-Options: "DENY"
+    X-Xss-Protection: "1; mode=block"
+  secure: always
+  expiration: "0"
 - url: /get_started
   static_files: core/templates/dev/head/dist/get-started-page.mainpage.html
   upload: core/templates/dev/head/dist/get-started-page.mainpage.html
@@ -150,6 +183,17 @@ handlers:
     X-Xss-Protection: "1; mode=block"
   secure: always
   expiration: "0"
+- url: /privacy
+  static_files: core/templates/dev/head/dist/privacy-page.mainpage.html
+  upload: core/templates/dev/head/dist/privacy-page.mainpage.html
+  http_headers:
+    Pragma: no-cache
+    Strict-Transport-Security: "max-age=31536000; includeSubDomains"
+    X-Content-Type-Options: "nosniff"
+    X-Frame-Options: "DENY"
+    X-Xss-Protection: "1; mode=block"
+  secure: always
+  expiration: "0"
 - url: /splash
   static_files: core/templates/dev/head/dist/splash-page.mainpage.html
   upload: core/templates/dev/head/dist/splash-page.mainpage.html
@@ -172,7 +216,28 @@ handlers:
     X-Xss-Protection: "1; mode=block"
   secure: always
   expiration: "0"
-
+- url: /terms
+  static_files: core/templates/dev/head/dist/terms-page.mainpage.html
+  upload: core/templates/dev/head/dist/terms-page.mainpage.html
+  http_headers:
+    Pragma: no-cache
+    Strict-Transport-Security: "max-age=31536000; includeSubDomains"
+    X-Content-Type-Options: "nosniff"
+    X-Frame-Options: "DENY"
+    X-Xss-Protection: "1; mode=block"
+  secure: always
+  expiration: "0"
+- url: /thanks
+  static_files: core/templates/dev/head/dist/thanks-page.mainpage.html
+  upload: core/templates/dev/head/dist/thanks-page.mainpage.html
+  http_headers:
+    Pragma: no-cache
+    Strict-Transport-Security: "max-age=31536000; includeSubDomains"
+    X-Content-Type-Options: "nosniff"
+    X-Frame-Options: "DENY"
+    X-Xss-Protection: "1; mode=block"
+  secure: always
+  expiration: "0"
 - url: /.*
   script: main.app
   secure: always