diff --git a/.space.kts b/.space.kts new file mode 100644 index 0000000..d15e264 --- /dev/null +++ b/.space.kts @@ -0,0 +1,21 @@ +job("Deploy") { + container(displayName = "Build and install", image = "openjdk:11") { + kotlinScript { api -> + // here can be your complex logic + api.gradlew("installDist") + } + } + container(displayName = "Deploy", image = "openjdk:11") { + env["HOST"] = Params("sciprog-host") + env["ID"] = Secrets("sciprog-webmaster-id") + + shellScript { + interpreter = "/bin/bash" + content = """ + echo Hello + echo World! + """ + } + } + +} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index e5794a7..ce4690d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,11 +3,10 @@ import ru.mipt.npm.gradle.KScienceVersions plugins { id("ru.mipt.npm.gradle.project") id("ru.mipt.npm.gradle.jvm") - id("org.hidetake.ssh") version "2.10.1" application } -repositories{ +repositories { mavenLocal() } @@ -45,8 +44,8 @@ kotlin { explicitApi = org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode.Disabled } -tasks.withType{ - kotlinOptions{ +tasks.withType { + kotlinOptions { freeCompilerArgs = freeCompilerArgs + "-Xcontext-receivers" } } diff --git a/data/home/content/people/Nozik.md b/data/home/content/people/Nozik.md index ad0e1ea..896cd66 100644 --- a/data/home/content/people/Nozik.md +++ b/data/home/content/people/Nozik.md @@ -7,7 +7,7 @@ language: en image: images/people/nozik_2.png --- -** Director of the centre ** +**Director of the centre** * PhD in particle physics. * Director of [Scientific Programming Centre](/). diff --git a/data/magprog/assets/images/mentors/Nizovtseva.jpg b/data/magprog/assets/images/mentors/Nizovtseva.jpg deleted file mode 100644 index 3b871b1..0000000 Binary files a/data/magprog/assets/images/mentors/Nizovtseva.jpg and /dev/null differ diff --git a/data/magprog/assets/images/favicon-32x32.png b/data/magprog/images/favicon-32x32.png similarity index 100% rename from data/magprog/assets/images/favicon-32x32.png rename to data/magprog/images/favicon-32x32.png diff --git a/data/magprog/assets/images/mentors/Dolgonosov.jpg b/data/magprog/images/mentors/Dolgonosov.jpg similarity index 100% rename from data/magprog/assets/images/mentors/Dolgonosov.jpg rename to data/magprog/images/mentors/Dolgonosov.jpg diff --git a/data/magprog/assets/images/mentors/Gertsenberger.jpg b/data/magprog/images/mentors/Gertsenberger.jpg similarity index 100% rename from data/magprog/assets/images/mentors/Gertsenberger.jpg rename to data/magprog/images/mentors/Gertsenberger.jpg diff --git a/data/magprog/assets/images/mentors/Grinis.jpg b/data/magprog/images/mentors/Grinis.jpg similarity index 100% rename from data/magprog/assets/images/mentors/Grinis.jpg rename to data/magprog/images/mentors/Grinis.jpg diff --git a/data/magprog/assets/images/mentors/Kalashev.jpg b/data/magprog/images/mentors/Kalashev.jpg similarity index 100% rename from data/magprog/assets/images/mentors/Kalashev.jpg rename to data/magprog/images/mentors/Kalashev.jpg diff --git a/data/magprog/assets/images/mentors/Khokhriakov.jpg b/data/magprog/images/mentors/Khokhriakov.jpg similarity index 100% rename from data/magprog/assets/images/mentors/Khokhriakov.jpg rename to data/magprog/images/mentors/Khokhriakov.jpg diff --git a/data/magprog/assets/images/mentors/Klimai.jpg b/data/magprog/images/mentors/Klimai.jpg similarity index 100% rename from data/magprog/assets/images/mentors/Klimai.jpg rename to data/magprog/images/mentors/Klimai.jpg diff --git a/data/magprog/assets/images/mentors/Kostunin.jpg b/data/magprog/images/mentors/Kostunin.jpg similarity index 100% rename from data/magprog/assets/images/mentors/Kostunin.jpg rename to data/magprog/images/mentors/Kostunin.jpg diff --git a/data/magprog/images/mentors/Nizovtseva.jpg b/data/magprog/images/mentors/Nizovtseva.jpg new file mode 100644 index 0000000..8aac95c Binary files /dev/null and b/data/magprog/images/mentors/Nizovtseva.jpg differ diff --git a/data/magprog/assets/images/mentors/Nozik.jpg b/data/magprog/images/mentors/Nozik.jpg similarity index 100% rename from data/magprog/assets/images/mentors/Nozik.jpg rename to data/magprog/images/mentors/Nozik.jpg diff --git a/data/magprog/assets/images/mentors/Oliinychenko.jpg b/data/magprog/images/mentors/Oliinychenko.jpg similarity index 100% rename from data/magprog/assets/images/mentors/Oliinychenko.jpg rename to data/magprog/images/mentors/Oliinychenko.jpg diff --git a/data/magprog/assets/images/mentors/Pantuev.jpg b/data/magprog/images/mentors/Pantuev.jpg similarity index 100% rename from data/magprog/assets/images/mentors/Pantuev.jpg rename to data/magprog/images/mentors/Pantuev.jpg diff --git a/data/magprog/assets/images/mentors/Pshenichnov.jpg b/data/magprog/images/mentors/Pshenichnov.jpg similarity index 100% rename from data/magprog/assets/images/mentors/Pshenichnov.jpg rename to data/magprog/images/mentors/Pshenichnov.jpg diff --git a/data/magprog/assets/images/mentors/Shagalov.jpg b/data/magprog/images/mentors/Shagalov.jpg similarity index 100% rename from data/magprog/assets/images/mentors/Shagalov.jpg rename to data/magprog/images/mentors/Shagalov.jpg diff --git a/data/magprog/assets/images/mentors/Skasyrskaya.jpg b/data/magprog/images/mentors/Skasyrskaya.jpg similarity index 100% rename from data/magprog/assets/images/mentors/Skasyrskaya.jpg rename to data/magprog/images/mentors/Skasyrskaya.jpg diff --git a/data/magprog/assets/images/mentors/Svetlichny.jpg b/data/magprog/images/mentors/Svetlichny.jpg similarity index 100% rename from data/magprog/assets/images/mentors/Svetlichny.jpg rename to data/magprog/images/mentors/Svetlichny.jpg diff --git a/data/magprog/assets/images/mentors/Template.jpg b/data/magprog/images/mentors/Template.jpg similarity index 100% rename from data/magprog/assets/images/mentors/Template.jpg rename to data/magprog/images/mentors/Template.jpg diff --git a/data/magprog/assets/images/mentors/Usmanov.jpg b/data/magprog/images/mentors/Usmanov.jpg similarity index 100% rename from data/magprog/assets/images/mentors/Usmanov.jpg rename to data/magprog/images/mentors/Usmanov.jpg diff --git a/data/magprog/assets/images/mentors/Zinoviev.jpg b/data/magprog/images/mentors/Zinoviev.jpg similarity index 100% rename from data/magprog/assets/images/mentors/Zinoviev.jpg rename to data/magprog/images/mentors/Zinoviev.jpg diff --git a/data/magprog/assets/images/partners/FPMI.jpg b/data/magprog/images/partners/FPMI.jpg similarity index 100% rename from data/magprog/assets/images/partners/FPMI.jpg rename to data/magprog/images/partners/FPMI.jpg diff --git a/data/magprog/assets/images/partners/JBR.png b/data/magprog/images/partners/JBR.png similarity index 100% rename from data/magprog/assets/images/partners/JBR.png rename to data/magprog/images/partners/JBR.png diff --git a/data/magprog/assets/images/partners/LPI.jpg b/data/magprog/images/partners/LPI.jpg similarity index 100% rename from data/magprog/assets/images/partners/LPI.jpg rename to data/magprog/images/partners/LPI.jpg diff --git a/data/magprog/assets/images/partners/Tavrida.png b/data/magprog/images/partners/Tavrida.png similarity index 100% rename from data/magprog/assets/images/partners/Tavrida.png rename to data/magprog/images/partners/Tavrida.png diff --git a/data/magprog/assets/images/partners/aramco.jpg b/data/magprog/images/partners/aramco.jpg similarity index 100% rename from data/magprog/assets/images/partners/aramco.jpg rename to data/magprog/images/partners/aramco.jpg diff --git a/data/magprog/assets/images/partners/biotech.png b/data/magprog/images/partners/biotech.png similarity index 100% rename from data/magprog/assets/images/partners/biotech.png rename to data/magprog/images/partners/biotech.png diff --git a/data/magprog/assets/images/partners/desy.svg b/data/magprog/images/partners/desy.svg similarity index 100% rename from data/magprog/assets/images/partners/desy.svg rename to data/magprog/images/partners/desy.svg diff --git a/data/magprog/assets/images/partners/hse.jpg b/data/magprog/images/partners/hse.jpg similarity index 100% rename from data/magprog/assets/images/partners/hse.jpg rename to data/magprog/images/partners/hse.jpg diff --git a/data/magprog/assets/images/partners/iki.jpg b/data/magprog/images/partners/iki.jpg similarity index 100% rename from data/magprog/assets/images/partners/iki.jpg rename to data/magprog/images/partners/iki.jpg diff --git a/data/magprog/assets/images/partners/inr_logo.png b/data/magprog/images/partners/inr_logo.png similarity index 100% rename from data/magprog/assets/images/partners/inr_logo.png rename to data/magprog/images/partners/inr_logo.png diff --git a/data/magprog/assets/images/partners/jetbrains.png b/data/magprog/images/partners/jetbrains.png similarity index 100% rename from data/magprog/assets/images/partners/jetbrains.png rename to data/magprog/images/partners/jetbrains.png diff --git a/data/magprog/assets/images/partners/jinr.png b/data/magprog/images/partners/jinr.png similarity index 100% rename from data/magprog/assets/images/partners/jinr.png rename to data/magprog/images/partners/jinr.png diff --git a/data/magprog/assets/images/partners/tink.jpg b/data/magprog/images/partners/tink.jpg similarity index 100% rename from data/magprog/assets/images/partners/tink.jpg rename to data/magprog/images/partners/tink.jpg diff --git a/data/magprog/assets/images/team/Aivazov.jpg b/data/magprog/images/team/Aivazov.jpg similarity index 100% rename from data/magprog/assets/images/team/Aivazov.jpg rename to data/magprog/images/team/Aivazov.jpg diff --git a/data/magprog/assets/images/team/muhina.jpg b/data/magprog/images/team/muhina.jpg similarity index 100% rename from data/magprog/assets/images/team/muhina.jpg rename to data/magprog/images/team/muhina.jpg diff --git a/data/magprog/assets/images/team/svetlichny.jpeg b/data/magprog/images/team/svetlichny.jpeg similarity index 100% rename from data/magprog/assets/images/team/svetlichny.jpeg rename to data/magprog/images/team/svetlichny.jpeg diff --git a/src/main/kotlin/ru/mipt/spc/master.kt b/src/main/kotlin/ru/mipt/spc/master.kt index 45eaaf3..bad772a 100644 --- a/src/main/kotlin/ru/mipt/spc/master.kt +++ b/src/main/kotlin/ru/mipt/spc/master.kt @@ -273,10 +273,15 @@ internal fun Application.spcMaster(context: Context, dataPath: Path, prefix: Str routing { route(prefix) { with(magProgPageContext) { - static { + static{ files(dataPath.resolve("assets").toFile()) + + static("images") { + files(dataPath.resolve("images").toFile()) + } } + get { call.respondHtml { val sections = listOf(