Skip to content

Update static paths to reflect migration to esbuild #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IvanIvanoff wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update static paths to reflect migration to esbuild #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
618afb2
Update static paths to reflect migration to esbuild
IvanIvanoff Feb 2, 2022
d53d722
backup
IvanIvanoff Feb 2, 2022
27870a3
backup
IvanIvanoff Feb 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 20 additions & 19 deletions brunch-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ exports.config = {
files: {
javascripts: {
joinTo: {
'js/admin_lte2.js': [
'assets/admin_lte2.js': [
"web/static/vendor/themes/admin_lte2/bootstrap/js/bootstrap.min.js",
"web/static/vendor/themes/admin_lte2/plugins/daterangepicker/daterangepicker.js",
"web/static/vendor/themes/admin_lte2/plugins/datepicker/bootstrap-datepicker.js",
Expand All @@ -13,11 +13,11 @@ exports.config = {
"web/static/vendor/themes/admin_lte2/js/moment.js",
"web/static/vendor/themes/admin_lte2/dist/js/app.js",
],
'js/jquery.min.js': [
'assets/jquery.min.js': [
"web/static/vendor/jQuery-2.1.4.min.js",
"web/static/vendor/jquery-ui.min.js",
],
'js/ex_admin_common.js': [
'assets/ex_admin_common.js': [
"web/static/vendor/active_admin.js",
/^(web\/static\/vendor\/active_admin\/)/,
"web/static/vendor/best_in_place.js",
Expand Down Expand Up @@ -45,22 +45,23 @@ exports.config = {
// // }
// },
stylesheets: {
joinTo: { "css/admin_lte2.css": [
"web/static/vendor/themes/admin_lte2/css/ex_admin.css",
"web/static/vendor/themes/admin_lte2/bootstrap/css/bootstrap.min.css",
"web/static/vendor/themes/admin_lte2/dist/css/AdminLTE.min.css",
"web/static/vendor/themes/admin_lte2/dist/css/skins/all-skins.min.css",
"web/static/vendor/themes/admin_lte2/css/font-awesome.min.css",
"web/static/vendor/themes/admin_lte2/css/ionicons.min.css",
"web/static/vendor/themes/admin_lte2/plugins/datepicker/datepicker3.css",
"web/static/vendor/themes/admin_lte2/plugins/daterangepicker/daterangepicker-bs3.css",
"web/static/vendor/themes/admin_lte2/plugins/select2/select2.css",
],
"css/active_admin.css.css": [
"web/static/vendor/themes/active_admin/css/active_admin.css.css",
"web/static/vendor/themes/admin_lte2/plugins/select2/select2.css",
]
}
joinTo: {
"assets/admin_lte2.css": [
"web/static/vendor/themes/admin_lte2/css/ex_admin.css",
"web/static/vendor/themes/admin_lte2/bootstrap/css/bootstrap.min.css",
"web/static/vendor/themes/admin_lte2/dist/css/AdminLTE.min.css",
"web/static/vendor/themes/admin_lte2/dist/css/skins/all-skins.min.css",
"web/static/vendor/themes/admin_lte2/css/font-awesome.min.css",
"web/static/vendor/themes/admin_lte2/css/ionicons.min.css",
"web/static/vendor/themes/admin_lte2/plugins/datepicker/datepicker3.css",
"web/static/vendor/themes/admin_lte2/plugins/daterangepicker/daterangepicker-bs3.css",
"web/static/vendor/themes/admin_lte2/plugins/select2/select2.css",
],
"assets/active_admin.css.css": [
"web/static/vendor/themes/active_admin/css/active_admin.css.css",
"web/static/vendor/themes/admin_lte2/plugins/select2/select2.css",
]
}
},
// templates: {
// joinTo: 'js/active_admin.js'
Expand Down
8 changes: 3 additions & 5 deletions lib/ex_admin.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,13 @@ defmodule ExAdmin do

in `web/templates/admin/admin_layout.html.eex`
```html
<link rel='stylesheet' href='<%= static_path(@conn, "/css/admin_custom.css") %>'>
<link rel='stylesheet' href='<%= static_path(@conn, "/assets/admin_custom.css") %>'>

<!--
since this is rendered into the head area, make sure to defer the loading
of your scripts with `async` to not block rendering.
-->
<script async src='<%= static_path(@conn, "/js/app.js") %>'></script>
<script async src='<%= static_path(@conn, "/assets/app.js") %>'></script>
```

in `priv/static/css/admin_custom.css`
Expand Down Expand Up @@ -246,9 +246,7 @@ defmodule ExAdmin do

nil ->
raise ArgumentError.exception(
"Association #{assoc_name} is not found.\n#{inspect(resource_model)}.__schema__(:association, #{
inspect(assoc_name)
}) returns nil"
"Association #{assoc_name} is not found.\n#{inspect(resource_model)}.__schema__(:association, #{inspect(assoc_name)}) returns nil"
)

_ ->
Expand Down
12 changes: 5 additions & 7 deletions lib/mix/tasks/admin.install.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,13 @@ defmodule Mix.Tasks.Admin.Install do
status_msg("creating", "css files")

~w(admin_lte2.css admin_lte2.css.map active_admin.css.css active_admin.css.css.map)
|> Enum.each(&copy_vendor(base_path, "css", &1))
|> Enum.each(&copy_vendor(base_path, "assets", &1))

status_msg("creating", "js files")

(~w(jquery.min.js admin_lte2.js jquery.min.js.map admin_lte2.js.map) ++
~w(ex_admin_common.js ex_admin_common.js.map))
|> Enum.each(&copy_vendor(base_path, "js", &1))
|> Enum.each(&copy_vendor(base_path, "assets", &1))

copy_vendor_r(base_path, "fonts")
copy_vendor_r(base_path, "images")
Expand All @@ -125,13 +125,13 @@ defmodule Mix.Tasks.Admin.Install do
status_msg("creating", "css files")

~w(admin_lte2.css admin_lte2.css.map active_admin.css.css active_admin.css.css.map)
|> Enum.each(&copy_file(base_path, "css", &1))
|> Enum.each(&copy_file(base_path, "assets", &1))

status_msg("creating", "js files")

(~w(jquery.min.js admin_lte2.js jquery.min.js.map admin_lte2.js.map) ++
~w(ex_admin_common.js ex_admin_common.js.map))
|> Enum.each(&copy_file(base_path, "js", &1))
|> Enum.each(&copy_file(base_path, "assets", &1))

copy_r(base_path, "fonts")
copy_r(base_path, "images")
Expand Down Expand Up @@ -284,9 +284,7 @@ defmodule Mix.Tasks.Admin.Install do
File.mkdir_p(dest)

IO.puts(
"copying #{Path.join([get_package_path(), from_path, path, filename])} -> #{
Path.join([dest, filename])
}"
"copying #{Path.join([get_package_path(), from_path, path, filename])} -> #{Path.join([dest, filename])}"
)

File.cp(
Expand Down
6 changes: 3 additions & 3 deletions web/templates/layout/active_admin.html.eex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
<meta name="csrf-token" id="_csrf_token" content="<%= Plug.CSRFProtection.get_csrf_token %>" />
<%= favicon() %>
<title><%= site_title() %></title>
<link rel="stylesheet" media="screen" type="text/css" href="<%= static_path(@conn, "/css/active_admin.css.css") %>">
<link rel="stylesheet" media="screen" type="text/css" href="<%= static_path(@conn, "/assets/active_admin.css.css") %>">

<!-- jQuery 2.1.4 & jquery-ui 1.11.4 -->
<script src="<%= static_path(@conn, "/js/jquery.min.js") %>"></script>
<script src="<%= static_path(@conn, "/assets/jquery.min.js") %>"></script>
<%=
case Application.get_env(:ex_admin, :head_template) do
{layout, template} ->
Expand Down Expand Up @@ -55,7 +55,7 @@
</footer>
</div>
</body>
<script src='<%= static_path(@conn, "/js/ex_admin_common.js") %>'></script>
<script src='<%= static_path(@conn, "/assets/ex_admin_common.js") %>'></script>
<script type="text/javascript">
$(function() {
$('#theme-selector').change(function(e) {
Expand Down
8 changes: 4 additions & 4 deletions web/templates/layout/admin_lte2.html.eex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
<meta name="csrf-token" id="_csrf_token" content="<%= Plug.CSRFProtection.get_csrf_token %>" />
<%= favicon() %>
<title><%= site_title() %></title>
<link rel="stylesheet" href="<%= static_path(@conn, "/css/admin_lte2.css") %>">
<link rel="stylesheet" href="<%= static_path(@conn, "/assets/admin_lte2.css") %>">
<!-- Ionicons -->
<%# <link rel="stylesheet" href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css"> %>
<!-- Theme style -->

<!-- jQuery 2.1.4 & jquery-ui 1.11.4 -->
<script src="<%= static_path(@conn, "/js/jquery.min.js") %>"></script>
<script src="<%= static_path(@conn, "/assets/jquery.min.js") %>"></script>

<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
Expand Down Expand Up @@ -69,8 +69,8 @@
$.widget.bridge('uibutton', $.ui.button);
</script>
<!-- Bootstrap 3.3.5 -->
<script src='<%= static_path(@conn, "/js/ex_admin_common.js") %>'></script>
<script src='<%= static_path(@conn, "/js/admin_lte2.js") %>'></script>
<script src='<%= static_path(@conn, "/assets/ex_admin_common.js") %>'></script>
<script src='<%= static_path(@conn, "/assets/admin_lte2.js") %>'></script>
</body>
<script type="text/javascript">
$(function() {
Expand Down