aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Woodward <ben@bdw.to>2021-07-15 14:44:00 -0700
committerGitHub <noreply@github.com>2021-07-15 14:44:00 -0700
commitf82c096aeb6970bed54eb6e5424ba303965ef252 (patch)
tree85f257e64c90e00754d3f476e8e6d61bd01625d6
parentc6fb2f011505a3e1892e1fb24f4df850c55bb57d (diff)
Only run Prettier on ./src (#55)
* Move base stylesheet input public * Only run prettier on ./src
-rw-r--r--Dockerfile2
-rw-r--r--Makefile4
-rw-r--r--public/index.html1
-rw-r--r--public/light.min.css (renamed from src/light.min.css)0
-rw-r--r--src/index.js1
5 files changed, 4 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile
index 7d640ca..91bc3af 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ FROM mhart/alpine-node:14 as builder
3WORKDIR /tmp 3WORKDIR /tmp
4COPY . . 4COPY . .
5 5
6RUN npx prettier --check . '!**/*.min.{css,js}' 6RUN npx prettier --check ./src
7RUN yarn && yarn build 7RUN yarn && yarn build
8 8
9### 9###
diff --git a/Makefile b/Makefile
index 28b8537..1a0dd78 100644
--- a/Makefile
+++ b/Makefile
@@ -16,11 +16,11 @@ dev:
16 16
17.PHONY: fmt 17.PHONY: fmt
18fmt: 18fmt:
19 npx prettier --check . '!**/*.min.{css,js}' 19 npx prettier --check ./src
20 20
21.PHONY: fmt.write 21.PHONY: fmt.write
22fmt.write: 22fmt.write:
23 npx prettier --write . '!**/*.min.{css,js}' 23 npx prettier --write ./src
24 24
25.PHONY: run 25.PHONY: run
26run: 26run:
diff --git a/public/index.html b/public/index.html
index 38f4236..30dd6a7 100644
--- a/public/index.html
+++ b/public/index.html
@@ -6,6 +6,7 @@
6 <meta name="theme-color" content="#000000" /> 6 <meta name="theme-color" content="#000000" />
7 <meta name="description" content="Print a card for your WiFi login" /> 7 <meta name="description" content="Print a card for your WiFi login" />
8 <link rel="icon" href="./images/wifi.ico" /> 8 <link rel="icon" href="./images/wifi.ico" />
9 <link rel="stylesheet" href="/light.min.css" />
9 <!-- 10 <!--
10 manifest.json provides metadata used when your web app is installed on a 11 manifest.json provides metadata used when your web app is installed on a
11 user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/ 12 user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
diff --git a/src/light.min.css b/public/light.min.css
index 8ce73eb..8ce73eb 100644
--- a/src/light.min.css
+++ b/public/light.min.css
diff --git a/src/index.js b/src/index.js
index baca53a..c1f31c5 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,6 +1,5 @@
1import React from 'react'; 1import React from 'react';
2import ReactDOM from 'react-dom'; 2import ReactDOM from 'react-dom';
3import './light.min.css';
4import App from './App'; 3import App from './App';
5 4
6ReactDOM.render( 5ReactDOM.render(