From efb3fdb86ab3625ed86ee55171b2ff560fa0c299 Mon Sep 17 00:00:00 2001
From: mykhalenych <mykhalenych@gmail.com>
Date: Fri, 10 Jan 2025 09:49:04 +0200
Subject: [PATCH 1/2] bugfix/styles fixed import issue, renamed files

---
 package-lock.json                            | 8 ++++----
 package.json                                 | 2 +-
 src/index.tsx                                | 5 ++---
 src/styles/{filters.css => filters.scss}     | 0
 src/styles/{index.css => index.scss}         | 4 ++--
 src/styles/{todo-list.css => todo-list.scss} | 0
 6 files changed, 9 insertions(+), 10 deletions(-)
 rename src/styles/{filters.css => filters.scss} (100%)
 rename src/styles/{index.css => index.scss} (87%)
 rename src/styles/{todo-list.css => todo-list.scss} (100%)

diff --git a/package-lock.json b/package-lock.json
index 0adcc869f..1f19b4743 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,7 @@
       },
       "devDependencies": {
         "@cypress/react18": "^2.0.1",
-        "@mate-academy/scripts": "^1.8.5",
+        "@mate-academy/scripts": "^1.9.12",
         "@mate-academy/students-ts-config": "*",
         "@mate-academy/stylelint-config": "*",
         "@types/node": "^20.14.10",
@@ -1170,9 +1170,9 @@
       }
     },
     "node_modules/@mate-academy/scripts": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-1.8.5.tgz",
-      "integrity": "sha512-mHRY2FkuoYCf5U0ahIukkaRo5LSZsxrTSgMJheFoyf3VXsTvfM9OfWcZIDIDB521kdPrScHHnRp+JRNjCfUO5A==",
+      "version": "1.9.12",
+      "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-1.9.12.tgz",
+      "integrity": "sha512-/OcmxMa34lYLFlGx7Ig926W1U1qjrnXbjFJ2TzUcDaLmED+A5se652NcWwGOidXRuMAOYLPU2jNYBEkKyXrFJA==",
       "dev": true,
       "dependencies": {
         "@octokit/rest": "^17.11.2",
diff --git a/package.json b/package.json
index e6134ce84..91d7489b9 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
   },
   "devDependencies": {
     "@cypress/react18": "^2.0.1",
-    "@mate-academy/scripts": "^1.8.5",
+    "@mate-academy/scripts": "^1.9.12",
     "@mate-academy/students-ts-config": "*",
     "@mate-academy/stylelint-config": "*",
     "@types/node": "^20.14.10",
diff --git a/src/index.tsx b/src/index.tsx
index a9689cb38..c1206bb36 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,8 +1,7 @@
 import { createRoot } from 'react-dom/client';
 
-import './styles/index.css';
-import './styles/todo-list.css';
-import './styles/filters.css';
+import './styles/index.scss';
+
 
 import { App } from './App';
 
diff --git a/src/styles/filters.css b/src/styles/filters.scss
similarity index 100%
rename from src/styles/filters.css
rename to src/styles/filters.scss
diff --git a/src/styles/index.css b/src/styles/index.scss
similarity index 87%
rename from src/styles/index.css
rename to src/styles/index.scss
index a34eec7c6..d8d324941 100644
--- a/src/styles/index.css
+++ b/src/styles/index.scss
@@ -21,5 +21,5 @@ body {
 }
 
 @import './todoapp';
-@import './todo';
-@import './filter';
+@import './todo-list';
+@import './filters';
diff --git a/src/styles/todo-list.css b/src/styles/todo-list.scss
similarity index 100%
rename from src/styles/todo-list.css
rename to src/styles/todo-list.scss

From 7e953b52e56245d00a80784cd5acef1c566edf68 Mon Sep 17 00:00:00 2001
From: mykhalenych <mykhalenych@gmail.com>
Date: Fri, 10 Jan 2025 09:49:20 +0200
Subject: [PATCH 2/2] bugfix/styles fixed import issue, renamed files

---
 src/index.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/index.tsx b/src/index.tsx
index c1206bb36..b2c38a17a 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -2,7 +2,6 @@ import { createRoot } from 'react-dom/client';
 
 import './styles/index.scss';
 
-
 import { App } from './App';
 
 const container = document.getElementById('root') as HTMLDivElement;