Merge branch 'feature/restructure-timelines' into 'develop'

Unify notice timelines to make changes easier.

See merge request !36
This commit is contained in:
Shpuld Shpuldson 2017-03-01 16:58:42 -05:00
commit 6075915223
7 changed files with 34 additions and 43 deletions

View file

@ -27,15 +27,20 @@ before_script:
# paths: # paths:
# - node_modules/ # - node_modules/
stages:
- build
- test
- deploy
test: test:
stage: test
script: script:
- npm install -g yarn
- yarn - yarn
- npm run unit - npm run unit
build: build:
stage: build
script: script:
- npm install -g yarn
- yarn - yarn
- npm run build - npm run build
artifacts: artifacts:
@ -43,11 +48,11 @@ build:
- dist/ - dist/
deploy: deploy:
stage: deploy
environment: dev environment: dev
only: only:
- develop - develop
script: script:
- npm install -g yarn
- yarn - yarn
- npm run build - npm run build
- scp -r dist/* pleroma@tenshi.heldscal.la:~/pleroma - scp -r dist/* pleroma@tenshi.heldscal.la:~/pleroma

View file

@ -1,10 +1,5 @@
<template> <template>
<div class="timeline panel panel-default"> <Timeline :title="'Friends'" v-bind:timeline="timeline" v-bind:timeline-name="'friends'"/>
<div class="panel-heading base01-background base04">Friends Timeline</div>
<div class="panel-body">
<Timeline v-bind:timeline="timeline" v-bind:timeline-name="'friends'"/>
</div>
</div>
</template> </template>
<script src="./friends_timeline.js"></script> <script src="./friends_timeline.js"></script>

View file

@ -1,10 +1,5 @@
<template> <template>
<div class="timeline panel panel-default"> <Timeline :title="'Mentions'" v-bind:timeline="timeline" v-bind:timeline-name="'mentions'"/>
<div class="panel-heading base01-background base04">Mentions</div>
<div class="panel-body">
<Timeline v-bind:timeline="timeline" v-bind:timeline-name="'mentions'"/>
</div>
</div>
</template> </template>
<script src="./mentions.js"></script> <script src="./mentions.js"></script>

View file

@ -1,10 +1,5 @@
<template> <template>
<div class="timeline panel panel-default"> <Timeline :title="'THE WHOLE KNOWN NETWORK'"v-bind:timeline="timeline" v-bind:timeline-name="'publicAndExternal'"/>
<div class="panel-heading base01-background base04">THE WHOLE KNOWN NETWORK</div>
<div class="panel-body">
<Timeline v-bind:timeline="timeline" v-bind:timeline-name="'publicAndExternal'"/>
</div>
</div>
</template> </template>
<script src="./public_and_external_timeline.js"></script> <script src="./public_and_external_timeline.js"></script>

View file

@ -1,10 +1,5 @@
<template> <template>
<div class="timeline panel panel-default"> <Timeline :title="'Public Timeline'" v-bind:timeline="timeline" v-bind:timeline-name="'public'"/>
<div class="panel-heading base01-background base04">Public Timeline</div>
<div class="panel-body">
<Timeline v-bind:timeline="timeline" v-bind:timeline-name="'public'"/>
</div>
</div>
</template> </template>
<script src="./public_timeline.js"></script> <script src="./public_timeline.js"></script>

View file

@ -5,7 +5,8 @@ import StatusOrConversation from '../status_or_conversation/status_or_conversati
const Timeline = { const Timeline = {
props: [ props: [
'timeline', 'timeline',
'timelineName' 'timelineName',
'title'
], ],
components: { components: {
Status, Status,

View file

@ -1,20 +1,25 @@
<template> <template>
<div class="timeline"> <div class="timeline panel panel-default">
<a href="#" v-on:click.prevent='showNewStatuses()' v-if="timeline.newStatusCount > 0"> <div class="panel-heading base01-background base04">{{title}}</div>
<div class="base01-background base05-border new-status-notification"> <div class="panel-body">
<p class="text-center" > <div class="timeline">
{{timeline.newStatusCount}} new statuses <a href="#" v-on:click.prevent='showNewStatuses()' v-if="timeline.newStatusCount > 0">
</p> <div class="base01-background base05-border new-status-notification">
<p class="text-center" >
{{timeline.newStatusCount}} new statuses
</p>
</div>
</a>
<status-or-conversation v-for="status in timeline.visibleStatuses" :key="status.id" v-bind:statusoid="status"></status-or-conversation>
<a href="#" v-on:click.prevent='fetchOlderStatuses()' v-if="!timeline.loading">
<div class="base01-background base05-border new-status-notification">
<p class="text-center" >
Load older statuses.
</p>
</div>
</a>
</div> </div>
</a> </div>
<status-or-conversation v-for="status in timeline.visibleStatuses" :key="status.id" v-bind:statusoid="status"></status-or-conversation>
<a href="#" v-on:click.prevent='fetchOlderStatuses()' v-if="!timeline.loading">
<div class="base01-background base05-border new-status-notification">
<p class="text-center" >
Load older statuses.
</p>
</div>
</a>
</div> </div>
</template> </template>
<script src="./timeline.js"></script> <script src="./timeline.js"></script>