-
Notifications
You must be signed in to change notification settings - Fork 2
Renderer to website #48
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
Merged
Merged
Changes from all commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
2eafb29
Fixed city rendering, multiple files, layout algorithm, improved sorting
liviacutra 8ad2221
Add Python city support and example workspaces
arjun52 bf195bc
integrated webview manager to work with webviewview alongside panel. …
logann-tom 599fe7a
Merge branch 'main' into fileWatcherFixes
logann-tom 9984b05
removed unecessary code
logann-tom 4f1fa6c
Merge branch 'fileWatcherFixes' of github.com:pdsl2005/codescape into…
logann-tom 6f37f19
Merge branch 'pythonparser-master' into scrum-162-frontend-schema-bri…
arjun52 d10838e
Merge pull request #45 from pdsl2005/scrum-162-frontend-schema-bridging
arjun52 e01166d
Update src/extension.ts
logann-tom 1567612
Update src/extension.ts
logann-tom 0d287a1
Merge pull request #41 from pdsl2005/fileWatcherFixes
jan3tlim 6217e1a
Merge branch 'main' into file-discovery-bugs
livia-cutra e431159
Merge pull request #36 from pdsl2005/file-discovery-bugs
livia-cutra 7e8628e
organized files into extension, web, and media(shared rendering code)…
logann-tom e03ad76
implemented placer in javascript to allow for compatability with webv…
logann-tom 171f45a
Merge origin/main into pythonparser-master
arjun52 d67233b
Fix WebviewPanel ready-state race condition and dead ternary in cityW…
Jackfu13 298195e
Merge pull request #49 from pdsl2005/pythonparser-master
arjun52 ad3f313
Moved gethtml to webview manager
logann-tom b27d091
merged main into branch:
logann-tom 83c1fdd
merged main into renderer refactor for updated html
logann-tom eb0724b
refactored html so webviews html only handles event listeners
logann-tom 23fbf4e
Update extension/src/cityWebviewHtml.ts
logann-tom 4fe06cf
Update .github/workflows/ci.yml
logann-tom 6d1ebc8
removed placer.js because its purpose is redundant
logann-tom e39f12b
t
logann-tom 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
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,26 @@ | ||
| name: CI | ||
|
|
||
| on: | ||
| push: | ||
| branches: [main] | ||
| paths: | ||
| - 'media/**' | ||
| - 'extension/**' | ||
| pull_request: | ||
| branches: [main] | ||
| paths: | ||
| - 'media/**' | ||
| - 'extension/**' | ||
|
|
||
| jobs: | ||
| extension: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: 18 | ||
| - name: Install extension deps | ||
| run: cd extension && npm install | ||
| - name: Compile extension | ||
| run: cd extension && npm run compile | ||
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
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,11 @@ | ||
| public class RouteMap { | ||
| private int districtCode; | ||
|
|
||
| public RouteMap(int districtCode) { | ||
| this.districtCode = districtCode; | ||
| } | ||
|
|
||
| public int getDistrictCode() { | ||
| return districtCode; | ||
| } | ||
| } |
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,11 @@ | ||
| public class ShuttleService { | ||
| private TransitHub hub; | ||
|
|
||
| public ShuttleService(TransitHub hub) { | ||
| this.hub = hub; | ||
| } | ||
|
|
||
| public TransitHub getHub() { | ||
| return hub; | ||
| } | ||
| } |
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,29 @@ | ||
| public class TransitHub { | ||
| private RouteMap routeMap; | ||
| private Gate primaryGate; | ||
|
|
||
| public TransitHub(RouteMap routeMap, Gate primaryGate) { | ||
| this.routeMap = routeMap; | ||
| this.primaryGate = primaryGate; | ||
| } | ||
|
|
||
| public RouteMap getRouteMap() { | ||
| return routeMap; | ||
| } | ||
|
|
||
| public Gate getPrimaryGate() { | ||
| return primaryGate; | ||
| } | ||
|
|
||
| static class Gate { | ||
| private int gateNumber; | ||
|
|
||
| Gate(int gateNumber) { | ||
| this.gateNumber = gateNumber; | ||
| } | ||
|
|
||
| public int getGateNumber() { | ||
| return gateNumber; | ||
| } | ||
| } | ||
| } |
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,5 @@ | ||
| DEFAULT_BLOCKS = 12 | ||
|
|
||
|
|
||
| def estimate_blocks(distance): | ||
| return (distance + DEFAULT_BLOCKS - 1) // DEFAULT_BLOCKS |
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,15 @@ | ||
| class BaseStation: | ||
| def __init__(self, district): | ||
| self.district = district | ||
|
|
||
| def label(self): | ||
| return f"Station<{self.district}>" | ||
|
|
||
|
|
||
| class DispatchCenter(BaseStation): | ||
| def __init__(self, district): | ||
| super().__init__(district) | ||
| self.active_routes = 3 | ||
|
|
||
| def assign_route(self, route_name): | ||
| return f"{route_name}:{self.active_routes}" |
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,6 @@ | ||
| class RouteMap: | ||
| def __init__(self): | ||
| self.routes = ["A", "B"] | ||
|
|
||
| def count(self): | ||
| return len(self.routes) |
File renamed without changes.
File renamed without changes.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
File renamed without changes.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This workflow only runs when
media/**changes due to thepathsfilters, but it compiles the extension. Extension changes in PRs won’t be built/checked by CI. Remove thepathsrestriction or includeextension/**so the compile step runs for relevant changes.