Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Repository stats #49

Merged
merged 10 commits into from
May 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,10 @@
"dependencies": {
"@sentry/electron": "^0.17.0",
"axios": "^0.18.0",
"chart.js": "^2.8.0",
"simple-git": "1.110.0",
"vue": "2.6.10",
"vue-chartjs": "^3.4.2",
"vue-electron": "^1.0.6",
"vue-router": "3.0.2",
"vuex": "^3.0.1"
Expand All @@ -104,6 +106,7 @@
"@babel/register": "^7.4.0",
"@babel/runtime": "^7.4.3",
"ajv": "^6.5.0",
"apexcharts": "^3.6.10",
"babel-eslint": "10.0.1",
"babel-loader": "8.0.5",
"babili-webpack-plugin": "^0.1.2",
Expand Down Expand Up @@ -139,6 +142,7 @@
"sass-loader": "^7.0.3",
"style-loader": "0.23.1",
"url-loader": "^1.0.1",
"vue-apexcharts": "^1.3.5",
"vue-content-loader": "^0.2.1",
"vue-html-loader": "^1.2.4",
"vue-js-toggle-button": "^1.3.2",
Expand Down
11 changes: 10 additions & 1 deletion src/renderer/components/sidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,28 @@
<clockIcon />
<p>History</p>
</router-link>
<router-link
class="repository__sidebar__item d-flex align-items-center"
:to="{ name: 'repositoryStats' }"
>
<barIcon />
<p>Stats</p>
</router-link>
</div>
</div>
</template>

<script>
import folderIcon from "./icon/folder";
import clockIcon from "./icon/clock";
import barIcon from "./icon/bar";

export default {
name: "Sidebar",
components: {
folderIcon,
clockIcon
clockIcon,
barIcon
}
};
</script>
Expand Down
4 changes: 2 additions & 2 deletions src/renderer/git/log.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import git from "simple-git/promise";
import * as Sentry from "@sentry/electron";

const log = async repository => {
const data = await git(repository.path).log();
const log = async (repository, params) => {
const data = await git(repository.path).log(params);
try {
return data.all;
} catch (error) {
Expand Down
125 changes: 125 additions & 0 deletions src/renderer/pages/repository/stats.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
<template>
<div class="stats w-100">
<VueScrollbar class="stats__scrollbar">
<div class="container">
<div class="stats__content">
<div class="stats__content-group">
<p>Commits per day</p>
<ApexCharts type="area" :options="options" :series="series" />
</div>
</div>
</div>
</VueScrollbar>
</div>
</template>

<script>
import gitLog from "../../git/log";
import ApexCharts from "vue-apexcharts";
import VueScrollbar from "vue2-scrollbar";

export default {
name: "RepositoryStats",
components: {
ApexCharts,
VueScrollbar
},
data() {
return {
commitCountData: [],
options: {
chart: {
id: "numberOfCommits"
},
xaxis: {
type: "datetime",
categories: []
}
},
series: [
{
name: "commits",
data: []
}
]
};
},
computed: {
currentRepository() {
return this.$store.getters["workspace/currentRepository"];
}
},
created() {
gitLog(this.currentRepository, [
"--date=short",
"--pretty=format:%ad"
]).then(result => {
this.commitCount(result[0].hash.split("\n"));
this.series[0].data = this.commitCountData;
});
},
methods: {
commitCount(commits) {
let graphData = [];
let data = {
x: "",
y: 0
};
for (let i = 0; i < commits.length; i++) {
if (commits[i] === commits[i + 1]) {
data.x = commits[i];
data.y += 1;
} else {
if (commits[i] === commits[i - 1]) {
data.y += 1;
}
if (data.x === "") {
data.x = commits[i];
data.y = 1;
}
graphData.push(data);
data = {
x: "",
y: 0
};
}
}
this.commitCountData = graphData;
},
statsLabel() {
let array = [];
for (let i = 0; i < this.commitCountData.length; i++) {
array.push(this.commitCountData[i].date);
}
this.options.xaxis.categories = array;
},
statsDataSet() {
let array = [];
for (let i = 0; i < this.commitCountData.length; i++) {
array.push(this.commitCountData[i].count);
}
this.series[0].data = array;
}
}
};
</script>

<style lang="sass">
.stats
&__scrollbar
max-height: 86vh

&__content
margin-top: 2rem
margin-bottom: 4rem

&-group
border: 1px solid #eee
border-radius: .3rem
padding: 1rem

p
font-size: 0.875rem
text-align: center
margin-bottom: .3rem
</style>
5 changes: 5 additions & 0 deletions src/renderer/router/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ let routes = [
name: "repositoryHistory",
component: require("../pages/repository/history").default
},
{
path: "stats",
name: "repositoryStats",
component: require("../pages/repository/stats").default
},
{
path: "settings",
name: "repositorySettings",
Expand Down
117 changes: 111 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1058,6 +1058,20 @@ anymatch@^2.0.0:
micromatch "^3.1.4"
normalize-path "^2.1.1"

apexcharts@^3.6.10:
version "3.6.10"
resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.6.10.tgz#553588b58e6b0757716f991255c2cb41ba2abaa7"
integrity sha512-RdlpC3KqEAAPBH7RaE6pwXGlp2XUtlNgAfE7xmvmquLl6W6RYU6dicIqPsuJtpePrZqLAYdbtxOiwrIrc7Xkjg==
dependencies:
promise-polyfill "8.1.0"
svg.draggable.js "^2.2.1"
svg.easing.js "^2.0.0"
svg.filter.js "^2.0.2"
svg.js "^2.6.6"
svg.pathmorphing.js "^0.1.3"
svg.resize.js "^1.4.1"
svg.select.js "^2.1.2"

app-builder-bin@2.6.4:
version "2.6.4"
resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.6.4.tgz#011cd9e7e144d52b43fffa15aff8039804d3078a"
Expand Down Expand Up @@ -2130,6 +2144,29 @@ chardet@^0.7.0:
resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==

chart.js@^2.8.0:
version "2.8.0"
resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.8.0.tgz#b703b10d0f4ec5079eaefdcd6ca32dc8f826e0e9"
integrity sha512-Di3wUL4BFvqI5FB5K26aQ+hvWh8wnP9A3DWGvXHVkO13D3DSnaSsdZx29cXlEsYKVkn1E2az+ZYFS4t0zi8x0w==
dependencies:
chartjs-color "^2.1.0"
moment "^2.10.2"

chartjs-color-string@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz#1df096621c0e70720a64f4135ea171d051402f71"
integrity sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==
dependencies:
color-name "^1.0.0"

chartjs-color@^2.1.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.3.0.tgz#0e7e1e8dba37eae8415fd3db38bf572007dd958f"
integrity sha512-hEvVheqczsoHD+fZ+tfPUE+1+RbV6b+eksp2LwAhwRTVXEjCSEavvk+Hg3H6SZfGlPh/UfmWKGIvZbtobOEm3g==
dependencies:
chartjs-color-string "^0.6.0"
color-convert "^0.5.3"

chokidar@^2.0.0, chokidar@^2.0.2:
version "2.1.5"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d"
Expand Down Expand Up @@ -2288,23 +2325,28 @@ collection-visit@^1.0.0:
map-visit "^1.0.0"
object-visit "^1.0.0"

color-convert@^0.5.3, color-convert@~0.5.0:
version "0.5.3"
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz#bdb6c69ce660fadffe0b0007cc447e1b9f7282bd"
integrity sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=

color-convert@^1.9.0:
version "1.9.3"
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
dependencies:
color-name "1.1.3"

color-convert@~0.5.0:
version "0.5.3"
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz#bdb6c69ce660fadffe0b0007cc447e1b9f7282bd"
integrity sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=

color-name@1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=

color-name@^1.0.0:
version "1.1.4"
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==

combined-stream@1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
Expand Down Expand Up @@ -5794,7 +5836,7 @@ mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdi
dependencies:
minimist "0.0.8"

moment@^2.11.1:
moment@^2.10.2, moment@^2.11.1:
version "2.24.0"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
Expand Down Expand Up @@ -6741,6 +6783,11 @@ promise-inflight@^1.0.1:
resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=

promise-polyfill@8.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-8.1.0.tgz#30059da54d1358ce905ac581f287e184aedf995d"
integrity sha512-OzSf6gcCUQ01byV4BgwyUCswlaQQ6gzXc23aLQWhicvfX9kfsUiUhgt3CCQej8jDnl8/PhGF31JdHX2/MzF3WA==

proxy-addr@~2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
Expand Down Expand Up @@ -7908,6 +7955,54 @@ supports-color@^6.1.0:
dependencies:
has-flag "^3.0.0"

svg.draggable.js@^2.2.1:
version "2.2.2"
resolved "https://registry.yarnpkg.com/svg.draggable.js/-/svg.draggable.js-2.2.2.tgz#c514a2f1405efb6f0263e7958f5b68fce50603ba"
integrity sha512-JzNHBc2fLQMzYCZ90KZHN2ohXL0BQJGQimK1kGk6AvSeibuKcIdDX9Kr0dT9+UJ5O8nYA0RB839Lhvk4CY4MZw==
dependencies:
svg.js "^2.0.1"

svg.easing.js@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/svg.easing.js/-/svg.easing.js-2.0.0.tgz#8aa9946b0a8e27857a5c40a10eba4091e5691f12"
integrity sha1-iqmUawqOJ4V6XEChDrpAkeVpHxI=
dependencies:
svg.js ">=2.3.x"

svg.filter.js@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/svg.filter.js/-/svg.filter.js-2.0.2.tgz#91008e151389dd9230779fcbe6e2c9a362d1c203"
integrity sha1-kQCOFROJ3ZIwd5/L5uLJo2LRwgM=
dependencies:
svg.js "^2.2.5"

svg.js@>=2.3.x, svg.js@^2.0.1, svg.js@^2.2.5, svg.js@^2.4.0, svg.js@^2.6.5, svg.js@^2.6.6:
version "2.7.1"
resolved "https://registry.yarnpkg.com/svg.js/-/svg.js-2.7.1.tgz#eb977ed4737001eab859949b4a398ee1bb79948d"
integrity sha512-ycbxpizEQktk3FYvn/8BH+6/EuWXg7ZpQREJvgacqn46gIddG24tNNe4Son6omdXCnSOaApnpZw6MPCBA1dODA==

svg.pathmorphing.js@^0.1.3:
version "0.1.3"
resolved "https://registry.yarnpkg.com/svg.pathmorphing.js/-/svg.pathmorphing.js-0.1.3.tgz#c25718a1cc7c36e852ecabc380e758ac09bb2b65"
integrity sha512-49HWI9X4XQR/JG1qXkSDV8xViuTLIWm/B/7YuQELV5KMOPtXjiwH4XPJvr/ghEDibmLQ9Oc22dpWpG0vUDDNww==
dependencies:
svg.js "^2.4.0"

svg.resize.js@^1.4.1:
version "1.4.3"
resolved "https://registry.yarnpkg.com/svg.resize.js/-/svg.resize.js-1.4.3.tgz#885abd248e0cd205b36b973c4b578b9a36f23332"
integrity sha512-9k5sXJuPKp+mVzXNvxz7U0uC9oVMQrrf7cFsETznzUDDm0x8+77dtZkWdMfRlmbkEEYvUn9btKuZ3n41oNA+uw==
dependencies:
svg.js "^2.6.5"
svg.select.js "^2.1.2"

svg.select.js@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/svg.select.js/-/svg.select.js-2.1.2.tgz#e41ce13b1acff43a7441f9f8be87a2319c87be73"
integrity sha512-tH6ABEyJsAOVAhwcCjF8mw4crjXSI1aa7j2VQR8ZuJ37H2MBUbyeqYr5nEO7sSN3cy9AR9DUwNg0t/962HlDbQ==
dependencies:
svg.js "^2.2.5"

swap-case@^1.1.0:
version "1.1.2"
resolved "https://registry.yarnpkg.com/swap-case/-/swap-case-1.1.2.tgz#c39203a4587385fad3c850a0bd1bcafa081974e3"
Expand Down Expand Up @@ -8442,6 +8537,16 @@ vm-browserify@0.0.4:
dependencies:
indexof "0.0.1"

vue-apexcharts@^1.3.5:
version "1.3.5"
resolved "https://registry.yarnpkg.com/vue-apexcharts/-/vue-apexcharts-1.3.5.tgz#4c98c314ffdb6ea63c9354678bf93a666a859921"
integrity sha512-9UeY9013+BQfQbx7JrBjLiQf3wNa041OrfnC3F1onmsIY1z842xGMiRD60PqBSvc3wHzxYtKzj8LngSuDYWaCA==

vue-chartjs@^3.4.2:
version "3.4.2"
resolved "https://registry.yarnpkg.com/vue-chartjs/-/vue-chartjs-3.4.2.tgz#0323e6a99a10a68f38d426899c3994f48596fd23"
integrity sha512-EhoXUJ17+9isMLhJpOliS++xE5z5FM8iAVytIqnKofByVMr8AISRL/SCy3zvWbvzhjgQPStd9y6adMF5bnWQdg==

vue-content-loader@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/vue-content-loader/-/vue-content-loader-0.2.1.tgz#0eb332e2a72643d57fb209d72d6526573b191f5a"
Expand Down