Skip to content

Al/tailwind node #17

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Dec 9, 2023
Merged

Al/tailwind node #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0ffa0c7
Co-authored-by: Louis <Louka3@users.noreply.github.com>
ash-t-luu Dec 9, 2023
4cc6be0
added text overflow
ChristinaRaether Dec 9, 2023
35f784e
Add dev command to package.json for recompiling bundle during develop…
Ponch49 Dec 9, 2023
03ad4ec
Merge branch 'AL/tailwind-node' of https://github.com/oslabs-beta/Rea…
Ponch49 Dec 9, 2023
fec07f5
edited text color and took out comments
ash-t-luu Dec 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
"lint": "eslint .",
"pretest": "npm run lint",
"test": "node ./test/runTest.js",
"dev": "webpack --watch",
"webpack": "webpack"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions src/webview/Flow.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ const OverviewFlow = () => {
nodeBorderRadius={2}
/>
<Panel position="top-left">
<div className="border-1 border-gray-500">
<div className="text-black">
<div className="flex justify-end place-items-end shadow-lg bg-slate-50 w-20 h-15">
<p className="pl-2 pr-2 py-2">Client: <span className="border-1 border-gray-500 bg-orange-300 text-transparent rounded-full">00</span></p>
<p className="pl-2 pr-2 py-2">Client: <span className="bg-orange-300 text-transparent rounded-full">00</span></p>
</div>
<div className="flex justify-end place-items-end shadow-lg bg-slate-50 w-20 h-15">
<p className="pl-2 pr-2 pb-2">Server: <span className="bg-blue-300 text-transparent rounded-full">00</span></p>
Expand Down
19 changes: 10 additions & 9 deletions src/webview/flowBuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,27 @@ class FlowBuilder {
buildNodesArray(parsedData, x = this.x, y = this.y) {
if (!parsedData) return;


parsedData.forEach((item) => {
const node = {
id: (++this.id).toString(),
data: {
label: (
<div className={`-mx-2.5 -my-2.5 py-2 px-9 shadow-lg rounded-md border-2 border-gray-500 ${(item.isClientComponent) ? 'bg-orange-300' : 'bg-blue-300'}`}>
<div className="flex justify-center place-items-center" key={this.id}>
<div className="text-sm font-medium">{item.fileName}</div>
</div>
</div>
<div className="text-sm font-medium text-ellipsis overflow-hidden ..." key={this.id}>{item.fileName}</div>
)
},
// type: item.depth === 0 ? 'input' : '',
// type: item.isClientComponent ? 'input' : 'output',
type: 'default',
position: { x: x += 40, y: y += 30 },
style: {
border: 'none',
borderRadius: "6px"
}
borderRadius: '6px',
borderWidth: '2px',
borderColor: '#6b7280',
display: 'flex',
justifyContent: 'center',
placeItems: 'center',
backgroundColor: `${(item.isClientComponent) ? '#fdba74' : '#93C5FD'}`,
},
};
this.initialNodes.push(node);
if (item.children) {
Expand Down