adam/shift73k
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

switched to topbar from nprogress, to track phoenix 1.5.8

Browse source
This commit is contained in:
Adam Piontek 2021-02-24 11:46:13 -05:00
parent 9194fdc36c
commit 7c5583fd61
4 changed files with 11966 additions and 1251 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
assets/css/app.scss
View file

@ -1,6 +1,5 @@
/* This file is for your main application css. */ /* This file is for your main application css. */
@import "./phoenix.css"; @import "./phoenix.css";
@import "../node_modules/nprogress/nprogress.css";
/* LiveView specific classes for your customizations */ /* LiveView specific classes for your customizations */
.phx-no-feedback.invalid-feedback, .phx-no-feedback.invalid-feedback,
@ -13,15 +12,15 @@
transition: opacity 1s ease-out; transition: opacity 1s ease-out;
} }
.phx-disconnected{ .phx-disconnected {
cursor: wait; cursor: wait;
} }
.phx-disconnected *{ .phx-disconnected * {
pointer-events: none; pointer-events: none;
} }
.phx-modal { .phx-modal {
opacity: 1!important; opacity: 1 !important;
position: fixed; position: fixed;
z-index: 1; z-index: 1;
left: 0; left: 0;
@ -29,8 +28,8 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: auto; overflow: auto;
background-color: rgb(0,0,0); background-color: rgb(0, 0, 0);
background-color: rgba(0,0,0,0.4); background-color: rgba(0, 0, 0, 0.4);
} }
.phx-modal-content { .phx-modal-content {
@ -55,7 +54,6 @@
cursor: pointer; cursor: pointer;
} }
/* Alerts and form errors */ /* Alerts and form errors */
.alert { .alert {
padding: 15px; padding: 15px;

28
assets/js/app.js
View file

@ -1,7 +1,7 @@
// We need to import the CSS so that webpack will load it. // We need to import the CSS so that webpack will load it.
// The MiniCssExtractPlugin is used to separate it out into // The MiniCssExtractPlugin is used to separate it out into
// its own CSS file. // its own CSS file.
import "../css/app.scss" import "../css/app.scss";
// webpack automatically bundles all modules in your // webpack automatically bundles all modules in your
// entry points. Those entry points can be configured // entry points. Those entry points can be configured
@ -12,24 +12,28 @@ import "../css/app.scss"
// import {Socket} from "phoenix" // import {Socket} from "phoenix"
// import socket from "./socket" // import socket from "./socket"
// //
import "phoenix_html" import "phoenix_html";
import {Socket} from "phoenix" import { Socket } from "phoenix";
import NProgress from "nprogress" import topbar from "topbar";
import {LiveSocket} from "phoenix_live_view" import { LiveSocket } from "phoenix_live_view";
let csrfToken = document.querySelector("meta[name='csrf-token']").getAttribute("content") let csrfToken = document
let liveSocket = new LiveSocket("/live", Socket, {params: {_csrf_token: csrfToken}}) .querySelector("meta[name='csrf-token']")
.getAttribute("content");
let liveSocket = new LiveSocket("/live", Socket, {
params: { _csrf_token: csrfToken },
});
// Show progress bar on live navigation and form submits // Show progress bar on live navigation and form submits
window.addEventListener("phx:page-loading-start", info => NProgress.start()) topbar.config({ barColors: { 0: "#29d" }, shadowColor: "rgba(0, 0, 0, .3)" });
window.addEventListener("phx:page-loading-stop", info => NProgress.done()) window.addEventListener("phx:page-loading-start", (info) => topbar.show());
window.addEventListener("phx:page-loading-stop", (info) => topbar.hide());
// connect if there are any LiveViews on the page // connect if there are any LiveViews on the page
liveSocket.connect() liveSocket.connect();
// expose liveSocket on window for web console debug logs and latency simulation: // expose liveSocket on window for web console debug logs and latency simulation:
// >> liveSocket.enableDebug() // >> liveSocket.enableDebug()
// >> liveSocket.enableLatencySim(1000) // enabled for duration of browser session // >> liveSocket.enableLatencySim(1000) // enabled for duration of browser session
// >> liveSocket.disableLatencySim() // >> liveSocket.disableLatencySim()
window.liveSocket = liveSocket window.liveSocket = liveSocket;

13171
assets/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

6
assets/package.json
View file

@ -10,7 +10,7 @@
"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",
"nprogress": "^0.2.0" "topbar": "^1.x"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.0.0", "@babel/core": "^7.0.0",
@ -18,11 +18,11 @@
"babel-loader": "^8.0.0", "babel-loader": "^8.0.0",
"copy-webpack-plugin": "^5.1.1", "copy-webpack-plugin": "^5.1.1",
"css-loader": "^3.4.2", "css-loader": "^3.4.2",
"sass-loader": "^8.0.2",
"node-sass": "^4.13.1",
"hard-source-webpack-plugin": "^0.13.1", "hard-source-webpack-plugin": "^0.13.1",
"mini-css-extract-plugin": "^0.9.0", "mini-css-extract-plugin": "^0.9.0",
"node-sass": "^4.13.1",
"optimize-css-assets-webpack-plugin": "^5.0.1", "optimize-css-assets-webpack-plugin": "^5.0.1",
"sass-loader": "^8.0.2",
"terser-webpack-plugin": "^2.3.2", "terser-webpack-plugin": "^2.3.2",
"webpack": "4.41.5", "webpack": "4.41.5",
"webpack-cli": "^3.3.2" "webpack-cli": "^3.3.2"