From a4c58aab13db901197ec20ef2bc8b79578141b92 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Wed, 1 Mar 2017 20:36:37 +0100
Subject: [PATCH 1/3] Unify notice timelines to make changes easier.
---
.../friends_timeline/friends_timeline.vue | 7 +---
src/components/mentions/mentions.vue | 7 +---
.../public_and_external_timeline.vue | 7 +---
.../public_timeline/public_timeline.vue | 7 +---
src/components/timeline/timeline.js | 3 +-
src/components/timeline/timeline.vue | 35 +++++++++++--------
6 files changed, 26 insertions(+), 40 deletions(-)
diff --git a/src/components/friends_timeline/friends_timeline.vue b/src/components/friends_timeline/friends_timeline.vue
index afe5cc8..3bf3b54 100644
--- 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
index 59f0024..7af402c 100644
--- 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
index bda5115..fd69693 100644
--- 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
index d05695b..bd6a23e 100644
--- 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
index addd025..b4e80fe 100644
--- 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
index 45886f6..15ac5ff 100644
--- 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>
--
GitLab
From 30a908b56d9d380860d51f275bafcd3eda97c1cf Mon Sep 17 00:00:00 2001
From: lambadalambda <gitgud@rogerbraun.net>
Date: Wed, 1 Mar 2017 14:42:45 -0500
Subject: [PATCH 2/3] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d3cba0..0e0b947 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,15 +27,18 @@ before_script:
# paths:
# - node_modules/
+stages:
+ - build
+ - test
+ - deploy
+
test:
script:
- - npm install -g yarn
- yarn
- npm run unit
build:
script:
- - npm install -g yarn
- yarn
- npm run build
artifacts:
@@ -47,7 +50,6 @@ deploy:
only:
- develop
script:
- - npm install -g yarn
- yarn
- npm run build
- scp -r dist/* pleroma@tenshi.heldscal.la:~/pleroma
--
GitLab
From bed37646f929ba7241f382a0ce06555d20b163b0 Mon Sep 17 00:00:00 2001
From: lambadalambda <gitgud@rogerbraun.net>
Date: Wed, 1 Mar 2017 14:46:07 -0500
Subject: [PATCH 3/3] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0e0b947..c31d2d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,11 +33,13 @@ stages:
- deploy
test:
+ stage: test
script:
- yarn
- npm run unit
build:
+ stage: build
script:
- yarn
- npm run build
@@ -46,6 +48,7 @@ build:
- dist/
deploy:
+ stage: deploy
environment: dev
only:
- develop
--
GitLab