Merge branch 'master' into 2398-dojoadminpage-create-the-page-for-adding-lessons

flacial · web-flow · commit 49fe969b6526 · 2022-12-01T21:13:19.000+04:00
diff --git a/components/DiffView.test.js b/components/DiffView.test.js
@@ -101,6 +101,19 @@ describe('DiffView component', () => {
     )
     expect(screen.getByText('js7/1.c')).toBeVisible()
   })
+  test('Should set JSX syntax if language is HTML', async () => {
+    const cDiff =
+      "diff --git a/js5/public/index.html b/js5/public/index.html\nnew file mode 100644\nindex 0000000..9d4ae75\n--- /dev/null\n+++ b/js5/public/index.html\n@@ -0,0 +1,142 @@\n+<html>\n+\n+<head>\n+  <meta charset=\"UTF-8\">\n+  <link rel=\"stylesheet\" type=\"text/css\" href=\"4.css\">\n+</head>\n+\n+<body>\n+  <div class=\"container\">\n+  </div>\n+<script>\n+  const container = document.querySelector('.container');\n+\n+function CreateLightsOff(value) {\n+  this.value = value;\n+  this.colsElements = [];\n+\n+  // All marks counter used for winning condition\n+  this.marks = 1;\n+\n+  const changeMark = neighborElement => {\n+    if (neighborElement.value.includes('mark')) {\n+      neighborElement.remove('mark');\n+      this.marks -= 1;\n+    } else {\n+      neighborElement.add('mark');\n+      this.marks += 1;\n+    }\n+  };\n+\n+  const allMarked = () => {\n+    if (this.value * this.value - this.marks === this.value * this.value) {\n+      const answer = parseInt(\n+        prompt(\n+          'Congrats! Type your next challenge number: (type 0 to stop playing)'\n+        )\n+      );\n+\n+      // Returns NaN (for other types) or number\n+      if (answer) {\n+        container.innerHTML = '';\n+        CreateLightsOff(answer);\n+      }\n+    }\n+  };\n+\n+  const modifyColsElements = (index, currentCol) => {\n+    const currentElementClass = this.colsElements[currentCol].children[index]\n+      .classList;\n+\n+    if (!currentElementClass.value.includes('mark')) {\n+      return;\n+    }\n+\n+    let topNeighbor;\n+\n+    if (this.colsElements[currentCol - 1]) {\n+      topNeighbor = this.colsElements[currentCol - 1].children[index].classList;\n+      changeMark(topNeighbor);\n+    }\n+\n+    let bottomNeighbor;\n+\n+    if (this.colsElements[currentCol + 1]) {\n+      bottomNeighbor = this.colsElements[currentCol + 1].children[index]\n+        .classList;\n+      changeMark(bottomNeighbor);\n+    }\n+\n+    let rightNeighbor;\n+\n+    if (this.colsElements[currentCol].children[index + 1]) {\n+      rightNeighbor = this.colsElements[currentCol].children[index + 1]\n+        .classList;\n+      changeMark(rightNeighbor);\n+    }\n+\n+    let leftNeighbor;\n+\n+    if (this.colsElements[currentCol].children[index - 1]) {\n+      leftNeighbor = this.colsElements[currentCol].children[index - 1]\n+        .classList;\n+      changeMark(leftNeighbor);\n+    }\n+\n+    currentElementClass.remove('mark');\n+    this.marks -= 1;\n+\n+    allMarked();\n+  };\n+\n+  const generateRows = (colCount, currentCol, i = 0, rows = []) => {\n+    if (i === colCount) return rows;\n+\n+    const block = document.createElement('div');\n+    block.classList.add('block');\n+\n+    block.addEventListener('click', () => {\n+      modifyColsElements(i, currentCol);\n+    });\n+\n+    rows.push(block);\n+\n+    return generateRows(colCount, currentCol, i + 1, rows);\n+  };\n+\n+  const generateColumns = (\n+    col,\n+    i = 0,\n+    randomIndex = Math.floor(Math.random() * col)\n+  ) => {\n+    if (i === col) return;\n+\n+    const rows = generateRows(col, i);\n+\n+    const colContainer = document.createElement('div');\n+    colContainer.classList.add('row', `row-${i}`);\n+\n+    rows.forEach(e => colContainer.append(e));\n+\n+    if (i === randomIndex) {\n+      const colChildren = colContainer.children;\n+      colChildren[randomIndex].classList.add('mark');\n+    }\n+\n+    this.colsElements.push(colContainer);\n+\n+    container.append(colContainer);\n+\n+    return generateColumns(col, i + 1, randomIndex);\n+  };\n+\n+  if (this.value) {\n+    generateColumns(this.value);\n+  }\n+}\n+\n+const g = new CreateLightsOff(2);\n+</script>\n+</body>\n+\n+</html>\n"
+    render(
+      <DiffView
+        submission={{ ...dummySumissions[0], diff: cDiff, comments: undefined }}
+        generalStatus={SubmissionStatus.Open}
+      />
+    )
+    expect(screen.getAllByText('CreateLightsOff')[0]).toHaveStyle({
+      color: 'rgb(221, 74, 104);'
+    })
+  })
   test('Should do nothing with incorrect diff', () => {
     const incorrectDiff =
       'diff --git \nindex 9c96b34..853bddf 100644\n---@@ -1,8 +1,19 @@\n-// write your code here!\n const solution = () => {\n-  // global clear all timeout:\n+  const allT = [];\n+  const old = setTimeout;\n+  window.setTimeout = (func, delay) => {\n+    const realTimeout = old(func, delay);\n+    allT.push(realTimeout);\n+    return realTimeout;\n+  };\n+  window.clearAllTimouts = () => {\n+    while (allT.length) {\n+      clearTimeout(allT.pop());\n+    }\n+  };\n   cat = () => {\n-  }\n+    window.clearAllTimouts();\n+  };\n };\n \n module.exports = solution;'
diff --git a/components/DiffView.tsx b/components/DiffView.tsx
@@ -82,8 +82,11 @@ const DiffView: React.FC<{
   const renderFile = ({ hunks, newPath }: File, fileIdx: number) => {
     const newValue: string[] = []
     if (!hunks.length || !newPath) return
-    let extension = newPath.split('.').pop()!
-    if (!prismLanguages.includes(extension)) extension = 'javascript'
+    const extension = newPath.split('.').pop()!
+
+    let language = extension === 'html' ? 'jsx' : extension
+
+    if (!prismLanguages.includes(language)) language = 'javascript'
     hunks.forEach(hunk => {
       hunk.changes.forEach(change => {
         if (!change.isDelete) newValue.push(change.content)
@@ -92,8 +95,8 @@ const DiffView: React.FC<{
     const syntaxHighlight = (str: string, n: number) => {
       const highlighted = Prism.highlight(
         str,
-        Prism.languages[extension],
-        extension
+        Prism.languages[language],
+        language
       )
       return (
         <>
diff --git a/next.config.js b/next.config.js
@@ -34,6 +34,9 @@ const moduleExports = {
   i18n: {
     locales: ['en'],
     defaultLocale: 'en'
+  },
+  sentry: {
+    hideSourceMaps: true
   }
 }
 
diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
     "@primer/octicons-react": "17.9.0",
     "@prisma/client": "4",
     "@quixo3/prisma-session-store": "^3.1.10",
-    "@sentry/nextjs": "^7.21.1",
+    "@sentry/nextjs": "^7.22.0",
     "apollo-server-micro": "^2.26.1",
     "apollo3-cache-persist": "^0.14.1",
     "bcrypt": "5.0.0",
@@ -74,14 +74,14 @@
     "yup": "^0.32.11"
   },
   "devDependencies": {
-    "@graphql-codegen/cli": "^2.13.12",
+    "@graphql-codegen/cli": "^2.15.0",
     "@graphql-codegen/typescript": "^2.8.0",
     "@graphql-codegen/typescript-apollo-client-helpers": "^2.2.6",
     "@graphql-codegen/typescript-operations": "^2.5.7",
-    "@graphql-codegen/typescript-react-apollo": "^3.3.6",
+    "@graphql-codegen/typescript-react-apollo": "^3.3.7",
     "@graphql-codegen/typescript-resolvers": "^2.7.7",
     "@jest/types": "^29.2.1",
-    "@next/eslint-plugin-next": "^13.0.4",
+    "@next/eslint-plugin-next": "^13.0.5",
     "@storybook/addon-actions": "^6.5.9",
     "@storybook/addon-essentials": "^6.5.13",
     "@storybook/addon-storyshots": "^6.5.13",
@@ -94,7 +94,7 @@
     "@testing-library/user-event": "^14.4.3",
     "@types/bcrypt": "^5.0.0",
     "@types/express-session": "^1.17.5",
-    "@types/lodash": "^4.14.189",
+    "@types/lodash": "^4.14.191",
     "@types/mdx-js__react": "^1.5.5",
     "@types/node": "^16.7.5",
     "@types/nodemailer": "^6.4.6",
@@ -108,7 +108,7 @@
     "copy-webpack-plugin": "^11.0.0",
     "cross-env": "^7.0.3",
     "eslint": "^7.32.0",
-    "eslint-config-next": "^13.0.4",
+    "eslint-config-next": "^13.0.5",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-mdx": "^1.17.1",
     "eslint-plugin-prettier": "^4.2.1",
@@ -118,7 +118,7 @@
     "identity-obj-proxy": "^3.0.0",
     "jest": "^27.5.1",
     "jest-mock-extended": "^3.0.1",
-    "lint-staged": "^13.0.3",
+    "lint-staged": "^13.0.4",
     "prettier": "^2.8.0",
     "prisma": "4",
     "react-test-renderer": "^17.0.1",
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,9 @@ const moduleExports = {`
`34`	`34`	`i18n: {`
`35`	`35`	`locales: ['en'],`
`36`	`36`	`defaultLocale: 'en'`
	`37`	`+ },`
	`38`	`+ sentry: {`
	`39`	`+ hideSourceMaps: true`
`37`	`40`	`}`
`38`	`41`	`}`
`39`	`42`