limepotato/jormungandr-bite
1
0
Fork 0
mirror of https://iceshrimp.dev/limepotato/jormungandr-bite.git synced 2024-11-25 19:37:34 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'thatonecalculator/self-host-images' into develop

Browse source
This commit is contained in:
ThatOneCalculator 2022-07-18 20:34:37 -07:00
commit 67460a4e7b
16 changed files with 46 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
packages/backend/assets/badges/error.jpg (Stored with Git LFS) Normal file
View file

Binary file not shown.

BIN
packages/backend/assets/badges/info.jpg (Stored with Git LFS) Normal file
View file

Binary file not shown.

BIN
packages/backend/assets/badges/not-found.jpg (Stored with Git LFS) Normal file
View file

Binary file not shown.

6
packages/backend/src/server/web/views/base.pug
View file

@ -31,9 +31,9 @@ html
link(rel='icon' href= icon || '/favicon.ico')
link(rel='apple-touch-icon' href= icon || '/apple-touch-icon.png')
link(rel='manifest' href='/manifest.json')
link(rel='prefetch' href='https://xn--931a.moe/assets/info.jpg')
link(rel='prefetch' href='https://xn--931a.moe/assets/not-found.jpg')
link(rel='prefetch' href='https://xn--931a.moe/assets/error.jpg')
link(rel='prefetch' href='/static-assets/badges/info.jpg')
link(rel='prefetch' href='/static-assets/badges/not-found.jpg')
link(rel='prefetch' href='/static-assets/badges/error.jpg')
link(rel='stylesheet' href='/assets/fontawesome/css/all.css')
link(rel='modulepreload' href=`/assets/${clientEntry.file}`)

2
packages/client/src/components/global/error.vue
View file

@ -1,7 +1,7 @@
<template>
<transition :name="$store.state.animation ? 'zoom' : ''" appear>
<div class="mjndxjcg">
<img src="https://xn--931a.moe/assets/error.jpg" class="_ghost"/>
<img src="/static-assets/badges/error.jpg" class="_ghost" alt="Error"/>
<p><i class="fas fa-exclamation-triangle"></i> {{ $ts.somethingHappened }}</p>
<MkButton class="button" @click="() => $emit('retry')">{{ $ts.retry }}</MkButton>
</div>

2
packages/client/src/components/notes.vue
View file

@ -2,7 +2,7 @@
<MkPagination ref="pagingComponent" :pagination="pagination">
<template #empty>
<div class="_fullinfo">
<img src="https://xn--931a.moe/assets/info.jpg" class="_ghost"/>
<img src="/static-assets/badges/info.jpg" class="_ghost" alt="Info"/>
<div>{{ $ts.noNotes }}</div>
</div>
</template>

2
packages/client/src/components/notifications.vue
View file

@ -2,7 +2,7 @@
<MkPagination ref="pagingComponent" :pagination="pagination">
<template #empty>
<div class="_fullinfo">
<img src="https://xn--931a.moe/assets/info.jpg" class="_ghost"/>
<img src="/static-assets/badges/info.jpg" class="_ghost" alt="Info"/>
<div>{{ $ts.noNotifications }}</div>
</div>
</template>

2
packages/client/src/components/ui/pagination.vue
View file

@ -7,7 +7,7 @@
<div v-else-if="empty" key="_empty_" class="empty">
<slot name="empty">
<div class="_fullinfo">
<img src="https://xn--931a.moe/assets/info.jpg" class="_ghost"/>
<img src="/static-assets/badges/info.jpg" class="_ghost" alt="Error"/>
<div>{{ $ts.nothing }}</div>
</div>
</slot>

2
packages/client/src/components/user-list.vue
View file

@ -2,7 +2,7 @@
<MkPagination ref="pagingComponent" :pagination="pagination">
<template #empty>
<div class="_fullinfo">
<img src="https://xn--931a.moe/assets/info.jpg" class="_ghost"/>
<img src="/static-assets/badges/info.jpg" class="_ghost" alt="Info"/>
<div>{{ $ts.noUsers }}</div>
</div>
</template>

2
packages/client/src/pages/_error_.vue
View file

@ -2,7 +2,7 @@
<MkLoading v-if="!loaded"/>
<transition :name="$store.state.animation ? 'zoom' : ''" appear>
<div v-show="loaded" class="mjndxjch">
<img src="https://xn--931a.moe/assets/error.jpg" class="_ghost"/>
<img src="/static-assets/badges/error.jpg" class="_ghost" alt="Error"/>
<p><b><i class="fas fa-exclamation-triangle"></i> {{ i18n.ts.pageLoadError }}</b></p>
<p v-if="meta && (version === meta.version)">{{ i18n.ts.pageLoadErrorDescription }}</p>
<p v-else-if="serverIsDead">{{ i18n.ts.serverIsDead }}</p>

2
packages/client/src/pages/favorites.vue
View file

@ -5,7 +5,7 @@
<MkPagination ref="pagingComponent" :pagination="pagination">
<template #empty>
<div class="_fullinfo">
<img src="https://xn--931a.moe/assets/info.jpg" class="_ghost"/>
<img src="/static-assets/badges/info.jpg" class="_ghost" alt="Info"/>
<div>{{ $ts.noNotes }}</div>
</div>
</template>

49
packages/client/src/pages/follow-requests.vue
View file

@ -1,30 +1,27 @@
<template>
<MkStickyContainer>
<template #header><MkPageHeader/></template>
<MkSpacer :content-max="800">
<MkPagination ref="paginationComponent" :pagination="pagination">
<template #empty>
<div class="_fullinfo">
<img src="https://xn--931a.moe/assets/info.jpg" class="_ghost"/>
<div>{{ $ts.noFollowRequests }}</div>
</div>
</template>
<template #default="{items}">
<div class="mk-follow-requests">
<div v-for="req in items" :key="req.id" class="user _panel">
<MkAvatar class="avatar" :user="req.follower" :show-indicator="true"/>
<div class="body">
<div class="name">
<MkA v-user-preview="req.follower.id" class="name" :to="userPage(req.follower)"><MkUserName :user="req.follower"/></MkA>
<p class="acct">@{{ acct(req.follower) }}</p>
</div>
<div v-if="req.follower.description" class="description" :title="req.follower.description">
<Mfm :text="req.follower.description" :is-note="false" :author="req.follower" :i="$i" :custom-emojis="req.follower.emojis" :plain="true" :nowrap="true"/>
</div>
<div class="actions">
<button class="_button" @click="accept(req.follower)"><i class="fas fa-check"></i></button>
<button class="_button" @click="reject(req.follower)"><i class="fas fa-times"></i></button>
</div>
<div>
<MkPagination ref="paginationComponent" :pagination="pagination">
<template #empty>
<div class="_fullinfo">
<img src="/static-assets/badges/info.jpg" class="_ghost" alt="Info"/>
<div>{{ $ts.noFollowRequests }}</div>
</div>
</template>
<template #default="{items}">
<div class="mk-follow-requests">
<div v-for="req in items" :key="req.id" class="user _panel">
<MkAvatar class="avatar" :user="req.follower" :show-indicator="true"/>
<div class="body">
<div class="name">
<MkA v-user-preview="req.follower.id" class="name" :to="userPage(req.follower)"><MkUserName :user="req.follower"/></MkA>
<p class="acct">@{{ acct(req.follower) }}</p>
</div>
<div v-if="req.follower.description" class="description" :title="req.follower.description">
<Mfm :text="req.follower.description" :is-note="false" :author="req.follower" :i="$i" :custom-emojis="req.follower.emojis" :plain="true" :nowrap="true"/>
</div>
<div class="actions">
<button class="_button" @click="accept(req.follower)"><i class="fas fa-check"></i></button>
<button class="_button" @click="reject(req.follower)"><i class="fas fa-times"></i></button>
</div>
</div>
</div>

2
packages/client/src/pages/messaging/index.vue
View file

@ -33,7 +33,7 @@
</MkA>
</div>
<div v-if="!fetching && messages.length == 0" class="_fullinfo">
<img src="https://xn--931a.moe/assets/info.jpg" class="_ghost"/>
<img src="/static-assets/badges/info.jpg" class="_ghost" alt="Info"/>
<div>{{ $ts.noHistory }}</div>
</div>
<MkLoading v-if="fetching"/>

2
packages/client/src/pages/messaging/messaging-room.vue
View file

@ -10,7 +10,7 @@
<MkPagination v-if="pagination" ref="pagingComponent" :key="userAcct || groupId" :pagination="pagination">
<template #empty>
<div class="_fullinfo">
<img src="https://xn--931a.moe/assets/info.jpg" class="_ghost"/>
<img src="/static-assets/badges/info.jpg" class="_ghost" alt="Info"/>
<div>{{ i18n.ts.noMessagesYet }}</div>
</div>
</template>

2
packages/client/src/pages/not-found.vue
View file

@ -1,7 +1,7 @@
<template>
<div class="ipledcug">
<div class="_fullinfo">
<img src="https://xn--931a.moe/assets/not-found.jpg" class="_ghost"/>
<img src="/static-assets/badges/not-found.jpg" class="_ghost" alt="Not found"/>
<div>{{ $ts.notFoundDescription }}</div>
</div>
</div>

2
packages/client/src/pages/settings/apps.vue
View file

@ -3,7 +3,7 @@
<FormPagination ref="list" :pagination="pagination">
<template #empty>
<div class="_fullinfo">
<img src="https://xn--931a.moe/assets/info.jpg" class="_ghost"/>
<img src="/static-assets/badges/info.jpg" class="_ghost" alt="Info"/>
<div>{{ i18n.ts.nothing }}</div>
</div>
</template>