Merge pull request #114 from TaloDev/develop

Release 0.24.0

Author: tudddorrr

.github/workflows/docker.yml

@@ -24,7 +24,7 @@ jobs:
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           push: true
           tags: |

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:lts-alpine AS build
+FROM node:16-alpine AS build
 WORKDIR /usr/frontend
 COPY . .
 RUN yarn

package.json

@@ -19,7 +19,7 @@
     "classnames": "^2.3.2",
     "date-fns": "^2.29.3",
     "dinero.js": "^2.0.0-alpha.11",
-    "framer-motion": "^8.0.0",
+    "framer-motion": "^9.0.0",
     "lodash-es": "^4.17.21",
     "prop-types": "^15.7.2",
     "querystring": "^0.2.1",
@@ -71,7 +71,7 @@
   "lint-staged": {
     "*.{js,jsx}": "eslint --fix"
   },
-  "version": "0.23.2",
+  "version": "0.24.0",
   "engines": {
     "node": "16.x"
   }

src/components/AlertBanner.jsx

@@ -14,7 +14,7 @@ const AlertBanner = (props) => {
 AlertBanner.propTypes = {
   text: PropTypes.oneOfType([PropTypes.node, PropTypes.string]).isRequired,
   className: PropTypes.string,
-  icon: PropTypes.func
+  icon: PropTypes.object
 }
 
 AlertBanner.defaultProps = {

src/modals/Scopes.jsx

@@ -2,7 +2,7 @@ import PropTypes from 'prop-types'
 import Modal from '../components/Modal'
 import Button from '../components/Button'
 
-const Scopes = (props) => {
+export default function Scopes(props) {
   const [, setOpen] = props.modalState
 
   return (
@@ -13,7 +13,6 @@ const Scopes = (props) => {
     >
       <div>
         <div className='p-4 space-y-4'>
-          <p>Key ending in <span className='font-semibold'>{props.selectedKey?.token}</span></p>
           <div className='text-white'>
             <div className='flex flex-wrap -mb-2'>
               {props.selectedKey?.scopes.sort((a, b) => {
@@ -40,5 +39,3 @@ Scopes.propTypes = {
   modalState: PropTypes.array.isRequired,
   selectedKey: PropTypes.object
 }
-
-export default Scopes

src/pages/APIKeys.jsx

@@ -115,13 +115,13 @@ const APIKeys = () => {
         }
 
         {user.emailConfirmed && keys.length > 0 &&
-          <Table columns={['Ending in', 'Created by', 'Created at', 'Scopes', '']}>
+          <Table columns={['Created by', 'Created at', 'Last used', 'Scopes', '']}>
             <TableBody iterator={keys}>
               {(key) => (
                 <>
-                  <TableCell>…{key.token}</TableCell>
                   <TableCell>{key.createdBy === user.username ? 'You' : key.createdBy}</TableCell>
                   <DateCell>{format(new Date(key.createdAt), 'dd MMM Y, HH:mm')}</DateCell>
+                  <DateCell>{key.lastUsedAt ? format(new Date(key.lastUsedAt), 'dd MMM Y, HH:mm') : 'Never used'}</DateCell>
                   <TableCell className='flex'>
                     <div>
                       <Button variant='grey' onClick={() => setSelectedKey(key)}>View scopes</Button>

yarn.lock

@@ -2752,10 +2752,10 @@ fraction.js@^4.2.0:
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950"
   integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==
 
-framer-motion@^8.0.0:
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/framer-motion/-/framer-motion-8.5.0.tgz#700cc132f7b22b1627d0031a4ae8d169998a9613"
-  integrity sha512-z5hQvIa+9uFcA2aFmT+6XsUfuVPl9Y1uhs5yntxU1Q0E6hm4wDRpvFlB/yYN/cdfXUctf/1Q1Rep/dqOipz8sg==
+framer-motion@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/framer-motion/-/framer-motion-9.0.0.tgz#acad6aa4bea014ee06f4300941a1cb71eebefc41"
+  integrity sha512-nDLVzUlIUNyxD7SbqWpWKBeK1FIP/mDMFNy4yhXjhaRoyvGPcoe3uGYf0cEti+DG64N99Dzaw5kdmVjsxbwlEA==
   dependencies:
     "@motionone/dom" "^10.15.3"
     hey-listen "^1.0.8"