Merge pull request #66 from linhaojun857/dev

merge dev
3 years ago · 468493664b
parent 5f6f402c8e 4d6bd4b45a
commit 468493664b
7 changed files with 26 additions and 23 deletions
--- a/aurora-vue/aurora-admin/public/index.html
+++ b/aurora-vue/aurora-admin/public/index.html
@ -4,6 +4,7 @@
    <meta charset="utf-8" />
    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
    <meta name="viewport" content="width=device-width,initial-scale=1.0" />
+    <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests" />
    <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
    <title>后台管理系统</title>
    <script src="https://ssl.captcha.qq.com/TCaptcha.js"></script>
@ -11,12 +12,6 @@
    <link rel="stylesheet" href="<%= BASE_URL %>lib/css/prism.css" />
  </head>
  <body>
-    <noscript>
-      <strong
-        >We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please
-        enable it to continue.</strong
-      >
-    </noscript>
    <div id="app"></div>
  </body>
 </html>
--- a/aurora-vue/aurora-blog/public/index.html
+++ b/aurora-vue/aurora-blog/public/index.html
@ -15,12 +15,6 @@
    <script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.8.3/katex.min.js"></script>
  </head>
  <body>
-    <noscript>
-      <strong
-        >We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please
-        enable it to continue.</strong
-      >
-    </noscript>
    <div id="app"></div>
  </body>
 </html>
--- a/aurora-vue/aurora-blog/src/components/Comment/src/CommentForm.vue
+++ b/aurora-vue/aurora-blog/src/components/Comment/src/CommentForm.vue
@ -1,13 +1,13 @@
 <template>
  <div class="flex space-x-3 xl:space-x-5">
-    <Avatar :url="avatar"></Avatar>
+    <Avatar :url="avatar" />
    <div class="comment flex flex-col flex-wrap-reverse w-full max-w-full-calc">
      <textarea
        v-model="commentContent"
        class="w-full shadow-md rounded-md p-4 focus:outline-none input"
        placeholder="Add comment..."
        cols="30"
-        rows="5"/>
+        rows="5" />
      <div class="justify-between" style="text-align: right">
        <button
          @click="saveComment"
--- a/aurora-vue/aurora-blog/src/components/Comment/src/CommentReplyForm.vue
+++ b/aurora-vue/aurora-blog/src/components/Comment/src/CommentReplyForm.vue
@ -1,6 +1,6 @@
 <template>
  <div class="flex space-x-3 xl:space-x-5">
-    <Avatar :url="avatar"></Avatar>
+    <Avatar :url="avatar" />
    <div class="reply flex flex-col flex-wrap-reverse w-full max-w-full-calc" style="width: fit-content">
      <textarea
        v-model="commentContent"
--- a/aurora-vue/aurora-blog/src/components/Sidebar/src/RecentComment.vue
+++ b/aurora-vue/aurora-blog/src/components/Sidebar/src/RecentComment.vue
@ -7,12 +7,16 @@
          class="bg-ob-deep-900 px-2 py-3 mb-1.5 rounded-lg flex flex-row justify-items-center items-center shadow-sm hover:shadow-ob transition-shadow"
          v-for="comment in comments"
          :key="comment.id">
-          <img
-            class="col-span-1 mr-2 rounded-full p-1"
-            :src="comment.avatar"
-            alt="comment-avatar"
-            height="40"
-            width="40" />
+          <div class="flex-shrink-0 mr-2">
+            <div class="rounded-full ring-gray-100 overflow-hidden shaodw-lg w-9">
+              <template v-if="comment.avatar != null">
+                <img class="avatar-img" :src="comment.avatar" alt="" />
+              </template>
+              <template v-else>
+                <img class="avatar-img" :src="default" alt="" />
+              </template>
+            </div>
+          </div>
          <div class="flex-1 text-xs comment">
            <div class="text-xs">
              <span class="text-ob pr-2">
@ -66,6 +70,7 @@ export default defineComponent({
    }
    return {
      comments: toRef(commentStore.$state, 'recentComment'),
+      default: 'https://static.linhaojun.top/config/0af1901da1e64dfb99bb61db21e716c4.jpeg',
      t
    }
  }
@ -83,4 +88,13 @@ export default defineComponent({
  -webkit-line-clamp: 2;
  -webkit-box-orient: vertical;
 }
+.avatar-img {
+  transition-property: transform;
+  transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+  transition-duration: 800ms;
+  transform: rotate(-360deg);
+}
+.avatar-img:hover {
+  transform: rotate(360deg);
+}
 </style>
--- a/aurora-vue/aurora-blog/src/views/Talk.vue
+++ b/aurora-vue/aurora-blog/src/views/Talk.vue
@ -8,7 +8,7 @@
        <div class="main-grid">
          <div class="relative space-y-5">
            <div class="bg-ob-deep-800 flex p-4 lg:p-8 rounded-2xl shadow-xl mb-8 lg:mb-0">
-              <Avatar v-if="talk.avatar" :url="talk.avatar"></Avatar>
+              <Avatar v-if="talk.avatar" :url="talk.avatar" />
              <div class="talk-info">
                <div class="user-nickname text-sm">
                  {{ talk.nickname }}
--- a/aurora-vue/aurora-blog/src/views/TalkList.vue
+++ b/aurora-vue/aurora-blog/src/views/TalkList.vue
@ -12,7 +12,7 @@
            v-for="item in talks"
            :key="item.id"
            @click="toTalk(item.id)">
-            <Avatar :url="item.avatar"></Avatar>
+            <Avatar :url="item.avatar" />
            <div class="talk-info">
              <div class="user-nickname text-sm">
                {{ item.nickname }}