Merge pull request 'Fix asset settings not loading in Frontend, bump node-sass' (#5) from eris/admin-fe:fix-avatar into develop

Reviewed-on: #5

.woodpecker.yml

@@ -2,6 +2,7 @@ pipeline:
   lint:
     when:
       event:
+      - push
       - pull_request
     image: node:14
     commands:
@@ -12,13 +13,14 @@ pipeline:
   test:
     when:
       event:
+      - push
       - pull_request
     image: node:14
     commands:
     - apt update
     - apt install firefox-esr -y --no-install-recommends
     - git config --global url."https://github.com/".insteadOf git://github.com/
-    - yarn 
+    - yarn
     - yarn test
 
   build:

package.json

@@ -40,7 +40,7 @@
   "dependencies": {
     "@babel/runtime": "^7.3.4",
     "axios": "0.18.0",
-    "clipboard": "1.7.1", 
+    "clipboard": "1.7.1",
     "codemirror": "5.39.2",
     "default-passive-events": "^1.0.10",
     "driver.js": "0.8.1",
@@ -111,7 +111,7 @@
     "lint-staged": "7.2.2",
     "mini-css-extract-plugin": "0.4.1",
     "node-notifier": "5.2.1",
-    "node-sass": "^4.12.0",
+    "node-sass": "^7.0.1",
     "optimize-css-assets-webpack-plugin": "5.0.0",
     "ora": "3.0.0",
     "path-to-regexp": "2.4.0",

src/views/settings/components/Frontend.vue

@@ -14,7 +14,9 @@
       <setting :setting-group="frontends" :data="frontendsData"/>
     </el-form>
     <el-divider v-if="frontends" class="divider thick-line"/>
-    <el-form :model="assetsData" :label-position="labelPosition" :label-width="labelWidth"/>
+    <el-form :model="assetsData" :label-position="labelPosition" :label-width="labelWidth">
+      <setting :setting-group="assets" :data="assetsData"/>
+    </el-form>
     <el-divider v-if="assets" class="divider thick-line"/>
     <el-form :model="chatData" :label-position="labelPosition" :label-width="labelWidth">
       <setting :setting-group="chat" :data="chatData"/>