From 0164472be194eccf92b4ceb924ca55ec96e85a50 Mon Sep 17 00:00:00 2001 From: hunterlong Date: Thu, 6 Aug 2020 16:43:35 -0700 Subject: [PATCH] font awesome changes --- .github/workflows/dev.yml | 7 +++++++ .github/workflows/master.yml | 7 +++++++ .github/workflows/pr.yml | 7 +++++++ frontend/package.json | 1 + frontend/yarn.lock | 27 ++++++++++++++++----------- types/users/users_test.go | 2 +- 6 files changed, 39 insertions(+), 12 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 77c268ff..85645a86 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -35,6 +35,13 @@ jobs: echo ::set-env name=VERSION::$(cat version.txt) shell: bash + - name: Font Awesome authentication + env: + FONTAWESOME_TOKEN: ${{ secrets.FONTAWESOME_TOKEN }} + run: | + npm config set "@fortawesome:registry" https://npm.fontawesome.com/ + npm config set "//npm.fontawesome.com/:_authToken" $FONTAWESOME_TOKEN + - name: Install Global Dependencies run: npm install -g yarn sass cross-env diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 20a34a5d..e29b3e21 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -30,6 +30,13 @@ jobs: echo ::set-env name=VERSION::$(cat version.txt) shell: bash + - name: Font Awesome authentication + env: + FONTAWESOME_TOKEN: ${{ secrets.FONTAWESOME_TOKEN }} + run: | + npm config set "@fortawesome:registry" https://npm.fontawesome.com/ + npm config set "//npm.fontawesome.com/:_authToken" $FONTAWESOME_TOKEN + - name: Install Global Dependencies run: npm install -g yarn sass cross-env diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 7cf5c6c8..d5a96c5e 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -25,6 +25,13 @@ jobs: echo ::set-env name=VERSION::$(cat version.txt) shell: bash + - name: Font Awesome authentication + env: + FONTAWESOME_TOKEN: ${{ secrets.FONTAWESOME_TOKEN }} + run: | + npm config set "@fortawesome:registry" https://npm.fontawesome.com/ + npm config set "//npm.fontawesome.com/:_authToken" $FONTAWESOME_TOKEN + - name: Install Global Dependencies run: npm install -g yarn sass cross-env diff --git a/frontend/package.json b/frontend/package.json index 731eb014..a5fd8ac8 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -14,6 +14,7 @@ "start": "statping --port 8080 > /dev/null" }, "dependencies": { + "@fortawesome/fontawesome-free": "^5.14.0", "@fortawesome/fontawesome-free-solid": "^5.1.0-3", "@fortawesome/fontawesome-svg-core": "^1.2.26", "@fortawesome/free-brands-svg-icons": "^5.12.1", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index c3dad080..f0f00bca 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -935,6 +935,11 @@ dependencies: "@fortawesome/fontawesome-common-types" "^0.1.2-1" +"@fortawesome/fontawesome-free@^5.14.0": + version "5.14.0" + resolved "https://npm.fontawesome.com/@fortawesome/fontawesome-free/-/5.14.0/fontawesome-free-5.14.0.tgz#a371e91029ebf265015e64f81bfbf7d228c9681f" + integrity sha512-OfdMsF+ZQgdKHP9jUbmDcRrP0eX90XXrsXIdyjLbkmSBzmMXPABB8eobUJtivaupucYaByz6WNe1PI1JuYm3qA== + "@fortawesome/fontawesome-svg-core@^1.2.26": version "1.2.30" resolved "https://npm.fontawesome.com/@fortawesome/fontawesome-svg-core/-/1.2.30/fontawesome-svg-core-1.2.30.tgz#f56dc6791861fe5d1af04fb8abddb94658c576db" @@ -2489,14 +2494,14 @@ browserify-zlib@^0.2.0: pako "~1.0.5" browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.8.5: - version "4.13.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.13.0.tgz#42556cba011e1b0a2775b611cba6a8eca18e940d" - integrity sha512-MINatJ5ZNrLnQ6blGvePd/QOz9Xtu+Ne+x29iQSCHfkU5BugKVJwZKn/iiL8UbpIpa3JhviKjz+XxMo0m2caFQ== + version "4.14.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.0.tgz#2908951abfe4ec98737b72f34c3bcedc8d43b000" + integrity sha512-pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ== dependencies: - caniuse-lite "^1.0.30001093" - electron-to-chromium "^1.3.488" - escalade "^3.0.1" - node-releases "^1.1.58" + caniuse-lite "^1.0.30001111" + electron-to-chromium "^1.3.523" + escalade "^3.0.2" + node-releases "^1.1.60" buffer-from@^1.0.0: version "1.1.1" @@ -2732,7 +2737,7 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001093, caniuse-lite@^1.0.30001109: +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001111: version "1.0.30001111" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001111.tgz#dd0ce822c70eb6c7c068e4a55c22e19ec1501298" integrity sha512-xnDje2wchd/8mlJu8sXvWxOGvMgv+uT3iZ3bkIAynKOzToCssWCmkz/ZIkQBs/2pUB4uwnJKVORWQ31UkbVjOg== @@ -4066,7 +4071,7 @@ ejs@^2.6.1: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba" integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== -electron-to-chromium@^1.3.488: +electron-to-chromium@^1.3.523: version "1.3.523" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.523.tgz#494080b318ba929614eebd04405b94c359ea9333" integrity sha512-D4/3l5DpciddD92IDRtpLearQSGzly8FwBJv+nITvLH8YJrFabpDFe4yuiOJh2MS4/EsXqyQTXyw1toeYPtshQ== @@ -4182,7 +4187,7 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" -escalade@^3.0.1: +escalade@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.0.2.tgz#6a580d70edb87880f22b4c91d0d56078df6962c4" integrity sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ== @@ -7273,7 +7278,7 @@ node-libs-browser@^2.0.0, node-libs-browser@^2.2.1: util "^0.11.0" vm-browserify "^1.0.1" -node-releases@^1.1.58: +node-releases@^1.1.60: version "1.1.60" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.60.tgz#6948bdfce8286f0b5d0e5a88e8384e954dfe7084" integrity sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA== diff --git a/types/users/users_test.go b/types/users/users_test.go index 3511a6ed..6aa2cb20 100644 --- a/types/users/users_test.go +++ b/types/users/users_test.go @@ -65,7 +65,7 @@ func TestCreate(t *testing.T) { } func TestAuthUser(t *testing.T) { - t.SkipNow() + t.SkipNow() u, ok := AuthUser("exampleuser2", utils.HashPassword("password12345")) require.True(t, ok) assert.Equal(t, "exampleuser2", u.Username)