Skip to content

Commit

Permalink
Resolve merge conflict in package-lock.json
Browse files Browse the repository at this point in the history
  • Loading branch information
mahendrameghwal committed Oct 30, 2023
2 parents c80383c + 572e451 commit 876b9ed
Show file tree
Hide file tree
Showing 8 changed files with 273 additions and 91 deletions.
11 changes: 11 additions & 0 deletions .github/ISSue_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: 🐛 Bug
description: Report an issue to help improve the project.
labels: ["🛠 goal: fix", "🚦 status: awaiting triage"]
body:
- type: textarea
id: description
attributes:
label: Description
description: A brief description of the question or issue, also include what you tried and what didn't work
validations:
required: true
12 changes: 12 additions & 0 deletions .github/ISSue_TEMPLATE/feature_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: 📄 Feature Request
description: Want to add a new Feature? use this
title: "[Feat] <description>"
labels: ["📄 aspect: feature", "🚦 status: awaiting triage"]
body:
- type: textarea
id: description
attributes:
label: Description
description: A brief description of the feature.
validations:
required: true
33 changes: 33 additions & 0 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Build and Test


on:

push:
branches: [ master ]
pull_request:
branches: [ master ]


jobs:
build_test:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [14.x, 15.x]


steps:

- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
- name: npm ci, build and test
run: |
npm ci
npm run build --if-present
npm test
106 changes: 89 additions & 17 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
"@fortawesome/free-solid-svg-icons": "^6.4.2",
"@fortawesome/react-fontawesome": "^0.2.0",
"@testing-library/jest-dom": "^6.1.4",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"framer-motion": "^10.16.2",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.5.1",
"framer-motion": "^10.16.4",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-icons": "^4.10.1",
"react-router-dom": "^6.15.0",
"react-icons": "^4.11.0",
"react-router-dom": "^6.17.0",
"react-scripts": "5.0.1",
"web-vitals": "^3.5.0"
},
Expand Down
88 changes: 44 additions & 44 deletions src/components/Accordion.css
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
.accordion {

overflow: hidden;
width: 100%;
}

.accordion-item {
border-bottom: 1px solid #ddd;
margin: 8px 0px;
border: 1px solid #ddd;
border-radius: 4px;
}
.expand{
width: 100%;
max-width: 15px;
}
.accordion-title {
display: flex;
justify-content: space-between;
align-items: center;
padding: 15px;
cursor: pointer;
background-color: #f5f5f5;
border-bottom: 1px solid #ddd;
}

.accordion-title:hover {
background-color: #e0e0e0;
}

.accordion-title.active {
background-color: #ddd;
}

.accordion-content {
padding: 15px;
background-color: lightcyan;
}
overflow: hidden;
width: 100%;
}

.expand {
transition: transform 0.3s ease-in-out;
}

.rotate {
transform: rotate(180deg);
}
.accordion-item {
border-bottom: 1px solid #ddd;
margin: 8px 0px;
border: 1px solid #ddd;
border-radius: 4px;
overflow: hidden;
}
.expand {
width: 100%;
max-width: 15px;
}
.accordion-title {
display: flex;
justify-content: space-between;
align-items: center;
padding: 15px;
cursor: pointer;
background-color: #f5f5f5;
border-bottom: 1px solid #ddd;
}

.accordion-title:hover {
background-color: #e0e0e0;
}

.accordion-title.active {
background-color: #ddd;
}

.accordion-content {
padding: 15px;
background-color: lightcyan;
}

.expand {
transition: transform 0.3s ease-in-out;
}

.rotate {
transform: rotate(180deg);
}
Loading

0 comments on commit 876b9ed

Please sign in to comment.