Skip to content
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

Substance b6. #31

Open
wants to merge 81 commits into
base: editor
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
6e511af
Improve make script.
Integral Aug 2, 2017
af81b03
Change bundler version.
Integral Aug 2, 2017
dc8f5c9
Drop libraries into libs directory.
Integral Aug 2, 2017
34f3c64
Highlights.
Integral Aug 2, 2017
41de33c
Upgrade Interview package.
Integral Aug 2, 2017
19d047e
Upgrade towards substance beta-6.
Integral Aug 2, 2017
d2cbd82
Upgrade subjects packages.
Integral Aug 2, 2017
8b9e429
Remove obsolete tools.
Integral Aug 2, 2017
ffeebd4
Upgrade publisher.
Integral Aug 2, 2017
1882e49
Improve styles.
Integral Aug 2, 2017
5c6cf85
Missing labels.
Integral Aug 2, 2017
85867eb
Index subject parents.
Integral Aug 10, 2017
be427d9
Remove obsolete tool.
Integral Aug 10, 2017
c11927a
Repair Explorer package.
Integral Aug 10, 2017
c3c6932
Schema fixes.
Integral Aug 10, 2017
209edab
Repair Person index package.
Integral Aug 10, 2017
d283c45
Cleanup.
Integral Aug 10, 2017
bf5af9b
Improve publisher.
Integral Aug 10, 2017
f11019c
Improve subjects.
Integral Aug 10, 2017
acdf956
Fix scroll resources.
Integral Aug 10, 2017
d2801f7
Repair Reader package.
Integral Aug 10, 2017
2253d07
Repair scholar client package.
Integral Aug 10, 2017
c5e67dd
Improve html containers.
Integral Aug 10, 2017
218726c
Update eslint config.
Integral Aug 11, 2017
9657bb5
Keep collaborators inside document record.
Integral Aug 11, 2017
a4ccd27
Improve collaborators support.
Integral Aug 12, 2017
92a78b8
Fix prison context item position.
Integral Aug 12, 2017
7d809fd
Set schemas version.
Integral Aug 14, 2017
8a75331
Expose active collaborators.
Integral Aug 14, 2017
e444240
Connect collaboration engine.
Integral Aug 14, 2017
6cdffc4
Reset resource view on filter changes.
Integral Aug 14, 2017
6898bc5
Context item view mode.
Integral Aug 18, 2017
883e6c7
Small fixes.
Integral Aug 18, 2017
83b73ea
Update deps.
Integral Aug 18, 2017
f0597dc
Update libraries versions.
Integral Aug 18, 2017
2a17c59
Update archivist.
Integral Aug 19, 2017
7fab9fd
Improve translations.
Integral Aug 20, 2017
f69ecc4
Set minimum width.
Integral Aug 20, 2017
379a6f4
Set language.
Integral Aug 20, 2017
4a5b3a8
Keep scholar poly fills together.
Integral Sep 9, 2017
98aff68
Don't use notifications inside reader.
Integral Sep 9, 2017
25cb549
Male legacy version.
Integral Sep 9, 2017
a016071
Change connected scripts.
Integral Sep 9, 2017
27609c6
Connect ost publisher styles.
Integral Sep 9, 2017
1c3f950
Bump Archivist version.
Integral Sep 9, 2017
887b101
Pass configurator to Forms.
Integral Sep 11, 2017
b33948c
Pass configurator inside form widgets.
Integral Sep 12, 2017
f60bca2
Missing translations added.
Integral Sep 12, 2017
f68a003
Bump archivist version.
Integral Sep 12, 2017
7d635bc
Bump deps.
Integral Oct 11, 2017
c407222
Fix entity highlighter in reader.
Integral Oct 11, 2017
9376e72
Use npm packages, rename archivist to archivist-js.
Integral Nov 30, 2017
fa24089
Deactivate converter.
Integral Dec 5, 2017
8ab2ffa
Ignore sync script.
Integral Dec 5, 2017
b387fc5
Optional db url argument.
Integral Dec 5, 2017
5aea5d6
Waypoints.
Integral Dec 5, 2017
3a22c48
Override documents package with filters and sorting.
Integral Dec 11, 2017
0080c79
Fix location query.
Integral Dec 27, 2017
d0c9398
Fix location query.
Integral Dec 27, 2017
fa1b736
Fix reverse geocoordinates bug.
Integral Jan 17, 2018
2025e18
Rerender synonyms on geocoding events.
Integral Jan 17, 2018
58930f0
Replace latest synonym on geocoding events.
Integral Jan 17, 2018
b056720
Hide comments in reader.
Integral Mar 19, 2018
18a248e
Don't load archivist source.
Integral Mar 19, 2018
6919718
Bump archivist-js version.
Integral Mar 19, 2018
91b9af5
Change archivist-js version.
Integral Mar 19, 2018
7046324
Faster entity indexing and loading.
Integral Apr 15, 2018
4751c5b
Show IE error.
Integral Jul 23, 2018
61385e7
Disable minifier.
Integral Jul 23, 2018
f25b66b
Disable minifier.
Integral Jul 23, 2018
64e250c
Disable minifier.
Integral Jul 23, 2018
c24a3b6
Disable minifier.
Integral Jul 23, 2018
a6e71b7
Fix some packages version.
Integral Mar 4, 2019
bc9b238
Add subjects via context menu.
Integral Mar 4, 2019
a4a05e8
Add subject children.
Integral Mar 4, 2019
eba4a28
Always allow to add child subjects.
Integral Mar 4, 2019
f407c7c
Always allow to add child subjects.
Integral Mar 4, 2019
63f6227
Typo.
Integral Mar 4, 2019
299b892
Fix subject manager errors.
Integral Jul 24, 2019
d5f642d
Fix subject manager error.
Integral Jul 24, 2019
0759758
Fix typo.
Integral Jul 24, 2019
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
Prev Previous commit
Next Next commit
Waypoints.
Integral committed Dec 5, 2017
commit 5aea5d6ab3b77fc83d03f895d41cc5371622b7fd
20 changes: 12 additions & 8 deletions import.js
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ args.forEach(function(arg) {
let option = arg.split('=')
if(option.length === 2) {
config[option[0]] = option[1]
}
}
})

let db = new Database()
@@ -148,7 +148,7 @@ function importLocations() {
jsonData.forEach(function(location) {
let locationData = {
entityId: location._id['$oid'],
name: location.name,
name: location.name,
description: location.description,
edited: location.updatedAt['$date'],
entityType: location.type,
@@ -233,7 +233,7 @@ function importDocuments() {
let changes = {}
let documents = {}
let snapshots = {}

jsonData.forEach(function(doc) {
// Document processing
// ===================
@@ -417,6 +417,9 @@ function importDocuments() {
entities.push(node.target)
documentData.nodes.push(entity)
entityIndexes[entityType]++
} else if (node.type === 'waypoint') {
node.density = node.density.toString()
documentData.nodes.push(node)
} else if (node.type === 'document') {
metaSource = node
metaNode = {
@@ -455,7 +458,8 @@ function importDocuments() {
interviewee_place_of_birth: node.place_of_birth,
interviewee_year_of_birth: node.year_of_birth,
interviewee_enslaving_year: node.enslaving_year,
interviewee_homecoming_year: node.homecoming_year
interviewee_homecoming_year: node.homecoming_year,
interviewee_waypoints: node.interviewee_waypoints || []
}

try {
@@ -475,7 +479,7 @@ function importDocuments() {
if(node.finished) metaNode.state = 'finished'
if(node.published) metaNode.state = 'published'

documentData.nodes.unshift(metaNode)
documentData.nodes.unshift(metaNode)
}

})
@@ -536,11 +540,11 @@ function importDocuments() {
// }

})

let changeStore = configurator.getStore('change')
let documentStore = configurator.getStore('document')
let snapshotStore = configurator.getStore('snapshot')

return documentStore.seed(documents)
.then(function() {
return changeStore.seed(changes)
@@ -617,4 +621,4 @@ importUsers()
console.error(error)
db.shutdown()
process.exit(1)
})
})
9 changes: 4 additions & 5 deletions packages/interview/MetaNode.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion packages/interview/package.js
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@ import InterviewSeed from './InterviewSeed'

import { BasePackage, ParagraphPackage, PersistencePackage, HeadingPackage, BlockquotePackage, LinkPackage, EmphasisPackage, StrongPackage} from 'substance'
import { CommentPackage, TimecodePackage } from 'archivist-js'
import WaypointPackage from '../waypoint/package'
import SubjectPackage from '../subject/package'
import DefinitionPackage from '../definition/package'
import PersonPackage from '../person/package'
@@ -33,6 +34,7 @@ export default {
config.import(LinkPackage)

// Import archivist specific packages
config.import(WaypointPackage)
config.import(CommentPackage)
config.import(TimecodePackage)
config.import(SubjectPackage)
@@ -63,4 +65,4 @@ export default {
ru: 'ссылка'
})
}
}
}
21 changes: 21 additions & 0 deletions packages/waypoint/Waypoint.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { DocumentNode } from 'substance'

/*
Waypoint meta node.
Holds waypoint reference data.

Attributes
- entityId ID of referenced entity
- density Density of waypoint

*/
class Waypoint extends DocumentNode {}

Waypoint.type = 'waypoint'

Waypoint.define({
entityId: { type: 'string', default: ''},
density: { type: 'string', default: '0'}
})

export default Waypoint
8 changes: 8 additions & 0 deletions packages/waypoint/package.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import Waypoint from './Waypoint'

export default {
name: 'waypoint',
configure: function(config) {
config.addNode(Waypoint)
}
}