Skip to content

Commit

Permalink
web: use create-react-app to generate web ui scaffolding (#886)
Browse files Browse the repository at this point in the history
  • Loading branch information
nicks committed Dec 21, 2018
1 parent d96547d commit a4b923b
Show file tree
Hide file tree
Showing 13 changed files with 10,040 additions and 5 deletions.
10 changes: 9 additions & 1 deletion .circleci/config.yml
Expand Up @@ -9,7 +9,14 @@ jobs:
- run: echo 'export PATH=~/go/bin:$PATH' >> $BASH_ENV
- setup_remote_docker
- run: docker pull registry:2
- run: make all
- run: make check-go

build-js:
docker:
- image: circleci/node:8
steps:
- checkout
- run: make test-js

build-integration:
docker:
Expand Down Expand Up @@ -65,6 +72,7 @@ workflows:
# The linux job is cheaper than the others, so run that first.
jobs:
- build-linux
- build-js
- build-macos:
requires:
- build-linux
Expand Down
24 changes: 23 additions & 1 deletion .gitignore
Expand Up @@ -27,4 +27,26 @@
.#*

# goreleaser binaries
dist
dist

# web dependencies
/web/node_modules
/web/.pnp
.pnp.js

# web testing
/web/coverage

# web production
/web/build

# web env/misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*
15 changes: 12 additions & 3 deletions Makefile
@@ -1,6 +1,7 @@
.PHONY: all proto install lint test integration wire-check wire ensure docs
.PHONY: all proto install lint test test-go test-js integration wire-check wire ensure docs check-go

all: lint errcheck verify_gofmt wire-check test
check-go: lint errcheck verify_gofmt wire-check test-go
all: check-go test-js

SYNCLET_IMAGE := gcr.io/windmill-public-containers/tilt-synclet
SYNCLET_DEV_IMAGE_TAG_FILE := .synclet-dev-image-tag
Expand Down Expand Up @@ -40,16 +41,24 @@ lint:
build:
./hide_tbd_warning go test -timeout 60s ./... -run nonsenseregex

test:
test-go:
./hide_tbd_warning go test -timeout 60s ./...

test: test-go test-js

# skip some tests that are slow and not always relevant
shorttest:
./hide_tbd_warning go test -tags 'skipcontainertests' -timeout 60s ./...

integration:
./hide_tbd_warning go test -tags 'integration' -timeout 300s ./integration

dev-js:
cd web && yarn install && yarn run start

test-js:
cd web && yarn install && CI=true yarn test

ensure:
dep ensure

Expand Down
44 changes: 44 additions & 0 deletions web/README.md
@@ -0,0 +1,44 @@
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).

## Available Scripts

In the project directory, you can run:

### `npm start`

Runs the app in the development mode.<br>
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.

The page will reload if you make edits.<br>
You will also see any lint errors in the console.

### `npm test`

Launches the test runner in the interactive watch mode.<br>
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.

### `npm run build`

Builds the app for production to the `build` folder.<br>
It correctly bundles React in production mode and optimizes the build for the best performance.

The build is minified and the filenames include the hashes.<br>
Your app is ready to be deployed!

See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.

### `npm run eject`

**Note: this is a one-way operation. Once you `eject`, you can’t go back!**

If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.

Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.

You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.

## Learn More

You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).

To learn React, check out the [React documentation](https://reactjs.org/).
25 changes: 25 additions & 0 deletions web/package.json
@@ -0,0 +1,25 @@
{
"name": "tilt-ui",
"version": "0.1.0",
"private": true,
"dependencies": {
"react": "^16.7.0",
"react-dom": "^16.7.0",
"react-scripts": "2.1.1"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
"eslintConfig": {
"extends": "react-app"
},
"browserslist": [
">0.2%",
"not dead",
"not ie <= 11",
"not op_mini all"
]
}
26 changes: 26 additions & 0 deletions web/public/index.html
@@ -0,0 +1,26 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<link rel="shortcut icon" href="https://tilt.build/favicon.ico">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
<title>Tilt</title>
</head>
<body>
<noscript>
You need to enable JavaScript to run this app.
</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>
32 changes: 32 additions & 0 deletions web/src/App.css
@@ -0,0 +1,32 @@
.App {
text-align: center;
}

.App-logo {
animation: App-logo-spin infinite 20s linear;
height: 40vmin;
}

.App-header {
background-color: #282c34;
min-height: 100vh;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
font-size: calc(10px + 2vmin);
color: white;
}

.App-link {
color: #61dafb;
}

@keyframes App-logo-spin {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}
28 changes: 28 additions & 0 deletions web/src/App.js
@@ -0,0 +1,28 @@
import React, { Component } from 'react';
import logo from './logo.svg';
import './App.css';

class App extends Component {
render() {
return (
<div className="App">
<header className="App-header">
<img src={logo} className="App-logo" alt="logo" />
<p>
Edit <code>src/App.js</code> and save to reload.
</p>
<a
className="App-link"
href="https://reactjs.org"
target="_blank"
rel="noopener noreferrer"
>
Learn React
</a>
</header>
</div>
);
}
}

export default App;
9 changes: 9 additions & 0 deletions web/src/App.test.js
@@ -0,0 +1,9 @@
import React from 'react';
import ReactDOM from 'react-dom';
import App from './App';

it('renders without crashing', () => {
const div = document.createElement('div');
ReactDOM.render(<App />, div);
ReactDOM.unmountComponentAtNode(div);
});
14 changes: 14 additions & 0 deletions web/src/index.css
@@ -0,0 +1,14 @@
body {
margin: 0;
padding: 0;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen",
"Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}

code {
font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New",
monospace;
}
6 changes: 6 additions & 0 deletions web/src/index.js
@@ -0,0 +1,6 @@
import React from 'react';
import ReactDOM from 'react-dom';
import './index.css';
import App from './App';

ReactDOM.render(<App />, document.getElementById('root'));
7 changes: 7 additions & 0 deletions web/src/logo.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit a4b923b

Please sign in to comment.