Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mamba-org/quetz-theme
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.1.1
Choose a base ref
...
head repository: mamba-org/quetz-theme
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.2.0
Choose a head ref
  • 8 commits
  • 7 files changed
  • 1 contributor

Commits on Jan 20, 2022

  1. Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    4716401 View commit details

Commits on Jan 21, 2022

  1. Upgrade linter

    fcollonval committed Jan 21, 2022

    Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    3ed0399 View commit details
  2. Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    f0dff6d View commit details
  3. Fix binder installation

    fcollonval committed Jan 21, 2022

    Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    fc63130 View commit details
  4. More binder fix

    fcollonval committed Jan 21, 2022

    Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    35b88ed View commit details
  5. More binder fix

    fcollonval committed Jan 21, 2022

    Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    ec58ed5 View commit details
  6. Missing lab installation

    fcollonval committed Jan 21, 2022

    Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    a199a2f View commit details

Commits on Jan 27, 2022

  1. Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    424d1c3 View commit details
Showing with 245 additions and 595 deletions.
  1. +9 −2 .eslintrc.js
  2. +1 −1 README.md
  3. +6 −0 binder/overrides.json
  4. +8 −1 binder/postBuild
  5. +16 −10 package.json
  6. +5 −8 src/index.ts
  7. +200 −573 yarn.lock
11 changes: 9 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -12,9 +12,16 @@ module.exports = {
},
plugins: ['@typescript-eslint'],
rules: {
'@typescript-eslint/interface-name-prefix': [
'@typescript-eslint/naming-convention': [
'error',
{ prefixWithI: 'always' }
{
'selector': 'interface',
'format': ['PascalCase'],
'custom': {
'regex': '^I[A-Z]',
'match': true
}
}
],
'@typescript-eslint/no-unused-vars': ['warn', { args: 'none' }],
'@typescript-eslint/no-explicit-any': 'off',
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# quetz-theme

![Github Actions Status](https://github.com/mamba-org/quetz-theme/workflows/Build/badge.svg)
[![Github Actions Status](https://github.com/mamba-org/quetz-theme/workflows/Build/badge.svg)](https://github.com/mamba-org/quetz-theme/actions/workflows/build.yml)
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/mamba-org/quetz-theme/main?urlpath=lab)

A dark-yellow theme for Quetz.
6 changes: 6 additions & 0 deletions binder/overrides.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"@jupyterlab/apputils-extension:themes": {
"theme": "Quetz",
"theme-scrollbars": true
}
}
9 changes: 8 additions & 1 deletion binder/postBuild
Original file line number Diff line number Diff line change
@@ -8,12 +8,13 @@
python3 binder/postBuild
"""
import os
import subprocess
import sys
from pathlib import Path


ROOT = Path.cwd()
HERE = Path(__file__).parent.resolve()

def _(*args, **kwargs):
""" Run a command, echoing the args
@@ -31,6 +32,7 @@ _(sys.executable, "-m", "pip", "check")

# install the labextension
_(sys.executable, "-m", "pip", "install", "-e", ".")
_(sys.executable, "-m", "jupyter", "labextension", "develop", "--overwrite", ".")

# verify the environment the extension didn't break anything
_(sys.executable, "-m", "pip", "check")
@@ -41,6 +43,11 @@ _("jupyter", "server", "extension", "list")
# initially list installed extensions to determine if there are any surprises
_("jupyter", "labextension", "list")

override = HERE / "overrides.json"
override_target = Path(os.environ["NB_PYTHON_PREFIX"]) / "share/jupyter/lab/settings" / override.name

override_target.parent.mkdir(parents=True, exist_ok=True)
override_target.write_bytes(override.read_bytes())

print("JupyterLab with quetz-theme is ready to run with:\n")
print("\tjupyter lab\n")
26 changes: 16 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"name": "quetz-theme",
"version": "0.1.1",
"version": "0.2.0",
"description": "A dark-yellow theme for Quetz.",
"keywords": [
"jupyter",
"jupyterlab",
"jupyterlab-extension"
"jupyterlab-extension",
"quetz"
],
"homepage": "https://github.com/mamba-org/quetz-theme",
"bugs": {
@@ -35,24 +36,24 @@
"clean:all": "jlpm run clean:lib && jlpm run clean:labextension",
"eslint": "eslint . --ext .ts,.tsx --fix",
"eslint:check": "eslint . --ext .ts,.tsx",
"install:extension": "jupyter labextension develop --overwrite .",
"prepare": "jlpm run clean && jlpm run build:prod",
"install:extension": "jlpm run build",
"watch": "run-p watch:src watch:labextension",
"watch:src": "tsc -w",
"watch:labextension": "jupyter labextension watch ."
},
"dependencies": {
"@jupyterlab/application": "^3.0.0"
"@jupyterlab/apputils": "^3.0.0",
"@lumino/application": "^1.25.0"
},
"devDependencies": {
"@jupyterlab/builder": "^3.0.0",
"@typescript-eslint/eslint-plugin": "^2.27.0",
"@typescript-eslint/parser": "^2.27.0",
"@typescript-eslint/eslint-plugin": "^4.28.0",
"@typescript-eslint/parser": "^4.28.0",
"eslint": "^7.5.0",
"eslint-config-prettier": "^6.10.1",
"eslint-plugin-prettier": "^3.1.2",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^4.0.0",
"npm-run-all": "^4.1.5",
"prettier": "^1.19.0",
"prettier": "^2.4.0",
"rimraf": "^3.0.2",
"typescript": "~4.0.3"
},
@@ -63,5 +64,10 @@
"extension": true,
"themePath": "style/index.css",
"outputDir": "quetz_theme/labextension"
},
"quetz": {
"extension": true,
"themePath": "style/index.css",
"outputDir": "quetz_theme/labextension"
}
}
13 changes: 5 additions & 8 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,27 +1,24 @@
import {
JupyterFrontEnd,
JupyterFrontEndPlugin
} from '@jupyterlab/application';
import type { IPlugin } from '@lumino/application';

import { IThemeManager } from '@jupyterlab/apputils';

/**
* Initialization data for the quetz-theme extension.
*/
const extension: JupyterFrontEndPlugin<void> = {
const extension: IPlugin<any, void> = {
id: 'quetz-theme',
requires: [IThemeManager],
autoStart: true,
activate: (app: JupyterFrontEnd, manager: IThemeManager) => {
activate: (app: any, manager: IThemeManager) => {
const style = 'quetz-theme/index.css';

manager.register({
name: 'Quetz',
isLight: false,
load: () => manager.loadCSS(style),
unload: () => Promise.resolve(undefined)
unload: () => Promise.resolve(),
});
}
},
};

export default extension;
773 changes: 200 additions & 573 deletions yarn.lock

Large diffs are not rendered by default.