From f7d478cc3ae4a7b7ca23658a1d9cc1c33c549699 Mon Sep 17 00:00:00 2001 From: Daoortor Date: Thu, 25 Jul 2024 16:36:59 +0200 Subject: [PATCH 1/2] remove kotlin/js --- duckShopFrontend/src/components/DuckContainer.tsx | 5 ++--- .../src/components/screens/MainActionsScreen.tsx | 3 +-- duckShopFrontend/src/models/Duck.tsx | 14 ++++++++++++++ duckShopFrontend/src/models/DuckInfo.tsx | 3 +-- oldSchoolFrontend/src/components/PhotoAlbum.tsx | 5 ++--- .../src/components/screens/MainActionsScreen.tsx | 3 +-- oldSchoolFrontend/src/models/Photo.tsx | 11 +++++++++++ oldSchoolFrontend/src/models/PhotoInfo.tsx | 4 ++-- 8 files changed, 34 insertions(+), 14 deletions(-) create mode 100644 duckShopFrontend/src/models/Duck.tsx create mode 100644 oldSchoolFrontend/src/models/Photo.tsx diff --git a/duckShopFrontend/src/components/DuckContainer.tsx b/duckShopFrontend/src/components/DuckContainer.tsx index 7a6b608..f844467 100644 --- a/duckShopFrontend/src/components/DuckContainer.tsx +++ b/duckShopFrontend/src/components/DuckContainer.tsx @@ -1,5 +1,4 @@ -import {duck} from "common-types"; -import JsDuck = duck.shop.JsDuck; +import {JsDuck} from '../models/Duck'; import {DuckInfo} from "../models/DuckInfo"; import Duck from "./Duck"; @@ -13,7 +12,7 @@ export default function DuckContainer({ducks, pressedFunction}: DuckContainerPro if (ducks.length > index) { return new DuckInfo(ducks[index]) } - return new DuckInfo(new JsDuck("", null, false)) + return new DuckInfo(new JsDuck()) } return( diff --git a/duckShopFrontend/src/components/screens/MainActionsScreen.tsx b/duckShopFrontend/src/components/screens/MainActionsScreen.tsx index 831173d..3501802 100644 --- a/duckShopFrontend/src/components/screens/MainActionsScreen.tsx +++ b/duckShopFrontend/src/components/screens/MainActionsScreen.tsx @@ -1,7 +1,6 @@ import {GameState} from "../GameScreen"; import {useState} from "react"; -import {duck} from "common-types"; -import JsDuck = duck.shop.JsDuck; +import {JsDuck} from '../../models/Duck'; import axios from "axios"; import DuckContainer from "../DuckContainer"; diff --git a/duckShopFrontend/src/models/Duck.tsx b/duckShopFrontend/src/models/Duck.tsx new file mode 100644 index 0000000..e6d4448 --- /dev/null +++ b/duckShopFrontend/src/models/Duck.tsx @@ -0,0 +1,14 @@ +import {Nullable} from "common-types"; + + +export class JsDuck { + constructor(name: string = "", description: Nullable = null, hasKotlinAttribute: boolean = false) { + this.name = name + this.description = description + this.hasKotlinAttribute = hasKotlinAttribute + } + + name: string + description: Nullable = null + hasKotlinAttribute: Boolean = false +} \ No newline at end of file diff --git a/duckShopFrontend/src/models/DuckInfo.tsx b/duckShopFrontend/src/models/DuckInfo.tsx index 3aa461e..cb31188 100644 --- a/duckShopFrontend/src/models/DuckInfo.tsx +++ b/duckShopFrontend/src/models/DuckInfo.tsx @@ -1,6 +1,5 @@ import {Nullable} from "common-types"; -import {duck} from "common-types"; -import JsDuck = duck.shop.JsDuck; +import {JsDuck} from './Duck'; export class DuckInfo { imageClass: Nullable diff --git a/oldSchoolFrontend/src/components/PhotoAlbum.tsx b/oldSchoolFrontend/src/components/PhotoAlbum.tsx index fe26ad8..5a9a05e 100644 --- a/oldSchoolFrontend/src/components/PhotoAlbum.tsx +++ b/oldSchoolFrontend/src/components/PhotoAlbum.tsx @@ -1,7 +1,6 @@ import {PhotoInfo} from "../models/PhotoInfo"; import Photo from "./Photo"; -import {old} from "common-types"; -import JsPhoto = old.school.JsPhoto; +import {JsPhoto} from "../models/Photo"; type PhotoAlbumProps = { photos: Array @@ -13,7 +12,7 @@ export default function PhotoAlbum({photos, indexToHighLight}: PhotoAlbumProps) if (photos.length > index) { return new PhotoInfo(photos[index], indexToHighLight == index) } - return new PhotoInfo(new JsPhoto("", null)) + return new PhotoInfo(new JsPhoto()) } return( diff --git a/oldSchoolFrontend/src/components/screens/MainActionsScreen.tsx b/oldSchoolFrontend/src/components/screens/MainActionsScreen.tsx index 578694a..8d6ca9a 100644 --- a/oldSchoolFrontend/src/components/screens/MainActionsScreen.tsx +++ b/oldSchoolFrontend/src/components/screens/MainActionsScreen.tsx @@ -1,8 +1,7 @@ import {GameState} from "../GameScreen"; import axios, {AxiosRequestConfig} from "axios"; import {useEffect, useState} from "react"; -import {old} from "common-types"; -import JsPhoto = old.school.JsPhoto; +import {JsPhoto} from "../../models/Photo"; import PhotoAlbum from "../PhotoAlbum"; type MainActionsScreenProps = { diff --git a/oldSchoolFrontend/src/models/Photo.tsx b/oldSchoolFrontend/src/models/Photo.tsx new file mode 100644 index 0000000..d2300b8 --- /dev/null +++ b/oldSchoolFrontend/src/models/Photo.tsx @@ -0,0 +1,11 @@ +import {Nullable} from "common-types"; + +export class JsPhoto { + name: string + description: Nullable = null + + constructor(name: string = "", description: Nullable = null) { + this.name = name + this.description = description + } +} \ No newline at end of file diff --git a/oldSchoolFrontend/src/models/PhotoInfo.tsx b/oldSchoolFrontend/src/models/PhotoInfo.tsx index 844ab9c..785882f 100644 --- a/oldSchoolFrontend/src/models/PhotoInfo.tsx +++ b/oldSchoolFrontend/src/models/PhotoInfo.tsx @@ -1,5 +1,5 @@ -import {Nullable, old} from "common-types"; -import JsPhoto = old.school.JsPhoto; +import {Nullable} from "common-types"; +import {JsPhoto} from "./Photo"; export class PhotoInfo { imageClass: Nullable From e67b847f4b7511bf443f6c201d8e0eaff7a0246c Mon Sep 17 00:00:00 2001 From: Daoortor Date: Thu, 25 Jul 2024 16:57:17 +0200 Subject: [PATCH 2/2] remove common --- build.gradle.kts | 13 +------- common/build.gradle.kts | 33 ------------------- .../src/commonMain/kotlin/duck/shop/Duck.kt | 12 ------- .../src/commonMain/kotlin/old/school/Photo.kt | 13 -------- .../kotlin/course/duck/shop/duck/JsDuck.kt | 3 ++ .../action/GameActionFunctionsResource.kt | 2 +- .../change/GameChangeFunctionsResource.kt | 2 +- .../course/duck/shop/mode/GameModeResource.kt | 2 +- .../course/duck/shop/utils/Converters.kt | 2 +- .../kotlin/course/duck/shop/duck/JsDuck.kt | 3 ++ .../action/GameActionFunctionsResource.kt | 2 +- .../change/GameChangeFunctionsResource.kt | 2 +- .../course/duck/shop/mode/GameModeResource.kt | 2 +- .../course/duck/shop/utils/Converters.kt | 2 +- .../kotlin/course/duck/shop/duck/JsDuck.kt | 3 ++ .../action/GameActionFunctionsResource.kt | 2 +- .../change/GameChangeFunctionsResource.kt | 2 +- .../course/duck/shop/mode/GameModeResource.kt | 2 +- .../course/duck/shop/utils/Converters.kt | 2 +- .../kotlin/course/duck/shop/duck/JsDuck.kt | 3 ++ .../action/GameActionFunctionsResource.kt | 2 +- .../change/GameChangeFunctionsResource.kt | 2 +- .../course/duck/shop/mode/GameModeResource.kt | 2 +- .../course/duck/shop/utils/Converters.kt | 2 +- .../kotlin/course/duck/shop/duck/JsDuck.kt | 3 ++ .../action/GameActionFunctionsResource.kt | 2 +- .../change/GameChangeFunctionsResource.kt | 2 +- .../course/duck/shop/mode/GameModeResource.kt | 2 +- .../course/duck/shop/utils/Converters.kt | 2 +- .../kotlin/course/duck/shop/duck/JsDuck.kt | 3 ++ .../action/GameActionFunctionsResource.kt | 2 +- .../change/GameChangeFunctionsResource.kt | 2 +- .../course/duck/shop/mode/GameModeResource.kt | 2 +- .../course/duck/shop/utils/Converters.kt | 2 +- .../kotlin/course/duck/shop/duck/JsDuck.kt | 3 ++ .../action/GameActionFunctionsResource.kt | 2 +- .../change/GameChangeFunctionsResource.kt | 2 +- .../course/duck/shop/mode/GameModeResource.kt | 2 +- .../course/duck/shop/utils/Converters.kt | 2 +- .../kotlin/course/duck/shop/duck/JsDuck.kt | 3 ++ .../action/GameActionFunctionsResource.kt | 2 +- .../change/GameChangeFunctionsResource.kt | 2 +- .../course/duck/shop/mode/GameModeResource.kt | 2 +- .../course/duck/shop/utils/Converters.kt | 2 +- .../kotlin/course/duck/shop/duck/JsDuck.kt | 3 ++ .../action/GameActionFunctionsResource.kt | 2 +- .../change/GameChangeFunctionsResource.kt | 2 +- .../course/duck/shop/mode/GameModeResource.kt | 2 +- .../course/duck/shop/utils/Converters.kt | 2 +- .../kotlin/course/duck/shop/duck/JsDuck.kt | 3 ++ .../action/GameActionFunctionsResource.kt | 2 +- .../change/GameChangeFunctionsResource.kt | 2 +- .../course/duck/shop/mode/GameModeResource.kt | 2 +- .../course/duck/shop/utils/Converters.kt | 2 +- .../kotlin/course/duck/shop/duck/JsDuck.kt | 3 ++ .../action/GameActionFunctionsResource.kt | 2 +- .../change/GameChangeFunctionsResource.kt | 2 +- .../course/duck/shop/mode/GameModeResource.kt | 2 +- .../course/duck/shop/utils/Converters.kt | 2 +- .../kotlin/course/duck/shop/duck/JsDuck.kt | 3 ++ .../action/GameActionFunctionsResource.kt | 2 +- .../change/GameChangeFunctionsResource.kt | 2 +- .../course/duck/shop/mode/GameModeResource.kt | 2 +- .../course/duck/shop/utils/Converters.kt | 2 +- .../kotlin/course/duck/shop/duck/JsDuck.kt | 3 ++ .../action/GameActionFunctionsResource.kt | 2 +- .../change/GameChangeFunctionsResource.kt | 2 +- .../course/duck/shop/mode/GameModeResource.kt | 2 +- .../course/duck/shop/utils/Converters.kt | 2 +- .../kotlin/course/duck/shop/duck/JsDuck.kt | 3 ++ .../action/GameActionFunctionsResource.kt | 2 +- .../change/GameChangeFunctionsResource.kt | 2 +- .../course/duck/shop/mode/GameModeResource.kt | 2 +- .../course/duck/shop/utils/Converters.kt | 2 +- .../kotlin/course/duck/shop/duck/JsDuck.kt | 3 ++ .../action/GameActionFunctionsResource.kt | 2 +- .../change/GameChangeFunctionsResource.kt | 2 +- .../course/duck/shop/mode/GameModeResource.kt | 2 +- .../course/duck/shop/utils/Converters.kt | 2 +- .../kotlin/course/duck/shop/duck/JsDuck.kt | 3 ++ .../action/GameActionFunctionsResource.kt | 2 +- .../change/GameChangeFunctionsResource.kt | 2 +- .../course/duck/shop/mode/GameModeResource.kt | 2 +- .../course/duck/shop/utils/Converters.kt | 2 +- .../kotlin/course/duck/shop/duck/JsDuck.kt | 3 ++ .../action/GameActionFunctionsResource.kt | 2 +- .../change/GameChangeFunctionsResource.kt | 2 +- .../course/duck/shop/mode/GameModeResource.kt | 2 +- .../course/duck/shop/utils/Converters.kt | 2 +- .../old/school/mode/GameModeResource.kt | 2 +- .../kotlin/course/old/school/photo/JsPhoto.kt | 3 ++ .../old/school/mode/GameModeResource.kt | 2 +- .../kotlin/course/old/school/photo/JsPhoto.kt | 3 ++ .../old/school/mode/GameModeResource.kt | 2 +- .../kotlin/course/old/school/photo/JsPhoto.kt | 3 ++ .../old/school/mode/GameModeResource.kt | 2 +- .../kotlin/course/old/school/photo/JsPhoto.kt | 3 ++ .../old/school/mode/GameModeResource.kt | 2 +- .../kotlin/course/old/school/photo/JsPhoto.kt | 3 ++ .../old/school/mode/GameModeResource.kt | 2 +- .../kotlin/course/old/school/photo/JsPhoto.kt | 3 ++ .../old/school/mode/GameModeResource.kt | 2 +- .../kotlin/course/old/school/photo/JsPhoto.kt | 3 ++ .../old/school/mode/GameModeResource.kt | 2 +- .../kotlin/course/old/school/photo/JsPhoto.kt | 3 ++ .../old/school/mode/GameModeResource.kt | 2 +- .../kotlin/course/old/school/photo/JsPhoto.kt | 3 ++ 107 files changed, 156 insertions(+), 147 deletions(-) delete mode 100644 common/build.gradle.kts delete mode 100644 common/src/commonMain/kotlin/duck/shop/Duck.kt delete mode 100644 common/src/commonMain/kotlin/old/school/Photo.kt create mode 100644 duckShopServer/DuckShopServerDuckMapInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt create mode 100644 duckShopServer/DuckShopServerDuckSetInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt create mode 100644 duckShopServer/DuckShopServerDucksListInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt create mode 100644 duckShopServer/DuckShopServerMapDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt create mode 100644 duckShopServer/DuckShopServerSetDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt create mode 100644 duckShopServer/duckShopServerAddElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt create mode 100644 duckShopServer/duckShopServerBuiltInFunctions/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt create mode 100644 duckShopServer/duckShopServerFilter/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt create mode 100644 duckShopServer/duckShopServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt create mode 100644 duckShopServer/duckShopServerImprovments/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt create mode 100644 duckShopServer/duckShopServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt create mode 100644 duckShopServer/duckShopServerListDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt create mode 100644 duckShopServer/duckShopServerMutableCollectionDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt create mode 100644 duckShopServer/duckShopServerPartition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt create mode 100644 duckShopServer/duckShopServerRemoveElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt create mode 100644 duckShopServer/duckShopServerShuffle/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt create mode 100644 duckShopServer/duckShopServerSortFunction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt create mode 100644 oldSchoolServer/oldSchoolServerColorsList/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt create mode 100644 oldSchoolServer/oldSchoolServerFindPhoto/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt create mode 100644 oldSchoolServer/oldSchoolServerGroupBy/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt create mode 100644 oldSchoolServer/oldSchoolServerGroupByByHairAndHat/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt create mode 100644 oldSchoolServer/oldSchoolServerGroupByColor/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt create mode 100644 oldSchoolServer/oldSchoolServerHelpers/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt create mode 100644 oldSchoolServer/oldSchoolServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt create mode 100644 oldSchoolServer/oldSchoolServerImprovements/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt create mode 100644 oldSchoolServer/oldSchoolServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt diff --git a/build.gradle.kts b/build.gradle.kts index 987a93c..c845884 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -41,7 +41,7 @@ tasks { val frontendSuffix = "Frontend" val server = "Server" -configure(subprojects.filter { it.name != "common" && frontendSuffix !in it.name }) { +configure(subprojects.filter { frontendSuffix !in it.name }) { apply() apply { @@ -140,7 +140,6 @@ configure(subprojects.filter { server in it.name }) { } dependencies { - implementation(project(":common")) implementation(project(":utils")) implementation("org.springframework.boot:spring-boot-starter-web") @@ -181,16 +180,6 @@ configure(subprojects.filter { frontendSuffix in it.name }) { installScript.set("install") } - val addCommonTypesTask = tasks.register("addCommonTypes") { - outputs.upToDateWhen { false } - workingDir = projectDir - commandLine("yarn", "remove", "common-types") - commandLine("yarn", "add", "common-types@file:$rootDir/common/build/libs/common-types") - } - addCommonTypesTask { - mustRunAfter(":common:build") - } - val yarnRunBuildTask = tasks.register("yarnRunBuildTask") { commandLine("yarn", "run", "build") } diff --git a/common/build.gradle.kts b/common/build.gradle.kts deleted file mode 100644 index 6b88ea0..0000000 --- a/common/build.gradle.kts +++ /dev/null @@ -1,33 +0,0 @@ -plugins { - val kotlinVersion = "1.9.0" - kotlin("multiplatform") version kotlinVersion -} - -group = rootProject.group -version = rootProject.version - -kotlin { - js(IR) { - binaries.executable() - browser { - } - generateTypeScriptDefinitions() - } - jvm() -} - -tasks { - "build" { - doLast { - copy { - from("$buildDir/processedResources/js/main") - into("$buildDir/libs/common-types") - } - copy { - from("$buildDir/compileSync/js/main/productionExecutable/kotlin") - into("$buildDir/libs/common-types") - rename { name -> name.replace("${rootProject.name}-common", "index") } - } - } - } -} diff --git a/common/src/commonMain/kotlin/duck/shop/Duck.kt b/common/src/commonMain/kotlin/duck/shop/Duck.kt deleted file mode 100644 index 3f31b91..0000000 --- a/common/src/commonMain/kotlin/duck/shop/Duck.kt +++ /dev/null @@ -1,12 +0,0 @@ -package duck.shop - -import kotlin.js.ExperimentalJsExport -import kotlin.js.JsExport - -@OptIn(ExperimentalJsExport::class) -@JsExport -data class JsDuck( - val name: String, - val description: String? = null, - val hasKotlinAttribute: Boolean = false, -) diff --git a/common/src/commonMain/kotlin/old/school/Photo.kt b/common/src/commonMain/kotlin/old/school/Photo.kt deleted file mode 100644 index 2e29602..0000000 --- a/common/src/commonMain/kotlin/old/school/Photo.kt +++ /dev/null @@ -1,13 +0,0 @@ -@file:Suppress("unused") - -package old.school - -import kotlin.js.ExperimentalJsExport -import kotlin.js.JsExport - -@OptIn(ExperimentalJsExport::class) -@JsExport -data class JsPhoto( - val name: String, - val description: String? = null, -) diff --git a/duckShopServer/DuckShopServerDuckMapInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt b/duckShopServer/DuckShopServerDuckMapInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt new file mode 100644 index 0000000..6991671 --- /dev/null +++ b/duckShopServer/DuckShopServerDuckMapInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt @@ -0,0 +1,3 @@ +package org.jetbrains.kotlin.course.duck.shop.duck + +data class JsDuck(val name: String, val description: String?, val hasKotlinAttribute: Boolean) diff --git a/duckShopServer/DuckShopServerDuckMapInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt b/duckShopServer/DuckShopServerDuckMapInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt index 783e5bb..6b8e51c 100644 --- a/duckShopServer/DuckShopServerDuckMapInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt +++ b/duckShopServer/DuckShopServerDuckMapInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.action -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/DuckShopServerDuckMapInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt b/duckShopServer/DuckShopServerDuckMapInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt index 20dcb13..0461951 100644 --- a/duckShopServer/DuckShopServerDuckMapInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt +++ b/duckShopServer/DuckShopServerDuckMapInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.change -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/DuckShopServerDuckMapInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt b/duckShopServer/DuckShopServerDuckMapInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt index 1922e2d..2e6ea55 100644 --- a/duckShopServer/DuckShopServerDuckMapInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt +++ b/duckShopServer/DuckShopServerDuckMapInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.mode -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.utils.GameMode import org.jetbrains.kotlin.course.duck.shop.utils.toJsDuck import org.springframework.web.bind.annotation.CrossOrigin diff --git a/duckShopServer/DuckShopServerDuckMapInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt b/duckShopServer/DuckShopServerDuckMapInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt index fe6a130..04a4ab8 100644 --- a/duckShopServer/DuckShopServerDuckMapInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt +++ b/duckShopServer/DuckShopServerDuckMapInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.utils -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.Duck import org.jetbrains.kotlin.course.duck.shop.functions.common.Body diff --git a/duckShopServer/DuckShopServerDuckSetInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt b/duckShopServer/DuckShopServerDuckSetInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt new file mode 100644 index 0000000..6991671 --- /dev/null +++ b/duckShopServer/DuckShopServerDuckSetInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt @@ -0,0 +1,3 @@ +package org.jetbrains.kotlin.course.duck.shop.duck + +data class JsDuck(val name: String, val description: String?, val hasKotlinAttribute: Boolean) diff --git a/duckShopServer/DuckShopServerDuckSetInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt b/duckShopServer/DuckShopServerDuckSetInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt index 783e5bb..6b8e51c 100644 --- a/duckShopServer/DuckShopServerDuckSetInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt +++ b/duckShopServer/DuckShopServerDuckSetInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.action -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/DuckShopServerDuckSetInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt b/duckShopServer/DuckShopServerDuckSetInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt index 20dcb13..0461951 100644 --- a/duckShopServer/DuckShopServerDuckSetInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt +++ b/duckShopServer/DuckShopServerDuckSetInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.change -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/DuckShopServerDuckSetInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt b/duckShopServer/DuckShopServerDuckSetInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt index 1922e2d..2e6ea55 100644 --- a/duckShopServer/DuckShopServerDuckSetInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt +++ b/duckShopServer/DuckShopServerDuckSetInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.mode -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.utils.GameMode import org.jetbrains.kotlin.course.duck.shop.utils.toJsDuck import org.springframework.web.bind.annotation.CrossOrigin diff --git a/duckShopServer/DuckShopServerDuckSetInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt b/duckShopServer/DuckShopServerDuckSetInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt index fe6a130..04a4ab8 100644 --- a/duckShopServer/DuckShopServerDuckSetInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt +++ b/duckShopServer/DuckShopServerDuckSetInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.utils -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.Duck import org.jetbrains.kotlin.course.duck.shop.functions.common.Body diff --git a/duckShopServer/DuckShopServerDucksListInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt b/duckShopServer/DuckShopServerDucksListInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt new file mode 100644 index 0000000..6991671 --- /dev/null +++ b/duckShopServer/DuckShopServerDucksListInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt @@ -0,0 +1,3 @@ +package org.jetbrains.kotlin.course.duck.shop.duck + +data class JsDuck(val name: String, val description: String?, val hasKotlinAttribute: Boolean) diff --git a/duckShopServer/DuckShopServerDucksListInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt b/duckShopServer/DuckShopServerDucksListInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt index 783e5bb..6b8e51c 100644 --- a/duckShopServer/DuckShopServerDucksListInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt +++ b/duckShopServer/DuckShopServerDucksListInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.action -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/DuckShopServerDucksListInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt b/duckShopServer/DuckShopServerDucksListInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt index 20dcb13..0461951 100644 --- a/duckShopServer/DuckShopServerDucksListInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt +++ b/duckShopServer/DuckShopServerDucksListInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.change -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/DuckShopServerDucksListInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt b/duckShopServer/DuckShopServerDucksListInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt index 1922e2d..2e6ea55 100644 --- a/duckShopServer/DuckShopServerDucksListInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt +++ b/duckShopServer/DuckShopServerDucksListInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.mode -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.utils.GameMode import org.jetbrains.kotlin.course.duck.shop.utils.toJsDuck import org.springframework.web.bind.annotation.CrossOrigin diff --git a/duckShopServer/DuckShopServerDucksListInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt b/duckShopServer/DuckShopServerDucksListInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt index fe6a130..04a4ab8 100644 --- a/duckShopServer/DuckShopServerDucksListInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt +++ b/duckShopServer/DuckShopServerDucksListInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.utils -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.Duck import org.jetbrains.kotlin.course.duck.shop.functions.common.Body diff --git a/duckShopServer/DuckShopServerMapDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt b/duckShopServer/DuckShopServerMapDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt new file mode 100644 index 0000000..6991671 --- /dev/null +++ b/duckShopServer/DuckShopServerMapDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt @@ -0,0 +1,3 @@ +package org.jetbrains.kotlin.course.duck.shop.duck + +data class JsDuck(val name: String, val description: String?, val hasKotlinAttribute: Boolean) diff --git a/duckShopServer/DuckShopServerMapDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt b/duckShopServer/DuckShopServerMapDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt index 783e5bb..6b8e51c 100644 --- a/duckShopServer/DuckShopServerMapDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt +++ b/duckShopServer/DuckShopServerMapDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.action -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/DuckShopServerMapDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt b/duckShopServer/DuckShopServerMapDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt index 20dcb13..0461951 100644 --- a/duckShopServer/DuckShopServerMapDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt +++ b/duckShopServer/DuckShopServerMapDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.change -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/DuckShopServerMapDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt b/duckShopServer/DuckShopServerMapDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt index 1922e2d..2e6ea55 100644 --- a/duckShopServer/DuckShopServerMapDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt +++ b/duckShopServer/DuckShopServerMapDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.mode -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.utils.GameMode import org.jetbrains.kotlin.course.duck.shop.utils.toJsDuck import org.springframework.web.bind.annotation.CrossOrigin diff --git a/duckShopServer/DuckShopServerMapDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt b/duckShopServer/DuckShopServerMapDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt index fe6a130..04a4ab8 100644 --- a/duckShopServer/DuckShopServerMapDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt +++ b/duckShopServer/DuckShopServerMapDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.utils -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.Duck import org.jetbrains.kotlin.course.duck.shop.functions.common.Body diff --git a/duckShopServer/DuckShopServerSetDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt b/duckShopServer/DuckShopServerSetDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt new file mode 100644 index 0000000..6991671 --- /dev/null +++ b/duckShopServer/DuckShopServerSetDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt @@ -0,0 +1,3 @@ +package org.jetbrains.kotlin.course.duck.shop.duck + +data class JsDuck(val name: String, val description: String?, val hasKotlinAttribute: Boolean) diff --git a/duckShopServer/DuckShopServerSetDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt b/duckShopServer/DuckShopServerSetDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt index 783e5bb..6b8e51c 100644 --- a/duckShopServer/DuckShopServerSetDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt +++ b/duckShopServer/DuckShopServerSetDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.action -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/DuckShopServerSetDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt b/duckShopServer/DuckShopServerSetDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt index 20dcb13..0461951 100644 --- a/duckShopServer/DuckShopServerSetDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt +++ b/duckShopServer/DuckShopServerSetDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.change -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/DuckShopServerSetDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt b/duckShopServer/DuckShopServerSetDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt index 1922e2d..2e6ea55 100644 --- a/duckShopServer/DuckShopServerSetDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt +++ b/duckShopServer/DuckShopServerSetDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.mode -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.utils.GameMode import org.jetbrains.kotlin.course.duck.shop.utils.toJsDuck import org.springframework.web.bind.annotation.CrossOrigin diff --git a/duckShopServer/DuckShopServerSetDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt b/duckShopServer/DuckShopServerSetDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt index fe6a130..04a4ab8 100644 --- a/duckShopServer/DuckShopServerSetDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt +++ b/duckShopServer/DuckShopServerSetDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.utils -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.Duck import org.jetbrains.kotlin.course.duck.shop.functions.common.Body diff --git a/duckShopServer/duckShopServerAddElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt b/duckShopServer/duckShopServerAddElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt new file mode 100644 index 0000000..6991671 --- /dev/null +++ b/duckShopServer/duckShopServerAddElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt @@ -0,0 +1,3 @@ +package org.jetbrains.kotlin.course.duck.shop.duck + +data class JsDuck(val name: String, val description: String?, val hasKotlinAttribute: Boolean) diff --git a/duckShopServer/duckShopServerAddElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt b/duckShopServer/duckShopServerAddElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt index 783e5bb..6b8e51c 100644 --- a/duckShopServer/duckShopServerAddElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt +++ b/duckShopServer/duckShopServerAddElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.action -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/duckShopServerAddElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt b/duckShopServer/duckShopServerAddElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt index 20dcb13..0461951 100644 --- a/duckShopServer/duckShopServerAddElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt +++ b/duckShopServer/duckShopServerAddElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.change -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/duckShopServerAddElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt b/duckShopServer/duckShopServerAddElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt index 1922e2d..2e6ea55 100644 --- a/duckShopServer/duckShopServerAddElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt +++ b/duckShopServer/duckShopServerAddElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.mode -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.utils.GameMode import org.jetbrains.kotlin.course.duck.shop.utils.toJsDuck import org.springframework.web.bind.annotation.CrossOrigin diff --git a/duckShopServer/duckShopServerAddElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt b/duckShopServer/duckShopServerAddElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt index fe6a130..04a4ab8 100644 --- a/duckShopServer/duckShopServerAddElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt +++ b/duckShopServer/duckShopServerAddElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.utils -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.Duck import org.jetbrains.kotlin.course.duck.shop.functions.common.Body diff --git a/duckShopServer/duckShopServerBuiltInFunctions/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt b/duckShopServer/duckShopServerBuiltInFunctions/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt new file mode 100644 index 0000000..6991671 --- /dev/null +++ b/duckShopServer/duckShopServerBuiltInFunctions/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt @@ -0,0 +1,3 @@ +package org.jetbrains.kotlin.course.duck.shop.duck + +data class JsDuck(val name: String, val description: String?, val hasKotlinAttribute: Boolean) diff --git a/duckShopServer/duckShopServerBuiltInFunctions/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt b/duckShopServer/duckShopServerBuiltInFunctions/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt index 783e5bb..6b8e51c 100644 --- a/duckShopServer/duckShopServerBuiltInFunctions/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt +++ b/duckShopServer/duckShopServerBuiltInFunctions/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.action -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/duckShopServerBuiltInFunctions/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt b/duckShopServer/duckShopServerBuiltInFunctions/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt index 20dcb13..0461951 100644 --- a/duckShopServer/duckShopServerBuiltInFunctions/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt +++ b/duckShopServer/duckShopServerBuiltInFunctions/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.change -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/duckShopServerBuiltInFunctions/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt b/duckShopServer/duckShopServerBuiltInFunctions/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt index 1922e2d..2e6ea55 100644 --- a/duckShopServer/duckShopServerBuiltInFunctions/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt +++ b/duckShopServer/duckShopServerBuiltInFunctions/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.mode -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.utils.GameMode import org.jetbrains.kotlin.course.duck.shop.utils.toJsDuck import org.springframework.web.bind.annotation.CrossOrigin diff --git a/duckShopServer/duckShopServerBuiltInFunctions/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt b/duckShopServer/duckShopServerBuiltInFunctions/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt index fe6a130..04a4ab8 100644 --- a/duckShopServer/duckShopServerBuiltInFunctions/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt +++ b/duckShopServer/duckShopServerBuiltInFunctions/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.utils -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.Duck import org.jetbrains.kotlin.course.duck.shop.functions.common.Body diff --git a/duckShopServer/duckShopServerFilter/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt b/duckShopServer/duckShopServerFilter/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt new file mode 100644 index 0000000..6991671 --- /dev/null +++ b/duckShopServer/duckShopServerFilter/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt @@ -0,0 +1,3 @@ +package org.jetbrains.kotlin.course.duck.shop.duck + +data class JsDuck(val name: String, val description: String?, val hasKotlinAttribute: Boolean) diff --git a/duckShopServer/duckShopServerFilter/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt b/duckShopServer/duckShopServerFilter/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt index 783e5bb..6b8e51c 100644 --- a/duckShopServer/duckShopServerFilter/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt +++ b/duckShopServer/duckShopServerFilter/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.action -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/duckShopServerFilter/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt b/duckShopServer/duckShopServerFilter/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt index 20dcb13..0461951 100644 --- a/duckShopServer/duckShopServerFilter/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt +++ b/duckShopServer/duckShopServerFilter/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.change -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/duckShopServerFilter/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt b/duckShopServer/duckShopServerFilter/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt index 1922e2d..2e6ea55 100644 --- a/duckShopServer/duckShopServerFilter/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt +++ b/duckShopServer/duckShopServerFilter/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.mode -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.utils.GameMode import org.jetbrains.kotlin.course.duck.shop.utils.toJsDuck import org.springframework.web.bind.annotation.CrossOrigin diff --git a/duckShopServer/duckShopServerFilter/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt b/duckShopServer/duckShopServerFilter/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt index fe6a130..04a4ab8 100644 --- a/duckShopServer/duckShopServerFilter/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt +++ b/duckShopServer/duckShopServerFilter/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.utils -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.Duck import org.jetbrains.kotlin.course.duck.shop.functions.common.Body diff --git a/duckShopServer/duckShopServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt b/duckShopServer/duckShopServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt new file mode 100644 index 0000000..6991671 --- /dev/null +++ b/duckShopServer/duckShopServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt @@ -0,0 +1,3 @@ +package org.jetbrains.kotlin.course.duck.shop.duck + +data class JsDuck(val name: String, val description: String?, val hasKotlinAttribute: Boolean) diff --git a/duckShopServer/duckShopServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt b/duckShopServer/duckShopServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt index 783e5bb..6b8e51c 100644 --- a/duckShopServer/duckShopServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt +++ b/duckShopServer/duckShopServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.action -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/duckShopServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt b/duckShopServer/duckShopServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt index 20dcb13..0461951 100644 --- a/duckShopServer/duckShopServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt +++ b/duckShopServer/duckShopServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.change -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/duckShopServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt b/duckShopServer/duckShopServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt index 1922e2d..2e6ea55 100644 --- a/duckShopServer/duckShopServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt +++ b/duckShopServer/duckShopServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.mode -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.utils.GameMode import org.jetbrains.kotlin.course.duck.shop.utils.toJsDuck import org.springframework.web.bind.annotation.CrossOrigin diff --git a/duckShopServer/duckShopServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt b/duckShopServer/duckShopServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt index fe6a130..04a4ab8 100644 --- a/duckShopServer/duckShopServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt +++ b/duckShopServer/duckShopServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.utils -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.Duck import org.jetbrains.kotlin.course.duck.shop.functions.common.Body diff --git a/duckShopServer/duckShopServerImprovments/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt b/duckShopServer/duckShopServerImprovments/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt new file mode 100644 index 0000000..6991671 --- /dev/null +++ b/duckShopServer/duckShopServerImprovments/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt @@ -0,0 +1,3 @@ +package org.jetbrains.kotlin.course.duck.shop.duck + +data class JsDuck(val name: String, val description: String?, val hasKotlinAttribute: Boolean) diff --git a/duckShopServer/duckShopServerImprovments/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt b/duckShopServer/duckShopServerImprovments/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt index 783e5bb..6b8e51c 100644 --- a/duckShopServer/duckShopServerImprovments/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt +++ b/duckShopServer/duckShopServerImprovments/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.action -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/duckShopServerImprovments/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt b/duckShopServer/duckShopServerImprovments/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt index 20dcb13..0461951 100644 --- a/duckShopServer/duckShopServerImprovments/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt +++ b/duckShopServer/duckShopServerImprovments/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.change -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/duckShopServerImprovments/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt b/duckShopServer/duckShopServerImprovments/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt index 1922e2d..2e6ea55 100644 --- a/duckShopServer/duckShopServerImprovments/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt +++ b/duckShopServer/duckShopServerImprovments/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.mode -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.utils.GameMode import org.jetbrains.kotlin.course.duck.shop.utils.toJsDuck import org.springframework.web.bind.annotation.CrossOrigin diff --git a/duckShopServer/duckShopServerImprovments/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt b/duckShopServer/duckShopServerImprovments/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt index fe6a130..04a4ab8 100644 --- a/duckShopServer/duckShopServerImprovments/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt +++ b/duckShopServer/duckShopServerImprovments/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.utils -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.Duck import org.jetbrains.kotlin.course.duck.shop.functions.common.Body diff --git a/duckShopServer/duckShopServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt b/duckShopServer/duckShopServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt new file mode 100644 index 0000000..6991671 --- /dev/null +++ b/duckShopServer/duckShopServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt @@ -0,0 +1,3 @@ +package org.jetbrains.kotlin.course.duck.shop.duck + +data class JsDuck(val name: String, val description: String?, val hasKotlinAttribute: Boolean) diff --git a/duckShopServer/duckShopServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt b/duckShopServer/duckShopServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt index 783e5bb..6b8e51c 100644 --- a/duckShopServer/duckShopServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt +++ b/duckShopServer/duckShopServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.action -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/duckShopServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt b/duckShopServer/duckShopServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt index 20dcb13..0461951 100644 --- a/duckShopServer/duckShopServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt +++ b/duckShopServer/duckShopServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.change -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/duckShopServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt b/duckShopServer/duckShopServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt index 1922e2d..2e6ea55 100644 --- a/duckShopServer/duckShopServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt +++ b/duckShopServer/duckShopServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.mode -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.utils.GameMode import org.jetbrains.kotlin.course.duck.shop.utils.toJsDuck import org.springframework.web.bind.annotation.CrossOrigin diff --git a/duckShopServer/duckShopServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt b/duckShopServer/duckShopServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt index fe6a130..04a4ab8 100644 --- a/duckShopServer/duckShopServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt +++ b/duckShopServer/duckShopServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.utils -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.Duck import org.jetbrains.kotlin.course.duck.shop.functions.common.Body diff --git a/duckShopServer/duckShopServerListDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt b/duckShopServer/duckShopServerListDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt new file mode 100644 index 0000000..6991671 --- /dev/null +++ b/duckShopServer/duckShopServerListDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt @@ -0,0 +1,3 @@ +package org.jetbrains.kotlin.course.duck.shop.duck + +data class JsDuck(val name: String, val description: String?, val hasKotlinAttribute: Boolean) diff --git a/duckShopServer/duckShopServerListDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt b/duckShopServer/duckShopServerListDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt index 783e5bb..6b8e51c 100644 --- a/duckShopServer/duckShopServerListDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt +++ b/duckShopServer/duckShopServerListDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.action -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/duckShopServerListDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt b/duckShopServer/duckShopServerListDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt index 20dcb13..0461951 100644 --- a/duckShopServer/duckShopServerListDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt +++ b/duckShopServer/duckShopServerListDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.change -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/duckShopServerListDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt b/duckShopServer/duckShopServerListDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt index 1922e2d..2e6ea55 100644 --- a/duckShopServer/duckShopServerListDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt +++ b/duckShopServer/duckShopServerListDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.mode -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.utils.GameMode import org.jetbrains.kotlin.course.duck.shop.utils.toJsDuck import org.springframework.web.bind.annotation.CrossOrigin diff --git a/duckShopServer/duckShopServerListDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt b/duckShopServer/duckShopServerListDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt index fe6a130..04a4ab8 100644 --- a/duckShopServer/duckShopServerListDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt +++ b/duckShopServer/duckShopServerListDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.utils -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.Duck import org.jetbrains.kotlin.course.duck.shop.functions.common.Body diff --git a/duckShopServer/duckShopServerMutableCollectionDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt b/duckShopServer/duckShopServerMutableCollectionDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt new file mode 100644 index 0000000..6991671 --- /dev/null +++ b/duckShopServer/duckShopServerMutableCollectionDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt @@ -0,0 +1,3 @@ +package org.jetbrains.kotlin.course.duck.shop.duck + +data class JsDuck(val name: String, val description: String?, val hasKotlinAttribute: Boolean) diff --git a/duckShopServer/duckShopServerMutableCollectionDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt b/duckShopServer/duckShopServerMutableCollectionDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt index 783e5bb..6b8e51c 100644 --- a/duckShopServer/duckShopServerMutableCollectionDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt +++ b/duckShopServer/duckShopServerMutableCollectionDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.action -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/duckShopServerMutableCollectionDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt b/duckShopServer/duckShopServerMutableCollectionDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt index 20dcb13..0461951 100644 --- a/duckShopServer/duckShopServerMutableCollectionDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt +++ b/duckShopServer/duckShopServerMutableCollectionDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.change -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/duckShopServerMutableCollectionDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt b/duckShopServer/duckShopServerMutableCollectionDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt index 1922e2d..2e6ea55 100644 --- a/duckShopServer/duckShopServerMutableCollectionDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt +++ b/duckShopServer/duckShopServerMutableCollectionDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.mode -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.utils.GameMode import org.jetbrains.kotlin.course.duck.shop.utils.toJsDuck import org.springframework.web.bind.annotation.CrossOrigin diff --git a/duckShopServer/duckShopServerMutableCollectionDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt b/duckShopServer/duckShopServerMutableCollectionDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt index fe6a130..04a4ab8 100644 --- a/duckShopServer/duckShopServerMutableCollectionDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt +++ b/duckShopServer/duckShopServerMutableCollectionDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.utils -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.Duck import org.jetbrains.kotlin.course.duck.shop.functions.common.Body diff --git a/duckShopServer/duckShopServerPartition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt b/duckShopServer/duckShopServerPartition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt new file mode 100644 index 0000000..6991671 --- /dev/null +++ b/duckShopServer/duckShopServerPartition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt @@ -0,0 +1,3 @@ +package org.jetbrains.kotlin.course.duck.shop.duck + +data class JsDuck(val name: String, val description: String?, val hasKotlinAttribute: Boolean) diff --git a/duckShopServer/duckShopServerPartition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt b/duckShopServer/duckShopServerPartition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt index 783e5bb..6b8e51c 100644 --- a/duckShopServer/duckShopServerPartition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt +++ b/duckShopServer/duckShopServerPartition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.action -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/duckShopServerPartition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt b/duckShopServer/duckShopServerPartition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt index 20dcb13..0461951 100644 --- a/duckShopServer/duckShopServerPartition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt +++ b/duckShopServer/duckShopServerPartition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.change -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/duckShopServerPartition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt b/duckShopServer/duckShopServerPartition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt index 1922e2d..2e6ea55 100644 --- a/duckShopServer/duckShopServerPartition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt +++ b/duckShopServer/duckShopServerPartition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.mode -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.utils.GameMode import org.jetbrains.kotlin.course.duck.shop.utils.toJsDuck import org.springframework.web.bind.annotation.CrossOrigin diff --git a/duckShopServer/duckShopServerPartition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt b/duckShopServer/duckShopServerPartition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt index fe6a130..04a4ab8 100644 --- a/duckShopServer/duckShopServerPartition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt +++ b/duckShopServer/duckShopServerPartition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.utils -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.Duck import org.jetbrains.kotlin.course.duck.shop.functions.common.Body diff --git a/duckShopServer/duckShopServerRemoveElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt b/duckShopServer/duckShopServerRemoveElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt new file mode 100644 index 0000000..6991671 --- /dev/null +++ b/duckShopServer/duckShopServerRemoveElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt @@ -0,0 +1,3 @@ +package org.jetbrains.kotlin.course.duck.shop.duck + +data class JsDuck(val name: String, val description: String?, val hasKotlinAttribute: Boolean) diff --git a/duckShopServer/duckShopServerRemoveElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt b/duckShopServer/duckShopServerRemoveElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt index 783e5bb..6b8e51c 100644 --- a/duckShopServer/duckShopServerRemoveElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt +++ b/duckShopServer/duckShopServerRemoveElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.action -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/duckShopServerRemoveElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt b/duckShopServer/duckShopServerRemoveElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt index 20dcb13..0461951 100644 --- a/duckShopServer/duckShopServerRemoveElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt +++ b/duckShopServer/duckShopServerRemoveElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.change -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/duckShopServerRemoveElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt b/duckShopServer/duckShopServerRemoveElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt index 1922e2d..2e6ea55 100644 --- a/duckShopServer/duckShopServerRemoveElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt +++ b/duckShopServer/duckShopServerRemoveElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.mode -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.utils.GameMode import org.jetbrains.kotlin.course.duck.shop.utils.toJsDuck import org.springframework.web.bind.annotation.CrossOrigin diff --git a/duckShopServer/duckShopServerRemoveElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt b/duckShopServer/duckShopServerRemoveElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt index fe6a130..04a4ab8 100644 --- a/duckShopServer/duckShopServerRemoveElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt +++ b/duckShopServer/duckShopServerRemoveElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.utils -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.Duck import org.jetbrains.kotlin.course.duck.shop.functions.common.Body diff --git a/duckShopServer/duckShopServerShuffle/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt b/duckShopServer/duckShopServerShuffle/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt new file mode 100644 index 0000000..6991671 --- /dev/null +++ b/duckShopServer/duckShopServerShuffle/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt @@ -0,0 +1,3 @@ +package org.jetbrains.kotlin.course.duck.shop.duck + +data class JsDuck(val name: String, val description: String?, val hasKotlinAttribute: Boolean) diff --git a/duckShopServer/duckShopServerShuffle/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt b/duckShopServer/duckShopServerShuffle/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt index 783e5bb..6b8e51c 100644 --- a/duckShopServer/duckShopServerShuffle/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt +++ b/duckShopServer/duckShopServerShuffle/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.action -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/duckShopServerShuffle/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt b/duckShopServer/duckShopServerShuffle/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt index 20dcb13..0461951 100644 --- a/duckShopServer/duckShopServerShuffle/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt +++ b/duckShopServer/duckShopServerShuffle/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.change -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/duckShopServerShuffle/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt b/duckShopServer/duckShopServerShuffle/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt index 1922e2d..2e6ea55 100644 --- a/duckShopServer/duckShopServerShuffle/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt +++ b/duckShopServer/duckShopServerShuffle/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.mode -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.utils.GameMode import org.jetbrains.kotlin.course.duck.shop.utils.toJsDuck import org.springframework.web.bind.annotation.CrossOrigin diff --git a/duckShopServer/duckShopServerShuffle/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt b/duckShopServer/duckShopServerShuffle/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt index fe6a130..04a4ab8 100644 --- a/duckShopServer/duckShopServerShuffle/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt +++ b/duckShopServer/duckShopServerShuffle/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.utils -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.Duck import org.jetbrains.kotlin.course.duck.shop.functions.common.Body diff --git a/duckShopServer/duckShopServerSortFunction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt b/duckShopServer/duckShopServerSortFunction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt new file mode 100644 index 0000000..6991671 --- /dev/null +++ b/duckShopServer/duckShopServerSortFunction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt @@ -0,0 +1,3 @@ +package org.jetbrains.kotlin.course.duck.shop.duck + +data class JsDuck(val name: String, val description: String?, val hasKotlinAttribute: Boolean) diff --git a/duckShopServer/duckShopServerSortFunction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt b/duckShopServer/duckShopServerSortFunction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt index 783e5bb..6b8e51c 100644 --- a/duckShopServer/duckShopServerSortFunction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt +++ b/duckShopServer/duckShopServerSortFunction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.action -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/duckShopServerSortFunction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt b/duckShopServer/duckShopServerSortFunction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt index 20dcb13..0461951 100644 --- a/duckShopServer/duckShopServerSortFunction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt +++ b/duckShopServer/duckShopServerSortFunction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.functions.change -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.getDescription import org.jetbrains.kotlin.course.duck.shop.functions.common.Body import org.jetbrains.kotlin.course.duck.shop.utils.GameMode diff --git a/duckShopServer/duckShopServerSortFunction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt b/duckShopServer/duckShopServerSortFunction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt index 1922e2d..2e6ea55 100644 --- a/duckShopServer/duckShopServerSortFunction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt +++ b/duckShopServer/duckShopServerSortFunction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.mode -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.utils.GameMode import org.jetbrains.kotlin.course.duck.shop.utils.toJsDuck import org.springframework.web.bind.annotation.CrossOrigin diff --git a/duckShopServer/duckShopServerSortFunction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt b/duckShopServer/duckShopServerSortFunction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt index fe6a130..04a4ab8 100644 --- a/duckShopServer/duckShopServerSortFunction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt +++ b/duckShopServer/duckShopServerSortFunction/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.duck.shop.utils -import duck.shop.JsDuck +import org.jetbrains.kotlin.course.duck.shop.duck.JsDuck import org.jetbrains.kotlin.course.duck.shop.duck.Duck import org.jetbrains.kotlin.course.duck.shop.functions.common.Body diff --git a/oldSchoolServer/oldSchoolServerColorsList/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt b/oldSchoolServer/oldSchoolServerColorsList/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt index d4e6bee..a9fd32f 100644 --- a/oldSchoolServer/oldSchoolServerColorsList/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt +++ b/oldSchoolServer/oldSchoolServerColorsList/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.old.school.mode -import old.school.JsPhoto +import org.jetbrains.kotlin.course.old.school.photo.JsPhoto import org.springframework.web.bind.annotation.CrossOrigin import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.RequestMapping diff --git a/oldSchoolServer/oldSchoolServerColorsList/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt b/oldSchoolServer/oldSchoolServerColorsList/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt new file mode 100644 index 0000000..50124eb --- /dev/null +++ b/oldSchoolServer/oldSchoolServerColorsList/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt @@ -0,0 +1,3 @@ +package org.jetbrains.kotlin.course.old.school.photo + +data class JsPhoto(val name: String, val description: String? = null) diff --git a/oldSchoolServer/oldSchoolServerFindPhoto/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt b/oldSchoolServer/oldSchoolServerFindPhoto/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt index d4e6bee..a9fd32f 100644 --- a/oldSchoolServer/oldSchoolServerFindPhoto/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt +++ b/oldSchoolServer/oldSchoolServerFindPhoto/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.old.school.mode -import old.school.JsPhoto +import org.jetbrains.kotlin.course.old.school.photo.JsPhoto import org.springframework.web.bind.annotation.CrossOrigin import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.RequestMapping diff --git a/oldSchoolServer/oldSchoolServerFindPhoto/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt b/oldSchoolServer/oldSchoolServerFindPhoto/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt new file mode 100644 index 0000000..50124eb --- /dev/null +++ b/oldSchoolServer/oldSchoolServerFindPhoto/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt @@ -0,0 +1,3 @@ +package org.jetbrains.kotlin.course.old.school.photo + +data class JsPhoto(val name: String, val description: String? = null) diff --git a/oldSchoolServer/oldSchoolServerGroupBy/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt b/oldSchoolServer/oldSchoolServerGroupBy/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt index d4e6bee..a9fd32f 100644 --- a/oldSchoolServer/oldSchoolServerGroupBy/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt +++ b/oldSchoolServer/oldSchoolServerGroupBy/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.old.school.mode -import old.school.JsPhoto +import org.jetbrains.kotlin.course.old.school.photo.JsPhoto import org.springframework.web.bind.annotation.CrossOrigin import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.RequestMapping diff --git a/oldSchoolServer/oldSchoolServerGroupBy/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt b/oldSchoolServer/oldSchoolServerGroupBy/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt new file mode 100644 index 0000000..50124eb --- /dev/null +++ b/oldSchoolServer/oldSchoolServerGroupBy/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt @@ -0,0 +1,3 @@ +package org.jetbrains.kotlin.course.old.school.photo + +data class JsPhoto(val name: String, val description: String? = null) diff --git a/oldSchoolServer/oldSchoolServerGroupByByHairAndHat/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt b/oldSchoolServer/oldSchoolServerGroupByByHairAndHat/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt index d4e6bee..a9fd32f 100644 --- a/oldSchoolServer/oldSchoolServerGroupByByHairAndHat/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt +++ b/oldSchoolServer/oldSchoolServerGroupByByHairAndHat/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.old.school.mode -import old.school.JsPhoto +import org.jetbrains.kotlin.course.old.school.photo.JsPhoto import org.springframework.web.bind.annotation.CrossOrigin import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.RequestMapping diff --git a/oldSchoolServer/oldSchoolServerGroupByByHairAndHat/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt b/oldSchoolServer/oldSchoolServerGroupByByHairAndHat/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt new file mode 100644 index 0000000..50124eb --- /dev/null +++ b/oldSchoolServer/oldSchoolServerGroupByByHairAndHat/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt @@ -0,0 +1,3 @@ +package org.jetbrains.kotlin.course.old.school.photo + +data class JsPhoto(val name: String, val description: String? = null) diff --git a/oldSchoolServer/oldSchoolServerGroupByColor/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt b/oldSchoolServer/oldSchoolServerGroupByColor/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt index d4e6bee..a9fd32f 100644 --- a/oldSchoolServer/oldSchoolServerGroupByColor/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt +++ b/oldSchoolServer/oldSchoolServerGroupByColor/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.old.school.mode -import old.school.JsPhoto +import org.jetbrains.kotlin.course.old.school.photo.JsPhoto import org.springframework.web.bind.annotation.CrossOrigin import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.RequestMapping diff --git a/oldSchoolServer/oldSchoolServerGroupByColor/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt b/oldSchoolServer/oldSchoolServerGroupByColor/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt new file mode 100644 index 0000000..50124eb --- /dev/null +++ b/oldSchoolServer/oldSchoolServerGroupByColor/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt @@ -0,0 +1,3 @@ +package org.jetbrains.kotlin.course.old.school.photo + +data class JsPhoto(val name: String, val description: String? = null) diff --git a/oldSchoolServer/oldSchoolServerHelpers/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt b/oldSchoolServer/oldSchoolServerHelpers/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt index d4e6bee..a9fd32f 100644 --- a/oldSchoolServer/oldSchoolServerHelpers/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt +++ b/oldSchoolServer/oldSchoolServerHelpers/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.old.school.mode -import old.school.JsPhoto +import org.jetbrains.kotlin.course.old.school.photo.JsPhoto import org.springframework.web.bind.annotation.CrossOrigin import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.RequestMapping diff --git a/oldSchoolServer/oldSchoolServerHelpers/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt b/oldSchoolServer/oldSchoolServerHelpers/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt new file mode 100644 index 0000000..50124eb --- /dev/null +++ b/oldSchoolServer/oldSchoolServerHelpers/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt @@ -0,0 +1,3 @@ +package org.jetbrains.kotlin.course.old.school.photo + +data class JsPhoto(val name: String, val description: String? = null) diff --git a/oldSchoolServer/oldSchoolServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt b/oldSchoolServer/oldSchoolServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt index d4e6bee..a9fd32f 100644 --- a/oldSchoolServer/oldSchoolServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt +++ b/oldSchoolServer/oldSchoolServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.old.school.mode -import old.school.JsPhoto +import org.jetbrains.kotlin.course.old.school.photo.JsPhoto import org.springframework.web.bind.annotation.CrossOrigin import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.RequestMapping diff --git a/oldSchoolServer/oldSchoolServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt b/oldSchoolServer/oldSchoolServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt new file mode 100644 index 0000000..50124eb --- /dev/null +++ b/oldSchoolServer/oldSchoolServerHowToRun/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt @@ -0,0 +1,3 @@ +package org.jetbrains.kotlin.course.old.school.photo + +data class JsPhoto(val name: String, val description: String? = null) diff --git a/oldSchoolServer/oldSchoolServerImprovements/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt b/oldSchoolServer/oldSchoolServerImprovements/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt index d4e6bee..a9fd32f 100644 --- a/oldSchoolServer/oldSchoolServerImprovements/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt +++ b/oldSchoolServer/oldSchoolServerImprovements/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.old.school.mode -import old.school.JsPhoto +import org.jetbrains.kotlin.course.old.school.photo.JsPhoto import org.springframework.web.bind.annotation.CrossOrigin import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.RequestMapping diff --git a/oldSchoolServer/oldSchoolServerImprovements/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt b/oldSchoolServer/oldSchoolServerImprovements/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt new file mode 100644 index 0000000..50124eb --- /dev/null +++ b/oldSchoolServer/oldSchoolServerImprovements/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt @@ -0,0 +1,3 @@ +package org.jetbrains.kotlin.course.old.school.photo + +data class JsPhoto(val name: String, val description: String? = null) diff --git a/oldSchoolServer/oldSchoolServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt b/oldSchoolServer/oldSchoolServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt index d4e6bee..a9fd32f 100644 --- a/oldSchoolServer/oldSchoolServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt +++ b/oldSchoolServer/oldSchoolServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/old/school/mode/GameModeResource.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.course.old.school.mode -import old.school.JsPhoto +import org.jetbrains.kotlin.course.old.school.photo.JsPhoto import org.springframework.web.bind.annotation.CrossOrigin import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.RequestMapping diff --git a/oldSchoolServer/oldSchoolServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt b/oldSchoolServer/oldSchoolServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt new file mode 100644 index 0000000..50124eb --- /dev/null +++ b/oldSchoolServer/oldSchoolServerIntroduction/src/main/kotlin/org/jetbrains/kotlin/course/old/school/photo/JsPhoto.kt @@ -0,0 +1,3 @@ +package org.jetbrains.kotlin.course.old.school.photo + +data class JsPhoto(val name: String, val description: String? = null)