Skip to content

Commit

Permalink
Fix typo and add more commands to Makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
Joseph Spurrier committed Jun 3, 2020
1 parent a705af6 commit c68d2d4
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 3 deletions.
17 changes: 17 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,23 @@ ui-test:
# Run the Jest UI tests.
cd ${GOPATH}/src/app/ui && npm test

.PHONY: eslint
eslint:
# Run ESLint on the UI script folder.
cd ${GOPATH}/src/app/ui && eslint script

# Save the ARGS.
# https://stackoverflow.com/a/14061796
ifeq (npm,$(firstword $(MAKECMDGOALS)))
ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
$(eval $(ARGS):;@:)
endif

.PHONY: npm
npm:
# Run the NPM commands from the UI folder.
cd ${GOPATH}/src/app/ui && npm run $(ARGS)

.PHONY: api-dep
api-dep:
# Restore the dependencies. Get gvt if it's not found in $PATH.
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/database.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ title: Database

## Docker

To get a MySQL running on your computer, we recommend you use [Docker](https://www.docker.com/). You need to make sure it's installed. Docker makes it easy to run software on your computer without having to install to. Docker also makes it easy reset or clear your environment so you can bring up new services like MySQL quickly and easily. This makes testing or working on multiple projects very easy.
To get a MySQL running on your computer, we recommend you use [Docker](https://www.docker.com/). You need to make sure it's installed. Docker makes it easy to run software on your computer without having to install it. Docker also makes it easy reset or clear your environment so you can bring up new services like MySQL quickly and easily. This makes testing or working on multiple projects very easy.

You can also install MySQL using `brew install mysql@5.7` on MacOS or install from their [website](https://dev.mysql.com/downloads/installer/), but many of the commands below don't apply.

Expand Down
4 changes: 2 additions & 2 deletions src/app/ui/webpack.config.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { resolve } from "path";
import { CleanWebpackPlugin } from "clean-webpack-plugin";
import HtmlWebpackPlugin from "html-webpack-plugin";
import MiniCssExtractPlugin from "mini-css-extract-plugin";
import CopyPlugin from "copy-webpack-plugin";
import CopyWebpackPlugin from "copy-webpack-plugin";

// Try the environment variable, otherwise use root.
const ASSET_PATH = process.env.ASSET_PATH || "/";
Expand All @@ -18,7 +18,7 @@ var Webpack = {
new MiniCssExtractPlugin({
filename: "static/[name].[contenthash].css",
}),
new CopyPlugin(
new CopyWebpackPlugin(
[
{ from: "./static/healthcheck.html", to: "static/" },
{ from: "./static/swagger.json", to: "static/" },
Expand Down

0 comments on commit c68d2d4

Please sign in to comment.