🎨
This commit is contained in:
		
							parent
							
								
									372a17d7f0
								
							
						
					
					
						commit
						aefc8fb7b5
					
				
					 5 changed files with 65 additions and 54 deletions
				
			
		|  | @ -172,6 +172,7 @@ import { getAccountFromId } from '@/scripts/get-account-from-id'; | ||||||
| 		app.config.performance = true; | 		app.config.performance = true; | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  | 	// TODO: 廃止
 | ||||||
| 	app.config.globalProperties = { | 	app.config.globalProperties = { | ||||||
| 		$i, | 		$i, | ||||||
| 		$store: defaultStore, | 		$store: defaultStore, | ||||||
|  |  | ||||||
|  | @ -1,6 +1,6 @@ | ||||||
| <template> | <template> | ||||||
| <div class="_autoGap"> | <div class="_autoGap"> | ||||||
| 	<FormSection> | 	<FormSection first> | ||||||
| 		<template #label>{{ i18n.ts.emailAddress }}</template> | 		<template #label>{{ i18n.ts.emailAddress }}</template> | ||||||
| 		<FormInput v-model="emailAddress" type="email" manual-save> | 		<FormInput v-model="emailAddress" type="email" manual-save> | ||||||
| 			<template #prefix><i class="ti ti-mail"></i></template> | 			<template #prefix><i class="ti ti-mail"></i></template> | ||||||
|  |  | ||||||
|  | @ -1,6 +1,6 @@ | ||||||
| <template> | <template> | ||||||
| <div class="_autoGap"> | <div class="_autoGap"> | ||||||
| 	<FormSection> | 	<FormSection first> | ||||||
| 		<template #label><i class="ti ti-pencil"></i> {{ i18n.ts._exportOrImport.allNotes }}</template> | 		<template #label><i class="ti ti-pencil"></i> {{ i18n.ts._exportOrImport.allNotes }}</template> | ||||||
| 		<FormFolder> | 		<FormFolder> | ||||||
| 			<template #label>{{ i18n.ts.export }}</template> | 			<template #label>{{ i18n.ts.export }}</template> | ||||||
|  | @ -18,61 +18,71 @@ | ||||||
| 	</FormSection> | 	</FormSection> | ||||||
| 	<FormSection> | 	<FormSection> | ||||||
| 		<template #label><i class="ti ti-users"></i> {{ i18n.ts._exportOrImport.followingList }}</template> | 		<template #label><i class="ti ti-users"></i> {{ i18n.ts._exportOrImport.followingList }}</template> | ||||||
| 		<FormFolder> | 		<div class="_autoGap_half"> | ||||||
| 			<template #label>{{ i18n.ts.export }}</template> | 			<FormFolder> | ||||||
| 			<template #icon><i class="ti ti-download"></i></template> | 				<template #label>{{ i18n.ts.export }}</template> | ||||||
| 			<FormSwitch v-model="excludeMutingUsers"> | 				<template #icon><i class="ti ti-download"></i></template> | ||||||
| 				{{ i18n.ts._exportOrImport.excludeMutingUsers }} | 				<div class="_autoGap_half"> | ||||||
| 			</FormSwitch> | 					<FormSwitch v-model="excludeMutingUsers"> | ||||||
| 			<FormSwitch v-model="excludeInactiveUsers"> | 						{{ i18n.ts._exportOrImport.excludeMutingUsers }} | ||||||
| 				{{ i18n.ts._exportOrImport.excludeInactiveUsers }} | 					</FormSwitch> | ||||||
| 			</FormSwitch> | 					<FormSwitch v-model="excludeInactiveUsers"> | ||||||
| 			<MkButton primary :class="$style.button" inline @click="exportFollowing()"><i class="ti ti-download"></i> {{ i18n.ts.export }}</MkButton> | 						{{ i18n.ts._exportOrImport.excludeInactiveUsers }} | ||||||
| 		</FormFolder> | 					</FormSwitch> | ||||||
| 		<FormFolder> | 					<MkButton primary :class="$style.button" inline @click="exportFollowing()"><i class="ti ti-download"></i> {{ i18n.ts.export }}</MkButton> | ||||||
| 			<template #label>{{ i18n.ts.import }}</template> | 				</div> | ||||||
| 			<template #icon><i class="ti ti-upload"></i></template> | 			</FormFolder> | ||||||
| 			<MkButton primary :class="$style.button" inline @click="importFollowing($event)"><i class="ti ti-upload"></i> {{ i18n.ts.import }}</MkButton> | 			<FormFolder> | ||||||
| 		</FormFolder> | 				<template #label>{{ i18n.ts.import }}</template> | ||||||
|  | 				<template #icon><i class="ti ti-upload"></i></template> | ||||||
|  | 				<MkButton primary :class="$style.button" inline @click="importFollowing($event)"><i class="ti ti-upload"></i> {{ i18n.ts.import }}</MkButton> | ||||||
|  | 			</FormFolder> | ||||||
|  | 		</div> | ||||||
| 	</FormSection> | 	</FormSection> | ||||||
| 	<FormSection> | 	<FormSection> | ||||||
| 		<template #label><i class="ti ti-users"></i> {{ i18n.ts._exportOrImport.userLists }}</template> | 		<template #label><i class="ti ti-users"></i> {{ i18n.ts._exportOrImport.userLists }}</template> | ||||||
| 		<FormFolder> | 		<div class="_autoGap_half"> | ||||||
| 			<template #label>{{ i18n.ts.export }}</template> | 			<FormFolder> | ||||||
| 			<template #icon><i class="ti ti-download"></i></template> | 				<template #label>{{ i18n.ts.export }}</template> | ||||||
| 			<MkButton primary :class="$style.button" inline @click="exportUserLists()"><i class="ti ti-download"></i> {{ i18n.ts.export }}</MkButton> | 				<template #icon><i class="ti ti-download"></i></template> | ||||||
| 		</FormFolder> | 				<MkButton primary :class="$style.button" inline @click="exportUserLists()"><i class="ti ti-download"></i> {{ i18n.ts.export }}</MkButton> | ||||||
| 		<FormFolder> | 			</FormFolder> | ||||||
| 			<template #label>{{ i18n.ts.import }}</template> | 			<FormFolder> | ||||||
| 			<template #icon><i class="ti ti-upload"></i></template> | 				<template #label>{{ i18n.ts.import }}</template> | ||||||
| 			<MkButton primary :class="$style.button" inline @click="importUserLists($event)"><i class="ti ti-upload"></i> {{ i18n.ts.import }}</MkButton> | 				<template #icon><i class="ti ti-upload"></i></template> | ||||||
| 		</FormFolder> | 				<MkButton primary :class="$style.button" inline @click="importUserLists($event)"><i class="ti ti-upload"></i> {{ i18n.ts.import }}</MkButton> | ||||||
|  | 			</FormFolder> | ||||||
|  | 		</div> | ||||||
| 	</FormSection> | 	</FormSection> | ||||||
| 	<FormSection> | 	<FormSection> | ||||||
| 		<template #label><i class="ti ti-user-off"></i> {{ i18n.ts._exportOrImport.muteList }}</template> | 		<template #label><i class="ti ti-user-off"></i> {{ i18n.ts._exportOrImport.muteList }}</template> | ||||||
| 		<FormFolder> | 		<div class="_autoGap_half"> | ||||||
| 			<template #label>{{ i18n.ts.export }}</template> | 			<FormFolder> | ||||||
| 			<template #icon><i class="ti ti-download"></i></template> | 				<template #label>{{ i18n.ts.export }}</template> | ||||||
| 			<MkButton primary :class="$style.button" inline @click="exportMuting()"><i class="ti ti-download"></i> {{ i18n.ts.export }}</MkButton> | 				<template #icon><i class="ti ti-download"></i></template> | ||||||
| 		</FormFolder> | 				<MkButton primary :class="$style.button" inline @click="exportMuting()"><i class="ti ti-download"></i> {{ i18n.ts.export }}</MkButton> | ||||||
| 		<FormFolder> | 			</FormFolder> | ||||||
| 			<template #label>{{ i18n.ts.import }}</template> | 			<FormFolder> | ||||||
| 			<template #icon><i class="ti ti-upload"></i></template> | 				<template #label>{{ i18n.ts.import }}</template> | ||||||
| 			<MkButton primary :class="$style.button" inline @click="importMuting($event)"><i class="ti ti-upload"></i> {{ i18n.ts.import }}</MkButton> | 				<template #icon><i class="ti ti-upload"></i></template> | ||||||
| 		</FormFolder> | 				<MkButton primary :class="$style.button" inline @click="importMuting($event)"><i class="ti ti-upload"></i> {{ i18n.ts.import }}</MkButton> | ||||||
|  | 			</FormFolder> | ||||||
|  | 		</div> | ||||||
| 	</FormSection> | 	</FormSection> | ||||||
| 	<FormSection> | 	<FormSection> | ||||||
| 		<template #label><i class="ti ti-user-off"></i> {{ i18n.ts._exportOrImport.blockingList }}</template> | 		<template #label><i class="ti ti-user-off"></i> {{ i18n.ts._exportOrImport.blockingList }}</template> | ||||||
| 		<FormFolder> | 		<div class="_autoGap_half"> | ||||||
| 			<template #label>{{ i18n.ts.export }}</template> | 			<FormFolder> | ||||||
| 			<template #icon><i class="ti ti-download"></i></template> | 				<template #label>{{ i18n.ts.export }}</template> | ||||||
| 			<MkButton primary :class="$style.button" inline @click="exportBlocking()"><i class="ti ti-download"></i> {{ i18n.ts.export }}</MkButton> | 				<template #icon><i class="ti ti-download"></i></template> | ||||||
| 		</FormFolder> | 				<MkButton primary :class="$style.button" inline @click="exportBlocking()"><i class="ti ti-download"></i> {{ i18n.ts.export }}</MkButton> | ||||||
| 		<FormFolder> | 			</FormFolder> | ||||||
| 			<template #label>{{ i18n.ts.import }}</template> | 			<FormFolder> | ||||||
| 			<template #icon><i class="ti ti-upload"></i></template> | 				<template #label>{{ i18n.ts.import }}</template> | ||||||
| 			<MkButton primary :class="$style.button" inline @click="importBlocking($event)"><i class="ti ti-upload"></i> {{ i18n.ts.import }}</MkButton> | 				<template #icon><i class="ti ti-upload"></i></template> | ||||||
| 		</FormFolder> | 				<MkButton primary :class="$style.button" inline @click="importBlocking($event)"><i class="ti ti-upload"></i> {{ i18n.ts.import }}</MkButton> | ||||||
|  | 			</FormFolder> | ||||||
|  | 		</div> | ||||||
| 	</FormSection> | 	</FormSection> | ||||||
| </div> | </div> | ||||||
| </template> | </template> | ||||||
|  |  | ||||||
|  | @ -1,6 +1,6 @@ | ||||||
| <template> | <template> | ||||||
| <div class="_autoGap"> | <div class="_autoGap"> | ||||||
| 	<FormSection> | 	<FormSection first> | ||||||
| 		<template #label>{{ i18n.ts.password }}</template> | 		<template #label>{{ i18n.ts.password }}</template> | ||||||
| 		<MkButton primary @click="change()">{{ i18n.ts.changePassword }}</MkButton> | 		<MkButton primary @click="change()">{{ i18n.ts.changePassword }}</MkButton> | ||||||
| 	</FormSection> | 	</FormSection> | ||||||
|  |  | ||||||
|  | @ -1,15 +1,15 @@ | ||||||
| <template> | <template> | ||||||
| <MkSpacer :content-max="narrow ? 800 : 1100"> | <MkSpacer :content-max="narrow ? 800 : 1100"> | ||||||
| 	<div ref="rootEl" class="ftskorzw" :class="{ wide: !narrow }" style="container-type: inline-size;"> | 	<div ref="rootEl" class="ftskorzw" :class="{ wide: !narrow }" style="container-type: inline-size;"> | ||||||
| 		<div class="main"> | 		<div class="main _autoGap"> | ||||||
| 			<!-- TODO --> | 			<!-- TODO --> | ||||||
| 			<!-- <div class="punished" v-if="user.isSuspended"><i class="ti ti-alert-triangle" style="margin-right: 8px;"></i> {{ i18n.ts.userSuspended }}</div> --> | 			<!-- <div class="punished" v-if="user.isSuspended"><i class="ti ti-alert-triangle" style="margin-right: 8px;"></i> {{ i18n.ts.userSuspended }}</div> --> | ||||||
| 			<!-- <div class="punished" v-if="user.isSilenced"><i class="ti ti-alert-triangle" style="margin-right: 8px;"></i> {{ i18n.ts.userSilenced }}</div> --> | 			<!-- <div class="punished" v-if="user.isSilenced"><i class="ti ti-alert-triangle" style="margin-right: 8px;"></i> {{ i18n.ts.userSilenced }}</div> --> | ||||||
| 
 | 
 | ||||||
| 			<div class="profile"> | 			<div class="profile _autoGap"> | ||||||
| 				<MkRemoteCaution v-if="user.host != null" :href="user.url" class="warn"/> | 				<MkRemoteCaution v-if="user.host != null" :href="user.url" class="warn"/> | ||||||
| 
 | 
 | ||||||
| 				<div :key="user.id" class="main"> | 				<div :key="user.id" class="main _panel"> | ||||||
| 					<div class="banner-container" :style="style"> | 					<div class="banner-container" :style="style"> | ||||||
| 						<div ref="bannerEl" class="banner" :style="style"></div> | 						<div ref="bannerEl" class="banner" :style="style"></div> | ||||||
| 						<div class="fade"></div> | 						<div class="fade"></div> | ||||||
|  | @ -86,8 +86,8 @@ | ||||||
| 			</div> | 			</div> | ||||||
| 
 | 
 | ||||||
| 			<div class="contents"> | 			<div class="contents"> | ||||||
| 				<div v-if="user.pinnedNotes.length > 0" class="_margin"> | 				<div v-if="user.pinnedNotes.length > 0" class="_autoGap_half"> | ||||||
| 					<XNote v-for="note in user.pinnedNotes" :key="note.id" class="note" :note="note" :pinned="true"/> | 					<XNote v-for="note in user.pinnedNotes" :key="note.id" class="note _panel" :note="note" :pinned="true"/> | ||||||
| 				</div> | 				</div> | ||||||
| 				<MkInfo v-else-if="$i && $i.id === user.id">{{ i18n.ts.userPagePinTip }}</MkInfo> | 				<MkInfo v-else-if="$i && $i.id === user.id">{{ i18n.ts.userPagePinTip }}</MkInfo> | ||||||
| 				<template v-if="narrow"> | 				<template v-if="narrow"> | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue