rename website/client to website/client-old

.bowerrc

@@ -1,3 +1,3 @@
 {
-  "directory": "website/client/bower_components"
+  "directory": "website/client-old/bower_components"
 }

.eslintignore

@@ -8,8 +8,8 @@ website/transpiled-babel/
 
 migrations/*
 
-# The files in website/client/js should be moved out and browserified
-website/client/
+# The files in website/client-old/js should be moved out and browserified
+website/client-old/
 
 # Temporarilly disabled. These should be removed when the linting errors are fixed
 common/script/content/index.js

.gitignore

@@ -1,7 +1,7 @@
 .DS_Store
-website/client/gen
-website/client/common
-website/client/apidoc
+website/client-old/gen
+website/client-old/common
+website/client-old/apidoc
 website/transpiled-babel/
 common/transpiled-babel/
 node_modules
@@ -10,8 +10,8 @@ node_modules
 config.json
 npm-debug.log*
 lib
-website/client/bower_components
-website/client/new-stuff.html
+website/client-old/bower_components
+website/client-old/new-stuff.html
 website/build
 newrelic_agent.log
 .bower-tmp
@@ -25,7 +25,7 @@ src/*/*.map
 src/*/*/*.map
 test/*.js
 test/*.map
-website/client/docs
+website/client-old/docs
 *.sublime-workspace
 coverage
 coverage.html

.nodemonignore

@@ -2,7 +2,7 @@ node_modules/**
 .bower-cache/**
 .bower-tmp/**
 .bower-registry/**
-website/client/**
+website/client-old/**
 website/views/**
 website/build/**
 test/**

Gruntfile.js

@@ -43,11 +43,11 @@ module.exports = function(grunt) {
         options: {
           compress: false, // AFTER
           'include css': true,
-          paths: ['website/client']
+          paths: ['website/client-old']
         },
         files: {
-          'website/build/app.css': ['website/client/css/index.styl'],
-          'website/build/static.css': ['website/client/css/static.styl']
+          'website/build/app.css': ['website/client-old/css/index.styl'],
+          'website/build/static.css': ['website/client-old/css/static.styl']
         }
       }
     },
@@ -55,13 +55,13 @@ module.exports = function(grunt) {
     copy: {
       build: {
         files: [
-          {expand: true, cwd: 'website/client/', src: 'favicon.ico', dest: 'website/build/'},
-          {expand: true, cwd: 'website/client/', src: 'favicon_192x192.png', dest: 'website/build/'},
+          {expand: true, cwd: 'website/client-old/', src: 'favicon.ico', dest: 'website/build/'},
+          {expand: true, cwd: 'website/client-old/', src: 'favicon_192x192.png', dest: 'website/build/'},
           {expand: true, cwd: '', src: 'common/dist/sprites/spritesmith*.png', dest: 'website/build/'},
           {expand: true, cwd: '', src: 'common/img/sprites/backer-only/*.gif', dest: 'website/build/'},
           {expand: true, cwd: '', src: 'common/img/sprites/npc_ian.gif', dest: 'website/build/'},
           {expand: true, cwd: '', src: 'common/img/sprites/quest_*.gif', dest: 'website/build/'},
-          {expand: true, cwd: 'website/client/', src: 'bower_components/bootstrap/dist/fonts/*', dest: 'website/build/'}
+          {expand: true, cwd: 'website/client-old/', src: 'bower_components/bootstrap/dist/fonts/*', dest: 'website/build/'}
         ]
       }
     },
@@ -88,9 +88,9 @@ module.exports = function(grunt) {
     }
   });
 
-  //Load build files from client/manifest.json
-  grunt.registerTask('loadManifestFiles', 'Load all build files from client/manifest.json', function(){
-    var files = grunt.file.readJSON('./website/client/manifest.json');
+  //Load build files from client-old/manifest.json
+  grunt.registerTask('loadManifestFiles', 'Load all build files from client-old/manifest.json', function(){
+    var files = grunt.file.readJSON('./website/client-old/manifest.json');
     var uglify = {};
     var cssmin = {};
 
@@ -101,7 +101,7 @@ module.exports = function(grunt) {
       _.each(files[key].js, function(val){
         var path = "./";
         if( val.indexOf('common/') == -1)
-          path = './website/client/';
+          path = './website/client-old/';
         js.push(path + val);
       });
 
@@ -110,7 +110,7 @@ module.exports = function(grunt) {
       _.each(files[key].css, function(val){
         var path = "./";
         if( val.indexOf('common/') == -1) {
-          path = (val == 'app.css' || val == 'static.css') ?  './website/build/' : './website/client/';
+          path = (val == 'app.css' || val == 'static.css') ?  './website/build/' : './website/client-old/';
         }
         css.push(path + val)
       });
@@ -122,7 +122,7 @@ module.exports = function(grunt) {
 
     grunt.config.set('cssmin.build.files', cssmin);
     // Rewrite urls to relative path
-    grunt.config.set('cssmin.build.options', {'target': 'website/client/css/whatever-css.css'});
+    grunt.config.set('cssmin.build.options', {'target': 'website/client-old/css/whatever-css.css'});
   });
 
   // Register tasks.

bower.json

@@ -9,7 +9,7 @@
   "ignore": [
     "**/.*",
     "node_modules",
-    "website/client/bower_components",
+    "website/client-old/bower_components",
     "test",
     "tests"
   ],

karma.conf.js

@@ -11,40 +11,40 @@ module.exports = function karmaConfig (config) {
 
     // list of files / patterns to load in the browser
     files: [
-      'website/client/bower_components/jquery/dist/jquery.js',
-      'website/client/bower_components/pnotify/jquery.pnotify.js',
-      'website/client/bower_components/angular/angular.js',
-      'website/client/bower_components/angular-loading-bar/build/loading-bar.min.js',
-      'website/client/bower_components/angular-resource/angular-resource.min.js',
-      'website/client/bower_components/hello/dist/hello.all.min.js',
-      'website/client/bower_components/angular-sanitize/angular-sanitize.js',
-      'website/client/bower_components/bootstrap/dist/js/bootstrap.js',
-      'website/client/bower_components/angular-bootstrap/ui-bootstrap.js',
-      'website/client/bower_components/angular-bootstrap/ui-bootstrap-tpls.js',
-      'website/client/bower_components/angular-ui-router/release/angular-ui-router.js',
-      'website/client/bower_components/angular-filter/dist/angular-filter.js',
-      'website/client/bower_components/angular-ui/build/angular-ui.js',
-      'website/client/bower_components/angular-ui-utils/ui-utils.min.js',
-      'website/client/bower_components/Angular-At-Directive/src/at.js',
-      'website/client/bower_components/Angular-At-Directive/src/caret.js',
-      'website/client/bower_components/angular-mocks/angular-mocks.js',
-      'website/client/bower_components/ngInfiniteScroll/build/ng-infinite-scroll.js',
-      'website/client/bower_components/select2/select2.js',
-      'website/client/bower_components/angular-ui-select2/src/select2.js',
-      'website/client/bower_components/habitica-markdown/dist/habitica-markdown.min.js',
+      'website/client-old/bower_components/jquery/dist/jquery.js',
+      'website/client-old/bower_components/pnotify/jquery.pnotify.js',
+      'website/client-old/bower_components/angular/angular.js',
+      'website/client-old/bower_components/angular-loading-bar/build/loading-bar.min.js',
+      'website/client-old/bower_components/angular-resource/angular-resource.min.js',
+      'website/client-old/bower_components/hello/dist/hello.all.min.js',
+      'website/client-old/bower_components/angular-sanitize/angular-sanitize.js',
+      'website/client-old/bower_components/bootstrap/dist/js/bootstrap.js',
+      'website/client-old/bower_components/angular-bootstrap/ui-bootstrap.js',
+      'website/client-old/bower_components/angular-bootstrap/ui-bootstrap-tpls.js',
+      'website/client-old/bower_components/angular-ui-router/release/angular-ui-router.js',
+      'website/client-old/bower_components/angular-filter/dist/angular-filter.js',
+      'website/client-old/bower_components/angular-ui/build/angular-ui.js',
+      'website/client-old/bower_components/angular-ui-utils/ui-utils.min.js',
+      'website/client-old/bower_components/Angular-At-Directive/src/at.js',
+      'website/client-old/bower_components/Angular-At-Directive/src/caret.js',
+      'website/client-old/bower_components/angular-mocks/angular-mocks.js',
+      'website/client-old/bower_components/ngInfiniteScroll/build/ng-infinite-scroll.js',
+      'website/client-old/bower_components/select2/select2.js',
+      'website/client-old/bower_components/angular-ui-select2/src/select2.js',
+      'website/client-old/bower_components/habitica-markdown/dist/habitica-markdown.min.js',
       'common/dist/scripts/habitrpg-shared.js',
 
       'test/spec/mocks/**/*.js',
 
-      'website/client/js/env.js',
-      'website/client/js/app.js',
+      'website/client-old/js/env.js',
+      'website/client-old/js/app.js',
       'common/script/public/config.js',
       'common/script/public/directives.js',
 
-      'website/client/js/services/**/*.js',
-      'website/client/js/filters/**/*.js',
-      'website/client/js/directives/**/*.js',
-      'website/client/js/controllers/**/*.js',
+      'website/client-old/js/services/**/*.js',
+      'website/client-old/js/filters/**/*.js',
+      'website/client-old/js/directives/**/*.js',
+      'website/client-old/js/controllers/**/*.js',
 
       'test/spec/specHelper.js',
       'test/spec/**/*.js',
@@ -76,7 +76,7 @@ module.exports = function karmaConfig (config) {
     browsers: ['PhantomJS'],
 
     preprocessors: {
-      'website/client/js/**/*.js': ['coverage'],
+      'website/client-old/js/**/*.js': ['coverage'],
       'test/**/*.js': ['babel'],
     },
 

tasks/gulp-build.js

@@ -30,7 +30,7 @@ gulp.task('build:dev', ['browserify', 'prepare:staticNewStuff'], (done) => {
 });
 
 gulp.task('build:dev:watch', ['build:dev'], () => {
-  gulp.watch(['website/client/**/*.styl', 'common/script/*']);
+  gulp.watch(['website/client-old/**/*.styl', 'common/script/*']);
 });
 
 gulp.task('build:prod', ['browserify', 'build:server', 'prepare:staticNewStuff'], (done) => {

tasks/gulp-newstuff.js

@@ -4,7 +4,7 @@ import {writeFileSync} from 'fs';
 
 gulp.task('prepare:staticNewStuff', () => {
   writeFileSync(
-    './website/client/new-stuff.html',
+    './website/client-old/new-stuff.html',
     jade.compileFile('./website/views/shared/new-stuff.jade')()
   );
 });

tasks/gulp-start.js

@@ -9,7 +9,7 @@ gulp.task('nodemon', () => {
   nodemon({
     script: pkg.main,
     ignore: [
-      'website/client/*',
+      'website/client-old/*',
       'website/views/*',
       'common/dist/script/content/*',
     ]