diff --git a/.drone.yml b/.drone.yml
index 1f6aab4..fbed859 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,28 +1,25 @@
kind: pipeline
-type: ssh
+type: docker
name: default
-server:
- host: 192.168.1.54
- user: pi
- password:
- from_secret: password
+clone:
+ disable: true
steps:
-- name: pull
+- name: bulid
+ image: node:16
+ environment:
+ SSH_PRIVATE_KEY:
+ from_secret: ssh_private_key
commands:
- - cd /home/pi/warframe-center
- - git fetch --all
- - git reset --hard origin/monorepo
-- name: install
- commands:
- - cd /home/pi/warframe-center
+ - git clone -b monorepo https://git.radner.ru/anatolykopyl/warframe-center.git
+ - cd warframe-center/app
- npm install
-- name: build
- commands:
- - cd /home/pi/warframe-center/app
- npm run build
-- name: start
- commands:
- - cd /home/pi/warframe-center/app
- - npm run start
+ - mkdir ~/.ssh
+ - echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
+ - chmod 400 ~/.ssh/id_rsa
+ - scp -o StrictHostKeyChecking=no -r .next pi@192.168.1.54:/home/pi/warframe-center/app
+ when:
+ branch:
+ - monorepo
diff --git a/app/components/Footer.js b/app/components/Footer.js
new file mode 100644
index 0000000..2b6d01b
--- /dev/null
+++ b/app/components/Footer.js
@@ -0,0 +1,9 @@
+import { Component } from 'react'
+
+export default class Footer extends Component {
+ render () {
+ return (
+
Footer
+ )
+ }
+}
diff --git a/app/components/layout.js b/app/components/layout.js
index 6174fb7..2f0b32f 100644
--- a/app/components/layout.js
+++ b/app/components/layout.js
@@ -1,4 +1,5 @@
import Head from 'next/head'
+import Footer from './Footer'
export default function Layout ({ children }) {
return (
@@ -8,6 +9,7 @@ export default function Layout ({ children }) {
{children}
+
>
)
}
diff --git a/app/package-lock.json b/app/package-lock.json
index 66e8015..eaf05d3 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -13,6 +13,7 @@
"next": "latest",
"react": "^17.0.2",
"react-dom": "^17.0.2",
+ "react-moment": "^1.1.1",
"reset-css": "^5.0.1",
"sass": "^1.49.9",
"shared-stuff": "file:../shared-stuff"
@@ -3126,6 +3127,15 @@
"version": "1.2.5",
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
},
+ "node_modules/moment": {
+ "version": "2.29.1",
+ "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
+ "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==",
+ "peer": true,
+ "engines": {
+ "node": "*"
+ }
+ },
"node_modules/ms": {
"version": "2.1.2",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
@@ -3521,6 +3531,16 @@
"version": "16.13.1",
"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
},
+ "node_modules/react-moment": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/react-moment/-/react-moment-1.1.1.tgz",
+ "integrity": "sha512-WjwvxBSnmLMRcU33do0KixDB+9vP3e84eCse+rd+HNklAMNWyRgZTDEQlay/qK6lcXFPRuEIASJTpEt6pyK7Ww==",
+ "peerDependencies": {
+ "moment": "^2.29.0",
+ "prop-types": "^15.7.0",
+ "react": "^16.0 || ^17.0.0"
+ }
+ },
"node_modules/react-transition-group": {
"version": "4.4.2",
"resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.2.tgz",
@@ -6142,6 +6162,12 @@
"version": "1.2.5",
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
},
+ "moment": {
+ "version": "2.29.1",
+ "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
+ "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==",
+ "peer": true
+ },
"ms": {
"version": "2.1.2",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
@@ -6397,6 +6423,12 @@
"version": "16.13.1",
"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
},
+ "react-moment": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/react-moment/-/react-moment-1.1.1.tgz",
+ "integrity": "sha512-WjwvxBSnmLMRcU33do0KixDB+9vP3e84eCse+rd+HNklAMNWyRgZTDEQlay/qK6lcXFPRuEIASJTpEt6pyK7Ww==",
+ "requires": {}
+ },
"react-transition-group": {
"version": "4.4.2",
"resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.2.tgz",
diff --git a/app/package.json b/app/package.json
index 9c20fda..39f50b2 100644
--- a/app/package.json
+++ b/app/package.json
@@ -14,6 +14,7 @@
"next": "latest",
"react": "^17.0.2",
"react-dom": "^17.0.2",
+ "react-moment": "^1.1.1",
"reset-css": "^5.0.1",
"sass": "^1.49.9",
"shared-stuff": "file:../shared-stuff"
diff --git a/app/pages/home/Table.js b/app/pages/home/Table.js
index 5a7cb62..ee940ce 100644
--- a/app/pages/home/Table.js
+++ b/app/pages/home/Table.js
@@ -1,6 +1,7 @@
import { Component } from 'react'
import { DataGrid } from '@mui/x-data-grid'
-import { Link } from '@mui/material'
+import { Link, Typography, Box } from '@mui/material'
+import Moment from 'react-moment'
export default class Table extends Component {
constructor ({ scanResults }) {
@@ -16,13 +17,27 @@ export default class Table extends Component {
flex: 2,
renderCell: (cellValues) => {
return (
-
- {cellValues.row.fullName}
-
+
+ {cellValues.row.fullName}
+
+
+
+ {cellValues.row.updatedAt}
+
+
+
)
}
},
diff --git a/app/styles/_fonts.scss b/app/styles/_fonts.scss
index b9bc5ce..b423964 100644
--- a/app/styles/_fonts.scss
+++ b/app/styles/_fonts.scss
@@ -2,21 +2,21 @@ $text-font: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto,
Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue,
sans-serif;
-$font-h0: normal normal bold 56px/64px $text-font;
-$font-h1: normal normal bold 48px/56px $text-font;
-$font-h2: normal normal bold 40px/48px $text-font;
-$font-h3: normal normal bold 36px/44px $text-font;
-$font-h4: normal normal bold 32px/40px $text-font;
-$font-h5: normal normal bold 28px/36px $text-font;
-$font-h6: normal normal bold 24px/32px $text-font;
-$font-h7: normal normal bold 20px/26px $text-font;
-$font-h8: normal normal bold 18px/24px $text-font;
-$font-h9: normal normal bold 16px/20px $text-font;
+$font-h0: normal normal 300 56px/64px $text-font;
+$font-h1: normal normal 300 48px/56px $text-font;
+$font-h2: normal normal 300 40px/48px $text-font;
+$font-h3: normal normal 300 36px/44px $text-font;
+$font-h4: normal normal 300 32px/40px $text-font;
+$font-h5: normal normal 300 28px/36px $text-font;
+$font-h6: normal normal 300 24px/32px $text-font;
+$font-h7: normal normal 300 20px/26px $text-font;
+$font-h8: normal normal 300 18px/24px $text-font;
+$font-h9: normal normal 300 16px/20px $text-font;
-$font-r8: normal normal normal 24px/30px $text-font;
-$font-r7: normal normal normal 22px/28px $text-font;
-$font-r6: normal normal normal 20px/26px $text-font;
-$font-r5: normal normal normal 18px/24px $text-font;
-$font-r4: normal normal normal 16px/22px $text-font;
-$font-r3: normal normal normal 14px/18px $text-font;
-$font-r2: normal normal normal 12px/16px $text-font;
+$font-r8: normal normal 300 24px/30px $text-font;
+$font-r7: normal normal 300 22px/28px $text-font;
+$font-r6: normal normal 300 20px/26px $text-font;
+$font-r5: normal normal 300 18px/24px $text-font;
+$font-r4: normal normal 300 16px/22px $text-font;
+$font-r3: normal normal 300 14px/18px $text-font;
+$font-r2: normal normal 300 12px/16px $text-font;