Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into Cidoc-&-Templates-e…
Browse files Browse the repository at this point in the history
…xperiments
  • Loading branch information
nunofreitas96 committed Mar 19, 2020
2 parents 1ad80bf + 24a22f4 commit bc52094
Show file tree
Hide file tree
Showing 249 changed files with 33,526 additions and 5,021 deletions.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# archgraph

[![Codacy Badge](https://api.codacy.com/project/badge/Grade/f3070810a6f946de93967d5a78acbfc0)](https://app.codacy.com/manual/feup-infolab/archgraph?utm_source=github.com&utm_medium=referral&utm_content=feup-infolab/archgraph&utm_campaign=Badge_Grade_Dashboard)
[![Build Status](https://travis-ci.com/feup-infolab/archgraph.svg?branch=master)](https://travis-ci.com/feup-infolab/archgraph)
[![Coverage Status](https://coveralls.io/repos/github/feup-infolab/archgraph/badge.svg?branch=master)](https://coveralls.io/github/feup-infolab/archgraph?branch=master)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/f3070810a6f946de93967d5a78acbfc0)](https://app.codacy.com/manual/feup-infolab/archgraph?utm_source=github.com&utm_medium=referral&utm_content=feup-infolab/archgraph&utm_campaign=Badge_Grade_Dashboard)
Expand Down Expand Up @@ -43,4 +42,4 @@ The setup should automatically detect your operating system (Mac or Linux) and r
./conf/run.sh
```

To exit, press Ctrl+C, and both the API server and the frontend server should be terminated.
To exit, press Ctrl+C, and both the API server and the frontend server should be terminated.
4 changes: 2 additions & 2 deletions conf/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ source "$HOME/.bash_profile"
export PATH="$HOME/miniconda/bin":$PATH
conda remove --quiet --name "$ENV_NAME" -y --all
conda create --quiet -y -n "$ENV_NAME" python=3.7 anaconda
conda activate"$ENV_NAME"
conda activate "$ENV_NAME"
conda init bash

# install pip
Expand All @@ -29,7 +29,7 @@ python get-pip.py
# upgrade pip to latest version
pip install --quiet --upgrade pip
# (optional) install any requirements of your current app in this venv
pip install --quiet -r requirements.txt
pip install -r requirements.txt
# Get location of python interpreter
echo "Python interpreter is at: ---> $(which python) <---"

Expand Down
2 changes: 1 addition & 1 deletion frontend/.editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Editor configuration, see https://editorconfig.org
# Editor configuration, see http://editorconfig.org
root = true

[*]
Expand Down
39 changes: 39 additions & 0 deletions frontend/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/out-tsc

# dependencies
/node_modules

# IDEs and editors
/.idea
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

# misc
/.sass-cache
/connect.lock
/coverage
/libpeerconnection.log
npm-debug.log
yarn-error.log
testem.log
/typings

# System Files
.DS_Store
Thumbs.db
25 changes: 25 additions & 0 deletions frontend/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
language: node_js
node_js:
- "8.9.4"

branches:
only:
- master
- develop

before_script:
- yarn install --frozen-lockfile

script:
- yarn buildlib
- yarn build

deploy:
provider: pages
skip-cleanup: true
github-token: $GITHUB_TOKEN # Set in travis-ci.org dashboard, marked secure
keep-history: true
on:
branch: master
local_dir: dist/angular7-json-schema-form-app

21 changes: 21 additions & 0 deletions frontend/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2018 Hamza Hamidi

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Loading

0 comments on commit bc52094

Please sign in to comment.