Merge pull request #68 from Daoortor/remove-kotlin-js

Remove kotlin/js
jetbrains-academy · Jul 30, 2024 · 16692e0 · 16692e0
2 parents ec60b18 + e67b847
commit 16692e0
Show file tree

Hide file tree

Showing 115 changed files with 190 additions and 161 deletions.
diff --git 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<io.gitlab.arturbosch.detekt.DetektPlugin>()
 
     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<Exec>("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<Exec>("yarnRunBuildTask") {
         commandLine("yarn", "run", "build")
     }

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
diff --git a/common/src/commonMain/kotlin/duck/shop/Duck.kt b/common/src/commonMain/kotlin/duck/shop/Duck.kt
diff --git a/common/src/commonMain/kotlin/old/school/Photo.kt b/common/src/commonMain/kotlin/old/school/Photo.kt
diff --git 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
@@ -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
@@ -0,0 +1,14 @@
+import {Nullable} from "common-types";
+
+
+export class JsDuck {
+    constructor(name: string = "", description: Nullable<string> = null, hasKotlinAttribute: boolean = false) {
+        this.name = name
+        this.description = description
+        this.hasKotlinAttribute = hasKotlinAttribute
+    }
+
+    name: string
+    description: Nullable<string> = null
+    hasKotlinAttribute: Boolean = false
+}
diff --git 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<string>

diff --git a/...uckMapInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt b/...uckMapInitialization/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/...lin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt b/...lin/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/...lin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt b/...lin/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/...ialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt b/...ialization/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/...pInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt b/...pInitialization/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/...uckSetInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt b/...uckSetInitialization/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/...lin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt b/...lin/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/...lin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt b/...lin/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/...ialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt b/...ialization/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/...tInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt b/...tInitialization/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/...ksListInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt b/...ksListInitialization/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/...lin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt b/...lin/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/...lin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt b/...lin/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/...ialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt b/...ialization/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/...tInitialization/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt b/...tInitialization/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/...pServerMapDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt b/...pServerMapDefinition/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/...lin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt b/...lin/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/...lin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt b/...lin/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/...Definition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt b/...Definition/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/...erMapDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt b/...erMapDefinition/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/...pServerSetDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt b/...pServerSetDefinition/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/...lin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt b/...lin/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/...lin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt b/...lin/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/...Definition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt b/...Definition/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/...erSetDefinition/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt b/...erSetDefinition/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/...hopServerAddElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt b/...hopServerAddElements/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/...lin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt b/...lin/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/...lin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt b/...lin/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/...ddElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt b/...ddElements/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/...rverAddElements/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt b/...rverAddElements/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/...rverBuiltInFunctions/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt b/...rverBuiltInFunctions/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/...lin/org/jetbrains/kotlin/course/duck/shop/functions/action/GameActionFunctionsResource.kt b/...lin/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/...lin/org/jetbrains/kotlin/course/duck/shop/functions/change/GameChangeFunctionsResource.kt b/...lin/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/...nFunctions/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/mode/GameModeResource.kt b/...nFunctions/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/...uiltInFunctions/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/utils/Converters.kt b/...uiltInFunctions/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/...duckShopServerFilter/src/main/kotlin/org/jetbrains/kotlin/course/duck/shop/duck/JsDuck.kt b/...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)