Merge pull request #5 from gogobody/dev

Dev
gogobody · Dec 15, 2020 · 596eeb0 · 596eeb0
2 parents 15b4c4c + 5535bf8
commit 596eeb0
Show file tree

Hide file tree

Showing 23 changed files with 725 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 ## onecircle 一个圈子，基于typecho
 
 ## 名字就叫一个圈子。
-## version：3.0
+## version：3.1
 ## 平台：typecho
 
 ### 想弄一个类社交圈子，开发了一部分，剩下慢慢折腾
@@ -21,6 +21,7 @@
 6. 支持给每个新注册用户添加个人签名和tag
 7. 支持免费的sm 图床
 8. 支持博客页
+9. 添加用户设置页，用户等级以及积分支持
 
 ## changeLog
 v1.6 支持 pjax，以及前台登录发布文章，加入progress动画  
@@ -143,10 +144,10 @@ links
 ![index](READMEimgs/follow.png)
 
 主题设置  
-![index](READMEimgs/follow.png)
+![index](READMEimgs/usersetting.png)
 
 签名设置  
-![index](READMEimgs/usersign.png)
+![index](READMEimgs/gexinghua.png)
 
 ### 感谢以下作者的辛苦付出
 - compress https://javascript-minifier.com/

diff --git a/READMEimgs/gexinghua.png b/READMEimgs/gexinghua.png
diff --git a/READMEimgs/usersetting.png b/READMEimgs/usersetting.png
diff --git a/assets/css/onecircle.css b/assets/css/onecircle.css
@@ -322,7 +322,7 @@ aside
     /*color: rgb(29, 161, 242);*/
     background-color: #86abc3!important;
 }
-.nav-item:hover {
+.nav-menu .nav-item:hover {
     background-color: #1da1f21a;
     color: #1da1f2;
     border-radius: 25px;
@@ -1460,7 +1460,9 @@ right
 .user-detail.user-detail-padding {
     padding-bottom: 20px;
 }
-
+.user-detail .value{
+    margin-top: 10px;
+}
 .user-detail .info {
     box-sizing: border-box;
     min-width: 0;
@@ -3886,6 +3888,142 @@ button {
     transition: transform 0.35s, -webkit-transform 0.35s;
     font-size: 14px;
 }
+/**
+usercenter
+ */
+.m-b {
+    margin-bottom: 15px;
+}
+.m-t {
+    margin-top: 15px;
+}
+.m-b-xs {
+    margin-bottom: 5px;
+}
+.m-t-xs {
+    margin-top: 5px;
+}
+.m-l-xs {
+    margin-left: 5px;
+}
+.text-xs {
+    font-size: 12px;
+}
+.bg-info{
+    color: #fff;
+}
+.d-flex-wrap{
+    display: flex;
+    flex-wrap: wrap;
+}
+.pull-right {
+    float: right !important;
+}
+.btn-xs, .btn-group-xs > .btn{
+    padding: 1px 5px;
+    font-size: 12px;
+    line-height: 1.5;
+    border-radius: 3px;
+}
+.bg-light.lt, .bg-light .lt{
+    background-color: #edf2f3;
+}
+.usercenter-container{
+    display: flex;
+    flex-direction: row;
+    font-size: 14px;
+}
+.usercenter-container .left-panel{
+    flex: 1;
+    background-color: aliceblue;
+    padding: 10px;
+}
+.list-group-item.active{
+    color: #fff;
+    border-color: #4cb6cb !important;
+    background-color: #4cb6cb !important;
+}
+.usercenter-container .left-panel .list-group-item a span{
+    width: 20px;
+    display: inline-block;
+}
+.usercenter-container .left-panel .list-group-item a span svg{
+    margin-bottom: 4px;
+    margin-right: 5px;
+    width: 1em!important;
+    height: 1em!important;
+}
+.usercenter-container .right-panel {
+    flex: 3;
+    background-color: aliceblue;
+    padding: 10px;
+}
+.usercenter-container .right-panel .nav-tabs .nav-link.active{
+    background-color: #d9dae5;
+}
+.header .nav-tabs{
+    border: none;
+}
+
+.header .nav-tabs > li a{
+    border: none !important;
+    border-radius: 0;
+    padding-top: 15px;
+    padding-bottom: 15px;
+    line-height: 20px;
+}
+.usercenter-container .right-panel .typecho-option li .radio-label{
+    padding-left: 8px;
+    padding-right: 8px;
+    word-break: keep-all;
+}
+/* coin */
+.coin {
+    align-items: center;
+    background: linear-gradient(to bottom, rgba(238, 238, 238, 0.45), rgba(197, 197, 197, 0.62));
+    border-radius: 290486px;
+    display: inline-block;
+    height: 24px;
+    line-height: 24px;
+    justify-content: center;
+    color: #666;
+    padding: 0 8px;
+}
+.coin > .gold,
+.coin > .silver,
+.coin > .copper {
+    position: relative;
+    padding-right: 20px;
+    height: 24px;
+    display: inline-block;
+}
+.coin > .gold:after,
+.coin > .silver:after,
+.coin > .copper:after {
+    position: absolute;
+    top: 50%;
+    right: 0px;
+    content: "";
+    display: inline-block;
+    width: 10px;
+    height: 10px;
+    border-radius: 100%;
+    border: 1px solid #e5e5e5;
+    margin: -6px 5px 0 5px;
+}
+.coin > .gold:after {
+    background-color: #F2EC8B;
+    box-shadow: 0px 1px 2px 1px #a78502, inset 1px 2px 3px 1px #bf9900;
+}
+.coin > .silver:after {
+    background-color: #f6f6f6;
+    box-shadow: 0px 1px 2px 1px #969393, inset 1px 2px 3px 1px #949494;
+}
+.coin > .copper:after {
+    background-color: #F3BF9E;
+    box-shadow: 0px 1px 2px 1px #DC795C, inset 1px 2px 3px 1px #C75131;
+}
+
 /**
 mobile fix
  */

diff --git a/assets/css/onecircle.min.css b/assets/css/onecircle.min.css
diff --git a/assets/js/editor.js b/assets/js/editor.js
@@ -22,7 +22,7 @@ $(function () {
         });
         $(document).on('click', '#wmd-hide-button', function () {
             myField = document.getElementById('text');
-            insertAtCursor(myField, '\n[hide]\n\n[/hide]\n');
+            insertAtCursor(myField, '\n[hide]\n\n[endhide]\n');
         });
         $(document).on('click', '#wmd-bili-button', function () {
             myField = document.getElementById('text');

diff --git a/assets/js/editor.min.js b/assets/js/editor.min.js
diff --git a/assets/js/onecircle.js b/assets/js/onecircle.js
@@ -1213,11 +1213,12 @@ var oneMap = { // use js only!
                         })
                     });
                 } else {
-                    $.message({
-                        type: "error",
-                        title: "提示",
-                        message: "获取amapJsKey失败"
-                    })
+                    console.log(json)
+                    // $.message({
+                    //     type: "error",
+                    //     title: "提示",
+                    //     message: "获取amapJsKey失败"
+                    // })
                 }
             }
         };

diff --git a/assets/js/onecircle.min.js b/assets/js/onecircle.min.js
diff --git a/components/archive/archive-author.php b/components/archive/archive-author.php
@@ -14,7 +14,7 @@
     <div class="biCwrr">
         <div class="sc-AxjAm sc-AxirZ fUlriR" data-authorhref="<?php _e($this->getPageRow()['permalink']);?>">
             <div class="sc-AxjAm sc-AxirZ jnzuaU"><img src="<?php echo getUserV2exAvatar($this->getPageRow()['mail'],$this->getPageRow()['userAvatar']) ?>" class="sc-AxjAm author-avatar"></div>
-            <h2 class="sc-AxjAm author_page-name"><?php echo $this->author() ?></h2>
+            <h2 class="sc-AxjAm author_page-name"><?php echo $this->author() ?><span class="badge bg-info m-l-xs text-xs">LV<?php _e($this->getPageRow()['level']); ?></span></h2>
             <div class="sc-AxjAm sc-AxirZ dZfkqf">
                 <a href="" class="sc-AxjAm OAorY  ffrrSB"><span><?php _e(UserFollow::getFollowNum($this->getPageRow()['uid']));?></span> 关注</a>
                 <a href="" class="sc-AxjAm OAorY  dDeaQZ"><span><?php _e(UserFollow::getOtherFollowNum($this->getPageRow()['uid']));?></span> 被关注</a>

diff --git a/components/index/index-default.php b/components/index/index-default.php
@@ -3,7 +3,7 @@
 /**
  * 主页 显示 图文 default
  */
-$arr = getGirdPics($this)
+$arr = getGirdPics($this);
 ?>
 <div class="row">
 

diff --git a/components/recommend/recommend-right.php b/components/recommend/recommend-right.php
@@ -18,7 +18,7 @@
                                     src="<?php _e(getUserV2exAvatar($users->mail, $users->userAvatar)) ?>" alt="再多一点可爱"
                                     class="sc-AxjAm jZLHXc">
                             <div class="sc-AxjAm sc-AxirZ hkyonN">
-                                <div class="sc-AxjAm oDrAC"><?php $users->screenName() ?></div>
+                                <div class="sc-AxjAm oDrAC"><?php $users->screenName() ?><span class="badge bg-info m-l-xs text-xs">LV<?php _e($users->level); ?></span></div>
                                 <div class="sc-AxjAm hHqHSX ezzhLs"><?php if ($users->userSign) _e($users->userSign); else _e('太懒了还没有签名'); ?></div>
                             </div>
                         </a>