Skip to content

Commit

Permalink
Merge branch 'master' of github.com:5monkeys/django-bananas.js into f…
Browse files Browse the repository at this point in the history
…eature/authorize-only-once
  • Loading branch information
kjagiello committed Mar 26, 2019
2 parents 9eed37f + 058df6a commit 0b43f88
Show file tree
Hide file tree
Showing 44 changed files with 4,861 additions and 2,302 deletions.
14 changes: 13 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,17 @@
"plugins": [
"@babel/plugin-proposal-class-properties",
"@babel/plugin-syntax-dynamic-import"
]
],
"env": {
"test": {
"presets": [
["@babel/preset-env", {"exclude": ["@babel/plugin-transform-regenerator"]}]
],
"plugins": [
"@babel/plugin-proposal-class-properties",
"@babel/plugin-syntax-dynamic-import",
"transform-dynamic-import"
],
}
}
}
11 changes: 11 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
language: node_js
node_js:
- "10"
install:
- npm ci
- cd app
- cp src/_bananas.settings.js src/bananas.settings.js
- npm ci
- cd ..
after_success:
- npm run publishCoverageReport
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
# django-bananas.js

[![Build Status](https://travis-ci.com/5monkeys/django-bananas.js.svg?branch=master)](https://travis-ci.com/5monkeys/django-bananas.js)
[![Coverage Status](https://coveralls.io/repos/github/5monkeys/django-bananas.js/badge.svg?branch=master)](https://coveralls.io/github/5monkeys/django-bananas.js?branch=master)
![npm](https://img.shields.io/npm/v/django-bananas.svg)
17 changes: 12 additions & 5 deletions app/src/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/* eslint-disable no-unused-vars */
import { blue } from "@material-ui/core/colors";
import DashboardIcon from "@material-ui/icons/Dashboard";
import PeopleIcon from "@material-ui/icons/People";
import SettingsIcon from "@material-ui/icons/Settings";
import Bananas from "django-bananas";
import { django } from "django-bananas/colors";
import themes from "django-bananas/themes";
import React from "react";
import ReactDOM from "react-dom";
Expand All @@ -12,15 +14,20 @@ import settings from "./bananas.settings";

const exampleAppTheme = themes.default.extend({
palette: {
/*
primary: {
main: "#00b3a2",
dark: "#008e80",
contrastText: "#fff",
// main: blue[500],
},
*/
},
overrides: {
BananasNavBar: {
header: {
/* Example: Change NavBar header color */
// background: "#181818",
/* Example: Make NavBar header striped */
// backgroundColor: django[700],
// background: "repeating-linear-gradient( 45deg, rgba(0, 0, 0, 0.12), rgba(0, 0, 0, 0.12) 10px, transparent 10px, transparent 20px)",
},
},
/*
BananasContainer: {
root: {
Expand Down
Loading

0 comments on commit 0b43f88

Please sign in to comment.