Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
7867392
Added tooltip to the graph name.
May 19, 2020
5092f93
Moved the tooltip stylesheets to a separate file for brunch to take c…
May 20, 2020
fd95dbb
Merge pull request #88 from netcreateorg/Minor-Tweaks
kalanicraig May 21, 2020
49dcedf
Fixed error caused in node and edge table by really old database file…
May 22, 2020
7495234
Add some of the new datasets to the public data folder
kalanicraig May 27, 2020
142a46a
1.2.1cleanup: Fix `Each child in a list should have a unique "key" pr…
benloh Jun 5, 2020
423d25b
1.2.1cleanup: Relayout Search label text so it doesn't wrap and take …
benloh Jun 5, 2020
df6b338
1.2.1cleanup: Clean lint on EdgeEditor.
benloh Jun 7, 2020
d3c2f42
1.2.1cleanup: Optimize EdgeEditor render to only display full editor …
benloh Jun 7, 2020
57ce99c
1.2.1cleanup: Bug Fix: AutoComplete field is now properly re-enabled …
benloh Jun 30, 2020
1daab4e
dev-bl/config-ip: Clean up googlea messages in nc.js
benloh Jul 18, 2020
abdf0e6
dev-bl/config-ip: Set port via nc.js
benloh Jul 18, 2020
c921d17
dev-bl/config-ip: Clean up nc.js info displays.
benloh Jul 19, 2020
f1aaadb
dev-bl/config-ip: Set ip via nc.js. -- NEEDS REVIEW. A bit of a hack.
benloh Jul 19, 2020
2f14cd6
dev-bl/config-ip: nc.js no longer passes ip if it's undefined so brun…
benloh Jul 19, 2020
5047a6c
dev-bl/config-ip: Set netport via nc.js.
benloh Jul 19, 2020
fa90a9d
dev-bl/config-ip: On login, redirect without removing /graph/<db>/ path.
benloh Jul 24, 2020
0f26ee5
dev-bl/config-ip: Add db to title.
benloh Jul 24, 2020
c4aa0ef
dev-bl/config-ip: Add `dataset` to token hash.
benloh Jul 25, 2020
3201899
dev-bl/config-ip: Update ReadMe to link to netcreateorg wiki (instead…
benloh Jul 29, 2020
ed6f461
dev-bl/config-ip: Update brunch to 2.10.17.
benloh Jul 29, 2020
c961898
config-ip: AutoComplete needs to unsubscribe from state changes when …
benloh Aug 6, 2020
67b12cf
config-ip: Renam EdgeEditor onButtonClick event to onEdgeClick
benloh Aug 6, 2020
2577488
config-ip: Bug Fix: Canceling Edge Edit now properly clears unsaved e…
benloh Aug 6, 2020
19e6b2b
config-ip: Prevent "Significance" from overwriting text on small scre…
benloh Aug 6, 2020
2285eb4
config-ip: Fix credit/copyright footer floating on tablets.
benloh Aug 6, 2020
566c929
config-ip: Decrease navbar height to provide more room for smaller sc…
benloh Aug 6, 2020
d3b4ec2
config-ip: Hide "Extras" button. This was mainly used for convenienc…
benloh Aug 6, 2020
bcf5ec2
config-ip: Move login to navbar.
benloh Aug 6, 2020
2f74dad
config-ip: Tighten up Search and "Add New Node" spacing.
benloh Aug 6, 2020
ec402e6
config-ip: Add dataset to log.
benloh Aug 6, 2020
b0a7130
config-ip: Use tab delimiter for all log fields.
benloh Aug 6, 2020
d3cdf72
config-ip: Remove extraneous 'row' parameter.
benloh Aug 6, 2020
e134f82
config-ip: Show "Server Disconnected" message.
benloh Aug 6, 2020
79ea683
config-ip: Add optional "requireLogin" flag for templates. If set to…
benloh Aug 7, 2020
eeedac1
config-ip: Deleting an edge now properly returns focus to the Search …
benloh Aug 7, 2020
54cb41c
config-ip: Bug fix: Remove errant quotes from default template.
benloh Aug 7, 2020
ad6e322
config-ip-heartbeat: Server now sends periodic heartbeat to any conne…
benloh Aug 8, 2020
ee36b7d
config-ip-heartbeat: client will now show "Server Disconnected" if a …
benloh Aug 8, 2020
de4de00
config-ip-filter: Lint
benloh Aug 9, 2020
bdb4ab7
config-ip-filter: d3 set opacity to 0 if `isFilteredOut`
benloh Aug 9, 2020
65ebf82
config-ip-filter: Add filter functions to nc-logic.
benloh Aug 9, 2020
b391b26
config-ip-filter: Add rudimentary filter panel.
benloh Aug 9, 2020
1fbb7ba
config-ip-filter: Add "Clear Filters" button.
benloh Aug 10, 2020
38057f3
config-ip-filter: Show multiple filter groups.
benloh Aug 10, 2020
18012f2
config-ip-filter: Add filter actions.
benloh Aug 10, 2020
06fadef
config-ip-filter: Enumerate filter constants.
benloh Aug 10, 2020
b6ec3fd
config-ip-filter: Move `filter-logic` to its own module.
benloh Aug 10, 2020
ca7b888
config-ip-filter: Add separate key label filter parameters. (templat…
benloh Aug 10, 2020
c3b304b
config-ip-filter: Filter by different template node field keys.
benloh Aug 10, 2020
89cfa84
config-ip-filter: Add HACK to convert old attribute data. (Historica…
benloh Aug 10, 2020
58400f8
config-ip-filter: Add 'not-contains' filter.
benloh Aug 10, 2020
1c4b521
config-ip-filter: Add transitiion animation to opacity change.
benloh Aug 12, 2020
9567e81
config-ip-filter: Rename operator "EMPTY" as "NO_OP" because changing…
benloh Aug 12, 2020
21ec7cf
config-ip-filter: Rough first pass at working filter. Only the first…
benloh Aug 12, 2020
25c58f2
config-ip-filter: Working basic mulitiple filter for nodes and edges.
benloh Aug 12, 2020
1c317be
config-ip-filter: Convert StringFilter to React.Component class.
benloh Aug 13, 2020
b42d039
config-ip-filter: Rough pass at reading filters from templates. Works.
benloh Aug 13, 2020
8548014
config-ip-label: Convert FILITERDEFS to FDATA, streamline data model.
benloh Aug 13, 2020
cfc9e4e
config-ip-filter: Remove padding from InfoPanel.
benloh Aug 13, 2020
ef97d49
config-ip-filter: Add Number filter.
benloh Aug 13, 2020
d2a088c
config-ip-filter: Add number filter for edges.
benloh Aug 13, 2020
0328336
config-ip-filter: Add Select filter.
benloh Aug 13, 2020
a853ed7
config-ip-filter: Add "Clear Filter" and rdfc (really deep fast clone)
benloh Aug 14, 2020
4e08f74
config-ip-filter: Add "Clear Filter", part 2
benloh Aug 14, 2020
8ed38a4
config-ip-filter: If property is hidden in template, don't create a f…
benloh Aug 14, 2020
5d1eed9
config-ip-filter: Documentation and linting.
benloh Aug 14, 2020
8cfaf61
config-ip-filter: Add Storybook.
benloh Aug 14, 2020
c619a34
config-ip-filter: Tighten layout. Reduce height of filter fields.
benloh Aug 14, 2020
fc5d375
config-ip-filter: Keep infopanel dragbar from dragging into the tabpenl
benloh Aug 14, 2020
f649cb4
config-ip-filter: Hide tabcontent overflow to prevent two scrollbars …
benloh Aug 14, 2020
0d02cde
config-ip-filter: Reconfigure brunch to not compile storybook files t…
benloh Aug 14, 2020
997e69d
config-ip-filter: Show filter summary when filters tab is closed.
benloh Aug 14, 2020
a9ad2e1
config-ip-filter: Fix bad quotes in template comments.
benloh Aug 14, 2020
6a0f3be
config-ip-filter: Hyphenate "significance" instead of hiding the over…
benloh Aug 14, 2020
8648e3d
config-ip-filter: Server disconnect now allows manipulating graph, bu…
benloh Aug 14, 2020
f669699
config-ip-filter: Disable Edge on disconnect.
benloh Aug 14, 2020
62294cd
config-ip-filter: Check for source/target node removal before saving …
benloh Aug 15, 2020
b5f23c8
config-ip-filter: Bug fix: SOURCE_UPDATE call no longer triggers erro…
benloh Aug 15, 2020
24edcd7
config-ip-filter: Hyphenate and remove padding so node and edge label…
benloh Aug 15, 2020
e2ec17a
config-ip-filter: Update nvmrc node version from 10.9.0 to 10.22.0
benloh Aug 18, 2020
8c7d32c
config-ip-filter: Fix bad 'citation' HACKMAP reference.
benloh Aug 18, 2020
017100a
config-ip-filter: HACKMAP_EDGES "Citation" should be "Citations" to m…
benloh Aug 19, 2020
ae49169
config-ip-filter: Change default template label to "Citations" to mat…
benloh Aug 20, 2020
2c567d7
config-ip-ping: Add note about when sockets will actually close.
benloh Aug 20, 2020
c20bb38
config-ip-ping: Change message from 'heartbeat' to 'ping'
benloh Aug 20, 2020
a0e6e22
config-ip-ping: Clear debug message
benloh Aug 20, 2020
48e8a36
config-ip-ping: Respond to `ping` with a `pong`. Add socket-specific…
benloh Aug 20, 2020
a539d4c
config-ip-ping: Document pong
benloh Aug 20, 2020
6ea9831
config-ip-ping: Track locks by uaddr.
benloh Aug 20, 2020
fab41bf
config-ip-ping: Clarify documentation
benloh Aug 21, 2020
fdcdbf4
Merge pull request #107 from netcreateorg/dev-bl/config-ip-heartbeat
benloh Aug 21, 2020
a35f435
Merge pull request #113 from netcreateorg/dev-bl/config-ip-filter
benloh Aug 21, 2020
159df57
Tweaked warning message for disconnect.
Aug 21, 2020
e0f8266
Merge pull request #126 from netcreateorg/dev-bl/config-ip-ping
benloh Aug 25, 2020
489e014
Merge pull request #123 from netcreateorg/dev-bl/config-ip
benloh Aug 25, 2020
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: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
## PROJECT SUMMARY

NetCreate 2018 is a network graph analysis tool for researching reading comprehension in the digital humanities classroom. This is a work in progress. See the [NetCreate Wiki](https://github.com/daveseah/netcreate-2018/wiki) for additional documentation.
NetCreate 2018 is a network graph analysis tool for researching reading comprehension in the digital humanities classroom. This is a work in progress. See the [NetCreate Wiki](https://github.com/netcreateorg/netcreate-2018/wiki) for additional documentation.

## CITATION

If you use or refer to Net.Create in a publication, we ask that you cite it. The correct citation is: Craig, K. & Danish, J. (2018). Net.Create. http://www.netcreate.org. Indiana University, IN.

## QUICK INSTALLATION

The Wiki has [detailed instructions](https://github.com/daveseah/netcreate-2018/wiki/Installation-Guide). In general, you'll need to install the prerequisite `Git` and `NodeJS` command line utilities to your computer and use a `terminal` program to issue the following commands to install from the Internet:
The Wiki has [detailed instructions](https://github.com/netcreateorg/netcreate-2018/wiki/Installation-Guide). In general, you'll need to install the prerequisite `Git` and `NodeJS` (as of 7/29/2020 the officially supported version of Node is version 10.22.0) command line utilities to your computer and use a `terminal` program to issue the following commands to install from the Internet:

* `git clone https://github.com/netcreateorg/netcreate-2018.git`
* `cd netcreate-2018/build`
Expand Down
2 changes: 1 addition & 1 deletion build/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v10.9.0
v10.22.0
17 changes: 17 additions & 0 deletions build/.storybook/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
const path = require("path");

module.exports = {
"stories": [
"../app/**/*.stories.js"
],
"addons": [
"@storybook/addon-links",
"@storybook/addon-essentials"
],
"webpackFinal": (config) => {
config.resolve.modules.push(
path.resolve(__dirname, '../app/')
);
return config;
}
}
4 changes: 4 additions & 0 deletions build/.storybook/preview.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

export const parameters = {
actions: { argTypesRegex: "^on[A-Z].*" },
}
1 change: 1 addition & 0 deletions build/app/assets/data/2020_PlagueAndFire-db.json

Large diffs are not rendered by default.

167 changes: 167 additions & 0 deletions build/app/assets/data/2020_PlagueAndFire-template.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,167 @@
{

"_comments": [ "/// NetCreate Template File ///",
"/// IMPORTANT: As of 1/31/2019, the following functionality is available: ///",
"/// * `label` parameter for each field may be customized ///",
"/// * `hidden` parameter may be used to hide fields ///",
"/// * changing the order of the `options` WILL change their order on selections ///",
"/// * changing the order of the prompts themselves will NOT change their order ///",
"/// * `duplicateWarning` is used in NodeSelector ///",
"/// * `sourceNodeIsLockedMessage` is used in NodeSelector ///",
"/// * `edgeIsLockedMessage` is used in EdgeEditor ///",
"/// The rest of the definitions are there as placeholders for future functionality ///"
],

"name": "2020PlagueAndFire",

"description": "Spring 2020 Plague and Fire Network",

"citationPrompts":{
"citation": "H213 Main Network (April, 2020)",
"hidden": false
},


"nodePrompts": {
"label": {
"label": "Label",
"help": "A short title for the node",
"duplicateWarning": "You’re entering a duplicate node. Do you want to View the Existing node, or Continue creating?",
"sourceNodeIsLockedMessage": "This node is currently being edited by someone else. Please try again in 10 minutes. If you are still getting this message, send your instructor a text using the phone number provided in this week's Canvas assignment.",
"_cmt4": "/// `Label` is always required and cannot be hidden"
},
"type": {
"label": "Type",
"help": "Multiple people are a 'Group'",
"hidden": false,
"options": [
{
"_comment": "Default color when nothing is selected",
"id": "",
"label": "",
"color": "#EEEEEE"
},
{
"id": "person",
"label": "Person",
"help": "An individual",
"color": "#aabaf2"
},
{
"id": "group",
"label": "Group",
"help": "A group of people",
"color": "#3399FF"
},
{
"id": "place",
"label": "Place",
"help": "A location or place name",
"color": "#00FF00"
},
{
"id": "thing",
"label": "Thing",
"help": "An item or concept",
"color": "#FF0000"
},
{
"id": "event",
"label": "Event",
"help": "A specific event or series of events",
"color": "#009999"
}
]
},
"degrees": {
"label": "Degrees",
"help": "Number of edges.",
"hidden": false
},
"notes": {
"label": "Significance",
"help": "Describe the historical importance.",
"hidden": false
},
"info": {
"label": "Geocode or Date",
"help": "Use latitude/longitude or a date YYYY-MM-DD",
"hidden": true
},
"delete": {
"hidden": false
}
},



"edgePrompts": {
"edgeIsLockedMessage": "This edge is currently being edited by someone else. Please try again in 10 minutes. If you are still getting this message, send your instructor a text using the phone number provided in this week's Canvas assignment.",
"source": {
"label": "Source",
"help": "Source",
"hidden": false
},
"type": {
"label": "Type",
"help": "Type",
"hidden": false,
"options": [
{
"id": "notSelected",
"label": ""
},
{
"id": "peaceful",
"label": "has peaceful interaction with"
},
{
"id": "martial",
"label": "has adversarial interaction with"
},
{
"id": "writes",
"label": "sends written communication to"
},
{
"id": "member",
"label": "is a group member of"
},
{
"id": "participate",
"label": "participates in"
},
{
"id": "visit",
"label": "makes visit to"
}
]
},
"target": {
"label": "Target",
"help": "Target",
"hidden": false
},
"notes": {
"label": "Signficance",
"help": "Describe the historical importance.",
"hidden": false
},
"info": {
"label": "Date",
"help": "'YYYY-MM-DD' format",
"hidden": false
},
"citation": {
"label": "Citation",
"help": "3-digit page number",
"hidden": false
},
"category": {
"label": "Category",
"help": "Political? Social? Economic? Racial/ethnic? Religious? Medical?",
"hidden": false
}
}

}
1 change: 1 addition & 0 deletions build/app/assets/data/2020_PlagueAndFireGrp14-db.json

Large diffs are not rendered by default.

167 changes: 167 additions & 0 deletions build/app/assets/data/2020_PlagueAndFireGrp14-template.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,167 @@
{

"_comments": [ "/// NetCreate Template File ///",
"/// IMPORTANT: As of 1/31/2019, the following functionality is available: ///",
"/// * `label` parameter for each field may be customized ///",
"/// * `hidden` parameter may be used to hide fields ///",
"/// * changing the order of the `options` WILL change their order on selections ///",
"/// * changing the order of the prompts themselves will NOT change their order ///",
"/// * `duplicateWarning` is used in NodeSelector ///",
"/// * `sourceNodeIsLockedMessage` is used in NodeSelector ///",
"/// * `edgeIsLockedMessage` is used in EdgeEditor ///",
"/// The rest of the definitions are there as placeholders for future functionality ///"
],

"name": "2020PlagueAndFire",

"description": "Spring 2020 Plague and Fire Network",

"citationPrompts":{
"citation": "H213 Group 14 Network (April, 2020)",
"hidden": false
},


"nodePrompts": {
"label": {
"label": "Label",
"help": "A short title for the node",
"duplicateWarning": "You’re entering a duplicate node. Do you want to View the Existing node, or Continue creating?",
"sourceNodeIsLockedMessage": "This node is currently being edited by someone else. Please try again in 10 minutes. If you are still getting this message, send your instructor a text using the phone number provided in this week's Canvas assignment.",
"_cmt4": "/// `Label` is always required and cannot be hidden"
},
"type": {
"label": "Type",
"help": "Multiple people are a 'Group'",
"hidden": false,
"options": [
{
"_comment": "Default color when nothing is selected",
"id": "",
"label": "",
"color": "#EEEEEE"
},
{
"id": "person",
"label": "Person",
"help": "An individual",
"color": "#aabaf2"
},
{
"id": "group",
"label": "Group",
"help": "A group of people",
"color": "#3399FF"
},
{
"id": "place",
"label": "Place",
"help": "A location or place name",
"color": "#00FF00"
},
{
"id": "thing",
"label": "Thing",
"help": "An item or concept",
"color": "#FF0000"
},
{
"id": "event",
"label": "Event",
"help": "A specific event or series of events",
"color": "#009999"
}
]
},
"degrees": {
"label": "Degrees",
"help": "Number of edges.",
"hidden": false
},
"notes": {
"label": "Significance",
"help": "Describe the historical importance.",
"hidden": false
},
"info": {
"label": "Geocode or Date",
"help": "Use latitude/longitude or a date YYYY-MM-DD",
"hidden": true
},
"delete": {
"hidden": false
}
},



"edgePrompts": {
"edgeIsLockedMessage": "This edge is currently being edited by someone else. Please try again in 10 minutes. If you are still getting this message, send your instructor a text using the phone number provided in this week's Canvas assignment.",
"source": {
"label": "Source",
"help": "Source",
"hidden": false
},
"type": {
"label": "Type",
"help": "Type",
"hidden": false,
"options": [
{
"id": "notSelected",
"label": ""
},
{
"id": "peaceful",
"label": "has peaceful interaction with"
},
{
"id": "martial",
"label": "has adversarial interaction with"
},
{
"id": "writes",
"label": "sends written communication to"
},
{
"id": "member",
"label": "is a group member of"
},
{
"id": "participate",
"label": "participates in"
},
{
"id": "visit",
"label": "makes visit to"
}
]
},
"target": {
"label": "Target",
"help": "Target",
"hidden": false
},
"notes": {
"label": "Signficance",
"help": "Describe the historical importance.",
"hidden": false
},
"info": {
"label": "Date",
"help": "'YYYY-MM-DD' format",
"hidden": false
},
"citation": {
"label": "Citation",
"help": "3-digit page number",
"hidden": false
},
"category": {
"label": "Category",
"help": "Political? Social? Economy?",
"hidden": false
}
}

}
1 change: 1 addition & 0 deletions build/app/assets/data/Grimm-db.json

Large diffs are not rendered by default.

Loading