summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--client/button.js4
-rw-r--r--client/colors.less42
-rw-r--r--client/templates/about.html25
-rw-r--r--lib/router.js2
4 files changed, 72 insertions, 1 deletions
diff --git a/client/button.js b/client/button.js
index 27beb28..4a9906a 100644
--- a/client/button.js
+++ b/client/button.js
@@ -178,5 +178,7 @@ Template.photo.helpers({
})
Accounts.onLogin(function() {
- Router.go('dates');
+ if (Router.current().route.getName() == 'login') {
+ Router.go('dates');
+ }
});
diff --git a/client/colors.less b/client/colors.less
index db572c0..4cc07cf 100644
--- a/client/colors.less
+++ b/client/colors.less
@@ -185,5 +185,47 @@ body {
text-align: center;
}
}
+ div.about-wrapper {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ height: auto;
+ max-width: 500px;
+ margin: 0 auto;
+ margin-top: 85px;
+ div.about {
+ text-align: center;
+ h1 {
+ color: #2636F9;
+ font-size: 3.5em;
+ font-weight: bold;
+ }
+ h2 {
+ margin: 30px 10px 0px 10px;
+ font-size: 2em;
+ font-weight: bold;
+ color: #333;
+ }
+ div.items {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-top: 50px;
+ div.item {
+ flex: 0 0 auto;
+ margin-right: 40px;
+ text-align: left;
+ font-weight: bold;
+ div.title {
+ color: #333;
+ font-size: 1em;
+ }
+ div.content a {
+ color: #2636F9;
+ }
+ }
+ }
+ }
+ }
}
}
diff --git a/client/templates/about.html b/client/templates/about.html
new file mode 100644
index 0000000..caa79f6
--- /dev/null
+++ b/client/templates/about.html
@@ -0,0 +1,25 @@
+<template name="about">
+ <div class="about-wrapper">
+ <div class="about">
+ <h1>About</h1>
+ <h2>Modes is a visual coding platform reflecting your social media images</h2>
+
+ <div class="items">
+ <div class="item">
+ <div class="title">A Project by:</div>
+ <div class="content"><a href="#">Adi Tamches</a></div>
+ </div>
+
+ <div class="item">
+ <div class="title">Developed by:</div>
+ <div class="content"><a href="https://y3xz.com">Yuval Adam</a></div>
+ </div>
+
+ <div class="item">
+ <div class="title">Made in 2015 while studying at</div>
+ <div class="content"><a href="#">The NB Haifa School of Design</a></div>
+ </div>
+ </div>
+ </div>
+ </div>
+</template>
diff --git a/lib/router.js b/lib/router.js
index ed4e2ef..55816d0 100644
--- a/lib/router.js
+++ b/lib/router.js
@@ -6,6 +6,8 @@ Router.route('/', {name: 'login'});
Router.route('/dates', {name: 'dates'});
Router.route('/photos', {name: 'photos'});
+Router.route('/about', {name: 'about'});
+
Router.route('/imgproxy', function () {
var self = this;
var url = 'http://scontent.cdninstagram.com' + this.request._parsedUrl.search.match(/url\=[^\&]+/)[0].split('=')[1];