Skip to content

Commit 7e9a6cb

Browse files
adithya-6101adithya-6101
committed
fix: resolve merge conflicts
2 parents 1ca93b9 + c6f18e4 commit 7e9a6cb

840 files changed

Lines changed: 97448 additions & 22209 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.eslintrc.json‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
"no-restricted-imports": [
44
"error",
55
{
6-
"patterns": [
7-
"*.css",
8-
"!*.module.css",
9-
"!index.css"
10-
]
6+
"patterns": ["*.css", "!*.module.css", "!index.css"]
117
}
128
]
139
}
14-
}
10+
}

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
# dependencies
44
/node_modules
5+
package-lock.json
56
# testing
67
/coverage
78
*.code-snippets
@@ -27,7 +28,9 @@ yarn-error.log*
2728
/.idea
2829

2930
.vscode/launch.json
31+
.vscode/settings.json
3032

3133
**\ **
3234

33-
/public/tinymce/
35+
/public/tinymce/
36+
package-lock.json

‎.husky/pre-commit‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
#!/bin/sh
2-
. "$(dirname "$0")/_/husky.sh"
2+
# Load nvm if available
3+
# Try to load nvm (non-blocking)
4+
export NVM_DIR="$HOME/.nvm"
5+
6+
if [ -s "$NVM_DIR/nvm.sh" ]; then
7+
. "$NVM_DIR/nvm.sh"
8+
nvm use >/dev/null 2>&1
9+
echo "Using Node via nvm"
10+
else
11+
echo "nvm not available, using system Node"
12+
fi
313

414
echo ""
515
echo "🛡️ Husky pre-commit hook triggered"

‎.husky/pre-push‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
#!/bin/sh
2+
# Load nvm if available
3+
export NVM_DIR="$HOME/.nvm"
4+
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
5+
# Use Node 20 if available (or install if needed)
6+
if [ -f .nvmrc ]; then
7+
nvm use 20 2>/dev/null || nvm install 20 && nvm use 20
8+
fi
9+
210
. "$(dirname "$0")/_/husky.sh"
311

412
echo "🧪 Running tests before push..."

‎.prettierignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
*.png
22
*.svg
33
src/actions/**
4-
src/App.css
54
src/config.json
65

76
src/languages/**

‎.stylelintignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
public/
2+
node_modules/
3+
dist/
4+
build/
5+
coverage/

‎.stylelintrc‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
{
2+
"extends": ["stylelint-config-standard"],
3+
"ignoreFiles": [
4+
"build/**/*.css",
5+
"public/**/*.css",
6+
"node_modules/**/*.css"
7+
],
28
"rules": {
3-
"no-duplicate-selectors": true
9+
"no-duplicate-selectors": true,
10+
"selector-pseudo-class-no-unknown": [
11+
true,
12+
{ "ignorePseudoClasses": ["global", "local"] }
13+
],
14+
"selector-class-pattern": null,
15+
"selector-id-pattern": null
416
}
5-
}
17+
}

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Define a imagem base
2-
FROM node:14-alpine
2+
FROM node:20-alpine
33
# Set the working directory to /app
44
WORKDIR /app
55
# Copy the package.json and yarn.lock files to the container

0 commit comments

Comments
 (0)