spacecruft
/
Farmbot-Web-App
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Typo in rails template.

pull/1103/head
Rick Carlino 2019-01-29 20:23:04 -06:00
parent 1cd8d57799
commit 835ea510a4
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/dashboard_controller.rb
View File

@ -1,7 +1,7 @@
class DashboardController < ApplicationController
before_action :set_global_config
OUTPUT_PATH = "/dist"
OUTPUT_URL_PATH = "/dist"
CSS_INPUTS = {
front_page: "/css/laptop_splash.scss",
@ -16,12 +16,12 @@ class DashboardController < ApplicationController
}.with_indifferent_access
CSS_OUTPUTS = CSS_INPUTS.reduce({}) do |acc, (key, value)|
acc[key] = OUTPUT_PATH + value.gsub(/\.scss$/, ".css")
acc[key] = OUTPUT_URL_PATH + value.gsub(/\.scss$/, ".css")
acc
end
JS_OUTPUTS = JS_INPUTS.reduce({}) do |acc, (key, value)|
acc[key] = OUTPUT_PATH + value.gsub(/\.tsx?$/, ".js")
acc[key] = OUTPUT_URL_PATH + value.gsub(/\.tsx?$/, ".js")
acc
end

4
app/views/dashboard/main_app.html.erb
View File

@ -4,9 +4,5 @@
<%= render "common_assets" %>
</head>
<body>
<%=
#javascript_include_tag *webpack_asset_paths("app_bundle")
javascript_include_tag "/webpack/entry.js"
%>
</body>
</html>

1
lib/tasks/api.rake
View File

@ -68,7 +68,6 @@ namespace :api do
"--public-url /dist",
"--hmr-hostname #{ENV.fetch("API_HOST")}",
"--hmr-port 3808",
"--bundle-node-modules",
"--log-level 5",
].join(" ")
puts "=== Running: \n#{cli}"