resolved merge conflicts

Author: aayushshetty12

.gitignore

@@ -2,6 +2,7 @@
 
 # dependencies
 /node_modules
+package-lock.json
 # testing
 /coverage
 *.code-snippets
@@ -27,7 +28,9 @@ yarn-error.log*
 /.idea
 
 .vscode/launch.json
+.vscode/settings.json
 
 **\ **
 
-/public/tinymce/
+/public/tinymce/
+package-lock.json

.husky/pre-commit

@@ -1,5 +1,11 @@
 #!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
+# Load nvm if available
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+# Use Node 20 if available (or install if needed)
+if [ -f .nvmrc ]; then
+  nvm use 20 2>/dev/null || nvm install 20 && nvm use 20
+fi
 
 echo ""
 echo "🛡️  Husky pre-commit hook triggered"

.husky/pre-push

@@ -1,4 +1,12 @@
 #!/bin/sh
+# Load nvm if available
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+# Use Node 20 if available (or install if needed)
+if [ -f .nvmrc ]; then
+  nvm use 20 2>/dev/null || nvm install 20 && nvm use 20
+fi
+
 . "$(dirname "$0")/_/husky.sh"
 
 echo "🧪 Running tests before push..."

.prettierignore

@@ -1,7 +1,6 @@
 *.png
 *.svg
 src/actions/**
-src/App.css
 src/config.json
 
 src/languages/**

.stylelintignore

@@ -0,0 +1,5 @@
+public/
+node_modules/
+dist/
+build/
+coverage/

.stylelintrc

@@ -1,5 +1,17 @@
 {
+  "extends": ["stylelint-config-standard"],
+  "ignoreFiles": [
+    "build/**/*.css",
+    "public/**/*.css",
+    "node_modules/**/*.css"
+  ],
   "rules": {
-    "no-duplicate-selectors": true
+    "no-duplicate-selectors": true,
+    "selector-pseudo-class-no-unknown": [
+      true,
+      { "ignorePseudoClasses": ["global", "local"] }
+    ],
+    "selector-class-pattern": null,
+    "selector-id-pattern": null
   }
-}
+}

Dockerfile

@@ -1,5 +1,5 @@
 # Define a imagem base
-FROM node:14-alpine
+FROM node:20-alpine
 # Set the working directory to /app
 WORKDIR /app
 # Copy the package.json and yarn.lock files to the container