Skip to content

updated dev to main #28

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 35 commits into from
Jan 19, 2024
Merged

updated dev to main #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
9d852c9
changed files to ts/tsx and require statements to import/export
ash-t-luu Dec 18, 2023
8fe04aa
moved extension.ts to src folder, modified webpack to align with impo…
ash-t-luu Dec 19, 2023
fbbbfb4
added tailwind loader in webpack to make working legend and minimap
ash-t-luu Dec 19, 2023
bb91598
added types to certain params to keep typesafe, rearranged dependenci…
ash-t-luu Dec 21, 2023
5e5f8a0
changed javascript to typescript
ash-t-luu Jan 3, 2024
972639e
Merge pull request #19 from oslabs-beta/AL/js-to-ts
ChristinaRaether Jan 4, 2024
33ceabf
Was able to get the nodes to render on the screen using d3, still wor…
Ponch49 Jan 4, 2024
316dcb1
testing first pass
ChristinaRaether Jan 4, 2024
f0befbd
A single typo was causing the bug in ticket RL-27. Fixed the typo and…
Jan 5, 2024
11734b1
Merge pull request #20 from oslabs-beta/LK/RL-27
Louka3 Jan 5, 2024
8a4efe2
testing day 2
ChristinaRaether Jan 5, 2024
b1914fd
Got the nodes to render as a tree structure using D3. Need to get the…
Ponch49 Jan 5, 2024
ba20066
updating version
ChristinaRaether Jan 6, 2024
9ec967c
working test
ChristinaRaether Jan 6, 2024
e45e116
Merge pull request #21 from oslabs-beta/AL-CR/testing
Louka3 Jan 6, 2024
8b8c34d
Got the React Flow diagram working
Ponch49 Jan 6, 2024
3f6db85
took build out of gitignore
ChristinaRaether Jan 6, 2024
4bb8447
Cleaned up Flow.tsx, Still need to fully convert to TypeScript now th…
Ponch49 Jan 6, 2024
0963ed2
'Resolving merge conflicts'
Ponch49 Jan 6, 2024
164d30c
Merge pull request #22 from oslabs-beta/FL-JA/D3-visualization
Louka3 Jan 6, 2024
1467564
added complier option in tsconfig, ran npx tsc, and got the complied …
ash-t-luu Jan 17, 2024
c27dd30
in ts config, changed value of outDir to include src folder. changed …
ash-t-luu Jan 17, 2024
9a16594
changed test script value to match path
ash-t-luu Jan 17, 2024
fafafb2
Merge pull request #23 from oslabs-beta/AL/testing
Louka3 Jan 17, 2024
e517bd6
Got everything converted to TS, except node parameter on line 70. Sti…
Ponch49 Jan 17, 2024
5efe4ae
Got spacing to where we wanted it to be, still considering moving map…
Ponch49 Jan 18, 2024
96ce660
Delete build directory
Louka3 Jan 18, 2024
b0d453e
Merge pull request #24 from oslabs-beta/Louka3-patch-1
ash-t-luu Jan 18, 2024
6f1af5e
Merge branch 'dev' into FL-JA/RL-39/Flow-to-TS
Ponch49 Jan 18, 2024
d100e17
Co-authored-by: Johnny Arroyo <johnnydrycreek@gmail.com>
Ponch49 Jan 18, 2024
017c393
remove bundle
Ponch49 Jan 18, 2024
5a3f338
Merge pull request #26 from oslabs-beta/FL-JA/RL-39/Flow-to-TS
ChristinaRaether Jan 18, 2024
11808b1
remove old .js files
Ponch49 Jan 18, 2024
49fb0c7
removed old .js file
Ponch49 Jan 18, 2024
cbdd3c2
Merge pull request #27 from oslabs-beta/FL-JA/RL-39/Flow-to-TS
Johnny-Arroyo Jan 18, 2024
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
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
node_modules
/build
/package-lock.json
/.vscode-test/
/build/
9 changes: 9 additions & 0 deletions .vscode-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// .vscode-test.js
const { defineConfig } = require('@vscode/test-cli');

module.exports = defineConfig([
{
label: 'unitTests',
files: 'build/src/test/**/*.test.js',
}
]);
5 changes: 4 additions & 1 deletion .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
{
"version": "0.2.0",
"configurations": [

{
"name": "Run Extension",
"type": "extensionHost",
Expand All @@ -20,7 +21,9 @@
"args": [
"--extensionDevelopmentPath=${workspaceFolder}",
"--extensionTestsPath=${workspaceFolder}/test/suite/index"
]
],
"outFiles": ["${workspaceFolder}/build/**.js"],
"preLaunchTask": "npm: test-compile"
}
]
}
3 changes: 3 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"cmake.configureOnOpen": false
}
1 change: 1 addition & 0 deletions .vscodeignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ vsc-extension-quickstart.md
**/jsconfig.json
**/*.map
**/.eslintrc.json
**/*.js.map
Loading