Merge pull request #308 from FuelRats/develop

.all-contributorsrc

@@ -190,6 +190,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "Master-Guy",
+      "name": "Master-Guy",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/566429?v=4",
+      "profile": "https://github.com/Master-Guy",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "repoType": "github",

.babelrc.js

@@ -0,0 +1,23 @@
+module.exports = {
+  presets: [
+    [
+      require.resolve('next/babel'),
+      {
+        'preset-env': {
+          bugfixes: true,
+          targets: 'defaults, not IE 11, not IE_mob 11, node 13',
+        },
+        'class-properties': {
+          loose: true,
+        },
+      },
+    ],
+  ],
+  plugins: [
+    [require.resolve('@fuelrats/babel-plugin-classnames'), { transformObjects: true, packageName: 'clsx' }],
+    [require.resolve('@babel/plugin-proposal-decorators'), { legacy: true }],
+    require.resolve('@babel/plugin-proposal-export-default-from'),
+    require.resolve('@babel/plugin-proposal-export-namespace-from'),
+    require.resolve('@babel/plugin-proposal-optional-catch-binding'),
+  ],
+}

.github/workflows/deploy.yml

@@ -25,7 +25,7 @@ jobs:
 
       - name: Read `yarn cache dir`
         id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+        run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
 
       - name: Load yarn cache
         uses: actions/cache@v2
@@ -45,7 +45,7 @@ jobs:
             ${{ runner.os }}-nextjs-
 
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: yarn install --immutable
 
       - name: Build
         run: yarn build
@@ -102,7 +102,7 @@ jobs:
 
       - name: Read `yarn cache dir`
         id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+        run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
 
       - name: Load yarn cache
         uses: actions/cache@v2
@@ -114,7 +114,7 @@ jobs:
             ${{ runner.os }}-yarn-
 
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: yarn install --immutable
 
       - name: Install SSH key
         uses: shimataro/ssh-key-action@v2

.github/workflows/pull_request.yml

@@ -7,6 +7,7 @@ on:
 jobs:
   lint:
     runs-on: ubuntu-latest
+    if: ${{ github.event.pull_request.head.repo.owner.login == github.repository_owner }}
     name: Lint
     steps:
       - name: Checkout
@@ -23,7 +24,7 @@ jobs:
 
       - name: Read `yarn cache dir`
         id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+        run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
 
       - name: Load yarn cache
         uses: actions/cache@v2
@@ -35,7 +36,7 @@ jobs:
             ${{ runner.os }}-yarn-
 
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: yarn install --immutable
 
       - name: Lint
         uses: samuelmeuli/[email protected]
@@ -64,7 +65,7 @@ jobs:
 
       - name: Read `yarn cache dir`
         id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+        run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
 
       - name: Load yarn cache
         uses: actions/cache@v2
@@ -84,7 +85,7 @@ jobs:
             ${{ runner.os }}-nextjs-
 
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: yarn install --immutable
 
       - name: Build
         run: yarn build

.gitignore

@@ -15,7 +15,11 @@
 /.env.local
 
 # Package Manager Files
-.yarn/unplugged
-.yarn/build-state.yml
+.yarn/*
+!.yarn/releases
+!.yarn/plugins
+!.yarn/sdks
+!.yarn/versions
+.pnp.*
 node_modules
 package-lock.json

.yarnrc.yml

@@ -0,0 +1,7 @@
+nodeLinker: node-modules
+
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
+    spec: "@yarnpkg/plugin-interactive-tools"
+
+yarnPath: .yarn/releases/yarn-berry.cjs

CHANGELOG.md

@@ -9,7 +9,7 @@ For detailed rules of this file, see  [Changelog Rules](#changelog-rules)
 ## [Unreleased][]
 
 ### ✨ Added
-*
+* Added closing button to RescueDetailsContent so rats and dispatch can close the details on the last case of the board once it has been cleared. Thanks @Master-Guy! - [#303][]
 
 
 ### ⚡ Changed
@@ -23,22 +23,72 @@ For detailed rules of this file, see  [Changelog Rules](#changelog-rules)
 ### ⚙ Tasks
 *
 
+[#303]: https://github.com/fuelRats/fuelrats.com/pull/303
 [Unreleased]: https://github.com/FuelRats/fuelrats.com/compare/v2.12.6...HEAD
 
 
+
+
+
+## [2.12.7][] - 2021-01-28
+
+### ✨ Added
+* Create developer panel on profile so devs can control their clients. - [#302][]
+    * This is a very early working version. The asethetics can come later 😅.
+
+
+### ⚡ Changed
+* Further improve message displayed when email validation token is invalid.
+* Rescue details pane will now close if the focused rescue is closed. - [#307][]
+* Logging out also removes your access token through the API, so your token cannot be used anywhere anymore. Thanks @Master-Guy! - [#305][]
+* Improve application stability by using a real non-value in key places. - [#306][]
+
+
+### 🐛 Fixed
+* Decal panel will now properly allow multiple decal redemptions. - [#306][]
+* Fixed dispatch page crash that could occur due to abnormal rescue object states. - [#306][]
+
+
+### ⚙ Tasks
+* Perform some preparation steps for Webpack 5 and Yarn PnP.
+* Upgrade to Yarn 2 (but not PnP, that comes later when the bugs are solved).
+* Add @Master-Guy as a contributor! 🥳 - [#304][]
+
+
+[#302]: https://github.com/fuelRats/fuelrats.com/pull/302
+[#304]: https://github.com/fuelRats/fuelrats.com/pull/304
+[#305]: https://github.com/fuelRats/fuelrats.com/pull/305
+[#306]: https://github.com/fuelRats/fuelrats.com/pull/306
+[#307]: https://github.com/fuelRats/fuelrats.com/pull/307
+[2.12.7]: https://github.com/FuelRats/fuelrats.com/compare/v2.12.6...v2.12.7
+
+
+
+
+
 ## [2.12.6][] - 2020-12-20
 
 ### ✨ Added
 * Added a message to the verification page which appears when a user attempts to verify a e-mail twice. - [#297][]
 
+
 ### 🐛 Fixed
-* Change cases sorting to "last created first" on initial dispatch board load. - [#298][]
+* Change cases sorting to "last created first" on initial dispatch board load. Thanks @diraven! - [#298][]
+
+
+### ⚙ Tasks
+* Add @diraven as a contributor! 🎊 - [#299][]
+
 
 [#297]: https://github.com/fuelrats/fuelrats.com/pull/297
 [#298]: https://github.com/fuelRats/fuelrats.com/pull/298
+[#299]: https://github.com/fuelRats/fuelrats.com/pull/299]
 [2.12.6]: https://github.com/FuelRats/fuelrats.com/compare/v2.12.5...v2.12.6
 
 
+
+
+
 ## [2.12.5][] - 2020-11-21
 
 ### ⚡ Changed

CONTRIBUTING.md

@@ -38,7 +38,7 @@ By contributing to this repository, you are expected to know and follow the rule
 1. In the project directory, run `yarn install` to install dependencies.
 1. Run `yarn dev` to start the dev server.
 
-> Use of NPM is **NOT** supported by this repository.
+> Use of `npm` as a package manager is **NOT** supported by this repository.
 
 > Tip: Keep your `develop` branch pointing at the original repository and make
 > pull requests from branches on your fork. To do this, run:

README.md

@@ -2,7 +2,7 @@
 
 [![Fuelrats.com dependencies on David DM][daviddm-badge]][daviddm]
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-16-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-17-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 [![PRs Welcome][prs-badge]][prs]
 
@@ -54,6 +54,7 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
   </tr>
   <tr>
     <td align="center"><a href="http://selfdecode.com"><img src="https://avatars0.githubusercontent.com/u/108279?v=4" width="80px;" alt=""/><br /><sub><b>Alex</b></sub></a><br /><a href="https://github.com/FuelRats/fuelrats.com/commits?author=diraven" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/Master-Guy"><img src="https://avatars3.githubusercontent.com/u/566429?v=4" width="80px;" alt=""/><br /><sub><b>Master-Guy</b></sub></a><br /><a href="https://github.com/FuelRats/fuelrats.com/commits?author=Master-Guy" title="Code">💻</a></td>
   </tr>
 </table>
 

next.config.js

@@ -4,6 +4,7 @@
 /* eslint-env node */
 const crypto = require('crypto')
 const path = require('path')
+const { DefinePlugin } = require('webpack')
 
 
 
@@ -45,6 +46,9 @@ const generateBuildId = () => {
 module.exports = {
   distDir: path.join('dist', 'next'),
   generateBuildId,
+  images: {
+    domains: ['static-cdn.jtvnw.net'],
+  },
   publicRuntimeConfig: {
     local: {
       publicUrl: FINAL_PUBLIC_URL,
@@ -66,7 +70,6 @@ module.exports = {
   },
   webpack: (config, opt) => {
     /* Define Plugin */
-    const { DefinePlugin } = require('webpack')
     config.plugins.push(new DefinePlugin({
       $IS_DEVELOPMENT: JSON.stringify(opt.dev),
       $IS_STAGING: JSON.stringify(['develop', 'beta'].includes(GIT_BRANCH)),

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fuelrats.com",
-  "version": "2.12.6",
+  "version": "2.12.7",
   "description": "The primary website of The Fuel Rats!",
   "main": "dist/server.js",
   "license": "BSD-3-Clause",
@@ -24,7 +24,7 @@
     "@babel/eslint-parser": "^7.12.1",
     "@babel/eslint-plugin": "^7.12.1",
     "@babel/plugin-proposal-class-properties": "^7.12.1",
-    "@babel/plugin-proposal-decorators": "^7.12.1",
+    "@babel/plugin-proposal-decorators": "^7.12.12",
     "@babel/plugin-proposal-export-default-from": "^7.12.1",
     "@babel/plugin-proposal-export-namespace-from": "^7.12.1",
     "@babel/plugin-proposal-function-bind": "^7.12.1",
@@ -53,15 +53,15 @@
     "@types/koa-compress": "^4.0.1",
     "@types/koa-logger": "^3.1.1",
     "@types/koa__router": "^8.0.3",
-    "@types/lodash": "^4.14.165",
+    "@types/lodash": "^4.14.166",
     "@types/react": "^17.0.0",
     "@types/react-dom": "^17.0.0",
-    "@types/react-redux": "^7.1.12",
+    "@types/react-redux": "^7.1.14",
     "@types/ua-parser-js": "^0.7.35",
     "@types/webpack": "^4.41.25",
     "@types/zxcvbn": "^4.4.0",
     "babel-loader": "8.2.2",
-    "builtin-modules": "^3.1.0",
+    "builtin-modules": "^3.2.0",
     "doctoc": "^2.0.0",
     "eslint": "^7.16.0",
     "eslint-import-resolver-alias": "^1.1.2",
@@ -79,19 +79,19 @@
     "stylelint-order": "^4.1.0",
     "stylelint-scss": "^3.18.0",
     "webpack": "^4.44.2",
-    "worker-loader": "^3.0.6"
+    "worker-loader": "^3.0.7"
   },
   "dependencies": {
     "@fingerprintjs/fingerprintjs": "^3.0.4",
     "@fortawesome/fontawesome-svg-core": "^1.2.32",
     "@fortawesome/free-brands-svg-icons": "^5.15.1",
     "@fortawesome/free-solid-svg-icons": "^5.15.1",
-    "@fortawesome/react-fontawesome": "^0.1.13",
+    "@fortawesome/react-fontawesome": "^0.1.14",
     "@fuelrats/koa-adorable-avatars": "^0.1.1",
     "@fuelrats/validation-util": "^1.2.0",
     "@fuelrats/web-util": "^0.3.2",
     "@koa/router": "^10.0.0",
-    "axios": "^0.21.0",
+    "axios": "^0.21.1",
     "clsx": "^1.1.1",
     "content-security-policy-builder": "^2.1.0",
     "date-fns": "^2.16.1",
@@ -110,10 +110,11 @@
     "koa-logger": "^3.2.1",
     "koa-proxies": "0.11.0",
     "lodash": "^4.17.20",
-    "next": "^10.0.3",
+    "next": "^10.0.4",
     "next-cookies": "^2.0.3",
     "next-redux-wrapper": "5.0.0",
     "nprogress": "^0.2.0",
+    "postcss": "^8.2.1",
     "postcss-easy-import": "^3.0.0",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-preset-env": "^6.7.0",