Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 5fc700d
Author: Heinrich Fenkart <[email protected]>
Date:   Wed Jan 28 17:28:11 2015 +0100

    Add Pingdom RUM
    Conflicts:
    	views/partials/head.jade

commit e6cab54
Author: Heinrich Fenkart <[email protected]>
Date:   Sun Jan 25 22:33:48 2015 +0100

    Make Teamspeak connection reconnect after error

commit 20827a6
Author: Heinrich Fenkart <[email protected]>
Date:   Sun Jan 25 22:05:33 2015 +0100

    Switch to markdown-it from marked

commit ff781dc
Author: Heinrich Fenkart <[email protected]>
Date:   Sun Jan 25 21:09:39 2015 +0100

    Update gkmail package to 1.0.1

commit 0dcf355
Author: Heinrich Fenkart <[email protected]>
Date:   Sun Jan 25 21:06:15 2015 +0100

    Update year in LICENSE

commit d777129
Author: Heinrich Fenkart <[email protected]>
Date:   Sun Jan 25 20:58:49 2015 +0100

    One big update again

    Implements a homepage, closes #21.

commit 6b4e26b
Author: Heinrich Fenkart <[email protected]>
Date:   Sat Jan 10 15:24:26 2015 +0100

    Travis: Try to place the SSH key in $HOME/.ssh

commit b678a5c
Author: Heinrich Fenkart <[email protected]>
Date:   Sat Jan 10 01:00:23 2015 +0100

    Add Travis for deployment

commit 3850837
Author: Heinrich Fenkart <[email protected]>
Date:   Sat Jan 3 05:09:35 2015 +0100

    Make the site look good on mobile

    Closes #23.

commit 1134c35
Author: Heinrich Fenkart <[email protected]>
Date:   Fri Jan 2 04:57:24 2015 +0100

    Make gravatar URLs protocol relative

commit 813074d
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Jan 1 23:42:36 2015 +0100

    Fix imprint and privacy policy pages

commit eb07dc9
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Jan 1 08:27:59 2015 +0100

    Implement a CSP

    Closes #46.

commit 5a9a093
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Jan 1 07:29:28 2015 +0100

    Make expander trigger resize event on window when opened

commit 5e8e2b0
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Jan 1 07:27:32 2015 +0100

    Really fix the sticky sidebar for mobile

commit b5af46e
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Jan 1 07:19:41 2015 +0100

    Also use sticky sidebar on admin views, also fix it for mobile

commit cf93205
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Jan 1 07:05:27 2015 +0100

    Make sidebar sticky on account page

    Refs #47

commit 1401e08
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Jan 1 05:46:44 2015 +0100

    Follow-up to a29c4e9: Fix default config

commit a29c4e9
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Jan 1 05:45:38 2015 +0100

    Show Teamspeak ranks for connected accounts

    Closes #51.

commit 55663be
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Jan 1 03:57:34 2015 +0100

    Bump deps

commit fe7915f
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Jan 1 03:52:56 2015 +0100

    Convert some routes to require POST request instead of GET requests

    Resolves #52.

commit 5785a25
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Jan 1 03:51:28 2015 +0100

    Add "conquerino" to username blacklist

commit 325f719
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Jan 1 03:51:03 2015 +0100

    Fix hover effect for links in landing page navbar

commit f60c1b0
Author: Heinrich Fenkart <[email protected]>
Date:   Wed Dec 31 08:55:32 2014 +0100

    Handle multiple Teamspeak connections with the same ID

commit 2e65150
Author: Heinrich Fenkart <[email protected]>
Date:   Wed Dec 31 08:55:18 2014 +0100

    Bump deps

commit 5ff8a8f
Author: Heinrich Fenkart <[email protected]>
Date:   Wed Dec 31 08:52:25 2014 +0100

    Add grunt task for simulating production environment

commit 7846185
Author: Heinrich Fenkart <[email protected]>
Date:   Sun Oct 12 18:32:05 2014 +0200

    rm console.log

commit 0424461
Author: Heinrich Fenkart <[email protected]>
Date:   Sun Oct 12 18:31:42 2014 +0200

    Use redis for Teamspeak status of users

    Fix #54.

commit dbbfdf4
Author: Heinrich Fenkart <[email protected]>
Date:   Sat Oct 11 12:03:07 2014 +0200

    Allow for custom messages on error pages

commit ec3ed5d
Author: Heinrich Fenkart <[email protected]>
Date:   Sat Oct 11 01:12:53 2014 +0200

    Minor tweaks

commit c977930
Author: Heinrich Fenkart <[email protected]>
Date:   Sat Oct 11 01:10:13 2014 +0200

    Tweak detail display of security log.

    Also adds logging for session revocation.

commit 8c1237c
Author: Heinrich Fenkart <[email protected]>
Date:   Fri Oct 10 23:57:15 2014 +0200

    Lock `autoprefixer` dependency to `2.2.0` until mincer updated to v3

commit b093772
Author: Heinrich Fenkart <[email protected]>
Date:   Fri Oct 10 23:49:03 2014 +0200

    Small design tweaks for expander

commit f74b2f1
Author: Heinrich Fenkart <[email protected]>
Date:   Fri Oct 10 23:48:57 2014 +0200

    Remove old session stuff

commit 7a37152
Author: Heinrich Fenkart <[email protected]>
Date:   Fri Oct 10 23:17:56 2014 +0200

    Use redis for session store

    Closes #49.

commit 8d86a10
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Oct 9 22:13:33 2014 +0200

    Outsource email views to separate module

    See https://github.com/gamekeller/mail.

commit 5e23684
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Oct 9 22:08:00 2014 +0200

    Even better last stop error handler

commit e44d8d5
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Oct 9 21:17:33 2014 +0200

    Remove testing stuff accidentally added in 473ea9f

commit 473ea9f
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Oct 9 21:15:56 2014 +0200

    Use agnostic error pages

    See https://github.com/gamekeller/error-pages

    Removes old 404 site. RIP in peces. 😭 😢 😨

commit d549e9a
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Oct 9 20:54:18 2014 +0200

    Use `·` as delimiter in page title

commit 11817f8
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Oct 9 16:39:40 2014 +0200

    Bump `express` dependency

commit c36b25b
Author: Heinrich Fenkart <[email protected]>
Date:   Tue Oct 7 04:59:36 2014 +0200

    Bump `bluebird` dependency

commit 4de5da2
Author: Heinrich Fenkart <[email protected]>
Date:   Mon Oct 6 03:37:56 2014 +0200

    Set Teamspeak online status to `null` if the connection error'd

commit 2d9a012
Author: Heinrich Fenkart <[email protected]>
Date:   Mon Oct 6 03:37:04 2014 +0200

    Remove buggy reconnect code from Teamspeak client

commit 128ffa4
Author: Heinrich Fenkart <[email protected]>
Date:   Mon Oct 6 03:20:17 2014 +0200

    Implement camo support

    Camo "is an SSL image proxy to prevent mixed content warnings on secure pages".

    https://github.com/atmos/camo

commit b024a5d
Author: Heinrich Fenkart <[email protected]>
Date:   Mon Oct 6 03:02:51 2014 +0200

    Bump `validator` dependency

commit ab24a86
Author: Heinrich Fenkart <[email protected]>
Date:   Tue Jul 29 03:24:29 2014 +0200

    A whole bunch of changes. Again.

    I should try to commit to commit more often.

    Adds Teamspeak link; closes #10
    Adds User API endpoint; closes #44
    and also adds Teamspeak status to profiles with Teamspeak link.

    Credit where credit is due:
    Original work on Teamspeak link by @Bujuhu

commit d28e67a
Author: Heinrich Fenkart <[email protected]>
Date:   Fri Sep 26 14:42:54 2014 +0200

    Make account dropdown item be active in more views

commit 0897dd3
Author: Heinrich Fenkart <[email protected]>
Date:   Fri Sep 26 14:41:20 2014 +0200

    Use `server` task as default grunt task

commit e016da3
Author: Heinrich Fenkart <[email protected]>
Date:   Fri Sep 26 14:41:05 2014 +0200

    Use `autoprefixer` instead of `autoprefixer-core`

commit ea5b199
Author: Heinrich Fenkart <[email protected]>
Date:   Fri Sep 26 14:09:38 2014 +0200

    Bump deps

commit 918fc2e
Author: Heinrich Fenkart <[email protected]>
Date:   Wed Sep 10 20:25:24 2014 +0200

    Bump deps

commit 6ac17ad
Author: Heinrich Fenkart <[email protected]>
Date:   Mon Sep 8 02:43:49 2014 +0200

    Bunch of stuff again

    Managing my git habits is hard

    Closes #41

commit 7ae2a88
Author: Heinrich Fenkart <[email protected]>
Date:   Fri Sep 5 16:40:14 2014 +0200

    Handle invalid CSRF token errors

commit 96e37d8
Author: Heinrich Fenkart <[email protected]>
Date:   Fri Sep 5 16:34:11 2014 +0200

    Remove unused create function in lib/error.js

commit f6bcb0d
Author: Heinrich Fenkart <[email protected]>
Date:   Fri Sep 5 16:30:17 2014 +0200

    Small refactor in mailer

commit 0a392f5
Author: Heinrich Fenkart <[email protected]>
Date:   Fri Sep 5 16:29:56 2014 +0200

    Update deps

commit 0f1ef92
Author: Heinrich Fenkart <[email protected]>
Date:   Fri Sep 5 16:28:50 2014 +0200

    Better error handling

    Closes #37

commit a335841
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Sep 4 19:28:37 2014 +0200

    Don't delete whole public/assets dir on precompile

commit 6d48558
Author: Heinrich Fenkart <[email protected]>
Date:   Sun Aug 31 17:43:37 2014 +0200

    Update imprint to reflect Martin's relocation

    No. 2

commit 5bf8a01
Author: Heinrich Fenkart <[email protected]>
Date:   Sun Aug 31 15:26:04 2014 +0200

    Track all account activity

    Closes #42

commit 1dda4ce
Author: Heinrich Fenkart <[email protected]>
Date:   Tue Aug 26 08:16:24 2014 +0200

    Make datetime attribute of timestamps valid

commit 032d7e0
Author: Heinrich Fenkart <[email protected]>
Date:   Sun Aug 24 07:39:04 2014 +0200

    Track sessions

    Closes #40

    Also bumps a few deps, and other stuff...

commit 1fe14d8
Author: Heinrich Fenkart <[email protected]>
Date:   Mon Aug 18 14:51:43 2014 +0200

    Fix jade complaining about missing space

commit e88d8ea
Author: Heinrich Fenkart <[email protected]>
Date:   Mon Aug 18 14:47:24 2014 +0200

    Fix session.cookie.secure in prod mode

commit 0541fce
Author: Heinrich Fenkart <[email protected]>
Date:   Mon Aug 18 03:09:08 2014 +0200

    Make floating labels degrade gracefully

    Fixes #14

commit 501f21a
Author: Heinrich Fenkart <[email protected]>
Date:   Mon Aug 18 01:56:19 2014 +0200

    Save MD5 hash of email as gravatarId

    Closes #43

commit 8ba0372
Author: Heinrich Fenkart <[email protected]>
Date:   Mon Aug 18 01:42:05 2014 +0200

    Remove st dependency and implement session bound return path for auth actions

    Assets are now purely served by nginx in production, so no need for st.

commit 3dedcb1
Author: Heinrich Fenkart <[email protected]>
Date:   Sun Aug 17 20:12:11 2014 +0200

    HTML emails

    Closes #29

commit b27fd53
Author: Heinrich Fenkart <[email protected]>
Date:   Sun Aug 17 00:24:21 2014 +0200

    Bump a few deps

commit 0cfced5
Author: Heinrich Fenkart <[email protected]>
Date:   Sun Aug 17 00:21:20 2014 +0200

    Small update to floating label JS

commit 66c3075
Author: Heinrich Fenkart <[email protected]>
Date:   Wed Aug 13 21:12:25 2014 +0200

    Use new URL helper in a few more views

commit f4707f4
Author: Heinrich Fenkart <[email protected]>
Date:   Wed Aug 13 20:12:43 2014 +0200

    User editor for admins

    Closes #15

commit 4b9d141
Author: Heinrich Fenkart <[email protected]>
Date:   Sun Aug 10 07:33:19 2014 +0200

    Only enable trust proxy and secure cookies in production

commit f8a7893
Author: Heinrich Fenkart <[email protected]>
Date:   Sat Aug 9 23:04:48 2014 +0200

    Run username already in use validation only when field was modified

commit 7bfab92
Author: Heinrich Fenkart <[email protected]>
Date:   Sat Aug 9 22:56:26 2014 +0200

    Use protocol in config.url

commit f61b081
Author: Heinrich Fenkart <[email protected]>
Date:   Sat Aug 9 19:18:35 2014 +0200

    Usernames should be case insensitive

    Fixes #33

commit c2eb36c
Author: Heinrich Fenkart <[email protected]>
Date:   Sat Aug 9 17:20:16 2014 +0200

    Pass document to validators created with `buildValidator`

commit 2f846d8
Author: Heinrich Fenkart <[email protected]>
Date:   Sat Aug 9 17:18:46 2014 +0200

    Properly position flash messages on empty profiles

commit 023788f
Author: Heinrich Fenkart <[email protected]>
Date:   Sat Aug 9 17:14:46 2014 +0200

    Username must contain at least one alphanumeric character

    Fixes #32

commit 2e92314
Author: Heinrich Fenkart <[email protected]>
Date:   Sat Aug 9 17:07:47 2014 +0200

    Make app requireable

commit 0ed41f4
Author: Heinrich Fenkart <[email protected]>
Date:   Sat Aug 9 16:28:09 2014 +0200

    Remove dev console.log

commit e8d09f0
Author: Heinrich Fenkart <[email protected]>
Date:   Sat Aug 9 16:24:43 2014 +0200

    Remove unused CSS

commit abb23ff
Author: Heinrich Fenkart <[email protected]>
Date:   Sat Aug 9 16:21:47 2014 +0200

    Bunch of combined changes

    ...again!

    - Implement first rather basic version of user profiles
    - Lay the foundation of the API and implement markdown renderering API endpoint
    - Only run validation for fields that actually changed during a document save
    - Implement modular markdown editor
    - Remove frontend Lodash dep
    - Add Teamspeak rank icons

commit 4774ee4
Author: Heinrich Fenkart <[email protected]>
Date:   Sat Aug 9 07:51:42 2014 +0200

    Move password validator from pre save middleware to actual validation

commit 32069ed
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Aug 7 01:09:51 2014 +0200

    Add markdown icon

commit 01b4d0c
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Aug 7 01:02:30 2014 +0200

    Add "assets" to vanity URL blacklist

commit f29bb08
Author: Heinrich Fenkart <[email protected]>
Date:   Wed Aug 6 13:30:24 2014 +0200

    Switch to `lodash-node`

commit 02a8164
Author: Heinrich Fenkart <[email protected]>
Date:   Wed Aug 6 13:18:14 2014 +0200

    Split user model up into smaller parts

commit 74eae8e
Author: Heinrich Fenkart <[email protected]>
Date:   Tue Aug 5 07:13:46 2014 +0200

    Rename flash messages view local to `flash`

commit 314dc2f
Author: Heinrich Fenkart <[email protected]>
Date:   Tue Aug 5 03:14:53 2014 +0200

    Fix flash messages for admin page and home page

commit 0825d50
Author: Heinrich Fenkart <[email protected]>
Date:   Tue Aug 5 00:50:06 2014 +0200

    Add a few missing flash message insertion points

commit f112335
Author: Heinrich Fenkart <[email protected]>
Date:   Tue Aug 5 00:48:08 2014 +0200

    Remove `special` option for layout and small design tweaks

commit 7cda8ee
Author: Heinrich Fenkart <[email protected]>
Date:   Tue Aug 5 00:30:38 2014 +0200

    Add Bootstrap collapse plugin back to main.js

commit 332e7ff
Author: Heinrich Fenkart <[email protected]>
Date:   Mon Aug 4 23:56:10 2014 +0200

    Make floating label inputs work better in Safari

commit 6e762cd
Author: Heinrich Fenkart <[email protected]>
Date:   Mon Aug 4 23:51:19 2014 +0200

    Close #19: Implement password forgot functionality

commit 80d2768
Author: Heinrich Fenkart <[email protected]>
Date:   Mon Aug 4 05:57:53 2014 +0200

    Bump deps

commit f2374bb
Author: Heinrich Fenkart <[email protected]>
Date:   Mon Aug 4 04:32:11 2014 +0200

    Destroy session when account is deleted

commit d0c1997
Author: Heinrich Fenkart <[email protected]>
Date:   Mon Aug 4 04:09:15 2014 +0200

    Mount signup, login, logout router under specific paths

commit 71d6f8c
Author: Heinrich Fenkart <[email protected]>
Date:   Mon Aug 4 04:00:30 2014 +0200

    Close #17: Implement account deletion

commit d90edd4
Author: Heinrich Fenkart <[email protected]>
Date:   Mon Aug 4 03:22:54 2014 +0200

    Add columns

commit fee938f
Author: Heinrich Fenkart <[email protected]>
Date:   Mon Aug 4 02:43:14 2014 +0200

    Closes #27: Implement "flash and redirect"-helper

commit ad3bf73
Author: Heinrich Fenkart <[email protected]>
Date:   Mon Aug 4 01:54:41 2014 +0200

    Fix #25: Actually use "current password" in user settings

    Also adds sync version of `User#comparePassword`

commit cbed022
Author: Heinrich Fenkart <[email protected]>
Date:   Mon Aug 4 01:52:29 2014 +0200

    Fix #24: Don't send message when email didn't change and tweak email copy

commit 9905014
Author: Heinrich Fenkart <[email protected]>
Date:   Mon Aug 4 01:16:30 2014 +0200

    Make email addresses unique

    Fixes #26

commit ced2f3c
Author: Heinrich Fenkart <[email protected]>
Date:   Mon Aug 4 00:57:53 2014 +0200

    rm console.log in lib/flash

commit dfd4ac5
Author: Heinrich Fenkart <[email protected]>
Date:   Mon Aug 4 00:51:20 2014 +0200

    Removes unused lodash import

commit 4f42923
Author: Heinrich Fenkart <[email protected]>
Date:   Mon Aug 4 00:48:29 2014 +0200

    Rework flash messages and small tweaks for email verification

    Closes #22

commit 53e3dc9
Author: Heinrich Fenkart <[email protected]>
Date:   Sat Aug 2 15:07:45 2014 +0200

    Update icon font for new help icon

commit 8728da0
Author: Heinrich Fenkart <[email protected]>
Date:   Sat Aug 2 15:07:30 2014 +0200

    Implement selectize

commit baff332
Author: Heinrich Fenkart <[email protected]>
Date:   Sat Aug 2 15:06:59 2014 +0200

    Add font weight 700 to Roboto stylesheet

commit 24051da
Author: Heinrich Fenkart <[email protected]>
Date:   Tue Jul 29 22:35:56 2014 +0200

    More work on email verifications

    I'm too lazy to split this up into multiple commits <.<

commit 204e5c8
Author: Heinrich Fenkart <[email protected]>
Date:   Tue Jul 29 16:20:32 2014 +0200

    Don't create the `.gz` files for precompilation

commit 3d2e793
Author: Heinrich Fenkart <[email protected]>
Date:   Tue Jul 29 16:19:22 2014 +0200

    Fix autoprefixer in precompilation

commit ec01d4d
Author: Heinrich Fenkart <[email protected]>
Date:   Tue Jul 29 16:18:53 2014 +0200

    Add Feather icon set to `gkicons`

    See <http://colebemis.com/feather/>

commit 14c02a5
Author: Heinrich Fenkart <[email protected]>
Date:   Tue Jul 29 03:08:35 2014 +0200

    Make panels on auth pages actually panels

commit 3b95d57
Author: Heinrich Fenkart <[email protected]>
Date:   Tue Jul 29 02:56:43 2014 +0200

    Combined commit of the following:

    - Move authentication related views to `views/auth`
    - Add `moment` for relative time displaying
    - Store time at which a user's password was last changed at
    - Change type of all date related fields in the user model to numbers so that it saves unix time instead of a JavaScript date string
    - Change to `^` in `package.json`
    - Various style changes
    - Add two jade mixins

commit 752ecc6
Author: Heinrich Fenkart <[email protected]>
Date:   Mon Jul 28 20:20:37 2014 +0200

    Add phone number to imprint

    Conflicts:
    	views/imprint.jade

commit 7e608fe
Author: Heinrich Fenkart <[email protected]>
Date:   Mon Jul 28 20:20:37 2014 +0200

    Add phone number to imprint

commit f655931
Author: Juri Schreib | Bujuhu <[email protected]>
Date:   Mon Jul 28 00:20:43 2014 +0200

    Update Gitignore

commit d0a3e10
Author: Heinrich Fenkart <[email protected]>
Date:   Mon Jul 28 00:17:01 2014 +0200

    Fix prepopulated floating-label inputs

commit bb7b137
Author: Heinrich Fenkart <[email protected]>
Date:   Sun Jul 27 23:35:26 2014 +0200

    Also reset `hadContent` on inputs for signup form

commit 01fa34c
Author: Heinrich Fenkart <[email protected]>
Date:   Sun Jul 27 23:31:47 2014 +0200

    Clean up signup client-side JS

commit 882a234
Author: Heinrich Fenkart <[email protected]>
Date:   Sun Jul 27 23:16:50 2014 +0200

    Implement autoprefixer and small style tweaks for auth form

commit 68aa829
Author: Heinrich Fenkart <[email protected]>
Date:   Sun Jul 27 20:09:07 2014 +0200

    Add `.will-change` and small tweak for new buttons

commit e58e10c
Author: Heinrich Fenkart <[email protected]>
Date:   Sun Jul 27 20:05:16 2014 +0200

    Add `method="post"` back to forms

commit 02f104b
Author: Heinrich Fenkart <[email protected]>
Date:   Sun Jul 27 19:50:23 2014 +0200

    More work on email verifications

commit cc3c25c
Author: Heinrich Fenkart <[email protected]>
Date:   Sun Jul 27 19:49:59 2014 +0200

    Input style/auth pages redesign

commit 4f096fb
Author: Heinrich Fenkart <[email protected]>
Date:   Sun Jul 27 14:50:58 2014 +0200

    Reorganize structure and add basic mail support

commit 81bacb2
Author: Heinrich Fenkart <[email protected]>
Date:   Sat Jul 26 01:27:22 2014 +0200

    Add login and sign up links to landing page

commit 3e37dde
Author: Heinrich Fenkart <[email protected]>
Date:   Sat Jul 26 01:15:57 2014 +0200

    Reset email placeholder on reset for sign up form

commit 55fcd84
Author: Heinrich Fenkart <[email protected]>
Date:   Sat Jul 26 01:12:07 2014 +0200

    Small visual tweaks for sign up form

commit 1eac995
Author: Heinrich Fenkart <[email protected]>
Date:   Sat Jul 26 00:58:38 2014 +0200

    Small style changes on sign up page

commit 974d37e
Author: Heinrich Fenkart <[email protected]>
Date:   Sat Jul 26 00:58:23 2014 +0200

    Clear errors on form reset for sign up form

commit 6a63aeb
Author: Heinrich Fenkart <[email protected]>
Date:   Sat Jul 26 00:47:00 2014 +0200

    Add `.alert-dismissible` to flash messages

commit 7d943df
Author: Heinrich Fenkart <[email protected]>
Date:   Sat Jul 26 00:46:45 2014 +0200

    Client-side JS refactor and client-side validation for sign up form

commit 8dc37c1
Author: Heinrich Fenkart <[email protected]>
Date:   Fri Jul 25 15:54:34 2014 +0200

    Use different way for validation in user model

commit c6081a3
Author: Juri Schreib | Bujuhu <[email protected]>
Date:   Thu Jul 24 21:28:08 2014 +0200

    Add "404" and "500" to blacklist

commit 98983e0
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Jul 24 21:25:10 2014 +0200

    Purge one more non-breaking space

commit b51c6de
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Jul 24 21:24:24 2014 +0200

    Add "project" to blacklist

commit e29d103
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Jul 24 21:24:14 2014 +0200

    Purge some non-breaking spaces

commit 97795e1
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Jul 24 21:24:02 2014 +0200

    Fix landing page and homepage

commit a6454e3
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Jul 24 21:06:43 2014 +0200

    Update README info

commit 93d0ad7
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Jul 24 20:55:16 2014 +0200

    Add some words to the vanity URL blacklist

    Also fixes a small error

commit 659d677
Author: Heinrich Fenkart <[email protected]>
Date:   Thu Jul 24 20:22:37 2014 +0200

    Combined commit of the following:

    - new config system
    - Gruntfile split up into smaller parts
    - vanity url blacklist
    - userprofiles available at the top level instead of `/@username`
  • Loading branch information
@hnrch02
hnrch02 committed May 10, 2015
1 parent e6b9241 commit 07e4e25
Show file tree
Hide file tree
Showing 156 changed files with 7,257 additions and 1,443 deletions.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Icon

# SublimeText project files
*.sublime-workspace

*.sublime-project

###Windows###

Expand All @@ -64,6 +64,7 @@ $RECYCLE.BIN/

###App###
views/partials/rev.jade
config.local.json

###Deploy###
deploy/key.rsa
Expand Down
201 changes: 36 additions & 165 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
@@ -1,195 +1,66 @@
module.exports = function(grunt) {
'use strict'

var fs = require('fs')
var exec = require('child_process').exec
var mongoose = require('mongoose')
var bower = require('bower')
var secrets = require('./config/secrets')
var User = require('./models/User')
var DBLoaded = false

function loadDB() {
if(!DBLoaded) {
mongoose.connect(secrets.db)
mongoose.connection.on('error', function() {
grunt.fail.fatal('✗ MongoDB Connection Error. Please make sure MongoDB is running.')
})
DBLoaded = true
}
}

grunt.registerTask('revupdate', 'update rev info in footer of site', function() {
var done = this.async()

exec('git rev-parse HEAD', function(err, rev, stderr) {
if(err)
return grunt.fail.fatal(err)
if(stderr)
return grunt.fail.fatal(stderr)

var jade = 'a(href=\'https://github.com/gamekeller/next/commit/' + rev.replace('\n', '') + '\') rev. ' + rev.substr(0, 10)

fs.writeFile(__dirname + '/views/partials/rev.jade', jade, function(err) {
if(err)
return grunt.fail.fatal(err)

grunt.log.writeln('views/partials/rev.jade updated.')

done()
})
})
})

grunt.registerTask('bower', 'install all bower dependencies', function() {
bower.commands.install()
.on('log', function(result) {
grunt.log.writeln(['bower', result.id.cyan, result.message].join(' '))
})
.on('error', function(err) { grunt.fail.fatal(error) })
.on('end', this.async())
})

grunt.registerTask('addUser', 'add a user to the database', function(name, email, pass, admin) {
loadDB()

var done = this.async()
var user =
new User({
username: name,
email: email,
password: pass,
admin: (admin === 'true')
})

user.save(function(err) {
if(err) {
grunt.log.error('Error: ' + err)
done(false)
} else {
grunt.log.writeln('Saved user: ' + user.username)
done()
}
})
})

grunt.registerTask('seedDB', 'seed the database', function() {
grunt.task.run('addUser:admin:[email protected]:admin:true')
grunt.task.run('addUser:bob:[email protected]:password:false')
})

grunt.registerTask('dropDB', 'drop the database', function() {
loadDB()

var done = this.async()

mongoose.connection.on('open', function() {
mongoose.connection.db.dropDatabase(function(err) {
if(err) {
grunt.fail.fatal('Error: ' + err)
done(false)
} else {
grunt.log.writeln('Successfully dropped the database.')
done()
}
})
})
})

// Mincer asset precompilation
grunt.registerTask('precompile', function() {
var Mincer = require('mincer')
var done = this.async()

var env = new Mincer.Environment('./')

env.appendPath('assets')

env.ContextClass.defineAssetPath(function(pathname, options) {
var asset = this.environment.findAsset(pathname, options)

if(!asset)
throw new Error('File ' + pathname + ' not found')

return '/assets/' + asset.digestPath
})

env.jsCompressor = 'uglify'
env.cssCompressor = 'csso'

env = env.index

var manifest = new Mincer.Manifest(env, './public/assets')
var toCompile = [
'css/main.css',
'css/pages/*',
'js/main.js',
'img/*',
'img/404/*',
'fonts/*'
]

try {
var assetsData = manifest.compile(toCompile)
grunt.log.writeln('Assets were successfully compiled.\nManifest data (a proper JSON) was written to:\n' + manifest.path)
console.dir(assetsData)
} catch(err) {
grunt.fail.fatal('Failed compile assets: ' + (err.message || err.toString()))
}
})
'use strict';

// Project configuration.
grunt.initConfig({

pkg: grunt.file.readJSON('package.json'),

// Task configuration.
shell: {
db: {
command: 'mongod --dbpath /usr/local/var/mongodb',
options: {
stdout: false,
stderr: false
}
}
},

nodemon: {
server: {
script: 'app.js',
options: {
ignoredFiles: ['assets/**', 'public/**']
}
},
prod: {
script: 'app.js',
options: {
env: {
SIMULATE_PRODUCTION: true,
NODE_ENV: 'production'
}
}
}
},

concurrent: {
options: {
logConcurrentOutput: true
external_daemon: {
redis: {
cmd: 'redis-server',
args: ['/usr/local/etc/redis.conf']
},
dev: {
tasks: ['shell', 'nodemon']
},
dropDB: {
tasks: ['shell', 'dropDB']
},
seedDB: {
tasks: ['shell', 'seedDB']
mongodb: {
options: {
startCheck: function(stdout, stderr) {
return /waiting for connections/.test(stdout)
}
},
cmd: 'mongod',
args: ['--dbpath', '/usr/local/var/mongodb']
}
}

})

// Load local grunt tasks.
grunt.loadTasks('grunt')

// Load necessary plugins.
grunt.loadNpmTasks('grunt-shell-spawn')
grunt.loadNpmTasks('grunt-nodemon')
grunt.loadNpmTasks('grunt-concurrent')
grunt.loadNpmTasks('grunt-external-daemon')

// Development server task.
grunt.registerTask('server', ['revupdate', 'concurrent:dev'])
grunt.registerTask('server', ['revupdate', 'external_daemon', 'nodemon:server'])

// Production simulating task.
grunt.registerTask('prod', ['revupdate', 'precompile', 'external_daemon', 'nodemon:prod'])

// Database operation tasks.
grunt.registerTask('db', ['concurrent:dropDB', 'concurrent:seedDB'])
grunt.registerTask('db.drop', ['concurrent:dropDB'])
grunt.registerTask('db.seed', ['concurrent:seedDB'])
grunt.registerTask('db', ['external_daemon', 'dropDB', 'seedDB'])
grunt.registerTask('db.drop', ['external_daemon', 'dropDB'])
grunt.registerTask('db.seed', ['external_daemon', 'seedDB'])

// Default task.
grunt.registerTask('default', ['server'])
}
2 changes: 1 addition & 1 deletion LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2013-2014 Gamekeller
Copyright (c) 2013-2015 Gamekeller

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# [next Gamekeller website](https://github.com/gamekeller/next/)
# [Gamekeller website](http://gamekeller.net)
[![dependency Status](https://david-dm.org/gamekeller/next/status.svg)](https://david-dm.org/gamekeller/next#info=dependencies)
[![devDependency Status](https://david-dm.org/gamekeller/next/dev-status.svg)](https://david-dm.org/gamekeller/next#info=devDependencies)

Expand Down
Loading

0 comments on commit 07e4e25

Please sign in to comment.