Skip to content

Commit ec05bdb

Browse files
Juhitha-ReddyJuhitha-Reddy
committed
Fixed merge conflicts
2 parents 3f6b120 + 53906a2 commit ec05bdb

184 files changed

Lines changed: 48485 additions & 7595 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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ jobs:
2323
uses: actions/setup-node@v4
2424
with:
2525
node-version: 20
26-
cache: 'npm'
26+
cache: 'yarn'
2727
- name: Install Dependencies
28-
run: npm ci
28+
run: yarn install --frozen-lockfile
2929
# We don't run tests here since we assume it's already done during PR process.
3030
# - name: Update Browser List
3131
# run: npx browserslist@latest --update-db
3232
- name: Build React App
33-
run: npm run build && cp build/index.html build/200.html
33+
run: yarn run build && cp build/index.html build/200.html
3434
env:
3535
NODE_ENV: ${{ github.ref_name == 'main' && 'production' || 'development' }}
3636
REACT_APP_APIENDPOINT: ${{ vars.REACT_APP_API_ENDPOINT }}

‎.github/workflows/pull_request_test.yml‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,13 @@ jobs:
4646
- uses: actions/checkout@v4
4747
with:
4848
fetch-depth: 0
49-
- uses: actions/setup-node@v4
50-
with:
51-
node-version: 20
52-
cache: 'yarn'
53-
- name: Enable Corepack
54-
run: corepack enable
55-
- name: Install Dependencies
56-
run: yarn install --frozen-lockfile
57-
- name: Run Unit Tests for Changed Files Only
58-
run: yarn test:changed
59-
- name: Run Lint
60-
run: yarn lint
49+
- uses: actions/setup-node@v4
50+
with:
51+
node-version: 20
52+
cache: 'yarn'
53+
- name: Install Dependencies
54+
run: yarn install --frozen-lockfile
55+
- name: Run Unit Tests for Changed Files Only
56+
run: yarn run test:changed
57+
- name: Run Lint
58+
run: yarn run lint

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,14 @@ jobs:
1212
- name: Checkout repository
1313
uses: actions/checkout@v3
1414

15-
- name: Set up Node.js & cache npm
15+
- name: Set up Node.js & cache Yarn
1616
uses: actions/setup-node@v4
1717
with:
1818
node-version: 20
1919
cache: yarn
2020

21-
- name: Enable Corepack
22-
run: corepack enable
23-
2421
- name: Install dependencies
25-
run: yarn install --frozen-lockfile
22+
run: yarn install
2623

2724
- name: Run tests
2825
run: yarn test

‎.gitignore‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
# dependencies
44
/node_modules
5-
package-lock.json
65
# testing
76
/coverage
87
*.code-snippets
@@ -32,5 +31,4 @@ yarn-error.log*
3231

3332
**\ **
3433

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

‎.husky-disabled/pre-commit‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.husky/pre-push‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@ if command -v nvm >/dev/null 2>&1 && [ -f .nvmrc ]; then
77
nvm use 20 2>/dev/null || nvm install 20 && nvm use 20
88
fi
99

10-
. "$(dirname "$0")/_/husky.sh"
11-
12-
changed_files=$(git diff --name-only @{upstream}...HEAD 2>/dev/null)
10+
if git rev-parse --abbrev-ref @{upstream} >/dev/null 2>&1; then
11+
changed_files=$(git diff --name-only @{upstream}...HEAD)
12+
else
13+
echo "ℹ️ No upstream branch set. Skipping pre-push checks."
14+
exit 0
15+
fi
1316

1417
if [ -z "$changed_files" ]; then
1518
echo "ℹ️ No outgoing changes to validate. Skipping pre-push checks."
@@ -30,17 +33,17 @@ style_status=0
3033

3134
if [ -n "$js_files" ]; then
3235
echo "🧪 Running related tests before push..."
33-
npx vitest related --run $js_files
36+
echo "$js_files" | tr ' ' '\n' | xargs npx vitest related --run
3437
test_status=$?
3538

3639
echo "🧹 Running ESLint on changed files before push..."
37-
npx eslint $js_files
40+
echo "$js_files" | tr ' ' '\n' | xargs npx eslint
3841
lint_status=$?
3942
fi
4043

4144
if [ -n "$style_files" ]; then
4245
echo "🎨 Running Stylelint on changed files before push..."
43-
npx stylelint $style_files
46+
echo "$style_files" | tr ' ' '\n' | xargs npx stylelint
4447
style_status=$?
4548
fi
4649

‎index.html‎

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

0 commit comments

Comments
 (0)