Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change badge location #15140

Closed
wants to merge 49 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
18a466b
change docker prop
pernucia Nov 16, 2024
7e2909e
publicity minify
pernucia Nov 16, 2024
eed40d9
publicity minfy 2
pernucia Nov 16, 2024
d1be05c
adjustments
pernucia Nov 16, 2024
73fc11a
update reg name
pernucia Nov 16, 2024
ba2a937
Merge pull request #1 from pernucia/develop
pernucia Nov 16, 2024
78f97fc
add widget
pernucia Nov 17, 2024
35a2cde
update widget name
pernucia Nov 17, 2024
bb8aabb
edit on widget
pernucia Nov 17, 2024
e73edc4
redo welcome page
pernucia Nov 17, 2024
f04cbfd
revert
pernucia Nov 17, 2024
beca892
Revert "revert"
pernucia Nov 17, 2024
5df9c45
Update WidgetPaplin.vue
pernucia Nov 17, 2024
4de4b6e
Update WidgetPaplin.vue
pernucia Nov 17, 2024
9840396
Update WidgetPaplin.vue
pernucia Nov 17, 2024
52136a9
go spin go
pernucia Nov 17, 2024
3d89bd2
update css
pernucia Nov 17, 2024
223bbce
surly spin
pernucia Nov 17, 2024
56e3272
translation added
pernucia Nov 17, 2024
cc920d9
finding how to add widget name
pernucia Nov 17, 2024
6d12063
Merge pull request #2 from pernucia/develop
pernucia Nov 17, 2024
a6b0c79
edit localization
pernucia Nov 18, 2024
194e766
disable time line
pernucia Nov 18, 2024
75d7e7a
replace img link
pernucia Nov 18, 2024
fa359b5
Update MkWidgets.vue
pernucia Nov 18, 2024
4db5725
re-edit following lint
pernucia Nov 18, 2024
1f2d677
it wasn't saved
pernucia Nov 18, 2024
7dd91f6
Merge pull request #3 from pernucia/develop
pernucia Nov 18, 2024
915ebaa
correct style input
pernucia Nov 18, 2024
b484380
Update WidgetPaplin.vue
pernucia Nov 18, 2024
8830ba8
Update WidgetPaplin.vue
pernucia Nov 18, 2024
6835e85
Merge pull request #4 from pernucia/develop
pernucia Nov 18, 2024
ea41de6
added widgets
pernucia Nov 20, 2024
011b6ca
replace random func
pernucia Nov 20, 2024
a720d53
apply height option
pernucia Nov 20, 2024
bddb104
change default source of spinner
pernucia Nov 20, 2024
9c6ae0c
added new mode on spinner
pernucia Nov 20, 2024
d090875
update css
pernucia Nov 20, 2024
8e43f07
Update WidgetKordle.vue
pernucia Nov 20, 2024
9903b04
Update WidgetSpinner.vue
pernucia Nov 20, 2024
aad582b
Update WidgetSpinner.vue
pernucia Nov 20, 2024
0465605
Update WidgetKordle.vue
pernucia Nov 20, 2024
878e964
update css
pernucia Nov 20, 2024
78554ed
change style
pernucia Nov 20, 2024
7c7f3aa
Update WidgetSpinner.vue
pernucia Nov 20, 2024
36256a0
Update WidgetSpinner.vue
pernucia Nov 20, 2024
454b032
Merge pull request #5 from pernucia/develop
pernucia Nov 20, 2024
954f14b
Update WidgetSpinner.vue
pernucia Nov 20, 2024
47a175c
Merge pull request #6 from pernucia/develop
pernucia Nov 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/docker-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
workflow_dispatch:

env:
REGISTRY_IMAGE: misskey/misskey
REGISTRY_IMAGE: pernucia/pern-custom-misskey

jobs:
# see https://docs.docker.com/build/ci/github-actions/multi-platform/#distribute-build-across-multiple-runners
Expand All @@ -20,7 +20,7 @@ jobs:
platform:
- linux/amd64
- linux/arm64
if: github.repository == 'misskey-dev/misskey'
if: github.repository == 'pernucia/pern-custom-misskey'
steps:
- name: Prepare
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
workflow_dispatch:

env:
REGISTRY_IMAGE: misskey/misskey
REGISTRY_IMAGE: pernucia/pern-custom-misskey
TAGS: |
type=edge
type=ref,event=pr
Expand Down
1 change: 1 addition & 0 deletions locales/ja-JP.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2274,6 +2274,7 @@ _widgets:
chooseList: "リストを選択"
clicker: "クリッカー"
birthdayFollowings: "今日誕生日のユーザー"
paplin: "Papline"

_cw:
hide: "隠す"
Expand Down
4 changes: 2 additions & 2 deletions packages/frontend/src/components/MkVisitorDashboard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ SPDX-License-Identifier: AGPL-3.0-only
<div :class="$style.statsItemCount"><MkNumber :value="stats.originalNotesCount"/></div>
</div>
</div>
<div v-if="instance.policies.ltlAvailable" :class="[$style.tl, $style.panel]">
<!-- <div v-if="instance.policies.ltlAvailable" :class="[$style.tl, $style.panel]">
<div :class="$style.tlHeader">{{ i18n.ts.letsLookAtTimeline }}</div>
<div :class="$style.tlBody">
<MkTimeline src="local"/>
</div>
</div>
</div> -->
<div :class="$style.panel">
<XActiveUsersChart/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/components/MkWidgets.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<header :class="$style.editHeader">
<MkSelect v-model="widgetAdderSelected" style="margin-bottom: var(--MI-margin)" data-cy-widget-select>
<template #label>{{ i18n.ts.selectWidget }}</template>
<option v-for="widget in widgetDefs" :key="widget" :value="widget">{{ i18n.ts._widgets[widget] }}</option>
<option v-for="widget in widgetDefs" :key="widget" :value="widget">{{ i18n.ts._widgets[widget] || widget }}</option>
</MkSelect>
<MkButton inline primary data-cy-widget-add @click="addWidget"><i class="ti ti-plus"></i> {{ i18n.ts.add }}</MkButton>
<MkButton inline @click="emit('exit')">{{ i18n.ts.close }}</MkButton>
Expand Down
16 changes: 9 additions & 7 deletions packages/frontend/src/pages/about.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkSpacer v-if="tab === 'overview'" :contentMax="600" :marginMin="20">
<XOverview/>
</MkSpacer>
<MkSpacer v-else-if="tab === 'emojis'" :contentMax="1000" :marginMin="20">
<!-- <MkSpacer v-else-if="tab === 'emojis'" :contentMax="1000" :marginMin="20">
<XEmojis/>
</MkSpacer>
</MkSpacer> -->
<MkSpacer v-else-if="tab === 'federation'" :contentMax="1000" :marginMin="20">
<XFederation/>
</MkSpacer>
Expand Down Expand Up @@ -54,11 +54,13 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => [{
key: 'overview',
title: i18n.ts.overview,
}, {
key: 'emojis',
title: i18n.ts.customEmojis,
icon: 'ti ti-icons',
}, {
},
// {
// key: 'emojis',
// title: i18n.ts.customEmojis,
// icon: 'ti ti-icons',
// },
{
key: 'federation',
title: i18n.ts.federation,
icon: 'ti ti-whirl',
Expand Down
4 changes: 2 additions & 2 deletions packages/frontend/src/pages/welcome.entrance.a.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template>
<div v-if="meta" class="rsqzvsbo">
<MkFeaturedPhotos class="bg"/>
<XTimeline class="tl"/>
<!-- <XTimeline class="tl"/> -->
<div class="shape1"></div>
<div class="shape2"></div>
<div class="logo-wrapper">
Expand All @@ -26,7 +26,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div v-if="instances && instances.length > 0" class="federation">
<MarqueeText :duration="40">
<MkA v-for="instance in instances" :key="instance.id" :class="$style.federationInstance" :to="`/instance-info/${instance.host}`" behavior="window">
<!--<MkInstanceCardMini :instance="instance"/>-->
<MkInstanceCardMini :instance="instance"/>
<img v-if="instance.iconUrl" class="icon" :src="getInstanceIcon(instance)" alt=""/>
<span class="name _monospace">{{ instance.host }}</span>
</MkA>
Expand Down
29 changes: 17 additions & 12 deletions packages/frontend/src/ui/_common_/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,14 @@ export function openInstanceMenu(ev: MouseEvent) {
text: i18n.ts.instanceInfo,
icon: 'ti ti-info-circle',
to: '/about',
}, {
type: 'link',
text: i18n.ts.customEmojis,
icon: 'ti ti-icons',
to: '/about#emojis',
}, {
},
// {
// type: 'link',
// text: i18n.ts.customEmojis,
// icon: 'ti ti-icons',
// to: '/about#emojis',
// },
{
type: 'link',
text: i18n.ts.federation,
icon: 'ti ti-whirl',
Expand All @@ -66,12 +68,15 @@ export function openInstanceMenu(ev: MouseEvent) {
text: i18n.ts.charts,
icon: 'ti ti-chart-line',
to: '/about#charts',
}, { type: 'divider' }, {
type: 'link',
text: i18n.ts.ads,
icon: 'ti ti-ad',
to: '/ads',
});
}, { type: 'divider' }
// ,
// {
// type: 'link',
// text: i18n.ts.ads,
// icon: 'ti ti-ad',
// to: '/ads',
// }
);

if ($i && ($i.isAdmin || $i.policies.canInvite) && instance.disableRegistration) {
menuItems.push({
Expand Down
8 changes: 4 additions & 4 deletions packages/frontend/src/ui/visitor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ SPDX-License-Identifier: AGPL-3.0-only
<div class="main">
<div v-if="!isRoot" class="header">
<div v-if="narrow === false" class="wide">
<MkA to="/" class="link" activeClass="active"><i class="ti ti-home icon"></i> {{ i18n.ts.home }}</MkA>
<!-- <MkA to="/" class="link" activeClass="active"><i class="ti ti-home icon"></i> {{ i18n.ts.home }}</MkA>
<MkA v-if="isTimelineAvailable" to="/timeline" class="link" activeClass="active"><i class="ti ti-message icon"></i> {{ i18n.ts.timeline }}</MkA>
<MkA to="/explore" class="link" activeClass="active"><i class="ti ti-hash icon"></i> {{ i18n.ts.explore }}</MkA>
<MkA to="/channels" class="link" activeClass="active"><i class="ti ti-device-tv icon"></i> {{ i18n.ts.channel }}</MkA>
<MkA to="/channels" class="link" activeClass="active"><i class="ti ti-device-tv icon"></i> {{ i18n.ts.channel }}</MkA> -->
</div>
<div v-else-if="narrow === true" class="narrow">
<button class="menu _button" @click="showMenu = true">
Expand Down Expand Up @@ -50,14 +50,14 @@ SPDX-License-Identifier: AGPL-3.0-only
<Transition :name="'tray'">
<div v-if="showMenu" class="menu">
<MkA to="/" class="link" activeClass="active"><i class="ti ti-home icon"></i>{{ i18n.ts.home }}</MkA>
<MkA v-if="isTimelineAvailable" to="/timeline" class="link" activeClass="active"><i class="ti ti-message icon"></i>{{ i18n.ts.timeline }}</MkA>
<!-- <MkA v-if="isTimelineAvailable" to="/timeline" class="link" activeClass="active"><i class="ti ti-message icon"></i>{{ i18n.ts.timeline }}</MkA>
<MkA to="/explore" class="link" activeClass="active"><i class="ti ti-hash icon"></i>{{ i18n.ts.explore }}</MkA>
<MkA to="/announcements" class="link" activeClass="active"><i class="ti ti-speakerphone icon"></i>{{ i18n.ts.announcements }}</MkA>
<MkA to="/channels" class="link" activeClass="active"><i class="ti ti-device-tv icon"></i>{{ i18n.ts.channel }}</MkA>
<div class="divider"></div>
<MkA to="/pages" class="link" activeClass="active"><i class="ti ti-news icon"></i>{{ i18n.ts.pages }}</MkA>
<MkA to="/play" class="link" activeClass="active"><i class="ti ti-player-play icon"></i>Play</MkA>
<MkA to="/gallery" class="link" activeClass="active"><i class="ti ti-icons icon"></i>{{ i18n.ts.gallery }}</MkA>
<MkA to="/gallery" class="link" activeClass="active"><i class="ti ti-icons icon"></i>{{ i18n.ts.gallery }}</MkA> -->
<div class="action">
<button class="_buttonPrimary" @click="signup()">{{ i18n.ts.signup }}</button>
<button class="_button" @click="signin()">{{ i18n.ts.login }}</button>
Expand Down
52 changes: 52 additions & 0 deletions packages/frontend/src/widgets/WidgetKordle.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<!--
SPDX-FileCopyrightText: syuilo and misskey-project
SPDX-License-Identifier: AGPL-3.0-only
-->

<template>
<div data-cy-mkw-kordle class="mkw-kordle" :style="{ height: widgetProps.height + 'px' }">
<iframe class="kordle" src="https://kordle.kr/" frameborder="0" scrolling="no" style="height: 100%"></iframe>
</div>
</template>

<script lang="ts" setup>
import { ref, reactive } from 'vue';
import { useWidgetPropsManager, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget.js';
import { GetFormResultType } from '@/scripts/form.js';

const name = '꼬들';

const widgetPropsDef = {
height: {
type: 'number' as const,
default: 750,
},
};

type WidgetProps = GetFormResultType<typeof widgetPropsDef>;

const props = defineProps<WidgetComponentProps<WidgetProps>>();
const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();

const { widgetProps, configure } = useWidgetPropsManager(name,
widgetPropsDef,
props,
emit,
);

const style = reactive({});

defineExpose<WidgetComponentExpose>({
name,
configure,
id: props.widget ? props.widget.id : null,
});
</script>

<style lang="scss" module>
.mkw-kordle {
.kordle {
height: 100%;
};
};
</style>
79 changes: 79 additions & 0 deletions packages/frontend/src/widgets/WidgetPaplin.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
<!--
SPDX-FileCopyrightText: syuilo and misskey-project
SPDX-License-Identifier: AGPL-3.0-only
-->

<template>
<MkContainer :showHeader="widgetProps.showHeader" data-cy-mkw-paplin class="mkw-paplin">
<template #header>paplin</template>

<div ref="paplin" class="paplin transition" :style="style" @click="rotation">
<img src="https://pub-61d9927ea6b24ad7b33e1db00f6950bf.r2.dev/misskey/files/thumbnail-60fd8592-2cad-4306-8ad9-c36243278e5f.webp" />
</div>
</MkContainer>
</template>

<script lang="ts" setup>
import { ref, reactive } from 'vue';
import { useWidgetPropsManager, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget.js';
import { GetFormResultType } from '@/scripts/form.js';

const name = 'paplin';

const widgetPropsDef = {
height: {
type: 'number' as const,
default: 350,
},
};

type WidgetProps = GetFormResultType<typeof widgetPropsDef>;

const props = defineProps<WidgetComponentProps<WidgetProps>>();
const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();

const { widgetProps, configure } = useWidgetPropsManager(name,
widgetPropsDef,
props,
emit,
);

const style = reactive({
transition: 'transform 0.8s ease-in-out',
});
const deg = ref(0);

const rotation = () => {
if (isNaN(deg.value)) {
deg.value = 0;
}
deg.value += 360;
style.transform = `rotate(${deg.value}deg)`;
};

defineExpose<WidgetComponentExpose>({
name,
configure,
id: props.widget ? props.widget.id : null,
});
</script>

<style lang="scss" module>
.root {
width: 100%;
height: 350px;
border: none;
pointer-events: none;
color-scheme: light;

> .paplin {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-size: cover;
background-position: center;
};
}
</style>
13 changes: 11 additions & 2 deletions packages/frontend/src/widgets/WidgetSlideshow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.folder }}
</p>
<p v-if="widgetProps.folderId != null && images.length === 0 && !fetching">{{ i18n.ts['no-image'] }}</p>
<div ref="slideA" class="slide a"></div>
<div ref="slideB" class="slide b"></div>
<div ref="slideA" class="slide a" :class="{'full-image': widgetProps.fullImageMode}"></div>
<div ref="slideB" class="slide b" :class="{'full-image': widgetProps.fullImageMode}"></div>
</div>
</div>
</template>
Expand All @@ -33,6 +33,10 @@ const widgetPropsDef = {
type: 'number' as const,
default: 300,
},
fullImageMode: {
type: 'boolean' as const,
default: false,
},
folderId: {
type: 'string' as const,
default: null,
Expand Down Expand Up @@ -158,6 +162,11 @@ defineExpose<WidgetComponentExpose>({
opacity: 1;
}
}
> .full-image {
background-size: contain;
background-repeat: no-repeat;
background-color: transparent;
}
}
}
</style>
Loading
Loading