Merge pull request #1186 from rain0r/issue-1184
Use self-hosted css and js
This commit is contained in:
Lorenz Hübschle-Schneider
GitHub
commit
6508993fea
3
.gitignore
vendored
3
.gitignore
vendored
@ -7,3 +7,6 @@ Glowing\ Bear-*/
|
||||
|
||||
# local build products
|
||||
build/
|
||||
|
||||
# IntelliJ / WebStorm
|
||||
.idea/
|
||||
|
||||
1499
package-lock.json
generated
1499
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -11,7 +11,7 @@
|
||||
"@babel/preset-env": "^7.12.7",
|
||||
"angular-mocks": "^1.8.2",
|
||||
"babel-loader": "^8.2.2",
|
||||
"copy-webpack-plugin": "^6.3.2",
|
||||
"copy-webpack-plugin": "^6.4.1",
|
||||
"electron-packager": "^15.0.0",
|
||||
"html-webpack-plugin": "^4.5.0",
|
||||
"jasmine-core": "^3.6.0",
|
||||
@ -48,6 +48,8 @@
|
||||
"angular-route": "^1.8.2",
|
||||
"angular-sanitize": "^1.8.2",
|
||||
"angular-touch": "^1.8.2",
|
||||
"bootstrap": "^3.4.1",
|
||||
"emojione": "^4.5.0",
|
||||
"favico.js": "^0.3.10",
|
||||
"jquery-linkify": "^2.2.1",
|
||||
"underscore": "^1.10.2",
|
||||
|
||||
@ -263,7 +263,7 @@ input[type=text], input[type=password], #sendMessage {
|
||||
#sidebar.ng-hide {
|
||||
width: 0;
|
||||
}
|
||||
|
||||
|
||||
#sidebar[data-state=hidden] {
|
||||
transform: translate(-200px,0);
|
||||
-webkit-transform: translate(-200px,0);
|
||||
|
||||
@ -13,15 +13,16 @@
|
||||
<!-- https://w3c.github.io/manifest/ && https://developer.mozilla.org/en-US/docs/Web/Manifest -->
|
||||
<link rel="manifest" href="webapp.manifest.json">
|
||||
<title ng-bind-template="{{ notificationStatus }}Glowing Bear {{ pageTitle}}"></title>
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.4.1/css/bootstrap.min.css" integrity="sha512-Dop/vW3iOtayerlYAqCgkVr2aTr2ErwwTYOvRFUpzl2VhCMJyjQF0Q9TjUXIo6JhuM/3i0vVEt2e/7QQmnHQqw==" crossorigin="anonymous" />
|
||||
<link rel="shortcut icon" sizes="128x128" href="assets/img/glowing_bear_128x128.png">
|
||||
<link rel="apple-touch-icon" sizes="128x128" href="assets/img/glowing_bear_128x128.png">
|
||||
<link rel="shortcut icon" type="image/png" href="assets/img/favicon.png" >
|
||||
<link href="css/bootstrap.min.css" rel="stylesheet"/>
|
||||
<link href="css/glowingbear.css" rel="stylesheet" media="screen">
|
||||
<link href="css/themes/dark.css" rel="stylesheet" media="screen" id="themeCSS" />
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/emojione/2.2.7/lib/js/emojione.min.js" integrity="sha256-9cBkVeU53NiJ9/BdcJta3HbERAmf5X9DE2WvL8V+gDs=" crossorigin="anonymous"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery-linkify/2.1.9/linkify.min.js" integrity="sha512-kxj7VjlzsQgiku2vbRcZI0FJ0dXmPsiRLugiRxJrCROusKHaFfX/hGDD1/L/R0Y+xI8zlA2B5nm6USapz7nQbg==" crossorigin="anonymous"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery-linkify/2.1.9/linkify-string.min.js" integrity="sha512-CMBjJdVIcw7zafkE+uedZCnw6r4ABU1Fev5xA7db0D097/NzhO6Ajo2kdZFOQ+y0kg9sE/t44bPAwuuNhUVIcQ==" crossorigin="anonymous"></script>
|
||||
|
||||
<script src="emojione.min.js"></script>
|
||||
<script src="linkify.min.js"></script>
|
||||
<script src="linkify-string.min.js"></script>
|
||||
</head>
|
||||
<body ng-controller="WeechatCtrl" ng-keydown="handleKeyPress($event)" ng-keyup="handleKeyRelease($event)" ng-keypress="handleKeyPress($event)" ng-class="{'no-overflow': connected}" ng-init="init()" lang="en-US">
|
||||
<audio id="audioNotificationInitializer"><source src="data:audio/mp3;base64,/+MYxAAJs2H8AABLSZv4Af/5yAsCIElB/v/+Y///U+QiEaSchGO+IMQjZCgOLw4KVoIEkf/r69Kbfc7/WbLRPsyvp7/p/p///+MYxBQK+1oUAACNMUWSyLcrqpERhDqKCBWcgbTmuIq8ISkQSv+yf/tbZf9krRTptRUv/XT////66NJQFZTpOd3KUEtM+a+l/+MYxCMKM2YcAACNMB+Jqe+HLv+75fSreYSWGtqHJghl6y///89fcz/p8qIRKeFWYKEGo5mLFmCGBjV0FEJn/9f85V87iy98/+MYxDULA1YYAABHLbI52f2/4v////n7U/swVr0SzhrRIueMLLog0qIKcOwu/5v/lLR/r9DPN/R+vmf//////V8tAxlMY1sy/+MYxEQKM2IYAABHLZjRjUlgUSUAhTUBFHVMQU1FMy4xMDBVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV/+MYxFYJ22oAAACHMFVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV"></audio>
|
||||
@ -45,7 +46,7 @@
|
||||
<strong>Secure connection error</strong> Unable to connect to unencrypted relay when you are connecting to Glowing Bear over HTTPS. Please use an encrypted relay or load the page without using HTTPS.
|
||||
</div>
|
||||
<div class="alert alert-danger" ng-show="oldWeechatError" ng-cloak>
|
||||
<strong>Weechat version error</strong> Weechat connected but did not respond to a handshake. This could mean weechat < version 2.9. Verify your weechat is 2.8 or older and check "Compatibility with Weechat 2.8 and older" or consider updating weechat.
|
||||
<strong>Weechat version error</strong> Weechat connected but did not respond to a handshake. This could mean weechat < version 2.9. Verify your weechat is 2.8 or older and check "Compatibility with Weechat 2.8 and older" or consider updating weechat.
|
||||
</div>
|
||||
<div class="alert alert-danger" ng-show="hashAlgorithmDisagree" ng-cloak>
|
||||
<strong>Hash algorithm error</strong> Weechat and glowing bear did not agree on a hashing algorithm, please do /set relay.network.password_hash_algo "pbkdf2+sha512" in weechat.
|
||||
@ -123,7 +124,7 @@
|
||||
<div class="checkbox indent" ng-show="settings.compatibilityWeechat28">
|
||||
<label class="control-label" for="useTotp">
|
||||
<input type="checkbox" id="useTotp" ng-model="settings.useTotp">
|
||||
Use Time-based One-Time Password (automatic for Weechat >= 2.9)<a href="https://blog.weechat.org/post/2019/01/14/Support-of-TOTP" target="_blank"><i class="glyphicon glyphicon-info-sign"></i></a>
|
||||
Use Time-based One-Time Password (automatic for Weechat >= 2.9)<a href="https://blog.weechat.org/post/2019/01/14/Support-of-TOTP" target="_blank"><i class="glyphicon glyphicon-info-sign"></i></a>
|
||||
</label>
|
||||
</div>
|
||||
<div class="checkbox">
|
||||
|
||||
@ -24,4 +24,4 @@ import "./js/whenscrolled-directive.js";
|
||||
import "./js/inputbar.js";
|
||||
import "./js/plugin-directive.js";
|
||||
|
||||
import "./js/imgur.js";
|
||||
import "./js/imgur.js";
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
|
||||
"use strict";
|
||||
|
||||
const path = require("path");
|
||||
@ -6,6 +5,7 @@ const path = require("path");
|
||||
const HtmlWebpackPlugin = require('html-webpack-plugin');
|
||||
const CopyWebpackPlugin = require("copy-webpack-plugin");
|
||||
|
||||
require("webpack");
|
||||
module.exports = {
|
||||
context: path.resolve(__dirname, 'src'),
|
||||
entry: './main.js',
|
||||
@ -33,9 +33,20 @@ module.exports = {
|
||||
"../package.json",
|
||||
"manifest.json",
|
||||
"manifest.webapp",
|
||||
"webapp.manifest.json"
|
||||
"webapp.manifest.json",
|
||||
{
|
||||
from: "../node_modules/bootstrap/dist/css/bootstrap.min.css",
|
||||
to: "css/"
|
||||
},
|
||||
{
|
||||
from: "../node_modules/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2",
|
||||
to: "css/"
|
||||
},
|
||||
{ from: "../node_modules/emojione/lib/js/emojione.min.js" },
|
||||
{ from: "../node_modules/linkifyjs/dist/linkify.min.js" },
|
||||
{ from: "../node_modules/linkifyjs/dist/linkify-string.min.js" },
|
||||
]
|
||||
})
|
||||
}),
|
||||
],
|
||||
module: {
|
||||
rules: [
|
||||
@ -47,7 +58,7 @@ module.exports = {
|
||||
loader: 'babel-loader'
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
]
|
||||
}
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user