Skip to content

Commit dcaa979

Browse files
Merge branch 'development' into DarkModeStyling
2 parents 8261923 + 39c40fe commit dcaa979

File tree

184 files changed

+54092
-4831
lines changed

Some content is hidden

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

184 files changed

+54092
-4831
lines changed

.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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,5 @@ yarn-error.log*
3232

3333
**\ **
3434

35-
/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"

index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4+
<base href="/" />
45
<meta charset="utf-8" />
56
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
67
<meta name="theme-color" content="#000000" />

0 commit comments

Comments
 (0)