Implemented settings frontend log level via props
This commit is contained in:
parent
88105559f7
commit
59c14d681d
@ -1,6 +1,6 @@
|
||||
import { Builder } from "builder-pattern";
|
||||
import * as Handlebars from "handlebars";
|
||||
import * as log from 'loglevel';
|
||||
import * as log from "loglevel";
|
||||
import { ChatController } from "./controller/ChatController";
|
||||
import { UserController } from "./controller/UserController";
|
||||
import { ChatModel } from "./model/ChatModel";
|
||||
@ -20,21 +20,22 @@ import { UserViewDeps } from "./view/UserViewDeps";
|
||||
import { ActiveUserViewModel } from "./viewmodel/ActiveUserViewModel";
|
||||
import moment = require("moment");
|
||||
|
||||
log.setLevel("TRACE");
|
||||
// log.setLevel("TRACE");
|
||||
|
||||
const usersListElement = document.getElementById('contacts-box');
|
||||
const userSearchButton = document.getElementById('user-search');
|
||||
const userSearchInputElement = document.getElementById('user-search-term') as HTMLInputElement;
|
||||
const userSearchCancelButton = document.getElementById('user-search-cancel');
|
||||
const chatArea = document.getElementById('chat-area-new');
|
||||
const usersListElement = document.getElementById("contacts-box");
|
||||
const userSearchButton = document.getElementById("user-search");
|
||||
const userSearchInputElement = document.getElementById(
|
||||
"user-search-term"
|
||||
) as HTMLInputElement;
|
||||
const userSearchCancelButton = document.getElementById("user-search-cancel");
|
||||
const chatArea = document.getElementById("chat-area-new");
|
||||
|
||||
|
||||
const activeUserSearchService: SearchService<ActiveUserViewModel> = new FuseSearchService(["userName"]);
|
||||
const activeUserSearchService: SearchService<ActiveUserViewModel> = new FuseSearchService(
|
||||
["userName"]
|
||||
);
|
||||
const ns: NotificationService = new AlertifyNotificationService();
|
||||
const encryptionService = EncryptionServiceFactory.getEncryptionService();
|
||||
|
||||
|
||||
|
||||
const chatModelHelper = new ChatModelHelper(encryptionService, ns);
|
||||
const chatModel = new ChatModel(chatModelHelper);
|
||||
const userModel = new UserModel(ns);
|
||||
@ -42,20 +43,19 @@ const cvDeps: ChatViewDeps = {
|
||||
chatModel: chatModel,
|
||||
// @ts-ignore: Argument of type 'HTMLElement | null' is not assignable to parameter of type 'HTMLElement'. Type 'null' is not assignable to type 'HTMLElement'.
|
||||
messageContainer: chatArea,
|
||||
messageSendTemplate: TemplateFactory.getTemplate('msg_container_send_template'),
|
||||
messageReceiveTemplate: TemplateFactory.getTemplate('msg_container_template'),
|
||||
markdownService: new MarkDownItMarkDownService,
|
||||
messageSendTemplate: TemplateFactory.getTemplate(
|
||||
"msg_container_send_template"
|
||||
),
|
||||
messageReceiveTemplate: TemplateFactory.getTemplate("msg_container_template"),
|
||||
markdownService: new MarkDownItMarkDownService(),
|
||||
encryptionService: encryptionService,
|
||||
notificationService: ns,
|
||||
userModel: userModel
|
||||
}
|
||||
userModel: userModel,
|
||||
};
|
||||
const chatView = new ChatView(cvDeps);
|
||||
chatModel.attach(chatView);
|
||||
const chatController = new ChatController(chatModel, chatView);
|
||||
|
||||
|
||||
|
||||
|
||||
const uvDeps: UserViewDeps = {
|
||||
model: userModel,
|
||||
chatModel: chatModel,
|
||||
@ -67,42 +67,47 @@ const uvDeps: UserViewDeps = {
|
||||
// @ts-ignore: Argument of type 'HTMLElement | null' is not assignable to parameter of type 'HTMLElement'. Type 'null' is not assignable to type 'HTMLElement'.
|
||||
userSearchCancelButton: userSearchCancelButton,
|
||||
searchService: activeUserSearchService,
|
||||
userContactOnlineTemplate: TemplateFactory.getTemplate('user-contact-online-template'),
|
||||
userContactOfflineTemplate: TemplateFactory.getTemplate('user-contact-offline-template'),
|
||||
notificationService: ns
|
||||
}
|
||||
userContactOnlineTemplate: TemplateFactory.getTemplate(
|
||||
"user-contact-online-template"
|
||||
),
|
||||
userContactOfflineTemplate: TemplateFactory.getTemplate(
|
||||
"user-contact-offline-template"
|
||||
),
|
||||
notificationService: ns,
|
||||
};
|
||||
const userView = new UserView(uvDeps);
|
||||
userModel.attach(userView);
|
||||
const userController = new UserController(userModel, userView);
|
||||
userController.getActiveUsers();
|
||||
|
||||
// @ts-ignore
|
||||
Handlebars.registerHelper('moment', require('helper-moment'));
|
||||
Handlebars.registerHelper('avatar', function () {
|
||||
Handlebars.registerHelper("moment", require("helper-moment"));
|
||||
Handlebars.registerHelper("avatar", function () {
|
||||
return '<div class="img_cont_msg"> <img src="https://static.turbosquid.com/Preview/001292/481/WV/_D.jpg" class="rounded-circle user_img_msg"> </div>';
|
||||
});
|
||||
Handlebars.registerHelper('fromNow', function (date: string) {
|
||||
if (date == null)
|
||||
return ": Never"
|
||||
Handlebars.registerHelper("fromNow", function (date: string) {
|
||||
if (date == null) return ": Never";
|
||||
return moment(date).fromNow();
|
||||
})
|
||||
Handlebars.registerHelper('msgDateFormat', function (date: string) {
|
||||
return moment(date).calendar(moment.now(), { lastWeek: "DD/MM/YY hh:mm A", sameElse: "DD/MM/YY hh:mm A" })
|
||||
})
|
||||
});
|
||||
Handlebars.registerHelper("msgDateFormat", function (date: string) {
|
||||
return moment(date).calendar(moment.now(), {
|
||||
lastWeek: "DD/MM/YY hh:mm A",
|
||||
sameElse: "DD/MM/YY hh:mm A",
|
||||
});
|
||||
});
|
||||
|
||||
Handlebars.registerHelper('lockIcon', function (unlocked: boolean) {
|
||||
Handlebars.registerHelper("lockIcon", function (unlocked: boolean) {
|
||||
switch (unlocked) {
|
||||
case true: { return '<i class="fas fa-lock-open user-passphrase"></i>'; }
|
||||
default: { return '<i class="fas fa-lock user-passphrase"></i>'; }
|
||||
case true: {
|
||||
return '<i class="fas fa-lock-open user-passphrase"></i>';
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
|
||||
default: {
|
||||
return '<i class="fas fa-lock user-passphrase"></i>';
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
ns.success("Welcome");
|
||||
// ns.errorWithDelay("Hmm very long error notif", 10);
|
||||
|
||||
|
||||
const test = Builder<UserViewDeps>().build();
|
||||
|
||||
|
||||
@ -6,3 +6,4 @@ logging.level.org.hibernate.type.descriptor.sql.BasicBinder=INFO
|
||||
spring.http.log-request-details=false
|
||||
logging.level.org.springframework.cache = INFO
|
||||
chat-bundle=bundle.min.js
|
||||
chatto.frontend.log-level=INFO
|
||||
@ -20,6 +20,7 @@ logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
|
||||
spring.jackson.serialization.write-dates-as-timestamps=false
|
||||
spring.cache.jcache.config=classpath:ehcache.xml
|
||||
logging.level.org.springframework.cache=DEBUG
|
||||
chatto.token.timeout-duration=1
|
||||
chatto.token.timeout-duration=30
|
||||
chat-bundle=bundle.js
|
||||
# spring.devtools.add-properties=false
|
||||
chatto.frontend.log-level=TRACE
|
||||
@ -40,10 +40,14 @@
|
||||
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/loglevel/1.6.4/loglevel.min.js" integrity="sha256-ACTlnmNCkOooSKkPCKYbiex8WLE82aeiN+Z9ElZag5Q=" crossorigin="anonymous"></script>
|
||||
|
||||
|
||||
<link th:href="@{/css/master.css}" href="../../resources/static/css/master.css" rel="stylesheet">
|
||||
<link th:href="@{/css/colors.css}" href="../../resources/static/css/colors.css" rel="stylesheet">
|
||||
|
||||
<script th:inline="javascript" defer>
|
||||
let loglevel = /*[[${@environment.getProperty('chatto.frontend.log-level')}]]*/ "DEBUG";
|
||||
window.log.setLevel(loglevel)
|
||||
</script>
|
||||
|
||||
<meta charset="UTF-8">
|
||||
<title th:include=":: #pageTitle">Layout Generic Title</title>
|
||||
</th:block>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user