Zergling_man/thedesk
Zergling_man/thedesk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change to select timeline when add account

Browse Source
This commit is contained in:
kPherox 2019-04-27 05:13:34 +09:00
parent fb9d11969b
commit d3b5d05762
No known key found for this signature in database
GPG Key ID: C04751C2BFA2F62D
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/components/Welcome.vue
View File

@ -4,16 +4,20 @@
<h1>Welcome to TheDesk</h1> <h1>Welcome to TheDesk</h1>
<BaseButton @click.native="status = 'login'" class="primary fill">{{ loginButton }}</BaseButton> <BaseButton @click.native="status = 'login'" class="primary fill">{{ loginButton }}</BaseButton>
<BaseButton @click.native="status = 'public_timeline'" class="primary">{{ publicTLButton }}</BaseButton> <BaseButton @click.native="status = 'public_timeline'" class="primary">{{ publicTLButton }}</BaseButton>
<BaseButton @click.native="status = 'timeline'" class="primary">{{ TLButton }}</BaseButton>
<BaseOverlay <BaseOverlay
v-show="status !== 'welcome'" v-show="status !== 'welcome'"
@close="status = 'welcome'" @close="status = 'welcome'"
:title="status === 'login' ? loginButton : publicTLButton" :title="status === 'login'
? loginButton
: status === 'public_timeline'
? publicTLButton
: status === 'select_timeline'
? selectTimeline : ''"
> >
<Login v-if="status === 'login'"/> <Login v-if="status === 'login'" @login-complete="loggedIn"/>
<PublicTimeline v-else-if="status === 'public_timeline'"/> <PublicTimeline v-else-if="status === 'public_timeline'"/>
<Timeline v-else-if="status === 'timeline'"/> <Timeline v-else-if="status === 'select_timeline'"/>
</BaseOverlay> </BaseOverlay>
</div> </div>
</template> </template>
@ -21,11 +25,11 @@
<script lang="ts"> <script lang="ts">
import { Component, Vue } from 'vue-property-decorator' import { Component, Vue } from 'vue-property-decorator'
import Login from './Preference/AccountManager.vue' import Login from './Preferences/AccountAuth.vue'
import Timeline from './Timeline/Timeline.vue' import Timeline from './Timeline/Timeline.vue'
import PublicTimeline from './AddColumn/PublicTimeline.vue' import PublicTimeline from './AddColumn/PublicTimeline.vue'
type Status = 'welcome' | 'login' | 'public_timeline' | 'timeline' type Status = 'welcome' | 'login' | 'public_timeline' | 'select_timeline'
@Component({ @Component({
components: { components: {
@ -38,7 +42,11 @@ export default class Welcome extends Vue {
public status: Status = 'welcome' public status: Status = 'welcome'
public loginButton: string = 'Login' public loginButton: string = 'Login'
public publicTLButton: string = 'Streaming Public Timeline' public publicTLButton: string = 'Streaming Public Timeline'
public TLButton: string = 'Timeline' public selectTimeline: string = 'Select Timeline'
public loggedIn() {
this.status = 'select_timeline'
}
} }
</script> </script>

2
src/views/App.vue
View File

@ -41,7 +41,7 @@ export default class App extends Vue {
ipcRenderer.on('change-color-theme', () => this.isDarkMode = ipcRenderer.sendSync('dark-theme')) ipcRenderer.on('change-color-theme', () => this.isDarkMode = ipcRenderer.sendSync('dark-theme'))
// TODO: アカウントか公開TLの追加を確認する。初回起動時のみ // TODO: アカウントか公開TLの追加を確認する。初回起動時のみ
if (this.isStartup) { if (this.isStartup) {
//ipcRenderer.once('add-account-or-timeline', () => this.isStartup = false) //ipcRenderer.once('add-timeline', () => this.isStartup = false)
} }
} }