heartles/egirlskey
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

switch to egirlskey branding

Browse source
This commit is contained in:
jaina heartles 2024-09-22 18:51:30 -04:00
parent 91ec6c3a14
commit eb05c2e619
53 changed files with 300 additions and 968 deletions
Download patch file Download diff file Expand all files Collapse all files

4
packages/frontend/src/boot/common.ts
View file

@ -25,7 +25,7 @@ import { fetchCustomEmojis } from '@/custom-emojis.js';
import { setupRouter } from '@/router/definition.js';
export async function common(createVue: () => App<Element>) {
console.info(`Sharkey v${version}`);
console.info(`eGirlskey v${version}`);
if (_DEV_) {
console.warn('Development mode!!!');
@ -256,7 +256,7 @@ export async function common(createVue: () => App<Element>) {
// https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114239210
// なぜか2回実行されることがあるため、mountするdivを1つに制限する
const rootEl = ((): HTMLElement => {
const MISSKEY_MOUNT_DIV_ID = 'sharkey_app';
const MISSKEY_MOUNT_DIV_ID = 'egirlskey_app';
const currentRoot = document.getElementById(MISSKEY_MOUNT_DIV_ID);

2
packages/frontend/src/boot/main-boot.ts
View file

@ -254,7 +254,7 @@ export async function mainBoot() {
}
const modifiedVersionMustProminentlyOfferInAgplV3Section13Read = miLocalStorage.getItem('modifiedVersionMustProminentlyOfferInAgplV3Section13Read');
if (modifiedVersionMustProminentlyOfferInAgplV3Section13Read !== 'true' && instance.repositoryUrl !== 'https://activitypub.software/TransFem-org/Sharkey/') {
if (modifiedVersionMustProminentlyOfferInAgplV3Section13Read !== 'true' && instance.repositoryUrl !== 'https://gitdab.com/heartles/egirlskey/') {
const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkSourceCodeAvailablePopup.vue')), {}, {
closed: () => dispose(),
});

2
packages/frontend/src/components/MkDonation.vue
View file

@ -23,7 +23,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</template>
</I18n>
<div style="margin-top: 0.2em;">
<MkLink target="_blank" url="https://opencollective.com/sharkey">{{ i18n.ts.learnMore }}</MkLink>
<MkLink target="_blank" url="https://heartles.xyz">{{ i18n.ts.learnMore }}</MkLink>
</div>
</div>
<div v-if="instance.donationUrl" :class="$style.text">

2
packages/frontend/src/components/MkPostForm.vue
View file

@ -920,7 +920,7 @@ async function post(ev?: MouseEvent) {
const text = postData.text ?? '';
const lowerCase = text.toLowerCase();
if ((lowerCase.includes('love') || lowerCase.includes('❤')) && lowerCase.includes('sharkey')) {
if ((lowerCase.includes('love') || lowerCase.includes('❤')) && lowerCase.includes('egirlskey')) {
claimAchievement('iLoveMisskey');
}
if ([

2
packages/frontend/src/components/MkSignupDialog.rules.vue
View file

@ -45,7 +45,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #label>{{ i18n.ts.basicNotesBeforeCreateAccount }}</template>
<template #suffix><i v-if="agreeNote" class="ti ti-check" style="color: var(--success)"></i></template>
<a href="https://activitypub.software/TransFem-org/Sharkey/-/blob/stable/IMPORTANT_NOTES.md" class="_link" target="_blank">{{ i18n.ts.basicNotesBeforeCreateAccount }} <i class="ti ti-external-link"></i></a>
<a href="https://gitdab.com/heartles/egirlskey/-/blob/stable/IMPORTANT_NOTES.md" class="_link" target="_blank">{{ i18n.ts.basicNotesBeforeCreateAccount }} <i class="ti ti-external-link"></i></a>
<MkSwitch :modelValue="agreeNote" style="margin-top: 16px;" data-cy-signup-rules-notes-agree @update:modelValue="updateAgreeNote">{{ i18n.ts.agree }}</MkSwitch>
</MkFolder>

2
packages/frontend/src/components/MkSourceCodeAvailablePopup.vue
View file

@ -27,7 +27,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</I18n>
<I18n :src="i18n.ts.correspondingSourceIsAvailable" tag="span">
<template #anchor>
<MkA to="/about-sharkey" class="_link">{{ i18n.ts.aboutMisskey }}</MkA>
<MkA to="/about-egirlskey" class="_link">{{ i18n.ts.aboutMisskey }}</MkA>
</template>
</I18n>
</div>

2
packages/frontend/src/components/MkUpdated.vue
View file

@ -27,7 +27,7 @@ const modal = shallowRef<InstanceType<typeof MkModal>>();
const whatIsNew = () => {
modal.value?.close();
window.open(`https://activitypub.software/TransFem-org/Sharkey/-/releases/${version}`, '_blank');
window.open(`https://gitdab.com/heartles/egirlskey/-/releases/${version}`, '_blank');
};
onMounted(() => {

2
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 link to="https://joinsharkey.org/#findaninstance">{{ 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>

2
packages/frontend/src/config.ts
View file

@ -18,7 +18,7 @@ export const langs = _LANGS_;
const preParseLocale = miLocalStorage.getItem('locale');
export let locale = preParseLocale ? JSON.parse(preParseLocale) : null;
export const version = _VERSION_;
export const instanceName = siteName === 'Sharkey' || siteName == null ? host : siteName;
export const instanceName = siteName === 'eGirlskey' || siteName == null ? host : siteName;
export const ui = miLocalStorage.getItem('ui');
export const debug = miLocalStorage.getItem('debug') === 'true';

2
packages/frontend/src/index.html
View file

@ -31,7 +31,7 @@
</head>
<body>
<div id="sharkey_app"></div>
<div id="egirlskey_app"></div>
<script type="module" src="./_dev_boot_.ts"></script>
</body>
</html>

30
packages/frontend/src/pages/about-sharkey.vue → packages/frontend/src/pages/about-egirlskey.vue
View file

@ -12,7 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div v-panel class="about">
<div ref="containerEl" class="container" :class="{ playing: easterEggEngine != null }">
<img src="/client-assets/about-icon.png" alt="" class="icon" draggable="false" @load="iconLoaded" @click="gravity"/>
<div class="misskey">Sharkey</div>
<div class="misskey">eGirlskey</div>
<div class="version">v{{ version }}</div>
<span v-for="emoji in easterEggEmojis" :key="emoji.id" class="emoji" :data-physics-x="emoji.left" :data-physics-y="emoji.top" :class="{ _physics_circle_: !emoji.emoji.startsWith(':') }">
<MkCustomEmoji v-if="emoji.emoji[0] === ':'" class="emoji" :name="emoji.emoji" :normal="true" :noStyle="true" :fallbackToImage="true"/>
@ -22,12 +22,12 @@ SPDX-License-Identifier: AGPL-3.0-only
<button v-if="thereIsTreasure" class="_button treasure" @click="getTreasure"><img src="/fluent-emoji/1f3c6.png" class="treasureImg"></button>
</div>
<div style="text-align: center;">
{{ i18n.ts._aboutMisskey.about }}<br><a href="https://joinsharkey.org/" target="_blank" class="_link">{{ i18n.ts.learnMore }}</a>
{{ i18n.ts._aboutMisskey.about }}<br><a href="https://gitdab.com/heartles/egirlskey" target="_blank" class="_link">{{ i18n.ts.learnMore }}</a>
</div>
<div v-if="$i != null" style="text-align: center;">
<MkButton primary rounded inline @click="iLoveMisskey">I <Mfm text="$[jelly ❤]"/> #Sharkey</MkButton>
<MkButton primary rounded inline @click="iLoveMisskey">I <Mfm text="$[jelly ❤]"/> #eGirlskey</MkButton>
</div>
<FormSection v-if="instance.repositoryUrl !== 'https://activitypub.software/TransFem-org/Sharkey/'">
<FormSection v-if="instance.repositoryUrl !== 'https://gitdab.com/heartles/egirlskey/'">
<div class="_gaps_s">
<MkInfo>
{{ i18n.tsx._aboutMisskey.thisIsModifiedVersion({ name: instance.name }) }}
@ -36,7 +36,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #icon><i class="ti ti-code"></i></template>
{{ i18n.ts._aboutMisskey.source }}
</FormLink>
<FormLink v-if="instance.providesTarball" :to="`/tarball/sharkey-${version}.tar.gz`" external>
<FormLink v-if="instance.providesTarball" :to="`/tarball/egirlskey-${version}.tar.gz`" external>
<template #icon><i class="ti ti-download"></i></template>
{{ i18n.ts._aboutMisskey.source }}
<template #suffix>Tarball</template>
@ -46,6 +46,15 @@ SPDX-License-Identifier: AGPL-3.0-only
</MkInfo>
</div>
</FormSection>
<FormSection>
<div class="_gaps_s">
<FormLink to="https://gitdab.com/heartles/egirlskey/" external>
<template #icon><i class="ph-code ph-bold ph-lg"></i></template>
{{ i18n.ts._aboutMisskey.source }} ({{ i18n.ts._aboutMisskey.original_egirlskey }})
<template #suffix>Gitdab</template>
</FormLink>
</div>
</FormSection>
<FormSection>
<div class="_gaps_s">
<FormLink to="https://activitypub.software/TransFem-org/Sharkey/" external>
@ -76,6 +85,15 @@ SPDX-License-Identifier: AGPL-3.0-only
</FormSection>
<FormSection>
<template #label>{{ i18n.ts._aboutMisskey.projectMembers }}</template>
<div :class="$style.contributors" style="margin-bottom: 8px;">
<a href="https://gitdab.com/heartles" target="_blank" :class="$style.contributor">
<img src="https://gitdab.com/avatar/23b9d5e61a48e641d1cd3562ea40c0f3?size=128" :class="$style.contributorAvatar">
<span :class="$style.contributorUsername">@heartles</span>
</a>
</div>
</FormSection>
<FormSection>
<template #label>Sharkey Contributors</template>
<div :class="$style.contributors" style="margin-bottom: 8px;">
<a href="https://activitypub.software/dakkar" target="_blank" :class="$style.contributor">
<img src="https://secure.gravatar.com/avatar/c71b315eed7c63ff94c42b1b3e8dbad1?s=192&d=identicon" :class="$style.contributorAvatar">
@ -113,7 +131,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #description><MkLink url="https://activitypub.software/TransFem-org/Sharkey/-/graphs/develop">{{ i18n.ts._aboutMisskey.allContributors }}</MkLink></template>
</FormSection>
<FormSection>
<template #label>{{ i18n.ts._aboutMisskey.testers }}</template>
<template #label>Sharkey Testers</template>
<div :class="$style.contributors" style="margin-bottom: 8px;">
<a href="https://antani.cyou/@lucent" target="_blank" :class="$style.contributor">
<img src="https://antani.cyou/proxy/avatar.webp?url=https%3A%2F%2Fantani.cyou%2Ffiles%2Fa2944119-024c-4abd-86e5-64bf0d30b26f&avatar=1" :class="$style.contributorAvatar">

6
packages/frontend/src/pages/about.overview.vue
View file

@ -22,16 +22,16 @@ SPDX-License-Identifier: AGPL-3.0-only
<FormSection>
<div class="_gaps_m">
<MkKeyValue :copy="version">
<template #key>Sharkey</template>
<template #key>eGirlskey</template>
<template #value>{{ version }}</template>
</MkKeyValue>
<div v-html="i18n.tsx.poweredByMisskeyDescription({ name: instance.name ?? host })">
</div>
<FormLink to="/about-sharkey">
<FormLink to="/about-egirlskey">
<template #icon><i class="ti ti-info-circle"></i></template>
{{ i18n.ts.aboutMisskey }}
</FormLink>
<FormLink v-if="instance.repositoryUrl || instance.providesTarball" :to="instance.repositoryUrl || `/tarball/sharkey-${version}.tar.gz`" external>
<FormLink v-if="instance.repositoryUrl || instance.providesTarball" :to="instance.repositoryUrl || `/tarball/egirlskey-${version}.tar.gz`" external>
<template #icon><i class="ti ti-code"></i></template>
{{ i18n.ts.sourceCode }}
</FormLink>

3
packages/frontend/src/pages/welcome.entrance.a.vue
View file

@ -11,7 +11,8 @@ SPDX-License-Identifier: AGPL-3.0-only
<div class="shape2"></div>
<div class="logo-wrapper">
<div class="powered-by">Powered by</div>
<img :src="misskeysvg" class="misskey"/>
eGirlskey
<!--<img :src="misskeysvg" class="misskey"/>-->
</div>
<div class="emojis">
<MkEmoji :normal="true" :noStyle="true" emoji="👍"/>

2
packages/frontend/src/pages/welcome.setup.vue
View file

@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div :class="$style.formContainer">
<form :class="$style.form" class="_panel" @submit.prevent="submit()">
<div :class="$style.title">
<div>Welcome to Sharkey!</div>
<div>Welcome to eGirlskey!</div>
<div :class="$style.version">v{{ version }}</div>
</div>
<div class="_gaps_m" style="padding: 32px;">

4
packages/frontend/src/router/definition.ts
View file

@ -204,8 +204,8 @@ const routes: RouteDef[] = [{
path: '/contact',
component: page(() => import('@/pages/contact.vue')),
}, {
path: '/about-sharkey',
component: page(() => import('@/pages/about-sharkey.vue')),
path: '/about-egirlskey',
component: page(() => import('@/pages/about-egirlskey.vue')),
}, {
path: '/invite',
name: 'invite',

2
packages/frontend/src/scripts/sanitize-html.ts
View file

@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: dakkar and other Sharkey contributors
* SPDX-FileCopyrightText: dakkar and other eGirlskey contributors
* SPDX-License-Identifier: AGPL-3.0-only
*/

2
packages/frontend/src/ui/_common_/common.ts
View file

@ -126,7 +126,7 @@ export function openInstanceMenu(ev: MouseEvent) {
type: 'link',
text: i18n.ts.aboutMisskey,
icon: 'sk-icons sk-shark sk-icons-lg',
to: '/about-sharkey',
to: '/about-egirlskey',
}], ev.currentTarget ?? ev.target, {
align: 'left',
});

2
packages/frontend/src/ui/deck.vue
View file

@ -269,7 +269,7 @@ body {
overscroll-behavior: none;
}
#sharkey_app {
#egirlskey_app {
width: 100%;
height: 100%;
overflow: clip;

2
packages/frontend/src/ui/universal.vue
View file

@ -256,7 +256,7 @@ body {
overscroll-behavior: none;
}
#sharkey_app {
#egirlskey_app {
width: 100%;
height: 100%;
overflow: clip;