Skip to content

Commit 9e77196

Browse files
jenkinjenkin
authored
Update dependencies (#55)
* Update npm packages - update to next 9.5 with stable revalidate option - fix issue in tenders search (method option with empty value) - fix standardjs warning * Update npm dependencies * Update ES to v7.9.2 * Remove search CTA from single supplier page * Update site metadata
1 parent 1f77b99 commit 9e77196

File tree

12 files changed

+2339
-2612
lines changed

12 files changed

+2339
-2612
lines changed

‎docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ services:
2828
image: docker.pkg.github.com/ondata/appaltipop.it/appaltipop-oas:latest
2929

3030
es01:
31-
image: docker.elastic.co/elasticsearch/elasticsearch:7.8.0
31+
image: docker.elastic.co/elasticsearch/elasticsearch:7.9.2
3232
container_name: appaltipop-es01
3333
environment:
3434
- discovery.type=single-node
@@ -37,7 +37,7 @@ services:
3737
- 9200:9200
3838

3939
kibana:
40-
image: docker.elastic.co/kibana/kibana:7.8.0
40+
image: docker.elastic.co/kibana/kibana:7.9.2
4141
container_name: appaltipop-kibana
4242
environment:
4343
SERVER_NAME: dashboard.appaltipop.it

‎package-lock.json

+2,249-2,543
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+52-52
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
11
{
2-
"name": "ondata-appaltipop.it",
3-
"version": "0.1.0",
4-
"homepage": "https://appaltipop.it",
5-
"private": true,
6-
"repository": {
7-
"type": "git",
8-
"url": "https://github.com/ondata/appaltipop.it.git"
9-
},
10-
"scripts": {
11-
"dev": "next dev",
12-
"build": "next build",
13-
"start": "next build && next start",
14-
"export": "next build && next export -o dist",
15-
"format": "standard --fix \"src/**/*.js\""
16-
},
17-
"dependencies": {
18-
"@date-io/date-fns": "^1.3.13",
19-
"@elastic/elasticsearch": "^7.8.0",
20-
"@material-ui/core": "^4.11.0",
21-
"@material-ui/icons": "^4.9.1",
22-
"@material-ui/lab": "^4.0.0-alpha.56",
23-
"@material-ui/pickers": "^3.2.10",
24-
"@mdx-js/loader": "^1.6.14",
25-
"@next/mdx": "^9.4.4",
26-
"axios": "^0.19.2",
27-
"clsx": "^1.1.1",
28-
"d3-format": "^1.4.4",
29-
"d3-time-format": "^2.2.3",
30-
"date-fns": "^2.15.0",
31-
"lodash": "^4.17.19",
32-
"next": "^9.4.4",
33-
"next-seo": "^4.7.3",
34-
"next-translate": "^0.16.1",
35-
"react": "^16.13.1",
36-
"react-copy-to-clipboard": "^5.0.2",
37-
"react-dom": "^16.13.1",
38-
"react-markdown": "^4.3.1",
39-
"remark-emoji": "^2.1.0",
40-
"remark-images": "^2.0.0"
41-
},
42-
"keywords": [],
43-
"author": "Alessio Cimarelli <[email protected]> (https://www.linkedin.com/in/alessiocimarelli/)",
44-
"contributors": [
45-
"Jacopo Solmi <[email protected]> (https://www.linkedin.com/in/jacoposolmi/)"
46-
],
47-
"license": "MIT",
48-
"devDependencies": {
49-
"eslint": "^7.5.0",
50-
"eslint-plugin-react": "^7.20.3",
51-
"sass": "^1.26.10",
52-
"standard": "^14.3.4"
53-
}
2+
"name": "ondata-appaltipop.it",
3+
"version": "0.1.0",
4+
"homepage": "https://appaltipop.it",
5+
"private": true,
6+
"repository": {
7+
"type": "git",
8+
"url": "https://github.com/ondata/appaltipop.it.git"
9+
},
10+
"scripts": {
11+
"dev": "next dev",
12+
"build": "next build",
13+
"start": "next build && next start",
14+
"export": "next build && next export -o dist",
15+
"format": "standard --fix \"src/**/*.js\""
16+
},
17+
"dependencies": {
18+
"@date-io/date-fns": "^1.3.13",
19+
"@elastic/elasticsearch": "~7.8.0",
20+
"@material-ui/core": "^4.11.0",
21+
"@material-ui/icons": "^4.9.1",
22+
"@material-ui/lab": "^4.0.0-alpha.56",
23+
"@material-ui/pickers": "^3.2.10",
24+
"@mdx-js/loader": "^1.6.18",
25+
"@next/mdx": "^9.5.5",
26+
"axios": "^0.20.0",
27+
"clsx": "^1.1.1",
28+
"d3-format": "^2.0.0",
29+
"d3-time-format": "^3.0.0",
30+
"date-fns": "^2.16.1",
31+
"lodash": "^4.17.20",
32+
"next": "^9.5.5",
33+
"next-seo": "^4.11.0",
34+
"next-translate": "^0.17.3",
35+
"react": "^16.14.0",
36+
"react-copy-to-clipboard": "^5.0.2",
37+
"react-dom": "^16.14.0",
38+
"react-markdown": "^4.3.1",
39+
"remark-emoji": "^2.1.0",
40+
"remark-images": "^2.0.0"
41+
},
42+
"keywords": [],
43+
"author": "Alessio Cimarelli <[email protected]> (https://www.linkedin.com/in/alessiocimarelli/)",
44+
"contributors": [
45+
"Jacopo Solmi <[email protected]> (https://www.linkedin.com/in/jacoposolmi/)"
46+
],
47+
"license": "MIT",
48+
"devDependencies": {
49+
"eslint": "^7.11.0",
50+
"eslint-plugin-react": "^7.21.4",
51+
"sass": "^1.27.0",
52+
"standard": "^14.3.4"
53+
}
5454
}

‎public/robots.txt

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
User-agent: *
2+
Allow: /

‎public/share.png

447 Bytes
Loading

‎public/site.webmanifest

+19-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,19 @@
1-
{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}
1+
{
2+
"name":"AppaltiPOP by @ondatait",
3+
"short_name":"AppaltiPOP",
4+
"icons":[
5+
{
6+
"src":"/android-chrome-192x192.png",
7+
"sizes":"192x192",
8+
"type":"image/png"
9+
},
10+
{
11+
"src":"/android-chrome-512x512.png",
12+
"sizes":"512x512",
13+
"type":"image/png"
14+
}
15+
],
16+
"theme_color":"#3624e0",
17+
"background_color":"#ffffff",
18+
"display":"standalone"
19+
}

‎src/locales/en/supplier.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
"label": "Cerca tra gli aggiudicatari",
1515
"redflags": "Mostra solo risultati con red flag"
1616
},
17-
"ctas": ["search","download"]
17+
"ctas": ["download"]
1818
}

‎src/locales/it/supplier.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
"label": "Cerca tra gli aggiudicatari",
1515
"redflags": "Mostra solo risultati con red flag"
1616
},
17-
"ctas": ["search","download"]
17+
"ctas": ["download"]
1818
}

‎src/pages/[lang]/buyers.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ export const getStaticProps = async (ctx) => {
115115
tendersCount: await getTendersCount(),
116116
redTendersCount: await getRedTendersCount()
117117
},
118-
unstable_revalidate: 3600
118+
revalidate: 3600
119119
}
120120
}
121121

‎src/pages/[lang]/suppliers.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ export const getStaticProps = async (ctx) => {
338338
tendersCount: await getTendersCount(),
339339
redTendersCount: await getRedTendersCount()
340340
},
341-
unstable_revalidate: 3600
341+
revalidate: 3600
342342
}
343343
}
344344

‎src/pages/[lang]/tender/[id]/index.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import FlagsInfo from '../../../../components/FlagsInfo'
4747
import KeyValue from '../../../../components/KeyValue'
4848
import AvatarIcon from '../../../../components/AvatarIcon'
4949
import Breadcrumbs from '../../../../components/Breadcrumbs'
50-
import { Button as CtaButton, Dialog as CtaDialog } from '../../../../components/Cta'
50+
import { Button as CtaButton } from '../../../../components/Cta'
5151

5252
import SEO from '../../../../config/next-seo'
5353

@@ -132,15 +132,16 @@ function Index ({ tender = {}, buyers = [], suppliers = [], redflags = [] }) {
132132
labels: 'segnalazione',
133133
title: `[${tender['ocds:releases/0/id']}] Segnalazione problema`,
134134
body: [
135-
`## Appalto segnalato\n`,
135+
'## Appalto segnalato\n',
136136
`CIG: ${tender['ocds:releases/0/id']}`,
137137
`URL: ${SEO.canonical}${router.asPath}`,
138138
`Titolo: "${tender['ocds:releases/0/tender/title']}"\n`,
139-
`## Descrizione del problema\n`,
140-
`...`
139+
'## Descrizione del problema\n',
140+
'...'
141141
].join('\n')
142142
})).toString()}`}
143143
target='_blank'
144+
rel='noopener noreferrer'
144145
>
145146
{t('common:report')}
146147
</a>

‎src/pages/[lang]/tenders.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@ function Index ({
135135
setMaxDate(query.maxDate ? new Date(query.maxDate) : maxDate)
136136
setRangeFlags(query.minFlags || query.maxFlags ? [query.minFlags ? +query.minFlags : 0, query.maxFlags ? +query.maxFlags : redflagsCount] : rangeFlags)
137137
setPage(query.page ? +query.page : page)
138-
setPermalink(`${location.origin}${location.pathname}?${(new URLSearchParams(query)).toString()}`)
138+
setPermalink(`${window.location.origin}${window.location.pathname}?${(new URLSearchParams(query)).toString()}`)
139139
// setCopied(false)
140-
if (!location.search || keys(query).length > 1) {
140+
if (!window.location.search || keys(query).length > 1) {
141141
handleRequest({ page: 0, ...query })
142142
}
143143
}, [query])
@@ -148,7 +148,7 @@ function Index ({
148148
q: searchString,
149149
buyer: buyer ? buyer['ocds:releases/0/buyer/id'] : '',
150150
region: region ? region['istat:COD_REG'] : '',
151-
method: method,
151+
method: method || '',
152152
minAmount: 10 ** rangeAmount[0],
153153
maxAmount: 10 ** rangeAmount[1],
154154
minDate: minDate ? minDate.toISOString().split('T')[0] : '',
@@ -171,7 +171,7 @@ function Index ({
171171
)
172172

173173
setResultsLabel(<>&nbsp;</>)
174-
e?.preventDefault?.()
174+
e && e.preventDefault && e.preventDefault()
175175
}
176176

177177
function handleReset () {
@@ -200,7 +200,7 @@ function Index ({
200200
q: query.q || searchString,
201201
buyer: query.buyer || (buyer ? buyer['ocds:releases/0/buyer/id'] : ''),
202202
region: query.region || (region ? region['istat:COD_REG'] : ''),
203-
method: query.method || method,
203+
method: query.method || method || '',
204204
minAmount: query.minAmount || 10 ** rangeAmount[0],
205205
maxAmount: query.maxAmount || 10 ** rangeAmount[1],
206206
minDate: query.minDate || (minDate ? minDate.toISOString().split('T')[0] : ''),
@@ -671,7 +671,7 @@ export const getStaticProps = async (ctx) => {
671671
regions: map((await getRegions()).hits, '_source'),
672672
methods: map((await getTenderMethods()).buckets, 'key')
673673
},
674-
unstable_revalidate: 3600
674+
revalidate: 3600
675675
}
676676
}
677677

0 commit comments

Comments
 (0)