commit: 6075915223e26fc0b535d87a3cdf26435245937e
parent: 51294082e079e83c7bc0df94e21e750d2a663a27
Author: Shpuld Shpuldson <shpuld@gmail.com>
Date: Wed, 1 Mar 2017 16:58:42 -0500
Merge branch 'feature/restructure-timelines' into 'develop'
Unify notice timelines to make changes easier.
See merge request !36
Diffstat:
7 files changed, 34 insertions(+), 43 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -27,15 +27,20 @@ before_script:
# paths:
# - node_modules/
+stages:
+ - build
+ - test
+ - deploy
+
test:
+ stage: test
script:
- - npm install -g yarn
- yarn
- npm run unit
build:
+ stage: build
script:
- - npm install -g yarn
- yarn
- npm run build
artifacts:
@@ -43,11 +48,11 @@ build:
- dist/
deploy:
+ stage: deploy
environment: dev
only:
- develop
script:
- - npm install -g yarn
- yarn
- npm run build
- scp -r dist/* pleroma@tenshi.heldscal.la:~/pleroma
diff --git a/src/components/friends_timeline/friends_timeline.vue b/src/components/friends_timeline/friends_timeline.vue
@@ -1,10 +1,5 @@
<template>
- <div class="timeline panel panel-default">
- <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>
+ <Timeline :title="'Friends'" v-bind:timeline="timeline" v-bind:timeline-name="'friends'"/>
</template>
<script src="./friends_timeline.js"></script>
diff --git a/src/components/mentions/mentions.vue b/src/components/mentions/mentions.vue
@@ -1,10 +1,5 @@
<template>
- <div class="timeline panel panel-default">
- <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>
+ <Timeline :title="'Mentions'" v-bind:timeline="timeline" v-bind:timeline-name="'mentions'"/>
</template>
<script src="./mentions.js"></script>
diff --git a/src/components/public_and_external_timeline/public_and_external_timeline.vue b/src/components/public_and_external_timeline/public_and_external_timeline.vue
@@ -1,10 +1,5 @@
<template>
- <div class="timeline panel panel-default">
- <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>
+ <Timeline :title="'THE WHOLE KNOWN NETWORK'"v-bind:timeline="timeline" v-bind:timeline-name="'publicAndExternal'"/>
</template>
<script src="./public_and_external_timeline.js"></script>
diff --git a/src/components/public_timeline/public_timeline.vue b/src/components/public_timeline/public_timeline.vue
@@ -1,10 +1,5 @@
<template>
- <div class="timeline panel panel-default">
- <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>
+ <Timeline :title="'Public Timeline'" v-bind:timeline="timeline" v-bind:timeline-name="'public'"/>
</template>
<script src="./public_timeline.js"></script>
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
@@ -5,7 +5,8 @@ import StatusOrConversation from '../status_or_conversation/status_or_conversati
const Timeline = {
props: [
'timeline',
- 'timelineName'
+ 'timelineName',
+ 'title'
],
components: {
Status,
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
@@ -1,20 +1,25 @@
<template>
- <div class="timeline">
- <a href="#" v-on:click.prevent='showNewStatuses()' v-if="timeline.newStatusCount > 0">
- <div class="base01-background base05-border new-status-notification">
- <p class="text-center" >
- {{timeline.newStatusCount}} new statuses
- </p>
+ <div class="timeline panel panel-default">
+ <div class="panel-heading base01-background base04">{{title}}</div>
+ <div class="panel-body">
+ <div class="timeline">
+ <a href="#" v-on:click.prevent='showNewStatuses()' v-if="timeline.newStatusCount > 0">
+ <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>
- </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>
</template>
<script src="./timeline.js"></script>