This repository was archived by the owner on Jun 16, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 19
Display the address of the server #258
Open
ThinkRedstone
wants to merge
5
commits into
FirstLegoLeague:master
Choose a base branch
from
ThinkRedstone:display_address
base: master
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 all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
277b31c
added address.js
ThinkRedstone 1caaabc
registered address.js 's middleware in localserver.js
ThinkRedstone 8b3489f
added server's address on the top of the drawer
ThinkRedstone dc3dc64
Moved css text properties from tag to css file
ThinkRedstone d93943d
address.js now only finds and saves one address
ThinkRedstone 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
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,20 @@ | ||
| var os = require('os'); | ||
| var args = require('./args') | ||
|
|
||
| //shamelessly copied from StackOverflow with only minor changes | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Although this is simple code, copying stuff without a clear license may conflict with the license of this project. |
||
| var interfaces = os.networkInterfaces(); | ||
| var serverAddress = ""; | ||
| for (var i in interfaces) { | ||
| for (var j in interfaces[i]) { | ||
| var address = interfaces[i][j];//we basically parse over all the addresses for every network interface | ||
| if (address.family === 'IPv4' && !address.internal) {//if that address is an IPv4 address, and it is not an internal one, that's the address we are looking for | ||
| serverAddress = address.address; | ||
| break; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| exports.middleware = function (req, res, next) { | ||
| req.session.serverAddress = serverAddress + ':' + args.port; | ||
| next(); | ||
| }; | ||
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 |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| <div class="drawer" ng-class="{visible:drawerVisible}"> | ||
| <div class="drawerLead"> | ||
| </div> | ||
| <ul class="nav"> | ||
| <li ng-repeat="page in pages" ng-class="{active: currentPage === page}"> | ||
| <a ng-click="setPage(page)"><i class="material-icons">{{page.icon}}</i> <span>{{page.title}}</span></a> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| <div class="drawer" ng-class="{visible:drawerVisible}"> | ||
| <div class="drawerLead"> | ||
| address: {{serverAddress}}</div> | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Wrong indentation: the text should be indented, the closing tag on its own line. |
||
| <ul class="nav"> | ||
| <li ng-repeat="page in pages" ng-class="{active: currentPage === page}"> | ||
| <a ng-click="setPage(page)"><i class="material-icons">{{page.icon}}</i> <span>{{page.title}}</span></a> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
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.
Better to place the closing bracket on its own line, to prevent unnecessary changes to the last line (e.g. how the
logline is now changed).