-
-
Notifications
You must be signed in to change notification settings - Fork 752
webuipoc: integrate code formatter #5601
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
MZ-AD
wants to merge
18
commits into
zaproxy:main
Choose a base branch
from
Exfiltra:integrate-prettier
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 9 commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
0ae882e
integrate code formatter
MZ-AD 5dc247b
Update package.json
MZ-AD 0739cd3
conflicts resolve
MZ-AD e7fd7fe
Merge branch 'integrate-prettier' of github.com:Tecvity/zap-extension…
MZ-AD 919f30a
configure prettier
MZ-AD 591d146
Wired into CI
MZ-AD 120b6c3
.Yml file update for failing build
MZ-AD 99a2d95
.Yml file update for failing build
MZ-AD 7baa7d0
.Yml changes
MZ-AD e4f2b03
npm run check-format && revert
MZ-AD b27354b
Delete addOns/webuipoc/src/main/pocs/reactWebUI/.github/workflows/ci.yml
MZ-AD e142eb5
webuipoc.gradle.kts update
MZ-AD 55f29aa
Merge branch 'integrate-prettier' of github.com:Tecvity/zap-extension…
MZ-AD a442788
Update webuipoc.gradle.kts
MZ-AD 914ce1e
Update webuipoc.gradle.kts
MZ-AD 1c6c445
Merge branch 'main' into integrate-prettier
MZ-AD 659390e
fix: resolve issue with 'export default' placement in Accordion compo…
MZ-AD e30ce86
fix: resolve issue with 'export default' placement in Accordion compo…
MZ-AD File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
31 changes: 31 additions & 0 deletions
31
addOns/webuipoc/src/main/pocs/reactWebUI/.github/workflows/ci.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| name: Lint and Check Formatting | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
| pull_request: | ||
| branches: | ||
| - main | ||
|
|
||
| jobs: | ||
| lint: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - name: Checkout code | ||
| uses: actions/checkout@v3 | ||
|
|
||
| - name: Set up Node.js | ||
| uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: '20.0.0' | ||
|
|
||
| - name: Install dependencies | ||
| run: npm install | ||
|
|
||
| - name: Run ESLint | ||
| run: npm run lint | ||
|
|
||
| - name: Check formatting with Prettier | ||
| run: npm run check-format | ||
16 changes: 16 additions & 0 deletions
16
addOns/webuipoc/src/main/pocs/reactWebUI/package-lock.json
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 30 additions & 40 deletions
70
addOns/webuipoc/src/main/pocs/reactWebUI/src/Components/Accordion/AccordionData.jsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 13 additions & 12 deletions
25
addOns/webuipoc/src/main/pocs/reactWebUI/src/Components/Header/HeaderBase.jsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,18 @@ | ||
| import React from 'react'; | ||
| import React from "react"; | ||
|
|
||
| const Header = () => { | ||
| return ( | ||
| <div className="fixed top-0 h-16 left-0 w-full bg-gray-900 text-white z-10"> | ||
| <div className="px-4 py-4"> | ||
| <div className="flex justify-between items-center"> | ||
| <div className="text-xl font-bold">ZAP</div> | ||
| <button className="px-3 py-1 bg-green-600 text-white font-bold ounded-md hover:bg-blue-600">Login</button> | ||
| </div> | ||
|
|
||
| </div> | ||
| return ( | ||
| <div className="fixed top-0 h-16 left-0 w-full bg-gray-900 text-white z-10"> | ||
| <div className="px-4 py-4"> | ||
| <div className="flex justify-between items-center"> | ||
| <div className="text-xl font-bold">ZAP</div> | ||
| <button className="px-3 py-1 bg-green-600 text-white font-bold ounded-md hover:bg-blue-600"> | ||
| Login | ||
| </button> | ||
| </div> | ||
| ); | ||
| } | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export default Header; |
12 changes: 4 additions & 8 deletions
12
addOns/webuipoc/src/main/pocs/reactWebUI/src/Components/HistoryBar.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,9 @@ | ||
| import React from 'react' | ||
| import React from "react"; | ||
|
|
||
| function HistoryBar() { | ||
| return ( | ||
| <div className="w-full bg-gray-400 text-white h-[250px]"> | ||
| History | ||
| </div> | ||
| ) | ||
| return <div className="w-full bg-gray-400 text-white h-[250px]">History</div>; | ||
| } | ||
|
|
||
| export default HistoryBar | ||
| export default HistoryBar; | ||
|
|
||
| // WIP | ||
| // WIP |
25 changes: 10 additions & 15 deletions
25
addOns/webuipoc/src/main/pocs/reactWebUI/src/Components/Request-Response/Req-Resp-Bar.jsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 10 additions & 6 deletions
16
addOns/webuipoc/src/main/pocs/reactWebUI/src/Components/SearchBar/SearchBar.jsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 15 additions & 12 deletions
27
addOns/webuipoc/src/main/pocs/reactWebUI/src/Components/Sidebar/Sidebar.jsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.