diff --git a/front/package.json b/front/package.json index ef7638ef0..89f2ddfa5 100644 --- a/front/package.json +++ b/front/package.json @@ -129,5 +129,16 @@ "workbox-precaching": "6.5.4", "workbox-routing": "6.5.4", "workbox-strategies": "6.5.4" + }, + "prettier": { + "bracketSameLine": false, + "bracketSpacing": true, + "embeddedLanguageFormatting": "off", + "htmlWhitespaceSensitivity": "strict", + "singleAttributePerLine": true, + "singleQuote": false, + "trailingComma": "es5", + "tabWidth": 2, + "useTabs": false } } diff --git a/front/src/components/common/HumanDate.vue b/front/src/components/common/HumanDate.vue index e16eb02ec..003e3516f 100644 --- a/front/src/components/common/HumanDate.vue +++ b/front/src/components/common/HumanDate.vue @@ -36,4 +36,4 @@ const realDate = useTimeAgo(date) margin-right: 8px; font-size: 14px; } - \ No newline at end of file + diff --git a/front/ui-docs/components/ui/alert.md b/front/ui-docs/components/ui/alert.md index c4e23a0b0..dcd155420 100644 --- a/front/ui-docs/components/ui/alert.md +++ b/front/ui-docs/components/ui/alert.md @@ -4,7 +4,7 @@ import Button from "~/components/ui/Button.vue" ```ts -import Alert from "~/components/ui/Alert.vue"; +import Alert from "~/components/ui/Alert.vue" ``` # Alert diff --git a/front/ui-docs/components/ui/button.md b/front/ui-docs/components/ui/button.md index 9768e5991..397f593da 100644 --- a/front/ui-docs/components/ui/button.md +++ b/front/ui-docs/components/ui/button.md @@ -6,7 +6,7 @@ const click = ():Promise => new Promise(resolve => setTimeout(resolve, 100 ```ts -import Button from "~/components/ui/Button.vue"; +import Button from "~/components/ui/Button.vue" ``` # Button diff --git a/front/ui-docs/components/ui/card.md b/front/ui-docs/components/ui/card.md index 8b32c45d4..5515650dc 100644 --- a/front/ui-docs/components/ui/card.md +++ b/front/ui-docs/components/ui/card.md @@ -10,7 +10,7 @@ ```ts -import Card from "~/components/ui/Card.vue"; +import Card from "~/components/ui/Card.vue" ``` # Card @@ -356,6 +356,8 @@ Avoid adding buttons and links on top of a [linked card](#card-as-a-link). This ``` + + Open this file in a new window + + Instead, use the [action area](#add-an-action) to offer the primary link: ```vue-html @@ -380,6 +384,8 @@ Instead, use the [action area](#add-an-action) to offer the primary link: ``` + + + + ## Add color - Choose a color: `default`, `primary`, `secondary`, `destructive`, or a Pastel (red, yellow, purple, green or blue) diff --git a/front/ui-docs/components/ui/heading.md b/front/ui-docs/components/ui/heading.md index 10d358009..ce9bce92b 100644 --- a/front/ui-docs/components/ui/heading.md +++ b/front/ui-docs/components/ui/heading.md @@ -3,7 +3,7 @@ ```ts -import Heading from "~/components/ui/Heading.vue"; +import Heading from "~/components/ui/Heading.vue" ``` # Heading diff --git a/front/ui-docs/components/ui/input.md b/front/ui-docs/components/ui/input.md index 5b16fe5ed..f812b6e40 100644 --- a/front/ui-docs/components/ui/input.md +++ b/front/ui-docs/components/ui/input.md @@ -16,7 +16,7 @@ const reset = () => { console.log("Hello"); value.value = 'Original value' } ```ts -import Input from "~/components/ui/Input.vue"; +import Input from "~/components/ui/Input.vue" ``` # Input diff --git a/front/ui-docs/components/ui/layout.md b/front/ui-docs/components/ui/layout.md index 6cf9ee386..bee5fdda6 100644 --- a/front/ui-docs/components/ui/layout.md +++ b/front/ui-docs/components/ui/layout.md @@ -17,6 +17,7 @@ const noGap = ref(true) ```ts import Layout from "~/components/ui/Layout.vue" ``` + # Layout CSS provides [four methods to arrange items in a container](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_grid_layout/Relationship_of_grid_layout_with_other_layout_methods): Flow, Columns, Flex and Grid. To make typical alignment tasks in the Funkwhale Ui easier, we have created a few useful presets. diff --git a/front/ui-docs/components/ui/modal.md b/front/ui-docs/components/ui/modal.md index 4d4477051..36a26d5c4 100644 --- a/front/ui-docs/components/ui/modal.md +++ b/front/ui-docs/components/ui/modal.md @@ -31,7 +31,7 @@ const input = ref('Episcosaurus') ```ts -import Modal from "~/components/ui/Modal.vue"; +import Modal from "~/components/ui/Modal.vue" ``` # Modal @@ -118,8 +118,10 @@ Note that the Cancel button has `autofocus`. If you want another button to auto- Use the `icon` prop and/or the `#topleft` slot for indicators such as the user's photo or a search input. You can hide the title by setting it to `""`. + +