Skip to content

Commit

Permalink
refactor: ♻️ Use new Versia branding everywhere
Browse files Browse the repository at this point in the history
  • Loading branch information
CPlusPatch committed Aug 27, 2024
1 parent b734d8a commit cc54e95
Show file tree
Hide file tree
Showing 68 changed files with 147 additions and 154 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ FROM oven/bun:1.1.24-alpine AS final
COPY --from=builder /app/.output/ /app

LABEL org.opencontainers.image.authors="Gaspard Wierzbinski (https://cpluspatch.com)"
LABEL org.opencontainers.image.source="https://github.com/lysand-org/frontend"
LABEL org.opencontainers.image.vendor="Lysand Org"
LABEL org.opencontainers.image.source="https://github.com/versia-pub/frontend"
LABEL org.opencontainers.image.vendor="Versia"
LABEL org.opencontainers.image.licenses="AGPL-3.0"
LABEL org.opencontainers.image.title="Lysand-FE"
LABEL org.opencontainers.image.description="Frontend for the Lysand Project"
LABEL org.opencontainers.image.title="Versia-FE"
LABEL org.opencontainers.image.description="Frontend for the Versia Server Project"

WORKDIR /app
CMD ["bun", "run", "server/index.mjs"]
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<p align="center">
<a href="https://lysand.org"><img src="https://cdn.lysand.org/logo-long-dark.webp" alt="Lysand Logo" height="110"></a>
<a href="https://versia.pub"><img src="https://cdn.versia.pub/branding/logo-dark.svg" alt="Versia Logo" height="110"></a>
</p>

<center><h1><code>lysand-fe</code></h1></center>
<center><h1><code>versia-fe</code></h1></center>

**Lysand-FE** is a beautiful, fast and responsive front-end for the Lysand project.
**Versia-FE** is a beautiful, fast and responsive front-end for the Versia Server project.

## Features

Expand All @@ -18,7 +18,7 @@
- [x] Following
- [x] Multiple accounts
- [x] Custom Emojis
- [x] Lysand Permissions support
- [x] Versia Server Permissions support
- [x] Note editing
- [x] Alt text support everywhere
- [x] Media uploads
Expand Down Expand Up @@ -55,31 +55,31 @@ Benchmarks are due to be conducted soon™.

## Installation

Lysand-FE is included in the provided `docker-compose` file during [Lysand Server installation](https://github.com/lysand-org/lysand/blob/main/docs/installation.md).
Versia-FE is included in the provided `docker-compose` file during [Versia Server installation](https://github.com/versia-pub/server/blob/main/docs/installation.md).

To have Lysand-FE and Lysand Server running on the same domain, edit the Lysand Server configuration to point to the Lysand-FE container's address (`frontend` category inside config).
To have Versia-FE and Versia Server running on the same domain, edit the Versia Server configuration to point to the Versia-FE container's address (`frontend` category inside config).

### Manual Installation

Here are the steps to install Lysand-FE manually:
Here are the steps to install Versia-FE manually:

#### Docker/Podman

```yaml
services:
fe:
image: ghcr.io/lysand-org/frontend:main
container_name: lysand-fe
image: ghcr.io/versia-pub/frontend:main
container_name: versia-fe
restart: unless-stopped
networks:
- lysand-net
- versia-net
environment:
NUXT_PUBLIC_API_HOST: https://yourserver.com
# For Tor users, set the following environment variable in addition to the above
# NUXT_PUBLIC_ONION_API_HOST: http://youronionserver.onion
```

Then, the frontend will be available at `http://localhost:3000` inside the container. To link it to a Lysand Server, set the `NUXT_PUBLIC_API_HOST` environment variable to the server's URL.
Then, the frontend will be available at `http://localhost:3000` inside the container. To link it to a Versia Server, set the `NUXT_PUBLIC_API_HOST` environment variable to the server's URL.

## License

Expand All @@ -94,4 +94,4 @@ This project is licensed under the AGPL 3.0 - see the [LICENSE](LICENSE) file fo

### People

- [**April John**](https://github.com/cutestnekoaqua): Creator and maintainer of the Lysand Server ActivityPub bridge.
- [**April John**](https://github.com/cutestnekoaqua): Creator and maintainer of the Versia Server ActivityPub bridge.
4 changes: 2 additions & 2 deletions app.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const customCss = useSetting(SettingIds.CustomCSS);
useSeoMeta({
titleTemplate: (titleChunk) => {
return titleChunk ? `${titleChunk} · Lysand` : "Lysand";
return titleChunk ? `${titleChunk} · Versia` : "Versia";
},
title: computed(() => instance.value?.title ?? ""),
ogImage: computed(() => instance.value?.banner.url),
Expand All @@ -41,7 +41,7 @@ useSeoMeta({
twitterImage: computed(() => instance.value?.banner.url),
description: computed(() => convert(description.value?.content ?? "")),
ogDescription: computed(() => convert(description.value?.content ?? "")),
ogSiteName: "Lysand",
ogSiteName: "Versia",
colorScheme: "dark",
themeColor: "#f9a8d4",
});
Expand Down
Binary file modified bun.lockb
Binary file not shown.
2 changes: 1 addition & 1 deletion components/composer/composer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</template>

<script lang="ts" setup>
import type { Instance, Status } from "@lysand-org/client/types";
import type { Instance, Status } from "@versia/client/types";
import { nanoid } from "nanoid";
import ButtonBase from "~/packages/ui/components/buttons/button.vue";
import { OverlayScrollbarsComponent } from "#imports";
Expand Down
2 changes: 1 addition & 1 deletion components/composer/emoji-suggestbox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</template>

<script lang="ts" setup>
import type { Emoji } from "@lysand-org/client/types";
import type { Emoji } from "@versia/client/types";
import { distance } from "fastest-levenshtein";
import Avatar from "../avatars/avatar.vue";
import AutocompleteSuggestbox from "./autocomplete-suggestbox.vue";
Expand Down
2 changes: 1 addition & 1 deletion components/composer/mention-suggestbox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</template>

<script lang="ts" setup>
import type { Account } from "@lysand-org/client/types";
import type { Account } from "@versia/client/types";
import { distance } from "fastest-levenshtein";
import Avatar from "../avatars/avatar.vue";
import AutocompleteSuggestbox from "./autocomplete-suggestbox.vue";
Expand Down
2 changes: 1 addition & 1 deletion components/errors/ErrorBoundary.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<p class="mt-6 text-base leading-7 text-gray-400" v-html="error.message"></p>
<div class="mt-10 grid grid-cols-2 gap-x-6 mx-auto max-w-md">
<Button theme="primary" class="w-full" @click="back">Go back</Button>
<a href="https://github.com/lysand-org/frontend/issues" target="_blank">
<a href="https://github.com/versia-pub/frontend/issues" target="_blank">
<Button theme="secondary" class="w-full">Report an issue</Button>
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion components/settings/oidc.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</template>

<script lang="ts" setup>
import type { ResponseError } from "@lysand-org/client";
import type { ResponseError } from "@versia/client";
import Button from "~/packages/ui/components/buttons/button.vue";
import Avatar from "../avatars/avatar.vue";
Expand Down
2 changes: 1 addition & 1 deletion components/settings/profile-editor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</template>

<script lang="ts" setup>
import type { ResponseError } from "@lysand-org/client";
import type { ResponseError } from "@versia/client";
import Button from "~/packages/ui/components/buttons/button.vue";
import Avatar from "../avatars/avatar.vue";
import RichTextboxInput from "../inputs/rich-textbox-input.vue";
Expand Down
7 changes: 4 additions & 3 deletions components/sidebars/navigation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
aria-label="Navigation" role="complementary">
<NuxtLink href="/">
<img crossorigin="anonymous" class="size-11 rounded ring-1 ring-white/10 hover:scale-105 duration-200"
:src="instance?.thumbnail.url ?? '/logo.webp'" alt="Logo of your instance" />
:src="instance?.thumbnail.url ?? 'https://cdn.versia.pub/branding/icon.svg'"
alt="Logo of your instance" />
</NuxtLink>

<div class="flex flex-col gap-3">
Expand Down Expand Up @@ -148,7 +149,7 @@ const compose = () => {
const signIn = async () => {
loadingAuth.value = true;
const output = await client.value.createApp("Lysand", {
const output = await client.value.createApp("Versia", {
scopes: ["read", "write", "follow", "push"],
redirect_uris: new URL("/", useRequestURL().origin).toString(),
website: useBaseUrl().value,
Expand Down Expand Up @@ -195,7 +196,7 @@ const signOut = async (id?: string) => {
return;
}
// Don't do anything on error, as Lysand doesn't implement the revoke endpoint yet
// Don't do anything on error, as Versia Server doesn't implement the revoke endpoint yet
await client.value
?.revokeToken(
appData.value.client_id,
Expand Down
2 changes: 1 addition & 1 deletion components/social-elements/notes/attachment-dialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

<script lang="ts" setup>
import { Dialog } from "@ark-ui/vue";
import type { Attachment } from "@lysand-org/client/types";
import type { Attachment } from "@versia/client/types";
const lightbox = ref(false);
const attachment = ref<Attachment | null>(null);
Expand Down
2 changes: 1 addition & 1 deletion components/social-elements/notes/attachment.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

<script lang="ts" setup>
import { Popover } from "@ark-ui/vue";
import type { Attachment } from "@lysand-org/client/types";
import type { Attachment } from "@versia/client/types";
const props = defineProps<{
attachment: Attachment;
Expand Down
2 changes: 1 addition & 1 deletion components/social-elements/notes/header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
</template>

<script lang="ts" setup>
import type { Status } from "@lysand-org/client/types";
import type { Status } from "@versia/client/types";
import Avatar from "~/components/avatars/avatar.vue";
import Skeleton from "~/components/skeleton/Skeleton.vue";
import UserCard from "~/components/social-elements/users/UserCard.vue";
Expand Down
2 changes: 1 addition & 1 deletion components/social-elements/notes/mention.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</template>

<script lang="ts" setup>
import type { Account } from "@lysand-org/client/types";
import type { Account } from "@versia/client/types";
defineProps<{
account: Account;
Expand Down
2 changes: 1 addition & 1 deletion components/social-elements/notes/note-content.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</template>

<script lang="ts" setup>
import type { Status } from "@lysand-org/client/types";
import type { Status } from "@versia/client/types";
import Skeleton from "~/components/skeleton/Skeleton.vue";
import Button from "~/packages/ui/components/buttons/button.vue";
import Attachment from "./attachment.vue";
Expand Down
2 changes: 1 addition & 1 deletion components/social-elements/notes/note.vue
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@

<script lang="ts" setup>
import { Menu } from "@ark-ui/vue";
import { RolePermission, type Status } from "@lysand-org/client/types";
import { RolePermission, type Status } from "@versia/client/types";
import Avatar from "~/components/avatars/avatar.vue";
import ButtonDropdown from "~/components/buttons/button-dropdown.vue";
import AdaptiveDropdown from "~/components/dropdowns/AdaptiveDropdown.vue";
Expand Down
2 changes: 1 addition & 1 deletion components/social-elements/notifications/notif.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</template>

<script lang="ts" setup>
import type { Notification } from "@lysand-org/client/types";
import type { Notification } from "@versia/client/types";
import Avatar from "~/components/avatars/avatar.vue";
import Skeleton from "~/components/skeleton/Skeleton.vue";
import Button from "~/packages/ui/components/buttons/button.vue";
Expand Down
4 changes: 2 additions & 2 deletions components/social-elements/users/Account.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<div class="flex flex-row flex-wrap gap-4 mt-4" v-if="isDeveloper || visibleRoles.length > 0">
<Badge v-for="role of visibleRoles" :key="role.id" :name="role.name" :description="role.description"
:img="role.icon" />
<Badge v-if="isDeveloper" name="Lysand Developer" description="This user is a Lysand developer."
<Badge v-if="isDeveloper" name="Versia Developer" description="This user is a Versia developer."
:verified="true" />
</div>
</div>
Expand Down Expand Up @@ -103,7 +103,7 @@
</template>

<script lang="ts" setup>
import type { Account } from "@lysand-org/client/types";
import type { Account } from "@versia/client/types";
import Avatar from "~/components/avatars/avatar.vue";
import Skeleton from "~/components/skeleton/Skeleton.vue";
import Button from "~/packages/ui/components/buttons/button.vue";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ import {
type Account,
type Relationship,
RolePermission,
} from "@lysand-org/client/types";
} from "@versia/client/types";
import ButtonDropdown from "~/components/buttons/button-dropdown.vue";
import AdaptiveDropdown from "~/components/dropdowns/AdaptiveDropdown.vue";
import Button from "~/packages/ui/components/buttons/button.vue";
Expand Down
2 changes: 1 addition & 1 deletion components/social-elements/users/SmallCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</template>

<script lang="ts" setup>
import type { Account } from "@lysand-org/client/types";
import type { Account } from "@versia/client/types";
import Avatar from "~/components/avatars/avatar.vue";
import Skeleton from "~/components/skeleton/Skeleton.vue";
import { NuxtLink } from "#components";
Expand Down
6 changes: 3 additions & 3 deletions components/social-elements/users/UserCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
<div class="flex flex-row flex-wrap gap-4 mt-4" v-if="isDeveloper || visibleRoles.length > 0">
<Badge v-for="role of visibleRoles" :key="role.id" :name="role.name"
:description="role.description" :img="role.icon" />
<Badge v-if="isDeveloper" name="Lysand Developer"
description="This user is a Lysand developer." :verified="true" />
<Badge v-if="isDeveloper" name="Versia Developer"
description="This user is a Versia developer." :verified="true" />
</div>
</div>

Expand Down Expand Up @@ -85,7 +85,7 @@

<script setup lang="ts">
import { HoverCard } from "@ark-ui/vue";
import type { Account } from "@lysand-org/client/types";
import type { Account } from "@versia/client/types";
import Avatar from "~/components/avatars/avatar.vue";
import { SettingIds } from "~/settings";
import Badge from "./Badge.vue";
Expand Down
2 changes: 1 addition & 1 deletion components/timelines/account.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</template>

<script lang="ts" setup>
import type { Status } from "@lysand-org/client/types";
import type { Status } from "@versia/client/types";
import Timeline from "./timeline.vue";
const props = defineProps<{
Expand Down
2 changes: 1 addition & 1 deletion components/timelines/home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</template>

<script lang="ts" setup>
import type { Status } from "@lysand-org/client/types";
import type { Status } from "@versia/client/types";
import { useHomeTimeline } from "~/composables/HomeTimeline";
import Timeline from "./timeline.vue";
Expand Down
2 changes: 1 addition & 1 deletion components/timelines/local.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</template>

<script lang="ts" setup>
import type { Status } from "@lysand-org/client/types";
import type { Status } from "@versia/client/types";
import { useLocalTimeline } from "~/composables/LocalTimeline";
import Timeline from "./timeline.vue";
Expand Down
2 changes: 1 addition & 1 deletion components/timelines/notifications.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</template>

<script lang="ts" setup>
import type { Notification } from "@lysand-org/client/types";
import type { Notification } from "@versia/client/types";
import { useNotificationTimeline } from "~/composables/NotificationTimeline";
import Timeline from "./timeline.vue";
Expand Down
2 changes: 1 addition & 1 deletion components/timelines/public.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</template>

<script lang="ts" setup>
import type { Status } from "@lysand-org/client/types";
import type { Status } from "@versia/client/types";
import { usePublicTimeline } from "~/composables/PublicTimeline";
import Timeline from "./timeline.vue";
Expand Down
2 changes: 1 addition & 1 deletion components/timelines/timeline-item.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</template>

<script lang="ts" setup>
import type { Notification, Status } from "@lysand-org/client/types";
import type { Notification, Status } from "@versia/client/types";
import { computed } from "vue";
import NoteItem from "../social-elements/notes/note.vue";
import NotificationItem from "../social-elements/notifications/notif.vue";
Expand Down
2 changes: 1 addition & 1 deletion components/timelines/timeline-scroller.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
const root = useParentElement(useParentElement());
// Store and keep y to restore it on page change
const route = useRoute();
const yStored = useLocalStorage("lysand:scroll", {
const yStored = useLocalStorage("versia:scroll", {
[route.fullPath]: 0,
});
const { y } = useScroll(root);
Expand Down
2 changes: 1 addition & 1 deletion components/timelines/timeline.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</template>

<script lang="ts" setup>
import type { Notification, Status } from "@lysand-org/client/types";
import type { Notification, Status } from "@versia/client/types";
import { useIntersectionObserver } from "@vueuse/core";
import { onMounted, watch } from "vue";
import Button from "~/packages/ui/components/buttons/button.vue";
Expand Down
6 changes: 3 additions & 3 deletions composables/Account.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { LysandClient } from "@lysand-org/client";
import type { Account } from "@lysand-org/client/types";
import type { Client } from "@versia/client";
import type { Account } from "@versia/client/types";

export const useAccount = (
client: MaybeRef<LysandClient | null>,
client: MaybeRef<Client | null>,
accountId: MaybeRef<string | null>,
) => {
if (!client) {
Expand Down
Loading

0 comments on commit cc54e95

Please sign in to comment.