Move public dir out of lib

It never belonged there in the first place, and I can't even remember how/why that happened.
sas1ni69 · Nov 22, 2015 · a63ce72 · a63ce72
1 parent 01bad98
commit a63ce72
Show file tree

Hide file tree

Showing 117 changed files with 48 additions and 9 deletions.
diff --git a/config.rb b/config.rb
@@ -5,11 +5,11 @@
 require 'font-awesome-sass'
 
 # Set this to the root of your project when deployed:
-http_path = "lib/app/"
-css_dir = "lib/app/public/css"
-sass_dir = "lib/app/public/sass"
-images_dir = "lib/app/public/img"
-fonts_dir = "lib/app/public/fonts"
+http_path = "."
+css_dir = "public/css"
+sass_dir = "public/sass"
+images_dir = "public/img"
+fonts_dir = "public/fonts"
 
 relative_assets = true
 

diff --git a/frontend/config/application.coffee b/frontend/config/application.coffee
@@ -34,7 +34,7 @@ module.exports = require(process.env['LINEMAN_MAIN']).config.extend('application
   copy:
     dev:
       files: [expand: true, cwd: 'generated', src: ['css/**', 'js/**', '!**/spec.js', 
-              '!**/*.less*', '!**/*.coffee*', '!**/*.*.map'], dest: '../lib/app/public' ]
+              '!**/*.less*', '!**/*.coffee*', '!**/*.*.map'], dest: '../public' ]
 
   # configuration for grunt-ngmin, this happens _after_ concat once, which is the ngmin ideal :)
   ngmin: {

diff --git a/lib/app/routes/core.rb b/lib/app/routes/core.rb
@@ -2,6 +2,7 @@ module ExercismWeb
   module Routes
     class Core < Sinatra::Application
       configure do
+        set :public_folder, Exercism.relative_to_root('public')
         set :root, Exercism.relative_to_root('lib', 'app')
         set :environment, ENV.fetch('RACK_ENV') { :development }.to_sym
         set :method_override, true

diff --git a/lineman.json b/lineman.json
@@ -3,7 +3,7 @@
     {
       "type": "file",
       "location": "frontend",
-      "installToPath": "lib/app/public",
+      "installToPath": "public",
       "filesToDeploy" : ["js/*.js", "css/*.css"]
     }
   ]

diff --git a/public/css/app.css b/public/css/app.css
diff --git a/lib/app/public/css/application.css → public/css/application.css b/lib/app/public/css/application.css → public/css/application.css
diff --git a/public/css/base/components/beta_banner.css b/public/css/base/components/beta_banner.css
diff --git a/public/css/base/components/brand.css b/public/css/base/components/brand.css
diff --git a/public/css/base/components/comment.css b/public/css/base/components/comment.css
diff --git a/public/css/base/components/exercise.css b/public/css/base/components/exercise.css
@@ -0,0 +1 @@
+.completed-exercise{line-height:1.6em}.completed-exercise a:after{content:", "}.completed-exercise:last-child a:after{content:"."}
diff --git a/public/css/base/components/import.css b/public/css/base/components/import.css
diff --git a/public/css/base/components/inbox.css b/public/css/base/components/inbox.css
@@ -0,0 +1 @@
+nav.inbox li{padding-left:50px}nav.inbox li a .total-count{color:#777;float:right}nav.inbox li .badge{position:absolute;top:0;left:0}
diff --git a/public/css/base/components/info.css b/public/css/base/components/info.css
diff --git a/public/css/base/components/main.css b/public/css/base/components/main.css
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		.completed-exercise{line-height:1.6em}.completed-exercise a:after{content:", "}.completed-exercise:last-child a:after{content:"."}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		nav.inbox li{padding-left:50px}nav.inbox li a .total-count{color:#777;float:right}nav.inbox li .badge{position:absolute;top:0;left:0}