Skip to content

Commit

Permalink
[Possible Fix] #1
Browse files Browse the repository at this point in the history
  • Loading branch information
@NiNiyas
NiNiyas committed Jul 21, 2022
1 parent 5ed2859 commit 26e4bab
Show file tree
Hide file tree
Showing 12 changed files with 221 additions and 1,073 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## [1.0.1] - 2022-07-21

## UI
Fixed default font issue (#1).
Toolbar fonts will now be changed too.
Reduced the default font size from 15px to 13px.

## [1.0.0] - 2022-07-06
First of all, I am not familiar with GO or JavaScript. I learned them while I was trying to make this better. \
So you may find some codes here and there that were not meant to be and I apologize for that.
Expand Down
46 changes: 15 additions & 31 deletions frontend/assets_vfsdata.go
View file

Large diffs are not rendered by default.

102 changes: 51 additions & 51 deletions frontend/js/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@ Vue.component('vue-loading', window.VueLoading);
var apiURL = endsWith(window.location.href, '/') ? window.location.href + "ws" : window.location.href.replace(/[^\/]+$/, 'ws');

if (localStorage.getItem("userFontColor") === null) {
document.documentElement.style.setProperty("--fontColor", "white");
} else {
document.documentElement.style.setProperty("--fontColor", localStorage.getItem('userFontColor'));
document.documentElement.style.setProperty("--fontColor", "white");
} else {
document.documentElement.style.setProperty("--fontColor", localStorage.getItem('userFontColor'));
};

if (localStorage.getItem("userBackgroundColor") === null) {
document.documentElement.style.setProperty("--mainColor", "#1d1f21");
} else {
document.documentElement.style.setProperty("--mainColor", localStorage.getItem("userBackgroundColor"));
document.documentElement.style.setProperty("--mainColor", "#1d1f21");
} else {
document.documentElement.style.setProperty("--mainColor", localStorage.getItem("userBackgroundColor"));
};

if (localStorage.getItem("userFontSize") === null) {
document.documentElement.style.setProperty("--fontSize", "15px");
localStorage.setItem("userFontSize", "15px");
} else {
document.documentElement.style.setProperty("--fontSize", localStorage.getItem("userFontSize"));
document.documentElement.style.setProperty("--fontSize", "13px");
localStorage.setItem("userFontSize", "13px");
} else {
document.documentElement.style.setProperty("--fontSize", localStorage.getItem("userFontSize"));
};

if (localStorage.getItem("userFont") === null) {
document.documentElement.style.setProperty("--font", "Consolas");
} else {
document.documentElement.style.setProperty("--font", localStorage.getItem("userFont"));
document.documentElement.style.setProperty("--font", "Default");
} else {
document.documentElement.style.setProperty("--font", localStorage.getItem("userFont"));
};

//if (localStorage.getItem("historyLines") === null) {
Expand All @@ -50,8 +50,8 @@ var app = new Vue({
'script': null,
'font_color': localStorage.getItem("userFontColor") || "white",
'theme': localStorage.getItem('userBackgroundColor') || "#1d1f21",
'font_size': localStorage.getItem('userFontSize').replace('px','') || "15px",
'font': localStorage.getItem('userFont') || "Consolas",
'font_size': localStorage.getItem('userFontSize').replace('px', '') || "13px",
'font': localStorage.getItem('userFont') || "Default",

'linesOfHistory': linesOfHistory,
'linesToTail': linesToTail,
Expand All @@ -65,54 +65,54 @@ var app = new Vue({
'socket': null,
'isConnected': false
},
created: function () {
created: function() {
this.backendConnect();

this.command = this.allowCommandNames[0];
},
computed: {
scriptInputEnabled: function () {
scriptInputEnabled: function() {
return this.commandScripts[this.command] !== "";
},
downloadLink: function () {
downloadLink: function() {
if (this.file) {
return relativeRoot + 'files/?path=' + this.file.path;
}
return '#';
}
},
methods: {
clearLogview: function () {
clearLogview: function() {
this.$refs.logview.clearLines();
},
backendConnect: function (){
backendConnect: function() {
console.log('Connecting to: ' + apiURL);
this.showLoadingOverlay = true;
this.socket = new SockJS(apiURL);
this.socket.onopen = this.onBackendOpen;
this.socket.onclose = this.onBackendClose;
this.socket.onmessage = this.onBackendMessage;
},
onBackendOpen: function () {
onBackendOpen: function() {
console.log('Connected to backend.');
this.isConnected = true;
this.refreshFiles();
},
onBackendClose: function () {
onBackendClose: function() {
console.log('Disconnected from backend.');
this.isConnected = false;
backendConnect = this.backendConnect;
window.setTimeout(function () {
window.setTimeout(function() {
backendConnect();
}, 1000);
},
onBackendMessage: function (message) {
onBackendMessage: function(message) {
var data = JSON.parse(message.data);

if (data.constructor === Object) {
// Reshape into something that vue-multiselect :group-select can use.
var fileList = [];
Object.keys(data).forEach(function (key) {
Object.keys(data).forEach(function(key) {
var group = ("__default__" === key) ? "Ungrouped Files" : key;
fileList.push({
"group": group,
Expand All @@ -124,36 +124,36 @@ var app = new Vue({

// Set file input to first entry in list.
if (!this.file) {
var query = parseQueryString(window.location.search);
if (Array.isArray(query.path)){
var k = query.path[0];
var files = fileList.map(function (e) {
return e.files;
}).flat()

files = files.filter(function (e) {
return e.alias==k || e.path==k;
})
if (files.length > 0) {
this.file = files[0];
} else {
this.file = fileList[0].files[0];
}
} else {
this.file = fileList[0].files[0];
}
var query = parseQueryString(window.location.search);
if (Array.isArray(query.path)) {
var k = query.path[0];
var files = fileList.map(function(e) {
return e.files;
}).flat()

files = files.filter(function(e) {
return e.alias == k || e.path == k;
})
if (files.length > 0) {
this.file = files[0];
} else {
this.file = fileList[0].files[0];
}
} else {
this.file = fileList[0].files[0];
}
}
} else {
var stream = data[0];
var line = data[1];
this.$refs.logview.write(stream, line);
}
},
refreshFiles: function () {
refreshFiles: function() {
console.log("Updating file list..");
this.socket.send("list");
},
notifyBackend: function () {
notifyBackend: function() {
var msg = {
command: this.command,
script: this.script,
Expand All @@ -164,7 +164,7 @@ var app = new Vue({
this.clearLogview();
this.socket.send(JSON.stringify(msg));
},
clearInput: function () {
clearInput: function() {
this.script = "";
this.notifyBackend();
}
Expand All @@ -180,22 +180,22 @@ var app = new Vue({
// document.documentElement.style.setProperty("--historyLines", val);
// localStorage.setItem("userhistoryLines", val);
//},
font_color: function (val) {
font_color: function(val) {
this.$refs.logview.changeFontColor(val);
document.documentElement.style.setProperty("--fontColor", val);
localStorage.setItem("userFontColor", val);
},
font: function (val) {
font: function(val) {
this.$refs.logview.changeFont(val);
document.documentElement.style.setProperty("--font", val);
localStorage.setItem("userFont", val);
},
font_size: function (val) {
font_size: function(val) {
this.$refs.logview.changeFontSize(val);
document.documentElement.style.setProperty("--fontSize", val + "px");
localStorage.setItem("userFontSize", val + "px");
},
theme: function (val) {
theme: function(val) {
document.documentElement.style.setProperty("--mainColor", val);
localStorage.setItem("userBackgroundColor", val);
},
Expand All @@ -208,7 +208,7 @@ var app = new Vue({
file: function(val) {
if (val && this.isConnected) {
this.notifyBackend();
this.$nextTick(function () {
this.$nextTick(function() {
this.$refs.script_input.select();
this.$refs.script_input.focus();
})
Expand Down
Loading

0 comments on commit 26e4bab

Please sign in to comment.