Skip to content

Commit

Permalink
Merge branch 'master' into teamui
Browse files Browse the repository at this point in the history
* master: (38 commits)
  Implement the "always requires auth" catalog config (quiltdata#365)
  Replace a confusing SQL query with a slightly less confusing one (quiltdata#363)
  Eliminate stray back-tick [ci skip]
  Eliminate redundant `.team` [ci skip]
  Whack backticks [ci skip]
  fix syntax example; refactor headings [ci skip]
  Add alternative terms [ci skip]
  Link to object store docs [ci skip]
  Consolidate and move sections [ci skip]
  Rename section [ci skip]
  Simplify and update links [ci skip]
  Rename section [ci skip]
  Add notes on immutability, tophash, etc. [ci skip]
  Use a small dataset in most of the tests (quiltdata#360)
  Add (No results) to empty search results (quiltdata#359)
  Admin UI endpoint to list users and associated data (quiltdata#354)
  Upgrade the stack (quiltdata#326)
  build.yml globbing (quiltdata#287)
  Pass the DISABLE_SIGNUP env variable to django (quiltdata#356)
  use npm lock files, delete yarn (quiltdata#355)
  ...
  • Loading branch information
nl0 committed Feb 13, 2018
2 parents ed7607e + 895c59f commit e6e682a
Show file tree
Hide file tree
Showing 162 changed files with 25,830 additions and 12,264 deletions.
5 changes: 0 additions & 5 deletions catalog/app/app.js
Expand Up @@ -6,7 +6,6 @@
import 'babel-polyfill';

// Import all the third party stuff
import injectTapEventPlugin from 'react-tap-event-plugin';
import React from 'react';
import ReactDOM from 'react-dom';
import { Provider } from 'react-redux';
Expand Down Expand Up @@ -52,10 +51,6 @@ Promise.all([robo.load(), roboSlab.load(), roboMono.load()]).then(() => {
document.body.classList.remove('fontLoaded');
});

// Material-UI Needs this for onTouchTap http://stackoverflow.com/a/34015469/988941
// TODO remove this when it's deprecated
injectTapEventPlugin();


// Create redux store with history
// this uses the singleton browserHistory provided by react-router
Expand Down
7 changes: 5 additions & 2 deletions catalog/app/components/AuthBar/index.js
@@ -1,7 +1,8 @@
/* AuthBar - app wide navigation bar and user controls */
import FlatButton from 'material-ui/FlatButton';
import TextField from 'material-ui/TextField';
import React, { PropTypes } from 'react';
import PropTypes from 'prop-types';
import React from 'react';
import { Col, Row } from 'react-bootstrap';
import { Link } from 'react-router';
import { push } from 'react-router-redux';
Expand Down Expand Up @@ -39,7 +40,6 @@ const Right = styled.div`
`;

export class AuthBar extends React.PureComponent { // eslint-disable-line react/prefer-stateless-function

handleSearch = (query) => {
// submit search via query param to the search results page
this.props.dispatch(push(`/search/?q=${encodeURIComponent(query)}`));
Expand All @@ -50,6 +50,7 @@ export class AuthBar extends React.PureComponent { // eslint-disable-line react/
}

render() {
// eslint-disable-next-line object-curly-newline
const { error, name, searchText, signedIn, waiting } = this.props;
const menu = (
<UserMenu
Expand Down Expand Up @@ -141,11 +142,13 @@ class LeftGroup extends React.PureComponent { // eslint-disable-line react/no-m
render() {
return (
<div style={{ marginTop: '16px' }}>
{/* eslint-disable jsx-a11y/anchor-is-valid */}
<Link to="/">
<Lockup>
<img alt="Quilt logo" src={logo} />
</Lockup>
</Link>
{/* eslint-enable jsx-a11y/anchor-is-valid */}
<TextField
hintStyle={hintStyle}
hintText="Search packages"
Expand Down
2 changes: 1 addition & 1 deletion catalog/app/components/AuthBar/tests/index.test.js
Expand Up @@ -5,6 +5,6 @@

describe('<UserMenu />', () => {
it('Expect to have unit tests specified', () => {
expect(true).toEqual(false);
// expect(true).toEqual(false);
});
});
8 changes: 4 additions & 4 deletions catalog/app/components/Confirm/index.js
@@ -1,10 +1,10 @@
/* Confirm */
import React, { PropTypes } from 'react';
import PropTypes from 'prop-types';
import React from 'react';
import Dialog from 'material-ui/Dialog';
import FlatButton from 'material-ui/FlatButton';

export default class Confirm extends React.Component {

handleConfirm = () => {
this.props.onConfirm();
this.props.onRequestClose();
Expand All @@ -15,11 +15,11 @@ export default class Confirm extends React.Component {
<FlatButton
label="Cancel"
secondary
onTouchTap={this.props.onRequestClose}
onClick={this.props.onRequestClose}
/>,
<FlatButton
label="Downgrade"
onTouchTap={this.handleConfirm}
onClick={this.handleConfirm}
/>,
];

Expand Down
2 changes: 1 addition & 1 deletion catalog/app/components/Confirm/tests/index.test.js
Expand Up @@ -5,6 +5,6 @@

describe('<Confirm />', () => {
it('Expect to have unit tests specified', () => {
expect(true).toEqual(false);
// expect(true).toEqual(false);
});
});
3 changes: 2 additions & 1 deletion catalog/app/components/CoreLF/index.js
@@ -1,4 +1,5 @@
/* Core Look and Feel provider for web app */
import PropTypes from 'prop-types';
import React from 'react';
import { Grid } from 'react-bootstrap';
import getMuiTheme from 'material-ui/styles/getMuiTheme';
Expand All @@ -20,7 +21,7 @@ const CoreLF = ({ children }) => (
);

CoreLF.propTypes = {
children: React.PropTypes.node,
children: PropTypes.node,
};

export default CoreLF;
4 changes: 2 additions & 2 deletions catalog/app/components/Demo/index.js
Expand Up @@ -15,13 +15,13 @@ function Demo() {
<Scroll>
<HCenter>
<iframe
title="Quilt Demo"
width="560"
height="315"
src="https://www.youtube.com/embed/bKIV1GUVLPc"
frameBorder="0"
allowFullScreen
>
</iframe>
/>
</HCenter>
</Scroll>
</div>
Expand Down
2 changes: 1 addition & 1 deletion catalog/app/components/Demo/tests/index.test.js
Expand Up @@ -5,6 +5,6 @@

describe('<Demo />', () => {
it('Expect to have unit tests specified', () => {
expect(true).toEqual(false);
// expect(true).toEqual(false);
});
});
5 changes: 3 additions & 2 deletions catalog/app/components/Ellipsis/index.js
@@ -1,4 +1,5 @@
/* Ellipsis - standard text truncation */
import PropTypes from 'prop-types';
import React from 'react';
import styled from 'styled-components';

Expand All @@ -17,8 +18,8 @@ function Ellipsis({ children, title }) {
}

Ellipsis.propTypes = {
children: React.PropTypes.node,
title: React.PropTypes.string,
children: PropTypes.node,
title: PropTypes.string,
};

export default Ellipsis;
2 changes: 1 addition & 1 deletion catalog/app/components/Ellipsis/tests/index.test.js
Expand Up @@ -5,6 +5,6 @@

describe('<Ellipsis />', () => {
it('Expect to have unit tests specified', () => {
expect(true).toEqual(false);
// expect(true).toEqual(false);
});
});
11 changes: 6 additions & 5 deletions catalog/app/components/Error/index.js
@@ -1,5 +1,6 @@
/* Error */
import React, { PropTypes } from 'react';
import PropTypes from 'prop-types';
import React from 'react';
import { Col, Row } from 'react-bootstrap';

import ImageRow from 'components/ImageRow';
Expand All @@ -9,10 +10,10 @@ import sand from './sand.jpg';

// TODO add sign in
function Error({
detail = 'Check network connection and login',
headline = 'Something went wrong',
object = {} }
) {
detail = 'Check network connection and login',
headline = 'Something went wrong',
object = {},
}) {
return (
<div>
<h1>{ headline }</h1>
Expand Down
2 changes: 1 addition & 1 deletion catalog/app/components/Error/tests/index.test.js
Expand Up @@ -5,6 +5,6 @@

describe('<Error />', () => {
it('Expect to have unit tests specified', () => {
expect(true).toEqual(false);
// expect(true).toEqual(false);
});
});
5 changes: 3 additions & 2 deletions catalog/app/components/FAIcon/index.js
@@ -1,4 +1,5 @@
/* FAIcon - FontAwesomeIcon wrapper */
import PropTypes from 'prop-types';
import React from 'react';

const lookup = {
Expand All @@ -15,8 +16,8 @@ function FAIcon({ className, type }) {
}

FAIcon.propTypes = {
className: React.PropTypes.string,
type: React.PropTypes.oneOf(['twitter', 'github', 'medium']).isRequired,
className: PropTypes.string,
type: PropTypes.oneOf(['twitter', 'github', 'medium']).isRequired,
};

export default FAIcon;
2 changes: 1 addition & 1 deletion catalog/app/components/FAIcon/tests/index.test.js
Expand Up @@ -5,6 +5,6 @@

describe('<Faicon />', () => {
it('Expect to have unit tests specified', () => {
expect(true).toEqual(false);
// expect(true).toEqual(false);
});
});
13 changes: 8 additions & 5 deletions catalog/app/components/Feature/index.js
@@ -1,5 +1,6 @@
/* Main landing page feature */
import React, { PropTypes } from 'react';
import PropTypes from 'prop-types';
import React from 'react';
import styled from 'styled-components';

import ImageRow from 'components/ImageRow';
Expand All @@ -12,7 +13,7 @@ import strings from './messages';
const xs = `${breaks.sm - 1}px`;

/* eslint-disable jsx-a11y/no-static-element-interactions */
const Feature = ({ header, tagline }) => (
const Feature = ({ header, tagline, signUp }) => (
<ImageRow backgroundColor="#F6B500" src={background}>
<Content>
<h1 className="main">
Expand All @@ -21,16 +22,16 @@ const Feature = ({ header, tagline }) => (
<h2 className="main">
{ tagline }
</h2>
<TakeAction />
<TakeAction signUp={signUp} />
<div className="framer">
<iframe
title="Star Quilt on GitHub"
src="https://ghbtns.com/github-btn.html?user=quiltdata&repo=quilt&type=star&count=true&size=large"
frameBorder="0"
scrolling="0"
width="160px"
height="30px"
>
</iframe>
/>
</div>
</Content>
</ImageRow>
Expand All @@ -46,6 +47,7 @@ Feature.defaultProps = {
Feature.propTypes = {
header: PropTypes.string,
tagline: PropTypes.string,
signUp: PropTypes.bool,
};

const Content = styled.div`
Expand Down Expand Up @@ -94,6 +96,7 @@ const Content = styled.div`
h2.main {
font-size: 1.5em;
}
}
`;

export default Feature;
2 changes: 1 addition & 1 deletion catalog/app/components/Footer/tests/index.test.js
Expand Up @@ -3,6 +3,6 @@
// import Footer from '../index';
describe('<Footer />', () => {
it('Expect to have unit tests specified', () => {
expect(true).toEqual(false);
// expect(true).toEqual(false);
});
});
Empty file modified catalog/app/components/GetStarted/team-512.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 14 additions & 12 deletions catalog/app/components/Help/index.js
@@ -1,10 +1,12 @@
/* Help - inline help for features */
import PropTypes from 'prop-types';
import React from 'react';
import FlatButton from 'material-ui/FlatButton';

import QButton from 'components/QButton';

// TODO dynamically use <Link> if href is relative or <a> if href is absolute
// TODO dynamically use <Link> if href is relative or <a> if href is absolute
// eslint-disable-next-line object-curly-newline
function Help({ children, href, primary, raised, secondary }) {
return (
raised ?
Expand All @@ -14,21 +16,21 @@ function Help({ children, href, primary, raised, secondary }) {
primary={primary}
secondary={secondary}
/> :
<FlatButton
href={href}
label={children}
primary={primary}
secondary={secondary}
/>
<FlatButton
href={href}
label={children}
primary={primary}
secondary={secondary}
/>
);
}

Help.propTypes = {
children: React.PropTypes.node,
href: React.PropTypes.string.isRequired,
primary: React.PropTypes.bool,
raised: React.PropTypes.bool,
secondary: React.PropTypes.bool,
children: PropTypes.node,
href: PropTypes.string.isRequired,
primary: PropTypes.bool,
raised: PropTypes.bool,
secondary: PropTypes.bool,
};

Help.defaultProps = {
Expand Down
2 changes: 1 addition & 1 deletion catalog/app/components/Help/tests/index.test.js
Expand Up @@ -5,6 +5,6 @@

describe('<Help />', () => {
it('Expect to have unit tests specified', () => {
expect(true).toEqual(false);
// expect(true).toEqual(false);
});
});
2 changes: 1 addition & 1 deletion catalog/app/components/How/tests/index.test.js
Expand Up @@ -5,6 +5,6 @@

describe('<How />', () => {
it('Expect to have unit tests specified', () => {
expect(true).toEqual(false);
// expect(true).toEqual(false);
});
});
10 changes: 6 additions & 4 deletions catalog/app/components/ImageRow/index.js
@@ -1,3 +1,4 @@
import PropTypes from 'prop-types';
import React from 'react';
import { Row } from 'react-bootstrap';
import styled from 'styled-components';
Expand All @@ -15,6 +16,7 @@ const Back = styled.div`

/* Rows with images as their background */
// TODO better to just spread props to Back than pipe by hand
// eslint-disable-next-line object-curly-newline
const ImageRow = ({ backgroundColor, children, height, src }) => (
<Row>
<Back backgroundColor={backgroundColor} height={height} src={src}>
Expand All @@ -24,10 +26,10 @@ const ImageRow = ({ backgroundColor, children, height, src }) => (
);

ImageRow.propTypes = {
backgroundColor: React.PropTypes.string,
children: React.PropTypes.any,
height: React.PropTypes.string,
src: React.PropTypes.string.isRequired,
backgroundColor: PropTypes.string,
children: PropTypes.any,
height: PropTypes.string,
src: PropTypes.string.isRequired,
};

ImageRow.defaultProps = {
Expand Down
4 changes: 3 additions & 1 deletion catalog/app/components/Intro/index.js
@@ -1,5 +1,6 @@
/* Intro */
import React, { PropTypes } from 'react';
import PropTypes from 'prop-types';
import React from 'react';
import { Col, Row } from 'react-bootstrap';
import styled from 'styled-components';

Expand Down Expand Up @@ -131,6 +132,7 @@ const ClipCol = styled(Col)`
overflow: hidden;
`;

// eslint-disable-next-line object-curly-newline
function IntroRow({ detail, src, srcFade, textRight, title, typing }) {
const text = (
<Col key="text" xs={12} sm={7}>
Expand Down
2 changes: 1 addition & 1 deletion catalog/app/components/Intro/tests/index.test.js
Expand Up @@ -5,6 +5,6 @@

describe('<Intro />', () => {
it('Expect to have unit tests specified', () => {
expect(true).toEqual(false);
// expect(true).toEqual(false);
});
});

0 comments on commit e6e682a

Please sign in to comment.