From 8f4251bb6e91cbb45cfdc03fc5278ea89e9455ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ciar=C3=A1n=20Ainsworth?= Date: Sun, 12 Nov 2023 13:42:23 +0100 Subject: [PATCH] feat(front): Add support for Funkwhale UI library Part-of: --- front/package.json | 1 + front/src/style/_main.scss | 1 + front/yarn.lock | 18 ++++++++++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/front/package.json b/front/package.json index 87003d8cb..f159c6238 100644 --- a/front/package.json +++ b/front/package.json @@ -17,6 +17,7 @@ "postinstall": "yarn run fix-fomantic-css" }, "dependencies": { + "@funkwhale/ui": "0.2.2", "@sentry/tracing": "7.47.0", "@sentry/vue": "7.47.0", "@vue/runtime-core": "3.3.2", diff --git a/front/src/style/_main.scss b/front/src/style/_main.scss index ddae53193..b537fd540 100644 --- a/front/src/style/_main.scss +++ b/front/src/style/_main.scss @@ -64,3 +64,4 @@ $bottom-player-height: 4rem; @import "./themes/light/_main.scss"; @import "./themes/dark/_main.scss"; +@import "@funkwhale/ui/style.css"; diff --git a/front/yarn.lock b/front/yarn.lock index bcf42c163..7e3128f84 100644 --- a/front/yarn.lock +++ b/front/yarn.lock @@ -1247,6 +1247,15 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" +"@funkwhale/ui@0.2.2": + version "0.2.2" + resolved "https://registry.yarnpkg.com/@funkwhale/ui/-/ui-0.2.2.tgz#09a5f8e6b30d7a898b50f5fdcfce9b09b3071c5b" + integrity sha512-+rmChC/06XVSEwzSN7ldVjtdKJknqk2FUBTBuhN41+BrinRpySjM5PQoUfVN5IiQkL8Nff5sIjt2k8gluHZ85g== + dependencies: + dompurify "^2.4.3 || ^3.0.0" + showdown "^2.1.0" + transliteration "^2.3.5" + "@humanwhocodes/config-array@^0.11.8": version "0.11.11" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.11.tgz#88a04c570dbbc7dd943e4712429c3df09bc32844" @@ -3717,6 +3726,11 @@ dompurify@2.4.7: resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.7.tgz#277adeb40a2c84be2d42a8bcd45f582bfa4d0cfc" integrity sha512-kxxKlPEDa6Nc5WJi+qRgPbOAbgTpSULL+vI3NUXsZMlkJxTqYI9wg5ZTay2sFrdZRWHPWNi+EdAhcJf81WtoMQ== +"dompurify@^2.4.3 || ^3.0.0": + version "3.0.6" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.0.6.tgz#925ebd576d54a9531b5d76f0a5bef32548351dae" + integrity sha512-ilkD8YEnnGh1zJ240uJsW7AzE+2qpbOUYjacomn3AvJ6J4JhKGSZ2nh4wUIXPZrEPppaCLx5jFe8T89Rk8tQ7w== + domutils@^3.0.1: version "3.1.0" resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.1.0.tgz#c47f551278d3dc4b0b1ab8cbb42d751a6f0d824e" @@ -6206,7 +6220,7 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -showdown@2.1.0: +showdown@2.1.0, showdown@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/showdown/-/showdown-2.1.0.tgz#1251f5ed8f773f0c0c7bfc8e6fd23581f9e545c5" integrity sha512-/6NVYu4U819R2pUIk79n67SYgJHWCce0a5xTP979WbNp0FL9MN1I1QK662IDU1b6JzKTvmhgI7T7JYIxBi3kMQ== @@ -6654,7 +6668,7 @@ tr46@^3.0.0: dependencies: punycode "^2.1.1" -transliteration@2.3.5: +transliteration@2.3.5, transliteration@^2.3.5: version "2.3.5" resolved "https://registry.yarnpkg.com/transliteration/-/transliteration-2.3.5.tgz#8f92309575f69e4a8a525dab4ff705ebcf961c45" integrity sha512-HAGI4Lq4Q9dZ3Utu2phaWgtm3vB6PkLUFqWAScg/UW+1eZ/Tg6Exo4oC0/3VUol/w4BlefLhUUSVBr/9/ZGQOw==