Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'misskey/master' into feature/misskey-2024.07

Browse source
This commit is contained in:
dakkar 2024-08-02 12:25:58 +01:00
commit cfa9b852df
585 changed files with 23423 additions and 9623 deletions
Download patch file Download diff file Expand all files Collapse all files

23
packages/frontend/src/components/MkVisitorDashboard.vue
View file

@ -26,7 +26,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</div>
<div class="_gaps_s" :class="$style.mainActions">
<MkButton :class="$style.mainAction" full rounded gradate data-cy-signup style="margin-right: 12px;" @click="signup()">{{ i18n.ts.joinThisServer }}</MkButton>
<MkButton :class="$style.mainAction" full rounded @click="exploreOtherServers()">{{ i18n.ts.exploreOtherServers }}</MkButton>
<MkButton :class="$style.mainAction" full rounded link to="https://joinsharkey.org/#findaninstance">{{ i18n.ts.exploreOtherServers }}</MkButton>
<MkButton :class="$style.mainAction" full rounded data-cy-signin @click="signin()">{{ i18n.ts.login }}</MkButton>
</div>
</div>
@ -69,7 +69,8 @@ import { i18n } from '@/i18n.js';
import { instance } from '@/instance.js';
import MkNumber from '@/components/MkNumber.vue';
import XActiveUsersChart from '@/components/MkVisitorDashboard.ActiveUsersChart.vue';
import { openInstanceMenu } from '@/ui/_common_/common';
import { openInstanceMenu } from '@/ui/_common_/common.js';
import type { MenuItem } from '@/types/menu.js';
const stats = ref<Misskey.entities.StatsResponse | null>(null);
@ -78,24 +79,24 @@ misskeyApi('stats', {}).then((res) => {
});
function signin() {
os.popup(XSigninDialog, {
const { dispose } = os.popup(XSigninDialog, {
autoSet: true,
}, {}, 'closed');
}, {
closed: () => dispose(),
});
}
function signup() {
os.popup(XSignupDialog, {
const { dispose } = os.popup(XSignupDialog, {
autoSet: true,
}, {}, 'closed');
}, {
closed: () => dispose(),
});
}
function showMenu(ev) {
function showMenu(ev: MouseEvent) {
openInstanceMenu(ev);
}
function exploreOtherServers() {
window.open('https://joinsharkey.org/#findaninstance', '_blank', 'noopener');
}
</script>
<style lang="scss" module>