]> git.r.bdr.sh - rbdr/dead-drop/commitdiff
git.r.bdr.sh / rbdr / dead-drop / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: b0b2aee)
Merge branch 'hotfix/1.0.1' into 'master' main
authorRubén Beltran del Río <redacted>
Wed, 1 Aug 2018 03:35:42 +0000 (03:35 +0000)
committerRubén Beltran del Río <redacted>
Wed, 1 Aug 2018 03:35:42 +0000 (03:35 +0000)
Add Gitlab pages support

See merge request rbdr/dead-drop!4

.gitlab-ci.yml [new file with mode: 0644] patch | blob
CHANGELOG.md patch | blob | blame | history
package.json patch | blob | blame | history
pages/css/style.css [new file with mode: 0644] patch | blob
pages/index.html [new file with mode: 0644] patch | blob

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644 (file)
index 0000000..39589ea
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,14 @@
+image: node:8
+
+stages:
+  - deploy
+
+pages:
+  stage: deploy
+  script:
+    - mv pages public
+  artifacts:
+    paths:
+      - public
+  only:
+    - master
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82f3e55df5d0a82c50dad787be2334e32975e786..e829b9bd1d779aae46f295846c5a1ce5e71357b6 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.0.1]
+### Added
+- Gitlab pages support
+
 ## 1.0.0
 ### Added
 - Application SID Checking
@@ -17,4 +21,5 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - This CHANGELOG
 - Readme
 
+[1.0.1]: https://github.com/olivierlacan/keep-a-changelog/compare/1.0.0...1.0.1
 [Unreleased]: https://github.com/olivierlacan/keep-a-changelog/compare/master...develop
diff --git a/package.json b/package.json
index 5bda8c499b1d80c5408dea0f07d96e4c25d02692..164ac5b9963c157c256916a2d912c9eba3bc767f 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dead-drop",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "A voice communication system",
   "main": "lib/dead_drop.js",
   "repository": "git@github.com:rbdr/dead-drop.git",
diff --git a/pages/css/style.css b/pages/css/style.css
new file mode 100644 (file)
index 0000000..d3883fc
--- /dev/null
+++ b/pages/css/style.css
@@ -0,0 +1,43 @@
+body {
+  background-color: #85CCDA;
+}
+
+h1, .cta, .phone {
+  font-family: 'Bungee Shade', sans-serif;
+  text-align: center;
+  width: 75%;
+  margin: 0 auto;
+}
+
+h1 {
+  font-size: 64pt;
+  color: #fff;
+  margin: 24px auto;
+}
+
+p, ul {
+  font-size: 14pt;
+  font-family: 'Roboto', sans-serif;
+  margin: 0;
+  color: #4C5F65;
+}
+
+.description {
+  text-align: center;
+  margin: 50px 0;
+}
+
+.usage {
+  margin: 10px auto 50px;
+  width: 25%;
+}
+
+.phone {
+  font-size: 48pt;
+}
+
+.cta {
+  margin: 24px auto;
+  font-size: 48pt;
+  color: #fff;
+}
diff --git a/pages/index.html b/pages/index.html
new file mode 100644 (file)
index 0000000..3b97c11
--- /dev/null
+++ b/pages/index.html
@@ -0,0 +1,29 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="description" content="A social network.">
+
+    <title>ｄｅａｄ ｄｒｏｐ</title>
+
+    <link href="https://fonts.googleapis.com/css?family=Bungee+Shade|Roboto:300" rel="stylesheet">
+    <link href="css/style.css" rel="stylesheet">
+
+  </head>
+  <body>
+    <h1>DEAD DROP</h1>
+    <p class="description">
+      Buzón de voz colaborativo. Deja un mensaje. Escucha un mensaje al azar.
+    </p>
+    <ul class="usage">
+      <li>Guarda recordatorios</li>
+      <li>Comparte tus secretos más oscuros</li>
+      <li>Canta una canción</li>
+      <li>Di lo que estás pensando</li>
+      <li>Comparte tus secretos menos oscuros</li>
+      <li>Solo escucha</li>
+    </ul>
+    <p class="phone">(33) 4160-0915</p>
+    <p class="cta">Llama Ahora!</p>
+  </body>
+</html>
A phone messaging system #web