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

Hawaii react hack core branch #7

Open
wants to merge 257 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
257 commits
Select commit Hold shift + click to select a range
9533e2c
Merge branch 'dev/7.0.x' into 7842_localizable_text_fields
apeters Sep 23, 2021
8ee849b
add custom field test, remove references in the card model to keep th…
apeters Sep 27, 2021
5483ea0
simplify and refactor i18n_TextField, add more unit tests to the i18n…
apeters Sep 28, 2021
8fec52f
make class callabler, re #7842
apeters Sep 29, 2021
29d7252
add tests, refine and simplify i18n custom field, re #7842
apeters Sep 29, 2021
fe62008
Fixing style errors.
stickler-ci Sep 29, 2021
2189c57
fix test errors, re #7842
apeters Sep 29, 2021
6267e1d
Merge branch '7842_localizable_text_fields' of https://github.com/arc…
apeters Sep 29, 2021
9ef438a
Fixing style errors.
stickler-ci Sep 29, 2021
0b7a883
add languages to test settings, re #7842
apeters Sep 29, 2021
a3b7013
Merge branch '7842_localizable_text_fields' of https://github.com/arc…
apeters Sep 29, 2021
905e34d
Fixing style errors.
stickler-ci Sep 29, 2021
73ab4fb
Fix typo, re #7842
chiatt Sep 30, 2021
3e6fdac
Merge pull request #7851 from archesproject/7842_localizable_text_fields
chiatt Sep 30, 2021
96af713
Merge pull request #7859 from archesproject/master
chiatt Oct 5, 2021
b4d168f
add serialize method so that the BetterJsonSerializer will serialize …
apeters Oct 7, 2021
ca64d56
Fixing style errors.
stickler-ci Oct 7, 2021
ee4c40f
Merge pull request #7863 from archesproject/7842_localizable_text_fields
apeters Oct 7, 2021
f89834c
adds graph publication table, remvoes is_active references #7783
chrabyrd Oct 22, 2021
b242847
nit
chrabyrd Oct 22, 2021
cf11547
adds PublishedModelError #7783
chrabyrd Oct 22, 2021
ada3715
change migration to not resolve column values #7783
chrabyrd Oct 25, 2021
03f5001
rough out fronted #7783
chrabyrd Oct 25, 2021
fe8681e
nit #7783
chrabyrd Oct 25, 2021
6b23127
api buttons to publish and unpublish #7783
chrabyrd Oct 25, 2021
2c9c3c4
Merge pull request #7926 from archesproject/master
chiatt Oct 26, 2021
7cbaa2d
Merge branch 'dev/7.0.x' of https://github.com/archesproject/arches i…
chrabyrd Oct 27, 2021
7ab4c3c
adds modal #7783
chrabyrd Oct 27, 2021
d148c2c
refines modal #7783
chrabyrd Oct 27, 2021
da80723
nit #7783
chrabyrd Oct 27, 2021
fe35966
updates tests and test data #7783
chrabyrd Oct 27, 2021
5541d43
Fixing style errors.
stickler-ci Oct 27, 2021
7148cc6
nit #7783
chrabyrd Oct 27, 2021
d3ef58a
nit #7783
chrabyrd Oct 27, 2021
60d0106
adds serialized graph column #7784
chrabyrd Oct 29, 2021
63b7fa8
nit #7784
chrabyrd Oct 29, 2021
b71e881
updates graph designer view #7784
chrabyrd Nov 2, 2021
af1ad71
nit #7784
chrabyrd Nov 2, 2021
11b5f84
nit #7784
chrabyrd Nov 3, 2021
ed2c0e2
updates graph model #7784
chrabyrd Nov 3, 2021
719d255
nit #7784
chrabyrd Nov 3, 2021
e7f5cd9
nit #7784
chrabyrd Nov 3, 2021
139c851
nit #7784
chrabyrd Nov 3, 2021
112f5f2
nit #7784
chrabyrd Nov 3, 2021
3aa5eae
nit #7784
chrabyrd Nov 4, 2021
761f4ea
Merge https://github.com/archesproject/arches into 7784-cbyrd-cache-s…
chrabyrd Nov 4, 2021
a38ccc6
prevents loop when initializing graph with deferred fields #7784
chrabyrd Nov 4, 2021
d2af04b
nit #7784
chrabyrd Nov 4, 2021
7851ee9
updates graph manager #7784
chrabyrd Nov 5, 2021
363cfae
updates card api #7784
chrabyrd Nov 5, 2021
15f9500
resolve branch frontend error #7784
chrabyrd Nov 5, 2021
e000812
Merge pull request #7952 from archesproject/master
chiatt Nov 8, 2021
f27029c
Merge branch 'dev/7.0.x' of https://github.com/archesproject/arches i…
chrabyrd Nov 8, 2021
e4ada19
updates migration to preserve isactive #7784
chrabyrd Nov 8, 2021
19ddcd2
updates migrations #7784
chrabyrd Nov 8, 2021
72e433c
nit #7784
chrabyrd Nov 8, 2021
6efa50e
split column logic across 2 migrations #7784
chrabyrd Nov 8, 2021
eaed3c0
nit #7784
chrabyrd Nov 8, 2021
f1bf0ee
updates serialized_graph field to json #7784
chrabyrd Nov 8, 2021
3393407
updates jsonserializer to handle force_recalculation #7784
chrabyrd Nov 8, 2021
f3e4ef1
enforce changed publication filtering in place of isactive #7784
chrabyrd Nov 8, 2021
1f3d635
Fixing style errors.
stickler-ci Nov 9, 2021
188678c
nit #7784
chrabyrd Nov 9, 2021
8f55c89
Merge branch '7784-cbyrd-cache-serialized-graphs' of https://github.c…
chrabyrd Nov 9, 2021
995d2b4
Merge pull request #8006 from archesproject/master
chiatt Nov 29, 2021
e93f22a
Merge pull request #8034 from archesproject/dev/6.1.x
chiatt Dec 17, 2021
041b51e
Merge branch 'dev/7.0.x' of https://github.com/archesproject/arches i…
chrabyrd Jan 18, 2022
656dcfe
update regarding PR comments #7783
chrabyrd Jan 18, 2022
cfc1520
nit #7783
chrabyrd Jan 18, 2022
8f6a933
nit #7783
chrabyrd Jan 18, 2022
2b9f81f
Merge branch 'dev/6.1.x' into dev/7.0.x
apeters Jan 26, 2022
61fd779
Merge pull request #7934 from archesproject/7783-cbyrd-add-graph-publ…
robgaston Feb 1, 2022
1d82701
Merge remote-tracking branch 'origin/dev/7.0.x' into 7784-cbyrd-cache…
robgaston Feb 1, 2022
e12e9de
fix migration order
robgaston Feb 1, 2022
b2dbe7b
Merge branch 'dev/7.0.x' of https://github.com/archesproject/arches i…
chrabyrd Feb 3, 2022
9ec64d2
updates migration ordering #7784
chrabyrd Feb 3, 2022
fc608f2
updates model instantiation #7784
chrabyrd Feb 3, 2022
c53e2f4
updates graphpublication model serialized_graph to have jsonfield #7784
chrabyrd Feb 3, 2022
1dae44b
nit #7784
chrabyrd Feb 3, 2022
39f0ba6
Merge branch '7784-cbyrd-cache-serialized-graphs' of https://github.c…
chrabyrd Feb 3, 2022
99823fc
nit #7784
chrabyrd Feb 3, 2022
282193c
Fixing style errors.
stickler-ci Feb 3, 2022
be1f0ff
nit #7784
chrabyrd Feb 3, 2022
d00ded0
updates model filtering based on publication status #7784
chrabyrd Feb 3, 2022
56c368d
Fixing style errors.
stickler-ci Feb 3, 2022
7353fd2
rough out #8090
chrabyrd Feb 10, 2022
d759fbc
Merge pull request #7962 from archesproject/7784-cbyrd-cache-serializ…
robgaston Feb 10, 2022
ac84025
nit #8089
chrabyrd Feb 10, 2022
c088c7c
Merge branch 'dev/7.0.x' of https://github.com/archesproject/arches i…
chrabyrd Feb 10, 2022
bdfa6d0
nit #8090
chrabyrd Feb 12, 2022
6ad0ce5
creates bundle #8090
chrabyrd Feb 12, 2022
52faec4
adds webpack-loader #8090
chrabyrd Feb 16, 2022
f0787fb
adds package chunking #8090
chrabyrd Feb 16, 2022
0f64206
move frontend folder into app #8090
chrabyrd Feb 16, 2022
b0e2986
nit #8090
chrabyrd Feb 16, 2022
57286fc
compiles nested js directory structure #8090
chrabyrd Feb 17, 2022
fe7a5a8
adds absolute import handling #8090
chrabyrd Feb 17, 2022
86d7e55
Merge branch 'dev/7.0.x' into dev/6.1.x
chiatt Feb 17, 2022
3471eff
Merge pull request #8139 from archesproject/dev/6.1.x
chiatt Feb 17, 2022
162549f
js compiles without error #8090
chrabyrd Feb 18, 2022
b7f9349
merge 8090
chrabyrd Feb 18, 2022
44898ac
handles arches css #8090
chrabyrd Feb 18, 2022
3eaef34
adds image handling #8090
chrabyrd Feb 18, 2022
e378154
grooming out unused references #8090
chrabyrd Feb 18, 2022
57c199b
nit #8090
chrabyrd Feb 19, 2022
94349fa
nit #8090
chrabyrd Feb 19, 2022
7f7a886
modifies migration to save json structure instead of string, modifies…
aarongundel Feb 22, 2022
eaff410
Fixing style errors.
stickler-ci Feb 22, 2022
5ab3167
raise unpublishedmodelerror if graph publication cannot be saved
aarongundel Feb 23, 2022
2744365
nit 8090
chrabyrd Feb 24, 2022
99bfbe3
updates JS requirejs component naming #8090
chrabyrd Feb 24, 2022
93c11d0
point arches routes to built html #8090
chrabyrd Feb 24, 2022
dc3a56b
nit #8090
chrabyrd Feb 24, 2022
db5d514
nit #8090
chrabyrd Feb 25, 2022
d493b3a
nit #8090
chrabyrd Feb 25, 2022
b699ec0
cleaning #8090
chrabyrd Feb 25, 2022
3b0bdcf
Merge pull request #8179 from archesproject/dev/6.1.x
chiatt Feb 26, 2022
a956e8a
nit #8090
chrabyrd Feb 27, 2022
88a3b25
nit #8090
chrabyrd Feb 28, 2022
20ccf81
first attempt at preserving graph publication ID associated with a re…
aarongundel Feb 28, 2022
209c862
nit #8090
chrabyrd Feb 28, 2022
5aa83b6
change model restrictions
aarongundel Feb 28, 2022
d9f0540
move resource migrations to 7784
aarongundel Feb 28, 2022
42002cd
cleaning #8090
chrabyrd Feb 28, 2022
4839210
clean up css #8090
chrabyrd Feb 28, 2022
0356df9
nit #8090
chrabyrd Feb 28, 2022
6877ba4
reverse bindings naming #8090
chrabyrd Feb 28, 2022
c4283f7
undo component naming #8090
chrabyrd Feb 28, 2022
cead5c1
Merge remote-tracking branch 'origin/8172_jsonfield_cached_graph' int…
aarongundel Feb 28, 2022
7022caa
undo naming #8090
chrabyrd Feb 28, 2022
0d330f4
makes the arches settings graph active - it must be active/published …
aarongundel Feb 28, 2022
b64c63a
cleaning #8090
chrabyrd Feb 28, 2022
cbebbf6
nit
chrabyrd Feb 28, 2022
e5f2876
nit #8090
chrabyrd Feb 28, 2022
9947ab6
merge #8090
chrabyrd Feb 28, 2022
667d873
Fixing style errors.
stickler-ci Feb 28, 2022
e046ff3
update models to update graph publication ID on tile update and resou…
aarongundel Feb 28, 2022
2b45417
Fixing style errors.
stickler-ci Feb 28, 2022
2361ec9
stylistic changes
aarongundel Feb 28, 2022
7a7179c
Merge branch '8186_publication_id_preservation' of github.com:aarongu…
aarongundel Feb 28, 2022
35b9f7b
Fixing style errors.
stickler-ci Feb 28, 2022
af5d2f7
solves undefined jquery error at index #8090
chrabyrd Mar 1, 2022
f6a0004
Merge branch '8090-cbyrd-adds-frontend-compiler' of https://github.co…
chrabyrd Mar 1, 2022
d878203
nit #8090
chrabyrd Mar 1, 2022
e7e2180
various test fixes
aarongundel Mar 1, 2022
296dc4d
Merge branch '8186_publication_id_preservation' of github.com:aarongu…
aarongundel Mar 1, 2022
e734fe2
Fixing style errors.
stickler-ci Mar 1, 2022
7379a35
nit #8090
chrabyrd Mar 1, 2022
115ad2e
update paths nit #8090
chrabyrd Mar 2, 2022
21790a1
nit #8090
chrabyrd Mar 2, 2022
5715900
nit #8090
chrabyrd Mar 2, 2022
be30d16
removes 'refresh_resoucce' and undoes test changes #8186
chrabyrd Mar 3, 2022
4aaea76
updates tests #8186
chrabyrd Mar 3, 2022
518b315
Fixing style errors.
stickler-ci Mar 3, 2022
94d6d4f
nit #8186
chrabyrd Mar 3, 2022
9cdb381
nit #8186
chrabyrd Mar 3, 2022
030cafb
PR feedback changes
aarongundel Mar 4, 2022
b8259ab
disables resource copy if graph is unpublished #8188
chrabyrd Mar 4, 2022
b31a244
nit #8188
chrabyrd Mar 4, 2022
edbe7f6
stabilizes publication logic #8212
chrabyrd Mar 4, 2022
008e2c8
adds publication_id to export_business_data #8204
chrabyrd Mar 4, 2022
a99a3c4
adds publication data to graph export #8204
chrabyrd Mar 4, 2022
686a9a7
updates test data #8204
chrabyrd Mar 4, 2022
9e280cd
Fixing style errors.
stickler-ci Mar 4, 2022
9a0649c
Merge pull request #8214 from archesproject/8212-cbyrd-restabilize-pu…
robgaston Mar 4, 2022
498de07
Merge remote-tracking branch 'upstream/dev/7.0.x' into 8172_jsonfield…
aarongundel Mar 4, 2022
affaca9
more detailed exception info
aarongundel Mar 4, 2022
2512237
adds model import #8204
chrabyrd Mar 8, 2022
b8a79d1
Merge branch 'dev/7.0.x' of https://github.com/archesproject/arches i…
chrabyrd Mar 8, 2022
fddfb8b
Merge branch '8204-cbyrd-add-publication-data-to-exports' of https://…
chrabyrd Mar 8, 2022
752330b
Fixing style errors.
stickler-ci Mar 8, 2022
92fbd07
nit #8204
chrabyrd Mar 8, 2022
c764ac1
merge #8204
chrabyrd Mar 8, 2022
c5aa860
nit #8204
chrabyrd Mar 8, 2022
96439f9
Merge branch 'dev/7.0.x' of https://github.com/archesproject/arches i…
chrabyrd Mar 8, 2022
d59d4ba
adds fix for text loading with requirejs
aarongundel Mar 9, 2022
865d6ab
revert stricken !text
aarongundel Mar 9, 2022
ea9c40e
Merge pull request #8227 from aarongundel/8200_text_fix
chrabyrd Mar 9, 2022
e29c0d0
Merge branch '8090-cbyrd-adds-frontend-compiler' of https://github.co…
chrabyrd Mar 9, 2022
cd592bc
removes jquery-migrate -> 'jquery' dependency mapping #8090
chrabyrd Mar 9, 2022
031d708
updates how data is moved between template and JS file, outside of ja…
chrabyrd Mar 10, 2022
04c1cd8
adds arches to window #8090
chrabyrd Mar 10, 2022
ea7411c
modify settings to include build directory in static files. remove a…
aarongundel Mar 10, 2022
f6ffb82
Merge pull request #8233 from aarongundel/8199_graph_vendor_chunks
chrabyrd Mar 10, 2022
f981319
nit #8090
chrabyrd Mar 10, 2022
fcbb0b9
adds search-components to window #8090
chrabyrd Mar 10, 2022
565b658
nit clean search.js #8090
chrabyrd Mar 10, 2022
e701808
nit #8090
chrabyrd Mar 10, 2022
1eed2f2
stops jquery from loading twice - fixes chosen loading issues
aarongundel Mar 10, 2022
a7cd9e2
Merge pull request #8238 from aarongundel/8234_chosen_binding
chrabyrd Mar 10, 2022
a28827d
nit #8090
chrabyrd Mar 11, 2022
61400cd
adds set-csrf-token dependency to graph.js #8090
chrabyrd Mar 11, 2022
e8102a9
nit #8090
chrabyrd Mar 11, 2022
658c2cc
adds regenerator-runtime d3 dependency #8090
chrabyrd Mar 11, 2022
96e365a
nit #8090
chrabyrd Mar 11, 2022
bc2da88
adds pattern to display search components #8090
chrabyrd Mar 15, 2022
40483fb
nit #8090
chrabyrd Mar 15, 2022
9ad94b1
adds filter templates to window #8090
chrabyrd Mar 15, 2022
8463d4a
various fixes for search mini SPA
aarongundel Mar 15, 2022
f38f84d
more changes
aarongundel Mar 16, 2022
4c90065
remove console log
aarongundel Mar 16, 2022
7681cb7
Merge pull request #8173 from aarongundel/8172_jsonfield_cached_graph
robgaston Mar 22, 2022
ffd0e50
Merge branch 'dev/7.0.x' into 8186_publication_id_preservation
robgaston Mar 22, 2022
9c61713
Merge pull request #8206 from archesproject/8186_publication_id_prese…
robgaston Mar 22, 2022
ecb68d2
Merge branch 'dev/7.0.x' into 8204-cbyrd-add-publication-data-to-exports
robgaston Mar 22, 2022
48a53cf
fixes graph serialization, test fixtures re: #8204
robgaston Mar 22, 2022
5fa3aaa
Merge remote-tracking branch 'origin/dev/7.0.x' into 8204-cbyrd-add-p…
robgaston Mar 22, 2022
fc17110
removes extra publish calls, re: #8204
robgaston Mar 22, 2022
42ae37d
fixes tests and fixtures, re: #8204
robgaston Mar 23, 2022
c2aa9c8
Fixing style errors.
stickler-ci Mar 23, 2022
2b32dc0
Merge pull request #8215 from archesproject/8204-cbyrd-add-publicatio…
robgaston Mar 23, 2022
a79d52a
start getting resource addition working
aarongundel Mar 23, 2022
424b4f2
create a resource through the editor
aarongundel Mar 23, 2022
7d59355
attempting to get reporting working
aarongundel Mar 24, 2022
6cead28
clean up config-manager.js and views/form.js, which no longer appear …
aarongundel Mar 24, 2022
3e29f1d
Merge branch 'dev/7.0.x' into 8188-cbyrd-disable-resource-copy-if-gra…
robgaston Mar 25, 2022
bdb5d09
Merge pull request #8213 from archesproject/8188-cbyrd-disable-resour…
robgaston Mar 25, 2022
baa2ea4
fix for map layer manager
aarongundel Mar 28, 2022
30557f6
gets arches settings page partially working
aarongundel Mar 28, 2022
cd20591
user-profile manager needs csrf check, map plugin template load
aarongundel Mar 28, 2022
8fe4348
merge #8090
chrabyrd Mar 30, 2022
8fd0a7b
Merge pull request #8261 from aarongundel/8090_webpack_search_functio…
chrabyrd Mar 30, 2022
5786964
Merge branch 'dev/6.1.x' into dev/7.0.x
chiatt Mar 31, 2022
f364f44
Resolve graph model conflict between migrations 7783 and 7874
chiatt Mar 31, 2022
500785f
Fixing style errors.
stickler-ci Mar 31, 2022
ef95ef3
Merge pull request #8317 from archesproject/merge_6.1_into_7.0
chrabyrd Apr 1, 2022
43fbfad
merge #8090
chrabyrd Apr 4, 2022
836ab97
updates widgets and datatypes #8090
chrabyrd Apr 4, 2022
08d74ec
updates cards #8090
chrabyrd Apr 5, 2022
5fabd8e
nit updates interactions #8090
chrabyrd Apr 5, 2022
568438e
nit #8090
chrabyrd Apr 5, 2022
60b6e51
Merge pull request #8338 from archesproject/dev/6.1.x
chiatt Apr 6, 2022
74df3d3
updates directory structure #8090
chrabyrd Apr 6, 2022
351913b
merge #8090
chrabyrd Apr 6, 2022
9a9b465
updates node_modules path #8090
chrabyrd Apr 7, 2022
9de41e9
nit #8090
chrabyrd Apr 7, 2022
fffb82d
makes workflows usuable #8090
chrabyrd Apr 8, 2022
ed53856
nit #8090
chrabyrd Apr 8, 2022
7c926f9
removes arches requirejs dependency #8090
chrabyrd Apr 8, 2022
62d0ff1
Merge branch '8090-cbyrd-adds-frontend-compiler' of https://github.co…
chrabyrd Apr 12, 2022
a575051
Merge branch '8090-cbyrd-adds-frontend-compiler' of https://github.co…
chrabyrd Apr 12, 2022
1654097
setup React header container
chrabyrd Apr 12, 2022
6ae1f6f
adds basic React demo
chrabyrd Apr 12, 2022
102f51a
nit
chrabyrd Apr 12, 2022
5cdffa2
nit
chrabyrd Apr 13, 2022
886e8c6
nit
chrabyrd Apr 13, 2022
e6da5ce
nit
chrabyrd Apr 13, 2022
f82774d
nit
chrabyrd Apr 13, 2022
a7c2929
adds gracful react binding in kojs
chrabyrd Apr 21, 2022
18562e6
hack trip changes
aarongundel Apr 21, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 16 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"presets": [
[
"@babel/preset-env"
]
],
"plugins": [
// "@babel/plugin-syntax-dynamic-import",
// "@babel/plugin-proposal-class-properties",
// "@babel/plugin-transform-runtime",
// {
// "regenerator": true,
// "corejs": 3 // or 2; if polyfills needed
// }
]
}
10 changes: 10 additions & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[production staging]
>5%
last 2 versions
Firefox ESR
not ie < 11

[development]
last 1 chrome version
last 1 firefox version
last 1 edge version
1 change: 1 addition & 0 deletions .eslint
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

54 changes: 54 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
// module.exports = {
// "extends": "eslint:recommended",
// // add your custom rules here
// rules: {
// "semi": ["error", "always"],
// "indent": ["error", 4],
// "space-before-function-paren": ["error", "never"],
// "no-extra-boolean-cast": 0, // 0=silence, 1=warning, 2=error
// // allow async-await
// 'generator-star-spacing': 'off',
// // allow debugger during development
// 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
// "camelcase": [2, {"properties": "always"}]
// },
// "globals": {
// "define": false,
// "require": false,
// "window": false,
// "console": false,
// "history": false,
// "location": false,
// "Promise": false,
// "setTimeout": false,
// "URL": false,
// "URLSearchParams": false,
// "fetch": false
// },
// "parserOptions": {
// "ecmaVersion": 2017
// },
// "env": {
// "es6": true
// }
// };

{
"parser": "@babel/eslint-parser",
"extends": [
"eslint:recommended"
],
"env": {
"browser": true,
"node": true
},
"parserOptions": {
"ecmaVersion": 8,
"sourceType": "module",
"requireConfigFile": false
},
"rules": {
"semi": 2
}
}

34 changes: 0 additions & 34 deletions .eslintrc.js

This file was deleted.

4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,6 @@ djcp.sh
pip-wheel-metadata
.eggs
*.code-workspace
coverage.xml
coverage.xml
webpack-stats.json
CACHE
3 changes: 3 additions & 0 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": "stylelint-config-standard"
}
8 changes: 7 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,13 @@ language:
- node_js

python: 3.9
node_js: 10.8

node_js:
- 10.8
- "lts/*"
- "node"

script: npm run build

jobs:
allow_failures:
Expand Down
3 changes: 1 addition & 2 deletions .yarnrc
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
--install.modules-folder "arches/app/media/packages"
--add.modules-folder "arches/app/media/packages"
--modules-folder arches/app/media/node_modules
27 changes: 9 additions & 18 deletions arches/app/functions/primary_descriptors.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,20 @@ class PrimaryDescriptorsFunction(AbstractPrimaryDescriptorsFunction):
def get_primary_descriptor_from_nodes(self, resource, config):
datatype_factory = None
try:
if (
"nodegroup_id" in config
and config["nodegroup_id"] != ""
and config["nodegroup_id"] is not None
):
tiles = models.TileModel.objects.filter(
nodegroup_id=uuid.UUID(config["nodegroup_id"]), sortorder=0
).filter(resourceinstance_id=resource.resourceinstanceid)
if "nodegroup_id" in config and config["nodegroup_id"] != "" and config["nodegroup_id"] is not None:
tiles = models.TileModel.objects.filter(nodegroup_id=uuid.UUID(config["nodegroup_id"]), sortorder=0).filter(
resourceinstance_id=resource.resourceinstanceid
)
if len(tiles) == 0:
tiles = models.TileModel.objects.filter(
nodegroup_id=uuid.UUID(config["nodegroup_id"])
).filter(resourceinstance_id=resource.resourceinstanceid)
tiles = models.TileModel.objects.filter(nodegroup_id=uuid.UUID(config["nodegroup_id"])).filter(
resourceinstance_id=resource.resourceinstanceid
)
for tile in tiles:
for node in models.Node.objects.filter(
nodegroup_id=uuid.UUID(config["nodegroup_id"])
):
for node in models.Node.objects.filter(nodegroup_id=uuid.UUID(config["nodegroup_id"])):
data = {}
if len(list(tile.data.keys())) > 0:
data = tile.data
elif (
tile.provisionaledits is not None
and len(list(tile.provisionaledits.keys())) == 1
):
elif tile.provisionaledits is not None and len(list(tile.provisionaledits.keys())) == 1:
userid = list(tile.provisionaledits.keys())[0]
data = tile.provisionaledits[userid]["value"]
if str(node.nodeid) in data:
Expand Down
63 changes: 43 additions & 20 deletions arches/app/media/css/arches.scss
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
@import url(fonts/openSans.css);
@import url(../packages/bootstrap/dist/css/bootstrap.min.css);
@import url(../packages/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css);
@import url(../packages/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css);
@import url(../node_modules/bootstrap/dist/css/bootstrap.min.css);
@import url(../node_modules/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css);
@import url(../node_modules/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css);
@import url(nifty.min.css);
@import url(../packages/font-awesome/css/font-awesome.min.css);
@import url(../packages/ionicons/css/ionicons.min.css);
@import url(../packages/lt-themify-icons/themify-icons.css);
@import url(../packages/chosen-js/chosen.css);
@import url(../packages/select2/select2.css);
@import url(../packages/select2/select2-bootstrap.css);
@import url(../packages/mapbox-gl/dist/mapbox-gl.css);
@import url(../packages/nouislider/distribute/nouislider.min.css);
@import url(../packages/codemirror/lib/codemirror.css);
@import url(../packages/codemirror/theme/monokai.css);
@import url(../packages/datatables.net-bs/css/dataTables.bootstrap.css);
@import url(../packages/datatables.net-responsive-bs/css/responsive.bootstrap.css);
@import url(../packages/datatables.net-buttons-bs/css/buttons.bootstrap.min.css);
@import url(../packages/leaflet/dist/leaflet.css);
@import url(../packages/leaflet-draw/dist/leaflet.draw.css);
@import url(../node_modules/font-awesome/css/font-awesome.min.css);
@import url(../node_modules/ionicons/css/ionicons.min.css);
@import url(../node_modules/lt-themify-icons/themify-icons.css);
@import url(../node_modules/chosen-js/chosen.css);
@import url(../node_modules/select2/select2.css);
@import url(../node_modules/select2/select2-bootstrap.css);
@import url(../node_modules/mapbox-gl/dist/mapbox-gl.css);
@import url(../node_modules/nouislider/distribute/nouislider.min.css);
@import url(../node_modules/codemirror/lib/codemirror.css);
@import url(../node_modules/codemirror/theme/monokai.css);
@import url(../node_modules/datatables.net-bs/css/dataTables.bootstrap.css);
@import url(../node_modules/datatables.net-responsive-bs/css/responsive.bootstrap.css);
@import url(../node_modules/datatables.net-buttons-bs/css/buttons.bootstrap.min.css);
@import url(../node_modules/leaflet/dist/leaflet.css);
@import url(../node_modules/leaflet-draw/dist/leaflet.draw.css);
@import url(../css/tree/tree.css);
@import url(../packages/@mapbox/mapbox-gl-geocoder/dist/mapbox-gl-geocoder.css);
@import url(../packages/leaflet.fullscreen/Control.FullScreen.css);
@import url(../node_modules/@mapbox/mapbox-gl-geocoder/dist/mapbox-gl-geocoder.css);
@import url(../node_modules/leaflet.fullscreen/Control.FullScreen.css);

img {
image-orientation: from-image;
Expand Down Expand Up @@ -4113,6 +4113,29 @@ div.dropdown-menu.open {
stroke-width: 3px;
}

.modal-background {
position: fixed;
background-color: rgba(200, 200, 200, 0.75);
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: 999;
transition: all 0.3s;
cursor: pointer;
}

.modal-content-container {
cursor: default;
background-color: #fafafa;
margin: 15% auto;
max-width: 600px;
padding: 18px;
border: 1px solid #ddd;
border-radius: 5px;
width: 70%;
}

.loading-mask {
position: fixed;
background-color: grey;
Expand Down
2 changes: 1 addition & 1 deletion arches/app/media/css/index.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import url(../packages/chosen-js/chosen.css);
@import url(../node_modules/chosen-js/chosen.css);

html, body {
overflow-x: hidden;
Expand Down
22 changes: 11 additions & 11 deletions arches/app/media/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@
box-shadow: 0 0 5px #ccc;
margin-left: auto !important;
margin-right: auto !important;
background: url(../img/patterns/15.png) repeat;
/* background: url(../img/patterns/15.png) repeat; */
}

/*Parallax Backgrounds
------------------------------------*/
.parallax-bg {
background: url(../img/blur/img1.jpg) 50% 0 repeat fixed;
/* background: url(../img/blur/img1.jpg) 50% 0 repeat fixed; */
}

/*Parallax Counter Block*/
.parallax-counter {
padding: 60px 0;
background: url(../img/bg/9.jpg) 50% 0 no-repeat fixed;
/* background: url(../img/bg/9.jpg) 50% 0 no-repeat fixed; */
}

.parallax-counter h4 {
Expand All @@ -64,7 +64,7 @@

/*Parallax Team*/
.parallax-team {
background: url(../img/team/faces.jpg) 50% 0 repeat fixed;
/* background: url(../img/team/faces.jpg) 50% 0 repeat fixed; */
}

.parallax-team,
Expand Down Expand Up @@ -1553,7 +1553,7 @@ ul.blog-tags a:hover i {

.slider-promo-info-bg {
padding: 25px 20px 20px;
background: url(../img/bg-black.png) repeat;
/* background: url(../img/bg-black.png) repeat; */
}

.slider-promo-info span.big-size {
Expand Down Expand Up @@ -2222,7 +2222,7 @@ ul.labels-demo li {
.breadcrumbs-v2 {
text-align: center;
position: relative;
background: url(../img/bg/11.jpg) no-repeat center;
/* background: url(../img/bg/11.jpg) no-repeat center; */
}

.breadcrumbs-v2-in {
Expand Down Expand Up @@ -2315,7 +2315,7 @@ ul.labels-demo li {
/*General Positioning Classes
------------------------------------*/
.margin-0 {
.margin: 0px;
margin: 0px;
}

.margin-10 {
Expand Down Expand Up @@ -2619,7 +2619,7 @@ ul.labels-demo li {
text-align: center;
position: relative;
margin-bottom: 20px;
background: url(../img/bg/Coast.jpg);
/* background: url(../img/bg/Coast.jpg); */
background-size: 101%;
background-position: 50% -80px;
background-repeat: no-repeat;
Expand Down Expand Up @@ -3752,7 +3752,7 @@ a.read-more:hover {
------------------------------------*/
/*Main Parallax Sldier*/
.da-slide h2 i {
background:url(../../plugins/parallax-slider/img/bg-heading-dark-blue.png) repeat;
/* background:url(../../plugins/parallax-slider/img/bg-heading-dark-blue.png) repeat; */
}

/*Sequence Parallax Sldier*/
Expand Down Expand Up @@ -3834,10 +3834,10 @@ a.read-more:hover {
}

.bx-wrapper .bx-prev {
background-image: url(../../plugins/bxslider/images/controls-dark-blue.png);
/* background-image: url(../../plugins/bxslider/images/controls-dark-blue.png); */
}
.bx-wrapper .bx-next {
background-image: url(../../plugins/bxslider/images/controls-dark-blue.png);
/* background-image: url(../../plugins/bxslider/images/controls-dark-blue.png); */
}

/*Typography
Expand Down
6 changes: 0 additions & 6 deletions arches/app/media/css/plugins/brand-buttons/.travis.yml

This file was deleted.

Loading