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

Merge branch 'develop' of codeberg.org:thatonecalculator/calckey into develop

Browse source
This commit is contained in:
ThatOneCalculator 2022-08-09 19:55:24 -07:00
commit c5cf74664a
4 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -1,6 +1,6 @@
{
"name": "misskey",
"version": "12.118.1-calc.rc.8",
"version": "12.118.1-calc.rc.9.6",
"codename": "aqua",
"repository": {
"type": "git",

1
packages/client/src/pages/timeline.vue
View file

@ -38,6 +38,7 @@ const XTutorial = defineAsyncComponent(() => import('./timeline.tutorial.vue'));
const isLocalTimelineAvailable = !instance.disableLocalTimeline || ($i != null && ($i.isModerator || $i.isAdmin));
const isRecommendedTimelineAvailable = !instance.disableRecommendedTimeline || ($i != null && ($i.isModerator || $i.isAdmin));
const isGlobalTimelineAvailable = !instance.disableGlobalTimeline || ($i != null && ($i.isModerator || $i.isAdmin));
const enableGuestTimeline = instance.enableGuestTimeline;
const keymap = {
't': focus,
};

2
packages/client/src/pages/welcome.entrance.a.vue
View file

@ -35,7 +35,7 @@
<div class="action">
<MkButton inline rounded gradate data-cy-signup style="margin-right: 12px;" @click="signup()">{{ i18n.ts.signup }}</MkButton>
<MkButton inline rounded data-cy-signin @click="signin()">{{ i18n.ts.login }}</MkButton>
<MkButton inline rounded style="margin-left: 12px;" onclick="window.location.href='/timeline'">Explore</MkButton>
<MkButton inline rounded style="margin-left: 12px;" onclick="window.location.href='/explore'">Explore</MkButton>
</div>
</div>
</div>

11
packages/client/src/router.ts
View file

@ -3,8 +3,19 @@ import { Router } from '@/nirax';
import { $i, iAmModerator } from '@/account';
import MkLoading from '@/pages/_loading_.vue';
import MkError from '@/pages/_error_.vue';
import { api } from '@/os';
import { ui } from '@/config';
function getGuestTimelineStatus() {
api('meta', {
detail: false
}).then((meta) => {
return meta.enableGuestTimeline;
});
}
const guestTimeline = getGuestTimelineStatus();
const page = (loader: AsyncComponentLoader<any>) => defineAsyncComponent({
loader: loader,
loadingComponent: MkLoading,