diff --git a/public/index.html b/public/index.html index 90f33d8f2..c11418aef 100755 --- a/public/index.html +++ b/public/index.html @@ -68,11 +68,11 @@ window.onload=function(){ $(".newContainer").delegate("a.anchors","click",function(){ let h = $(this).offset().top - 180; - console.log($(this).offset().top,document.body.scrollTop); $("html,body").animate({scrollTop:h},10); window.location.hash = $(this).attr("name"); return false; }); + } diff --git a/src/forge/About/Index.jsx b/src/forge/About/Index.jsx index 0546278f5..7f1222de1 100644 --- a/src/forge/About/Index.jsx +++ b/src/forge/About/Index.jsx @@ -68,13 +68,14 @@ function Index(props){ return(
- - 项目概览 - { editOpration && !edit && 编辑 } - +
+ 项目概览 + { editOpration && !edit && + 编辑 } +
{ edit ? -
+
: -
+
{content ? : diff --git a/src/forge/About/index.scss b/src/forge/About/index.scss index 2ddb21a47..a009b45de 100644 --- a/src/forge/About/index.scss +++ b/src/forge/About/index.scss @@ -3,10 +3,25 @@ margin:0px auto; .aboutContent{ border-radius: 2px; - border: 1px solid #EEEEEE; + // border: 1px solid #EEEEEE; width:100%; background-color: #fff; margin-top:20px; margin-bottom: 30px; + .aboutTitle{ + height: 50px; + background-color: #fafcff; + border: 1px solid; + border-color: rgba(42, 97, 255, 0.23); + border-radius: 4px 4px 0px 0px; + display: flex; + align-items: center; + justify-content: space-between; + padding:0px 20px; + } + .boies{ + border: 1px solid #d0d0d0; + border-top: none; + } } } \ No newline at end of file diff --git a/src/forge/Activity/Activity.js b/src/forge/Activity/Activity.js index 58af11d60..616c94511 100644 --- a/src/forge/Activity/Activity.js +++ b/src/forge/Activity/Activity.js @@ -9,6 +9,7 @@ import IssueLine from './issueLine'; import BranchLine from './branchLine'; import SmoothLine from './smoothLine'; import SmoothLineTwo from './smoothLineTwo'; +import Demo from './demo'; import ProjectScale from './ProjectScale'; import Pie from './pie'; @@ -185,74 +186,76 @@ class Activity extends Component{
概览
-
-
-
-

-

+
+
+
+
+

+

+
+ {data && data.pr_all_count}合并请求
- {data && data.pr_all_count}合并请求 -
-
-
-

-

+
+
+

+

+
+ {data && data.issues_count}疑修
- {data && data.issues_count}疑修
+
    +
  • + {data && data.pr_count} + this.changeTrends("PullRequest","delay")}>已处理的合并请求 +
    • +
  • + {data && data.new_pr_count} + this.changeTrends("PullRequest","not_delay")}>未处理的合并请求 +
    • +
  • + {data && data.close_issues_count} + this.changeTrends("Issue","delay")}>已关闭的疑修 +
    • +
  • + {data && data.open_issues_count} + this.changeTrends("Issue","not_delay")}>未处理的疑修 +
    • +
+ { + codeStatus && +
+
{codeStatus.author_count}位作者 已经推送 {codeStatus.commit_count}次提交 到 + {codeStatus.commit_count_in_all_branches && codeStatus.commit_count_in_all_branches>0? {projectDetail && projectDetail.default_branch}分支 和 {codeStatus.commit_count_in_all_branches}次提交 到所有分支:""}。 在 {projectDetail && projectDetail.default_branch}分支上， + {codeStatus.change_files && codeStatus.change_files >0 ? {codeStatus.change_files} 个文件 已经改变 而且:""} + {codeStatus.additions && codeStatus.additions >0 ?新增 {codeStatus.additions} 行代码:""} + {(codeStatus.additions && codeStatus.additions >0) &&(codeStatus.deletions && codeStatus.deletions >0) ? 和:""} + {codeStatus.deletions && codeStatus.deletions >0 ? 删除 {codeStatus.deletions} 行代码:""}.
+ {/* { + codeStatus.authors && codeStatus.authors.length > 0 && +
    + { + codeStatus.authors.map((i,v)=>{ + return( + i.author ? + !i.author.id ? + + + {i.author && i.author.name} + + : + + + {i.author && i.author.name} + + :"" + ) + }) + } +
+ } */} +
+ }
-
    -
  • - {data && data.pr_count} - this.changeTrends("PullRequest","delay")}>已处理的合并请求 -
    • -
  • - {data && data.new_pr_count} - this.changeTrends("PullRequest","not_delay")}>未处理的合并请求 -
    • -
  • - {data && data.close_issues_count} - this.changeTrends("Issue","delay")}>已关闭的疑修 -
    • -
  • - {data && data.open_issues_count} - this.changeTrends("Issue","not_delay")}>未处理的疑修 -
    • -
- { - codeStatus && -
-
{codeStatus.author_count}位作者 已经推送 {codeStatus.commit_count}次提交 到 - {codeStatus.commit_count_in_all_branches && codeStatus.commit_count_in_all_branches>0? {projectDetail && projectDetail.default_branch}分支 和 {codeStatus.commit_count_in_all_branches}次提交 到所有分支:""}。 在 {projectDetail && projectDetail.default_branch}分支上， - {codeStatus.change_files && codeStatus.change_files >0 ? {codeStatus.change_files} 个文件 已经改变 而且:""} - {codeStatus.additions && codeStatus.additions >0 ?新增 {codeStatus.additions} 行代码:""} - {(codeStatus.additions && codeStatus.additions >0) &&(codeStatus.deletions && codeStatus.deletions >0) ? 和:""} - {codeStatus.deletions && codeStatus.deletions >0 ? 删除 {codeStatus.deletions} 行代码:""}.
- {/* { - codeStatus.authors && codeStatus.authors.length > 0 && -
    - { - codeStatus.authors.map((i,v)=>{ - return( - i.author ? - !i.author.id ? - - - {i.author && i.author.name} - - : - - - {i.author && i.author.name} - - :"" - ) - }) - } -
- } */} -
- }
{ ai_shang_v1_url && @@ -272,12 +275,13 @@ class Activity extends Component{

基于信息熵围绕项目社群的社区分裂、缩减、合并和扩大演化行为度量

+
}
- 疑修/合并请求记录 + 疑修/合并请求记录
diff --git a/src/forge/Activity/activity.css b/src/forge/Activity/activity.css index 2f497a561..c5d323224 100644 --- a/src/forge/Activity/activity.css +++ b/src/forge/Activity/activity.css @@ -1,7 +1,9 @@ .trendsTop{ - padding:15px; - border-bottom:1px solid #ddd; - background-color: #f4f4f4; + background-color: #fafcff; + border: 1px solid; + border-color: rgba(42, 97, 255, 0.23); + border-radius: 4px 4px 0px 0px; + padding: 10px 20px; display: flex; align-items: center; justify-content: space-between; @@ -29,6 +31,10 @@ display: flex; justify-content: space-between; } +.boxpart{ + border: 1px solid #d0d0d0; + border-top: none; +} .orderInfo > div{ width: 45%; } @@ -95,7 +101,7 @@ } .commentsBox{ border-radius: 4px; - border: 1px solid #ddd; + /* border: 1px solid #ddd; */ margin: 20px 0px 20px 0px; } .prMsg{ @@ -140,6 +146,10 @@ white-space: nowrap; text-overflow: ellipsis; } +.activity_list{ + border:1px solid #d0d0d0; + border-top: none; +} .activity_list .activity_item{ border-bottom: 1px solid #f4f4f4; padding:15px; diff --git a/src/forge/Activity/data.js b/src/forge/Activity/data.js index 84e6dcbcc..080ac6125 100644 --- a/src/forge/Activity/data.js +++ b/src/forge/Activity/data.js @@ -1,4 +1,4 @@ -const data = [["2016-01-01",0.0],["2016-01-02",0.0],["2016-01-03",0.0],["2016-01-04",0.0],["2016-01-05",0.0],["2016-01-06",0.0],["2016-01-07",0.0],["2016-01-08",0.0],["2016-01-09",0.0],["2016-01-10",0.0],["2016-01-11",0.0],["2016-01-12",0.0],["2016-01-13",0.0],["2016-01-14",0.0],["2016-01-15",0.0],["2016-01-16",0.0],["2016-01-17",0.0],["2016-01-18",0.0],["2016-01-19",0.0],["2016-01-20",0.0],["2016-01-21",0.0],["2016-01-22",0.0],["2016-01-23",0.0],["2016-01-24",0.0],["2016-01-25",0.0],["2016-01-26",0.0],["2016-01-27",0.0],["2016-01-28",0.0],["2016-01-29",0.0],["2016-01-30",0.0],["2016-01-31",0.0],["2016-02-01",0.0],["2016-02-02",0.0],["2016-02-03",0.0],["2016-02-04",0.0],["2016-02-05",0.0],["2016-02-06",0.0],["2016-02-07",0.0],["2016-02-08",0.0],["2016-02-09",0.0],["2016-02-10",0.0],["2016-02-11",0.0],["2016-02-12",0.0],["2016-02-13",0.0],["2016-02-14",0.0],["2016-02-15",0.0],["2016-02-16",0.0],["2016-02-17",0.0],["2016-02-18",0.0],["2016-02-19",0.0],["2016-02-20",0.0],["2016-02-21",0.0],["2016-02-22",0.0],["2016-02-23",0.0],["2016-02-24",0.0],["2016-02-25",0.0],["2016-02-26",0.0],["2016-02-27",0.0],["2016-02-28",0.0],["2016-02-29",0.0],["2016-03-01",0.0],["2016-03-02",0.0],["2016-03-03",0.0],["2016-03-04",0.0],["2016-03-05",0.0],["2016-03-06",0.0],["2016-03-07",0.0],["2016-03-08",0.0],["2016-03-09",0.0],["2016-03-10",0.0],["2016-03-11",0.0],["2016-03-12",0.0],["2016-03-13",0.0],["2016-03-14",0.0],["2016-03-15",0.0],["2016-03-16",0.0],["2016-03-17",0.0],["2016-03-18",0.0],["2016-03-19",0.0],["2016-03-20",0.0],["2016-03-21",0.0],["2016-03-22",0.0],["2016-03-23",0.0],["2016-03-24",0.0],["2016-03-25",0.0],["2016-03-26",0.0],["2016-03-27",0.0],["2016-03-28",0.0],["2016-03-29",0.0],["2016-03-30",0.0],["2016-03-31",0.0],["2016-04-01",0.0],["2016-04-02",0.0],["2016-04-03",0.0],["2016-04-04",0.0],["2016-04-05",0.0],["2016-04-06",0.0],["2016-04-07",0.0],["2016-04-08",0.0],["2016-04-09",0.0],["2016-04-10",0.0],["2016-04-11",0.0],["2016-04-12",0.0],["2016-04-13",0.0],["2016-04-14",0.0],["2016-04-15",0.0],["2016-04-16",0.0],["2016-04-17",0.0],["2016-04-18",0.0],["2016-04-19",0.0],["2016-04-20",0.0],["2016-04-21",0.0],["2016-04-22",0.0],["2016-04-23",0.0],["2016-04-24",0.0],["2016-04-25",0.0],["2016-04-26",0.0],["2016-04-27",0.0],["2016-04-28",0.0],["2016-04-29",0.0],["2016-04-30",0.0],["2016-05-01",0.0],["2016-05-02",0.0],["2016-05-03",0.0],["2016-05-04",0.0],["2016-05-05",0.0],["2016-05-06",0.0],["2016-05-07",0.0],["2016-05-08",0.0],["2016-05-09",0.0],["2016-05-10",0.0],["2016-05-11",0.0],["2016-05-12",0.0],["2016-05-13",0.0],["2016-05-14",0.0],["2016-05-15",0.0],["2016-05-16",0.0],["2016-05-17",0.0],["2016-05-18",0.0],["2016-05-19",0.0],["2016-05-20",0.0],["2016-05-21",0.0],["2016-05-22",0.0],["2016-05-23",0.0],["2016-05-24",0.0],["2016-05-25",0.0],["2016-05-26",0.0],["2016-05-27",0.0],["2016-05-28",0.0],["2016-05-29",0.0],["2016-05-30",0.0],["2016-05-31",0.0],["2016-06-01",0.0],["2016-06-02",0.0],["2016-06-03",0.0],["2016-06-04",0.0],["2016-06-05",0.0],["2016-06-06",0.0],["2016-06-07",0.0],["2016-06-08",0.0],["2016-06-09",0.0],["2016-06-10",0.0],["2016-06-11",0.0],["2016-06-12",0.0],["2016-06-13",0.0],["2016-06-14",0.0],["2016-06-15",0.0],["2016-06-16",0.0],["2016-06-17",0.0],["2016-06-18",0.0],["2016-06-19",0.0],["2016-06-20",0.0],["2016-06-21",0.0],["2016-06-22",0.0],["2016-06-23",0.0],["2016-06-24",0.0],["2016-06-25",0.0],["2016-06-26",0.0],["2016-06-27",0.0],["2016-06-28",0.0],["2016-06-29",0.0],["2016-06-30",0.0],["2016-07-01",0.0],["2016-07-02",0.0],["2016-07-03",0.0],["2016-07-04",0.0],["2016-07-05",0.0],["2016-07-06",0.0],["2016-07-07",0.0],["2016-07-08",0.0],["2016-07-09",0.0],["2016-07-10",0.0],["2016-07-11",0.0],["2016-07-12",0.0],["2016-07-13",0.0],["2016-07-14",0.0],["2016-07-15",0.0],["2016-07-16",0.0],["2016-07-17",0.0],["2016-07-18",0.0],["2016-07-19",0.0],["2016-07-20",0.0],["2016-07-21",0.0],["2016-07-22",0.0],["2016-07-23",0.0],["2016-07-24",0.0],["2016-07-25",0.0],["2016-07-26",0.0],["2016-07-27",0.0],["2016-07-28",0.0],["2016-07-29",0.0],["2016-07-30",0.0],["2016-07-31",0.0],["2016-08-01",0.0],["2016-08-02",0.0],["2016-08-03",0.0],["2016-08-04",0.0],["2016-08-05",0.0],["2016-08-06",0.0],["2016-08-07",0.0],["2016-08-08",0.0],["2016-08-09",0.0],["2016-08-10",0.0],["2016-08-11",0.0],["2016-08-12",0.0],["2016-08-13",0.0],["2016-08-14",0.0],["2016-08-15",0.0],["2016-08-16",0.0],["2016-08-17",0.0],["2016-08-18",0.0],["2016-08-19",0.0],["2016-08-20",0.0],["2016-08-21",0.0],["2016-08-22",0.0],["2016-08-23",0.0],["2016-08-24",0.0],["2016-08-25",0.0],["2016-08-26",0.0],["2016-08-27",0.0],["2016-08-28",0.0],["2016-08-29",0.0],["2016-08-30",0.0],["2016-08-31",28.26],["2016-09-01",18.0],["2016-09-02",49.77],["2016-09-03",22.26],["2016-09-04",2.0],["2016-09-05",17.51],["2016-09-06",4.75],["2016-09-07",6.0],["2016-09-08",23.51],["2016-09-09",29.02],["2016-09-10",14.75],["2016-09-11",0.0],["2016-09-12",13.51],["2016-09-13",19.51],["2016-09-14",28.53],["2016-09-15",16.75],["2016-09-16",11.51],["2016-09-17",4.75],["2016-09-18",10.0],["2016-09-19",24.26],["2016-09-20",20.26],["2016-09-21",53.38],["2016-09-22",12.26],["2016-09-23",38.63],["2016-09-24",10.75],["2016-09-25",0.0],["2016-09-26",20.36],["2016-09-27",37.51],["2016-09-28",78.85],["2016-09-29",71.09],["2016-09-30",52.0],["2016-10-01",16.0],["2016-10-02",0.0],["2016-10-03",2.0],["2016-10-04",0.0],["2016-10-05",8.0],["2016-10-06",2.0],["2016-10-07",0.0],["2016-10-08",78.36],["2016-10-09",24.75],["2016-10-10",63.77],["2016-10-11",58.77],["2016-10-12",10.0],["2016-10-13",24.26],["2016-10-14",40.26],["2016-10-15",8.0],["2016-10-16",0.0],["2016-10-17",57.51],["2016-10-18",28.0],["2016-10-19",28.75],["2016-10-20",8.14],["2016-10-21",22.14],["2016-10-22",0.0],["2016-10-23",0.0],["2016-10-24",58.26],["2016-10-25",58.36],["2016-10-26",105.02],["2016-10-27",66.79],["2016-10-28",84.34],["2016-10-29",0.0],["2016-10-30",11.51],["2016-10-31",73.12],["2016-11-01",51.49],["2016-11-02",183.68],["2016-11-03",84.93],["2016-11-04",142.87],["2016-11-05",64.53],["2016-11-06",12.75],["2016-11-07",123.85],["2016-11-08",178.2],["2016-11-09",140.07],["2016-11-10",85.38],["2016-11-11",176.6],["2016-11-12",38.36],["2016-11-13",12.0],["2016-11-14",82.24],["2016-11-15",157.37],["2016-11-16",59.97],["2016-11-17",98.79],["2016-11-18",92.91],["2016-11-19",6.75],["2016-11-20",11.61],["2016-11-21",124.28],["2016-11-22",75.02],["2016-11-23",95.26],["2016-11-24",168.78],["2016-11-25",128.53],["2016-11-26",26.26],["2016-11-27",12.75],["2016-11-28",112.94],["2016-11-29",143.62],["2016-11-30",98.24],["2016-12-01",131.38],["2016-12-02",78.53],["2016-12-03",4.75],["2016-12-04",0.0],["2016-12-05",191.67],["2016-12-06",95.97],["2016-12-07",103.28],["2016-12-08",146.32],["2016-12-09",142.5],["2016-12-10",12.0],["2016-12-11",34.75],["2016-12-12",181.69],["2016-12-13",170.03],["2016-12-14",170.18],["2016-12-15",207.82],["2016-12-16",139.28],["2016-12-17",2.0],["2016-12-18",25.25],["2016-12-19",143.1],["2016-12-20",122.99],["2016-12-21",112.11],["2016-12-22",128.31],["2016-12-23",77.97],["2016-12-24",0.0],["2016-12-25",2.0],["2016-12-26",45.51],["2016-12-27",78.68],["2016-12-28",71.38],["2016-12-29",39.41],["2016-12-30",74.24],["2016-12-31",0.0],["2017-01-01",10.0],["2017-01-02",6.75],["2017-01-03",37.77],["2017-01-04",63.92],["2017-01-05",68.4],["2017-01-06",80.57],["2017-01-07",0.0],["2017-01-08",13.65],["2017-01-09",19.61],["2017-01-10",72.75],["2017-01-11",100.5],["2017-01-12",47.51],["2017-01-13",26.0],["2017-01-14",25.87],["2017-01-15",12.0],["2017-01-16",61.38],["2017-01-17",101.12],["2017-01-18",39.77],["2017-01-19",83.02],["2017-01-20",32.75],["2017-01-21",27.25],["2017-01-22",27.51],["2017-01-23",61.02],["2017-01-24",24.75],["2017-01-25",10.0],["2017-01-26",26.75],["2017-01-27",23.51],["2017-01-28",8.75],["2017-01-29",6.75],["2017-01-30",41.02],["2017-01-31",6.75],["2017-02-01",42.85],["2017-02-02",24.0],["2017-02-03",34.36],["2017-02-04",46.73],["2017-02-05",16.0],["2017-02-06",27.12],["2017-02-07",21.51],["2017-02-08",43.77],["2017-02-09",18.75],["2017-02-10",33.14],["2017-02-11",11.51],["2017-02-12",16.0],["2017-02-13",48.36],["2017-02-14",53.16],["2017-02-15",14.14],["2017-02-16",34.66],["2017-02-17",54.26],["2017-02-18",0.0],["2017-02-19",14.75],["2017-02-20",155.5],["2017-02-21",140.89],["2017-02-22",101.48],["2017-02-23",113.62],["2017-02-24",107.79],["2017-02-25",6.0],["2017-02-26",4.0],["2017-02-27",149.23],["2017-02-28",115.66],["2017-03-01",139.66],["2017-03-02",141.36],["2017-03-03",175.09],["2017-03-04",44.53],["2017-03-05",22.75],["2017-03-06",72.36],["2017-03-07",32.75],["2017-03-08",71.48],["2017-03-09",86.0],["2017-03-10",18.26],["2017-03-11",0.0],["2017-03-12",24.85],["2017-03-13",51.02],["2017-03-14",69.87],["2017-03-15",37.86],["2017-03-16",26.85],["2017-03-17",80.89],["2017-03-18",21.61],["2017-03-19",14.0],["2017-03-20",87.48],["2017-03-21",100.15],["2017-03-22",147.81],["2017-03-23",32.36],["2017-03-24",52.36],["2017-03-25",0.0],["2017-03-26",4.0],["2017-03-27",49.25],["2017-03-28",44.0],["2017-03-29",47.97],["2017-03-30",33.51],["2017-03-31",10.75],["2017-04-01",4.75],["2017-04-02",8.0],["2017-04-03",2.0],["2017-04-04",16.0],["2017-04-05",58.67],["2017-04-06",36.75],["2017-04-07",23.61],["2017-04-08",0.0],["2017-04-09",2.0],["2017-04-10",53.61],["2017-04-11",47.77],["2017-04-12",45.18],["2017-04-13",45.51],["2017-04-14",41.12],["2017-04-15",4.75],["2017-04-16",2.0],["2017-04-17",52.75],["2017-04-18",26.26],["2017-04-19",24.75],["2017-04-20",130.77],["2017-04-21",91.63],["2017-04-22",2.0],["2017-04-23",4.0],["2017-04-24",118.7],["2017-04-25",100.24],["2017-04-26",128.02],["2017-04-27",146.87],["2017-04-28",124.3],["2017-04-29",10.0],["2017-04-30",0.0],["2017-05-01",18.75],["2017-05-02",58.53],["2017-05-03",156.77],["2017-05-04",62.26],["2017-05-05",121.16],["2017-05-06",34.75],["2017-05-07",24.75],["2017-05-08",118.67],["2017-05-09",235.86],["2017-05-10",262.54],["2017-05-11",129.89],["2017-05-12",93.28],["2017-05-13",99.09],["2017-05-14",6.75],["2017-05-15",115.75],["2017-05-16",135.65],["2017-05-17",154.14],["2017-05-18",138.52],["2017-05-19",65.77],["2017-05-20",6.75],["2017-05-21",2.0],["2017-05-22",119.91],["2017-05-23",42.26],["2017-05-24",43.02],["2017-05-25",156.13],["2017-05-26",109.87],["2017-05-27",64.73],["2017-05-28",13.51],["2017-05-29",2.0],["2017-05-30",65.16],["2017-05-31",96.89],["2017-06-01",151.16],["2017-06-02",150.4],["2017-06-03",31.61],["2017-06-04",10.75],["2017-06-05",129.36],["2017-06-06",80.36],["2017-06-07",114.83],["2017-06-08",84.26],["2017-06-09",10.75],["2017-06-10",12.75],["2017-06-11",4.75],["2017-06-12",77.49],["2017-06-13",47.29],["2017-06-14",39.16],["2017-06-15",40.36],["2017-06-16",33.51],["2017-06-17",33.51],["2017-06-18",2.0],["2017-06-19",74.63],["2017-06-20",159.44],["2017-06-21",77.38],["2017-06-22",124.65],["2017-06-23",163.24],["2017-06-24",77.09],["2017-06-25",6.0],["2017-06-26",140.03],["2017-06-27",167.26],["2017-06-28",244.14],["2017-06-29",201.5],["2017-06-30",153.36],["2017-07-01",21.51],["2017-07-02",6.0],["2017-07-03",118.57],["2017-07-04",166.05],["2017-07-05",121.68],["2017-07-06",76.6],["2017-07-07",86.74],["2017-07-08",2.0],["2017-07-09",8.75],["2017-07-10",57.7],["2017-07-11",159.44],["2017-07-12",138.7],["2017-07-13",142.46],["2017-07-14",196.97],["2017-07-15",59.77],["2017-07-16",82.02],["2017-07-17",245.28],["2017-07-18",180.55],["2017-07-19",172.46],["2017-07-20",179.33],["2017-07-21",168.14],["2017-07-22",17.61],["2017-07-23",83.28],["2017-07-24",128.02],["2017-07-25",169.89],["2017-07-26",127.65],["2017-07-27",137.03],["2017-07-28",184.46],["2017-07-29",32.26],["2017-07-30",54.41],["2017-07-31",71.97],["2017-08-01",142.83],["2017-08-02",332.42],["2017-08-03",343.48],["2017-08-04",261.31],["2017-08-05",169.26],["2017-08-06",59.12],["2017-08-07",324.6],["2017-08-08",215.62],["2017-08-09",205.76],["2017-08-10",207.4],["2017-08-11",269.57],["2017-08-12",39.51],["2017-08-13",25.51],["2017-08-14",312.29],["2017-08-15",167.24],["2017-08-16",178.28],["2017-08-17",181.01],["2017-08-18",134.13],["2017-08-19",32.36],["2017-08-20",32.75],["2017-08-21",119.61],["2017-08-22",120.89],["2017-08-23",140.3],["2017-08-24",155.89],["2017-08-25",113.52],["2017-08-26",27.9],["2017-08-27",47.51],["2017-08-28",88.53],["2017-08-29",105.79],["2017-08-30",125.38],["2017-08-31",108.21],["2017-09-01",110.94],["2017-09-02",38.0],["2017-09-03",98.32],["2017-09-04",142.87],["2017-09-05",164.3],["2017-09-06",359.55],["2017-09-07",214.05],["2017-09-08",159.91],["2017-09-09",56.63],["2017-09-10",10.0],["2017-09-11",268.55],["2017-09-12",240.66],["2017-09-13",271.96],["2017-09-14",257.15],["2017-09-15",171.76],["2017-09-16",40.36],["2017-09-17",60.36],["2017-09-18",199.79],["2017-09-19",299.35],["2017-09-20",370.96],["2017-09-21",290.85],["2017-09-22",198.38],["2017-09-23",87.77],["2017-09-24",16.0],["2017-09-25",235.69],["2017-09-26",248.6],["2017-09-27",309.31],["2017-09-28",219.7],["2017-09-29",250.09],["2017-09-30",158.19],["2017-10-01",43.51],["2017-10-02",86.04],["2017-10-03",104.53],["2017-10-04",118.14],["2017-10-05",84.38],["2017-10-06",116.87],["2017-10-07",81.02],["2017-10-08",6.0],["2017-10-09",239.73],["2017-10-10",374.79],["2017-10-11",341.49],["2017-10-12",265.5],["2017-10-13",242.32],["2017-10-14",40.75],["2017-10-15",93.09],["2017-10-16",297.47],["2017-10-17",166.38],["2017-10-18",290.43],["2017-10-19",303.94],["2017-10-20",318.43],["2017-10-21",77.77],["2017-10-22",35.51],["2017-10-23",291.37],["2017-10-24",211.13],["2017-10-25",201.79],["2017-10-26",330.91],["2017-10-27",323.6],["2017-10-28",85.02],["2017-10-29",60.31],["2017-10-30",248.1],["2017-10-31",269.23],["2017-11-01",168.54],["2017-11-02",269.7],["2017-11-03",169.28],["2017-11-04",60.0],["2017-11-05",76.26],["2017-11-06",320.91],["2017-11-07",174.57],["2017-11-08",325.95],["2017-11-09",243.03],["2017-11-10",259.41],["2017-11-11",49.87],["2017-11-12",45.61],["2017-11-13",198.01],["2017-11-14",299.17],["2017-11-15",250.24],["2017-11-16",245.01],["2017-11-17",326.53],["2017-11-18",22.0],["2017-11-19",20.75],["2017-11-20",239.89],["2017-11-21",179.55],["2017-11-22",303.84],["2017-11-23",180.79],["2017-11-24",106.53],["2017-11-25",23.61],["2017-11-26",41.87],["2017-11-27",327.85],["2017-11-28",216.58],["2017-11-29",268.64],["2017-11-30",345.97],["2017-12-01",417.02],["2017-12-02",56.63],["2017-12-03",36.75],["2017-12-04",312.72],["2017-12-05",482.11],["2017-12-06",366.89],["2017-12-07",246.06],["2017-12-08",202.68],["2017-12-09",29.61],["2017-12-10",22.75],["2017-12-11",277.27],["2017-12-12",267.03],["2017-12-13",195.16],["2017-12-14",321.78],["2017-12-15",179.4],["2017-12-16",36.26],["2017-12-17",26.75],["2017-12-18",204.77],["2017-12-19",259.42],["2017-12-20",288.68],["2017-12-21",480.21],["2017-12-22",287.12],["2017-12-23",91.51],["2017-12-24",119.38],["2017-12-25",369.79],["2017-12-26",288.66],["2017-12-27",240.9],["2017-12-28",219.93],["2017-12-29",187.01],["2017-12-30",27.51],["2017-12-31",12.0],["2018-01-01",10.0],["2018-01-02",259.76],["2018-01-03",208.15],["2018-01-04",203.64],["2018-01-05",243.8],["2018-01-06",73.51],["2018-01-07",14.0],["2018-01-08",464.45],["2018-01-09",332.41],["2018-01-10",315.05],["2018-01-11",357.78],["2018-01-12",280.52],["2018-01-13",15.51],["2018-01-14",36.0],["2018-01-15",287.27],["2018-01-16",143.14],["2018-01-17",340.16],["2018-01-18",285.86],["2018-01-19",398.73],["2018-01-20",23.51],["2018-01-21",90.53],["2018-01-22",280.64],["2018-01-23",555.96],["2018-01-24",413.56],["2018-01-25",352.15],["2018-01-26",106.24],["2018-01-27",56.63],["2018-01-28",180.14],["2018-01-29",236.71],["2018-01-30",256.32],["2018-01-31",342.92],["2018-02-01",299.08],["2018-02-02",366.23],["2018-02-03",90.63],["2018-02-04",59.12],["2018-02-05",314.6],["2018-02-06",277.37],["2018-02-07",420.66],["2018-02-08",415.35],["2018-02-09",449.71],["2018-02-10",152.76],["2018-02-11",258.78],["2018-02-12",327.43],["2018-02-13",118.14],["2018-02-14",75.38],["2018-02-15",46.0],["2018-02-16",61.77],["2018-02-17",37.51],["2018-02-18",0.0],["2018-02-19",0.0],["2018-02-20",16.0],["2018-02-21",31.51],["2018-02-22",117.75],["2018-02-23",153.75],["2018-02-24",167.01],["2018-02-25",14.0],["2018-02-26",344.16],["2018-02-27",247.91],["2018-02-28",436.61],["2018-03-01",261.58],["2018-03-02",204.85],["2018-03-03",12.0],["2018-03-04",46.0],["2018-03-05",195.62],["2018-03-06",440.68],["2018-03-07",276.92],["2018-03-08",307.54],["2018-03-09",318.17],["2018-03-10",103.77],["2018-03-11",32.75],["2018-03-12",318.73],["2018-03-13",257.2],["2018-03-14",289.51],["2018-03-15",440.03],["2018-03-16",272.25],["2018-03-17",18.36],["2018-03-18",12.0],["2018-03-19",255.77],["2018-03-20",365.43],["2018-03-21",340.86],["2018-03-22",264.78],["2018-03-23",62.75],["2018-03-24",55.51],["2018-03-25",26.0],["2018-03-26",252.78],["2018-03-27",231.37],["2018-03-28",284.72],["2018-03-29",249.8],["2018-03-30",298.81],["2018-03-31",85.77],["2018-04-01",18.0],["2018-04-02",185.07],["2018-04-03",382.92],["2018-04-04",279.37],["2018-04-05",65.87],["2018-04-06",126.24],["2018-04-07",222.84],["2018-04-08",323.58],["2018-04-09",369.69],["2018-04-10",210.01],["2018-04-11",318.74],["2018-04-12",374.7],["2018-04-13",270.12],["2018-04-14",66.63],["2018-04-15",24.0],["2018-04-16",220.68],["2018-04-17",341.22],["2018-04-18",364.8],["2018-04-19",262.47],["2018-04-20",284.74],["2018-04-21",81.48],["2018-04-22",24.36],["2018-04-23",187.79],["2018-04-24",339.12],["2018-04-25",256.77],["2018-04-26",236.21],["2018-04-27",243.3],["2018-04-28",105.77],["2018-04-29",6.75],["2018-04-30",34.0],["2018-05-01",87.16],["2018-05-02",321.98],["2018-05-03",334.22],["2018-05-04",245.07],["2018-05-05",26.75],["2018-05-06",22.75],["2018-05-07",342.93],["2018-05-08",159.89],["2018-05-09",228.06],["2018-05-10",260.62],["2018-05-11",196.91],["2018-05-12",92.24],["2018-05-13",33.51],["2018-05-14",235.97],["2018-05-15",230.4],["2018-05-16",383.3],["2018-05-17",250.06],["2018-05-18",142.52],["2018-05-19",27.22],["2018-05-20",24.75],["2018-05-21",315.93],["2018-05-22",321.06],["2018-05-23",231.39],["2018-05-24",217.27],["2018-05-25",268.5],["2018-05-26",33.12],["2018-05-27",10.75],["2018-05-28",251.3],["2018-05-29",247.25],["2018-05-30",253.03],["2018-05-31",245.54],["2018-06-01",309.82],["2018-06-02",4.0],["2018-06-03",14.53],["2018-06-04",310.9],["2018-06-05",274.27],["2018-06-06",292.35],["2018-06-07",277.13],["2018-06-08",174.97],["2018-06-09",28.0],["2018-06-10",32.26],["2018-06-11",346.64],["2018-06-12",280.34],["2018-06-13",296.05],["2018-06-14",299.87],["2018-06-15",333.08],["2018-06-16",10.75],["2018-06-17",83.02],["2018-06-18",47.02],["2018-06-19",275.41],["2018-06-20",343.19],["2018-06-21",196.7],["2018-06-22",129.32],["2018-06-23",10.0],["2018-06-24",24.0],["2018-06-25",168.63],["2018-06-26",265.76],["2018-06-27",293.29],["2018-06-28",229.66],["2018-06-29",231.44],["2018-06-30",95.77],["2018-07-01",34.75],["2018-07-02",156.97],["2018-07-03",227.27],["2018-07-04",156.28],["2018-07-05",125.48],["2018-07-06",119.37],["2018-07-07",0.0],["2018-07-08",16.0],["2018-07-09",151.23],["2018-07-10",200.18],["2018-07-11",254.93],["2018-07-12",216.0],["2018-07-13",145.38],["2018-07-14",16.75],["2018-07-15",16.0],["2018-07-16",155.65],["2018-07-17",178.38],["2018-07-18",218.06],["2018-07-19",198.53],["2018-07-20",181.03],["2018-07-21",14.0],["2018-07-22",24.75],["2018-07-23",100.36],["2018-07-24",183.53],["2018-07-25",110.83],["2018-07-26",176.93],["2018-07-27",171.52],["2018-07-28",26.0],["2018-07-29",12.75],["2018-07-30",178.48],["2018-07-31",169.46],["2018-08-01",165.69],["2018-08-02",67.77],["2018-08-03",8.0],["2018-08-04",32.75],["2018-08-05",8.0],["2018-08-06",106.7],["2018-08-07",94.63],["2018-08-08",68.43],["2018-08-09",121.26],["2018-08-10",121.28],["2018-08-11",10.75],["2018-08-12",14.0],["2018-08-13",260.81],["2018-08-14",226.56],["2018-08-15",2015.27],["2018-08-16",187.62],["2018-08-17",177.62],["2018-08-18",30.75],["2018-08-19",14.0],["2018-08-20",254.62],["2018-08-21",281.75],["2018-08-22",171.38],["2018-08-23",174.74],["2018-08-24",251.67],["2018-08-25",88.0],["2018-08-26",37.61],["2018-08-27",183.09],["2018-08-28",260.07],["2018-08-29",158.55],["2018-08-30",228.39],["2018-08-31",287.39],["2018-09-01",106.01],["2018-09-02",28.0],["2018-09-03",316.04],["2018-09-04",230.97],["2018-09-05",210.58],["2018-09-06",199.55],["2018-09-07",96.26],["2018-09-08",28.75],["2018-09-09",12.75],["2018-09-10",123.77],["2018-09-11",127.38],["2018-09-12",192.24],["2018-09-13",108.14],["2018-09-14",236.29],["2018-09-15",14.75],["2018-09-16",16.75],["2018-09-17",524.28],["2018-09-18",202.33],["2018-09-19",240.35],["2018-09-20",244.15],["2018-09-21",137.2],["2018-09-22",11.65],["2018-09-23",2.0],["2018-09-24",64.36],["2018-09-25",226.84],["2018-09-26",190.14],["2018-09-27",263.2],["2018-09-28",184.54],["2018-09-29",192.97],["2018-09-30",211.91],["2018-10-01",36.0],["2018-10-02",4.75],["2018-10-03",0.0],["2018-10-04",4.75],["2018-10-05",9.61],["2018-10-06",4.75],["2018-10-07",6.0],["2018-10-08",228.52],["2018-10-09",168.48],["2018-10-10",203.26],["2018-10-11",128.6],["2018-10-12",88.77],["2018-10-13",42.75],["2018-10-14",18.75],["2018-10-15",192.81],["2018-10-16",174.64],["2018-10-17",170.11],["2018-10-18",259.6],["2018-10-19",163.74],["2018-10-20",17.51],["2018-10-21",18.75],["2018-10-22",120.49],["2018-10-23",147.38],["2018-10-24",99.41],["2018-10-25",104.63],["2018-10-26",261.81],["2018-10-27",11.51],["2018-10-28",73.89],["2018-10-29",284.34],["2018-10-30",143.66],["2018-10-31",170.74],["2018-11-01",164.99],["2018-11-02",264.09],["2018-11-03",39.77],["2018-11-04",8.0],["2018-11-05",135.75],["2018-11-06",224.95],["2018-11-07",222.76],["2018-11-08",261.73],["2018-11-09",220.39],["2018-11-10",2.0],["2018-11-11",8.75],["2018-11-12",123.75],["2018-11-13",151.71],["2018-11-14",206.62],["2018-11-15",156.35],["2018-11-16",159.21],["2018-11-17",6.0],["2018-11-18",16.0],["2018-11-19",114.28],["2018-11-20",154.24],["2018-11-21",113.91],["2018-11-22",155.99],["2018-11-23",178.54],["2018-11-24",25.51],["2018-11-25",37.12],["2018-11-26",191.35],["2018-11-27",200.99],["2018-11-28",143.75],["2018-11-29",164.15],["2018-11-30",169.53],["2018-12-01",33.61],["2018-12-02",28.75],["2018-12-03",140.24],["2018-12-04",103.12],["2018-12-05",168.3],["2018-12-06",176.35],["2018-12-07",169.75],["2018-12-08",10.0],["2018-12-09",4.0],["2018-12-10",184.38],["2018-12-11",99.8],["2018-12-12",142.43],["2018-12-13",94.14],["2018-12-14",162.97],["2018-12-15",0.0],["2018-12-16",7.51],["2018-12-17",76.92],["2018-12-18",167.16],["2018-12-19",141.91],["2018-12-20",300.18],["2018-12-21",123.23],["2018-12-22",36.75],["2018-12-23",2.0],["2018-12-24",108.26],["2018-12-25",146.0],["2018-12-26",138.89],["2018-12-27",137.6],["2018-12-28",179.52],["2018-12-29",48.75],["2018-12-30",6.0],["2018-12-31",0.0],["2019-01-01",6.0],["2019-01-02",132.5],["2019-01-03",99.42],["2019-01-04",42.63],["2019-01-05",27.12],["2019-01-06",17.61],["2019-01-07",166.59],["2019-01-08",156.4],["2019-01-09",243.09],["2019-01-10",177.17],["2019-01-11",130.7],["2019-01-12",31.02],["2019-01-13",4.0],["2019-01-14",113.75],["2019-01-15",145.55],["2019-01-16",139.36],["2019-01-17",149.18],["2019-01-18",129.87],["2019-01-19",12.0],["2019-01-20",18.75],["2019-01-21",146.07],["2019-01-22",139.91],["2019-01-23",153.79],["2019-01-24",151.95],["2019-01-25",222.89],["2019-01-26",47.77],["2019-01-27",36.0],["2019-01-28",225.43],["2019-01-29",163.82],["2019-01-30",165.23],["2019-01-31",169.12],["2019-02-01",333.38],["2019-02-02",101.26],["2019-02-03",58.36],["2019-02-04",4.75],["2019-02-05",2.75],["2019-02-06",2.0],["2019-02-07",0.0],["2019-02-08",6.0],["2019-02-09",0.0],["2019-02-10",14.0],["2019-02-11",59.87],["2019-02-12",78.63],["2019-02-13",194.7],["2019-02-14",91.02],["2019-02-15",137.46],["2019-02-16",10.75],["2019-02-17",20.0],["2019-02-18",215.6],["2019-02-19",194.24],["2019-02-20",193.23],["2019-02-21",208.81],["2019-02-22",499.68],["2019-02-23",35.51],["2019-02-24",22.75],["2019-02-25",163.07],["2019-02-26",173.52],["2019-02-27",227.7],["2019-02-28",216.52],["2019-03-01",148.34],["2019-03-02",24.0],["2019-03-03",22.0],["2019-03-04",109.26],["2019-03-05",121.56],["2019-03-06",137.66],["2019-03-07",134.97],["2019-03-08",93.48],["2019-03-09",33.9],["2019-03-10",19.61],["2019-03-11",131.53],["2019-03-12",140.99],["2019-03-13",136.11],["2019-03-14",114.79],["2019-03-15",128.06],["2019-03-16",22.75],["2019-03-17",22.0],["2019-03-18",152.5],["2019-03-19",176.77],["2019-03-20",233.35],["2019-03-21",181.28],["2019-03-22",202.89],["2019-03-23",88.55],["2019-03-24",16.0],["2019-03-25",139.04],["2019-03-26",143.91],["2019-03-27",317.26],["2019-03-28",296.79],["2019-03-29",252.87],["2019-03-30",24.75],["2019-03-31",53.97],["2019-04-01",189.11],["2019-04-02",226.88],["2019-04-03",175.76],["2019-04-04",155.72],["2019-04-05",16.0],["2019-04-06",18.0],["2019-04-07",22.75],["2019-04-08",127.36],["2019-04-09",181.16],["2019-04-10",150.01],["2019-04-11",173.52],["2019-04-12",131.26],["2019-04-13",22.75],["2019-04-14",27.51],["2019-04-15",235.76],["2019-04-16",346.21],["2019-04-17",315.89],["2019-04-18",145.43],["2019-04-19",100.5],["2019-04-20",33.02],["2019-04-21",29.61],["2019-04-22",289.86],["2019-04-23",122.73],["2019-04-24",125.55],["2019-04-25",132.59],["2019-04-26",87.02],["2019-04-27",17.61],["2019-04-28",55.87],["2019-04-29",156.81],["2019-04-30",124.79],["2019-05-01",10.0],["2019-05-02",0.0],["2019-05-03",5.51],["2019-05-04",2.0],["2019-05-05",85.12],["2019-05-06",138.23],["2019-05-07",197.33],["2019-05-08",260.66],["2019-05-09",180.01],["2019-05-10",79.12],["2019-05-11",16.75],["2019-05-12",22.0],["2019-05-13",135.3],["2019-05-14",160.38],["2019-05-15",189.4],["2019-05-16",133.3],["2019-05-17",107.77],["2019-05-18",33.22],["2019-05-19",13.51],["2019-05-20",154.93],["2019-05-21",231.89],["2019-05-22",191.6],["2019-05-23",252.45],["2019-05-24",339.02],["2019-05-25",50.73],["2019-05-26",32.73],["2019-05-27",137.36],["2019-05-28",160.62],["2019-05-29",269.39],["2019-05-30",166.47],["2019-05-31",168.43],["2019-06-01",12.0],["2019-06-02",16.26],["2019-06-03",161.62],["2019-06-04",205.98],["2019-06-05",185.08],["2019-06-06",231.53],["2019-06-07",59.38],["2019-06-08",29.61],["2019-06-09",31.51],["2019-06-10",327.97],["2019-06-11",285.81],["2019-06-12",237.64],["2019-06-13",240.57],["2019-06-14",224.56],["2019-06-15",86.4],["2019-06-16",88.65],["2019-06-17",121.38],["2019-06-18",199.1],["2019-06-19",262.84],["2019-06-20",162.21],["2019-06-21",182.48],["2019-06-22",37.12],["2019-06-23",49.12],["2019-06-24",189.82],["2019-06-25",224.49],["2019-06-26",246.95],["2019-06-27",211.76],["2019-06-28",219.51],["2019-06-29",56.75],["2019-06-30",10.75],["2019-07-01",154.3],["2019-07-02",179.35],["2019-07-03",151.26],["2019-07-04",99.14],["2019-07-05",149.92],["2019-07-06",2.0],["2019-07-07",20.0],["2019-07-08",152.99],["2019-07-09",85.02],["2019-07-10",107.38],["2019-07-11",61.12],["2019-07-12",90.63],["2019-07-13",8.0],["2019-07-14",12.75],["2019-07-15",54.0],["2019-07-16",55.51],["2019-07-17",80.26],["2019-07-18",110.99],["2019-07-19",128.18],["2019-07-20",8.0],["2019-07-21",9.95],["2019-07-22",160.28],["2019-07-23",140.58],["2019-07-24",213.79],["2019-07-25",208.42],["2019-07-26",150.77],["2019-07-27",31.12],["2019-07-28",12.75],["2019-07-29",107.16],["2019-07-30",130.3],["2019-07-31",188.41],["2019-08-01",126.87],["2019-08-02",110.99],["2019-08-03",23.51],["2019-08-04",8.75],["2019-08-05",143.04],["2019-08-06",149.36],["2019-08-07",70.24],["2019-08-08",101.87],["2019-08-09",147.72],["2019-08-10",35.51],["2019-08-11",29.61],["2019-08-12",172.01],["2019-08-13",144.79],["2019-08-14",140.79],["2019-08-15",180.18],["2019-08-16",151.16],["2019-08-17",4.0],["2019-08-18",18.0],["2019-08-19",195.98],["2019-08-20",142.14],["2019-08-21",105.16],["2019-08-22",200.95],["2019-08-23",123.12],["2019-08-24",6.75],["2019-08-25",2.0],["2019-08-26",245.39],["2019-08-27",181.86],["2019-08-28",149.79],["2019-08-29",162.89],["2019-08-30",222.58],["2019-08-31",24.75],["2019-09-01",28.75],["2019-09-02",181.04],["2019-09-03",176.21],["2019-09-04",166.24],["2019-09-05",180.06],["2019-09-06",161.52],["2019-09-07",10.75],["2019-09-08",6.75],["2019-09-09",142.04],["2019-09-10",136.53],["2019-09-11",182.03],["2019-09-12",78.89],["2019-09-13",12.75],["2019-09-14",27.51],["2019-09-15",4.0],["2019-09-16",165.85],["2019-09-17",294.67],["2019-09-18",179.83],["2019-09-19",169.7],["2019-09-20",169.65],["2019-09-21",67.77],["2019-09-22",28.36],["2019-09-23",177.01],["2019-09-24",234.54],["2019-09-25",296.35],["2019-09-26",227.86],["2019-09-27",231.3],["2019-09-28",104.53],["2019-09-29",183.17],["2019-09-30",243.49],["2019-10-01",26.75],["2019-10-02",18.75],["2019-10-03",51.87],["2019-10-04",53.48],["2019-10-05",12.75],["2019-10-06",16.36],["2019-10-07",106.97],["2019-10-08",273.12],["2019-10-09",627.89],["2019-10-10",1372.61],["2019-10-11",1193.18],["2019-10-12",623.32],["2019-10-13",189.68],["2019-10-14",298.44],["2019-10-15",289.98],["2019-10-16",248.98],["2019-10-17",167.46],["2019-10-18",193.82],["2019-10-19",29.51],["2019-10-20",108.45],["2019-10-21",61.22],["2019-10-22",112.14],["2019-10-23",140.3],["2019-10-24",214.48],["2019-10-25",59.51],["2019-10-26",6.0],["2019-10-27",8.0],["2019-10-28",234.5],["2019-10-29",210.88],["2019-10-30",168.77],["2019-10-31",261.35],["2019-11-01",214.38],["2019-11-02",14.75],["2019-11-03",18.0],["2019-11-04",130.3],["2019-11-05",164.38],["2019-11-06",174.4],["2019-11-07",111.48],["2019-11-08",186.24],["2019-11-09",4.0],["2019-11-10",8.36],["2019-11-11",91.87],["2019-11-12",168.79],["2019-11-13",139.55],["2019-11-14",173.75],["2019-11-15",114.55],["2019-11-16",2.0],["2019-11-17",6.75],["2019-11-18",147.69],["2019-11-19",127.3],["2019-11-20",146.48],["2019-11-21",184.5],["2019-11-22",138.14],["2019-11-23",45.12],["2019-11-24",36.79],["2019-11-25",198.07],["2019-11-26",257.1],["2019-11-27",181.66],["2019-11-28",224.37],["2019-11-29",198.94],["2019-11-30",12.75],["2019-12-01",27.61],["2019-12-02",316.87],["2019-12-03",333.44],["2019-12-04",233.09],["2019-12-05",213.64],["2019-12-06",225.85],["2019-12-07",4.75],["2019-12-08",32.75],["2019-12-09",248.69],["2019-12-10",229.99],["2019-12-11",131.36],["2019-12-12",243.85],["2019-12-13",86.14],["2019-12-14",49.12],["2019-12-15",55.12],["2019-12-16",186.38],["2019-12-17",142.4],["2019-12-18",200.33],["2019-12-19",218.3],["2019-12-20",179.75],["2019-12-21",11.51],["2019-12-22",8.75],["2019-12-23",167.14],["2019-12-24",174.48],["2019-12-25",158.73],["2019-12-26",192.05],["2019-12-27",134.89],["2019-12-28",2.0],["2019-12-29",14.0],["2019-12-30",142.99],["2019-12-31",146.5],["2020-01-01",19.51],["2020-01-02",148.01],["2020-01-03",147.36],["2020-01-04",62.14],["2020-01-05",45.55],["2020-01-06",290.07],["2020-01-07",338.77],["2020-01-08",268.41],["2020-01-09",199.04],["2020-01-10",173.86],["2020-01-11",31.51],["2020-01-12",15.61],["2020-01-13",169.73],["2020-01-14",226.58],["2020-01-15",262.45],["2020-01-16",228.73],["2020-01-17",138.7],["2020-01-18",12.0],["2020-01-19",148.21],["2020-01-20",65.77],["2020-01-21",111.46],["2020-01-22",29.25],["2020-01-23",17.61],["2020-01-24",13.25],["2020-01-25",12.75],["2020-01-26",10.0],["2020-01-27",4.75],["2020-01-28",4.0],["2020-01-29",12.0],["2020-01-30",13.51],["2020-01-31",14.75],["2020-02-01",4.75],["2020-02-02",18.0],["2020-02-03",31.61],["2020-02-04",138.24],["2020-02-05",152.91],["2020-02-06",99.65],["2020-02-07",118.99],["2020-02-08",4.75],["2020-02-09",2.0],["2020-02-10",167.16],["2020-02-11",187.74],["2020-02-12",170.52],["2020-02-13",190.45],["2020-02-14",117.99],["2020-02-15",62.67],["2020-02-16",61.97],["2020-02-17",239.83],["2020-02-18",161.65],["2020-02-19",118.55],["2020-02-20",101.93],["2020-02-21",123.72],["2020-02-22",20.75],["2020-02-23",26.26],["2020-02-24",180.83],["2020-02-25",181.96],["2020-02-26",109.97],["2020-02-27",104.34],["2020-02-28",95.38],["2020-02-29",8.0],["2020-03-01",21.61],["2020-03-02",201.42],["2020-03-03",192.68],["2020-03-04",129.43],["2020-03-05",112.44],["2020-03-06",153.78],["2020-03-07",12.75],["2020-03-08",55.48],["2020-03-09",158.97],["2020-03-10",116.89],["2020-03-11",131.19],["2020-03-12",116.89],["2020-03-13",95.38],["2020-03-14",8.0],["2020-03-15",12.0],["2020-03-16",101.12],["2020-03-17",207.89],["2020-03-18",125.48],["2020-03-19",137.26],["2020-03-20",121.56],["2020-03-21",28.26],["2020-03-22",18.75],["2020-03-23",108.4],["2020-03-24",122.04],["2020-03-25",161.02],["2020-03-26",216.32],["2020-03-27",125.55],["2020-03-28",40.36],["2020-03-29",38.75],["2020-03-30",166.84],["2020-03-31",206.68],["2020-04-01",228.93],["2020-04-02",260.13],["2020-04-03",373.95],["2020-04-04",209.67],["2020-04-05",73.87],["2020-04-06",58.73],["2020-04-07",361.06],["2020-04-08",410.31],["2020-04-09",496.58],["2020-04-10",533.11],["2020-04-11",257.93],["2020-04-12",228.25],["2020-04-13",281.03],["2020-04-14",426.14],["2020-04-15",249.01],["2020-04-16",129.77],["2020-04-17",336.57],["2020-04-18",93.38],["2020-04-19",147.81],["2020-04-20",418.17],["2020-04-21",231.93],["2020-04-22",281.55],["2020-04-23",307.66],["2020-04-24",359.58],["2020-04-25",74.63],["2020-04-26",321.49],["2020-04-27",282.27],["2020-04-28",256.35],["2020-04-29",116.75],["2020-04-30",178.78],["2020-05-01",18.26],["2020-05-02",6.0],["2020-05-03",4.0],["2020-05-04",4.0],["2020-05-05",8.0],["2020-05-06",69.53],["2020-05-07",84.97],["2020-05-08",149.86],["2020-05-09",122.07],["2020-05-10",2.0],["2020-05-11",145.91],["2020-05-12",220.59],["2020-05-13",527.28],["2020-05-14",442.34],["2020-05-15",240.06],["2020-05-16",0.0],["2020-05-17",9.51],["2020-05-18",142.6],["2020-05-19",144.01],["2020-05-20",144.97],["2020-05-21",162.48],["2020-05-22",1294.53],["2020-05-23",4.0],["2020-05-24",4.75],["2020-05-25",172.77],["2020-05-26",171.32],["2020-05-27",121.63],["2020-05-28",134.6],["2020-05-29",12.0],["2020-05-30",4.0],["2020-05-31",0.0],["2020-06-01",169.76],["2020-06-02",159.52],["2020-06-03",260.48],["2020-06-04",197.25],["2020-06-05",169.07],["2020-06-06",12.0],["2020-06-07",4.0],["2020-06-08",199.93],["2020-06-09",142.58],["2020-06-10",140.14],["2020-06-11",52.75],["2020-06-12",71.48],["2020-06-13",8.0],["2020-06-14",8.0],["2020-06-15",121.48],["2020-06-16",92.89],["2020-06-17",84.26],["2020-06-18",91.02],["2020-06-19",118.4],["2020-06-20",4.0],["2020-06-21",19.61],["2020-06-22",96.75],["2020-06-23",101.26],["2020-06-24",70.89],["2020-06-25",23.51],["2020-06-26",18.75],["2020-06-27",18.0],["2020-06-28",92.63],["2020-06-29",144.62],["2020-06-30",196.23],["2020-07-01",173.89],["2020-07-02",211.76],["2020-07-03",157.24],["2020-07-04",17.87],["2020-07-05",17.51],["2020-07-06",230.64],["2020-07-07",203.98],["2020-07-08",191.86],["2020-07-09",178.91],["2020-07-10",132.25],["2020-07-11",17.51],["2020-07-12",10.75],["2020-07-13",173.55],["2020-07-14",170.95],["2020-07-15",198.48],["2020-07-16",151.75],["2020-07-17",129.09],["2020-07-18",9.61],["2020-07-19",18.26],["2020-07-20",253.04],["2020-07-21",125.46],["2020-07-22",116.26],["2020-07-23",135.99],["2020-07-24",165.52],["2020-07-25",10.75],["2020-07-26",6.75],["2020-07-27",202.7],["2020-07-28",200.48],["2020-07-29",213.36],["2020-07-30",238.68],["2020-07-31",136.5],["2020-08-01",16.0],["2020-08-02",22.0],["2020-08-03",182.19],["2020-08-04",168.62],["2020-08-05",231.03],["2020-08-06",181.07],["2020-08-07",231.16],["2020-08-08",37.51],["2020-08-09",24.0],["2020-08-10",241.14],["2020-08-11",297.12],["2020-08-12",235.37],["2020-08-13",209.73],["2020-08-14",182.14],["2020-08-15",121.53],["2020-08-16",60.26],["2020-08-17",306.2],["2020-08-18",233.74],["2020-08-19",303.53],["2020-08-20",367.65],["2020-08-21",491.25],["2020-08-22",240.17],["2020-08-23",164.34],["2020-08-24",420.56],["2020-08-25",320.0],["2020-08-26",233.82],["2020-08-27",333.63],["2020-08-28",409.38],["2020-08-29",63.87],["2020-08-30",35.75],["2020-08-31",292.49],["2020-09-01",252.25],["2020-09-02",420.66],["2020-09-03",369.63],["2020-09-04",469.78],["2020-09-05",99.4],["2020-09-06",64.75],["2020-09-07",462.59],["2020-09-08",399.83],["2020-09-09",159.09],["2020-09-10",204.5],["2020-09-11",140.01],["2020-09-12",22.75],["2020-09-13",20.75],["2020-09-14",264.66],["2020-09-15",183.62],["2020-09-16",240.15],["2020-09-17",291.35],["2020-09-18",136.77],["2020-09-19",25.51],["2020-09-20",18.75],["2020-09-21",277.44],["2020-09-22",250.76],["2020-09-23",229.57],["2020-09-24",293.27],["2020-09-25",247.18],["2020-09-26",23.51],["2020-09-27",285.98],["2020-09-28",504.14],["2020-09-29",399.14],["2020-09-30",259.35],["2020-10-01",53.63],["2020-10-02",10.75],["2020-10-03",2.0],["2020-10-04",8.75],["2020-10-05",0.0],["2020-10-06",6.0],["2020-10-07",6.0],["2020-10-08",75.51],["2020-10-09",227.42],["2020-10-10",250.13],["2020-10-11",28.36],["2020-10-12",343.06],["2020-10-13",412.99],["2020-10-14",473.08],["2020-10-15",325.15],["2020-10-16",267.46],["2020-10-17",45.77],["2020-10-18",18.75],["2020-10-19",466.9],["2020-10-20",320.14],["2020-10-21",376.0],["2020-10-22",179.43],["2020-10-23",77.51],["2020-10-24",2.0],["2020-10-25",3.25],["2020-10-26",293.26],["2020-10-27",148.24],["2020-10-28",140.4],["2020-10-29",109.22],["2020-10-30",111.44],["2020-10-31",16.0],["2020-11-01",11.51],["2020-11-02",141.24],["2020-11-03",140.91],["2020-11-04",215.72],["2020-11-05",131.4],["2020-11-06",102.63],["2020-11-07",0.0],["2020-11-08",23.61],["2020-11-09",147.97],["2020-11-10",113.12],["2020-11-11",128.79],["2020-11-12",121.91],["2020-11-13",150.6],["2020-11-14",14.0],["2020-11-15",12.0],["2020-11-16",268.98],["2020-11-17",164.6],["2020-11-18",224.87],["2020-11-19",241.5],["2020-11-20",233.45],["2020-11-21",12.75],["2020-11-22",8.75],["2020-11-23",294.47],["2020-11-24",290.1],["2020-11-25",290.2],["2020-11-26",347.1],["2020-11-27",354.46],["2020-11-28",44.26],["2020-11-29",16.26],["2020-11-30",353.25],["2020-12-01",215.79],["2020-12-02",261.8],["2020-12-03",325.75],["2020-12-04",320.48],["2020-12-05",58.14],["2020-12-06",7.61],["2020-12-07",369.54],["2020-12-08",260.43],["2020-12-09",248.24],["2020-12-10",160.6],["2020-12-11",149.82],["2020-12-12",6.0],["2020-12-13",6.0],["2020-12-14",186.6],["2020-12-15",172.11],["2020-12-16",183.92],["2020-12-17",210.62],["2020-12-18",158.45],["2020-12-19",78.0],["2020-12-20",26.0],["2020-12-21",167.36],["2020-12-22",264.7],["2020-12-23",115.13],["2020-12-24",117.75],["2020-12-25",209.6],["2020-12-26",43.12],["2020-12-27",8.75],["2020-12-28",230.91],["2020-12-29",307.1],["2020-12-30",144.34],["2020-12-31",205.27],["2021-01-01",0.0],["2021-01-02",2.0],["2021-01-03",2.0],["2021-01-04",199.08],["2021-01-05",248.33],["2021-01-06",269.76],["2021-01-07",309.51],["2021-01-08",349.0],["2021-01-09",52.73],["2021-01-10",42.26],["2021-01-11",576.25],["2021-01-12",586.47],["2021-01-13",326.79],["2021-01-14",318.35],["2021-01-15",260.89],["2021-01-16",12.75],["2021-01-17",44.26],["2021-01-18",288.78],["2021-01-19",347.03],["2021-01-20",358.5],["2021-01-21",123.75],["2021-01-22",67.38],["2021-01-23",6.0],["2021-01-24",8.75],["2021-01-25",151.75],["2021-01-26",214.99],["2021-01-27",108.53],["2021-01-28",126.89],["2021-01-29",122.99],["2021-01-30",4.0],["2021-01-31",16.36],["2021-02-01",135.36],["2021-02-02",120.78],["2021-02-03",176.33],["2021-02-04",137.97],["2021-02-05",155.96],["2021-02-06",14.0],["2021-02-07",95.87],["2021-02-08",75.12],["2021-02-09",169.96],["2021-02-10",47.9],["2021-02-11",24.0],["2021-02-12",6.0],["2021-02-13",6.75],["2021-02-14",4.0],["2021-02-15",2.0],["2021-02-16",22.75],["2021-02-17",9.9],["2021-02-18",115.85],["2021-02-19",201.52],["2021-02-20",188.25],["2021-02-21",0.0],["2021-02-22",228.8],["2021-02-23",357.94],["2021-02-24",254.15],["2021-02-25",198.32],["2021-02-26",246.62],["2021-02-27",44.26],["2021-02-28",51.26],["2021-03-01",259.83],["2021-03-02",265.32],["2021-03-03",142.67],["2021-03-04",173.6],["2021-03-05",75.51],["2021-03-06",6.0],["2021-03-07",2.0],["2021-03-08",89.95],["2021-03-09",138.83],["2021-03-10",127.75],["2021-03-11",112.5],["2021-03-12",220.87],["2021-03-13",14.0],["2021-03-14",8.0],["2021-03-15",214.11],["2021-03-16",195.7],["2021-03-17",129.24],["2021-03-18",145.53],["2021-03-19",152.68],["2021-03-20",10.75],["2021-03-21",24.26],["2021-03-22",88.02],["2021-03-23",295.82],["2021-03-24",428.87],["2021-03-25",157.26],["2021-03-26",91.14],["2021-03-27",14.0],["2021-03-28",15.51],["2021-03-29",150.12],["2021-03-30",277.11],["2021-03-31",218.66],["2021-04-01",210.74],["2021-04-02",170.5],["2021-04-03",14.75],["2021-04-04",4.0],["2021-04-05",2.0],["2021-04-06",379.32],["2021-04-07",232.47],["2021-04-08",97.12],["2021-04-09",161.62],["2021-04-10",18.36],["2021-04-11",2.0],["2021-04-12",188.38],["2021-04-13",254.72],["2021-04-14",232.26],["2021-04-15",148.99],["2021-04-16",57.38],["2021-04-17",8.0],["2021-04-18",10.75],["2021-04-19",119.52],["2021-04-20",169.99],["2021-04-21",220.3],["2021-04-22",210.49],["2021-04-23",239.26],["2021-04-24",44.26],["2021-04-25",382.86],["2021-04-26",371.42],["2021-04-27",340.33],["2021-04-28",221.21],["2021-04-29",309.89],["2021-04-30",250.17],["2021-05-01",20.0],["2021-05-02",4.0],["2021-05-03",26.75],["2021-05-04",68.0],["2021-05-05",53.51],["2021-05-06",288.17],["2021-05-07",227.24],["2021-05-08",70.73],["2021-05-09",4.0],["2021-05-10",115.63],["2021-05-11",102.34],["2021-05-12",148.73],["2021-05-13",81.87],["2021-05-14",140.38],["2021-05-15",0.0],["2021-05-16",4.0],["2021-05-17",80.63],["2021-05-18",238.21],["2021-05-19",182.58],["2021-05-20",159.3],["2021-05-21",92.53],["2021-05-22",22.75],["2021-05-23",6.0],["2021-05-24",128.31],["2021-05-25",235.29],["2021-05-26",172.35],["2021-05-27",111.75],["2021-05-28",115.14],["2021-05-29",14.0],["2021-05-30",6.0],["2021-05-31",192.74],["2021-06-01",237.08],["2021-06-02",236.68],["2021-06-03",118.21],["2021-06-04",185.08],["2021-06-05",19.51],["2021-06-06",2.0],["2021-06-07",252.58],["2021-06-08",313.34],["2021-06-09",332.44],["2021-06-10",270.49],["2021-06-11",295.75],["2021-06-12",30.26],["2021-06-13",8.0],["2021-06-14",16.26],["2021-06-15",288.82],["2021-06-16",317.66],["2021-06-17",208.84],["2021-06-18",190.55],["2021-06-19",8.0],["2021-06-20",10.0],["2021-06-21",239.61],["2021-06-22",261.82],["2021-06-23",173.95],["2021-06-24",168.3],["2021-06-25",98.73],["2021-06-26",8.75],["2021-06-27",6.0],["2021-06-28",155.46],["2021-06-29",217.04],["2021-06-30",139.73],["2021-07-01",240.36],["2021-07-02",214.01],["2021-07-03",2.0],["2021-07-04",4.75],["2021-07-05",247.43],["2021-07-06",202.59],["2021-07-07",160.77],["2021-07-08",149.99],["2021-07-09",156.24],["2021-07-10",6.0],["2021-07-11",23.51],["2021-07-12",181.47],["2021-07-13",205.23],["2021-07-14",208.72],["2021-07-15",150.11],["2021-07-16",155.52],["2021-07-17",14.75],["2021-07-18",9.51],["2021-07-19",234.35],["2021-07-20",196.58],["2021-07-21",183.75],["2021-07-22",183.68],["2021-07-23",96.38],["2021-07-24",0.0],["2021-07-25",0.0],["2021-07-26",241.7],["2021-07-27",120.04],["2021-07-28",198.01],["2021-07-29",206.84],["2021-07-30",184.6],["2021-07-31",16.0],["2021-08-01",17.61],["2021-08-02",156.48],["2021-08-03",153.89],["2021-08-04",147.85],["2021-08-05",265.32],["2021-08-06",161.76],["2021-08-07",12.0],["2021-08-08",14.0],["2021-08-09",198.63],["2021-08-10",242.4],["2021-08-11",265.45],["2021-08-12",216.35],["2021-08-13",187.36],["2021-08-14",16.75],["2021-08-15",24.75],["2021-08-16",277.8],["2021-08-17",199.01],["2021-08-18",218.15],["2021-08-19",166.24],["2021-08-20",189.46],["2021-08-21",10.0],["2021-08-22",12.0],["2021-08-23",244.73],["2021-08-24",194.21],["2021-08-25",177.6],["2021-08-26",230.29],["2021-08-27",242.78],["2021-08-28",6.0],["2021-08-29",10.75],["2021-08-30",155.09],["2021-08-31",324.28],["2021-09-01",270.27],["2021-09-02",166.28],["2021-09-03",309.11],["2021-09-04",30.26],["2021-09-05",16.75],["2021-09-06",214.77],["2021-09-07",324.78],["2021-09-08",393.43],["2021-09-09",231.41],["2021-09-10",320.12],["2021-09-11",36.26],["2021-09-12",43.9],["2021-09-13",341.47],["2021-09-14",1022.5],["2021-09-15",358.81],["2021-09-16",304.07],["2021-09-17",367.25],["2021-09-18",175.75],["2021-09-19",22.75],["2021-09-20",39.61],["2021-09-21",74.36],["2021-09-22",417.99],["2021-09-23",472.39],["2021-09-24",299.12],["2021-09-25",27.02],["2021-09-26",361.82],["2021-09-27",311.97],["2021-09-28",266.25],["2021-09-29",309.48],["2021-09-30",146.09],["2021-10-01",6.0],["2021-10-02",0.0],["2021-10-03",4.0],["2021-10-04",25.87],["2021-10-05",50.0],["2021-10-06",11.51],["2021-10-07",25.51],["2021-10-08",148.38],["2021-10-09",151.09],["2021-10-10",14.0],["2021-10-11",339.14],["2021-10-12",281.22],["2021-10-13",281.61],["2021-10-14",238.9],["2021-10-15",198.14],["2021-10-16",20.0],["2021-10-17",29.25],["2021-10-18",226.19],["2021-10-19",300.18],["2021-10-20",244.55],["2021-10-21",246.1],["2021-10-22",189.45],["2021-10-23",79.85],["2021-10-24",10.0],["2021-10-25",415.53],["2021-10-26",466.03],["2021-10-27",492.6],["2021-10-28",349.84],["2021-10-29",162.82],["2021-10-30",6.0],["2021-10-31",26.0],["2021-11-01",186.64],["2021-11-02",289.6],["2021-11-03",156.7],["2021-11-04",135.58],["2021-11-05",149.57],["2021-11-06",19.51],["2021-11-07",10.0],["2021-11-08",203.78],["2021-11-09",133.16],["2021-11-10",255.52],["2021-11-11",235.07],["2021-11-12",226.73],["2021-11-13",32.36],["2021-11-14",25.51],["2021-11-15",267.42],["2021-11-16",360.2],["2021-11-17",301.67],["2021-11-18",230.84],["2021-11-19",321.46],["2021-11-20",6.75],["2021-11-21",4.0],["2021-11-22",323.71],["2021-11-23",661.78],["2021-11-24",242.22],["2021-11-25",305.4],["2021-11-26",344.55],["2021-11-27",45.51],["2021-11-28",32.49],["2021-11-29",337.38],["2021-11-30",405.57],["2021-12-01",250.59],["2021-12-02",215.06],["2021-12-03",184.26],["2021-12-04",10.0],["2021-12-05",14.0],["2021-12-06",236.94],["2021-12-07",342.89],["2021-12-08",269.77],["2021-12-09",302.53],["2021-12-10",325.4],["2021-12-11",10.75],["2021-12-12",28.0],["2021-12-13",277.11],["2021-12-14",406.78],["2021-12-15",257.2],["2021-12-16",383.68],["2021-12-17",336.76],["2021-12-18",48.75],["2021-12-19",12.0],["2021-12-20",250.0],["2021-12-21",298.65],["2021-12-22",305.51],["2021-12-23",298.57],["2021-12-24",311.47],["2021-12-25",12.0],["2021-12-26",43.51],["2021-12-27",265.56],["2021-12-28",403.8],["2021-12-29",331.45],["2021-12-30",351.68],["2021-12-31",252.55],["2022-01-01",4.0],["2022-01-02",6.0],["2022-01-03",10.0],["2022-01-04",270.2],["2022-01-05",267.72],["2022-01-06",462.87],["2022-01-07",153.53],["2022-01-08",4.0],["2022-01-09",4.0],["2022-01-10",338.37],["2022-01-11",280.21],["2022-01-12",270.74],["2022-01-13",217.11],["2022-01-14",120.34],["2022-01-15",62.26],["2022-01-16",18.75],["2022-01-17",237.68],["2022-01-18",285.03],["2022-01-19",89.51],["2022-01-20",223.2],["2022-01-21",252.18],["2022-01-22",79.12],["2022-01-23",45.94],["2022-01-24",296.4],["2022-01-25",329.16],["2022-01-26",301.33],["2022-01-27",361.65],["2022-01-28",238.47],["2022-01-29",153.81],["2022-01-30",78.63],["2022-01-31",6.75],["2022-02-01",107.61],["2022-02-02",33.51],["2022-02-03",16.0],["2022-02-04",23.61],["2022-02-05",0.0],["2022-02-06",15.61],["2022-02-07",138.11],["2022-02-08",266.16],["2022-02-09",286.37],["2022-02-10",236.79],["2022-02-11",270.64],["2022-02-12",14.75],["2022-02-13",18.0],["2022-02-14",227.79],["2022-02-15",359.15],["2022-02-16",381.64],["2022-02-17",329.89],["2022-02-18",311.73],["2022-02-19",78.77],["2022-02-20",41.56],["2022-02-21",284.36],["2022-02-22",451.67],["2022-02-23",324.38],["2022-02-24",306.83],["2022-02-25",316.9],["2022-02-26",60.89],["2022-02-27",24.75],["2022-02-28",316.82],["2022-03-01",422.41],["2022-03-02",451.3],["2022-03-03",341.8],["2022-03-04",359.16],["2022-03-05",41.12],["2022-03-06",18.75],["2022-03-07",252.09],["2022-03-08",510.64],["2022-03-09",502.37],["2022-03-10",350.8],["2022-03-11",338.66],["2022-03-12",65.02],["2022-03-13",35.51],["2022-03-14",411.24],["2022-03-15",447.18],["2022-03-16",400.79],["2022-03-17",447.07],["2022-03-18",375.23],["2022-03-19",71.48],["2022-03-20",15.51],["2022-03-21",358.29],["2022-03-22",286.37],["2022-03-23",406.3],["2022-03-24",485.2],["2022-03-25",405.22],["2022-03-26",87.48],["2022-03-27",95.87],["2022-03-28",545.35],["2022-03-29",434.33],["2022-03-30",574.85],["2022-03-31",504.23],["2022-04-01",532.82],["2022-04-02",432.61],["2022-04-03",198.74],["2022-04-04",317.56],["2022-04-05",226.21],["2022-04-06",411.78],["2022-04-07",548.57],["2022-04-08",384.81],["2022-04-09",137.26],["2022-04-10",82.89],["2022-04-11",497.48],["2022-04-12",623.36],["2022-04-13",666.56],["2022-04-14",501.91],["2022-04-15",512.48],["2022-04-16",95.79],["2022-04-17",59.53],["2022-04-18",702.84],["2022-04-19",1120.68],["2022-04-20",473.26],["2022-04-21",573.59],["2022-04-22",287.08],["2022-04-23",85.16],["2022-04-24",319.71],["2022-04-25",399.12],["2022-04-26",719.0],["2022-04-27",433.92],["2022-04-28",453.87],["2022-04-29",370.4],["2022-04-30",67.77],["2022-05-01",30.53],["2022-05-02",75.91],["2022-05-03",40.63],["2022-05-04",219.36],["2022-05-05",519.1],["2022-05-06",381.01],["2022-05-07",242.79],["2022-05-08",27.28],["2022-05-09",411.91],["2022-05-10",573.0],["2022-05-11",320.64],["2022-05-12",262.23],["2022-05-13",292.2],["2022-05-14",18.26],["2022-05-15",8.0],["2022-05-16",244.39],["2022-05-17",337.73],["2022-05-18",231.72],["2022-05-19",243.51],["2022-05-20",369.09],["2022-05-21",26.26],["2022-05-22",44.63],["2022-05-23",354.03],["2022-05-24",444.89],["2022-05-25",203.4],["2022-05-26",284.21],["2022-05-27",298.19],["2022-05-28",25.77],["2022-05-29",37.28],["2022-05-30",411.56],["2022-05-31",318.13],["2022-06-01",371.31],["2022-06-02",349.34],["2022-06-03",19.02],["2022-06-04",32.14],["2022-06-05",45.38],["2022-06-06",360.07],["2022-06-07",444.39],["2022-06-08",437.51],["2022-06-09",340.51],["2022-06-10",291.3],["2022-06-11",31.77],["2022-06-12",45.38],["2022-06-13",461.48],["2022-06-14",695.29],["2022-06-15",450.62],["2022-06-16",417.3],["2022-06-17",562.28],["2022-06-18",34.04],["2022-06-19",12.75],["2022-06-20",317.27],["2022-06-21",677.06],["2022-06-22",457.51],["2022-06-23",431.59],["2022-06-24",385.91],["2022-06-25",73.77],["2022-06-26",15.61],["2022-06-27",392.56],["2022-06-28",541.5],["2022-06-29",357.58],["2022-06-30",326.03],["2022-07-01",313.47],["2022-07-02",39.12],["2022-07-03",23.51],["2022-07-04",362.31],["2022-07-05",405.85],["2022-07-06",302.2],["2022-07-07",295.71],["2022-07-08",196.91],["2022-07-09",41.28],["2022-07-10",8.26],["2022-07-11",430.34],["2022-07-12",456.42],["2022-07-13",469.05],["2022-07-14",309.68],["2022-07-15",243.65],["2022-07-16",164.3],["2022-07-17",10.0],["2022-07-18",274.52],["2022-07-19",397.4],["2022-07-20",369.75],["2022-07-21",306.38],["2022-07-22",212.25],["2022-07-23",28.26],["2022-07-24",7.51],["2022-07-25",228.03],["2022-07-26",441.73],["2022-07-27",448.1],["2022-07-28",358.8],["2022-07-29",307.34],["2022-07-30",27.87],["2022-07-31",34.04],["2022-08-01",361.3],["2022-08-02",419.65],["2022-08-03",451.89],["2022-08-04",392.44],["2022-08-05",422.02],["2022-08-06",17.02],["2022-08-07",71.28],["2022-08-08",421.78],["2022-08-09",536.01],["2022-08-10",310.81],["2022-08-11",286.97],["2022-08-12",354.74],["2022-08-13",62.83],["2022-08-14",23.41],["2022-08-15",437.93],["2022-08-16",407.48],["2022-08-17",275.47],["2022-08-18",311.82],["2022-08-19",356.52],["2022-08-20",37.77],["2022-08-21",10.0],["2022-08-22",347.31],["2022-08-23",424.2],["2022-08-24",395.79],["2022-08-25",362.48],["2022-08-26",1125.34],["2022-08-27",31.77],["2022-08-28",50.14],["2022-08-29",485.91],["2022-08-30",432.88],["2022-08-31",469.83],["2022-09-01",856.83],["2022-09-02",509.62],["2022-09-03",32.63],["2022-09-04",52.63],["2022-09-05",497.42],["2022-09-06",538.79],["2022-09-07",609.81],["2022-09-08",368.1],["2022-09-09",416.06],["2022-09-10",26.26],["2022-09-11",13.51],["2022-09-12",35.51],["2022-09-13",711.59],["2022-09-14",549.02],["2022-09-15",799.0],["2022-09-16",474.98],["2022-09-17",99.77],["2022-09-18",50.04],["2022-09-19",791.88],["2022-09-20",1350.06],["2022-09-21",531.0],["2022-09-22",574.41],["2022-09-23",536.46],["2022-09-24",30.75],["2022-09-25",45.87],["2022-09-26",530.0],["2022-09-27",418.13],["2022-09-28",498.14],["2022-09-29",422.09],["2022-09-30",281.24],["2022-10-01",86.7],["2022-10-02",192.07],["2022-10-03",228.33],["2022-10-04",286.15],["2022-10-05",128.54],["2022-10-06",76.4],["2022-10-07",24.26],["2022-10-08",235.12],["2022-10-09",330.18],["2022-10-10",939.52],["2022-10-11",779.41],["2022-10-12",644.63],["2022-10-13",492.43],["2022-10-14",402.26],["2022-10-15",9.51],["2022-10-16",30.53],["2022-10-17",1293.9],["2022-10-18",784.34],["2022-10-19",694.82],["2022-10-20",608.9],["2022-10-21",363.41],["2022-10-22",19.02],["2022-10-23",87.09],["2022-10-24",512.43],["2022-10-25",498.63],["2022-10-26",466.61],["2022-10-27",408.42],["2022-10-28",393.62],["2022-10-29",43.02],["2022-10-30",46.77],["2022-10-31",374.08],["2022-11-01",616.87],["2022-11-02",441.67],["2022-11-03",518.26],["2022-11-04",403.67],["2022-11-05",23.02],["2022-11-06",18.26],["2022-11-07",523.74],["2022-11-08",755.34],["2022-11-09",482.38],["2022-11-10",545.23],["2022-11-11",301.17],["2022-11-12",5.51],["2022-11-13",10.0],["2022-11-14",435.07],["2022-11-15",460.51],["2022-11-16",492.72],["2022-11-17",510.23],["2022-11-18",463.98],["2022-11-19",36.26],["2022-11-20",49.77],["2022-11-21",565.78],["2022-11-22",532.42],["2022-11-23",525.31],["2022-11-24",483.87],["2022-11-25",466.82],["2022-11-26",76.04],["2022-11-27",70.1],["2022-11-28",701.04],["2022-11-29",723.19],["2022-11-30",624.64],["2022-12-01",664.31],["2022-12-02",555.44],["2022-12-03",80.89],["2022-12-04",87.91],["2022-12-05",642.33],["2022-12-06",524.23],["2022-12-07",544.12],["2022-12-08",767.68],["2022-12-09",644.76],["2022-12-10",57.87],["2022-12-11",28.26],["2022-12-12",547.89],["2022-12-13",474.1],["2022-12-14",374.49],["2022-12-15",429.21],["2022-12-16",328.38],["2022-12-17",41.87],["2022-12-18",51.87],["2022-12-19",345.43],["2022-12-20",448.65],["2022-12-21",360.53],["2022-12-22",309.9],["2022-12-23",354.04],["2022-12-24",19.51],["2022-12-25",37.51],["2022-12-26",232.6],["2022-12-27",422.3],["2022-12-28",373.2],["2022-12-29",264.28],["2022-12-30",260.21],["2022-12-31",8.26],["2023-01-01",29.02],["2023-01-02",20.75],["2023-01-03",483.9],["2023-01-04",420.32],["2023-01-05",537.41],["2023-01-06",305.53],["2023-01-07",35.87],["2023-01-08",18.26],["2023-01-09",428.36],["2023-01-10",520.86],["2023-01-11",6500.2],["2023-01-12",369.52],["2023-01-13",651.12],["2023-01-14",26.26],["2023-01-15",36.53],["2023-01-16",349.58],["2023-01-17",390.65],["2023-01-18",341.59],["2023-01-19",176.32],["2023-01-20",187.01],["2023-01-21",108.13],["2023-01-22",126.75],["2023-01-23",61.77],["2023-01-24",27.51],["2023-01-25",43.16],["2023-01-26",18.75],["2023-01-27",12.36],["2023-01-28",96.4],["2023-01-29",201.2],["2023-01-30",425.92],["2023-01-31",655.91],["2023-02-01",532.93],["2023-02-02",334.96]] +const data = [["2020-03-14",0,0,0],["2020-03-10",0,0,0],["2020-03-16",0,0,0],["2020-03-22",13,0,0],["2020-03-29",70,0,0],["2020-04-05",38,0,3],["2020-04-12",67,0,3],["2020-04-19",66,0,5],["2020-04-26",48,0,3],["2020-05-03",36,0,7],["2020-05-10",45,0,2],["2020-05-17",84,0,2],["2020-05-24",95,0,5],["2020-05-31",42,0,3],["2020-06-07",92,0,3],["2020-06-14",108,0,1],["2020-06-21",71,0,4],["2020-06-28",64,22528,0],["2020-07-05",67,47920,0],["2020-07-12",71,11564,0],["2020-07-19",107,1000,0],["2020-07-26",94,45,0],["2020-08-02",179,2005,0],["2020-08-09",287,3542,0],["2020-08-16",279,45698,0],["2020-08-23",228,101139,0],["2020-08-30",134,318,0],["2020-09-06",140,92,0],["2020-09-13",165,42,0],["2020-09-20",130,170,0],["2020-09-27",57,36,0],["2020-10-04",30,1,0],["2020-10-11",99,231,0],["2020-10-18",113,78597,0],["2020-10-25",130,24,0],["2020-11-01",85,32,0],["2020-11-08",82,10,0],["2020-11-15",104,8,0],["2020-11-22",102,11,0],["2020-11-29",153,0,0],["2020-12-06",124,2,0],["2020-12-13",105,0,0],["2020-12-20",94,0,0],["2020-12-27",63,2,0],["2021-01-03",70,0,0],["2021-01-10",68,198,2],["2021-01-17",73,0,5],["2021-01-24",100,0,5],["2021-01-31",111,0,3],["2021-02-07",45,0,2],["2021-02-14",56,1,5],["2021-02-21",83,2,2],["2021-02-28",119,1,4],["2021-03-07",141,1,3],["2021-03-14",139,3,2],["2021-03-21",151,4,3],["2021-03-28",89,0,6],["2021-04-04",84,0,5],["2021-04-11",147,3,1],["2021-04-18",110,2,2],["2021-04-25",111,0,1],["2021-05-02",63,0,7],["2021-05-09",79,0,15],["2021-05-16",84,3,12],["2021-05-23",165,1,14],["2021-05-30",132,0,7],["2021-06-06",147,12,15],["2021-06-13",122,0,20],["2021-06-20",185,0,16],["2021-06-27",190,0,21],["2021-07-04",248,0,14],["2021-07-11",290,0,24],["2021-07-18",136,0,16],["2021-07-25",173,0,18],["2021-08-01",133,24,13],["2021-08-08",144,9,19],["2021-08-15",110,20,21],["2021-08-22",190,0,16],["2021-08-29",451,15,10],["2021-09-05",126,39,14],["2021-09-12",186,54,11],["2021-09-19",138,8,5],["2021-09-26",113,46,4],["2021-10-03",86,32,8],["2021-10-10",99,119,5],["2021-10-17",90,28,0],["2021-10-24",110,66,1],["2021-10-31",86,30,2],["2021-11-07",132,210,1],["2021-11-14",96,334,2],["2021-11-21",96,616,1],["2021-11-28",141,25,2],["2021-12-05",104,75,0],["2021-12-12",126,8,2],["2021-12-19",123,17,0],["2021-12-26",111,4,8],["2022-01-02",115,5,16],["2022-01-09",110,3,13],["2022-01-16",94,5,13],["2022-01-23",122,1,14],["2022-01-30",4,0,8],["2022-02-06",74,30,11],["2022-02-13",97,2,11],["2022-02-20",84,0,17],["2022-02-27",71,1,17],["2022-03-06",179,5,13],["2022-03-13",86,0,62],["2022-03-20",134,9,72],["2022-03-27",250,9,111],["2022-04-03",50,6,404],["2022-04-10",87,10,426],["2022-04-17",125,2,454],["2022-04-24",126,8,658],["2022-05-01",78,6,857],["2022-05-08",136,6,809],["2022-05-15",115,4,624],["2022-05-22",130,4,468],["2022-05-29",67,8,536],["2022-06-05",121,4,638],["2022-06-12",112,7,205],["2022-06-19",184,22,113],["2022-06-26",143,11,141],["2022-07-31",59,4,5],["2022-08-07",90,49,3],["2022-08-14",77,4,4],["2022-08-21",105,15,4],["2022-08-28",120,1,8],["2022-09-04",121,1,8],["2022-09-11",115,212,0],["2022-09-18",121,12,0],["2022-09-25",98,0,0],["2022-10-02",22,15,0],["2022-10-09",111,2,0],["2022-10-16",108,9,0],["2022-10-23",147,4,0],["2022-10-30",200,0,0],["2022-11-06",226,127,0],["2022-11-13",214,171,0],["2022-11-20",226,19,0],["2022-11-27",203,32,0],["2022-12-04",197,4,0],["2022-12-11",127,44,0],["2022-12-18",109,31,0],["2022-12-25",69,1,0],["2023-01-01",81,1,0],["2023-01-08",565,0,0],["2023-01-15",90,7,0],["2023-01-22",24,2,0],["2023-01-29",160,0,0],["2023-02-05",130,88,0],["2023-02-12",79,175,0],["2023-02-19",138,4,0],["2023-02-26",164,4,0],["2023-03-05",164,4,0],["2023-03-12",246,0,0],["2023-03-19",78,0,1]] diff --git a/src/forge/Activity/demo.jsx b/src/forge/Activity/demo.jsx new file mode 100644 index 000000000..dd87e5c2e --- /dev/null +++ b/src/forge/Activity/demo.jsx @@ -0,0 +1,165 @@ +import React ,{ useEffect } from 'react'; +// import echarts from 'echarts/lib/echarts'; +import 'echarts/lib/chart/line'; +import * as echarts from 'echarts'; +import axios from 'axios'; +import { getdata } from './data' + +function Demo({url}) { + + useEffect(()=>{ + Init(); + },[]) + + function Init() { + let data = getdata(); + console.log(data); + var huan_val = document.getElementById("Demo"); + var myEcharts = echarts.init(huan_val); + let date = []; + let array = [0]; + let array1 = [0]; + let array2 = [0]; + let option = { + xAxis: { + type: 'time', + data:date, + boundaryGap: false, + axisLabel:{ + month:`{M}月` + } + }, + tooltip: { + trigger: 'axis', + formatter: function (params) { + params = params[0]; + var date = new Date(params.name); + return ( + date.getDate() + + '/' + + (date.getMonth() + 1) + + '/' + + date.getFullYear() + + ' : ' + + params.value + ); + }, + axisPointer: { + animation: false + } + }, + grid: { + left: '5%', + right: '1%', + top: '8%', + }, + legend: { + data: ['issue', 'fork' ,'commit'] + }, + color: ['red','#36bba6',"skyblue",'#a491d7','#e840f7',"#36bba6","#7b32b2"], + yAxis: { + type: 'value', + scale: true, + boundaryGap: [0, '100%'], + name: '', + min:0, + splitLine : { + show : true, + }, + nameLocation:'end', + nameTextStyle:{ + fontSize:14, + padding:[0,70,-80,0] + } + },series:[ + { + data: array, + type: 'line', + name:"issue", + smooth: true + }, + { + data: array1, + type: 'line', + name:"fork", + smooth: true + }, + { + data: array2, + type: 'line', + name:"commit", + smooth: true + }, + ] + }; + myEcharts.setOption(option); + + setTimeout(()=>{ + let count = data.length>15?15:data.length; + for(var i = 0;i
+ ) +} +export default Demo; \ No newline at end of file diff --git a/src/forge/Component/Contributors.jsx b/src/forge/Component/Contributors.jsx index 304d8a16e..bb5a8db47 100644 --- a/src/forge/Component/Contributors.jsx +++ b/src/forge/Component/Contributors.jsx @@ -166,7 +166,7 @@ function Contributors({owner,projectsId,currentLogin}){ return( total > 0 ?
- + {window.scrollTo(0,0)}} className="font-16 color-ooo hoverA"> 贡献者 { total > 0 && {total}} @@ -174,7 +174,7 @@ function Contributors({owner,projectsId,currentLogin}){ { list && list.length>0 && list.map((item,key)=>{ return( - item.id ? + item.login ? setVisibleFunc(true,item.login,key)}/> diff --git a/src/forge/Component/Releases.jsx b/src/forge/Component/Releases.jsx index 260e6bd2d..94768e733 100644 --- a/src/forge/Component/Releases.jsx +++ b/src/forge/Component/Releases.jsx @@ -5,7 +5,7 @@ import { Link } from 'react-router-dom'; function Releases({ owner, projectsId, releaseVersions, distribution }) { return(
- + {window.scrollTo(0,0)}} className="font-16 color-ooo hoverA"> 发行版 { releaseVersions && releaseVersions.total_count > 0 && {releaseVersions.total_count}} diff --git a/src/forge/Issues/Component/datas.jsx b/src/forge/Issues/Component/datas.jsx index ddcf3131a..dba2ab56e 100644 --- a/src/forge/Issues/Component/datas.jsx +++ b/src/forge/Issues/Component/datas.jsx @@ -59,7 +59,7 @@ function Datas({checkbox ,item , projectsId,owner}){ {item.updated_at}更新 {item.blockchain_token_num && {item.blockchain_token_num}} {item.milestone_name && - + {window.scrollTo(0,0)}} style={{maxWidth:item.blockchain_token_num ? "261px":"340px",color:"#898d9d"}} title={item.milestone_name} className="task-hide"> {item.milestone_name} diff --git a/src/forge/Issues/Pages/details.jsx b/src/forge/Issues/Pages/details.jsx index 626278eca..e1db36d9c 100644 --- a/src/forge/Issues/Pages/details.jsx +++ b/src/forge/Issues/Pages/details.jsx @@ -275,6 +275,7 @@ function Details(props){ ...params }).then(result=>{ if(result){ + window.scrollTo(0,0); props.showNotification("疑修更新成功！"); // 刷新操作记录 setCommentReload(Math.random()); @@ -303,6 +304,7 @@ function Details(props){ due_date }).then(result=>{ if(result && result.data && result.data.project_issues_index){ + window.scrollTo(0,0); props.showNotification("任务复制成功！"); props.history.push(`/${owner}/${projectsId}/issues/${result.data.project_issues_index}`); } diff --git a/src/forge/Issues/Pages/new.jsx b/src/forge/Issues/Pages/new.jsx index c7f2a87c9..ce09cc6be 100644 --- a/src/forge/Issues/Pages/new.jsx +++ b/src/forge/Issues/Pages/new.jsx @@ -197,6 +197,7 @@ function New(props){ blockchain_token_num:rewardAmount }).then(result=>{ if(result && result.data && result.data.project_issues_index){ + window.scrollTo(0,0); props.showNotification("任务创建成功！"); props.history.push(`/${owner}/${projectsId}/issues/${result.data.project_issues_index}`); } diff --git a/src/forge/Issues/index.scss b/src/forge/Issues/index.scss index 799a068c6..1283e3a8e 100644 --- a/src/forge/Issues/index.scss +++ b/src/forge/Issues/index.scss @@ -47,22 +47,6 @@ background-color: #f3f4f6; } } -// 操作按钮-蓝色 -.operateButton{ - padding:0px 15px; - height:32px; - color: #fff!important; - cursor: pointer; - line-height: 30px; - background-color:rgba(70, 106, 255, 1); - border:1px solid rgba(70, 106, 255, 1); - border-radius: 4px; - display: block; - &:hover{ - background-color:#708cff; - border-color:#708cff; - } -} // flex-左右，上下居中 .between{ display: flex; @@ -808,7 +792,7 @@ } } li{ - width: 100px; + width: 98px; height:32px; line-height:30px; text-align: center; diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index d59423710..2753398dd 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -63,7 +63,7 @@ function CoderDepot(props){ const details = props.projectDetail; let pathname = props.history.location.pathname; //distribution：判断此用户是否可以创建发行版 - const distribution = details && details.type != 2 && (details.permission === "Admin" || details.permission === "Owner" || details.permission === "Manager"); + const distribution = details && details.type !== 2 && ( details.permission && details.permission !== "Reporter"); const { bannerList } = props; useEffect(()=>{ if(bannerList && bannerList.length>0){ @@ -295,6 +295,7 @@ function CoderDepot(props){ let checkvalue = turnbar(enBranch); let enPath = turnbar(path); setType(type); + window.scrollTo(0,0) props.history.push(`/${owner}/${projectsId}${`/tree/${checkvalue}`}${enPath?`/${enPath}`:""}`); } } diff --git a/src/forge/Main/CoderDepotCatalogue.jsx b/src/forge/Main/CoderDepotCatalogue.jsx index c292ee733..993c56b48 100644 --- a/src/forge/Main/CoderDepotCatalogue.jsx +++ b/src/forge/Main/CoderDepotCatalogue.jsx @@ -32,11 +32,11 @@ function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId , platform ( item.submodule_git_url ? - + {window.scrollTo(0,0)}} target="_self"> {item.name} @ - {truncateCommitId(item.sha)} + {window.scrollTo(0,0)}} title={item.sha}>{truncateCommitId(item.sha)} : diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js index e2c3b2a41..39dc43f33 100644 --- a/src/forge/Main/IndexItem.js +++ b/src/forge/Main/IndexItem.js @@ -35,7 +35,7 @@ class IndexItem extends Component {
- + {item.author.name}/{item.name} { !item.is_public && 私有 } diff --git a/src/forge/Main/sub/Contribute.jsx b/src/forge/Main/sub/Contribute.jsx index cc3f97438..6f267c8cf 100644 --- a/src/forge/Main/sub/Contribute.jsx +++ b/src/forge/Main/sub/Contribute.jsx @@ -63,7 +63,7 @@ function Contribute(props){
- {item.name} + {item.name}

提交{item.contributions}次{item.contribution_perc ? ` I 贡献占比${item.contribution_perc}` : ''}

 diff --git a/src/forge/Main/tag/Index.jsx b/src/forge/Main/tag/Index.jsx index 4efb1c4cd..651f03bba 100644 --- a/src/forge/Main/tag/Index.jsx +++ b/src/forge/Main/tag/Index.jsx @@ -61,18 +61,18 @@ function Tags(props) { render: (txt, item) => { return (
- {item.name} + {window.scrollTo(0,0)}}>{item.name}
{ item.tagger && { item.tagger.id ? - + {window.scrollTo(0,0)}}> : - + {window.scrollTo(0,0)}}> } @@ -97,7 +97,7 @@ function Tags(props) { sha - {truncateCommitId(item.id)} + {window.scrollTo(0,0)}}>{truncateCommitId(item.id)} diff --git a/src/forge/Main/tree/Index.jsx b/src/forge/Main/tree/Index.jsx index f2abc4475..73ec3aa1c 100644 --- a/src/forge/Main/tree/Index.jsx +++ b/src/forge/Main/tree/Index.jsx @@ -75,7 +75,7 @@ function Index(props) { className: "branchNameColumn", render: (txt, item) => { return ( - {txt} + {window.scrollTo(0,0)}} className="task-hide">{txt} ) } }, diff --git a/src/forge/Main/version/version.js b/src/forge/Main/version/version.js index bee09621b..1c233dc2b 100644 --- a/src/forge/Main/version/version.js +++ b/src/forge/Main/version/version.js @@ -71,16 +71,16 @@ function version(props) { {item.draft} - {item.tag_name} + {window.scrollTo(0,0)}}>{item.tag_name} - - {truncateCommitId(item.sha)} + + {window.scrollTo(0,0)}} className="hover" to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`}>{truncateCommitId(item.sha)}
- {item.name} + {window.scrollTo(0,0)}} to={`/${owner}/${projectsId}/tree/${item.tag_name}`} className="task-hide color-blue hover font-18">{item.name} {data && data.user_admin_permission && type !== 2 && } {data && data.user_admin_permission && type !== 2 && diff --git a/src/forge/Merge/Index.scss b/src/forge/Merge/Index.scss index ea8b6b7eb..e0460902e 100644 --- a/src/forge/Merge/Index.scss +++ b/src/forge/Merge/Index.scss @@ -100,4 +100,12 @@ } } } +} +.empBtn{ + display: flex; + align-items: center; + justify-content: center; + margin-top: 60px; + padding-top: 20px; + border-top: 1px solid #F3F4F6; } \ No newline at end of file diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js index ece07f35b..f7fceacc9 100644 --- a/src/forge/Merge/MergeItem.js +++ b/src/forge/Merge/MergeItem.js @@ -56,6 +56,7 @@ class MergeItem extends Component { {window.scrollTo(0,0)}} className="hide-1 font-15 color-grey-3 fwb lineh-30 mr10" style={{ maxWidth: "600px" }} > diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js index e901e628f..794ae9138 100644 --- a/src/forge/Merge/merge.js +++ b/src/forge/Merge/merge.js @@ -11,7 +11,7 @@ import { turnbar } from "educoder"; import axios from "axios"; import CheckProfile from '../Component/ProfileModal/Profile'; -const Search = Input.Search; +const { Search } = Input; /** * issue_chosen:下拉的筛选列表, * data:列表接口返回的所有数据, @@ -268,17 +268,14 @@ class merge extends Component { return (
-
- -
+ { data && data.user_admin_or_developer && - this.checkOperation()}> + this.checkOperation()}> + 新建合并请求 } diff --git a/src/forge/Merge/no_data.js b/src/forge/Merge/no_data.js index e41e1dfa1..c54e4bda4 100644 --- a/src/forge/Merge/no_data.js +++ b/src/forge/Merge/no_data.js @@ -1,5 +1,6 @@ import React , { Component } from 'react'; import { Link } from "react-router-dom"; +import None from '../Images/emp.png' class Nodata extends Component{ render(){ const { _html, projectsId , owner , user_admin_or_developer , defaultBranch} = this.props; @@ -7,13 +8,19 @@ class Nodata extends Component{
- + {/* */} +
-

欢迎使用合并请求！

+

欢迎使用合并请求！

-
- 合并请求可以帮助您与他人协作编写代码。{ user_admin_or_developer && 在使用之前，请先创建一个 合并请求 } +
+ 合并请求可以帮助您与他人协作编写代码。请先创建一个合并请求
+ { user_admin_or_developer && +
+ 合并请求 +
+ }
) diff --git a/src/forge/Newfile/Index.js b/src/forge/Newfile/Index.js index 758bdf72b..98601e901 100644 --- a/src/forge/Newfile/Index.js +++ b/src/forge/Newfile/Index.js @@ -53,7 +53,7 @@ class Index extends Component { checkFileName=(e)=>{ let value = (e.target.value); //\需要单独判断 - const str = '!！@/:："“”<《》>|｜？？%'; + const str = '!！@:："“”<《》>|｜？？%'; let reg = /\\/g; if(reg.test(value)){ this.setState({ @@ -102,7 +102,7 @@ class Index extends Component { placeholder="命名文件..." onBlur={this.checkFileName} /> - {checkName ?

文件名不能包含下列任何字符：\{`！@/:"<>|？%`}

:"" } + {checkName ?

文件名不能包含下列任何字符：\{`！@:"<>|？%`}

:"" }
取消 diff --git a/src/forge/Newfile/UserSubmitComponent.js b/src/forge/Newfile/UserSubmitComponent.js index 66e2e1b47..c8789e1a9 100644 --- a/src/forge/Newfile/UserSubmitComponent.js +++ b/src/forge/Newfile/UserSubmitComponent.js @@ -75,6 +75,7 @@ class UserSubmitComponent extends Component { const { getDetail } = this.props; getDetail && getDetail(); } + window.scrollTo(0,0); let url = `/${owner}/${projectsId}${values.branchname ? `/tree/${turnbar(values.branchname)}`: (branch ? `/tree/${turnbar(branch)}` : "")}`; this.props.history.push(url); } @@ -112,6 +113,7 @@ class UserSubmitComponent extends Component { this.setState({ isSpin: false }); if (result.data && result.data.status === 1) { let b = currentBranch || branch; + window.scrollTo(0,0); let url = `/${owner}/${projectsId}${(values.branchname ? `/tree/${turnbar(values.branchname)}` : (b ? `/tree/${turnbar(b)}`:""))}`; this.props.history.push(url); this.props.showNotification("文件修改成功!"); @@ -267,6 +269,7 @@ class UserSubmitComponent extends Component { type="primary grey" onClick={() => { this.props.history.push(`/${owner}/${projectsId}`); + window.scrollTo(0,0); }} className="mr20" > diff --git a/src/forge/Order/UpdateMilepost.js b/src/forge/Order/UpdateMilepost.js index 7ffb1927e..4bb410409 100644 --- a/src/forge/Order/UpdateMilepost.js +++ b/src/forge/Order/UpdateMilepost.js @@ -92,6 +92,7 @@ class UpdateMilepost extends Component { }).then(result => { if (result) { this.setState({ isSpin: false }) + window.scrollTo(0,0); this.props.history.push(`/${owner}/${projectsId}/milestones/${meilid}`); } diff --git a/src/forge/Order/index.scss b/src/forge/Order/index.scss index e721713ca..617423312 100644 --- a/src/forge/Order/index.scss +++ b/src/forge/Order/index.scss @@ -1,5 +1,5 @@ .screenWrap{ - background:rgba(250,250,250,1); + background:#fafcff; border-top:1px solid rgba(221,221,221,1); border-bottom:1px solid rgba(221,221,221,1); padding-left: 20px; diff --git a/src/forge/Order/newMilepost.js b/src/forge/Order/newMilepost.js index a5aeb08c5..9418d8de3 100644 --- a/src/forge/Order/newMilepost.js +++ b/src/forge/Order/newMilepost.js @@ -77,6 +77,7 @@ class NewMilepost extends Component { }).then(result => { if (result) { this.setState({ isSpin: false }) + window.scrollTo(0,0); this.props.history.push(`/${owner}/${projectsId}/milestones`); const { getDetail } = this.props; getDetail && getDetail(); diff --git a/src/forge/Settings/Setting.js b/src/forge/Settings/Setting.js index b7023f0fd..fdf557c53 100644 --- a/src/forge/Settings/Setting.js +++ b/src/forge/Settings/Setting.js @@ -1,5 +1,5 @@ import React, { Component } from "react"; -import { Form, Input, Checkbox, Select , Spin } from "antd"; +import { Form, Input, Checkbox, Select , Spin, Button } from "antd"; import Title from '../Component/Title'; import {WhiteBack} from '../Component/layout'; import DivertModal from '../Divert/DivertModal'; @@ -208,6 +208,7 @@ class Setting extends Component { store_id: project_id, store_identifier: projectsId }) + window.scrollTo(0,0); this.props.showNotification("仓库删除成功！"); this.props.history.push(`/${owner}`); }) @@ -409,9 +410,9 @@ class Setting extends Component {
{ is_transfering ? - 取消转移 + : - 转移 + }
@@ -422,9 +423,9 @@ class Setting extends Component { 无法撤消，且删除后，与仓库关联的项目/任务/合并请求/版本发布等，均会被删除

- +
diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss index 51d252060..bd48b868c 100644 --- a/src/forge/css/index.scss +++ b/src/forge/css/index.scss @@ -146,16 +146,23 @@ ul,ol,dl{ .normalBox{ border-radius: 4px; - border:1px solid #ddd; + // border:1px solid #ddd; } .normalBox-title{ - padding:10px; - background-color: #f4f4f4; - line-height: 18px; + background-color: #fafcff; + border: 1px solid; + border-color: rgba(42, 97, 255, 0.23); + border-radius: 4px 4px 0px 0px; + padding:0px 20px; + height: 48px; + display: flex; + align-items: center; + font-size: 16px; } .none_panels{ text-align: center; - height: 400px; + min-height: 320px; + padding:40px 0px; display: flex; justify-content: center; align-items: center; @@ -409,4 +416,22 @@ button.btngrey{ .newTab .newBtnImg { right: -19px; } +} + + +// 操作按钮-蓝色 +.operateButton{ + padding:0px 15px; + height:32px; + color: #fff!important; + cursor: pointer; + line-height: 30px; + background-color:rgba(70, 106, 255, 1); + border:1px solid rgba(70, 106, 255, 1); + border-radius: 4px; + display: block; + &:hover{ + background-color:#708cff; + border-color:#708cff; + } } \ No newline at end of file diff --git a/src/modules/search/ItemList.jsx b/src/modules/search/ItemList.jsx index 799168fb5..58415fcd6 100644 --- a/src/modules/search/ItemList.jsx +++ b/src/modules/search/ItemList.jsx @@ -1,5 +1,8 @@ import React from 'react'; import './index.scss'; +import dianzan from './image/dianzan.png'; +import fork from './image/fork.png'; + export default (props) => { const { list } = props; @@ -16,9 +19,9 @@ export default (props) => {

{ itemClick(item) }}>

{item.type == 1 &&

- {item.watchersCount} - {item.praisesCount} - {item.forkedCount || 0} + {item.watchersCount} + {item.praisesCount} + {item.forkedCount || 0}

}
diff --git a/src/modules/search/image/bg.png b/src/modules/search/image/bg.png new file mode 100644 index 000000000..469baa522 Binary files /dev/null and b/src/modules/search/image/bg.png differ diff --git a/src/modules/search/image/dianzan.png b/src/modules/search/image/dianzan.png new file mode 100644 index 000000000..a2adc4bb5 Binary files /dev/null and b/src/modules/search/image/dianzan.png differ diff --git a/src/modules/search/image/fork.png b/src/modules/search/image/fork.png new file mode 100644 index 000000000..919af3c21 Binary files /dev/null and b/src/modules/search/image/fork.png differ diff --git a/src/modules/search/index.scss b/src/modules/search/index.scss index 01b6d1369..0671b9eeb 100644 --- a/src/modules/search/index.scss +++ b/src/modules/search/index.scss @@ -1,6 +1,9 @@ .suit-main { .search-head { - background: #eef2f5; + background-color: #eef2f5; + background-image: url(./image/bg.png); + background-size: 100% 100%; + height: 170px; } .search-box { @@ -21,7 +24,8 @@ } } .ant-tabs-top { - background: #eef2f5; + background: rgba(0,0,0,0); + margin-top: -44px; } .ant-tabs-tabpane { background: #fff; @@ -29,6 +33,7 @@ .ant-tabs-bar { width: 1200px; margin: 0 auto; + border-bottom: none; } .ant-tabs-tab-active { color: #000; @@ -54,7 +59,7 @@ margin-bottom: 30px!important; li{ margin-right: 25px; - padding:0px 22px; + padding:0px 15px 0px 22px; border:1px solid #5e6685; border-radius: 4px; height: 32px;