Skip to content

Commit

Permalink
Update lots of JS dependencies. Fix eslint issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jaywink
jaywink committed Nov 24, 2019
1 parent 7e14513 commit e0fca33
Show file tree
Hide file tree
Showing 16 changed files with 8,954 additions and 8,340 deletions.
1 change: 1 addition & 0 deletions .eslintignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
/dist/
/*.js
/test/unit/coverage/
/node_modules/
17,031 changes: 8,791 additions & 8,240 deletions package-lock.json
View file

Large diffs are not rendered by default.

121 changes: 61 additions & 60 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,85 +13,86 @@
"build": "node build/build.js"
},
"dependencies": {
"vue": "^2.5.17",
"vue-router": "^3.0.1",
"vue-sorted-table": "^1.0.1"
"vue": "^2.6.10",
"vue-router": "^3.1.3",
"vue-sorted-table": "^1.1.1"
},
"devDependencies": {
"apollo-cache-inmemory": "^1.3.7",
"apollo-client": "^2.4.4",
"apollo-link": "^1.2.3",
"apollo-link-http": "^1.5.5",
"autoprefixer": "^9.3.1",
"apollo-cache-inmemory": "^1.6.3",
"apollo-client": "^2.6.4",
"apollo-link": "^1.2.13",
"apollo-link-http": "^1.5.16",
"autoprefixer": "^9.7.2",
"babel-core": "^6.26.3",
"babel-eslint": "^10.0.1",
"babel-eslint": "^10.0.3",
"babel-helper-vue-jsx-merge-props": "^2.0.3",
"babel-loader": "^7.1.1",
"babel-plugin-istanbul": "^5.1.0",
"babel-loader": "^7.1.5",
"babel-plugin-istanbul": "^5.2.0",
"babel-plugin-syntax-jsx": "^6.18.0",
"babel-plugin-transform-runtime": "^6.22.0",
"babel-plugin-transform-vue-jsx": "^3.5.0",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-plugin-transform-vue-jsx": "^3.7.0",
"babel-preset-env": "^1.7.0",
"babel-preset-stage-2": "^6.22.0",
"babel-preset-stage-2": "^6.24.1",
"chai": "^4.2.0",
"chalk": "^2.4.1",
"chart.js": "^2.7.3",
"copy-webpack-plugin": "^4.5.4",
"cross-env": "^5.2.0",
"css-loader": "^1.0.0",
"eslint": "^5.8.0",
"eslint-config-airbnb-base": "^11.3.0",
"chalk": "^3.0.0",
"chart.js": "^2.9.3",
"copy-webpack-plugin": "<5",
"cross-env": "^6.0.3",
"css-loader": "^3.2.0",
"eslint": "^6.7.0",
"eslint-config-airbnb-base": "^14.0.0",
"eslint-friendly-formatter": "^4.0.1",
"eslint-import-resolver-webpack": "^0.10.1",
"eslint-loader": "^2.1.1",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-vue": "^4.7.1",
"extract-text-webpack-plugin": "^3.0.0",
"file-loader": "^1.1.4",
"eslint-import-resolver-webpack": "^0.11.1",
"eslint-loader": "^3.0.2",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-vue": "^6.0.1",
"extract-text-webpack-plugin": "^3.0.2",
"file-loader": "^4.3.0",
"friendly-errors-webpack-plugin": "^1.7.0",
"graphql": "^14.0.2",
"graphql-tag": "^2.10.0",
"graphql": "^14.5.8",
"graphql-tag": "^2.10.1",
"html-webpack-plugin": "^3.2.0",
"inject-loader": "^4.0.1",
"karma": "^3.1.1",
"karma-coverage": "^1.1.2",
"karma": "^4.4.1",
"karma-coverage": "^2.0.1",
"karma-mocha": "^1.3.0",
"karma-phantomjs-launcher": "^1.0.2",
"karma-phantomjs-shim": "^1.4.0",
"karma-phantomjs-launcher": "^1.0.4",
"karma-phantomjs-shim": "^1.5.0",
"karma-sinon-chai": "^2.0.2",
"karma-sourcemap-loader": "^0.3.7",
"karma-spec-reporter": "0.0.32",
"karma-webpack": "^3.0.5",
"lodash": "^4.17.11",
"mocha": "^5.2.0",
"node-notifier": "^5.3.0",
"node-sass": "^4.9.4",
"optimize-css-assets-webpack-plugin": "^3.2.0",
"ora": "^3.0.0",
"phantomjs-prebuilt": "^2.1.14",
"portfinder": "^1.0.19",
"karma-webpack": "^4.0.2",
"lodash": "^4.17.15",
"mocha": "^6.2.2",
"node-notifier": "^6.0.0",
"node-sass": "^4.13.0",
"optimize-css-assets-webpack-plugin": "^5.0.3",
"ora": "^4.0.3",
"phantomjs-prebuilt": "^2.1.16",
"portfinder": "^1.0.25",
"postcss-import": "^12.0.1",
"postcss-loader": "^3.0.0",
"postcss-url": "^8.0.0",
"rimraf": "^2.6.0",
"sass-loader": "^7.1.0",
"semver": "^5.6.0",
"shelljs": "^0.8.2",
"sinon": "^7.1.0",
"sinon-chai": "^3.2.0",
"uglifyjs-webpack-plugin": "^1.1.1",
"url-loader": "^1.1.2",
"vue-apollo": "^3.0.0-beta.25",
"vue-chartkick": "^0.5.0",
"vue-directive-tooltip": "^1.5.0",
"vue-loader": "^13.3.0",
"rimraf": "^3.0.0",
"sass-loader": "<8",
"semver": "^6.3.0",
"shelljs": "^0.8.3",
"sinon": "^7.5.0",
"sinon-chai": "^3.3.0",
"uglifyjs-webpack-plugin": "^2.2.0",
"url-loader": "^2.3.0",
"vue-apollo": "^3.0.0",
"vue-chartkick": "^0.6.0",
"vue-directive-tooltip": "^1.6.3",
"vue-loader": "<14",
"vue-spinner-component": "^1.0.5",
"vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.5.2",
"webpack": "^3.6.0",
"webpack-bundle-analyzer": "^3.3.2",
"webpack-dev-server": "^2.9.1",
"webpack-merge": "^4.1.0"
"vue-style-loader": "^4.1.2",
"vue-template-compiler": "^2.6.10",
"webpack": "<4",
"webpack-bundle-analyzer": "^3.6.0",
"webpack-cli": "^3.3.10",
"webpack-dev-server": "<3",
"webpack-merge": "^4.2.2"
},
"engines": {
"node": ">= 6.0.0",
Expand Down
2 changes: 1 addition & 1 deletion src/App.vue
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div id="app">
<router-view/>
<router-view />
</div>
</template>

Expand Down
19 changes: 13 additions & 6 deletions src/components/HostingReportPage.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,24 @@
<thead>
<tr>
<th class="center">
<SortLink name="countryName">Country</SortLink>
<SortLink name="countryName">
Country
</SortLink>
</th>
<th>
<SortLink name="count">Nodes</SortLink>
<SortLink name="count">
Nodes
</SortLink>
</th>
<th>
<SortLink name="total">Total users</SortLink>
<SortLink name="total">
Total users
</SortLink>
</th>
<th>
<SortLink name="actives">Active users</SortLink>
<SortLink name="actives">
Active users
</SortLink>
</th>
</tr>
</thead>
Expand Down Expand Up @@ -69,7 +77,6 @@ import gql from "graphql-tag"
import ApolloLoader from "./common/ApolloLoader"
import Drawer from "./common/Drawer"
import Footer from "./common/Footer"
const query = gql`
query {
Expand All @@ -94,7 +101,7 @@ export default {
},
},
name: "HostingReportPage",
components: {ApolloLoader, Drawer, Footer},
components: {ApolloLoader, Drawer},
data: () => ({values: []}),
}
Expand Down
14 changes: 11 additions & 3 deletions src/components/IndexContent.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
<main>
<header class="main-header">
<div class="main-title">
<h1><router-link to="/">The Federation</router-link></h1>
<h1>
<router-link to="/">
The Federation
</router-link>
</h1>
<h2>Welcome to the new social web</h2>
</div>
<div class="flex">
Expand Down Expand Up @@ -122,7 +126,9 @@
<thead>
<tr>
<th style="width: 20px;" />
<th style="text-align: left;">Project</th>
<th style="text-align: left;">
Project
</th>
<th>Nodes</th>
<th>Users</th>
<th>Website</th>
Expand Down Expand Up @@ -266,7 +272,9 @@ export default {
},
},
name: "IndexContent",
components: {ApolloLoader, Charts, PlatformTableRow, ProtocolTableRow, Number},
components: {
ApolloLoader, Charts, PlatformTableRow, ProtocolTableRow, Number,
},
data() {
return {
nodes: [],
Expand Down
34 changes: 21 additions & 13 deletions src/components/InfoPage.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,21 +70,26 @@
href="https://socialhome.network/u/thefederation"
title="thefederation@socialhome.network"
>
official account</a> on The Federation to receive daily or weekly statistics. The posts will be
tagged according to frequency, so instead of following the account you can also subscribe to
the hashtags. The following hashtags will be used:
official account</a> on The Federation to receive daily or weekly statistics. The posts
will be tagged according to frequency, so instead of following the account you can also
subscribe to the hashtags. The following hashtags will be used:
</p>
<blockquote>
<p><a href="https://socialhome.network/tags/thefederationstatsdaily/">
#thefederationstatsdaily
</a></p>
<p><a href="https://socialhome.network/tags/thefederationstatsweekly/">
#thefederationstatsweekly
</a></p>
<p>
<a href="https://socialhome.network/tags/thefederationstatsdaily/">
#thefederationstatsdaily
</a>
</p>
<p>
<a href="https://socialhome.network/tags/thefederationstatsweekly/">
#thefederationstatsweekly
</a>
</p>
</blockquote>
<h3>Licence</h3>
<ul>
<li>The Federation website code
<li>
The Federation website code
<a
href="https://github.com/thefederationinfo/the-federation.info"
target="_blank"
Expand All @@ -97,7 +102,8 @@
rel="noopener noreferrer"
>AGPLv3</a>)
</li>
<li>Blur background image
<li>
Blur background image
<a
href="https://www.flickr.com/photos/voidobjects/6204459845/"
target="_blank"
Expand All @@ -110,7 +116,8 @@
rel="noopener noreferrer"
>CC-BY</a>)
</li>
<li>The font used is
<li>
The font used is
<a
href="http://www.latofonts.com/lato-free-fonts/"
target="_blank"
Expand All @@ -125,7 +132,8 @@
</li>
</ul>

<p class="center">Hosted with &lt;3 by
<p class="center">
Hosted with &lt;3 by
<a
href="https://jasonrobinson.me"
target="_blank"
Expand Down
6 changes: 4 additions & 2 deletions src/components/NodesTable.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
<tr>
<th>Software</th>
<th>Name</th>
<th class="version-column">Version</th>
<th class="version-column">
Version
</th>
<th>Open signups</th>
<th>Total users</th>
<th>Active users half year</th>
Expand All @@ -18,9 +20,9 @@
<tbody>
<NodesTableRow
v-for="node in nodes"
:key="node.id"
:node="node"
:stats="statsForNode(node.id)"
:key="node.id"
/>
</tbody>
</table>
Expand Down
10 changes: 7 additions & 3 deletions src/components/NodesTableRow.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
:title="node.platform.name"
:src="imageSource"
>
<div v-else>&nbsp;</div>
<div v-else>
&nbsp;
</div>
</td>
<td>
<router-link
Expand All @@ -17,7 +19,9 @@
{{ node.name }}
</router-link>
</td>
<td class="version-column">{{ node.version }}</td>
<td class="version-column">
{{ node.version }}
</td>
<td>{{ openSignups }}</td>
<td>{{ stats.usersTotal ? stats.usersTotal : '' }}</td>
<td>{{ stats.usersHalfYear ? stats.usersHalfYear : '' }}</td>
Expand All @@ -26,8 +30,8 @@
<td>{{ stats.localComments ? stats.localComments : '' }}</td>
<td>
<span
v-tooltip="services"
v-if="services"
v-tooltip="services"
>
{{ node.services.length }}
</span>
Expand Down
4 changes: 3 additions & 1 deletion src/components/PlatformTableRow.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
:title="platform.name"
:src="imageSource"
>
<div v-else>&nbsp;</div>
<div v-else>
&nbsp;
</div>
</td>
<th style="text-align: left;">
<router-link
Expand Down

0 comments on commit e0fca33

Please sign in to comment.