#236 implement swig instead of jade

meanjs · Feb 3, 2014 · a0c9de3 · a0c9de3
1 parent c2330e5
commit a0c9de3
Show file tree

Hide file tree

Showing 20 changed files with 252 additions and 219 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 .DS_Store
 .nodemonignore
 .sass-cache/
+.bower-*
 node_modules/
 public/lib
 test/coverage/
diff --git a/app/views/404.html b/app/views/404.html
@@ -1,13 +1,17 @@
-extends layouts/default
+{% extends 'layouts/default.html' %}
 
-block main
-  h1 Oops something went wrong
-  br
-  span 404
-
-block content
-  #error-message-box
-    #error-stack-trace
-      pre
-        code!= error
+{% block main %}
+    <h1>Oops something went wrong</h1>
+    <br>
+    <span>404</span>
+{% endblock %}
 
+{% block content %}
+    <div id="error-message-box">
+        <div id="error-stack-trace">
+            <pre>
+                <code>{{error}}</code>
+            </pre>
+        </div>
+    </div>
+{% endblock %}
diff --git a/app/views/500.html b/app/views/500.html
@@ -1,12 +1,17 @@
-extends layouts/default
+{% extends 'layouts/default.html' %}
 
-block main
-  h1 Oops something went wrong
-  br
-  span 500
+{% block main %}
+    <h1>Oops something went wrong</h1>
+    <br>
+    <span>500</span>
+{% endblock %}
 
-block content
-  #error-message-box
-    #error-stack-trace
-      pre
-        code!= error
+{% block content %}
+    <div id="error-message-box">
+        <div id="error-stack-trace">
+            <pre>
+                <code>{{error}}</code>
+            </pre>
+        </div>
+    </div>
+{% endblock %}
diff --git a/app/views/includes/foot.html b/app/views/includes/foot.html
@@ -0,0 +1,32 @@
+<!-- Angular JS -->
+<script type="text/javascript" src="/lib/angular/angular.min.js"></script>
+<script type="text/javascript" src="/lib/angular-cookies/angular-cookies.min.js"></script>
+<script type="text/javascript" src="/lib/angular-resource/angular-resource.min.js"></script>
+<script type="text/javascript" src="/lib/angular-route/angular-route.js"></script>
+
+<!-- Angular UI -->
+<script type="text/javascript" src="/lib/angular-bootstrap/ui-bootstrap.js"></script>
+<script type="text/javascript" src="/lib/angular-bootstrap/ui-bootstrap-tpls.js"></script>
+<script type="text/javascript" src="/lib/angular-ui-utils/ui-utils.min.js"></script>
+
+<!-- Application Init -->
+<script type="text/javascript" src="/js/app.js"></script>
+<script type="text/javascript" src="/js/config.js"></script>
+<script type="text/javascript" src="/js/directives.js"></script>
+<script type="text/javascript" src="/js/filters.js"></script>
+
+<!-- Application Services -->
+<script type="text/javascript" src="/js/services/global.js"></script>
+<script type="text/javascript" src="/js/services/articles.js"></script>
+
+<!-- Application Controllers -->
+<script type="text/javascript" src="/js/controllers/articles.js"></script>
+<script type="text/javascript" src="/js/controllers/index.js"></script>
+<script type="text/javascript" src="/js/controllers/header.js"></script>
+<script type="text/javascript" src="/js/init.js"></script>
+
+
+{% if (process.env.NODE_ENV == 'development') %}
+    <!-- Livereload script rendered -->
+    <script type="text/javascript", src="http://" + req.host + ":35729/livereload.js"></script>
+{% endif %}
diff --git a/app/views/includes/foot.jade b/app/views/includes/foot.jade
diff --git a/app/views/includes/head.html b/app/views/includes/head.html
@@ -0,0 +1,31 @@
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+
+    <title>{{appName}} - {{title}}</title>
+    <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
+    <meta name="keywords" content="node.js, express, mongoose, mongodb, angularjs, swig">
+    <meta name="description" content="MEAN - A Modern Stack: MongoDB, ExpressJS, AngularJS, NodeJS. (BONUS: Passport User Support).">
+
+    <link href="/img/icons/favicon.ico" rel="shortcut icon" type="image/x-icon">
+
+    <meta property="fb:app_id" content="APP_ID">
+    <meta property="og:title" content="{{appName}} - {{title}}">
+    <meta property="og:description" content="MEAN - A Modern Stack: MongoDB, ExpressJS, AngularJS, NodeJS. (BONUS: Passport User Support).">
+    <meta property="og:type" content="website">
+    <meta property="og:url" content="APP_URL">
+    <meta property="og:image" content="APP_LOGO">
+    <meta property="og:site_name" content="MEAN - A Modern Stack">
+    <meta property="fb:admins" content="APP_ADMIN">
+
+    <link rel="stylesheet" href="/lib/bootstrap/dist/css/bootstrap.min.css">
+    <!-- <link rel="stylesheet" href="/lib/bootstrap/dist/css/bootstrap-responsive.css"> -->
+    <link rel="stylesheet" href="/css/common.css">
+
+    <link rel="stylesheet" href="/css/views/articles.css">
+
+<!--[if lt IE 9]>
+    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+<![endif]-->
+</head>
diff --git a/app/views/includes/head.jade b/app/views/includes/head.jade
diff --git a/app/views/index.html b/app/views/index.html
@@ -1,6 +1,7 @@
-extends layouts/default
-
-block content
-  section(data-ng-view)
-  script(type="text/javascript").
-    window.user = !{user};
+{% extends 'layouts/default.html' %}
+{% block content %}
+    <section data-ng-view />
+    <script type="text/javascript">
+        window.user = {{user|safe}};
+    </script>
+{% endblock %}
diff --git a/app/views/layouts/default.html b/app/views/layouts/default.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:fb="https://www.facebook.com/2008/fbml" itemscope="itemscope" itemtype="http://schema.org/Product">
+	{% include '../includes/head.html' %}
+	<body>
+		<div class="navbar navbar-inverse navbar-fixed-top" data-ng-include="'views/header.html'" data-role="navigation"></div>
+		<section class="content">
+            <section class="container">
+  		        {% block content %}{% endblock %}
+            </section>
+        </section>
+        {% include '../includes/foot.html' %}
+    </body>
+</html>
diff --git a/app/views/layouts/default.jade b/app/views/layouts/default.jade
diff --git a/app/views/users/auth.html b/app/views/users/auth.html
@@ -0,0 +1,24 @@
+{% extends '../layouts/default.html' %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-md-offset-1 col-md-5">
+            <a href="/auth/facebook"><img src="/img/icons/facebook.png"></a>
+            <a href="/auth/github"><img src="/img/icons/github.png"></a>
+            <a href="/auth/twitter"><img src="/img/icons/twitter.png"></a>
+            <a href="/auth/google"><img src="/img/icons/google.png"></a>
+            <a href="/auth/linkedin"><img src="/img/icons/linkedin.png"></a>
+        </div>
+        <div class="col-md-6">
+            {% if message && message.length  %}
+            <div class="fade in alert alert-error">
+                <button class="close" data-dismiss="alert">&times;</button>
+                <div class="strong">
+                    {{ message }}
+                </div>
+            </div>
+            {% endif %}
+            {% block auth %}{% endblock %}
+        </div>
+    </div>
+{% endblock %}
diff --git a/app/views/users/auth.jade b/app/views/users/auth.jade
diff --git a/app/views/users/signin.html b/app/views/users/signin.html
@@ -1,20 +1,24 @@
-extends auth
+{% extends 'auth.html' %}
 
-block auth
-  form.signin.form-horizontal(action="/users/session", method="post")
-    .form-group
-      label.col-md-4.control-label(for='email') Email
-      .col-md-8
-        input#email.form-control(type='text', name="email", placeholder='Email')
-
-    .form-group
-      label.col-md-4.control-label(for='password') Password
-      .col-md-8
-        input#password.form-control(type='password', name="password", placeholder='Password')
-
-    .form-group
-      .col-md-offset-4.col-md-8
-        button.btn.btn-primary(type='submit') Sign in
-        &nbsp;
-        | or&nbsp;
-        a.show-signup(href="/signup") Sign up
+{% block auth %}
+    <form class="signin form-horizontal" action="/users/session" method="post">
+        <div class="form-group">
+            <label class="col-md-4 control-label" for="email">Email</label>
+            <div class="col-md-8">
+                <input id="email" class="form-control" type="text" name="email" placeholder="Email">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-md-4 control-label" for="password">Password</label>
+            <div class="col-md-8">
+                <input id="password" class="form-control" type="password" name="password" placeholder="Password">
+            </div>
+        </div>
+        <div class="form-group">
+            <div class="col-md-offset-4 col-md-8">
+                <button class="btn btn-primary" type="submit">Sign in</button>&nbsp;
+                or&nbsp;<a class="show-signup" href="/signup">Sign up</a>
+            </div>
+        </div>
+    </form>
+{% endblock %}
diff --git a/app/views/users/signup.html b/app/views/users/signup.html
@@ -1,30 +1,36 @@
-extends auth
+{% extends 'auth.html' %}
 
-block auth
-  form.signup.form-horizontal(action="/users", method="post")
-    .form-group
-      label.col-md-4.control-label(for='name') Full Name
-      .col-md-8
-        input#name.form-control(type='text', name="name", placeholder='Full name', value=user.name)
-
-    .form-group
-      label.col-md-4.control-label(for='email') Email
-      .col-md-8
-        input#email.form-control(type='text', name="email", placeholder='Email', value=user.email)
-
-    .form-group
-      label.col-md-4.control-label(for='username') Username
-      .col-md-8
-        input#username.form-control(type='text', name="username", placeholder='Username', value=user.username)
-
-    .form-group
-      label.col-md-4.control-label(for='password') Password
-      .col-md-8
-        input#password.form-control(type='password', name="password", placeholder='Password')
-
-    .form-group
-      .col-md-offset-4.col-md-8
-        button.btn.btn-primary(type='submit') Sign up
-        &nbsp;
-        | or&nbsp;
-        a.show-login(href="/signin") login
+{% block auth %}
+    <form class="signin form-horizontal" action="/users" method="post">
+        <div class="form-group">
+            <label class="col-md-4 control-label" for="name">Full Name</label>
+            <div class="col-md-8">
+                <input id="name" class="form-control" type="text" name="name" placeholder="Full Name" value="{{user.name}}" />
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-md-4 control-label" for="email">Email</label>
+            <div class="col-md-8">
+                <input id="email" class="form-control" type="text" name="email" placeholder="Email" value="{{user.email}}" />
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-md-4 control-label" for="username">Username</label>
+            <div class="col-md-8">
+                <input id="username" class="form-control" type="text" name="username" placeholder="Username" value="{{user.username}}" />
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-md-4 control-label" for="password">Password</label>
+            <div class="col-md-8">
+                <input id="password" class="form-control" type="password" name="password" placeholder="Password" />
+            </div>
+        </div>
+        <div class="form-group">
+            <div class="col-md-offset-4 col-md-8">
+                <button class="btn btn-primary" type="submit">Sign up</button>&nbsp;
+                or&nbsp;<a class="show-login" href="/signin">login</a>
+            </div>
+        </div>
+    </form>
+{% endblock %}
diff --git a/config/env/all.js b/config/env/all.js
@@ -7,7 +7,7 @@ module.exports = {
 	root: rootPath,
 	port: process.env.PORT || 3000,
 	db: process.env.MONGOHQ_URL,
-	templateEngine: 'jade',
+	templateEngine: 'swig',
 
 	// The secret should be set to a non-guessable string that
 	// is used to compute a session hash