mirror of
				https://codeberg.org/yeentown/barkey.git
				synced 2025-11-04 15:34:13 +00:00 
			
		
		
		
	Merge branch 'master' into hybrid-tl
This commit is contained in:
		
						commit
						0cc00101dc
					
				
					 9 changed files with 12 additions and 12 deletions
				
			
		| 
						 | 
				
			
			@ -1,5 +1,5 @@
 | 
			
		|||
import Stream from '../stream';
 | 
			
		||||
import MiOS from '../../../../mios';
 | 
			
		||||
import Stream from '../../stream';
 | 
			
		||||
import MiOS from '../../../../../mios';
 | 
			
		||||
 | 
			
		||||
export class ReversiGameStream extends Stream {
 | 
			
		||||
	constructor(os: MiOS, me, game) {
 | 
			
		||||
| 
						 | 
				
			
			@ -1,6 +1,6 @@
 | 
			
		|||
import StreamManager from '../stream-manager';
 | 
			
		||||
import Stream from '../stream';
 | 
			
		||||
import MiOS from '../../../../mios';
 | 
			
		||||
import StreamManager from '../../stream-manager';
 | 
			
		||||
import Stream from '../../stream';
 | 
			
		||||
import MiOS from '../../../../../mios';
 | 
			
		||||
 | 
			
		||||
export class ReversiStream extends Stream {
 | 
			
		||||
	constructor(os: MiOS, me) {
 | 
			
		||||
| 
						 | 
				
			
			@ -58,8 +58,8 @@
 | 
			
		|||
<script lang="ts">
 | 
			
		||||
import Vue from 'vue';
 | 
			
		||||
import * as CRC32 from 'crc-32';
 | 
			
		||||
import Reversi, { Color } from '../../../../../games/reversi/core';
 | 
			
		||||
import { url } from '../../../config';
 | 
			
		||||
import Reversi, { Color } from '../../../../../../../games/reversi/core';
 | 
			
		||||
import { url } from '../../../../../config';
 | 
			
		||||
 | 
			
		||||
export default Vue.extend({
 | 
			
		||||
	props: ['initGame', 'connection'],
 | 
			
		||||
| 
						 | 
				
			
			@ -9,7 +9,7 @@
 | 
			
		|||
import Vue from 'vue';
 | 
			
		||||
import XGame from './reversi.game.vue';
 | 
			
		||||
import XRoom from './reversi.room.vue';
 | 
			
		||||
import { ReversiGameStream } from '../../scripts/streaming/reversi-game';
 | 
			
		||||
import { ReversiGameStream } from '../../../../scripts/streaming/games/reversi-game';
 | 
			
		||||
 | 
			
		||||
export default Vue.extend({
 | 
			
		||||
	components: {
 | 
			
		||||
| 
						 | 
				
			
			@ -94,7 +94,7 @@
 | 
			
		|||
 | 
			
		||||
<script lang="ts">
 | 
			
		||||
import Vue from 'vue';
 | 
			
		||||
import * as maps from '../../../../../games/reversi/maps';
 | 
			
		||||
import * as maps from '../../../../../../../games/reversi/maps';
 | 
			
		||||
 | 
			
		||||
export default Vue.extend({
 | 
			
		||||
	props: ['game', 'connection'],
 | 
			
		||||
| 
						 | 
				
			
			@ -27,7 +27,7 @@ import urlPreview from './url-preview.vue';
 | 
			
		|||
import twitterSetting from './twitter-setting.vue';
 | 
			
		||||
import fileTypeIcon from './file-type-icon.vue';
 | 
			
		||||
import Switch from './switch.vue';
 | 
			
		||||
import Reversi from './reversi.vue';
 | 
			
		||||
import Reversi from './games/reversi/reversi.vue';
 | 
			
		||||
import welcomeTimeline from './welcome-timeline.vue';
 | 
			
		||||
import uiInput from './ui/input.vue';
 | 
			
		||||
import uiButton from './ui/button.vue';
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -22,7 +22,7 @@
 | 
			
		|||
		<div></div>
 | 
			
		||||
		<mk-url-preview v-for="url in urls" :url="url" :key="url"/>
 | 
			
		||||
		<footer>
 | 
			
		||||
			<span class="read" v-if="isMe && message.isRead">%i18n:@is-read%</p>
 | 
			
		||||
			<span class="read" v-if="isMe && message.isRead">%i18n:@is-read%</span>
 | 
			
		||||
			<mk-time :time="message.createdAt"/>
 | 
			
		||||
			<template v-if="message.is_edited">%fa:pencil-alt%</template>
 | 
			
		||||
		</footer>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -11,7 +11,7 @@ import { DriveStreamManager } from './common/scripts/streaming/drive';
 | 
			
		|||
import { ServerStatsStreamManager } from './common/scripts/streaming/server-stats';
 | 
			
		||||
import { NotesStatsStreamManager } from './common/scripts/streaming/notes-stats';
 | 
			
		||||
import { MessagingIndexStreamManager } from './common/scripts/streaming/messaging-index';
 | 
			
		||||
import { ReversiStreamManager } from './common/scripts/streaming/games/reversi';
 | 
			
		||||
import { ReversiStreamManager } from './common/scripts/streaming/games/reversi/reversi';
 | 
			
		||||
 | 
			
		||||
import Err from './common/views/components/connect-failed.vue';
 | 
			
		||||
import { LocalTimelineStreamManager } from './common/scripts/streaming/local-timeline';
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue