From 3ff44fefd5d9eaba6c772d479523788c010b9e85 Mon Sep 17 00:00:00 2001
From: Nik <sch-nikolaj@yandex.ru>
Date: Wed, 2 Nov 2022 12:27:21 +0300
Subject: [PATCH] issue #180

---
 config/settings.py                            |   1 +
 contributors/views/contributor.py             |   5 ++
 locale/ru/LC_MESSAGES/django.mo               | Bin 6906 -> 6975 bytes
 locale/ru/LC_MESSAGES/django.po               |   4 ++
 static/js/activity_chart/my_chart.js          |  58 ++++++++++++++++++
 .../components/activity_chart/chart.html      |   5 ++
 .../components/activity_chart/scripts.html    |   3 +
 templates/contributor_details.html            |   9 ++-
 8 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 static/js/activity_chart/my_chart.js

diff --git a/config/settings.py b/config/settings.py
index 4f837fdb..3ac47968 100644
--- a/config/settings.py
+++ b/config/settings.py
@@ -31,6 +31,7 @@
     '[::1]',
     '.herokuapp.com',
     '.hexlet.io',
+    '0.0.0.0',
 ]
 
 INSTALLED_APPS = [
diff --git a/contributors/views/contributor.py b/contributors/views/contributor.py
index 5078094a..b311c715 100644
--- a/contributors/views/contributor.py
+++ b/contributors/views/contributor.py
@@ -37,4 +37,9 @@ def get_context_data(self, **kwargs):
         context['contributions_for_year'] = (
             self.object.contribution_set.for_year()
         )
+
+        context['current_contributor'] = self.object
+        if self.request.GET.get('compare') == 'yes':
+            context['my_contributions_for_year'] = self.request.user.contributor.contribution_set.for_year()
+
         return context
diff --git a/locale/ru/LC_MESSAGES/django.mo b/locale/ru/LC_MESSAGES/django.mo
index 937fc373d04d5e81a32df3c482c5159d7e3792aa..c68a206dc2f06bc6cedc2ad128ea21d099aafd2a 100644
GIT binary patch
delta 2291
zcmYk+YfM*V9Ki91M8yIm6f1@J8+pUTP(YNV0LA+SQ&Y2x8U$NO60JGe{>j?Pvfij$
zW!Lq>d}pv(Zgv?Pn=Pw9<3)3AT8q|fMRTq#vu58f|0mb8^E;pCJm;L}e$HQ&pH(H#
z=Vu-Xq!yx(SUoC)1K2f&6Y1To5IXQZya^|c3xOjfINgG!I2!AbN5XQPgiUA_t(b}J
zI1M{-2EKtjpA3Cu#!~Pl7T_Rqgo~VP@G@rOHMHXF8$-y!611Xn^!crLEAGOD*oC=x
zGT!gUJg&b%-~WE(elmpNc;g?m$GNm>g#~B@#b|jM+R;jM#Ea328qg6oVLon-*KP6s
zZsZ7EoE*rDvHS?;(tdcKj4$?}Q`nD=<ZHCSpV6iHJ>Jiz78@==M^u70V+HztBXWdw
z(e23CLK`}ePNb@^50e(WK*kZhiWBfK7UKtK182|?o<pBIkIv8#TJbPi;gxtjn%;Ro
z4}E_!I*{3Dd-IV;!=fD4-^?-!IKoCwR<tudusfFTLn}NG?;k>E?44NNgLdpR+M&L9
z{S{i@AUc2xXnRA*5iaF0|Mu(}S5Dnn7TgE&qD5$hrDy|{(Hiu<I<(>y@p>%|X0QkF
zl<zV8i8vI!f-||!Wxeje1xYgQ>TNg`_n-|PLOb*}F2Q41kH4bN&t>?u5gPG!+=PBT
zo#>Rmgp=_omf}gg4S&EYyox@ToX3KfkZHjE_&B=RF5-9`L-%LkB(#Fs=oXyDbq89}
zYv`Uij&|e=bRZX^zeNAQDU|yVdm$ML$vE;7^o6CE!1ZXwd(aVgM_)%PIDrW~i@x_8
zR^y-O5|;DQVys1Hstc#%%Qz2va2D-{pUB)v!FYaWWJ5)CRdgrXz+U7C&vUYYH<4Kk
z$I*&U;|lx{oryVo!+yqVqAkeaLlS-OFc#5%I7Ws}hkoSU@Ey9jE~6c~iZ+<f{5$eu
zw7e#|0eK{}p=;ia9N{fa&frJUGw7x}hpcY+8<Ree$6NMnDmv0Cbo14r-|I@W!KP>{
z+My&mwFl7|JR0wR9{m<?pnMn|@g?L4nT*1Ei>EOE_Ix@88CXgzCtM%XoHW<ZTgmw!
zC?Xyv%86#ebRV&ua6l%PqG2SL?&MtZcG}Ht^1rab^*2=$Yl-=UJ=;jw(@lg+@)%J|
ztR$S72ME*1KLPzxoKn}_<f#2D?;%_=mv<HMU%HnJvmch)zMtPiL>1vQ-%T_T_Y=zq
z(<6kR;VdGPND!vGh&sZZZd#otY{4CbpXfTm{p8x4D$;~)n0zo^h-+lpm1g9#G`oaw
zhx6~bp4=xb#KKrI6aA%{>Is+CJ@qKDnJ}#<7LDZi#iuO`jbug<ZlM3C*<94bf(5vS
zDC>PCt2$%ClTYpFXihxa*4dia+x|?))6Gw`^!ANw&ng^vE_EW+llmm}@j&;$!NkCR
Rj?|~A4~bK~W%*~b{sj#S#ZdqN

delta 2226
zcmX}tYiQMF9Ki8sc~)o5<8(S#+VaeKnR#u_HJ8iG+sd+w?zpa|P6%>EzUV^4$qJ(I
zg+=)yEF+2(Dxw3H2@?rI6JNw$h!TcxWLPnRC>9xgzvukc!+y`_`9J^v|GA(4j(7aM
ztazb5^KK&TByJ$qj7#Ya+;ue>X<s&_-S`&PVx}e~{?bIUMx2J#*oHikI&mtlLYwHr
z3~t5Q*pGAZP2~Av`ijCeR2)P8(syKbbOy)cIkdq`n8Pb*1GU#yo?nXBaovr}v49hB
zU)(>46S+Q&zW;69KUuCXrgWBqBOONCP9yQaXw+vJjRUMhXWEE1)P&A#KGx%sxLzIi
zdyv0WAaf$yqyA}hfG=S^{inSYT)KnkOb($Po<O(cRNTLWc07X4=n7843AFC}d9<T>
zVFxmYv>Kh@M&y;$8`s;g=!~AAFd3i18Tbm?!AIx}OXzdoper<pHhdCoa44>Sj{BF<
z_y0gAQq8CxKn|%&Q^MvP`|pevk=f9SxY2{w_mbJ+4)p#2y3{X3{a$on`_Ta%i0e<$
z=RZd$a1`x$5cx}|$sE|Z9P97WU5p1Vhkv0BX4oh@s0$m=7pJ2Qx5RZT4pngm@Tl)G
z{V6yY4q+?T!#EQsv2Pyg_9BI53LDT42hagMk85xb-htnvFVrx7`bc?fz{N<LX)R8}
z0^Wqr;PrR_JMakl+;7-||Kc7j&Sc{~WFKQ4p1`^IBig`dIGO3p=6WI8&?fY(^rHiL
z4V}Py;V0pjIGy@q=ovVRPWVFQKI_lhc`9nrh8LhS?G87i4Lpf?d>!rR5O!h--P>QW
z8%NO<x`jsO;5ux>0i1^);w=0Dr*i(%NV&l1_?%HpO=t)0=ofA!nH_9FRxS0T4L^r>
z;s@wT45L5aESWZwG0D`0zIQJ+;dW$<>1AxB|FoZihw2M-07uXc&!96uAN7BRIrfEO
znuYFpH@a1QWUk=u@KyA%y@Tvx`a0@QqXYX1i_Y|S3Ld(D&^@ZARR=OYY(WRqg)Z%S
zbO{S_|Hbfayo&n6=!`!@{?c(W+dYpC{32E%+fhvGDcnq$7F75@@1x}J-vjz6v4rR+
zOe=|p2@kEQhwztTa*&G%2ki=){2tt2E^#*S9-__tcVwFgCZ9GF&U^>qVRC<6nF3+*
zThLxERc3f&l%2JEdn@6LUEaHhv2+^+XYNnhEqR1kMl`tpi;4S)2Z(iq=`mss(Mn{9
z8H8y*aXYbsFm0%iw&3H0+p>}HJoz&-Ev=9q#D}6Rd{Uf0C(?|RFX#NjK!58Vrm^HX
z*-3Oph2IE1lI66DoWox}WLvSfT+4~a<x$=iuElXgOXYfO0V`jvu6U>e?<N+O-p_Vc
Pm42z&l`TD6e=7SQJn*M=

diff --git a/locale/ru/LC_MESSAGES/django.po b/locale/ru/LC_MESSAGES/django.po
index af23e1b6..17c52b55 100644
--- a/locale/ru/LC_MESSAGES/django.po
+++ b/locale/ru/LC_MESSAGES/django.po
@@ -465,6 +465,10 @@ msgstr "Добавления и удаления"
 msgid "Past year activity"
 msgstr "Активность за год"
 
+#: templates/contributor_details.html templates/home.html
+msgid "Compare with yourself"
+msgstr "Сравнить с собой"
+
 #: templates/contributor_details.html
 msgid "All-time contributions"
 msgstr "Вклад за всё время"
diff --git a/static/js/activity_chart/my_chart.js b/static/js/activity_chart/my_chart.js
new file mode 100644
index 00000000..3c3b21d9
--- /dev/null
+++ b/static/js/activity_chart/my_chart.js
@@ -0,0 +1,58 @@
+function generateMonths() {
+  const months = [];
+  moment.locale(document.documentElement.lang);
+  for (let i = 1; i <= 12; i += 1) {
+    months.push(moment().add(i, 'months').format('MMM'));
+  }
+  return months;
+}
+
+const my_contributions = JSON.parse(document.getElementById('my_contributions_for_year').textContent);
+const my_ctx = document.getElementById('my_yearActivityChart').getContext('2d');
+const my_config = {
+  type: 'bar',
+  data: {
+    labels: generateMonths(),
+    datasets: [
+      {
+        label: gettext('Commits'),
+        data: my_contributions.commits,
+        backgroundColor: 'rgba(87, 173, 219, 0.7)',
+      },
+      {
+        label: gettext('Pull requests'),
+        data: my_contributions.pull_requests,
+        backgroundColor: 'rgba(82, 206, 97, 0.7)',
+      },
+      {
+        label: gettext('Issues'),
+        data: my_contributions.issues,
+        backgroundColor: 'rgba(226, 113, 90, 0.7)',
+      },
+      {
+        label: gettext('Comments'),
+        data: my_contributions.comments,
+        backgroundColor: 'rgba(242, 232, 96, 0.7)',
+      },
+    ],
+  },
+  options: {
+    maintainAspectRatio: false,
+    tooltips: {
+      mode: 'index',
+      intersect: false,
+    },
+    animation: {
+      duration: 0,
+    },
+    scales: {
+      xAxes: [{
+        stacked: true,
+      }],
+      yAxes: [{
+        stacked: true,
+      }],
+    },
+  },
+};
+const my_yearActivityChart = new Chart(my_ctx, my_config);
diff --git a/templates/components/activity_chart/chart.html b/templates/components/activity_chart/chart.html
index 8eabf36a..185d583d 100644
--- a/templates/components/activity_chart/chart.html
+++ b/templates/components/activity_chart/chart.html
@@ -2,3 +2,8 @@
 
 <div class="chart-container mb-5"><canvas id="yearActivityChart"></canvas></div>
 <script src="{% static 'js/activity_chart/chart.js' %}"></script>
+
+{% if my_contributions_for_year %}
+  <div class="chart-container mb-5"><canvas id="my_yearActivityChart"></canvas></div>
+  <script src="{% static 'js/activity_chart/my_chart.js' %}"></script>
+{% endif %}
diff --git a/templates/components/activity_chart/scripts.html b/templates/components/activity_chart/scripts.html
index 6e80a6de..937a564a 100644
--- a/templates/components/activity_chart/scripts.html
+++ b/templates/components/activity_chart/scripts.html
@@ -1,3 +1,6 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment-with-locales.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.9.3/Chart.min.js"></script>
 {{ contributions_for_year|json_script:'contributions_for_year' }}
+{% if my_contributions_for_year %}
+  {{ my_contributions_for_year|json_script:'my_contributions_for_year' }}
+{% endif %}
diff --git a/templates/contributor_details.html b/templates/contributor_details.html
index 183b29ae..6d70ebe6 100644
--- a/templates/contributor_details.html
+++ b/templates/contributor_details.html
@@ -178,7 +178,14 @@ <h2 class="h5 card-subtitle font-weight-light mt-3">
       </div>
     </div>
     <div class="col">
-      <h2>{% trans "Past year activity" %}</h2>
+        <h2>{% translate "Past year activity" %}
+          {% if user.is_authenticated %}
+          <a class="btn btn-outline-primary"
+            href="{% url 'contributors:contributor_details' current_contributor %}?compare=yes">
+            {% translate "Compare with yourself" %}
+          </a>
+          {% endif %}
+        </h2>
       {% include 'components/activity_chart/chart.html' %}
       <h2 class="mr-5">{% trans "All-time contributions" %}</h2>
       <input type="text" name="name" id="repo-search-field" class="form-control col-3"