diff --git a/backend/RunWithMe/gradle/wrapper/.gitattributes b/backend/RunWithMe/gradle/wrapper/.gitattributes deleted file mode 100644 index e3a5a803..00000000 --- a/backend/RunWithMe/gradle/wrapper/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.jar filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/backend/RunWithMe/gradle/wrapper/gradle-wrapper.jar b/backend/RunWithMe/gradle/wrapper/gradle-wrapper.jar index 20633278..87b738cb 100644 Binary files a/backend/RunWithMe/gradle/wrapper/gradle-wrapper.jar and b/backend/RunWithMe/gradle/wrapper/gradle-wrapper.jar differ diff --git a/doc/UCC/.gitattributes b/doc/UCC/.gitattributes deleted file mode 100644 index 3fd51a7b..00000000 --- a/doc/UCC/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.mp4 filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/doc/UCC/RWM_Real_Final_83Mb_Best.mp4 b/doc/UCC/RWM_Real_Final_83Mb_Best.mp4 index 448a2482..b1631fa3 100644 Binary files a/doc/UCC/RWM_Real_Final_83Mb_Best.mp4 and b/doc/UCC/RWM_Real_Final_83Mb_Best.mp4 differ diff --git a/frontend/RunWithMe/src/views/app/dashboards/main.vue b/frontend/RunWithMe/src/views/app/dashboards/main.vue index dada851c..01370cd4 100644 --- a/frontend/RunWithMe/src/views/app/dashboards/main.vue +++ b/frontend/RunWithMe/src/views/app/dashboards/main.vue @@ -416,7 +416,7 @@ export default { obj.runningId = data.data.runnings[i].runningId; obj.total_distance = data.data.runnings[i].accDistance.toFixed(2); obj.accumulcated_time = data.data.runnings[i].accTime; - obj.running_avg_pace = data.data.runnings[i].accTime / data.data.runnings[i].accDistance; + obj.running_avg_pace = (data.data.runnings[i].accDistance<0.01 || data.data.runnings[i].accTime<1)? 0: (data.data.runnings[i].accDistance*1000) / data.data.runnings[i].accTime; obj.mapImg = data.data.runnings[i].thumbnail; } obj.userId = data.data.friends[i].userId; @@ -431,6 +431,7 @@ export default { if(this.friendsFeed.length == 0) this.haveFriends = false; } + this.friendsFeed.reverse(); }) .catch((error) => { console.log(error); diff --git a/frontend/RunWithMe/src/views/app/runnings/friendsDetail.vue b/frontend/RunWithMe/src/views/app/runnings/friendsDetail.vue index b2d5e9e6..a84463bf 100644 --- a/frontend/RunWithMe/src/views/app/runnings/friendsDetail.vue +++ b/frontend/RunWithMe/src/views/app/runnings/friendsDetail.vue @@ -162,10 +162,10 @@ export default { return runningTime; }, convertToTime(origin) { - var time = ""; - time += parseInt(origin / 60) + "'"; - time += (origin % 60) + '"'; - return time; + var time = ""; + time += parseInt(origin/60) + "\'"; + time += (origin%60).toFixed() + "\""; + return time; }, isFollower() { // //console.log(this.friendInfo.userId); @@ -201,7 +201,7 @@ export default { obj.running_avg_pace = 0; } else { obj.running_avg_pace = ( - element.accDistance / element.accTime + (element.accDistance*1000) / element.accTime ).toFixed(2); } obj.acc_time_min = parseInt(obj.accumulcated_time / 60); @@ -213,7 +213,7 @@ export default { this.items.push(obj); }); } - // //console.log(this.items); + console.log(this.items); if (this.items.length == 0) { this.isRunning = false; }