shibao/cannery
1
2
Fork 1
Code Issues 14 Pull Requests Projects 1 Releases 40 Wiki Activity

update to fa 6.1.1
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
shibao
2022-05-06 23:35:50 -04:00
parent f49fe21da5
commit d086c4c813
5 changed files with 1600 additions and 1859 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3403
assets/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

41
assets/package.json
View File

@@ -9,36 +9,33 @@
"test": "standard" "test": "standard"
}, },
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-free": "^5.15.4", "@fortawesome/fontawesome-free": "^6.1.1",
"alpinejs": "^3.9.0", "alpinejs": "^3.10.2",
"phoenix": "file:../deps/phoenix", "phoenix": "file:../deps/phoenix",
"phoenix_html": "file:../deps/phoenix_html", "phoenix_html": "file:../deps/phoenix_html",
"phoenix_live_view": "file:../deps/phoenix_live_view", "phoenix_live_view": "file:../deps/phoenix_live_view",
"topbar": "^0.1.4" "topbar": "^1.0.1"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.15.0", "@babel/core": "^7.17.10",
"@babel/preset-env": "^7.15.0", "@babel/preset-env": "^7.17.10",
"autoprefixer": "^10.4.7", "autoprefixer": "^10.4.7",
"babel-loader": "^8.2.2", "babel-loader": "^8.2.5",
"copy-webpack-plugin": "^9.0.0", "copy-webpack-plugin": "^10.2.4",
"css-loader": "^5.2.7", "css-loader": "^6.7.1",
"css-minimizer-webpack-plugin": "^3.0.1", "css-minimizer-webpack-plugin": "^3.4.1",
"file-loader": "^6.2.0", "file-loader": "^6.2.0",
"hard-source-webpack-plugin": "^0.13.1", "mini-css-extract-plugin": "^2.6.0",
"mini-css-extract-plugin": "^1.6.0",
"node-sass": "^7.0.1",
"postcss": "^8.4.13", "postcss": "^8.4.13",
"postcss-import": "^14.0.2", "postcss-import": "^14.1.0",
"postcss-loader": "^6.1.1", "postcss-loader": "^6.2.1",
"postcss-preset-env": "^7.3.1", "postcss-preset-env": "^7.5.0",
"sass-loader": "^12.1.0", "sass-loader": "^12.6.0",
"standard": "^16.0.4", "standard": "^17.0.0",
"style-loader": "^3.2.1",
"tailwindcss": "^3.0.24", "tailwindcss": "^3.0.24",
"terser-webpack-plugin": "^5.1.3", "terser-webpack-plugin": "^5.3.1",
"webpack": "^5.67.0", "webpack": "^5.72.0",
"webpack-cli": "^4.8.0", "webpack-cli": "^4.9.2",
"webpack-dev-server": "^4.7.4" "webpack-dev-server": "^4.9.0"
} }
} }

11
assets/webpack.config.js
View File

@@ -44,19 +44,14 @@ module.exports = (env, options) => {
}, },
{ {
test: /\.(woff(2)?|ttf|eot|svg|otf)(\?v=[0-9]\.[0-9]\.[0-9])?$/, test: /\.(woff(2)?|ttf|eot|svg|otf)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
loader: 'file-loader', type: 'asset/resource',
options: { generator: { filename: 'fonts/[name][ext]' }
name: '[name].[ext]?[hash]',
outputPath: '../fonts'
}
} }
] ]
}, },
plugins: [ plugins: [
new MiniCssExtractPlugin({ filename: '../css/app.css' }), new MiniCssExtractPlugin({ filename: '../css/app.css' }),
new CopyWebpackPlugin({ new CopyWebpackPlugin({ patterns: [{ from: 'static/', to: '../' }] })
patterns: [{ from: 'static/', to: '../' }]
})
] ]
} }
} }

2
lib/cannery_web/components/topbar.ex
View File

@@ -89,7 +89,7 @@ defmodule CanneryWeb.Components.Topbar do
<li class="mx-2 my-1"> <li class="mx-2 my-1">
<%= live_redirect to: Routes.live_dashboard_path(Endpoint, :home), <%= live_redirect to: Routes.live_dashboard_path(Endpoint, :home),
class: "text-primary-600 text-white hover:underline" do %> class: "text-primary-600 text-white hover:underline" do %>
<i class="fas fa-tachometer-alt"></i> <i class="fas fa-gauge"></i>
<% end %> <% end %>
</li> </li>
<% end %> <% end %>

2
lib/cannery_web/templates/layout/live.html.heex
View File

@@ -37,7 +37,7 @@
<%= gettext("Loading...") %> <%= gettext("Loading...") %>
</h1> </h1>
<i class="fas fa-3x fa-spin fa-cog"></i> <i class="fas fa-3x fa-spin fa-gear"></i>
</div> </div>
<div <div