Merge branch 'master' into develop

This commit is contained in:
James Barnsley
2020-02-10 06:57:27 +13:00
8 changed files with 19511 additions and 27437 deletions

View File

@ -5,13 +5,64 @@ orbs:
workflows:
version: 2
test:
build_and_test:
jobs:
- py38
- py37
- black
- check-manifest
- flake8
- py38:
filters:
branches:
only: deploy/test
- py37:
filters:
branches:
only: deploy/test
- black:
filters:
branches:
only: deploy/test
- check-manifest:
filters:
branches:
only: deploy/test
- flake8:
filters:
branches:
only: deploy/test
- build:
filters:
branches:
only: deploy/test
build_test_and_release:
jobs:
- py38:
filters:
branches:
only: deploy/release
- py37:
filters:
branches:
only: deploy/release
- black:
filters:
branches:
only: deploy/release
- check-manifest:
filters:
branches:
only: deploy/release
- flake8:
filters:
branches:
only: deploy/release
- build:
filters:
branches:
only: deploy/release
- deploy:
requires:
- build
filters:
branches:
only: deploy/release
jobs:
py38: &test-template
@ -49,3 +100,47 @@ jobs:
check-manifest: *test-template
flake8: *test-template
build:
docker:
- image: nikolaik/python-nodejs:python3.7-nodejs12-stretch
steps:
- checkout
- restore_cache:
keys:
- v1-dependencies-{{ checksum "IRIS_VERSION" }}
- run:
name: Install npm dependencies
command: npm install
- run:
name: Build code
command: npm run build:prod
- run:
name: Install python dependencies
command: pip install -e .
- save_cache:
paths:
- node_modules
- mopidy_iris
key: v1-dependencies-{{ checksum "IRIS_VERSION" }}
deploy:
docker:
- image: nikolaik/python-nodejs:python3.7-nodejs12-stretch
steps:
- checkout
- restore_cache:
keys:
- v1-dependencies-{{ checksum "IRIS_VERSION" }}
- run:
name: Prepare .pypirc
command: |
echo -e "[distutils]" >> ~/.pypirc
echo -e "index-servers =" >> ~/.pypirc
echo -e " pypi" >> ~/.pypirc
echo -e "[pypi]" >> ~/.pypirc
echo -e "username = jaedb" >> ~/.pypirc
echo -e "password = $PYPI_PASSWORD" >> ~/.pypirc
- run:
name: Create and distribute package to pypi
command: python setup.py sdist upload -r pypi

View File

@ -13,7 +13,7 @@ Features
--------
* Full web-based interface controls for Mopidy
* Improved support for local libraries (powered by Mopidy-Local-Sqlite)
* Improved support for local libraries (powered by Mopidy-Local)
* Browse and manage your playlists and tracks
* Discover new, popular and related music (powered by Spotify)
* Freely hosted, auto-updated interface available ([beta](https://jaedb.github.io/Iris/#/))
@ -32,6 +32,7 @@ Requirements
* Mopidy
* Mopidy-Spotify (recommended, not required)
* Mopidy-Local (recommended, not required)
Getting started
-------

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -4052,15 +4052,17 @@ select {
top: 0;
left: 0; }
.list__item__column {
align-items: center; }
align-items: center;
flex: 10; }
.list__item__column--middle {
display: flex;
margin-left: auto;
flex: 1; }
flex: 5; }
.list__item__column--right {
display: flex;
margin-left: auto;
z-index: 9; }
z-index: 9;
flex: 4;
justify-content: flex-end; }
.list__item__column--right .list__item__column__item {
padding-left: 10px;
display: inline-block; }

View File

@ -19,8 +19,8 @@
<!-- Icons -->
<link rel="apple-touch-startup-image" href="/iris/assets/app-icon_512.png" />
<link rel="apple-touch-icon" sizes="192x192" href="/iris/assets/logo-app_192.png" />
<link rel="apple-touch-icon" sizes="512x512" href="/iris/assets/logo-app_512.png" />
<link rel="apple-touch-icon" sizes="192x192" href="/iris/assets/app-icon_192.png" />
<link rel="apple-touch-icon" sizes="512x512" href="/iris/assets/app-icon_512.png" />
<link class="favicon" rel="shortcut icon" type="image/ico" href="/iris/assets/favicon.png" />
<link class="favicon" rel="shortcut icon" type="image/x-icon" href="/iris/assets/favicon.png" />
@ -100,7 +100,7 @@
// Release details
// These are automatically injected to built HTML
var build = "1580765077";
var build = "1581189249";
var version = "3.44.0";
// Construct the script tag

2
package.json Normal file → Executable file
View File

@ -65,7 +65,7 @@
"webpack-strip": "0.1.0"
},
"scripts": {
"test": "jest",
"jest": "jest",
"start": "webpack-dev-server",
"lint": "eslint src",
"lint:fix": "eslint src --fix",

View File

@ -19,8 +19,8 @@
<!-- Icons -->
<link rel="apple-touch-startup-image" href="/iris/assets/app-icon_512.png" />
<link rel="apple-touch-icon" sizes="192x192" href="/iris/assets/logo-app_192.png" />
<link rel="apple-touch-icon" sizes="512x512" href="/iris/assets/logo-app_512.png" />
<link rel="apple-touch-icon" sizes="192x192" href="/iris/assets/app-icon_192.png" />
<link rel="apple-touch-icon" sizes="512x512" href="/iris/assets/app-icon_512.png" />
<link class="favicon" rel="shortcut icon" type="image/ico" href="/iris/assets/favicon.png" />
<link class="favicon" rel="shortcut icon" type="image/x-icon" href="/iris/assets/favicon.png" />