Cleanup.

botwiki · Mar 18, 2017 · d44734c · d44734c
1 parent 1c2af7c
commit d44734c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/server.js b/server.js
@@ -13,7 +13,6 @@ var express = require('express'),
       contact: config.contact
     };
 
-
 var loggingEnabled = false;
 
 app.engine('handlebars', exphbs({defaultLayout: 'main'}));
@@ -25,9 +24,11 @@ app.use(bodyParser.urlencoded({
 }));
 
 app.get('/', function (req, res) {
-    res.render('home', {
-      community: config.community
-    });
+    res.render('home', community_info);
+});
+
+app.get('/coc', function (req, res) {
+    res.render('coc', community_info);
 });
 
 app.post('/invite', function(req, res) {
@@ -76,9 +77,8 @@ app.use(express.static(__dirname + '/public'));
 
 /*
   Note: This allows the app to be deployed to openshift.com or heroku.com. See https://github.com/botwiki/botmakers.org/issues/5#issuecomment-168426855 for a bit more detail.
-
-  Also, instead of 3011, you could use 8080, or any other port you want. 
 */
+
 app.set('port', process.env.OPENSHIFT_NODEJS_PORT || process.env.PORT || 3011);
 app.set('ip', process.env.OPENSHIFT_NODEJS_IP || '127.0.0.1');
 

diff --git a/views/coc.handlebars b/views/coc.handlebars
@@ -0,0 +1,5 @@
+<header>
+  <h1 class="shifted">{{community_name}}</h1>
+  <h2 class="shifted center-text">Code of conduct</h1>
+  <p class="shifted center-text">Our Code of Conduct is at <a href="https://botwiki.org/coc">botwiki.org/coc</a>.</p>
+</header>
diff --git a/views/home.handlebars b/views/home.handlebars
@@ -1,5 +1,5 @@
 <header>
-  <h1 class="shifted">Botmakers</h1>
+  <h1 class="shifted">{{community_name}}</h1>
 
   <p class="shifted">We are artists, journalists, educators, tinkerers, bot enthusiasts and seasoned developers who make and share friendly, useful, and artistic online bots for 
     <a href="https://botwiki.org/tag/twitterbot">Twitter</a>,

diff --git a/views/layouts/main.handlebars b/views/layouts/main.handlebars
@@ -3,18 +3,18 @@
 <head>
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <meta name="description" content="Professional and hobby developers, artists, journalists, and bot fans who make and share friendly, useful, and artistic online bots." />
+  <meta name="description" content="{{community_description}}" />
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Botmakers: A friendly community of bot makers and bot enthusiasts</title>
-  <meta property="og:title" content="A friendly community of bot makers and bot enthusiasts." />
-  <meta property="og:description" content="Professional and hobby developers, artists, journalists, and bot fans who make and share friendly, useful, and artistic online bots." />
+  <title>{{community_name}}: {{community_description}}</title>
+  <meta property="og:title" content="{{community_description}}" />
+  <meta property="og:description" content="{{community_description}}" />
   <meta property="og:type" content="website" />
   <meta property="og:url" content="https://botmakers.org" />
   <meta property="og:image" content="https://botmakers.org/images/site-thumbnail-3.png" /> 
   <meta name="twitter:card" content="summary_large_image">
   <meta name="twitter:site" content="@fourtonfish">
-  <meta name="twitter:title" content="A friendly community of bot makers and bot enthusiasts.">
-  <meta name="twitter:description" content="Professional and hobby developers, artists, journalists, and bot fans who make and share friendly, useful, and artistic online bots.">
+  <meta name="twitter:title" content="{{community_description}}">
+  <meta name="twitter:description" content="{{community_description}}">
   <meta name="twitter:image:src" content="https://botmakers.org/images/site-thumbnail-3.png">
   <meta name="twitter:domain" content="https://botmakers.org">
   <!--[if lt IE 9]>
@@ -41,11 +41,13 @@
   <![endif]-->
   <section id="content">
     <div id="content-inner">
+      <!-- Site logo -->
       <a href="/"><img title="Hello, human! BEEP" class="logo" src="/images/robot-face-emoji-one.svg"></a>
       {{{body}}}
     </div>
 
     <footer class="shifted">
+      <!-- Footer content -->
       <p>
         <strong>Botmakers</strong> is the official <a href="https://botwiki.org/">Botwiki</a> community, maintained by the <a href="https://github.com/botwiki">Botwiki team</a> and hosted by <a href="https://slack.com/is">Slack</a>. <strong>All members must read and follow our <a href="https://botwiki.org/coc/">Code of Conduct</a>.</strong>