diff --git a/.DS_Store b/.DS_Store index a7d1fab..9687716 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.metals/metals.lock.db b/.metals/metals.lock.db new file mode 100644 index 0000000..222556a --- /dev/null +++ b/.metals/metals.lock.db @@ -0,0 +1,6 @@ +#FileLock +#Sat Mar 23 13:00:55 MSK 2024 +hostName=localhost +id=18e6ac1958bcfabd8a4f6d0d994189ad9e061c25913 +method=file +server=localhost\:52505 diff --git a/.metals/metals.log b/.metals/metals.log new file mode 100644 index 0000000..30aa3e2 --- /dev/null +++ b/.metals/metals.log @@ -0,0 +1,236 @@ +2024.03.23 13:00:54 INFO Started: Metals version 1.2.2 in folders '/Users/apple/Desktop/diplom/math-game-frontend' for client Visual Studio Code 1.86.0. +13:00:55.178 [pool-1-thread-2] INFO org.flywaydb.core.internal.license.VersionPrinter -- Flyway Community Edition 9.22.3 by Redgate +13:00:55.180 [pool-1-thread-2] INFO org.flywaydb.core.internal.license.VersionPrinter -- See release notes here: https://rd.gt/416ObMi +13:00:55.180 [pool-1-thread-2] INFO org.flywaydb.core.internal.license.VersionPrinter -- +13:00:55.185 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.scanner.classpath.ClassPathScanner -- Scanning for classpath resources at 'classpath:db/callback' ... +13:00:55.185 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.scanner.classpath.ClassPathScanner -- Determining location urls for classpath:db/callback using ClassLoader jdk.internal.loader.ClassLoaders$AppClassLoader@7e32c033 ... +13:00:55.185 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.scanner.classpath.ClassPathScanner -- Unable to resolve location classpath:db/callback. +13:00:55.185 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.scanner.classpath.ClassPathScanner -- Scanning for classpath resources at 'classpath:db/migration' ... +13:00:55.185 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.scanner.classpath.ClassPathScanner -- Determining location urls for classpath:db/migration using ClassLoader jdk.internal.loader.ClassLoaders$AppClassLoader@7e32c033 ... +13:00:55.185 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.scanner.classpath.ClassPathScanner -- Scanning URL: jar:file:/Users/apple/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scalameta/metals_2.13/1.2.2/metals_2.13-1.2.2.jar!/db/migration +13:00:55.189 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.scanner.classpath.ClassPathScanner -- Found resource: db/migration/ +13:00:55.189 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.scanner.classpath.ClassPathScanner -- Found resource: db/migration/V1__Create_tables.sql +13:00:55.189 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.scanner.classpath.ClassPathScanner -- Found resource: db/migration/V2__Server_discovery.sql +13:00:55.189 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.scanner.classpath.ClassPathScanner -- Found resource: db/migration/V3__Jar_symbols.sql +13:00:55.189 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.scanner.classpath.ClassPathScanner -- Found resource: db/migration/V4__Fingerprints.sql +13:00:55.189 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.scanner.classpath.ClassPathScanner -- Scanning for classes at classpath:db/migration +13:00:55.192 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.scanner.Scanner -- Filtering out resource: db/migration/ (filename: ) +13:00:55.192 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.resource.ResourceNameValidator -- Validating V3__Jar_symbols.sql +13:00:55.193 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.resource.ResourceNameValidator -- Validating V4__Fingerprints.sql +13:00:55.193 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.resource.ResourceNameValidator -- Validating V2__Server_discovery.sql +13:00:55.193 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.resource.ResourceNameValidator -- Validating V1__Create_tables.sql +13:00:55.269 [pool-1-thread-2] INFO org.flywaydb.core.FlywayExecutor -- Database: jdbc:h2:file:/Users/apple/Desktop/diplom/math-game-frontend/.metals/metals (H2 2.2) +13:00:55.269 [pool-1-thread-2] DEBUG org.flywaydb.core.FlywayExecutor -- Driver: H2 JDBC Driver 2.2.224 (2023-09-17) +13:00:55.269 [pool-1-thread-2] DEBUG org.flywaydb.core.FlywayExecutor -- DDL Transactions Supported: false +13:00:55.271 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.schemahistory.SchemaHistoryFactory -- Schemas: +13:00:55.271 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.schemahistory.SchemaHistoryFactory -- Default schema: null +13:00:55.276 [pool-1-thread-2] WARN org.flywaydb.core.internal.database.base.Database -- Flyway upgrade recommended: H2 2.2.224 is newer than this version of Flyway and support has not been tested. The latest supported version of H2 is 2.2.220. +13:00:55.277 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.callback.SqlScriptCallbackFactory -- Scanning for SQL callbacks ... +13:00:55.277 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.scanner.Scanner -- Filtering out resource: db/migration/ (filename: ) +13:00:55.286 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.command.DbValidate -- Validating migrations ... +13:00:55.291 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.scanner.Scanner -- Filtering out resource: db/migration/ (filename: ) +13:00:55.303 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.scanner.Scanner -- Filtering out resource: db/migration/V3__Jar_symbols.sql (filename: V3__Jar_symbols.sql) +13:00:55.303 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.scanner.Scanner -- Filtering out resource: db/migration/V4__Fingerprints.sql (filename: V4__Fingerprints.sql) +13:00:55.303 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.scanner.Scanner -- Filtering out resource: db/migration/V2__Server_discovery.sql (filename: V2__Server_discovery.sql) +13:00:55.303 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.scanner.Scanner -- Filtering out resource: db/migration/V1__Create_tables.sql (filename: V1__Create_tables.sql) +13:00:55.303 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.scanner.Scanner -- Filtering out resource: db/migration/ (filename: ) +13:00:55.304 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.scanner.Scanner -- Filtering out resource: db/migration/V3__Jar_symbols.sql (filename: V3__Jar_symbols.sql) +13:00:55.304 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.scanner.Scanner -- Filtering out resource: db/migration/V4__Fingerprints.sql (filename: V4__Fingerprints.sql) +13:00:55.304 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.scanner.Scanner -- Filtering out resource: db/migration/V2__Server_discovery.sql (filename: V2__Server_discovery.sql) +13:00:55.304 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.scanner.Scanner -- Filtering out resource: db/migration/V1__Create_tables.sql (filename: V1__Create_tables.sql) +13:00:55.304 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.scanner.Scanner -- Filtering out resource: db/migration/ (filename: ) +13:00:55.307 [pool-1-thread-2] INFO org.flywaydb.core.internal.schemahistory.JdbcTableSchemaHistory -- Schema history table "PUBLIC"."flyway_schema_history" does not exist yet +13:00:55.310 [pool-1-thread-2] INFO org.flywaydb.core.internal.command.DbValidate -- Successfully validated 4 migrations (execution time 00:00.022s) +13:00:55.314 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.command.DbSchemas -- Skipping creation of existing schema: "PUBLIC" +13:00:55.318 [pool-1-thread-2] INFO org.flywaydb.core.internal.schemahistory.JdbcTableSchemaHistory -- Creating Schema History table "PUBLIC"."flyway_schema_history" ... +13:00:55.320 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.parser.Parser -- Parsing ... +13:00:55.329 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.ParserSqlScript -- Found statement at line 1: CREATE TABLE IF NOT EXISTS "PUBLIC"."flyway_schema_history" ( + "installed_rank" INT NOT NULL, + "version" VARCHAR(50), + "description" VARCHAR(200) NOT NULL, + "type" VARCHAR(20) NOT NULL, + "script" VARCHAR(1000) NOT NULL, + "checksum" INT, + "installed_by" VARCHAR(100) NOT NULL, + "installed_on" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + "execution_time" INT NOT NULL, + "success" BOOLEAN NOT NULL, + CONSTRAINT "flyway_schema_history_pk" PRIMARY KEY ("installed_rank") +) AS SELECT -1, NULL, '<< Flyway Schema History table created >>', 'TABLE', '', NULL, 'SA', CURRENT_TIMESTAMP, 0, TRUE +13:00:55.330 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.ParserSqlScript -- Found statement at line 14: CREATE INDEX "PUBLIC"."flyway_schema_history_s_idx" ON "PUBLIC"."flyway_schema_history" ("success") +13:00:55.331 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.DefaultSqlScriptExecutor -- Executing SQL: CREATE TABLE IF NOT EXISTS "PUBLIC"."flyway_schema_history" ( + "installed_rank" INT NOT NULL, + "version" VARCHAR(50), + "description" VARCHAR(200) NOT NULL, + "type" VARCHAR(20) NOT NULL, + "script" VARCHAR(1000) NOT NULL, + "checksum" INT, + "installed_by" VARCHAR(100) NOT NULL, + "installed_on" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + "execution_time" INT NOT NULL, + "success" BOOLEAN NOT NULL, + CONSTRAINT "flyway_schema_history_pk" PRIMARY KEY ("installed_rank") +) AS SELECT -1, NULL, '<< Flyway Schema History table created >>', 'TABLE', '', NULL, 'SA', CURRENT_TIMESTAMP, 0, TRUE +13:00:55.335 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.DefaultSqlScriptExecutor -- 0 rows affected +13:00:55.335 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.DefaultSqlScriptExecutor -- Executing SQL: CREATE INDEX "PUBLIC"."flyway_schema_history_s_idx" ON "PUBLIC"."flyway_schema_history" ("success") +13:00:55.339 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.DefaultSqlScriptExecutor -- 0 rows affected +13:00:55.339 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.schemahistory.JdbcTableSchemaHistory -- Created Schema History table "PUBLIC"."flyway_schema_history" +13:00:55.346 [pool-1-thread-2] INFO org.flywaydb.core.internal.command.DbMigrate -- Current version of schema "PUBLIC": << Empty Schema >> +13:00:55.347 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.parser.Parser -- Parsing V1__Create_tables.sql ... +13:00:55.349 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.ParserSqlScript -- Found statement at line 4: -- The relationship between library dependency sources under .metals/readonly/** +-- and build targets they belong to. Required to know what classpath to use +-- for compiling dependency sources. +create table dependency_source( + text_document_uri varchar primary key, + build_target_uri varchar not null +) +13:00:55.350 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.ParserSqlScript -- Found statement at line 12: -- The relationship between library dependency sources under .metals/readonly/** +-- and worksheets they belong to. Required to know what classpath to use +-- for compiling dependency sources. +create table worksheet_dependency_source( + text_document_uri varchar primary key, + worksheet_uri varchar not null +) +13:00:55.351 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.ParserSqlScript -- Found statement at line 19: -- The relationship between what library dependency sources under .metals/readonly/** +-- map to which build targets. +create table sbt_digest( + md5 varchar, + status tinyint not null, + when_recorded timestamp +) +13:00:55.352 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.ParserSqlScript -- Found statement at line 27: -- Which window/showMessage and window/showMessageRequest dialogues have been dismissed +-- by the user via "Don't show again" or closed by clicking on "x". +create table dismissed_notification( + id int, + when_dismissed timestamp, + when_expires timestamp +) +13:00:55.352 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.ParserSqlScript -- Found statement at line 34: -- The choice of build tool when multiple build tool files are found in a workspace +create table chosen_build_tool( + build_tool varchar primary key +) +13:00:55.353 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.command.DbMigrate -- Starting migration of schema "PUBLIC" to version "1 - Create tables" ... +13:00:55.354 [pool-1-thread-2] INFO org.flywaydb.core.internal.command.DbMigrate -- Migrating schema "PUBLIC" to version "1 - Create tables" +13:00:55.355 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.DefaultSqlScriptExecutor -- Executing SQL: -- The relationship between library dependency sources under .metals/readonly/** +-- and build targets they belong to. Required to know what classpath to use +-- for compiling dependency sources. +create table dependency_source( + text_document_uri varchar primary key, + build_target_uri varchar not null +) +13:00:55.357 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.DefaultSqlScriptExecutor -- 0 rows affected +13:00:55.357 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.DefaultSqlScriptExecutor -- Executing SQL: -- The relationship between library dependency sources under .metals/readonly/** +-- and worksheets they belong to. Required to know what classpath to use +-- for compiling dependency sources. +create table worksheet_dependency_source( + text_document_uri varchar primary key, + worksheet_uri varchar not null +) +13:00:55.358 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.DefaultSqlScriptExecutor -- 0 rows affected +13:00:55.359 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.DefaultSqlScriptExecutor -- Executing SQL: -- The relationship between what library dependency sources under .metals/readonly/** +-- map to which build targets. +create table sbt_digest( + md5 varchar, + status tinyint not null, + when_recorded timestamp +) +13:00:55.359 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.DefaultSqlScriptExecutor -- 0 rows affected +13:00:55.359 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.DefaultSqlScriptExecutor -- Executing SQL: -- Which window/showMessage and window/showMessageRequest dialogues have been dismissed +-- by the user via "Don't show again" or closed by clicking on "x". +create table dismissed_notification( + id int, + when_dismissed timestamp, + when_expires timestamp +) +13:00:55.360 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.DefaultSqlScriptExecutor -- 0 rows affected +13:00:55.360 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.DefaultSqlScriptExecutor -- Executing SQL: -- The choice of build tool when multiple build tool files are found in a workspace +create table chosen_build_tool( + build_tool varchar primary key +) +13:00:55.361 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.DefaultSqlScriptExecutor -- 0 rows affected +13:00:55.361 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.command.DbMigrate -- Successfully completed migration of schema "PUBLIC" to version "1 - Create tables" +13:00:55.363 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.schemahistory.JdbcTableSchemaHistory -- Schema History table "PUBLIC"."flyway_schema_history" successfully updated to reflect changes +13:00:55.369 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.parser.Parser -- Parsing V2__Server_discovery.sql ... +13:00:55.371 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.ParserSqlScript -- Found statement at line 4: -- For each unique combination of installed build servers we select one server. +-- The md5 checksum is computed from the names of the installed build servers, and +-- the selected server is the server which the user chose for this workspace. +create table chosen_build_server( + md5 varchar primary key, + selected_server varchar, + when_recorded timestamp +) +13:00:55.371 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.command.DbMigrate -- Starting migration of schema "PUBLIC" to version "2 - Server discovery" ... +13:00:55.372 [pool-1-thread-2] INFO org.flywaydb.core.internal.command.DbMigrate -- Migrating schema "PUBLIC" to version "2 - Server discovery" +13:00:55.372 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.DefaultSqlScriptExecutor -- Executing SQL: -- For each unique combination of installed build servers we select one server. +-- The md5 checksum is computed from the names of the installed build servers, and +-- the selected server is the server which the user chose for this workspace. +create table chosen_build_server( + md5 varchar primary key, + selected_server varchar, + when_recorded timestamp +) +13:00:55.373 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.DefaultSqlScriptExecutor -- 0 rows affected +13:00:55.374 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.command.DbMigrate -- Successfully completed migration of schema "PUBLIC" to version "2 - Server discovery" +13:00:55.375 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.schemahistory.JdbcTableSchemaHistory -- Schema History table "PUBLIC"."flyway_schema_history" successfully updated to reflect changes +13:00:55.377 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.parser.Parser -- Parsing V3__Jar_symbols.sql ... +13:00:55.379 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.ParserSqlScript -- Found statement at line 2: -- Indexed jars, the MD5 digest of path, modified time and size as key +create table indexed_jar( + id int auto_increment unique, + md5 varchar primary key +) +13:00:55.380 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.ParserSqlScript -- Found statement at line 7: -- Top Level Symbols per jar, allow for multiple jars with same symbols and paths +create table toplevel_symbol( + symbol varchar not null, + path varchar not null, + jar int, + foreign key (jar) references indexed_jar (id) on delete cascade, + primary key (jar, path, symbol) +) +13:00:55.381 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.ParserSqlScript -- Found statement at line 15: -- Create index to speedup lookup of jar symbols +create index toplevel_symbol_jar on toplevel_symbol(jar) +13:00:55.381 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.command.DbMigrate -- Starting migration of schema "PUBLIC" to version "3 - Jar symbols" ... +13:00:55.382 [pool-1-thread-2] INFO org.flywaydb.core.internal.command.DbMigrate -- Migrating schema "PUBLIC" to version "3 - Jar symbols" +13:00:55.382 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.DefaultSqlScriptExecutor -- Executing SQL: -- Indexed jars, the MD5 digest of path, modified time and size as key +create table indexed_jar( + id int auto_increment unique, + md5 varchar primary key +) +13:00:55.387 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.DefaultSqlScriptExecutor -- 0 rows affected +13:00:55.387 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.DefaultSqlScriptExecutor -- Executing SQL: -- Top Level Symbols per jar, allow for multiple jars with same symbols and paths +create table toplevel_symbol( + symbol varchar not null, + path varchar not null, + jar int, + foreign key (jar) references indexed_jar (id) on delete cascade, + primary key (jar, path, symbol) +) +13:00:55.392 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.DefaultSqlScriptExecutor -- 0 rows affected +13:00:55.392 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.DefaultSqlScriptExecutor -- Executing SQL: -- Create index to speedup lookup of jar symbols +create index toplevel_symbol_jar on toplevel_symbol(jar) +13:00:55.393 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.DefaultSqlScriptExecutor -- 0 rows affected +13:00:55.393 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.command.DbMigrate -- Successfully completed migration of schema "PUBLIC" to version "3 - Jar symbols" +13:00:55.395 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.schemahistory.JdbcTableSchemaHistory -- Schema History table "PUBLIC"."flyway_schema_history" successfully updated to reflect changes +13:00:55.396 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.parser.Parser -- Parsing V4__Fingerprints.sql ... +13:00:55.398 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.ParserSqlScript -- Found statement at line 2: -- Fingerprints saved between invocations +create table fingerprints( + path varchar not null, + text varchar not null, + md5 varchar not null, + id int auto_increment unique +) +13:00:55.398 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.command.DbMigrate -- Starting migration of schema "PUBLIC" to version "4 - Fingerprints" ... +13:00:55.399 [pool-1-thread-2] INFO org.flywaydb.core.internal.command.DbMigrate -- Migrating schema "PUBLIC" to version "4 - Fingerprints" +13:00:55.399 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.DefaultSqlScriptExecutor -- Executing SQL: -- Fingerprints saved between invocations +create table fingerprints( + path varchar not null, + text varchar not null, + md5 varchar not null, + id int auto_increment unique +) +13:00:55.401 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.sqlscript.DefaultSqlScriptExecutor -- 0 rows affected +13:00:55.401 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.command.DbMigrate -- Successfully completed migration of schema "PUBLIC" to version "4 - Fingerprints" +13:00:55.402 [pool-1-thread-2] DEBUG org.flywaydb.core.internal.schemahistory.JdbcTableSchemaHistory -- Schema History table "PUBLIC"."flyway_schema_history" successfully updated to reflect changes +13:00:55.408 [pool-1-thread-2] INFO org.flywaydb.core.internal.command.DbMigrate -- Successfully applied 4 migrations to schema "PUBLIC", now at version v4 (execution time 00:00.022s) +13:00:55.434 [pool-1-thread-2] DEBUG org.flywaydb.core.FlywayExecutor -- Memory usage: 50 of 100M +2024.03.23 13:00:55 WARN no build tool detected in workspace '/Users/apple/Desktop/diplom/math-game-frontend'. The most common cause for this problem is that the editor was opened in the wrong working directory, for example if you use sbt then the workspace directory should contain build.sbt.  +2024.03.23 13:00:55 WARN Build server is not auto-connectable. diff --git a/.metals/metals.mv.db b/.metals/metals.mv.db new file mode 100644 index 0000000..db7f903 Binary files /dev/null and b/.metals/metals.mv.db differ diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..32cfc61 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "files.watcherExclude": { + "**/target": true + } +} \ No newline at end of file diff --git a/common_scripts/messages.js b/common_scripts/messages.js index 4c5b8df..57b2569 100644 --- a/common_scripts/messages.js +++ b/common_scripts/messages.js @@ -6,7 +6,12 @@ const messages = { const taskConditions = ["Задача 1", "Задача 2", "Задача 3", "Задача 4", "Задача 5", "Задача 6", - "Задача 7", "Задача 8", "Задача 9" + "Задача 7", "Задача 8", "Задача 9", + "Задача 10", "Задача 11", "Задача 12", + "Задача 13", "Задача 14", "Задача 15", + "Задача 16", "Задача 17", "Задача 18", + "Задача 19", "Задача 20", "Задача 21", + "Задача 22", "Задача 23", "Задача 24" ]; const gameOverWiners = { @@ -26,6 +31,24 @@ const writeDownScoreWords = { team: "Команда ", score: " Счет " } + +const flowersColors = [ + "#cf3636", "#de6868", "#eba97a", "#f5771d", + "#f5cf45", "#3dbfab", "#76c6e3", "#3d9cbf", + "#3e67b5", "#8b72b8", "#8a4df7", "#7e18a8", + "#cd91e6", "#d175c3", "#a61f91" +] + + + + + + + + + + + -export {messages, taskConditions, gameOverWiners, scoreZeroSetting, writeDownScoreWords} \ No newline at end of file +export {messages, taskConditions, gameOverWiners, scoreZeroSetting, writeDownScoreWords, flowersColors } \ No newline at end of file diff --git a/common_scripts/random.js b/common_scripts/random.js new file mode 100644 index 0000000..cab321d --- /dev/null +++ b/common_scripts/random.js @@ -0,0 +1,7 @@ +function getRandomIntInclusive(min, max) { + min = Math.ceil(min); + max = Math.floor(max); + return Math.floor(Math.random() * (max - min + 1) + min); // Максимум и минимум включаются +} + +export { getRandomIntInclusive } \ No newline at end of file diff --git a/common_scripts/side-bar.js b/common_scripts/side-bar.js new file mode 100644 index 0000000..bebd969 --- /dev/null +++ b/common_scripts/side-bar.js @@ -0,0 +1,6 @@ +const toggle = document.querySelector(".toggle"); + +toggle.addEventListener("click", function () { + let item = document.getElementById("sidebar"); + item.classList.toggle("active-me"); +}); \ No newline at end of file diff --git a/game_domino/fonts/.DS_Store b/fonts/.DS_Store similarity index 100% rename from game_domino/fonts/.DS_Store rename to fonts/.DS_Store diff --git a/game_domino/fonts/PressStart2P-Regular.woff b/fonts/PressStart2P-Regular.woff similarity index 100% rename from game_domino/fonts/PressStart2P-Regular.woff rename to fonts/PressStart2P-Regular.woff diff --git a/game_domino/.DS_Store b/game_domino/.DS_Store index aa68954..594577c 100644 Binary files a/game_domino/.DS_Store and b/game_domino/.DS_Store differ diff --git a/game_domino/index.html b/game_domino/index.html index d124588..b3101c9 100644 --- a/game_domino/index.html +++ b/game_domino/index.html @@ -49,7 +49,7 @@

ДОМИНО

  • Крестики-нолики

    •  - +

  • Лабиринт

    •  diff --git a/game_domino/styles/style.css b/game_domino/styles/style.css index 29ae595..56c849c 100644 --- a/game_domino/styles/style.css +++ b/game_domino/styles/style.css @@ -1,7 +1,7 @@ @font-face { font-family: 'Press Start 2P'; - src: url('../fonts/PressStart2P-Regular.woff') format('woff2'), - url('../fonts/PressStart2P-Regular.woff') format('woff'); + src: url('../../fonts/PressStart2P-Regular.woff') format('woff2'), + url('../../fonts/PressStart2P-Regular.woff') format('woff'); } .header diff --git a/game_krestiki_noliki/.DS_Store b/game_krestiki_noliki/.DS_Store index e19629d..cc1e835 100644 Binary files a/game_krestiki_noliki/.DS_Store and b/game_krestiki_noliki/.DS_Store differ diff --git a/game_krestiki_noliki/fonts/PressStart2P-Regular.woff b/game_krestiki_noliki/fonts/PressStart2P-Regular.woff deleted file mode 100644 index e74f503..0000000 Binary files a/game_krestiki_noliki/fonts/PressStart2P-Regular.woff and /dev/null differ diff --git a/game_krestiki_noliki/index.html b/game_krestiki_noliki/index.html index 5545eaa..36c0aba 100644 --- a/game_krestiki_noliki/index.html +++ b/game_krestiki_noliki/index.html @@ -49,7 +49,7 @@

    КРЕСТИКИ НОЛИКИ

  • Карусель

    •  - +

  • Лабиринт

    •  diff --git a/game_krestiki_noliki/styles/style.css b/game_krestiki_noliki/styles/style.css index 841ce06..b94951d 100644 --- a/game_krestiki_noliki/styles/style.css +++ b/game_krestiki_noliki/styles/style.css @@ -1,7 +1,7 @@ @font-face { font-family: 'Press Start 2P'; - src: url('../fonts/PressStart2P-Regular.woff') format('woff2'), - url('../fonts/PressStart2P-Regular.woff') format('woff'); + src: url('../../fonts/PressStart2P-Regular.woff') format('woff2'), + url('../../fonts/PressStart2P-Regular.woff') format('woff'); } .header diff --git a/game_labirint/.DS_Store b/game_labirint/.DS_Store new file mode 100644 index 0000000..b2ee769 Binary files /dev/null and b/game_labirint/.DS_Store differ diff --git a/game_krestiki_noliki/fonts/.DS_Store b/game_labirint/images/.DS_Store similarity index 96% rename from game_krestiki_noliki/fonts/.DS_Store rename to game_labirint/images/.DS_Store index 937eb5b..ccd9f9b 100644 Binary files a/game_krestiki_noliki/fonts/.DS_Store and b/game_labirint/images/.DS_Store differ diff --git a/game_labirint/images/labirint.svg b/game_labirint/images/labirint.svg new file mode 100644 index 0000000..d82e8b6 --- /dev/null +++ b/game_labirint/images/labirint.svg @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/game_labirint/images/task.svg b/game_labirint/images/task.svg new file mode 100644 index 0000000..bd19af0 --- /dev/null +++ b/game_labirint/images/task.svg @@ -0,0 +1,3 @@ + + + diff --git a/game_labirint/index.html b/game_labirint/index.html new file mode 100644 index 0000000..1f7233c --- /dev/null +++ b/game_labirint/index.html @@ -0,0 +1,256 @@ + + + + + + + Математические игры + + + + + + +
    +

    ЛАБИРИНТ

    +     + + +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    + +

    Счет 000

    +
    +
    + задание +
    +

    + + +
    +
    + +
    +

    Игра закончена

    +

    + +
    + + + + + + + \ No newline at end of file diff --git a/game_labirint/scripts/.DS_Store b/game_labirint/scripts/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/game_labirint/scripts/.DS_Store differ diff --git a/game_labirint/scripts/flowers-activation.js b/game_labirint/scripts/flowers-activation.js new file mode 100644 index 0000000..a60ba5a --- /dev/null +++ b/game_labirint/scripts/flowers-activation.js @@ -0,0 +1,42 @@ +import { flowersColors } from "../../common_scripts/messages.js" +import { getRandomIntInclusive } from "../../common_scripts/random.js" +import { gameOver } from "./gameOver.js" + +const flowers = [] +let flowerCount = 24 +let notActivated = [] + +let directFlower; +let reverseFlower; +let directName; +let reverseName; +let prevFlower; + +function reStart() { + for (let i = 1; i <= flowerCount; ++i) { + directName = ".flower-" + i; + reverseName = ".flower-" + (flowerCount - i + 1); + directFlower = document.querySelector(directName); + reverseFlower = document.querySelector(reverseName); + flowers.push(directFlower); + notActivated.push(reverseFlower); + } +} + + + +function nextFlower() { + if (notActivated.length !== 0) { + notActivated[notActivated.length - 1].style.fill = + flowersColors[getRandomIntInclusive(0, flowersColors.length - 1)]; + prevFlower = notActivated.pop(); + } else { + gameOver(); + } +} + +function unsolved() { + prevFlower.style.fill = '#959393'; +} + +export { nextFlower, unsolved, reStart } diff --git a/game_labirint/scripts/gameOver.js b/game_labirint/scripts/gameOver.js new file mode 100644 index 0000000..a56f8a6 --- /dev/null +++ b/game_labirint/scripts/gameOver.js @@ -0,0 +1,26 @@ +import { getScore, zeroScore } from "./main.js" + +const popUpGameOver = document.querySelector(".popup_game_over"); +const popUpGameOverText = document.querySelector(".popup-text-winner"); +const buttonRepeatGame = document.querySelector(".repeat"); +let flowerName; + +function nonActiveFlowers() { + for (let i = 1; i <= 24; ++i) { + flowerName = ".flower-" + i; + document.querySelector(flowerName).style.fill = "#297a36"; + } + +} + +function gameOver() { + popUpGameOver.classList.add("popup_is-opened"); + popUpGameOverText.textContent = "Cчет = " + getScore(); + buttonRepeatGame.addEventListener("click", function (event) { + nonActiveFlowers(); + zeroScore(); + popUpGameOver.classList.remove("popup_is-opened"); + }); +} + +export { gameOver } \ No newline at end of file diff --git a/game_labirint/scripts/main.js b/game_labirint/scripts/main.js new file mode 100644 index 0000000..aa221b8 --- /dev/null +++ b/game_labirint/scripts/main.js @@ -0,0 +1,61 @@ +import { nextFlower, unsolved, reStart } from "./flowers-activation.js" +import { taskConditions } from "../../common_scripts/messages.js" +import { scoring } from "./score.js" +import { writeDownScoreWords } from "../../common_scripts/messages.js" + + +const startButton = document.querySelector(".start-button"); +const winButton = document.querySelector(".win"); +const lossButton = document.querySelector(".loss"); +const taskText = document.querySelector(".task-text"); +const scoreText = document.querySelector(".score"); + +let currentTask = 0; +let score = 0 +let zeroCount = 3; + +function getScore() { + return score; +} + +function zeroScore() { + score = 0; + currentTask = 0; + let scoreString = String(score).padStart(zeroCount, "0"); + scoreText.textContent = writeDownScoreWords["score"] + scoreString; + startButton.classList.remove("not-active"); +} + +startButton.addEventListener("click", function (event) { + { + if (!startButton.classList.remove("not-active")) { + startButton.classList.add("not-active"); + reStart(); + nextFlower(); + taskText.textContent = taskConditions[currentTask]; + currentTask += 1; + } + } +}); + +winButton.addEventListener("click", function (event) { + { + if (currentTask != 0) { + taskText.textContent = taskConditions[currentTask]; + currentTask += 1; + score = scoring(currentTask, score) + nextFlower(); + } + } +}); + +lossButton.addEventListener("click", function (event) { + { + unsolved(); + nextFlower(); + taskText.textContent = taskConditions[currentTask]; + currentTask += 1; + } +}); + +export { getScore, zeroScore } \ No newline at end of file diff --git a/game_labirint/scripts/score.js b/game_labirint/scripts/score.js new file mode 100644 index 0000000..99a03d1 --- /dev/null +++ b/game_labirint/scripts/score.js @@ -0,0 +1,18 @@ +import { writeDownScoreWords } from "../../common_scripts/messages.js" + +const scoreText = document.querySelector(".score"); + +let points; +let scoreString; +const zeroCount = 3; + + +function scoring(taskNumber, score) { + points = Math.floor(taskNumber/4) + 2; + score += points; + scoreString = String(score).padStart(zeroCount, "0"); + scoreText.textContent = writeDownScoreWords["score"] + scoreString; + return score; +} + +export { scoring } \ No newline at end of file diff --git a/game_labirint/styles/style.css b/game_labirint/styles/style.css new file mode 100644 index 0000000..5c98de2 --- /dev/null +++ b/game_labirint/styles/style.css @@ -0,0 +1,284 @@ +@font-face { + font-family: 'Press Start 2P'; + src: url('../../fonts/PressStart2P-Regular.woff') format('woff2'), + url('../../fonts/PressStart2P-Regular.woff') format('woff'); +} + +.header +.main +.body +.footer { + margin: 0; + padding: 0; +} + +.body { + display: grid; + background: var(--background-color); + width: 100%; + height: 100vh; + margin: 0; +} + +.header { + display: grid; +} + +h1 { + font-family: 'Press Start 2P'; + align-self: center; + justify-self: center; + /* margin-left: 50px; */ + color: #DBDBDB; + font-size: 6vh; + transition: 0.3s; +} + +main { + display: grid; + /* padding-top: 20px; */ + height: calc(100vh - 15vh); + grid-template-columns: 1fr 1fr; + grid-template-rows: 1fr 4fr; + +} + +.labirint-svg { + --flowers-color: var(--background-color); +} + +.game-field { + position: relative; + margin-left: 10vh; + margin-bottom: 5vh; +} + +.labirint { + width: min(70vh, 50vw); +} + +.start-button { + position: absolute; + background-color: transparent; + border: 0; + font-family: 'Press Start 2P'; + color: #DBDBDB; + font-size: min(2vw, 2vh); + left: min(10vh, 5vw); + top: min(71vh, 51vw); + transition: color 0.3s ease 0.05s; +} + +.active-flower { + --flowers-color: var(--accent-color); +} + + + +.not-active { + color: var(--background-color); +} + +.start-button:hover { + color: var(--accent-color); +} + +.not-active:hover { + color: var(--background-color); +} + +.square { + display: grid; + transition: fill 0.3s ease 0.05s; + position: relative; +} + + +.square:hover .square-svg { + --square-color: var(--accent-color); + cursor: pointer; + transform: scale(1.05); +} + +.is-choosed { + --square-color: var(--accent-color); +} + +.core { + transition: fill 0.3s ease 0.05s; +} + +.square-svg { + width: var(--square-size); +} + +.square-svg .cross { + display: none; +} + +.square-svg .cross-active { + display: block; +} + +.square-svg .zero { + display: none; +} + +.square-svg .zero-active { + display: block; +} + +.score { + position: absolute; + font-family: 'Press Start 2P'; + color: #DBDBDB; + font-size: min(4vw, 4vh); + right: 11vw; + grid-row-start: 1; + grid-row-end: 2; +} + +.task { + display: grid; + position: relative; + justify-content: center; + align-self: center; + grid-column-start: 2; + grid-column-end: 3; + grid-template-rows: 5fr 1fr; + grid-template-columns: 1fr 1fr; + margin-top: 10vh; +} + +.task-container { + display: grid; + grid-row-start: 1; + grid-row-end: 2; + grid-column-start: 1; + grid-column-end: 3; + justify-content: center; +} + +.task-svg { + width: min(30vw, 65vh); +} + +.win { + display: grid; + grid-row-start: 2; + grid-row-end: 3; + grid-column-start: 2; + grid-column-end: 3; + justify-content: center; + align-items: start; + + background-color: transparent; + border: 0; + padding-right: 3vw; + color: #DBDBDB; +} + +.win-text { + font-family: 'Press Start 2P'; + font-size: 18px; + transition: 0.4s; +} + +.win:hover { + color: var(--accent-color); + cursor: pointer; +} + +.loss { + display: grid; + grid-row-start: 2; + grid-row-end: 3; + grid-column-start: 1; + grid-column-end: 2; + justify-content: center; + align-items: start; + background-color: transparent; + border: 0; + padding-left: 8vw; + color: #DBDBDB; +} + +.loss-text { + font-family: 'Press Start 2P'; + font-size: 18px; + transition: 0.4s; +} + +.loss:hover { + color: var(--accent-color); + cursor: pointer; +} + +.task-text { + position: absolute; + top: 5vh; + left: 15vw; + font-family: 'Press Start 2P'; + color: aliceblue; + font-size: min(2vh, 2vw); +} + +.popup { + display: none; + font-family: 'Press Start 2P', sans-serif; + align-items: center; + justify-content: center; + background-color: rgba(0, 0, 0, .6); + position: fixed; + top: 0; + left: 0; + bottom: 0; + right: 0; + z-index: 10; +} + +.popup-text { + font-size: min(8vh, 8vw); + color: aliceblue; +} + +.popup-text-winner { + font-size: min(4vh, 4vw) +} + +.popup_is-opened { + display: flex; + flex-direction: column; + visibility: visible; + opacity: 1; + pointer-events: all; + transition: visibility 0s, opacity 0.6s; +} + +.popup_is-animated { + display: flex; + visibility: hidden; + opacity: 0; + pointer-events: none; + user-select: none; + transition: visibility 0s 0.6s, opacity 0.6s; +} + +.button-selection { + font-family: 'Press Start 2P', sans-serif; + color: aliceblue; + font-size: min(2vh, 2vw); + background: transparent; + border: aliceblue solid 2px; + padding: 8px; + margin: 20px; + transition: transform 0.4s; +} + +.button-selection:hover { + transform: scale(1.1); +} + +.spark-side-menu { + width: 45px; +} \ No newline at end of file diff --git a/game_labirint/styles/variables.css b/game_labirint/styles/variables.css new file mode 100644 index 0000000..ea0f4ef --- /dev/null +++ b/game_labirint/styles/variables.css @@ -0,0 +1,11 @@ +:root { + --square-size: min(20vh, 20vw); + --square-color: #DBDBDB; + --cross-color: #DBDBDB; + --menu-color : #DBDBDB; + --flowers-color: #DBDBDB; + --background-color: rgb(41 122 54); + --accent-color: #ff9e00; + + +} \ No newline at end of file diff --git a/index.html b/index.html index 20d0e3a..caa65f3 100644 --- a/index.html +++ b/index.html @@ -32,7 +32,7 @@

    Абака

  • - + @@ -48,7 +48,7 @@

    Домино

  • - + @@ -112,6 +112,6 @@

    Футбол

    - + \ No newline at end of file diff --git a/start-page/.DS_Store b/start-page/.DS_Store index 0cf1c2f..9695161 100644 Binary files a/start-page/.DS_Store and b/start-page/.DS_Store differ diff --git a/start-page/fonts/PressStart2P-Regular.woff b/start-page/fonts/PressStart2P-Regular.woff deleted file mode 100644 index e74f503..0000000 Binary files a/start-page/fonts/PressStart2P-Regular.woff and /dev/null differ diff --git a/start-page/styles/style.css b/start-page/styles/style.css index 61c3500..9984d9e 100644 --- a/start-page/styles/style.css +++ b/start-page/styles/style.css @@ -1,7 +1,7 @@ @font-face { font-family: 'Press Start 2P'; - src: url('../fonts/PressStart2P-Regular.woff') format('woff2'), - url('../fonts/PressStart2P-Regular.woff') format('woff'); + src: url('../../fonts/PressStart2P-Regular.woff') format('woff2'), + url('../../fonts/PressStart2P-Regular.woff') format('woff'); } .header