diff --git a/build.gradle.kts b/build.gradle.kts index adda388..f956679 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,10 +14,10 @@ group = "ru.mipt.npm" version = "0.0.1-SNAPSHOT" application { - mainClass.set("ru.mipt.ApplicationKt") + mainClass.set("ru.mipt.spc.ApplicationKt") val isDevelopment: Boolean = project.ext.has("development") - applicationDefaultJvmArgs = listOf("-Dio.ktor.development=$isDevelopment") + applicationDefaultJvmArgs = listOf("-Dio.ktor.development=$isDevelopment", "-Xmx200M") } tasks.withType{ diff --git a/gradle.properties b/gradle.properties index 7d0dfa5..a902a04 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,5 @@ kotlin.code.style=official toolsVersion=0.11.4-kotlin-1.6.20 + +#development=true diff --git a/src/main/kotlin/ru/mipt/Application.kt b/src/main/kotlin/ru/mipt/Application.kt deleted file mode 100644 index fb779d3..0000000 --- a/src/main/kotlin/ru/mipt/Application.kt +++ /dev/null @@ -1,78 +0,0 @@ -package ru.mipt - -import io.ktor.http.HttpStatusCode -import io.ktor.server.application.Application -import io.ktor.server.application.call -import io.ktor.server.application.install -import io.ktor.server.engine.embeddedServer -import io.ktor.server.html.respondHtml -import io.ktor.server.http.content.files -import io.ktor.server.http.content.static -import io.ktor.server.netty.Netty -import io.ktor.server.plugins.statuspages.StatusPages -import io.ktor.server.response.respond -import io.ktor.server.routing.get -import io.ktor.server.routing.route -import io.ktor.server.routing.routing -import kotlinx.css.CssBuilder -import kotlinx.html.CommonAttributeGroupFacade -import kotlinx.html.style -import ru.mipt.plugins.configureTemplating -import ru.mipt.spc.magprog.DataSetPageContext -import ru.mipt.spc.magprog.PageContext -import ru.mipt.spc.magprog.magProgPage -import space.kscience.dataforge.context.Context -import space.kscience.dataforge.io.io -import space.kscience.snark.DirectoryDataTree -import space.kscience.snark.SnarkPlugin -import java.nio.file.Path - -fun CommonAttributeGroupFacade.css(block: CssBuilder.() -> Unit) { - style = CssBuilder().block().toString() -} - -class AuthenticationException : RuntimeException() -class AuthorizationException : RuntimeException() - -internal fun Application.magProgPage(rootPath: Path, prefix: String = "magprog") { - val context = Context("spc-site") { - plugin(SnarkPlugin) - } - - val io = context.io - val content = DirectoryDataTree(io, rootPath.resolve("content")) - - - val magprogPageContext: PageContext = DataSetPageContext(context, prefix, content) - - routing { - route(prefix) { - get { - call.respondHtml { - with(magprogPageContext) { - magProgPage() - } - } - } - static { - files(rootPath.resolve("assets").toFile()) - } - } - } -} - - -fun main() { - embeddedServer(Netty, port = 8080, host = "0.0.0.0") { - magProgPage(rootPath = Path.of(javaClass.getResource("/magprog")!!.toURI())) - install(StatusPages) { - exception { call, _ -> - call.respond(HttpStatusCode.Unauthorized) - } - exception { call, _ -> - call.respond(HttpStatusCode.Forbidden) - } - } - configureTemplating() - }.start(wait = true) -} diff --git a/src/main/kotlin/ru/mipt/spc/Application.kt b/src/main/kotlin/ru/mipt/spc/Application.kt new file mode 100644 index 0000000..8b35d88 --- /dev/null +++ b/src/main/kotlin/ru/mipt/spc/Application.kt @@ -0,0 +1,57 @@ +package ru.mipt.spc + +import io.ktor.http.HttpStatusCode +import io.ktor.server.application.install +import io.ktor.server.engine.embeddedServer +import io.ktor.server.netty.Netty +import io.ktor.server.plugins.statuspages.StatusPages +import io.ktor.server.response.respond +import kotlinx.css.CssBuilder +import kotlinx.html.CommonAttributeGroupFacade +import kotlinx.html.style +import ru.mipt.spc.magprog.magProgPage +import space.kscience.dataforge.context.Context +import space.kscience.snark.SnarkPlugin +import java.net.URI +import java.nio.file.FileSystemNotFoundException +import java.nio.file.FileSystems +import java.nio.file.Path +import java.nio.file.Paths + +fun CommonAttributeGroupFacade.css(block: CssBuilder.() -> Unit) { + style = CssBuilder().block().toString() +} + +class AuthenticationException : RuntimeException() +class AuthorizationException : RuntimeException() + +private fun useResource(uri: URI, block: (Path) -> Unit) { + try { + block(Paths.get(uri)) + } catch (ex: FileSystemNotFoundException) { + FileSystems.newFileSystem(uri, emptyMap()).use { fs -> + val p: Path = fs.provider().getPath(uri) + block(p) + } + } +} + +fun main() { + val context = Context("spc-site") { + plugin(SnarkPlugin) + } + embeddedServer(Netty, port = 8080, watchPaths = listOf("classes", "resources")) { + useResource(javaClass.getResource("/magprog")!!.toURI()) { + install(StatusPages) { + exception { call, _ -> + call.respond(HttpStatusCode.Unauthorized) + } + exception { call, _ -> + call.respond(HttpStatusCode.Forbidden) + } + } + magProgPage(context, rootPath = it) + } + }.start(wait = true) + +} diff --git a/src/main/kotlin/ru/mipt/plugins/Templating.kt b/src/main/kotlin/ru/mipt/spc/Templating.kt similarity index 98% rename from src/main/kotlin/ru/mipt/plugins/Templating.kt rename to src/main/kotlin/ru/mipt/spc/Templating.kt index 06eed6f..e80d523 100644 --- a/src/main/kotlin/ru/mipt/plugins/Templating.kt +++ b/src/main/kotlin/ru/mipt/spc/Templating.kt @@ -1,4 +1,4 @@ -package ru.mipt.plugins +package ru.mipt import io.ktor.http.ContentType import io.ktor.server.application.Application diff --git a/src/main/kotlin/ru/mipt/spc/magprog/DataSetPageContext.kt b/src/main/kotlin/ru/mipt/spc/magprog/DataSetPageContext.kt index fd4bead..3d9bd3f 100644 --- a/src/main/kotlin/ru/mipt/spc/magprog/DataSetPageContext.kt +++ b/src/main/kotlin/ru/mipt/spc/magprog/DataSetPageContext.kt @@ -30,7 +30,7 @@ class DataSetPageContext( val dataSet: DataSet, ) : PageContext { - override fun resolveResource(name: String): String = "$prefix/$name" + override fun resolveRef(name: String): String = "$prefix/$name" private val markdownFlavor = CommonMarkFlavourDescriptor() private val markdownParser = MarkdownParser(markdownFlavor) @@ -65,9 +65,10 @@ class DataSetPageContext( private val Data<*>.published: Boolean get() = meta["published"].string != "false" + @Suppress("UNCHECKED_CAST") @DFInternal override fun resolve(type: KType, name: Name): Data? { - val data: Data = dataSet.get(name) ?: return null + val data: Data = dataSet[name] ?: return null return if (type == typeOf() && data.type == typeOf()) { data as Data when (data.meta[META_FILE_EXTENSION_KEY].string) { diff --git a/src/main/kotlin/ru/mipt/spc/magprog/PageContext.kt b/src/main/kotlin/ru/mipt/spc/magprog/PageContext.kt index 0e8c647..4e1e215 100644 --- a/src/main/kotlin/ru/mipt/spc/magprog/PageContext.kt +++ b/src/main/kotlin/ru/mipt/spc/magprog/PageContext.kt @@ -18,7 +18,7 @@ interface PageContext: ContextAware { /** * Resolve a resource full path by its name */ - fun resolveResource(name: String): String + fun resolveRef(name: String): String @DFInternal fun resolve(type: KType, name: Name): Data? @@ -37,6 +37,8 @@ interface PageContext: ContextAware { fun resolveAllHtml(filter: (name: Name, meta: Meta) -> Boolean): Map } +val PageContext.homeRef get() = resolveRef("").removeSuffix("/") + @OptIn(DFInternal::class) inline fun PageContext.resolve(name: Name): Data? = resolve(typeOf(), name) diff --git a/src/main/kotlin/ru/mipt/spc/magprog/Person.kt b/src/main/kotlin/ru/mipt/spc/magprog/Person.kt deleted file mode 100644 index 49d1550..0000000 --- a/src/main/kotlin/ru/mipt/spc/magprog/Person.kt +++ /dev/null @@ -1,78 +0,0 @@ -package ru.mipt.spc.magprog - -import kotlinx.css.* -import kotlinx.html.* -import ru.mipt.css -import space.kscience.dataforge.meta.string -import space.kscience.snark.HtmlData -import space.kscience.snark.htmlData -import space.kscience.snark.id -import space.kscience.snark.order - -class Person(val block: HtmlData) : HtmlData by block { - val name: String by meta.string { error("Mentor name is not defined") } - val photo: String? by meta.string() -} - -context(PageContext) -private fun FlowContent.personCards(list: List, prefix: String) { - list.forEach { mentor -> - section { - id = mentor.id - div("image main") { - mentor.photo?.let { photoPath -> - img( - src = resolveResource(photoPath).toString(), - alt = mentor.name - ) - } - } - div("content") { - div("inner") { - h2 { - a(href = "#${prefix}_${mentor.id}") { +mentor.name } - } - htmlData(mentor.block) - } - } - } - } -} - -context(PageContext) -fun FlowContent.mentors() { - val mentors = findByType("magprog_mentor").values.map { - Person(it) - }.sortedBy { it.order } - - div("header") { - css { - display = Display.flex - alignItems = Align.center - justifyContent = JustifyContent.center - marginLeft = 40.pt - } - h1("title") { - +"Научные руководители" - } - } - personCards(mentors,"mentor") -} - -context(PageContext) -fun FlowContent.team() { - val team = findByType("magprog_team").values.map { Person(it) }.sortedBy { it.order } - - div("header") { - css { - display = Display.flex - alignItems = Align.center - justifyContent = JustifyContent.center - marginLeft = 40.pt - } - h1("title") { - +"Команда" - } - } - personCards(team,"team") -} diff --git a/src/main/kotlin/ru/mipt/spc/magprog/magProgPage.kt b/src/main/kotlin/ru/mipt/spc/magprog/magProgPage.kt index 4c4ab1e..1cd8272 100644 --- a/src/main/kotlin/ru/mipt/spc/magprog/magProgPage.kt +++ b/src/main/kotlin/ru/mipt/spc/magprog/magProgPage.kt @@ -1,10 +1,18 @@ package ru.mipt.spc.magprog +import io.ktor.server.application.Application +import io.ktor.server.application.call +import io.ktor.server.html.respondHtml +import io.ktor.server.http.content.files +import io.ktor.server.http.content.static +import io.ktor.server.routing.get +import io.ktor.server.routing.route +import io.ktor.server.routing.routing import kotlinx.coroutines.runBlocking -import kotlinx.css.* import kotlinx.html.* -import ru.mipt.css +import space.kscience.dataforge.context.Context import space.kscience.dataforge.data.await +import space.kscience.dataforge.io.io import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.get import space.kscience.dataforge.meta.getIndexed @@ -12,9 +20,17 @@ import space.kscience.dataforge.meta.string import space.kscience.dataforge.names.Name import space.kscience.dataforge.names.asName import space.kscience.dataforge.names.plus -import space.kscience.snark.HtmlData -import space.kscience.snark.htmlData -import space.kscience.snark.id +import space.kscience.dataforge.names.withIndex +import space.kscience.snark.* +import java.nio.file.Path +import kotlin.collections.component1 +import kotlin.collections.component2 +import kotlin.collections.forEach +import kotlin.collections.listOf +import kotlin.collections.map +import kotlin.collections.mapValues +import kotlin.collections.set +import kotlin.collections.sortedBy //fun CssBuilder.magProgCss() { // rule(".magprog-body") { @@ -33,7 +49,7 @@ class MagProgSection( val title: String, val style: String, val content: FlowContent.() -> Unit, -) { +) { val meta: Meta get() = Meta { "id" put id @@ -58,7 +74,7 @@ private fun wrapSection( ): MagProgSection = wrapSection( idOverride ?: block.id, block.meta["section_title"]?.string ?: error("Section without title"), -){ +) { htmlData(block) } @@ -76,25 +92,20 @@ context(PageContext) private fun FlowContent.programSection() { div("inner") { h2 { +"Учебная программа" } htmlData(programBlock) - button(classes = "fit btn btn-secondary") { - attributes["data-bs-toggle"] = "collapse" - attributes["data-bs-target"] = "#recommended-courses-collapse-text" - attributes["aria-expanded"] = "false" - attributes["aria-controls"] = "recommended-courses-collapse-text" + button(classes = "fit collapsible") { + attributes["data-target"] = "recommended-courses-content" +"Рекомендованные курсы" } - div("collapse pt-3") { - id = "recommended-courses-collapse-text" - div { - htmlData(recommendedBlock) - } + div(classes = "collapsible-content") { + id = "recommended-courses-content" + htmlData(recommendedBlock) } } } context(PageContext) private fun FlowContent.partners() { //val partnersData: Meta = resolve(PARTNERS_PATH)?.meta ?: Meta.EMPTY - val partnersData: Meta = runBlocking { resolve(PARTNERS_PATH)?.await()} ?: Meta.EMPTY + val partnersData: Meta = runBlocking { resolve(PARTNERS_PATH)?.await() } ?: Meta.EMPTY div("inner") { h2 { +"Партнеры" } div("features") { @@ -102,7 +113,7 @@ context(PageContext) private fun FlowContent.partners() { section { a(href = partner["link"].string, target = "_blank") { rel = "noreferrer" - val imagePath = partner["logo"].string?.let(::resolveResource) + val imagePath = partner["logo"].string?.let(::resolveRef) img( classes = "icon major", src = imagePath, @@ -117,44 +128,84 @@ context(PageContext) private fun FlowContent.partners() { } } -context(PageContext) fun HTML.magProgPage() { - val sections = listOf( - wrapSection(resolveHtml(INTRO_PATH)!!, "intro"), - MagProgSection( - id = "partners", - title = "Партнеры", - style = "wrapper style3 fullscreen fade-up" - ) { - partners() - }, - // section(props.data.partners), - MagProgSection( - id = "mentors", - title = "Научные руководители", - style = "wrapper style2 spotlights", - ) { - mentors() - }, - MagProgSection( - id = "program", - title = "Учебная программа", - style = "wrapper style3 fullscreen fade-up" - ) { - programSection() - }, - wrapSection(resolveHtml(ENROLL_PATH)!!, "enroll"), - MagProgSection( - id = "team", - title = "Команда", - style = "wrapper style2 spotlights", - ) { - team() - }, - wrapSection(resolveHtml(CONTACTS_PATH)!!, "contacts"), - ) +class Person(val data: HtmlData) : HtmlData by data { + val name: String by meta.string { error("Mentor name is not defined") } + val photo: String? by meta.string() +} +context(PageContext) private fun FlowContent.team() { + val team = findByType("magprog_team").map { Person(it.value) }.sortedBy { it.order } + + div("header") { + h1("title") { + +"Команда" + } + } + team.forEach { member -> + section { + id = member.id + div("image left") { + member.photo?.let { photoPath -> + img( + src = resolveRef(photoPath), + alt = member.name + ) + } + } + + div("content") { + div("inner") { + h2 { + a(href = "#team_${member.id}") { +member.name } + } + htmlData(member) + } + } + } + } +} + +context(PageContext) private fun FlowContent.mentors() { + val mentors = findByType("magprog_mentor").mapValues { Person(it.value) }.entries.sortedBy { it.value.order } + + div("header") { + h1("title") { + +"Научные руководители" + } + } + mentors.forEach { (name, mentor) -> + section { + id = mentor.id + div("image left") { + mentor.photo?.let { photoPath -> + a(href = resolveRef("mentor-${mentor.id}")) { + img( + src = resolveRef(photoPath), + alt = mentor.name + ) + } + } + } + + div("content") { + div("inner") { + h2 { + a(href = resolveRef("mentor-${mentor.id}")) { +mentor.name } + } + val info = resolveHtml(name.withIndex("info")) + if (info != null) { + htmlData(info) + } + } + } + } + } +} + + +context(PageContext) internal fun HTML.magProgHead(title: String) { head { - title = "Магистратура \"Научное программирование\"" + this.title = title meta { charset = "utf-8" } @@ -164,92 +215,198 @@ context(PageContext) fun HTML.magProgPage() { } link { rel = "stylesheet" - href = resolveResource("css/bootstrap.min.css") - } - link { - rel = "stylesheet" - href = resolveResource("css/main.css") + href = resolveRef("css/main.css") } noScript { link { rel = "stylesheet" - href = resolveResource("css/noscript.css") + href = resolveRef("css/noscript.css") } } } - body("is-preload magprog-body") { - section { - id = "sidebar" - div("inner") { - nav { - ul { - sections.forEach { section -> - li { - a(href = "#${section.id}") { - +section.title +} + +context(PageContext) internal fun BODY.magProgFooter() { + footer("wrapper style1-alt") { + id = "footer" + div("inner") { + ul("menu") { + li { +"""SPC. All rights reserved.""" } + li { + +"""Design:""" + a { + href = "http://html5up.net" + +"""HTML5 UP""" + } + } + } + } + } + script { + src = resolveRef("js/jquery.min.js") + } + script { + src = resolveRef("js/jquery.scrollex.min.js") + } + script { + src = resolveRef("js/jquery.scrolly.min.js") + } + script { + src = resolveRef("js/browser.min.js") + } + script { + src = resolveRef("js/breakpoints.min.js") + } + script { + src = resolveRef("js/util.js") + } + script { + src = resolveRef("js/bootstrap.min.js") + } + script { + src = resolveRef("js/main.js") + } +} + +internal val Person.mentorPageId get() = "mentor-${id}" + + +internal fun Application.magProgPage(context: Context, rootPath: Path, prefix: String = "/magprog") { + val io = context.io + val content = DirectoryDataTree(io, rootPath.resolve("content")) + + + val magprogPageContext: PageContext = DataSetPageContext(context, prefix, content) + + routing { + route(prefix) { + with(magprogPageContext) { + static { + files(rootPath.resolve("assets").toFile()) + } + + get { + call.respondHtml { + val sections = listOf( + wrapSection(resolveHtml(INTRO_PATH)!!, "intro"), + MagProgSection( + id = "partners", + title = "Партнеры", + style = "wrapper style3 fullscreen fade-up" + ) { + partners() + }, + // section(props.data.partners), + MagProgSection( + id = "mentors", + title = "Научные руководители", + style = "wrapper style2 spotlights", + ) { + mentors() + }, + MagProgSection( + id = "program", + title = "Учебная программа", + style = "wrapper style3 fullscreen fade-up" + ) { + programSection() + }, + wrapSection(resolveHtml(ENROLL_PATH)!!, "enroll"), + MagProgSection( + id = "team", + title = "Команда", + style = "wrapper style2 spotlights", + ) { + team() + }, + wrapSection(resolveHtml(CONTACTS_PATH)!!, "contacts"), + ) + magProgHead("Магистратура \"Научное программирование\"") + body("is-preload magprog-body") { + section { + id = "sidebar" + div("inner") { + nav { + ul { + sections.forEach { section -> + li { + a(href = "#${section.id}") { + +section.title + } + } + } + } + } } } + div { + id = "wrapper" + sections.forEach { sec -> + section(sec.style) { + id = sec.id + with(sec) { content() } + } + } + } + magProgFooter() + } + } + } + + val mentors = findByType("magprog_mentor").map { + Person(it.value) + }.sortedBy { + it.order + } + + mentors.forEach { mentor -> + get(mentor.mentorPageId) { + call.respondHtml { + magProgHead("Научное программирование: ${mentor.name}") + body("is-preload") { + header { + id = "header" + a(classes = "title") { + href = "$homeRef#mentors" + +"Научные руководители" + } + nav { + ul { + mentors.forEach { + li { + a { + href = resolveRef(it.mentorPageId) + +it.name + } + } + } + } + } + } + div { + id = "wrapper" + section("wrapper") { + id = "main" + div("inner") { + h1("major") { +mentor.name } + span("image left") { + mentor.photo?.let { photoPath -> + img( + src = resolveRef(photoPath), + alt = mentor.name + ) + } + } + htmlData(mentor) + } + } + } + magProgFooter() + } } } } } } - div { - id = "wrapper" - div("magprog-header") { - css { - display = Display.flex - alignItems = Align.center - justifyContent = JustifyContent.center - marginTop = 90.pt - marginLeft = 40.pt - } - sections.forEach { sec -> - section(sec.style) { - id = sec.id - with(sec) { content() } - } - } - } - } - footer("wrapper style1-alt") { - id = "footer" - div("inner") { - ul("menu") { - li { +"""© SPC. All rights reserved.""" } - li { - +"""Design:""" - a { - href = "http://html5up.net" - +"""HTML5 UP""" - } - } - } - } - } - script { - src = resolveResource("js/jquery.min.js") - } - script { - src = resolveResource("js/jquery.scrollex.min.js") - } - script { - src = resolveResource("js/jquery.scrolly.min.js") - } - script { - src = resolveResource("js/browser.min.js") - } - script { - src = resolveResource("js/breakpoints.min.js") - } - script { - src = resolveResource("js/util.js") - } - script { - src = resolveResource("js/bootstrap.min.js") - } - script { - src = resolveResource("js/main.js") - } } } \ No newline at end of file diff --git a/src/main/kotlin/ru/mipt/snapshot.kt b/src/main/kotlin/ru/mipt/spc/snapshot.kt similarity index 90% rename from src/main/kotlin/ru/mipt/snapshot.kt rename to src/main/kotlin/ru/mipt/spc/snapshot.kt index 11e321e..ba2aa61 100644 --- a/src/main/kotlin/ru/mipt/snapshot.kt +++ b/src/main/kotlin/ru/mipt/spc/snapshot.kt @@ -1,4 +1,4 @@ -package ru.mipt +package ru.mipt.spc //private fun snapshotRoute(route: Route, path: Path){ // route.children.forEach { diff --git a/src/main/kotlin/space/kscience/snark/DirectoryDataTree.kt b/src/main/kotlin/space/kscience/snark/DirectoryDataTree.kt index 73d2b2b..03a7bca 100644 --- a/src/main/kotlin/space/kscience/snark/DirectoryDataTree.kt +++ b/src/main/kotlin/space/kscience/snark/DirectoryDataTree.kt @@ -9,9 +9,7 @@ import space.kscience.dataforge.io.readMetaFile import space.kscience.dataforge.io.toByteArray import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.copy -import space.kscience.dataforge.names.NameToken -import space.kscience.dataforge.names.asName -import space.kscience.dataforge.names.plus +import space.kscience.dataforge.names.* import java.nio.file.Path import java.nio.file.attribute.BasicFileAttributes import kotlin.io.path.* @@ -51,7 +49,12 @@ class DirectoryDataTree(val io: IOPlugin, val path: Path) : DataTree DataTreeItem.Leaf(readFile(childPath)) } - NameToken(fileName) to item + val name = Name.parse(fileName) + if(name.length == 1) { + name.first() to item + } else{ + TODO("Segmented names are not supported") + } } companion object { diff --git a/src/main/resources/magprog/LICENSE.txt b/src/main/resources/magprog/LICENSE.txt deleted file mode 100644 index 856b578..0000000 --- a/src/main/resources/magprog/LICENSE.txt +++ /dev/null @@ -1,63 +0,0 @@ -Creative Commons Attribution 3.0 Unported -http://creativecommons.org/licenses/by/3.0/ - -License - -THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. - -BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. - -1. Definitions - - 1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License. - 2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License. - 3. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership. - 4. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License. - 5. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast. - 6. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work. - 7. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. - 8. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images. - 9. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium. - -2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws. - -3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: - - 1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; - 2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified."; - 3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and, - 4. to Distribute and Publicly Perform Adaptations. - 5. - - For the avoidance of doubt: - 1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; - 2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and, - 3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License. - -The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved. - -4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: - - 1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(b), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(b), as requested. - 2. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Section 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4 (b) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties. - 3. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise. - -5. Representations, Warranties and Disclaimer - -UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. - -6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. Termination - - 1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. - 2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. - -8. Miscellaneous - - 1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. - 2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. - 3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. - 4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. - 5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. - 6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law. diff --git a/src/main/resources/magprog/README.txt b/src/main/resources/magprog/README.txt deleted file mode 100644 index 4d1be2b..0000000 --- a/src/main/resources/magprog/README.txt +++ /dev/null @@ -1,33 +0,0 @@ -Hyperspace by HTML5 UP -html5up.net | @ajlkn -Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) - - -So I've had the wireframe for this particular design kicking around for some time, but with all -the other interesting (and in some cases, semi-secret) projects I've been working on it took me -a little while to get to actually designing and coding it. Fortunately, things have eased up -enough for me to finaly get around to it, so I'm happy to introduce Hyperspace: a fun, blocky, -one-page design with a lot of color, a bit of animation, and an additional "generic" page template -(because hey, even one-page sites usually need an interior page or two). Hope you dig it :) - -Demo images* courtesy of Unsplash, a radtastic collection of CC0 (public domain) images -you can use for pretty much whatever. - -(* = not included) - -AJ -aj@lkn.io | @ajlkn - - -Credits: - - Demo Images: - Unsplash (unsplash.com) - - Icons: - Font Awesome (fontawesome.io) - - Other: - jQuery (jquery.com) - Scrollex (github.com/ajlkn/jquery.scrollex) - Responsive Tools (github.com/ajlkn/responsive-tools) \ No newline at end of file diff --git a/src/main/resources/magprog/assets/css/main.css b/src/main/resources/magprog/assets/css/main.css index 91e145e..623c898 100644 --- a/src/main/resources/magprog/assets/css/main.css +++ b/src/main/resources/magprog/assets/css/main.css @@ -3906,4 +3906,13 @@ input, select, textarea { background-attachment: scroll; } - } \ No newline at end of file + } + + +/* Style the collapsible content. Note: hidden by default */ +.collapsible-content { + padding: 0 18px; + max-height: 0; + overflow: hidden; + transition: max-height 0.2s ease-out; +} \ No newline at end of file diff --git a/src/main/resources/magprog/assets/images/mentors/Dolgonosov.jpg b/src/main/resources/magprog/assets/images/mentors/Dolgonosov.jpg index d85a94c..34c6c1c 100644 Binary files a/src/main/resources/magprog/assets/images/mentors/Dolgonosov.jpg and b/src/main/resources/magprog/assets/images/mentors/Dolgonosov.jpg differ diff --git a/src/main/resources/magprog/assets/images/mentors/Grinis.jpg b/src/main/resources/magprog/assets/images/mentors/Grinis.jpg index f494eff..e0e1be6 100644 Binary files a/src/main/resources/magprog/assets/images/mentors/Grinis.jpg and b/src/main/resources/magprog/assets/images/mentors/Grinis.jpg differ diff --git a/src/main/resources/magprog/assets/images/mentors/Klimai.jpg b/src/main/resources/magprog/assets/images/mentors/Klimai.jpg index 49db213..35d8e9c 100644 Binary files a/src/main/resources/magprog/assets/images/mentors/Klimai.jpg and b/src/main/resources/magprog/assets/images/mentors/Klimai.jpg differ diff --git a/src/main/resources/magprog/assets/images/mentors/Nozik.jpg b/src/main/resources/magprog/assets/images/mentors/Nozik.jpg index aab5041..f3c3154 100644 Binary files a/src/main/resources/magprog/assets/images/mentors/Nozik.jpg and b/src/main/resources/magprog/assets/images/mentors/Nozik.jpg differ diff --git a/src/main/resources/magprog/assets/images/mentors/Shagalov.jpg b/src/main/resources/magprog/assets/images/mentors/Shagalov.jpg index eed1617..fa8c335 100644 Binary files a/src/main/resources/magprog/assets/images/mentors/Shagalov.jpg and b/src/main/resources/magprog/assets/images/mentors/Shagalov.jpg differ diff --git a/src/main/resources/magprog/assets/images/partners/inr_logo.png b/src/main/resources/magprog/assets/images/partners/inr_logo.png new file mode 100644 index 0000000..5a0ed17 Binary files /dev/null and b/src/main/resources/magprog/assets/images/partners/inr_logo.png differ diff --git a/src/main/resources/magprog/assets/images/team/svetlichny.jpeg b/src/main/resources/magprog/assets/images/team/svetlichny.jpeg new file mode 100644 index 0000000..ae0b621 Binary files /dev/null and b/src/main/resources/magprog/assets/images/team/svetlichny.jpeg differ diff --git a/src/main/resources/magprog/assets/js/main.js b/src/main/resources/magprog/assets/js/main.js index d590b7f..84526ba 100644 --- a/src/main/resources/magprog/assets/js/main.js +++ b/src/main/resources/magprog/assets/js/main.js @@ -4,187 +4,202 @@ Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) */ -(function($) { +(function ($) { - var $window = $(window), - $body = $('body'), - $sidebar = $('#sidebar'); + var $window = $(window), + $body = $('body'), + $sidebar = $('#sidebar'); - // Breakpoints. - breakpoints({ - xlarge: [ '1281px', '1680px' ], - large: [ '981px', '1280px' ], - medium: [ '737px', '980px' ], - small: [ '481px', '736px' ], - xsmall: [ null, '480px' ] - }); + // Breakpoints. + breakpoints({ + xlarge: ['1281px', '1680px'], + large: ['981px', '1280px'], + medium: ['737px', '980px'], + small: ['481px', '736px'], + xsmall: [null, '480px'] + }); - // Hack: Enable IE flexbox workarounds. - if (browser.name == 'ie') - $body.addClass('is-ie'); + // Hack: Enable IE flexbox workarounds. + if (browser.name == 'ie') + $body.addClass('is-ie'); - // Play initial animations on page load. - $window.on('load', function() { - window.setTimeout(function() { - $body.removeClass('is-preload'); - }, 100); - }); + // Play initial animations on page load. + $window.on('load', function () { + window.setTimeout(function () { + $body.removeClass('is-preload'); + }, 100); + }); - // Forms. + // Forms. - // Hack: Activate non-input submits. - $('form').on('click', '.submit', function(event) { + // Hack: Activate non-input submits. + $('form').on('click', '.submit', function (event) { - // Stop propagation, default. - event.stopPropagation(); - event.preventDefault(); + // Stop propagation, default. + event.stopPropagation(); + event.preventDefault(); - // Submit form. - $(this).parents('form').submit(); + // Submit form. + $(this).parents('form').submit(); - }); + }); - // Sidebar. - if ($sidebar.length > 0) { + // Sidebar. + if ($sidebar.length > 0) { - var $sidebar_a = $sidebar.find('a'); + var $sidebar_a = $sidebar.find('a'); - $sidebar_a - .addClass('scrolly') - .on('click', function() { + $sidebar_a + .addClass('scrolly') + .on('click', function () { - var $this = $(this); + var $this = $(this); - // External link? Bail. - if ($this.attr('href').charAt(0) != '#') - return; + // External link? Bail. + if ($this.attr('href').charAt(0) != '#') + return; - // Deactivate all links. - $sidebar_a.removeClass('active'); + // Deactivate all links. + $sidebar_a.removeClass('active'); - // Activate link *and* lock it (so Scrollex doesn't try to activate other links as we're scrolling to this one's section). - $this - .addClass('active') - .addClass('active-locked'); + // Activate link *and* lock it (so Scrollex doesn't try to activate other links as we're scrolling to this one's section). + $this + .addClass('active') + .addClass('active-locked'); - }) - .each(function() { + }) + .each(function () { - var $this = $(this), - id = $this.attr('href'), - $section = $(id); + var $this = $(this), + id = $this.attr('href'), + $section = $(id); - // No section for this link? Bail. - if ($section.length < 1) - return; + // No section for this link? Bail. + if ($section.length < 1) + return; - // Scrollex. - $section.scrollex({ - mode: 'middle', - top: '-20vh', - bottom: '-20vh', - initialize: function() { + // Scrollex. + $section.scrollex({ + mode: 'middle', + top: '-20vh', + bottom: '-20vh', + initialize: function () { - // Deactivate section. - $section.addClass('inactive'); + // Deactivate section. + $section.addClass('inactive'); - }, - enter: function() { + }, + enter: function () { - // Activate section. - $section.removeClass('inactive'); + // Activate section. + $section.removeClass('inactive'); - // No locked links? Deactivate all links and activate this section's one. - if ($sidebar_a.filter('.active-locked').length == 0) { + // No locked links? Deactivate all links and activate this section's one. + if ($sidebar_a.filter('.active-locked').length == 0) { - $sidebar_a.removeClass('active'); - $this.addClass('active'); + $sidebar_a.removeClass('active'); + $this.addClass('active'); - } + } - // Otherwise, if this section's link is the one that's locked, unlock it. - else if ($this.hasClass('active-locked')) - $this.removeClass('active-locked'); + // Otherwise, if this section's link is the one that's locked, unlock it. + else if ($this.hasClass('active-locked')) + $this.removeClass('active-locked'); - } - }); + } + }); - }); + }); - } + } - // Scrolly. - $('.scrolly').scrolly({ - speed: 1000, - offset: function() { + // Scrolly. + $('.scrolly').scrolly({ + speed: 1000, + offset: function () { - // If <=large, >small, and sidebar is present, use its height as the offset. - if (breakpoints.active('<=large') - && !breakpoints.active('<=small') - && $sidebar.length > 0) - return $sidebar.height(); + // If <=large, >small, and sidebar is present, use its height as the offset. + if (breakpoints.active('<=large') + && !breakpoints.active('<=small') + && $sidebar.length > 0) + return $sidebar.height(); - return 0; + return 0; - } - }); + } + }); - // Spotlights. - $('.spotlights > section') - .scrollex({ - mode: 'middle', - top: '-10vh', - bottom: '-10vh', - initialize: function() { + // Spotlights. + $('.spotlights > section') + .scrollex({ + mode: 'middle', + top: '-10vh', + bottom: '-10vh', + initialize: function () { - // Deactivate section. - $(this).addClass('inactive'); + // Deactivate section. + $(this).addClass('inactive'); - }, - enter: function() { + }, + enter: function () { - // Activate section. - $(this).removeClass('inactive'); + // Activate section. + $(this).removeClass('inactive'); - } - }) - .each(function() { + } + }) + .each(function () { - var $this = $(this), - $image = $this.find('.image'), - $img = $image.find('img'), - x; + var $this = $(this), + $image = $this.find('.image'), + $img = $image.find('img'), + x; - // Assign image. - $image.css('background-image', 'url(' + $img.attr('src') + ')'); + // Assign image. + $image.css('background-image', 'url(' + $img.attr('src') + ')'); - // Set background position. - if (x = $img.data('position')) - $image.css('background-position', x); + // Set background position. + if (x = $img.data('position')) + $image.css('background-position', x); - // Hide . - $img.hide(); + // Hide . + $img.hide(); - }); + }); - // Features. - $('.features') - .scrollex({ - mode: 'middle', - top: '-20vh', - bottom: '-20vh', - initialize: function() { + // Features. + $('.features') + .scrollex({ + mode: 'middle', + top: '-20vh', + bottom: '-20vh', + initialize: function () { - // Deactivate section. - $(this).addClass('inactive'); + // Deactivate section. + $(this).addClass('inactive'); - }, - enter: function() { + }, + enter: function () { - // Activate section. - $(this).removeClass('inactive'); + // Activate section. + $(this).removeClass('inactive'); - } - }); + } + }); +})(jQuery); -})(jQuery); \ No newline at end of file +//From https://www.w3schools.com/howto/howto_js_collapsible.asp +let collapsibles = document.getElementsByClassName("collapsible"); + +Array.from(collapsibles).forEach(item => { + item.addEventListener("click", function () { + this.classList.toggle("collapsible-expanded"); + let target = item.attributes.getNamedItem("data-target").value; + let content = document.getElementById(target); + if (content.style.maxHeight) { + content.style.maxHeight = null; + } else { + content.style.maxHeight = content.scrollHeight + "px"; + } + }); +}) \ No newline at end of file diff --git a/src/main/resources/magprog/content/mentors/Nozik[info].md b/src/main/resources/magprog/content/mentors/Nozik[info].md new file mode 100644 index 0000000..dd2826b --- /dev/null +++ b/src/main/resources/magprog/content/mentors/Nozik[info].md @@ -0,0 +1,5 @@ +**Директор центра научного программирования** + +GDE по Kotlin + +Ключевые слова: *Научное ПО, Kotlin, анализ данных, физика нейтрино* \ No newline at end of file diff --git a/src/main/resources/magprog/content/partners.yaml b/src/main/resources/magprog/content/partners.yaml index 45f3123..dafa512 100644 --- a/src/main/resources/magprog/content/partners.yaml +++ b/src/main/resources/magprog/content/partners.yaml @@ -6,7 +6,7 @@ content: - title: ФПМИ МФТИ link: https://mipt.ru/education/departments/fpmi/ logo: /images/partners/FPMI.jpg - - title: JetBrains Research + - title: JetBrains Research (до 2022) link: https://research.jetbrains.org/groups/npm/ logo: /images/partners/JBR.png - title: Таврида Электрик diff --git a/src/main/resources/magprog/content/team/svetlichnii.md b/src/main/resources/magprog/content/team/svetlichnii.md index c499ad1..986dd1a 100644 --- a/src/main/resources/magprog/content/team/svetlichnii.md +++ b/src/main/resources/magprog/content/team/svetlichnii.md @@ -3,7 +3,7 @@ content_type: magprog_team name: Александр Светличный id: svetlichnii order: 2 -photo: images/members/svetlichny.jpeg +photo: images/team/svetlichny.jpeg language: ru --- **Заместитель руководителя** diff --git a/src/main/resources/magprog/elements.html b/src/main/resources/magprog/elements.html deleted file mode 100644 index 892d2fd..0000000 --- a/src/main/resources/magprog/elements.html +++ /dev/null @@ -1,363 +0,0 @@ - - - - - Elements - Hyperspace by HTML5 UP - - - - - - - - - - - -
- - -
-
-

Elements

- - -
-

Text

-

This is bold and this is strong. This is italic and this is emphasized. - This is superscript text and this is subscript text. - This is underlined and this is code: for (;;) { ... }. Finally, this is a link.

-
-

Nunc lacinia ante nunc ac lobortis. Interdum adipiscing gravida odio porttitor sem non mi integer non faucibus ornare mi ut ante amet placerat aliquet. Volutpat eu sed ante lacinia sapien lorem accumsan varius montes viverra nibh in adipiscing blandit tempus accumsan.

-
-

Heading Level 2

-

Heading Level 3

-

Heading Level 4

-
-

Blockquote

-
Fringilla nisl. Donec accumsan interdum nisi, quis tincidunt felis sagittis eget tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan faucibus. Vestibulum ante ipsum primis in faucibus lorem ipsum dolor sit amet nullam adipiscing eu felis.
-

Preformatted

- 
i = 0;
-
-while (!deck.isInOrder()) {
-    print 'Iteration ' + i;
-    deck.shuffle();
-    i++;
-}
-
-print 'It took ' + i + ' iterations to sort the deck.';
-
- - -
-

Lists

-
-
-

Unordered

-
    -
  • Dolor pulvinar etiam.
    • -
  • Sagittis adipiscing.
    • -
  • Felis enim feugiat.
    • -
-

Alternate

-
    -
  • Dolor pulvinar etiam.
    • -
  • Sagittis adipiscing.
    • -
  • Felis enim feugiat.
    • -
-
-
-

Ordered

-
    -
  1. Dolor pulvinar etiam.
    2. -
  2. Etiam vel felis viverra.
    3. -
  3. Felis enim feugiat.
    4. -
  4. Dolor pulvinar etiam.
    5. -
  5. Etiam vel felis lorem.
    6. -
  6. Felis enim et feugiat.
    7. -
-

Icons

- -
-
-

Actions

-
-
- - - - -
-
- - -
-
-
- - -
-

Table

-

Default

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionPrice
Item OneAnte turpis integer aliquet porttitor.29.99
Item TwoVis ac commodo adipiscing arcu aliquet.19.99
Item Three Morbi faucibus arcu accumsan lorem.29.99
Item FourVitae integer tempus condimentum.19.99
Item FiveAnte turpis integer aliquet porttitor.29.99
100.00
-
- -

Alternate

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionPrice
Item OneAnte turpis integer aliquet porttitor.29.99
Item TwoVis ac commodo adipiscing arcu aliquet.19.99
Item Three Morbi faucibus arcu accumsan lorem.29.99
Item FourVitae integer tempus condimentum.19.99
Item FiveAnte turpis integer aliquet porttitor.29.99
100.00
-
-
- - -
-

Buttons

- - - - - -
    -
  • Disabled
    • -
  • Disabled
    • -
-
- - -
-

Form

-
-
-
- -
-
- -
-
- -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- -
-
-
    -
    • -
    • -
-
-
-
-
- - -
-

Image

-

Fit

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

Left & Right

-

Fringilla nisl. Donec accumsan interdum nisi, quis tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent. Donec accumsan interdum nisi, quis tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent.

-

Fringilla nisl. Donec accumsan interdum nisi, quis tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent. Donec accumsan interdum nisi, quis tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent.

-
- -
-
- -
- - -
-
-
    -
  • © Untitled. All rights reserved.
  • Design: HTML5 UP
    • -
-
-
- - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/magprog/generic.html b/src/main/resources/magprog/generic.html deleted file mode 100644 index 8b8f5a9..0000000 --- a/src/main/resources/magprog/generic.html +++ /dev/null @@ -1,63 +0,0 @@ - - - - - Generic - Hyperspace by HTML5 UP - - - - - - - - - - - -
- - -
-
-

A Generic Page

- -

Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet. Pellentesque leo mauris, consectetur id ipsum sit amet, fergiat. Pellentesque in mi eu massa lacinia malesuada et a elit. Donec urna ex, lacinia in purus ac, pretium pulvinar mauris. Curabitur sapien risus, commodo eget turpis at, elementum convallis elit. Pellentesque enim turpis, hendrerit tristique.

-

Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet. Pellentesque leo mauris, consectetur id ipsum sit amet, fersapien risus, commodo eget turpis at, elementum convallis elit. Pellentesque enim turpis, hendrerit tristique lorem ipsum dolor.

-
-
- -
- - -
-
-
    -
  • © Untitled. All rights reserved.
  • Design: HTML5 UP
    • -
-
-
- - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/magprog/index.html b/src/main/resources/magprog/index.html deleted file mode 100644 index cae8c9f..0000000 --- a/src/main/resources/magprog/index.html +++ /dev/null @@ -1,209 +0,0 @@ - - - - - Hyperspace by HTML5 UP - - - - - - - - - - - -
- - -
-
-

Hyperspace

-

Just another fine responsive site template designed by HTML5 UP
- and released for free under the Creative Commons.

- -
-
- - -
-
- -
-
-

Sed ipsum dolor

-

Phasellus convallis elit id ullamcorper pulvinar. Duis aliquam turpis mauris, eu ultricies erat malesuada quis. Aliquam dapibus.

- -
-
-
-
- -
-
-

Feugiat consequat

-

Phasellus convallis elit id ullamcorper pulvinar. Duis aliquam turpis mauris, eu ultricies erat malesuada quis. Aliquam dapibus.

- -
-
-
-
- -
-
-

Ultricies aliquam

-

Phasellus convallis elit id ullamcorper pulvinar. Duis aliquam turpis mauris, eu ultricies erat malesuada quis. Aliquam dapibus.

- -
-
-
-
- - -
-
-

What we do

-

Phasellus convallis elit id ullamcorper pulvinar. Duis aliquam turpis mauris, eu ultricies erat malesuada quis. Aliquam dapibus, lacus eget hendrerit bibendum, urna est aliquam sem, sit amet imperdiet est velit quis lorem.

-
-
- -

Lorem ipsum amet

-

Phasellus convallis elit id ullam corper amet et pulvinar. Duis aliquam turpis mauris, sed ultricies erat dapibus.

-
-
- -

Aliquam sed nullam

-

Phasellus convallis elit id ullam corper amet et pulvinar. Duis aliquam turpis mauris, sed ultricies erat dapibus.

-
-
- -

Sed erat ullam corper

-

Phasellus convallis elit id ullam corper amet et pulvinar. Duis aliquam turpis mauris, sed ultricies erat dapibus.

-
-
- -

Veroeros quis lorem

-

Phasellus convallis elit id ullam corper amet et pulvinar. Duis aliquam turpis mauris, sed ultricies erat dapibus.

-
-
- -

Urna quis bibendum

-

Phasellus convallis elit id ullam corper amet et pulvinar. Duis aliquam turpis mauris, sed ultricies erat dapibus.

-
-
- -

Aliquam urna dapibus

-

Phasellus convallis elit id ullam corper amet et pulvinar. Duis aliquam turpis mauris, sed ultricies erat dapibus.

-
-
- -
-
- - -
-
-

Get in touch

-

Phasellus convallis elit id ullamcorper pulvinar. Duis aliquam turpis mauris, eu ultricies erat malesuada quis. Aliquam dapibus, lacus eget hendrerit bibendum, urna est aliquam sem, sit amet imperdiet est velit quis lorem.

-
-
-
-
-
- - -
-
- - -
-
- - -
-
- -
-
-
- -
-
-
-
- -
- - -
-
-
    -
  • © Untitled. All rights reserved.
  • Design: HTML5 UP
    • -
-
-
- - - - - - - - - - - - \ No newline at end of file