Skip to content

Commit f54f4ba

Browse files
Merge branch 'development' into aayush_activities_list_page_dark_mode
2 parents e50f105 + bb88fda commit f54f4ba

341 files changed

Lines changed: 33024 additions & 9396 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.

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ jobs:
6262
domain: ${{ vars.SURGE_DOMAIN }}
6363
project: './build'
6464
login: ${{ secrets.SURGE_LOGIN }}
65-
token: ${{ secrets.SURGE_TOKEN }}
65+
token: ${{ secrets.SURGE_TOKEN }}

.github/workflows/pull_request_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,4 @@ jobs:
5555
- name: Run Unit Tests for Changed Files Only
5656
run: yarn run test:changed
5757
- name: Run Lint
58-
run: yarn run lint
58+
run: yarn run lint

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ yarn-error.log*
2828
/.idea
2929

3030
.vscode/launch.json
31+
.vscode/settings.json
3132

3233
**\ **
3334

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

.husky/pre-commit

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
#!/bin/sh
22
# Load nvm if available
3+
# Try to load nvm (non-blocking)
34
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
95

10-
. "$(dirname "$0")/_/husky.sh"
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
1113

1214
echo ""
1315
echo "🛡️ Husky pre-commit hook triggered"

.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/**

.stylelintrc

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
1-
{
2-
"ignoreFiles": [
3-
"build/**/*.css",
4-
"public/**/*.css",
5-
"node_modules/**/*.css"
6-
],
7-
"rules": {
8-
"no-duplicate-selectors": true
9-
}
10-
}
1+
{
2+
"extends": ["stylelint-config-standard"],
3+
"ignoreFiles": [
4+
"build/**/*.css",
5+
"public/**/*.css",
6+
"node_modules/**/*.css"
7+
],
8+
"rules": {
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
16+
}
17+
}

0 commit comments

Comments
 (0)