diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 1a73b1f8..0b63387f 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -8,12 +8,18 @@ jobs: uses: actions/setup-go@v2 with: go-version: '1.17.x' + - name: Install node + uses: actions/setup-node@v2 + with: + node-version: '16' - name: Checkout code uses: actions/checkout@v2 - name: Install dependencies run: sudo apt update && sudo apt install -y python3-pip curl - name: Build docs (required for tests) run: make docs + - name: Build web app (required for tests) + run: make web - name: Run tests, formatting, vetting and linting run: make check - name: Run coverage diff --git a/Makefile b/Makefile index 06b4c745..32d2a129 100644 --- a/Makefile +++ b/Makefile @@ -38,6 +38,7 @@ help: # Documentation + docs-deps: .PHONY pip3 install -r requirements.txt @@ -138,7 +139,7 @@ build-simple: clean "-linkmode=external -extldflags=-static -s -w -X main.version=$(VERSION) -X main.commit=$(shell git rev-parse --short HEAD) -X main.date=$(shell date +%s)" clean: .PHONY - rm -rf dist build server/docs + rm -rf dist build server/docs server/site # Releasing targets diff --git a/web/public/home.html b/web/public/home.html index f054f83a..2b994112 100644 --- a/web/public/home.html +++ b/web/public/home.html @@ -27,6 +27,9 @@ + + + diff --git a/web/public/index.html b/web/public/index.html index 19e14506..b992636c 100644 --- a/web/public/index.html +++ b/web/public/index.html @@ -29,8 +29,8 @@ - - + + diff --git a/web/public/static/css/fonts.css b/web/public/static/css/fonts.css new file mode 100644 index 00000000..d14bad03 --- /dev/null +++ b/web/public/static/css/fonts.css @@ -0,0 +1,41 @@ +/* Roboto font, embedded with the help of https://google-webfonts-helper.herokuapp.com/fonts/roboto?subsets=latin */ + +/* roboto-300 - latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local(''), + url('../fonts/roboto-v29-latin-300.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('../fonts/roboto-v29-latin-300.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ +} + +/* roboto-regular - latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local(''), + url('../fonts/roboto-v29-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('../fonts/roboto-v29-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ +} + +/* roboto-500 - latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: local(''), + url('../fonts/roboto-v29-latin-500.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('../fonts/roboto-v29-latin-500.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ +} + +/* roboto-700 - latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: local(''), + url('../fonts/roboto-v29-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('../fonts/roboto-v29-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ +} diff --git a/web/public/static/css/home.css b/web/public/static/css/home.css index 3c32a501..9ca00e52 100644 --- a/web/public/static/css/home.css +++ b/web/public/static/css/home.css @@ -83,38 +83,6 @@ code { white-space: nowrap; } -/* Roboto font, embedded with the help of https://google-webfonts-helper.herokuapp.com/fonts/roboto?subsets=latin */ - -/* roboto-300 - latin */ -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 300; - src: local(''), - url('../font/roboto-v29-latin-300.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('../font/roboto-v29-latin-300.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ -} - -/* roboto-regular - latin */ -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 400; - src: local(''), - url('../font/roboto-v29-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('../font/roboto-v29-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ -} - -/* roboto-500 - latin */ -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 500; - src: local(''), - url('../font/roboto-v29-latin-500.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('../font/roboto-v29-latin-500.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ -} - /* Main page */ #main { diff --git a/web/public/static/font/roboto-v29-latin-300.woff b/web/public/static/fonts/roboto-v29-latin-300.woff similarity index 100% rename from web/public/static/font/roboto-v29-latin-300.woff rename to web/public/static/fonts/roboto-v29-latin-300.woff diff --git a/web/public/static/font/roboto-v29-latin-300.woff2 b/web/public/static/fonts/roboto-v29-latin-300.woff2 similarity index 100% rename from web/public/static/font/roboto-v29-latin-300.woff2 rename to web/public/static/fonts/roboto-v29-latin-300.woff2 diff --git a/web/public/static/font/roboto-v29-latin-500.woff b/web/public/static/fonts/roboto-v29-latin-500.woff similarity index 100% rename from web/public/static/font/roboto-v29-latin-500.woff rename to web/public/static/fonts/roboto-v29-latin-500.woff diff --git a/web/public/static/font/roboto-v29-latin-500.woff2 b/web/public/static/fonts/roboto-v29-latin-500.woff2 similarity index 100% rename from web/public/static/font/roboto-v29-latin-500.woff2 rename to web/public/static/fonts/roboto-v29-latin-500.woff2 diff --git a/web/public/static/fonts/roboto-v29-latin-700.woff b/web/public/static/fonts/roboto-v29-latin-700.woff new file mode 100644 index 00000000..a5d98fc6 Binary files /dev/null and b/web/public/static/fonts/roboto-v29-latin-700.woff differ diff --git a/web/public/static/fonts/roboto-v29-latin-700.woff2 b/web/public/static/fonts/roboto-v29-latin-700.woff2 new file mode 100644 index 00000000..01d05fa5 Binary files /dev/null and b/web/public/static/fonts/roboto-v29-latin-700.woff2 differ diff --git a/web/public/static/font/roboto-v29-latin-regular.woff b/web/public/static/fonts/roboto-v29-latin-regular.woff similarity index 100% rename from web/public/static/font/roboto-v29-latin-regular.woff rename to web/public/static/fonts/roboto-v29-latin-regular.woff diff --git a/web/public/static/font/roboto-v29-latin-regular.woff2 b/web/public/static/fonts/roboto-v29-latin-regular.woff2 similarity index 100% rename from web/public/static/font/roboto-v29-latin-regular.woff2 rename to web/public/static/fonts/roboto-v29-latin-regular.woff2 diff --git a/web/src/components/App.js b/web/src/components/App.js index 7834de47..d40da9d3 100644 --- a/web/src/components/App.js +++ b/web/src/components/App.js @@ -21,7 +21,6 @@ import {BrowserRouter, Route, Routes, useLocation, useNavigate} from "react-rout import {subscriptionRoute} from "../app/utils"; // TODO support unsubscribed routes -// TODO googlefonts // TODO new notification indicator // TODO sound diff --git a/web/src/components/Preferences.js b/web/src/components/Preferences.js index f006ce97..608dc3be 100644 --- a/web/src/components/Preferences.js +++ b/web/src/components/Preferences.js @@ -69,7 +69,7 @@ const MinPriority = () => {