TTMK/web2.0-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'update-next' into 'master'

Browse Source 
Chore: Update next.js

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!70
This commit is contained in:
Aarni Halinen
2021-06-16 20:59:10 +00:00
parent 35027e5b1b 1e1557581e
commit 56bf92e50e
15 changed files with 199 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.eslintrc.json
+7 -38
View File
@@ -1,42 +1,14 @@
{
"root": true,
"env": {
"browser": true,
"commonjs": true,
"es6": true,
"node": true
},
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"plugin:import/errors",
"plugin:import/warnings",
"plugin:jsx-a11y/recommended",
"plugin:react-hooks/recommended",
"plugin:@typescript-eslint/recommended",
"airbnb-typescript"
],
"globals": {
"Atomics": "readonly",
"SharedArrayBuffer": "readonly"
},
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 2018,
"sourceType": "module",
"project": "./tsconfig.json"
},
"plugins": [],
"settings": {
"react": {
"version": "detect"
}
},
"extends": [
"plugin:@typescript-eslint/recommended",
"airbnb-typescript",
"next",
"next/core-web-vitals"
],
"rules": {
"@typescript-eslint/naming-convention": "off",
"max-len": [
"warn",
240
@@ -49,10 +21,7 @@
"react/jsx-props-no-spreading": "off",
"react/prop-types": "off",
// Temp
"react/jsx-one-expression-per-line": "off",
"react/no-array-index-key": "off",
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/explicit-module-boundary-types": "off",
"react/no-array-index-key": "warn",
"jsx-a11y/label-has-associated-control": "off",
"jsx-a11y/click-events-have-key-events": "off",
"jsx-a11y/no-noninteractive-element-interactions": "off",
.gitlab-ci.yml
+3
View File
@@ -12,6 +12,9 @@ install:
stage: setup
script:
- npm ci
after_script:
- node -v
- npm -v
artifacts:
paths:
- node_modules
next.config.js
+1 -4
View File
@@ -10,8 +10,5 @@ module.exports = withBundleAnalyzer({
"static.sahkoinsinoorikilta.fi",
"api.dev.sahkoinsinoorikilta.fi",
],
},
future: {
webpack5: true,
},
}
});
package-lock.json
Generated
+153 -95
View File
@@ -14,7 +14,7 @@
"fast-deep-equal": "^3.1.3",
"js-cookie": "^2.2.1",
"lodash": "^4.17.21",
"next": "^10.2.3",
"next": "^11.0.0",
"normalize.css": "^8.0.1",
"react": "^17.0.2",
"react-beautiful-dnd": "^13.1.0",
@@ -41,14 +41,10 @@
"@types/shortid": "^0.0.29",
"@types/styled-components": "^5.1.10",
"@typescript-eslint/eslint-plugin": "^4.27.0",
"@typescript-eslint/parser": "^4.27.0",
"babel-plugin-styled-components": "^1.12.0",
"eslint": "^7.28.0",
"eslint-config-airbnb-typescript": "^12.3.1",
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-react": "^7.24.0",
"eslint-plugin-react-hooks": "^4.2.0",
"eslint-config-next": "^11.0.0",
"husky": "^6.0.0",
"next-sitemap": "^1.6.116",
"npm-run-all": "^4.1.5",
@@ -1800,19 +1796,25 @@
}
},
"node_modules/@next/env": {
"version": "10.2.3",
"resolved": "https://registry.npmjs.org/@next/env/-/env-10.2.3.tgz",
"integrity": "sha512-uBOjRBjsWC4C8X3DfmWWP6ekwLnf2JCCwQX9KVnJtJkqfDsv1yQPakdOEwvJzXQc3JC/v5KKffYPVmV2wHXCgQ=="
"version": "11.0.0",
"resolved": "https://registry.npmjs.org/@next/env/-/env-11.0.0.tgz",
"integrity": "sha512-VKpmDvTYeCpEQjREg3J4pCmVs/QjEzoLmkM8shGFK6e9AmFd0G9QXOL8HGA8qKhy/XmNb7dHeMqrcMiBua4OgA=="
},
"node_modules/@next/eslint-plugin-next": {
"version": "11.0.0",
"resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-11.0.0.tgz",
"integrity": "sha512-fPZ0904yY1box6bRpR9rJqIkNxJdvzzxH7doXS+cdjyBAdptMR7wj3mcx1hEikBHzWduU8BOXBvRg2hWc09YDQ==",
"dev": true
},
"node_modules/@next/polyfill-module": {
"version": "10.2.3",
"resolved": "https://registry.npmjs.org/@next/polyfill-module/-/polyfill-module-10.2.3.tgz",
"integrity": "sha512-OkeY4cLhzfYbXxM4fd+6V4s5pTPuyfKSlavItfNRA6PpS7t1/R6YjO7S7rB8tu1pbTGuDHGIdE1ioDv15bAbDQ=="
"version": "11.0.0",
"resolved": "https://registry.npmjs.org/@next/polyfill-module/-/polyfill-module-11.0.0.tgz",
"integrity": "sha512-gydtFzRqsT549U8+sY8382I/f4HFcelD8gdUGnAofQJa/jEU1jkxmjCHC8tmEiyeMLidl7iDZgchfSCpmMzzUg=="
},
"node_modules/@next/react-dev-overlay": {
"version": "10.2.3",
"resolved": "https://registry.npmjs.org/@next/react-dev-overlay/-/react-dev-overlay-10.2.3.tgz",
"integrity": "sha512-E6g2jws4YW94l0lMMopBVKIZK2mEHfSBvM0d9dmzKG9L/A/kEq6LZCB4SiwGJbNsAdlk2y3USDa0oNbpA+m5Kw==",
"version": "11.0.0",
"resolved": "https://registry.npmjs.org/@next/react-dev-overlay/-/react-dev-overlay-11.0.0.tgz",
"integrity": "sha512-q+Wp+eStEMThe77zxdeJ/nbuODkHR6P+/dfUqYXZSqbLf6x5c5xwLBauwwVbkCYFZpAlDuL8Jk8QSAH1OsqC2w==",
"dependencies": {
"@babel/code-frame": "7.12.11",
"anser": "1.4.9",
@@ -1827,8 +1829,8 @@
"strip-ansi": "6.0.0"
},
"peerDependencies": {
"react": "^16.9.0 || ^17",
"react-dom": "^16.9.0 || ^17"
"react": "^17.0.2",
"react-dom": "^17.0.2"
}
},
"node_modules/@next/react-dev-overlay/node_modules/chalk": {
@@ -1847,9 +1849,9 @@
}
},
"node_modules/@next/react-refresh-utils": {
"version": "10.2.3",
"resolved": "https://registry.npmjs.org/@next/react-refresh-utils/-/react-refresh-utils-10.2.3.tgz",
"integrity": "sha512-qtBF56vPC6d6a8p7LYd0iRjW89fhY80kAIzmj+VonvIGjK/nymBjcFUhbKiMFqlhsarCksnhwX+Zmn95Dw9qvA==",
"version": "11.0.0",
"resolved": "https://registry.npmjs.org/@next/react-refresh-utils/-/react-refresh-utils-11.0.0.tgz",
"integrity": "sha512-hi5eY+KBn4QGtUv7VL2OptdM33fI2hxhd7+omOFmAK+S0hDWhg1uqHqqGJk0W1IfqlWEzzL10WvTJDPRAtDugQ==",
"peerDependencies": {
"react-refresh": "0.8.3",
"webpack": "^4 || ^5"
@@ -1895,30 +1897,17 @@
"node": ">= 8"
}
},
"node_modules/@opentelemetry/api": {
"version": "0.14.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.14.0.tgz",
"integrity": "sha512-L7RMuZr5LzMmZiQSQDy9O1jo0q+DaLy6XpYJfIGfYSfoJA5qzYwUP3sP1uMIQ549DvxAgM3ng85EaPTM/hUHwQ==",
"dependencies": {
"@opentelemetry/context-base": "^0.14.0"
},
"engines": {
"node": ">=8.0.0"
}
},
"node_modules/@opentelemetry/context-base": {
"version": "0.14.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.14.0.tgz",
"integrity": "sha512-sDOAZcYwynHFTbLo6n8kIbLiVF3a3BLkrmehJUyEbT9F+Smbi47kLGS2gG2g0fjBLR/Lr1InPD7kXL7FaTqEkw==",
"engines": {
"node": ">=8.0.0"
}
},
"node_modules/@polka/url": {
"version": "1.0.0-next.15",
"resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.15.tgz",
"integrity": "sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA=="
},
"node_modules/@rushstack/eslint-patch": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.0.6.tgz",
"integrity": "sha512-Myxw//kzromB9yWgS8qYGuGVf91oBUUJpNvy5eM50sqvmKLbKjwLxohJnkWGTeeI9v9IBMtPLxz5Gc60FIfvCA==",
"dev": true
},
"node_modules/@stylelint/postcss-css-in-js": {
"version": "0.37.2",
"resolved": "https://registry.npmjs.org/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz",
@@ -4794,6 +4783,32 @@
"eslint-config-airbnb-base": "^14.2.0"
}
},
"node_modules/eslint-config-next": {
"version": "11.0.0",
"resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-11.0.0.tgz",
"integrity": "sha512-pmatg4zqb5Vygu2HrSPxbsCBudXO9OZQUMKQCyrPKRvfL8PJ3lOIOzzwsiW68eMPXOZwOc1yxTRZWKNY8OJT0w==",
"dev": true,
"dependencies": {
"@next/eslint-plugin-next": "11.0.0",
"@rushstack/eslint-patch": "^1.0.6",
"@typescript-eslint/parser": "^4.20.0",
"eslint-import-resolver-node": "^0.3.4",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-react": "^7.23.1",
"eslint-plugin-react-hooks": "^4.2.0"
},
"peerDependencies": {
"eslint": "^7.23.0",
"next": ">=10.2.0",
"typescript": ">=3.3.1"
},
"peerDependenciesMeta": {
"typescript": {
"optional": true
}
}
},
"node_modules/eslint-import-resolver-node": {
"version": "0.3.4",
"resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz",
@@ -6447,6 +6462,20 @@
"node": ">= 4"
}
},
"node_modules/image-size": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/image-size/-/image-size-1.0.0.tgz",
"integrity": "sha512-JLJ6OwBfO1KcA+TvJT+v8gbE6iWbj24LyDNFgFEN0lzegn6cC6a/p3NIDaepMsJjQjlUWqIC7wJv8lBFxPNjcw==",
"dependencies": {
"queue": "6.0.2"
},
"bin": {
"image-size": "bin/image-size.js"
},
"engines": {
"node": ">=12.0.0"
}
},
"node_modules/import-fresh": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -8043,17 +8072,16 @@
"dev": true
},
"node_modules/next": {
"version": "10.2.3",
"resolved": "https://registry.npmjs.org/next/-/next-10.2.3.tgz",
"integrity": "sha512-dkM1mIfnORtGyzw/Yme8RdqNxlCMZyi4Lqj56F01/yHbe1ZtOaJ0cyqqRB4RGiPhjGGh0319f8ddjDyO1605Ow==",
"version": "11.0.0",
"resolved": "https://registry.npmjs.org/next/-/next-11.0.0.tgz",
"integrity": "sha512-1OA0ccCTwVtdLats/1v7ReiBVx+Akya0UVhHo9IBr8ZkpDI3/SGNcaruJBp5agy8ROF97VDKkZamoUXxRB9NUA==",
"dependencies": {
"@babel/runtime": "7.12.5",
"@hapi/accept": "5.0.2",
"@next/env": "10.2.3",
"@next/polyfill-module": "10.2.3",
"@next/react-dev-overlay": "10.2.3",
"@next/react-refresh-utils": "10.2.3",
"@opentelemetry/api": "0.14.0",
"@next/env": "11.0.0",
"@next/polyfill-module": "11.0.0",
"@next/react-dev-overlay": "11.0.0",
"@next/react-refresh-utils": "11.0.0",
"assert": "2.0.0",
"ast-types": "0.13.2",
"browserify-zlib": "0.2.0",
@@ -8071,6 +8099,7 @@
"find-cache-dir": "3.3.1",
"get-orientation": "1.1.2",
"https-browserify": "1.0.0",
"image-size": "1.0.0",
"jest-worker": "27.0.0-next.5",
"native-url": "0.3.4",
"node-fetch": "2.6.1",
@@ -8085,7 +8114,7 @@
"prop-types": "15.7.2",
"querystring-es3": "0.2.1",
"raw-body": "2.4.1",
"react-is": "16.13.1",
"react-is": "17.0.2",
"react-refresh": "0.8.3",
"stream-browserify": "3.0.0",
"stream-http": "3.1.1",
@@ -8102,13 +8131,13 @@
"next": "dist/bin/next"
},
"engines": {
"node": ">=10.13.0"
"node": ">=12.0.0"
},
"peerDependencies": {
"fibers": ">= 3.1.0",
"node-sass": "^4.0.0 || ^5.0.0",
"react": "^16.6.0 || ^17",
"react-dom": "^16.6.0 || ^17",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"sass": "^1.3.0"
},
"peerDependenciesMeta": {
@@ -8201,11 +8230,6 @@
"node": ">=4"
}
},
"node_modules/next/node_modules/react-is": {
"version": "16.13.1",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
},
"node_modules/next/node_modules/supports-color": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -9961,6 +9985,14 @@
"node": ">=0.4.x"
}
},
"node_modules/queue": {
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/queue/-/queue-6.0.2.tgz",
"integrity": "sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==",
"dependencies": {
"inherits": "~2.0.3"
}
},
"node_modules/queue-microtask": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -15579,19 +15611,25 @@
}
},
"@next/env": {
"version": "10.2.3",
"resolved": "https://registry.npmjs.org/@next/env/-/env-10.2.3.tgz",
"integrity": "sha512-uBOjRBjsWC4C8X3DfmWWP6ekwLnf2JCCwQX9KVnJtJkqfDsv1yQPakdOEwvJzXQc3JC/v5KKffYPVmV2wHXCgQ=="
"version": "11.0.0",
"resolved": "https://registry.npmjs.org/@next/env/-/env-11.0.0.tgz",
"integrity": "sha512-VKpmDvTYeCpEQjREg3J4pCmVs/QjEzoLmkM8shGFK6e9AmFd0G9QXOL8HGA8qKhy/XmNb7dHeMqrcMiBua4OgA=="
},
"@next/eslint-plugin-next": {
"version": "11.0.0",
"resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-11.0.0.tgz",
"integrity": "sha512-fPZ0904yY1box6bRpR9rJqIkNxJdvzzxH7doXS+cdjyBAdptMR7wj3mcx1hEikBHzWduU8BOXBvRg2hWc09YDQ==",
"dev": true
},
"@next/polyfill-module": {
"version": "10.2.3",
"resolved": "https://registry.npmjs.org/@next/polyfill-module/-/polyfill-module-10.2.3.tgz",
"integrity": "sha512-OkeY4cLhzfYbXxM4fd+6V4s5pTPuyfKSlavItfNRA6PpS7t1/R6YjO7S7rB8tu1pbTGuDHGIdE1ioDv15bAbDQ=="
"version": "11.0.0",
"resolved": "https://registry.npmjs.org/@next/polyfill-module/-/polyfill-module-11.0.0.tgz",
"integrity": "sha512-gydtFzRqsT549U8+sY8382I/f4HFcelD8gdUGnAofQJa/jEU1jkxmjCHC8tmEiyeMLidl7iDZgchfSCpmMzzUg=="
},
"@next/react-dev-overlay": {
"version": "10.2.3",
"resolved": "https://registry.npmjs.org/@next/react-dev-overlay/-/react-dev-overlay-10.2.3.tgz",
"integrity": "sha512-E6g2jws4YW94l0lMMopBVKIZK2mEHfSBvM0d9dmzKG9L/A/kEq6LZCB4SiwGJbNsAdlk2y3USDa0oNbpA+m5Kw==",
"version": "11.0.0",
"resolved": "https://registry.npmjs.org/@next/react-dev-overlay/-/react-dev-overlay-11.0.0.tgz",
"integrity": "sha512-q+Wp+eStEMThe77zxdeJ/nbuODkHR6P+/dfUqYXZSqbLf6x5c5xwLBauwwVbkCYFZpAlDuL8Jk8QSAH1OsqC2w==",
"requires": {
"@babel/code-frame": "7.12.11",
"anser": "1.4.9",
@@ -15618,9 +15656,9 @@
}
},
"@next/react-refresh-utils": {
"version": "10.2.3",
"resolved": "https://registry.npmjs.org/@next/react-refresh-utils/-/react-refresh-utils-10.2.3.tgz",
"integrity": "sha512-qtBF56vPC6d6a8p7LYd0iRjW89fhY80kAIzmj+VonvIGjK/nymBjcFUhbKiMFqlhsarCksnhwX+Zmn95Dw9qvA==",
"version": "11.0.0",
"resolved": "https://registry.npmjs.org/@next/react-refresh-utils/-/react-refresh-utils-11.0.0.tgz",
"integrity": "sha512-hi5eY+KBn4QGtUv7VL2OptdM33fI2hxhd7+omOFmAK+S0hDWhg1uqHqqGJk0W1IfqlWEzzL10WvTJDPRAtDugQ==",
"requires": {}
},
"@nodelib/fs.scandir": {
@@ -15649,24 +15687,17 @@
"fastq": "^1.6.0"
}
},
"@opentelemetry/api": {
"version": "0.14.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.14.0.tgz",
"integrity": "sha512-L7RMuZr5LzMmZiQSQDy9O1jo0q+DaLy6XpYJfIGfYSfoJA5qzYwUP3sP1uMIQ549DvxAgM3ng85EaPTM/hUHwQ==",
"requires": {
"@opentelemetry/context-base": "^0.14.0"
}
},
"@opentelemetry/context-base": {
"version": "0.14.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.14.0.tgz",
"integrity": "sha512-sDOAZcYwynHFTbLo6n8kIbLiVF3a3BLkrmehJUyEbT9F+Smbi47kLGS2gG2g0fjBLR/Lr1InPD7kXL7FaTqEkw=="
},
"@polka/url": {
"version": "1.0.0-next.15",
"resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.15.tgz",
"integrity": "sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA=="
},
"@rushstack/eslint-patch": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.0.6.tgz",
"integrity": "sha512-Myxw//kzromB9yWgS8qYGuGVf91oBUUJpNvy5eM50sqvmKLbKjwLxohJnkWGTeeI9v9IBMtPLxz5Gc60FIfvCA==",
"dev": true
},
"@stylelint/postcss-css-in-js": {
"version": "0.37.2",
"resolved": "https://registry.npmjs.org/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz",
@@ -17957,6 +17988,22 @@
"eslint-config-airbnb-base": "^14.2.0"
}
},
"eslint-config-next": {
"version": "11.0.0",
"resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-11.0.0.tgz",
"integrity": "sha512-pmatg4zqb5Vygu2HrSPxbsCBudXO9OZQUMKQCyrPKRvfL8PJ3lOIOzzwsiW68eMPXOZwOc1yxTRZWKNY8OJT0w==",
"dev": true,
"requires": {
"@next/eslint-plugin-next": "11.0.0",
"@rushstack/eslint-patch": "^1.0.6",
"@typescript-eslint/parser": "^4.20.0",
"eslint-import-resolver-node": "^0.3.4",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-react": "^7.23.1",
"eslint-plugin-react-hooks": "^4.2.0"
}
},
"eslint-import-resolver-node": {
"version": "0.3.4",
"resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz",
@@ -19218,6 +19265,14 @@
"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
"dev": true
},
"image-size": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/image-size/-/image-size-1.0.0.tgz",
"integrity": "sha512-JLJ6OwBfO1KcA+TvJT+v8gbE6iWbj24LyDNFgFEN0lzegn6cC6a/p3NIDaepMsJjQjlUWqIC7wJv8lBFxPNjcw==",
"requires": {
"queue": "6.0.2"
}
},
"import-fresh": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -20384,17 +20439,16 @@
"dev": true
},
"next": {
"version": "10.2.3",
"resolved": "https://registry.npmjs.org/next/-/next-10.2.3.tgz",
"integrity": "sha512-dkM1mIfnORtGyzw/Yme8RdqNxlCMZyi4Lqj56F01/yHbe1ZtOaJ0cyqqRB4RGiPhjGGh0319f8ddjDyO1605Ow==",
"version": "11.0.0",
"resolved": "https://registry.npmjs.org/next/-/next-11.0.0.tgz",
"integrity": "sha512-1OA0ccCTwVtdLats/1v7ReiBVx+Akya0UVhHo9IBr8ZkpDI3/SGNcaruJBp5agy8ROF97VDKkZamoUXxRB9NUA==",
"requires": {
"@babel/runtime": "7.12.5",
"@hapi/accept": "5.0.2",
"@next/env": "10.2.3",
"@next/polyfill-module": "10.2.3",
"@next/react-dev-overlay": "10.2.3",
"@next/react-refresh-utils": "10.2.3",
"@opentelemetry/api": "0.14.0",
"@next/env": "11.0.0",
"@next/polyfill-module": "11.0.0",
"@next/react-dev-overlay": "11.0.0",
"@next/react-refresh-utils": "11.0.0",
"assert": "2.0.0",
"ast-types": "0.13.2",
"browserify-zlib": "0.2.0",
@@ -20412,6 +20466,7 @@
"find-cache-dir": "3.3.1",
"get-orientation": "1.1.2",
"https-browserify": "1.0.0",
"image-size": "1.0.0",
"jest-worker": "27.0.0-next.5",
"native-url": "0.3.4",
"node-fetch": "2.6.1",
@@ -20426,7 +20481,7 @@
"prop-types": "15.7.2",
"querystring-es3": "0.2.1",
"raw-body": "2.4.1",
"react-is": "16.13.1",
"react-is": "17.0.2",
"react-refresh": "0.8.3",
"stream-browserify": "3.0.0",
"stream-http": "3.1.1",
@@ -20489,11 +20544,6 @@
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
},
"react-is": {
"version": "16.13.1",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
},
"supports-color": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -21894,6 +21944,14 @@
"resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
"integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM="
},
"queue": {
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/queue/-/queue-6.0.2.tgz",
"integrity": "sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==",
"requires": {
"inherits": "~2.0.3"
}
},
"queue-microtask": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
package.json
+4 -8
View File
@@ -20,8 +20,8 @@
"postbuild": "next-sitemap",
"export": "next export",
"lint": "npm run lint:es && npm run lint:css",
"lint:es": "eslint . --ext .ts,.tsx",
"lint:es:fix": "eslint --fix . --ext .ts,.tsx",
"lint:es": "next lint",
"lint:es:fix": "next lint -- fix",
"lint:css": "stylelint \"./src/**/*.{ts,tsx}\"",
"dev": "next dev",
"start": "next dev",
@@ -42,14 +42,10 @@
"@types/shortid": "^0.0.29",
"@types/styled-components": "^5.1.10",
"@typescript-eslint/eslint-plugin": "^4.27.0",
"@typescript-eslint/parser": "^4.27.0",
"babel-plugin-styled-components": "^1.12.0",
"eslint": "^7.28.0",
"eslint-config-airbnb-typescript": "^12.3.1",
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-react": "^7.24.0",
"eslint-plugin-react-hooks": "^4.2.0",
"eslint-config-next": "^11.0.0",
"husky": "^6.0.0",
"next-sitemap": "^1.6.116",
"npm-run-all": "^4.1.5",
@@ -66,7 +62,7 @@
"fast-deep-equal": "^3.1.3",
"js-cookie": "^2.2.1",
"lodash": "^4.17.21",
"next": "^10.2.3",
"next": "^11.0.0",
"normalize.css": "^8.0.1",
"react": "^17.0.2",
"react-beautiful-dnd": "^13.1.0",
src/components/Favicons.tsx
+3 -2
View File
@@ -1,7 +1,6 @@
import React from "react";
// eslint-disable-next-line react/display-name
export default (): JSX.Element => (
const Icons = (): JSX.Element => (
<>
<link rel="shortcut icon" href="/favicons/favicon.ico" />
<link rel="icon" type="image/png" sizes="16x16" href="/favicons/favicon-16x16.png" />
@@ -54,3 +53,5 @@ export default (): JSX.Element => (
<link rel="yandex-tableau-widget" href="/favicons/yandex-browser-manifest.json" />
</>
);
export default Icons;
src/components/HTMLLogo.tsx
+3 -2
View File
@@ -1,7 +1,6 @@
import React from "react";
// eslint-disable-next-line react/display-name
export default (): JSX.Element => (
const Logo = (): JSX.Element => (
// eslint-disable-next-line react/no-danger
<head dangerouslySetInnerHTML={{
__html:
@@ -55,3 +54,5 @@ export default (): JSX.Element => (
}}
/>
);
export default Logo;
src/components/Widgets/SectionDividerWidget.tsx
+3 -1
View File
@@ -27,7 +27,9 @@ const Heading = styled.h3`
const SectionDividerWidget: React.FC<SectionDividerWidgetProps> = ({ label }) => (
<Heading>
{label}&nbsp;{getIconByLabel(label)}
{label}
&nbsp;
{getIconByLabel(label)}
</Heading>
);
src/components/Widgets/SignupQuestionsWidget/OptionsWidget.tsx
+4 -3
View File
@@ -51,19 +51,20 @@ class OptionsWidget extends React.Component<OptionsWidgetProps> {
onChange(questions);
};
requiredField() {
requiredField(): JSX.Element {
const { inputProps } = this.props;
const { questions, index } = inputProps;
return (
<Checkbox
checked={questions[index].required}
onChange={this.handleRequiredChange(questions, index)}
>Required?
>
Required?
</Checkbox>
);
}
render() {
render(): JSX.Element {
const { inputProps } = this.props;
const {
type, value, questions, index,
src/pages/404.tsx
+3 -1
View File
@@ -26,7 +26,9 @@ const NotFoundPage: NextPage = () => (
<Header />
<NotFound id="not-found">
<p>
<strong>404</strong> | Ei&nbsp;vaan&nbsp;löydy
<strong>404</strong>
{" "}
| Ei&nbsp;vaan&nbsp;löydy
</p>
</NotFound>
</>
src/pages/_app.tsx
+1 -2
View File
@@ -126,11 +126,10 @@ const AppContainer = styled.div`
background-color: ${colors.white};
`;
const Web20App = ({ Component, pageProps }: AppProps) => (
const Web20App = ({ Component, pageProps }: AppProps): JSX.Element => (
<>
<Head>
<meta httpEquiv="Content-Type" content="text/html; charset=utf-8" />
<link href="https://fonts.googleapis.com/css?family=Montserrat:100,100i,200,200i,300,300i,400,400i,500,500i,600,600i,700,800,900&display=swap" rel="stylesheet" />
<meta httpEquiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>Aalto-yliopiston Sähköinsinöörikilta ry</title>
src/pages/_document.tsx
+2 -1
View File
@@ -29,12 +29,13 @@ export default class MyDocument extends Document<{ styleTags: unknown }> {
}
}
render() {
render(): JSX.Element {
const { styleTags } = this.props;
return (
<Html lang="fi">
<Head>
<HTMLLogo />
<link href="https://fonts.googleapis.com/css?family=Montserrat:100,100i,200,200i,300,300i,400,400i,500,500i,600,600i,700,800,900&display=swap" rel="stylesheet" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/8.0.0/normalize.min.css" />
<Favicons />
</Head>
src/pages/admin/login.tsx
+4 -2
View File
@@ -46,7 +46,8 @@ const AdminLoginPage: NextPage = () => {
<div className="error">You have to log in first.</div>
)}
<form className="admin-login-form" onSubmit={handleSubmit}>
<label>Username
<label>
Username
<input
id="login-username"
type="text"
@@ -57,7 +58,8 @@ const AdminLoginPage: NextPage = () => {
}}
/>
</label>
<label>Password
<label>
Password
<input
id="login-password"
type="password"
src/pages/admin/signups/[id]/list.tsx
+4 -1
View File
@@ -61,7 +61,10 @@ const SignupEmailPage: NextPage = () => {
return (
<AdminListCommon>
<h1>{title}: Sign-ups</h1>
<h1>
{title}
: Sign-ups
</h1>
<table>
<thead>
<tr>
src/views/ContactsPage/ContactsPageView.tsx
+4 -3
View File
@@ -30,7 +30,7 @@ const orderedCommittees = [
Others,
];
const blank_profile = "/img/blank_profile.png";
const blankProfile = "/img/blank_profile.png";
const BlueLink = styled(Link)`
color: ${colors.blue1};
@@ -91,7 +91,7 @@ const CommitteeContainer: React.FC<{
name={representative.name}
phone={representative.phone_number}
email={representative.email}
image={(committee.name_en === "Board") ? (representative.image || blank_profile) : null}
image={(committee.name_en === "Board") ? (representative.image || blankProfile) : null}
role_fi={role.name_fi}
role_en={role.name_en}
/>
@@ -126,7 +126,8 @@ const ContactsPageView: React.FC = () => (
<TextSection>
<h1>Yhteystiedot</h1>
<p>
Asiaa olisi, mutta kehen ottaa yhteyttä?<br />
Asiaa olisi, mutta kehen ottaa yhteyttä?
<br />
Tämä sivu yrittää valottaa sen oikean ihmisen puhelinnumeroa ja sähköpostiosoitetta.
</p>
<aside>