Skip to content
This repository has been archived by the owner on Nov 30, 2021. It is now read-only.

Release 1.0.0 #55

Merged
merged 80 commits into from
Feb 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
e45c60e
Update template files and dependencies (#28)
rumersdorfer Dec 18, 2019
d25602f
Ignore package-lock.json
rumersdorfer Jan 7, 2020
902fe2b
Delete package-lock.json
rumersdorfer Jan 7, 2020
73e87fb
use `circleci/node:12.13-buster-browsers` as
dvvanessastoiber Jan 9, 2020
6d5f2d6
Merge pull request #29 from Caleydo/rumersdorfer-patch-1
Jan 9, 2020
9fceb53
Delete .gitlab-ci.yml
Jan 9, 2020
218b9d4
Update webpack.config.js
Jan 9, 2020
3a258c2
template changes
steiner-anita Jan 9, 2020
4cc70a6
Merge pull request #30 from Caleydo/python_3.7
Jan 9, 2020
d686968
add CODEOWNERS file
rumersdorfer Jan 29, 2020
f96e578
add CODEOWNERS file (#31)
Jan 30, 2020
931ce03
replace _karma.conf.js_ with _jest.config.js_
dvvanessastoiber Feb 4, 2020
c40e169
update scripts for testing with jest
dvvanessastoiber Feb 4, 2020
a64d837
update dependencies for testing with jest
dvvanessastoiber Feb 4, 2020
7a4d158
change test regex and allow to pass with no tests
dvvanessastoiber Feb 5, 2020
be90482
handle xml files with `jest-raw-loader`
dvvanessastoiber Feb 5, 2020
8d4916d
run `yo phovea:update`
dvvanessastoiber Feb 5, 2020
511ebfc
add dependency for "identity-obj-proxy"
dvvanessastoiber Feb 5, 2020
20bc332
set `"downlevelIteration": true` in ts config
dvvanessastoiber Feb 19, 2020
101e6ec
update dependencies
dvvanessastoiber Feb 19, 2020
bf61d4d
update typescript and tslib
dvvanessastoiber Feb 28, 2020
4c5babe
Initialize i18n
thinkh Feb 28, 2020
c25c454
Update CircleCI config
thinkh Feb 28, 2020
0b8ef07
Switch to combined prov-retrieval+ts_3.8 branch
thinkh Feb 28, 2020
e3ebc49
Merge branch 'develop' into typescript_3.8
thinkh Feb 28, 2020
7a6ae28
update webpack plugin
dvvanessastoiber Mar 3, 2020
38ec885
remove mkdirp dependency
dvvanessastoiber Mar 3, 2020
9654afc
update node-sass and typedoc
dvvanessastoiber Mar 3, 2020
56ea563
update vega dependencies
dvvanessastoiber Mar 3, 2020
b3a6adc
update npm-force-resolutions
dvvanessastoiber Mar 3, 2020
496f2b3
switch branches in package.json
dvvanessastoiber Mar 3, 2020
0b79fcc
revert vega update
dvvanessastoiber Mar 3, 2020
ace562e
update webpack plugin
dvvanessastoiber Mar 4, 2020
08682c1
Merge pull request #34 from Caleydo/typescript_3.8
Mar 5, 2020
43d5bfd
Merge branch 'develop' into update_dependencies_38
dvvanessastoiber Mar 9, 2020
38821f5
change `buildId` to `JSON.stringify(buildId)`
dvvanessastoiber Mar 13, 2020
a394ca0
Merge pull request #39 from Caleydo/stoiber/fix_build_id_webpack_config
Mar 15, 2020
e7d0424
Remove unused npm-force-resolutions dependency
thinkh Mar 16, 2020
6431ae3
Merge pull request #37 from Caleydo/update_dep_req
Mar 16, 2020
f6bf328
Merge branch 'develop' into stoiber/testing_with_jest
dvvanessastoiber Mar 23, 2020
2e8d2bb
update jest to latest version
dvvanessastoiber Mar 23, 2020
4620b3c
unify jest config
dvvanessastoiber Mar 23, 2020
853c97c
use pinned jest version
dvvanessastoiber Mar 24, 2020
b143f7e
switch branches in package.json
dvvanessastoiber Mar 24, 2020
1bb3fb0
add mapping for png, gif and jpg
dvvanessastoiber Mar 24, 2020
94a8a3d
Rename file spec.ts to VegaSpec.ts
thinkh Mar 24, 2020
b63a70c
Update package.json
Mar 27, 2020
bf6f945
Merge pull request #32 from Caleydo/stoiber/testing_with_jest
Mar 27, 2020
09c7e05
Update homepage
rumersdorfer Apr 28, 2020
6124c57
Update README.md circleci links
rumersdorfer Apr 28, 2020
4e82ebb
Merge pull request #45 from Caleydo/rumersdorfer-update_README.md
Apr 29, 2020
be6314e
Merge pull request #44 from Caleydo/rumersdofer-update_package.json
Apr 29, 2020
6078283
Update README.md
rumersdorfer May 15, 2020
fe5ffae
Merge pull request #46 from Caleydo/rumersdorfer-update_README.md
May 31, 2020
05cebdd
Update .gitattributes
rumersdorfer Aug 20, 2020
084de5d
Merge pull request #47 from Caleydo/rumersdorfer-gitattributes_dist
Aug 21, 2020
32fb347
Update template files and refactor source code
thinkh Dec 21, 2020
fed56b5
Switch branches
thinkh Dec 21, 2020
5724916
Split main.scss in multiple scss files
thinkh Dec 21, 2020
6356607
Remove SCSS imports in TS files
thinkh Dec 21, 2020
347578b
Fix tslint
thinkh Dec 21, 2020
7544b6a
Merge branch 'develop' into thinkh/refactor_stylesheets
thinkh Dec 21, 2020
2ad9cc4
Switch branches
thinkh Dec 21, 2020
72f55dc
Upgrade to Font Awesome v5
thinkh Dec 21, 2020
059fc7e
Update package.json
Dec 23, 2020
d477664
Merge pull request #50 from Caleydo/fontawesome-v5
Dec 23, 2020
da50179
Update package.json
Dec 28, 2020
9e55208
Merge pull request #49 from Caleydo/thinkh/refactor_stylesheets
Dec 28, 2020
38d5af1
update deprecated config option
dvvanessastoiber Jan 8, 2021
0459d03
switch branches in package.json
dvvanessastoiber Jan 8, 2021
dda2934
update dependencies
dvvanessastoiber Jan 8, 2021
0461290
update .gitignore
dvvanessastoiber Jan 12, 2021
e048a41
update tsconfig.json
dvvanessastoiber Jan 12, 2021
a33e32a
remove 404.html
dvvanessastoiber Jan 13, 2021
25a0774
remove imports
dvvanessastoiber Jan 13, 2021
f404204
Merge pull request #54 from Caleydo/vstoiber/add_html_templates_to_app
Jan 23, 2021
a2b2733
Update package.json
Jan 23, 2021
0330054
Merge pull request #52 from Caleydo/vstoiber/update_dependencies
Jan 23, 2021
5c06603
Adjust left padding in vega spec
thinkh Feb 18, 2021
49766a4
prepare release 1.0.0
dvvanessastoiber Feb 18, 2021
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
28 changes: 11 additions & 17 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,33 @@ jobs:
build:
working_directory: ~/phovea
docker:
- image: circleci/node:12-browsers
- image: circleci/node:12.13-buster-browsers
steps:
- checkout
- run:
name: Show Node.js and npm version
command: |
node -v
npm -v
- run:
name: NPM Force Resolutions
command: npx npm-force-resolutions
- restore_cache:
key: deps1-{{ .Branch }}-{{ checksum "package-lock.json" }}
key: deps1-{{ .Branch }}-{{ checksum "package.json" }}
- run:
name: Install npm dependencies
command: npm ci
# - run:
# name: Remove npm dependencies installed from git repositories (avoid caching of old commits)
# command: |
# (grep -l '._resolved.: .\(git[^:]*\|bitbucket\):' ./node_modules/*/package.json || true) | xargs -r dirname | xargs -r rm -rf
command: npm install
- run:
name: Remove npm dependencies installed from git repositories (avoid caching of old commits)
command: |
(grep -l '._resolved.: .\(git[^:]*\|bitbucket\):' ./node_modules/*/package.json || true) | xargs -r dirname | xargs -r rm -rf
- save_cache:
key: deps1-{{ .Branch }}-{{ checksum "package-lock.json" }}
key: deps1-{{ .Branch }}-{{ checksum "package.json" }}
paths:
- ./node_modules
# - run:
# name: Install npm dependencies from git repositories (always get latest commit)
# command: npm install
- run:
name: List node_modules directory
command: ls -la ./node_modules
name: Install npm dependencies from git repositories (always get latest commit)
command: npm install
- run:
name: Show installed npm dependencies
command: npm list --depth=2 || true
command: npm list --depth=1 || true
- run:
name: Build
command: npm run dist
Expand Down
7 changes: 7 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -125,3 +125,10 @@ AUTHORS text
# with the python modules ``pickle``, ``dbm.*``,
# ``shelve``, ``marshal``, ``anydbm``, & ``bsddb``
# (among others).


# Mark compiled files as generated to hide them in PRs
/dist/** linguist-generated=true

# Hide compiled files from git diff and auto-replace them when merging different branches
/dist/** -diff -merge
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @thinkh
11 changes: 7 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
/.tscache
/.idea
/build/
/dist/
/lib/
/dist/tsBuildInfoFile
node_modules/
/src/**/*.js
/tests/**/*.js
*.map
/src/**/*.map
/tests/**/*.map
*.css
*.log
/.cache-loader
/.awcache
/.cache-loader
package-lock.json
46 changes: 0 additions & 46 deletions .gitlab-ci.yml

This file was deleted.

28 changes: 24 additions & 4 deletions .yo-rc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@
"generator-phovea": {
"type": "app",
"name": "vega_clue",
"app": "Vega CLUE",
"app": "vega_clue",
"author": "The Caleydo Team",
"githubAccount": "caleydo",
"clientOnly": false,
"entries": {
"app": "./src/index.ts"
"app": {
"js": "dist/initialize.js",
"template": "dist/index.template.ejs",
"html": "index.html",
"chunkName": "app"
}
},
"libraries": [
"d3"
Expand All @@ -17,8 +22,17 @@
"phovea_ui",
"phovea_clue"
],
"vendors": {
"others": "phovea.*|tdp_.*|tdp-.*|datavisyn.*",
"phovea": "phovea.*",
"tdp": "tdp_.|tdp-.*",
"dv": "datavisyn.*"
},
"filesToLoad": {
"file-loader": "404|robots"
},
"libraryAliases": {
"d3": "d3/d3"
"d3": "d3/d3.js"
},
"libraryExternals": [
"d3",
Expand All @@ -28,6 +42,12 @@
],
"ignores": [],
"extensions": [],
"today": "Tue, 13 Mar 2018 10:20:09 GMT"
"today": "Tue, 13 Mar 2018 10:20:09 GMT",
"promptValues": {
"authorName": "The Caleydo Team",
"authorEmail": "[email protected]",
"authorUrl": "https://caleydo.org",
"githubAccount": "caleydo"
}
}
}
46 changes: 46 additions & 0 deletions AppWrapper.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import { ACLUEWrapper, CLUEGraphManager, IVisStateApp } from 'phovea_clue';
import { AppHeader } from 'phovea_ui';
import { ProvenanceGraph } from 'phovea_core';
import App from './internal/App';
export interface IView<T> {
init(): Promise<T>;
remove(): any;
}
export interface IAppWrapperOptions {
/**
* name of this application
*/
name: string;
/**
* prefix used for provenance graphs and used to identify matching provenance graphs
*/
prefix: string;
/**
* Show/hide the EU cookie disclaimer bar from `cookie-bar.eu`
*/
showCookieDisclaimer: boolean;
}
/**
* The main class for the App app
*/
export declare class AppWrapper<T extends IView<T> & IVisStateApp> extends ACLUEWrapper {
protected readonly options: IAppWrapperOptions;
protected app: Promise<App>;
protected header: AppHeader;
constructor(options?: Partial<IAppWrapperOptions>);
init(): Promise<void>;
protected buildImpl(body: HTMLElement): {
graph: Promise<ProvenanceGraph>;
manager: CLUEGraphManager;
storyVis: () => Promise<import("phovea_clue").VerticalStoryVis>;
provVis: () => Promise<import("phovea_clue").LayoutedProvVis>;
};
/**
* build the actual main application given the arguments
* @param {ProvenanceGraph} graph the resolved current provenance graph
* @param {CLUEGraphManager} manager its manager
* @param {HTMLElement} main root dom element
* @returns {PromiseLike<T> | T}
*/
protected createApp(graph: ProvenanceGraph, manager: CLUEGraphManager, main: HTMLElement): PromiseLike<App> | App;
}
12 changes: 5 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
Vega CLUE [![Phovea][phovea-image]][phovea-url] [![NPM version][npm-image]][npm-url] [![Build Status][travis-image]][travis-url] [![Dependency Status][daviddm-image]][daviddm-url] [![Build Status][circleci-image]][circleci-url]
Vega CLUE
=====================
[![Phovea][phovea-image]][phovea-url] [![NPM version][npm-image]][npm-url] [![Build Status][circleci-image]][circleci-url]


[Vega examples](https://vega.github.io/vega/examples/) with [CLUE](https://github.com/phovea/phovea_clue)

Expand Down Expand Up @@ -44,9 +46,5 @@ This repository is part of **[Phovea](http://phovea.caleydo.org/)**, a platform
[phovea-url]: https://phovea.caleydo.org
[npm-image]: https://badge.fury.io/js/vega_clue.svg
[npm-url]: https://npmjs.org/package/vega_clue
[travis-image]: https://travis-ci.org/Caleydo/vega_clue.svg?branch=master
[travis-url]: https://travis-ci.org/Caleydo/vega_clue
[daviddm-image]: https://david-dm.org/Caleydo/vega_clue/status.svg
[daviddm-url]: https://david-dm.org/Caleydo/vega_clue
[circleci-image]: https://circleci.com/gh/Caleydo/vega_clue/tree/master.svg?style=svg
[circleci-url]: https://circleci.com/gh/Caleydo/vega_clue/tree/master
[circleci-image]: https://circleci.com/gh/Caleydo/vega_clue.svg?style=shield
[circleci-url]: https://circleci.com/gh/Caleydo/vega_clue
46 changes: 46 additions & 0 deletions dist/AppWrapper.d.ts

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

Loading