From d2eafdd0210f9d35e3eeaf35076003cd19329383 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Tue, 3 Feb 2015 14:02:34 -0600 Subject: [PATCH] Started moving public folder stuff back to website --- .bowerrc | 2 +- .gitignore | 2 +- .../common-directives.js => directives.js} | 0 common/public/js/{services => }/userServices.js | 0 {common => website}/public/500.html | 0 .../public/apple-touch-icon-114-precomposed.png | Bin .../public/apple-touch-icon-144-precomposed.png | Bin .../public/apple-touch-icon-57-precomposed.png | Bin .../public/apple-touch-icon-72-precomposed.png | Bin .../public/apple-touch-icon-precomposed.png | Bin .../community-guidelines-images/backCorner.png | Bin .../community-guidelines-images/beingHabitican.png | Bin .../community-guidelines-images/consequences.png | Bin .../community-guidelines-images/contributing.png | Bin .../public/community-guidelines-images/github.gif | Bin .../community-guidelines-images/infractions.png | Bin .../public/community-guidelines-images/intro.png | Bin .../community-guidelines-images/moderators.png | Bin .../community-guidelines-images/publicGuilds.png | Bin .../community-guidelines-images/publicSpaces.png | Bin .../community-guidelines-images/restoration.png | Bin .../public/community-guidelines-images/staff.png | Bin .../public/community-guidelines-images/tavern.png | Bin .../public/community-guidelines-images/trello.png | Bin .../public/community-guidelines-images/wiki.png | Bin {common => website}/public/css/README.md | 0 {common => website}/public/css/alerts.styl | 0 {common => website}/public/css/avatar.styl | 0 {common => website}/public/css/challenges.styl | 0 {common => website}/public/css/classes.styl | 0 {common => website}/public/css/customizer.styl | 0 {common => website}/public/css/filters.styl | 0 {common => website}/public/css/footer.styl | 0 {common => website}/public/css/game-pane.styl | 0 {common => website}/public/css/global-colors.styl | 0 {common => website}/public/css/global-modules.styl | 0 {common => website}/public/css/header.styl | 0 {common => website}/public/css/helpers.styl | 0 {common => website}/public/css/index.styl | 0 {common => website}/public/css/inventory.styl | 0 {common => website}/public/css/items.styl | 0 {common => website}/public/css/menu.styl | 0 {common => website}/public/css/npcs.styl | 0 {common => website}/public/css/options.styl | 0 {common => website}/public/css/quests.styl | 0 {common => website}/public/css/scrollbars.styl | 0 {common => website}/public/css/shared.styl | 0 {common => website}/public/css/static.styl | 0 {common => website}/public/css/tasks.styl | 0 .../public/emails/images/10-days-recapture-v1.png | Bin .../emails/images/3-days-1-month-recapture-v1.png | Bin .../public/emails/images/one-day-v1.png | Bin .../subscription-begins-time-travelers-v1.png | Bin .../public/emails/images/subscription-begins-v1.png | Bin {common => website}/public/favicon.ico | Bin {common => website}/public/fontello/LICENSE.txt | 0 {common => website}/public/fontello/README.txt | 0 .../public/fontello/css/animation.css | 0 .../public/fontello/css/fontelico-codes.css | 0 .../public/fontello/css/fontelico-embedded.css | 0 .../public/fontello/css/fontelico-ie7-codes.css | 0 .../public/fontello/css/fontelico-ie7.css | 0 .../public/fontello/css/fontelico.css | 0 {common => website}/public/fontello/demo.html | 0 .../public/fontello/font/fontelico.eot | Bin .../public/fontello/font/fontelico.svg | 0 .../public/fontello/font/fontelico.ttf | Bin .../public/fontello/font/fontelico.woff | Bin .../public/google280633b772b94345.html | 0 .../public/google8ca65b6ff3506fb8.html | 0 .../public/googlef3b1402b0e28338a.html | 0 {common => website}/public/js/app.js | 0 .../public/js/controllers/authCtrl.js | 0 .../public/js/controllers/challengesCtrl.js | 0 .../public/js/controllers/filtersCtrl.js | 0 .../public/js/controllers/footerCtrl.js | 0 .../public/js/controllers/groupsCtrl.js | 0 .../public/js/controllers/hallCtrl.js | 0 .../public/js/controllers/headerCtrl.js | 0 .../public/js/controllers/inventoryCtrl.js | 0 .../public/js/controllers/notificationCtrl.js | 0 .../public/js/controllers/rootCtrl.js | 0 .../public/js/controllers/settingsCtrl.js | 0 .../public/js/controllers/tasksCtrl.js | 0 .../public/js/controllers/userCtrl.js | 0 .../public/js/directives/directives.js | 0 {common => website}/public/js/env.js | 0 {common => website}/public/js/filters/filters.js | 0 .../public/js/services/challengeServices.js | 0 .../public/js/services/groupServices.js | 0 .../public/js/services/guideServices.js | 0 .../public/js/services/memberServices.js | 0 .../public/js/services/notificationServices.js | 0 .../public/js/services/paymentServices.js | 0 .../public/js/services/sharedServices.js | 0 {common => website}/public/js/static.js | 0 .../public/logo/HABITRPG logo version 1.psd | Bin .../public/logo/HABITRPG-logo-version-1.gif | Bin {common => website}/public/logo/habitrpg.jpg | Bin {common => website}/public/logo/habitrpg_bl.eps | 0 {common => website}/public/logo/habitrpg_pixel.png | Bin {common => website}/public/manifest.json | 0 .../public/marketing/android_iphone.png | Bin {common => website}/public/marketing/animals.png | Bin {common => website}/public/marketing/challenge.png | Bin {common => website}/public/marketing/devices.png | Bin {common => website}/public/marketing/drops.png | Bin {common => website}/public/marketing/education.png | Bin {common => website}/public/marketing/gear.png | Bin {common => website}/public/marketing/guild.png | Bin .../public/marketing/guild_small.png | Bin .../public/marketing/integration.png | Bin {common => website}/public/marketing/lefnire.png | Bin .../marketing/promos/201403_Forest_Walker.png | Bin .../public/marketing/promos/April14SAMPLE2.png | Bin {common => website}/public/marketing/screenshot.png | Bin .../public/marketing/social_competitve.png | Bin {common => website}/public/marketing/wellness.png | Bin {common => website}/public/page-loader.gif | Bin .../public/presskit/Challenges Sample Screen.png | Bin .../public/presskit/Equipment Sample Screen.png | Bin .../public/presskit/Guilds Sample Screen.png | Bin .../public/presskit/HabitRPGPromoPostCard6.png | Bin .../public/presskit/HabitRPGPromoThin.png | Bin .../public/presskit/HabitRPGdevices.png | Bin .../public/presskit/Laundromancer_by_Arcosine.png | Bin .../public/presskit/Market Sample Screen.png | Bin .../public/presskit/PROMOdevices2.png | Bin .../presskit/SnackLessMonster_by_Arcosine.png | Bin .../public/presskit/habitrpg_pixel.png | Bin {common => website}/public/presskit/presskit.zip | Bin .../presskit/promo mobile inventorySTILL1.png | Bin .../presskit/promo mobile inventorySTILL2.png | Bin .../public/presskit/stag_battle_by_leephon.png | Bin .../public/presskit/stagnant_dishes_by_kiwibot.png | Bin .../public/presskit/vice_reborn_by_baconsaur.png | Bin {common => website}/public/refresh.png | Bin 137 files changed, 2 insertions(+), 2 deletions(-) rename common/public/js/{directives/common-directives.js => directives.js} (100%) rename common/public/js/{services => }/userServices.js (100%) rename {common => website}/public/500.html (100%) rename {common => website}/public/apple-touch-icon-114-precomposed.png (100%) rename {common => website}/public/apple-touch-icon-144-precomposed.png (100%) rename {common => website}/public/apple-touch-icon-57-precomposed.png (100%) rename {common => website}/public/apple-touch-icon-72-precomposed.png (100%) rename {common => website}/public/apple-touch-icon-precomposed.png (100%) rename {common => website}/public/community-guidelines-images/backCorner.png (100%) rename {common => website}/public/community-guidelines-images/beingHabitican.png (100%) rename {common => website}/public/community-guidelines-images/consequences.png (100%) rename {common => website}/public/community-guidelines-images/contributing.png (100%) rename {common => website}/public/community-guidelines-images/github.gif (100%) rename {common => website}/public/community-guidelines-images/infractions.png (100%) rename {common => website}/public/community-guidelines-images/intro.png (100%) rename {common => website}/public/community-guidelines-images/moderators.png (100%) rename {common => website}/public/community-guidelines-images/publicGuilds.png (100%) rename {common => website}/public/community-guidelines-images/publicSpaces.png (100%) rename {common => website}/public/community-guidelines-images/restoration.png (100%) rename {common => website}/public/community-guidelines-images/staff.png (100%) rename {common => website}/public/community-guidelines-images/tavern.png (100%) rename {common => website}/public/community-guidelines-images/trello.png (100%) rename {common => website}/public/community-guidelines-images/wiki.png (100%) rename {common => website}/public/css/README.md (100%) rename {common => website}/public/css/alerts.styl (100%) rename {common => website}/public/css/avatar.styl (100%) rename {common => website}/public/css/challenges.styl (100%) rename {common => website}/public/css/classes.styl (100%) rename {common => website}/public/css/customizer.styl (100%) rename {common => website}/public/css/filters.styl (100%) rename {common => website}/public/css/footer.styl (100%) rename {common => website}/public/css/game-pane.styl (100%) rename {common => website}/public/css/global-colors.styl (100%) rename {common => website}/public/css/global-modules.styl (100%) rename {common => website}/public/css/header.styl (100%) rename {common => website}/public/css/helpers.styl (100%) rename {common => website}/public/css/index.styl (100%) rename {common => website}/public/css/inventory.styl (100%) rename {common => website}/public/css/items.styl (100%) rename {common => website}/public/css/menu.styl (100%) rename {common => website}/public/css/npcs.styl (100%) rename {common => website}/public/css/options.styl (100%) rename {common => website}/public/css/quests.styl (100%) rename {common => website}/public/css/scrollbars.styl (100%) rename {common => website}/public/css/shared.styl (100%) rename {common => website}/public/css/static.styl (100%) rename {common => website}/public/css/tasks.styl (100%) rename {common => website}/public/emails/images/10-days-recapture-v1.png (100%) rename {common => website}/public/emails/images/3-days-1-month-recapture-v1.png (100%) rename {common => website}/public/emails/images/one-day-v1.png (100%) rename {common => website}/public/emails/images/subscription-begins-time-travelers-v1.png (100%) rename {common => website}/public/emails/images/subscription-begins-v1.png (100%) rename {common => website}/public/favicon.ico (100%) rename {common => website}/public/fontello/LICENSE.txt (100%) rename {common => website}/public/fontello/README.txt (100%) rename {common => website}/public/fontello/css/animation.css (100%) rename {common => website}/public/fontello/css/fontelico-codes.css (100%) rename {common => website}/public/fontello/css/fontelico-embedded.css (100%) rename {common => website}/public/fontello/css/fontelico-ie7-codes.css (100%) rename {common => website}/public/fontello/css/fontelico-ie7.css (100%) rename {common => website}/public/fontello/css/fontelico.css (100%) rename {common => website}/public/fontello/demo.html (100%) rename {common => website}/public/fontello/font/fontelico.eot (100%) rename {common => website}/public/fontello/font/fontelico.svg (100%) rename {common => website}/public/fontello/font/fontelico.ttf (100%) rename {common => website}/public/fontello/font/fontelico.woff (100%) rename {common => website}/public/google280633b772b94345.html (100%) rename {common => website}/public/google8ca65b6ff3506fb8.html (100%) rename {common => website}/public/googlef3b1402b0e28338a.html (100%) rename {common => website}/public/js/app.js (100%) rename {common => website}/public/js/controllers/authCtrl.js (100%) rename {common => website}/public/js/controllers/challengesCtrl.js (100%) rename {common => website}/public/js/controllers/filtersCtrl.js (100%) rename {common => website}/public/js/controllers/footerCtrl.js (100%) rename {common => website}/public/js/controllers/groupsCtrl.js (100%) rename {common => website}/public/js/controllers/hallCtrl.js (100%) rename {common => website}/public/js/controllers/headerCtrl.js (100%) rename {common => website}/public/js/controllers/inventoryCtrl.js (100%) rename {common => website}/public/js/controllers/notificationCtrl.js (100%) rename {common => website}/public/js/controllers/rootCtrl.js (100%) rename {common => website}/public/js/controllers/settingsCtrl.js (100%) rename {common => website}/public/js/controllers/tasksCtrl.js (100%) rename {common => website}/public/js/controllers/userCtrl.js (100%) rename {common => website}/public/js/directives/directives.js (100%) rename {common => website}/public/js/env.js (100%) rename {common => website}/public/js/filters/filters.js (100%) rename {common => website}/public/js/services/challengeServices.js (100%) rename {common => website}/public/js/services/groupServices.js (100%) rename {common => website}/public/js/services/guideServices.js (100%) rename {common => website}/public/js/services/memberServices.js (100%) rename {common => website}/public/js/services/notificationServices.js (100%) rename {common => website}/public/js/services/paymentServices.js (100%) rename {common => website}/public/js/services/sharedServices.js (100%) rename {common => website}/public/js/static.js (100%) rename {common => website}/public/logo/HABITRPG logo version 1.psd (100%) rename {common => website}/public/logo/HABITRPG-logo-version-1.gif (100%) rename {common => website}/public/logo/habitrpg.jpg (100%) rename {common => website}/public/logo/habitrpg_bl.eps (100%) rename {common => website}/public/logo/habitrpg_pixel.png (100%) rename {common => website}/public/manifest.json (100%) rename {common => website}/public/marketing/android_iphone.png (100%) rename {common => website}/public/marketing/animals.png (100%) rename {common => website}/public/marketing/challenge.png (100%) rename {common => website}/public/marketing/devices.png (100%) rename {common => website}/public/marketing/drops.png (100%) rename {common => website}/public/marketing/education.png (100%) rename {common => website}/public/marketing/gear.png (100%) rename {common => website}/public/marketing/guild.png (100%) rename {common => website}/public/marketing/guild_small.png (100%) rename {common => website}/public/marketing/integration.png (100%) rename {common => website}/public/marketing/lefnire.png (100%) rename {common => website}/public/marketing/promos/201403_Forest_Walker.png (100%) rename {common => website}/public/marketing/promos/April14SAMPLE2.png (100%) rename {common => website}/public/marketing/screenshot.png (100%) rename {common => website}/public/marketing/social_competitve.png (100%) rename {common => website}/public/marketing/wellness.png (100%) rename {common => website}/public/page-loader.gif (100%) rename {common => website}/public/presskit/Challenges Sample Screen.png (100%) rename {common => website}/public/presskit/Equipment Sample Screen.png (100%) rename {common => website}/public/presskit/Guilds Sample Screen.png (100%) rename {common => website}/public/presskit/HabitRPGPromoPostCard6.png (100%) rename {common => website}/public/presskit/HabitRPGPromoThin.png (100%) rename {common => website}/public/presskit/HabitRPGdevices.png (100%) rename {common => website}/public/presskit/Laundromancer_by_Arcosine.png (100%) rename {common => website}/public/presskit/Market Sample Screen.png (100%) rename {common => website}/public/presskit/PROMOdevices2.png (100%) rename {common => website}/public/presskit/SnackLessMonster_by_Arcosine.png (100%) rename {common => website}/public/presskit/habitrpg_pixel.png (100%) rename {common => website}/public/presskit/presskit.zip (100%) rename {common => website}/public/presskit/promo mobile inventorySTILL1.png (100%) rename {common => website}/public/presskit/promo mobile inventorySTILL2.png (100%) rename {common => website}/public/presskit/stag_battle_by_leephon.png (100%) rename {common => website}/public/presskit/stagnant_dishes_by_kiwibot.png (100%) rename {common => website}/public/presskit/vice_reborn_by_baconsaur.png (100%) rename {common => website}/public/refresh.png (100%) diff --git a/.bowerrc b/.bowerrc index cb4b8dcce6..3ffd231ea1 100644 --- a/.bowerrc +++ b/.bowerrc @@ -1,5 +1,5 @@ { - "directory": "common/public/bower_components", + "directory": "website/public/bower_components", "storage" : { "packages" : ".bower-cache", "registry" : ".bower-registry" diff --git a/.gitignore b/.gitignore index 42e31d291b..5ec4f0bf94 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ node_modules config.json npm-debug.log lib -common/public/bower_components +website/public/bower_components common/public/sprites build newrelic_agent.log diff --git a/common/public/js/directives/common-directives.js b/common/public/js/directives.js similarity index 100% rename from common/public/js/directives/common-directives.js rename to common/public/js/directives.js diff --git a/common/public/js/services/userServices.js b/common/public/js/userServices.js similarity index 100% rename from common/public/js/services/userServices.js rename to common/public/js/userServices.js diff --git a/common/public/500.html b/website/public/500.html similarity index 100% rename from common/public/500.html rename to website/public/500.html diff --git a/common/public/apple-touch-icon-114-precomposed.png b/website/public/apple-touch-icon-114-precomposed.png similarity index 100% rename from common/public/apple-touch-icon-114-precomposed.png rename to website/public/apple-touch-icon-114-precomposed.png diff --git a/common/public/apple-touch-icon-144-precomposed.png b/website/public/apple-touch-icon-144-precomposed.png similarity index 100% rename from common/public/apple-touch-icon-144-precomposed.png rename to website/public/apple-touch-icon-144-precomposed.png diff --git a/common/public/apple-touch-icon-57-precomposed.png b/website/public/apple-touch-icon-57-precomposed.png similarity index 100% rename from common/public/apple-touch-icon-57-precomposed.png rename to website/public/apple-touch-icon-57-precomposed.png diff --git a/common/public/apple-touch-icon-72-precomposed.png b/website/public/apple-touch-icon-72-precomposed.png similarity index 100% rename from common/public/apple-touch-icon-72-precomposed.png rename to website/public/apple-touch-icon-72-precomposed.png diff --git a/common/public/apple-touch-icon-precomposed.png b/website/public/apple-touch-icon-precomposed.png similarity index 100% rename from common/public/apple-touch-icon-precomposed.png rename to website/public/apple-touch-icon-precomposed.png diff --git a/common/public/community-guidelines-images/backCorner.png b/website/public/community-guidelines-images/backCorner.png similarity index 100% rename from common/public/community-guidelines-images/backCorner.png rename to website/public/community-guidelines-images/backCorner.png diff --git a/common/public/community-guidelines-images/beingHabitican.png b/website/public/community-guidelines-images/beingHabitican.png similarity index 100% rename from common/public/community-guidelines-images/beingHabitican.png rename to website/public/community-guidelines-images/beingHabitican.png diff --git a/common/public/community-guidelines-images/consequences.png b/website/public/community-guidelines-images/consequences.png similarity index 100% rename from common/public/community-guidelines-images/consequences.png rename to website/public/community-guidelines-images/consequences.png diff --git a/common/public/community-guidelines-images/contributing.png b/website/public/community-guidelines-images/contributing.png similarity index 100% rename from common/public/community-guidelines-images/contributing.png rename to website/public/community-guidelines-images/contributing.png diff --git a/common/public/community-guidelines-images/github.gif b/website/public/community-guidelines-images/github.gif similarity index 100% rename from common/public/community-guidelines-images/github.gif rename to website/public/community-guidelines-images/github.gif diff --git a/common/public/community-guidelines-images/infractions.png b/website/public/community-guidelines-images/infractions.png similarity index 100% rename from common/public/community-guidelines-images/infractions.png rename to website/public/community-guidelines-images/infractions.png diff --git a/common/public/community-guidelines-images/intro.png b/website/public/community-guidelines-images/intro.png similarity index 100% rename from common/public/community-guidelines-images/intro.png rename to website/public/community-guidelines-images/intro.png diff --git a/common/public/community-guidelines-images/moderators.png b/website/public/community-guidelines-images/moderators.png similarity index 100% rename from common/public/community-guidelines-images/moderators.png rename to website/public/community-guidelines-images/moderators.png diff --git a/common/public/community-guidelines-images/publicGuilds.png b/website/public/community-guidelines-images/publicGuilds.png similarity index 100% rename from common/public/community-guidelines-images/publicGuilds.png rename to website/public/community-guidelines-images/publicGuilds.png diff --git a/common/public/community-guidelines-images/publicSpaces.png b/website/public/community-guidelines-images/publicSpaces.png similarity index 100% rename from common/public/community-guidelines-images/publicSpaces.png rename to website/public/community-guidelines-images/publicSpaces.png diff --git a/common/public/community-guidelines-images/restoration.png b/website/public/community-guidelines-images/restoration.png similarity index 100% rename from common/public/community-guidelines-images/restoration.png rename to website/public/community-guidelines-images/restoration.png diff --git a/common/public/community-guidelines-images/staff.png b/website/public/community-guidelines-images/staff.png similarity index 100% rename from common/public/community-guidelines-images/staff.png rename to website/public/community-guidelines-images/staff.png diff --git a/common/public/community-guidelines-images/tavern.png b/website/public/community-guidelines-images/tavern.png similarity index 100% rename from common/public/community-guidelines-images/tavern.png rename to website/public/community-guidelines-images/tavern.png diff --git a/common/public/community-guidelines-images/trello.png b/website/public/community-guidelines-images/trello.png similarity index 100% rename from common/public/community-guidelines-images/trello.png rename to website/public/community-guidelines-images/trello.png diff --git a/common/public/community-guidelines-images/wiki.png b/website/public/community-guidelines-images/wiki.png similarity index 100% rename from common/public/community-guidelines-images/wiki.png rename to website/public/community-guidelines-images/wiki.png diff --git a/common/public/css/README.md b/website/public/css/README.md similarity index 100% rename from common/public/css/README.md rename to website/public/css/README.md diff --git a/common/public/css/alerts.styl b/website/public/css/alerts.styl similarity index 100% rename from common/public/css/alerts.styl rename to website/public/css/alerts.styl diff --git a/common/public/css/avatar.styl b/website/public/css/avatar.styl similarity index 100% rename from common/public/css/avatar.styl rename to website/public/css/avatar.styl diff --git a/common/public/css/challenges.styl b/website/public/css/challenges.styl similarity index 100% rename from common/public/css/challenges.styl rename to website/public/css/challenges.styl diff --git a/common/public/css/classes.styl b/website/public/css/classes.styl similarity index 100% rename from common/public/css/classes.styl rename to website/public/css/classes.styl diff --git a/common/public/css/customizer.styl b/website/public/css/customizer.styl similarity index 100% rename from common/public/css/customizer.styl rename to website/public/css/customizer.styl diff --git a/common/public/css/filters.styl b/website/public/css/filters.styl similarity index 100% rename from common/public/css/filters.styl rename to website/public/css/filters.styl diff --git a/common/public/css/footer.styl b/website/public/css/footer.styl similarity index 100% rename from common/public/css/footer.styl rename to website/public/css/footer.styl diff --git a/common/public/css/game-pane.styl b/website/public/css/game-pane.styl similarity index 100% rename from common/public/css/game-pane.styl rename to website/public/css/game-pane.styl diff --git a/common/public/css/global-colors.styl b/website/public/css/global-colors.styl similarity index 100% rename from common/public/css/global-colors.styl rename to website/public/css/global-colors.styl diff --git a/common/public/css/global-modules.styl b/website/public/css/global-modules.styl similarity index 100% rename from common/public/css/global-modules.styl rename to website/public/css/global-modules.styl diff --git a/common/public/css/header.styl b/website/public/css/header.styl similarity index 100% rename from common/public/css/header.styl rename to website/public/css/header.styl diff --git a/common/public/css/helpers.styl b/website/public/css/helpers.styl similarity index 100% rename from common/public/css/helpers.styl rename to website/public/css/helpers.styl diff --git a/common/public/css/index.styl b/website/public/css/index.styl similarity index 100% rename from common/public/css/index.styl rename to website/public/css/index.styl diff --git a/common/public/css/inventory.styl b/website/public/css/inventory.styl similarity index 100% rename from common/public/css/inventory.styl rename to website/public/css/inventory.styl diff --git a/common/public/css/items.styl b/website/public/css/items.styl similarity index 100% rename from common/public/css/items.styl rename to website/public/css/items.styl diff --git a/common/public/css/menu.styl b/website/public/css/menu.styl similarity index 100% rename from common/public/css/menu.styl rename to website/public/css/menu.styl diff --git a/common/public/css/npcs.styl b/website/public/css/npcs.styl similarity index 100% rename from common/public/css/npcs.styl rename to website/public/css/npcs.styl diff --git a/common/public/css/options.styl b/website/public/css/options.styl similarity index 100% rename from common/public/css/options.styl rename to website/public/css/options.styl diff --git a/common/public/css/quests.styl b/website/public/css/quests.styl similarity index 100% rename from common/public/css/quests.styl rename to website/public/css/quests.styl diff --git a/common/public/css/scrollbars.styl b/website/public/css/scrollbars.styl similarity index 100% rename from common/public/css/scrollbars.styl rename to website/public/css/scrollbars.styl diff --git a/common/public/css/shared.styl b/website/public/css/shared.styl similarity index 100% rename from common/public/css/shared.styl rename to website/public/css/shared.styl diff --git a/common/public/css/static.styl b/website/public/css/static.styl similarity index 100% rename from common/public/css/static.styl rename to website/public/css/static.styl diff --git a/common/public/css/tasks.styl b/website/public/css/tasks.styl similarity index 100% rename from common/public/css/tasks.styl rename to website/public/css/tasks.styl diff --git a/common/public/emails/images/10-days-recapture-v1.png b/website/public/emails/images/10-days-recapture-v1.png similarity index 100% rename from common/public/emails/images/10-days-recapture-v1.png rename to website/public/emails/images/10-days-recapture-v1.png diff --git a/common/public/emails/images/3-days-1-month-recapture-v1.png b/website/public/emails/images/3-days-1-month-recapture-v1.png similarity index 100% rename from common/public/emails/images/3-days-1-month-recapture-v1.png rename to website/public/emails/images/3-days-1-month-recapture-v1.png diff --git a/common/public/emails/images/one-day-v1.png b/website/public/emails/images/one-day-v1.png similarity index 100% rename from common/public/emails/images/one-day-v1.png rename to website/public/emails/images/one-day-v1.png diff --git a/common/public/emails/images/subscription-begins-time-travelers-v1.png b/website/public/emails/images/subscription-begins-time-travelers-v1.png similarity index 100% rename from common/public/emails/images/subscription-begins-time-travelers-v1.png rename to website/public/emails/images/subscription-begins-time-travelers-v1.png diff --git a/common/public/emails/images/subscription-begins-v1.png b/website/public/emails/images/subscription-begins-v1.png similarity index 100% rename from common/public/emails/images/subscription-begins-v1.png rename to website/public/emails/images/subscription-begins-v1.png diff --git a/common/public/favicon.ico b/website/public/favicon.ico similarity index 100% rename from common/public/favicon.ico rename to website/public/favicon.ico diff --git a/common/public/fontello/LICENSE.txt b/website/public/fontello/LICENSE.txt similarity index 100% rename from common/public/fontello/LICENSE.txt rename to website/public/fontello/LICENSE.txt diff --git a/common/public/fontello/README.txt b/website/public/fontello/README.txt similarity index 100% rename from common/public/fontello/README.txt rename to website/public/fontello/README.txt diff --git a/common/public/fontello/css/animation.css b/website/public/fontello/css/animation.css similarity index 100% rename from common/public/fontello/css/animation.css rename to website/public/fontello/css/animation.css diff --git a/common/public/fontello/css/fontelico-codes.css b/website/public/fontello/css/fontelico-codes.css similarity index 100% rename from common/public/fontello/css/fontelico-codes.css rename to website/public/fontello/css/fontelico-codes.css diff --git a/common/public/fontello/css/fontelico-embedded.css b/website/public/fontello/css/fontelico-embedded.css similarity index 100% rename from common/public/fontello/css/fontelico-embedded.css rename to website/public/fontello/css/fontelico-embedded.css diff --git a/common/public/fontello/css/fontelico-ie7-codes.css b/website/public/fontello/css/fontelico-ie7-codes.css similarity index 100% rename from common/public/fontello/css/fontelico-ie7-codes.css rename to website/public/fontello/css/fontelico-ie7-codes.css diff --git a/common/public/fontello/css/fontelico-ie7.css b/website/public/fontello/css/fontelico-ie7.css similarity index 100% rename from common/public/fontello/css/fontelico-ie7.css rename to website/public/fontello/css/fontelico-ie7.css diff --git a/common/public/fontello/css/fontelico.css b/website/public/fontello/css/fontelico.css similarity index 100% rename from common/public/fontello/css/fontelico.css rename to website/public/fontello/css/fontelico.css diff --git a/common/public/fontello/demo.html b/website/public/fontello/demo.html similarity index 100% rename from common/public/fontello/demo.html rename to website/public/fontello/demo.html diff --git a/common/public/fontello/font/fontelico.eot b/website/public/fontello/font/fontelico.eot similarity index 100% rename from common/public/fontello/font/fontelico.eot rename to website/public/fontello/font/fontelico.eot diff --git a/common/public/fontello/font/fontelico.svg b/website/public/fontello/font/fontelico.svg similarity index 100% rename from common/public/fontello/font/fontelico.svg rename to website/public/fontello/font/fontelico.svg diff --git a/common/public/fontello/font/fontelico.ttf b/website/public/fontello/font/fontelico.ttf similarity index 100% rename from common/public/fontello/font/fontelico.ttf rename to website/public/fontello/font/fontelico.ttf diff --git a/common/public/fontello/font/fontelico.woff b/website/public/fontello/font/fontelico.woff similarity index 100% rename from common/public/fontello/font/fontelico.woff rename to website/public/fontello/font/fontelico.woff diff --git a/common/public/google280633b772b94345.html b/website/public/google280633b772b94345.html similarity index 100% rename from common/public/google280633b772b94345.html rename to website/public/google280633b772b94345.html diff --git a/common/public/google8ca65b6ff3506fb8.html b/website/public/google8ca65b6ff3506fb8.html similarity index 100% rename from common/public/google8ca65b6ff3506fb8.html rename to website/public/google8ca65b6ff3506fb8.html diff --git a/common/public/googlef3b1402b0e28338a.html b/website/public/googlef3b1402b0e28338a.html similarity index 100% rename from common/public/googlef3b1402b0e28338a.html rename to website/public/googlef3b1402b0e28338a.html diff --git a/common/public/js/app.js b/website/public/js/app.js similarity index 100% rename from common/public/js/app.js rename to website/public/js/app.js diff --git a/common/public/js/controllers/authCtrl.js b/website/public/js/controllers/authCtrl.js similarity index 100% rename from common/public/js/controllers/authCtrl.js rename to website/public/js/controllers/authCtrl.js diff --git a/common/public/js/controllers/challengesCtrl.js b/website/public/js/controllers/challengesCtrl.js similarity index 100% rename from common/public/js/controllers/challengesCtrl.js rename to website/public/js/controllers/challengesCtrl.js diff --git a/common/public/js/controllers/filtersCtrl.js b/website/public/js/controllers/filtersCtrl.js similarity index 100% rename from common/public/js/controllers/filtersCtrl.js rename to website/public/js/controllers/filtersCtrl.js diff --git a/common/public/js/controllers/footerCtrl.js b/website/public/js/controllers/footerCtrl.js similarity index 100% rename from common/public/js/controllers/footerCtrl.js rename to website/public/js/controllers/footerCtrl.js diff --git a/common/public/js/controllers/groupsCtrl.js b/website/public/js/controllers/groupsCtrl.js similarity index 100% rename from common/public/js/controllers/groupsCtrl.js rename to website/public/js/controllers/groupsCtrl.js diff --git a/common/public/js/controllers/hallCtrl.js b/website/public/js/controllers/hallCtrl.js similarity index 100% rename from common/public/js/controllers/hallCtrl.js rename to website/public/js/controllers/hallCtrl.js diff --git a/common/public/js/controllers/headerCtrl.js b/website/public/js/controllers/headerCtrl.js similarity index 100% rename from common/public/js/controllers/headerCtrl.js rename to website/public/js/controllers/headerCtrl.js diff --git a/common/public/js/controllers/inventoryCtrl.js b/website/public/js/controllers/inventoryCtrl.js similarity index 100% rename from common/public/js/controllers/inventoryCtrl.js rename to website/public/js/controllers/inventoryCtrl.js diff --git a/common/public/js/controllers/notificationCtrl.js b/website/public/js/controllers/notificationCtrl.js similarity index 100% rename from common/public/js/controllers/notificationCtrl.js rename to website/public/js/controllers/notificationCtrl.js diff --git a/common/public/js/controllers/rootCtrl.js b/website/public/js/controllers/rootCtrl.js similarity index 100% rename from common/public/js/controllers/rootCtrl.js rename to website/public/js/controllers/rootCtrl.js diff --git a/common/public/js/controllers/settingsCtrl.js b/website/public/js/controllers/settingsCtrl.js similarity index 100% rename from common/public/js/controllers/settingsCtrl.js rename to website/public/js/controllers/settingsCtrl.js diff --git a/common/public/js/controllers/tasksCtrl.js b/website/public/js/controllers/tasksCtrl.js similarity index 100% rename from common/public/js/controllers/tasksCtrl.js rename to website/public/js/controllers/tasksCtrl.js diff --git a/common/public/js/controllers/userCtrl.js b/website/public/js/controllers/userCtrl.js similarity index 100% rename from common/public/js/controllers/userCtrl.js rename to website/public/js/controllers/userCtrl.js diff --git a/common/public/js/directives/directives.js b/website/public/js/directives/directives.js similarity index 100% rename from common/public/js/directives/directives.js rename to website/public/js/directives/directives.js diff --git a/common/public/js/env.js b/website/public/js/env.js similarity index 100% rename from common/public/js/env.js rename to website/public/js/env.js diff --git a/common/public/js/filters/filters.js b/website/public/js/filters/filters.js similarity index 100% rename from common/public/js/filters/filters.js rename to website/public/js/filters/filters.js diff --git a/common/public/js/services/challengeServices.js b/website/public/js/services/challengeServices.js similarity index 100% rename from common/public/js/services/challengeServices.js rename to website/public/js/services/challengeServices.js diff --git a/common/public/js/services/groupServices.js b/website/public/js/services/groupServices.js similarity index 100% rename from common/public/js/services/groupServices.js rename to website/public/js/services/groupServices.js diff --git a/common/public/js/services/guideServices.js b/website/public/js/services/guideServices.js similarity index 100% rename from common/public/js/services/guideServices.js rename to website/public/js/services/guideServices.js diff --git a/common/public/js/services/memberServices.js b/website/public/js/services/memberServices.js similarity index 100% rename from common/public/js/services/memberServices.js rename to website/public/js/services/memberServices.js diff --git a/common/public/js/services/notificationServices.js b/website/public/js/services/notificationServices.js similarity index 100% rename from common/public/js/services/notificationServices.js rename to website/public/js/services/notificationServices.js diff --git a/common/public/js/services/paymentServices.js b/website/public/js/services/paymentServices.js similarity index 100% rename from common/public/js/services/paymentServices.js rename to website/public/js/services/paymentServices.js diff --git a/common/public/js/services/sharedServices.js b/website/public/js/services/sharedServices.js similarity index 100% rename from common/public/js/services/sharedServices.js rename to website/public/js/services/sharedServices.js diff --git a/common/public/js/static.js b/website/public/js/static.js similarity index 100% rename from common/public/js/static.js rename to website/public/js/static.js diff --git a/common/public/logo/HABITRPG logo version 1.psd b/website/public/logo/HABITRPG logo version 1.psd similarity index 100% rename from common/public/logo/HABITRPG logo version 1.psd rename to website/public/logo/HABITRPG logo version 1.psd diff --git a/common/public/logo/HABITRPG-logo-version-1.gif b/website/public/logo/HABITRPG-logo-version-1.gif similarity index 100% rename from common/public/logo/HABITRPG-logo-version-1.gif rename to website/public/logo/HABITRPG-logo-version-1.gif diff --git a/common/public/logo/habitrpg.jpg b/website/public/logo/habitrpg.jpg similarity index 100% rename from common/public/logo/habitrpg.jpg rename to website/public/logo/habitrpg.jpg diff --git a/common/public/logo/habitrpg_bl.eps b/website/public/logo/habitrpg_bl.eps similarity index 100% rename from common/public/logo/habitrpg_bl.eps rename to website/public/logo/habitrpg_bl.eps diff --git a/common/public/logo/habitrpg_pixel.png b/website/public/logo/habitrpg_pixel.png similarity index 100% rename from common/public/logo/habitrpg_pixel.png rename to website/public/logo/habitrpg_pixel.png diff --git a/common/public/manifest.json b/website/public/manifest.json similarity index 100% rename from common/public/manifest.json rename to website/public/manifest.json diff --git a/common/public/marketing/android_iphone.png b/website/public/marketing/android_iphone.png similarity index 100% rename from common/public/marketing/android_iphone.png rename to website/public/marketing/android_iphone.png diff --git a/common/public/marketing/animals.png b/website/public/marketing/animals.png similarity index 100% rename from common/public/marketing/animals.png rename to website/public/marketing/animals.png diff --git a/common/public/marketing/challenge.png b/website/public/marketing/challenge.png similarity index 100% rename from common/public/marketing/challenge.png rename to website/public/marketing/challenge.png diff --git a/common/public/marketing/devices.png b/website/public/marketing/devices.png similarity index 100% rename from common/public/marketing/devices.png rename to website/public/marketing/devices.png diff --git a/common/public/marketing/drops.png b/website/public/marketing/drops.png similarity index 100% rename from common/public/marketing/drops.png rename to website/public/marketing/drops.png diff --git a/common/public/marketing/education.png b/website/public/marketing/education.png similarity index 100% rename from common/public/marketing/education.png rename to website/public/marketing/education.png diff --git a/common/public/marketing/gear.png b/website/public/marketing/gear.png similarity index 100% rename from common/public/marketing/gear.png rename to website/public/marketing/gear.png diff --git a/common/public/marketing/guild.png b/website/public/marketing/guild.png similarity index 100% rename from common/public/marketing/guild.png rename to website/public/marketing/guild.png diff --git a/common/public/marketing/guild_small.png b/website/public/marketing/guild_small.png similarity index 100% rename from common/public/marketing/guild_small.png rename to website/public/marketing/guild_small.png diff --git a/common/public/marketing/integration.png b/website/public/marketing/integration.png similarity index 100% rename from common/public/marketing/integration.png rename to website/public/marketing/integration.png diff --git a/common/public/marketing/lefnire.png b/website/public/marketing/lefnire.png similarity index 100% rename from common/public/marketing/lefnire.png rename to website/public/marketing/lefnire.png diff --git a/common/public/marketing/promos/201403_Forest_Walker.png b/website/public/marketing/promos/201403_Forest_Walker.png similarity index 100% rename from common/public/marketing/promos/201403_Forest_Walker.png rename to website/public/marketing/promos/201403_Forest_Walker.png diff --git a/common/public/marketing/promos/April14SAMPLE2.png b/website/public/marketing/promos/April14SAMPLE2.png similarity index 100% rename from common/public/marketing/promos/April14SAMPLE2.png rename to website/public/marketing/promos/April14SAMPLE2.png diff --git a/common/public/marketing/screenshot.png b/website/public/marketing/screenshot.png similarity index 100% rename from common/public/marketing/screenshot.png rename to website/public/marketing/screenshot.png diff --git a/common/public/marketing/social_competitve.png b/website/public/marketing/social_competitve.png similarity index 100% rename from common/public/marketing/social_competitve.png rename to website/public/marketing/social_competitve.png diff --git a/common/public/marketing/wellness.png b/website/public/marketing/wellness.png similarity index 100% rename from common/public/marketing/wellness.png rename to website/public/marketing/wellness.png diff --git a/common/public/page-loader.gif b/website/public/page-loader.gif similarity index 100% rename from common/public/page-loader.gif rename to website/public/page-loader.gif diff --git a/common/public/presskit/Challenges Sample Screen.png b/website/public/presskit/Challenges Sample Screen.png similarity index 100% rename from common/public/presskit/Challenges Sample Screen.png rename to website/public/presskit/Challenges Sample Screen.png diff --git a/common/public/presskit/Equipment Sample Screen.png b/website/public/presskit/Equipment Sample Screen.png similarity index 100% rename from common/public/presskit/Equipment Sample Screen.png rename to website/public/presskit/Equipment Sample Screen.png diff --git a/common/public/presskit/Guilds Sample Screen.png b/website/public/presskit/Guilds Sample Screen.png similarity index 100% rename from common/public/presskit/Guilds Sample Screen.png rename to website/public/presskit/Guilds Sample Screen.png diff --git a/common/public/presskit/HabitRPGPromoPostCard6.png b/website/public/presskit/HabitRPGPromoPostCard6.png similarity index 100% rename from common/public/presskit/HabitRPGPromoPostCard6.png rename to website/public/presskit/HabitRPGPromoPostCard6.png diff --git a/common/public/presskit/HabitRPGPromoThin.png b/website/public/presskit/HabitRPGPromoThin.png similarity index 100% rename from common/public/presskit/HabitRPGPromoThin.png rename to website/public/presskit/HabitRPGPromoThin.png diff --git a/common/public/presskit/HabitRPGdevices.png b/website/public/presskit/HabitRPGdevices.png similarity index 100% rename from common/public/presskit/HabitRPGdevices.png rename to website/public/presskit/HabitRPGdevices.png diff --git a/common/public/presskit/Laundromancer_by_Arcosine.png b/website/public/presskit/Laundromancer_by_Arcosine.png similarity index 100% rename from common/public/presskit/Laundromancer_by_Arcosine.png rename to website/public/presskit/Laundromancer_by_Arcosine.png diff --git a/common/public/presskit/Market Sample Screen.png b/website/public/presskit/Market Sample Screen.png similarity index 100% rename from common/public/presskit/Market Sample Screen.png rename to website/public/presskit/Market Sample Screen.png diff --git a/common/public/presskit/PROMOdevices2.png b/website/public/presskit/PROMOdevices2.png similarity index 100% rename from common/public/presskit/PROMOdevices2.png rename to website/public/presskit/PROMOdevices2.png diff --git a/common/public/presskit/SnackLessMonster_by_Arcosine.png b/website/public/presskit/SnackLessMonster_by_Arcosine.png similarity index 100% rename from common/public/presskit/SnackLessMonster_by_Arcosine.png rename to website/public/presskit/SnackLessMonster_by_Arcosine.png diff --git a/common/public/presskit/habitrpg_pixel.png b/website/public/presskit/habitrpg_pixel.png similarity index 100% rename from common/public/presskit/habitrpg_pixel.png rename to website/public/presskit/habitrpg_pixel.png diff --git a/common/public/presskit/presskit.zip b/website/public/presskit/presskit.zip similarity index 100% rename from common/public/presskit/presskit.zip rename to website/public/presskit/presskit.zip diff --git a/common/public/presskit/promo mobile inventorySTILL1.png b/website/public/presskit/promo mobile inventorySTILL1.png similarity index 100% rename from common/public/presskit/promo mobile inventorySTILL1.png rename to website/public/presskit/promo mobile inventorySTILL1.png diff --git a/common/public/presskit/promo mobile inventorySTILL2.png b/website/public/presskit/promo mobile inventorySTILL2.png similarity index 100% rename from common/public/presskit/promo mobile inventorySTILL2.png rename to website/public/presskit/promo mobile inventorySTILL2.png diff --git a/common/public/presskit/stag_battle_by_leephon.png b/website/public/presskit/stag_battle_by_leephon.png similarity index 100% rename from common/public/presskit/stag_battle_by_leephon.png rename to website/public/presskit/stag_battle_by_leephon.png diff --git a/common/public/presskit/stagnant_dishes_by_kiwibot.png b/website/public/presskit/stagnant_dishes_by_kiwibot.png similarity index 100% rename from common/public/presskit/stagnant_dishes_by_kiwibot.png rename to website/public/presskit/stagnant_dishes_by_kiwibot.png diff --git a/common/public/presskit/vice_reborn_by_baconsaur.png b/website/public/presskit/vice_reborn_by_baconsaur.png similarity index 100% rename from common/public/presskit/vice_reborn_by_baconsaur.png rename to website/public/presskit/vice_reborn_by_baconsaur.png diff --git a/common/public/refresh.png b/website/public/refresh.png similarity index 100% rename from common/public/refresh.png rename to website/public/refresh.png