From f127fc9f90621174be1304298c7a150b7193f682 Mon Sep 17 00:00:00 2001 From: darksnake Date: Sat, 3 Apr 2021 17:37:14 +0300 Subject: [PATCH] Fix biref --- package.json | 6 +-- src/content/en/pages/biref.md | 2 +- src/content/en/projects/education/labs.md | 6 +++ src/content/en/projects/software/biref.md | 14 ------ src/content/ru/magprog/partners.md | 2 +- src/content/ru/pages/biref.md | 2 +- src/content/ru/projects/education/labs.md | 6 +++ src/content/ru/projects/software/biref.md | 14 ------ src/pages/magprog/index.js | 22 +++++---- yarn.lock | 56 +++++++++++------------ 10 files changed, 60 insertions(+), 70 deletions(-) delete mode 100644 src/content/en/projects/software/biref.md delete mode 100644 src/content/ru/projects/software/biref.md diff --git a/package.json b/package.json index fb91213..7d5a280 100644 --- a/package.json +++ b/package.json @@ -53,9 +53,9 @@ "img-loader": "3.0.2", "react-dom": "^17.0.2", "uglifyjs-webpack-plugin": "2.2.0", - "webpack": "5.27.2", - "webpack-cli": "4.5.0", - "webpack-dev-server": "3.11.2" + "webpack": "^5.30.0", + "webpack-cli": "^4.6.0", + "webpack-dev-server": "^3.11.2" }, "keywords": [ "gatsby" diff --git a/src/content/en/pages/biref.md b/src/content/en/pages/biref.md index 33bcb02..8e787c2 100644 --- a/src/content/en/pages/biref.md +++ b/src/content/en/pages/biref.md @@ -41,7 +41,7 @@ language: en

Web-version

- The test version of the web-version of the program is available at http://npm.mipt.ru/apps/biref. + The test version of the web-version of the program is available at http://npm.mipt.ru/apps/biref. The web version works in exactly the same way as the Java version. To run it, you do not need to install anything, just follow the link. It is currently in test mode.

diff --git a/src/content/en/projects/education/labs.md b/src/content/en/projects/education/labs.md index 74ce6ba..48d9b7e 100644 --- a/src/content/en/projects/education/labs.md +++ b/src/content/en/projects/education/labs.md @@ -16,6 +16,12 @@ The group is involved in improving laboratory work at the department of general A software package and an additional description for processing data in laboratory work on birefringence in optics course (IV semester of general physics). +The web application is available [here](https://npm.mipt.ru/apps/biref). + +Details available at the [project page](/pages/biref). + +The code is [on the github](https://github.com/mipt-genphys/birefringence). + ### Manual for conducting and processing the results of a training experiment The manual is intended for junior students and describes the conduct, processing and presentation of the results of a typical educational experiment (laboratory work). diff --git a/src/content/en/projects/software/biref.md b/src/content/en/projects/software/biref.md deleted file mode 100644 index c9d35ef..0000000 --- a/src/content/en/projects/software/biref.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -content_type: project -project_type: software -id: biref -shortTitle: Birefringence -title: Data analysis in laboratory work on birefringence -order: 100 -published: true -language: en ---- - -Binary refraction laboratory work with dual implementation on Kotlin-JVM / JFreeChart and Kotlin-JS / Plotly. - -Details available at the [project page](/pages/biref). \ No newline at end of file diff --git a/src/content/ru/magprog/partners.md b/src/content/ru/magprog/partners.md index 7fb07b1..09eb660 100644 --- a/src/content/ru/magprog/partners.md +++ b/src/content/ru/magprog/partners.md @@ -8,7 +8,7 @@ language: ru * [ФПМИ](https://mipt.ru/education/departments/fpmi/) * [JetBrains Research](https://research.jetbrains.org/groups/npm/) * [JetBrains](https://www.jetbrains.com/) -* [Таврида электрик](https://www.tavrida.com/ter/) +* [Таврида Электрик](https://www.tavrida.com/ter/) * [ИЯИ РАН](https://www.inr.ru/) * [ИКИ РАН](http://www.iki.rssi.ru/) * [ОИЯИ](https://bmn.jinr.ru/) diff --git a/src/content/ru/pages/biref.md b/src/content/ru/pages/biref.md index 0b6027c..bf8f3ef 100644 --- a/src/content/ru/pages/biref.md +++ b/src/content/ru/pages/biref.md @@ -1,5 +1,5 @@ --- -content_type: page_education +content_type: course title: Лабораторная работа по двулучепреломлению shortTitle: Лабораторная работа по двулучепреломлению parent: education diff --git a/src/content/ru/projects/education/labs.md b/src/content/ru/projects/education/labs.md index caab6ce..6bcf88c 100644 --- a/src/content/ru/projects/education/labs.md +++ b/src/content/ru/projects/education/labs.md @@ -17,6 +17,12 @@ language: ru Создан программный пакет и дополнительное описание для обработки данных в лабораторной работе по двулучепреломлению в рамках курса оптики (IV семестр общей физики). +Веб приложение для обработки доступно [тут](https://npm.mipt.ru/apps/biref). + +Подробности на [странице проекта](/pages/biref). + +Исходный код [в github](https://github.com/mipt-genphys/birefringence). + ### Методическое пособие по проведению и обработке результатов учебного эксперимента Пособие предназначено для студентов младших курсов и описывает проведение, обработку и представление результатов типичного учебного эксперимента (лабораторной работы). diff --git a/src/content/ru/projects/software/biref.md b/src/content/ru/projects/software/biref.md deleted file mode 100644 index a7391b7..0000000 --- a/src/content/ru/projects/software/biref.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -content_type: project -project_type: software -id: biref -shortTitle: Двулучепреломление -title: Анализ данных в лабораторной работе по двулучепреломлению -order: 100 -published: true -language: ru ---- - -Обработка лабораторной работы по двулучепреломлению с двойной реализацией на Kotlin-JVM/JFreeChart и Kotlin-JS/Plotly. - -Подробности на [странице проекта](/pages/biref). \ No newline at end of file diff --git a/src/pages/magprog/index.js b/src/pages/magprog/index.js index 901f4c4..8e0d027 100644 --- a/src/pages/magprog/index.js +++ b/src/pages/magprog/index.js @@ -19,14 +19,19 @@ function mentors(edges) {

Научные руководители

{edges.map((edge) => { - return
-
- {edge.node.frontmatter.title}/ + const name = edge.node.frontmatter.title; + const id = edge.node.frontmatter.id + const photo = edge.node.frontmatter.photo; + + return
+
+ {name}
-

{edge.node.frontmatter.title}

+

{name}

{Parser(edge.node.html)} {/*
    @@ -54,13 +59,14 @@ function team(edges) {
{edges.map((edge) => { const name = edge.node.frontmatter.title; + const id = edge.node.frontmatter.id const photo = edge.node.frontmatter.photo; return ( -
-
+
+
{edge.node.frontmatter.title}/ + alt={name}/>
diff --git a/yarn.lock b/yarn.lock index 89723ed..1a4c074 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2619,22 +2619,22 @@ "@webassemblyjs/ast" "1.11.0" "@xtuc/long" "4.2.2" -"@webpack-cli/configtest@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.1.tgz#241aecfbdc715eee96bed447ed402e12ec171935" - integrity sha512-B+4uBUYhpzDXmwuo3V9yBH6cISwxEI4J+NO5ggDaGEEHb0osY/R7MzeKc0bHURXQuZjMM4qD+bSJCKIuI3eNBQ== +"@webpack-cli/configtest@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.2.tgz#2a20812bfb3a2ebb0b27ee26a52eeb3e3f000836" + integrity sha512-3OBzV2fBGZ5TBfdW50cha1lHDVf9vlvRXnjpVbJBa20pSZQaSkMJZiwA8V2vD9ogyeXn8nU5s5A6mHyf5jhMzA== -"@webpack-cli/info@^1.2.2": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.2.tgz#ef3c0cd947a1fa083e174a59cb74e0b6195c236c" - integrity sha512-5U9kUJHnwU+FhKH4PWGZuBC1hTEPYyxGSL5jjoBI96Gx8qcYJGOikpiIpFoTq8mmgX3im2zAo2wanv/alD74KQ== +"@webpack-cli/info@^1.2.3": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.3.tgz#ef819d10ace2976b6d134c7c823a3e79ee31a92c" + integrity sha512-lLek3/T7u40lTqzCGpC6CAbY6+vXhdhmwFRxZLMnRm6/sIF/7qMpT8MocXCRQfz0JAh63wpbXLMnsQ5162WS7Q== dependencies: envinfo "^7.7.3" -"@webpack-cli/serve@^1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.3.0.tgz#2730c770f5f1f132767c63dcaaa4ec28f8c56a6c" - integrity sha512-k2p2VrONcYVX1wRRrf0f3X2VGltLWcv+JzXRBDmvCxGlCeESx4OXw91TsWeKOkp784uNoVQo313vxJFHXPPwfw== +"@webpack-cli/serve@^1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.3.1.tgz#911d1b3ff4a843304b9c3bacf67bb34672418441" + integrity sha512-0qXvpeYO6vaNoRBI52/UsbcaBydJCggoBBnIo/ovQQdn6fug0BgwsjorV1hVS7fMqGVTZGcVxv8334gjmbj5hw== "@wry/context@^0.5.2": version "0.5.4" @@ -15743,15 +15743,15 @@ web-namespaces@^1.0.0, web-namespaces@^1.1.2: resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-1.1.4.tgz#bc98a3de60dadd7faefc403d1076d529f5e030ec" integrity sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw== -webpack-cli@4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.5.0.tgz#b5213b84adf6e1f5de6391334c9fa53a48850466" - integrity sha512-wXg/ef6Ibstl2f50mnkcHblRPN/P9J4Nlod5Hg9HGFgSeF8rsqDGHJeVe4aR26q9l62TUJi6vmvC2Qz96YJw1Q== +webpack-cli@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.6.0.tgz#27ae86bfaec0cf393fcfd58abdc5a229ad32fd16" + integrity sha512-9YV+qTcGMjQFiY7Nb1kmnupvb1x40lfpj8pwdO/bom+sQiP4OBMKjHq29YQrlDWDPZO9r/qWaRRywKaRDKqBTA== dependencies: "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^1.0.1" - "@webpack-cli/info" "^1.2.2" - "@webpack-cli/serve" "^1.3.0" + "@webpack-cli/configtest" "^1.0.2" + "@webpack-cli/info" "^1.2.3" + "@webpack-cli/serve" "^1.3.1" colorette "^1.2.1" commander "^7.0.0" enquirer "^2.3.6" @@ -15786,7 +15786,7 @@ webpack-dev-middleware@^4.1.0: range-parser "^1.2.1" schema-utils "^3.0.0" -webpack-dev-server@3.11.2, webpack-dev-server@^3.11.2: +webpack-dev-server@^3.11.2: version "3.11.2" resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz#695ebced76a4929f0d5de7fd73fafe185fe33708" integrity sha512-A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ== @@ -15869,10 +15869,10 @@ webpack-virtual-modules@^0.3.2: dependencies: debug "^3.0.0" -webpack@5.27.2: - version "5.27.2" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.27.2.tgz#44442219e1469ebe00292703b848580faae03f07" - integrity sha512-brNF3N/EdvMzkaZ/Xzb8sqPn5Si3iw6meqCnmNFtcnkorZsFZCBFMa2ElpIMjx6sKWYsnUpBO2dnX+7xgj+mjg== +webpack@^5.16.0, webpack@^5.23.00: + version "5.28.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.28.0.tgz#0de8bcd706186b26da09d4d1e8cbd3e4025a7c2f" + integrity sha512-1xllYVmA4dIvRjHzwELgW4KjIU1fW4PEuEnjsylz7k7H5HgPOctIq7W1jrt3sKH9yG5d72//XWzsHhfoWvsQVg== dependencies: "@types/eslint-scope" "^3.7.0" "@types/estree" "^0.0.46" @@ -15898,10 +15898,10 @@ webpack@5.27.2: watchpack "^2.0.0" webpack-sources "^2.1.1" -webpack@^5.16.0, webpack@^5.23.00: - version "5.28.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.28.0.tgz#0de8bcd706186b26da09d4d1e8cbd3e4025a7c2f" - integrity sha512-1xllYVmA4dIvRjHzwELgW4KjIU1fW4PEuEnjsylz7k7H5HgPOctIq7W1jrt3sKH9yG5d72//XWzsHhfoWvsQVg== +webpack@^5.30.0: + version "5.30.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.30.0.tgz#07d87c182a060e0c2491062f3dc0edc85a29d884" + integrity sha512-Zr9NIri5yzpfmaMea2lSMV1UygbW0zQsSlGLMgKUm63ACXg6alhd1u4v5UBSBjzYKXJN6BNMGVM7w165e7NxYA== dependencies: "@types/eslint-scope" "^3.7.0" "@types/estree" "^0.0.46"