Skip to content

Commit

Permalink
Merge 'develop' into 'master'
Browse files Browse the repository at this point in the history
  • Loading branch information
jinh0 committed Aug 18, 2022
1 parent 7f57b0e commit 5c08c7b
Show file tree
Hide file tree
Showing 620 changed files with 747,337 additions and 1,615 deletions.
24 changes: 17 additions & 7 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
"browser": true,
"es6": true
},
"extends": "plugin:@typescript-eslint/recommended",
"extends": [
"plugin:@typescript-eslint/recommended"
],
"globals": {
"Atomics": "readonly",
"SharedArrayBuffer": "readonly"
Expand All @@ -22,7 +24,7 @@
},
"rules": {
"@typescript-eslint/indent": [
"error",
"warn",
2
],
"linebreak-style": [
Expand All @@ -33,19 +35,27 @@
"error",
"single"
],
"@typescript-eslint/semi": [
"object-curly-spacing": [
"error",
"always"
],
"@typescript-eslint/no-var-requires": 1,
"@typescript-eslint/no-use-before-define": [
"warn"
"quote-props": [
"error",
"as-needed"
],
"@typescript-eslint/semi": [
"warn",
"always"
],
"@typescript-eslint/no-var-requires": 1,
"@typescript-eslint/no-unused-vars": [
"error",
"warn",
{
"argsIgnorePattern": "^_"
}
],
"@typescript-eslint/no-empty-function": [
"warn"
]
}
}
14 changes: 14 additions & 0 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: E2E on Chrome
on: [push]
jobs:
cypress-run:
runs-on: ubuntu-20.04
# let's make sure our tests pass on Chrome browser
name: E2E on Chrome
steps:
- uses: actions/checkout@v2
- uses: cypress-io/github-action@v4
with:
build: yarn build
start: yarn start
browser: chrome
21 changes: 11 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
/node_modules
/deployment/public/*.js
/deployment/public/*.rng
/deployment/public/*.map
/deployment/public/*.css
/deployment/public/img
/deployment/public/assets
/deployment/public/Neon
/deployment/public/uploads/*
/views/*.png
/dist
/package-lock.json
.DS_Store
.awcache
.vscode

/deployment/server/Neon-gh
/deployment/public
/dist

/cypress/videos
/cypress/screenshots
/cypress/downloads

2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: node_js
node_js: stable
os: osx
osx_image: xcode11.3
if: (branch = master OR branch = develop)
if: (branch = master)
addons:
firefox: latest
chrome: stable
Expand Down
17 changes: 6 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Neon v4.1.1
Neon v6.0.0
=====
[![Build_Status](https://travis-ci.org/DDMAL/Neon.svg?branch=master)](https://travis-ci.org/DDMAL/Neon)
[![License: MIT](https://img.shields.io/github/license/DDMAL/Neon)](https://opensource.org/licenses/MIT)
Expand Down Expand Up @@ -44,19 +44,14 @@ Instructions

Neon has two main modes: viewer and editor. To learn how to use both, [read the instructions on our wiki.](https://github.com/DDMAL/Neon/wiki/Instructions)

Test
Testing
----

Follow the instructions from above first. The tests for Neon use [Selenium](https://docs.seleniumhq.org/) and use Firefox, Safari, and Chrome. Their respective webdrivers are required. Safari 12 or greater is required. On Mac, Firefox and Chrome can be installed by:
```shell
brew cask install firefox
brew cask install google-chrome
brew install geckodriver
brew cask install chromedriver
```
Then you can run the tests locally using `yarn test`. We use [jest](https://facebook.github.io/jest/) to script our tests.
Follow the instructions from above first.

We use [Cypress](https://www.cypress.io/) for E2E testing.

*These tests require the server to be running on `localhost:8080`*
Run the command `yarn test`. [Read more about testing on our wiki.](https://github.com/DDMAL/Neon/wiki/Testing-with-Cypress)

Verovio
-------
Expand Down
16 changes: 16 additions & 0 deletions assets/img/Neon-Icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions assets/img/Neon-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions assets/img/Neon_Icon_3.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/accidFlat.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/accidNatural.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions assets/img/checkmark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/divisio.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions assets/img/dropdown_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions assets/img/dropdown_icon_white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
45 changes: 45 additions & 0 deletions assets/img/expand-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/img/external-link.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 50 additions & 0 deletions assets/img/garbage-closed.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 50 additions & 0 deletions assets/img/garbage-open.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions assets/img/generic-profile-picture.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 5c08c7b

Please sign in to comment.