diff --git a/.gitignore b/.gitignore index ed0a0ee..0ad328c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,39 +1,7 @@ -.gradle +.gradle/ build/ +.idea/ +/logs/ +/data/deployDate + !gradle/wrapper/gradle-wrapper.jar -!**/src/main/**/build/ -!**/src/test/**/build/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache -bin/ -!**/src/main/**/bin/ -!**/src/test/**/bin/ - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr -out/ -!**/src/main/**/out/ -!**/src/test/**/out/ - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ - -### VS Code ### -.vscode/ - - -/logs/ \ No newline at end of file diff --git a/.space.kts b/.space.kts index d15e264..cb9b85a 100644 --- a/.space.kts +++ b/.space.kts @@ -12,9 +12,8 @@ job("Deploy") { shellScript { interpreter = "/bin/bash" content = """ - echo Hello - echo World! - """ + ls -la + """.trimIndent() } } diff --git a/data/home/content/consulting.md b/data/home/content/consulting.md index 33505f5..657ff06 100644 --- a/data/home/content/consulting.md +++ b/data/home/content/consulting.md @@ -10,4 +10,6 @@ The centre provides a number of commercial services: * Architecture for scientific applications. * Scientific open source project development and support. -**This page is work in progress.** \ No newline at end of file +**This page is work in progress.** + +email: research@sciprog.center \ No newline at end of file diff --git a/data/home/content/people/Nozik.md b/data/home/content/people/Nozik.md index 896cd66..f000322 100644 --- a/data/home/content/people/Nozik.md +++ b/data/home/content/people/Nozik.md @@ -15,6 +15,8 @@ image: images/people/nozik_2.png * (ex) Team lead at [JetBrains Research](https://research.jetbrains.org/groups/npm/). * Google developer expert in Kotlin. +email: director@sciprog.center +
- I am against the war in Ukraine. It must be stopped.
diff --git a/data/home/content/people/Nozik[info].md b/data/home/content/people/Nozik[info].md index b0ee7ce..921ac9b 100644 --- a/data/home/content/people/Nozik[info].md +++ b/data/home/content/people/Nozik[info].md @@ -4,4 +4,6 @@ * Director of [Scientific Programming Centre](/). * Senior researcher at https://npm.mipt.ru. * (ex) Team lead at [JetBrains Research](https://research.jetbrains.org/groups/npm/). -* Google developer expert in Kotlin. \ No newline at end of file +* Google developer expert in Kotlin. + +email: director@sciprog.center \ No newline at end of file diff --git a/data/home/content/research.md b/data/home/content/research.md index eaae097..32f97b0 100644 --- a/data/home/content/research.md +++ b/data/home/content/research.md @@ -3,3 +3,5 @@ type: page title: Research language: en --- + +email: research@sciprog.center \ No newline at end of file diff --git a/data/magprog/assets/images/mentors/Kharuk.JPG b/data/magprog/assets/images/mentors/Kharuk.JPG deleted file mode 100644 index 6770188..0000000 Binary files a/data/magprog/assets/images/mentors/Kharuk.JPG and /dev/null differ diff --git a/data/magprog/content/contacts.md b/data/magprog/content/contacts.md index 4c64af9..c301944 100644 --- a/data/magprog/content/contacts.md +++ b/data/magprog/content/contacts.md @@ -5,6 +5,6 @@ section_title: Контакты language: ru --- -Все вопросы можно задать в телеграм-канале лаборатории: [https://t.me/mipt_npm](https://t.me/mipt_npm). +Все вопросы можно задать в телеграм-канале лаборатории MIPT-NPM: [https://t.me/mipt_npm](https://t.me/mipt_npm). -Также можно писать на электронную почту: npm@mipt.ru. +Также можно писать на электронную почту: edu@sciprog.center. diff --git a/data/magprog/content/mentors/kharuk.md b/data/magprog/content/mentors/kharuk.md index 7f48e22..4ea92cf 100644 --- a/data/magprog/content/mentors/kharuk.md +++ b/data/magprog/content/mentors/kharuk.md @@ -2,7 +2,7 @@ content_type: magprog_mentor name: Иван Харук id: Kharuk -photo: images/mentors/Kharuk.JPG +photo: images/mentors/Kharuk.jpg language: ru --- diff --git a/data/magprog/images/mentors/Kharuk.jpg b/data/magprog/images/mentors/Kharuk.jpg new file mode 100644 index 0000000..755e98f Binary files /dev/null and b/data/magprog/images/mentors/Kharuk.jpg differ diff --git a/data/magprog/assets/images/mentors/Kondratov.jpg b/data/magprog/images/mentors/Kondratov.jpg similarity index 100% rename from data/magprog/assets/images/mentors/Kondratov.jpg rename to data/magprog/images/mentors/Kondratov.jpg diff --git a/src/main/kotlin/ru/mipt/spc/Application.kt b/src/main/kotlin/ru/mipt/spc/Application.kt index 21061a0..6e1494c 100644 --- a/src/main/kotlin/ru/mipt/spc/Application.kt +++ b/src/main/kotlin/ru/mipt/spc/Application.kt @@ -41,7 +41,7 @@ private fun Application.resolveData(uri: URI, targetPath: Path): Path { } const val DEPLOY_DATE_FILE = "deployDate" -const val BUILD_DATE_FILE = "buildDate" +const val BUILD_DATE_FILE = "/buildDate" @Suppress("unused") fun Application.spcModule() { @@ -64,7 +64,9 @@ fun Application.spcModule() { dataPath.createDirectories() dataPath.resolve(DEPLOY_DATE_FILE).writeText(LocalDateTime.now().toString()) } else if (deployDate == null && buildDate != null) { - //Writing deploy date in production mode + + //Writing deploy date in production mode if it does not exist + dataPath.createDirectories() dataPath.resolve(DEPLOY_DATE_FILE).writeText(LocalDateTime.now().toString()) }