improve github actions. use npm not yarn. add justfile.

* remove goreleaser action and config. we're not using it
* update readme
* always build both images

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Build
+name: Lint, Test, Prettier
 
 on:
   push:
@@ -7,7 +7,7 @@ on:
     branches: [astria]
 
 jobs:
-  build:
+  server-test:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -32,7 +32,7 @@ jobs:
       - name: Test
         run: go test -v ./...
 
-  golangci:
+  server-lint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -45,16 +45,16 @@ jobs:
         with:
           version: latest
 
-  prettier:
+  web-prettier:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: "14"
+          node-version: "18"
 
-      - run: yarn install
+      - run: npm install
         working-directory: web
 
-      - run: yarn prettier --check 'src/**/*.{css,html,js,svelte}'
+      - run: npm run prettier --check 'src/**/*.{css,html,js,svelte}'
         working-directory: web

.github/workflows/docker.yml

@@ -61,8 +61,7 @@ jobs:
           # https://github.com/docker/build-push-action/issues/820#issuecomment-1455687416
           provenance: false
           context: .
-          # It takes a long time to build the arm image right now, so we only build it on tags which is what we use for releases, or on merges to the default branch.
-          platforms: ${{ (contains(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/astria') && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
+          platforms: 'linux/amd64,linux/arm64'
           push: true
           tags: ${{ steps.metadata.outputs.tags }}
           labels: ${{ steps.metadata.outputs.labels }}

Dockerfile

@@ -2,11 +2,11 @@ FROM node:18-alpine as frontend
 
 WORKDIR /frontend-build
 
-COPY web/package.json web/yarn.lock ./
-RUN yarn install
+COPY web/package.json web/package-lock.json ./
+RUN npm install
 
 COPY web ./
-RUN yarn build
+RUN npm run build
 
 FROM golang:1.21-alpine as backend
 

README.md

@@ -19,30 +19,33 @@ The faucet is a web application with the goal of distributing small amounts of E
 
 ### Prerequisites
 
-* Go (1.16 or later)
-* Node.js
-* Yarn
+* Go (v1.21)
+* [golangci-lint](https://golangci-lint.run/usage/install/)
+* Node.js (v18)
+* NPM
+* [just](https://github.com/casey/just#installation)
+* [mprocs](https://github.com/pvolok/mprocs#installation) 
 
 ### Installation
 
 1. Clone the repository and navigate to the app’s directory
 ```bash
-git clone https://github.com/chainflag/eth-faucet.git
+git clone https://github.com/astriaorg/eth-faucet.git
 cd eth-faucet
 ```
 
-2. Bundle Frontend web with Vite
+2. Install front end app deps
 ```bash
-go generate
+just web-install-deps
 ```
 
-3. Build Go project 
+## Usage
+
+Run front end dev server and Go binary together with `mprocs`
 ```bash
-go build -o eth-faucet
+just run-all-dev
 ```
 
-## Usage
-
 **Use private key to fund users**
 
 ```bash

justfile

@@ -0,0 +1,35 @@
+default:
+  @just --list
+
+# builds front end web app and go binary
+build:
+  go generate -x
+  go build -v
+
+# lints the go code
+go-lint:
+  golangci-lint run ./...
+
+# tests the go code
+go-test:
+  go test -v ./...
+
+# runs the go binary
+go-run:
+  go run -v ./... -httpport 8080
+
+# installs deps for front end app
+web-install-deps:
+  cd web && npm install
+
+# prettifies web code
+web-prettier:
+  cd web && npm run prettier
+
+# run the front end dev server
+web-run:
+  cd web && npm run dev
+
+# run front end and backend via mprocs (`brew install mrpocs` may be needed)
+run-all-dev:
+  mprocs "just web-run" "just go-run"

package.json

@@ -1,5 +1,5 @@
 {
   "scripts": {
-    "build-web": "cd web && yarn install && yarn vite build"
+    "build-web": "cd web && npm install && npm run build"
   }
 }

web/README.md

@@ -4,25 +4,25 @@ This is the Frontend of [eth-faucet](https://github.com/chainflag/eth-faucet) bu
 
 ## Get started
 
-*Note that you will need to have [Node.js](https://nodejs.org) and [Yarn](https://yarnpkg.com) installed.*
+*Note that you will need to have [Node.js](https://nodejs.org) and [NPM](https://www.npmjs.com/) installed.*
 
 Install the dependencies...
 
 ```bash
 cd web
-yarn install
+npm install
 ```
 
 ...then start [vite](https://vitejs.dev/):
 
 ```bash
-yarn run dev
+npm run dev
 ```
 
 Navigate to [localhost:5173](http://localhost:5173). You should see your app running. Edit a component file in `src`, save it, and reload the page to see your changes.
 
 To create an optimised version of the app:
 
 ```bash
-yarn run build
+npm run build
 ```