mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-12-23 13:33:18 +00:00
Merge pull request #1443 from pixelfed/frontend-ui-refactor
Add Admin Configuration Editor
This commit is contained in:
commit
5896a5103c
25 changed files with 22327 additions and 65 deletions
|
@ -25,9 +25,47 @@ trait AdminSettingsController
|
||||||
|
|
||||||
public function settingsConfig(Request $request)
|
public function settingsConfig(Request $request)
|
||||||
{
|
{
|
||||||
$editor = [];
|
$editor = config('pixelfed.admin.env_editor');
|
||||||
$config = file_get_contents(base_path('.env'));
|
$config = !$editor ? false : file_get_contents(base_path('.env'));
|
||||||
return view('admin.settings.config', compact('editor', 'config'));
|
$backup = !$editor ? false : (is_file(base_path('.env.backup')) ? file_get_contents(base_path('.env.backup')) : false);
|
||||||
|
return view('admin.settings.config', compact('editor', 'config', 'backup'));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function settingsConfigStore(Request $request)
|
||||||
|
{
|
||||||
|
if(config('pixelfed.admin.env_editor') !== true) {
|
||||||
|
abort(400);
|
||||||
|
}
|
||||||
|
$res = $request->input('res');
|
||||||
|
|
||||||
|
$old = file_get_contents(app()->environmentFilePath());
|
||||||
|
if(empty($old) || $old != $res) {
|
||||||
|
$oldFile = fopen(app()->environmentFilePath().'.backup', 'w');
|
||||||
|
fwrite($oldFile, $old);
|
||||||
|
fclose($oldFile);
|
||||||
|
}
|
||||||
|
|
||||||
|
$file = fopen(app()->environmentFilePath(), 'w');
|
||||||
|
fwrite($file, $res);
|
||||||
|
fclose($file);
|
||||||
|
Artisan::call('config:cache');
|
||||||
|
return ['msg' => 200];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function settingsConfigRestore(Request $request)
|
||||||
|
{
|
||||||
|
if(config('pixelfed.admin.env_editor') !== true) {
|
||||||
|
abort(400);
|
||||||
|
}
|
||||||
|
$res = file_get_contents(app()->environmentFilePath().'.backup');
|
||||||
|
if(empty($res)) {
|
||||||
|
abort(400, 'No backup exists.');
|
||||||
|
}
|
||||||
|
$file = fopen(app()->environmentFilePath(), 'w');
|
||||||
|
fwrite($file, $res);
|
||||||
|
fclose($file);
|
||||||
|
Artisan::call('config:cache');
|
||||||
|
return ['msg' => 200];
|
||||||
}
|
}
|
||||||
|
|
||||||
public function settingsMaintenance(Request $request)
|
public function settingsMaintenance(Request $request)
|
||||||
|
|
|
@ -274,4 +274,8 @@ return [
|
||||||
'sanitizer' => [
|
'sanitizer' => [
|
||||||
'restrict_html_types' => env('RESTRICT_HTML_TYPES', true)
|
'restrict_html_types' => env('RESTRICT_HTML_TYPES', true)
|
||||||
],
|
],
|
||||||
|
|
||||||
|
'admin' => [
|
||||||
|
'env_editor' => env('ADMIN_ENV_EDITOR', false)
|
||||||
|
],
|
||||||
];
|
];
|
||||||
|
|
BIN
public/js/ace.js
vendored
Normal file
BIN
public/js/ace.js
vendored
Normal file
Binary file not shown.
BIN
public/js/activity.js
vendored
BIN
public/js/activity.js
vendored
Binary file not shown.
BIN
public/js/app.js
vendored
BIN
public/js/app.js
vendored
Binary file not shown.
BIN
public/js/components.js
vendored
BIN
public/js/components.js
vendored
Binary file not shown.
BIN
public/js/compose.js
vendored
BIN
public/js/compose.js
vendored
Binary file not shown.
BIN
public/js/developers.js
vendored
BIN
public/js/developers.js
vendored
Binary file not shown.
BIN
public/js/discover.js
vendored
BIN
public/js/discover.js
vendored
Binary file not shown.
BIN
public/js/loops.js
vendored
BIN
public/js/loops.js
vendored
Binary file not shown.
BIN
public/js/mode-dot.js
vendored
Normal file
BIN
public/js/mode-dot.js
vendored
Normal file
Binary file not shown.
BIN
public/js/profile.js
vendored
BIN
public/js/profile.js
vendored
Binary file not shown.
BIN
public/js/quill.js
vendored
BIN
public/js/quill.js
vendored
Binary file not shown.
BIN
public/js/search.js
vendored
BIN
public/js/search.js
vendored
Binary file not shown.
BIN
public/js/status.js
vendored
BIN
public/js/status.js
vendored
Binary file not shown.
BIN
public/js/theme-monokai.js
vendored
Normal file
BIN
public/js/theme-monokai.js
vendored
Normal file
Binary file not shown.
BIN
public/js/timeline.js
vendored
BIN
public/js/timeline.js
vendored
Binary file not shown.
BIN
public/js/vendor.js
vendored
BIN
public/js/vendor.js
vendored
Binary file not shown.
Binary file not shown.
21606
resources/assets/js/lib/ace/ace.js
vendored
Executable file
21606
resources/assets/js/lib/ace/ace.js
vendored
Executable file
File diff suppressed because it is too large
Load diff
417
resources/assets/js/lib/ace/mode-dot.js
vendored
Executable file
417
resources/assets/js/lib/ace/mode-dot.js
vendored
Executable file
|
@ -0,0 +1,417 @@
|
||||||
|
ace.define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"], function(require, exports, module) {
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
var Range = require("../range").Range;
|
||||||
|
|
||||||
|
var MatchingBraceOutdent = function() {};
|
||||||
|
|
||||||
|
(function() {
|
||||||
|
|
||||||
|
this.checkOutdent = function(line, input) {
|
||||||
|
if (! /^\s+$/.test(line))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
return /^\s*\}/.test(input);
|
||||||
|
};
|
||||||
|
|
||||||
|
this.autoOutdent = function(doc, row) {
|
||||||
|
var line = doc.getLine(row);
|
||||||
|
var match = line.match(/^(\s*\})/);
|
||||||
|
|
||||||
|
if (!match) return 0;
|
||||||
|
|
||||||
|
var column = match[1].length;
|
||||||
|
var openBracePos = doc.findMatchingBracket({row: row, column: column});
|
||||||
|
|
||||||
|
if (!openBracePos || openBracePos.row == row) return 0;
|
||||||
|
|
||||||
|
var indent = this.$getIndent(doc.getLine(openBracePos.row));
|
||||||
|
doc.replace(new Range(row, 0, row, column-1), indent);
|
||||||
|
};
|
||||||
|
|
||||||
|
this.$getIndent = function(line) {
|
||||||
|
return line.match(/^\s*/)[0];
|
||||||
|
};
|
||||||
|
|
||||||
|
}).call(MatchingBraceOutdent.prototype);
|
||||||
|
|
||||||
|
exports.MatchingBraceOutdent = MatchingBraceOutdent;
|
||||||
|
});
|
||||||
|
|
||||||
|
ace.define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"], function(require, exports, module) {
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
var oop = require("../lib/oop");
|
||||||
|
var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
|
||||||
|
|
||||||
|
var DocCommentHighlightRules = function() {
|
||||||
|
this.$rules = {
|
||||||
|
"start" : [ {
|
||||||
|
token : "comment.doc.tag",
|
||||||
|
regex : "@[\\w\\d_]+" // TODO: fix email addresses
|
||||||
|
},
|
||||||
|
DocCommentHighlightRules.getTagRule(),
|
||||||
|
{
|
||||||
|
defaultToken : "comment.doc",
|
||||||
|
caseInsensitive: true
|
||||||
|
}]
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
oop.inherits(DocCommentHighlightRules, TextHighlightRules);
|
||||||
|
|
||||||
|
DocCommentHighlightRules.getTagRule = function(start) {
|
||||||
|
return {
|
||||||
|
token : "comment.doc.tag.storage.type",
|
||||||
|
regex : "\\b(?:TODO|FIXME|XXX|HACK)\\b"
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
DocCommentHighlightRules.getStartRule = function(start) {
|
||||||
|
return {
|
||||||
|
token : "comment.doc", // doc comment
|
||||||
|
regex : "\\/\\*(?=\\*)",
|
||||||
|
next : start
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
DocCommentHighlightRules.getEndRule = function (start) {
|
||||||
|
return {
|
||||||
|
token : "comment.doc", // closing comment
|
||||||
|
regex : "\\*\\/",
|
||||||
|
next : start
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
exports.DocCommentHighlightRules = DocCommentHighlightRules;
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
ace.define("ace/mode/dot_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules","ace/mode/doc_comment_highlight_rules"], function(require, exports, module) {
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
var oop = require("../lib/oop");
|
||||||
|
var lang = require("../lib/lang");
|
||||||
|
var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
|
||||||
|
var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
|
||||||
|
|
||||||
|
var DotHighlightRules = function() {
|
||||||
|
|
||||||
|
var keywords = lang.arrayToMap(
|
||||||
|
("strict|node|edge|graph|digraph|subgraph").split("|")
|
||||||
|
);
|
||||||
|
|
||||||
|
var attributes = lang.arrayToMap(
|
||||||
|
("damping|k|url|area|arrowhead|arrowsize|arrowtail|aspect|bb|bgcolor|center|charset|clusterrank|color|colorscheme|comment|compound|concentrate|constraint|decorate|defaultdist|dim|dimen|dir|diredgeconstraints|distortion|dpi|edgeurl|edgehref|edgetarget|edgetooltip|epsilon|esep|fillcolor|fixedsize|fontcolor|fontname|fontnames|fontpath|fontsize|forcelabels|gradientangle|group|headurl|head_lp|headclip|headhref|headlabel|headport|headtarget|headtooltip|height|href|id|image|imagepath|imagescale|label|labelurl|label_scheme|labelangle|labeldistance|labelfloat|labelfontcolor|labelfontname|labelfontsize|labelhref|labeljust|labelloc|labeltarget|labeltooltip|landscape|layer|layerlistsep|layers|layerselect|layersep|layout|len|levels|levelsgap|lhead|lheight|lp|ltail|lwidth|margin|maxiter|mclimit|mindist|minlen|mode|model|mosek|nodesep|nojustify|normalize|nslimit|nslimit1|ordering|orientation|outputorder|overlap|overlap_scaling|pack|packmode|pad|page|pagedir|pencolor|penwidth|peripheries|pin|pos|quadtree|quantum|rank|rankdir|ranksep|ratio|rects|regular|remincross|repulsiveforce|resolution|root|rotate|rotation|samehead|sametail|samplepoints|scale|searchsize|sep|shape|shapefile|showboxes|sides|size|skew|smoothing|sortv|splines|start|style|stylesheet|tailurl|tail_lp|tailclip|tailhref|taillabel|tailport|tailtarget|tailtooltip|target|tooltip|truecolor|vertices|viewport|voro_margin|weight|width|xlabel|xlp|z").split("|")
|
||||||
|
);
|
||||||
|
|
||||||
|
this.$rules = {
|
||||||
|
"start" : [
|
||||||
|
{
|
||||||
|
token : "comment",
|
||||||
|
regex : /\/\/.*$/
|
||||||
|
}, {
|
||||||
|
token : "comment",
|
||||||
|
regex : /#.*$/
|
||||||
|
}, {
|
||||||
|
token : "comment", // multi line comment
|
||||||
|
merge : true,
|
||||||
|
regex : /\/\*/,
|
||||||
|
next : "comment"
|
||||||
|
}, {
|
||||||
|
token : "string",
|
||||||
|
regex : "'(?=.)",
|
||||||
|
next : "qstring"
|
||||||
|
}, {
|
||||||
|
token : "string",
|
||||||
|
regex : '"(?=.)',
|
||||||
|
next : "qqstring"
|
||||||
|
}, {
|
||||||
|
token : "constant.numeric",
|
||||||
|
regex : /[+\-]?\d+(?:(?:\.\d*)?(?:[eE][+\-]?\d+)?)?\b/
|
||||||
|
}, {
|
||||||
|
token : "keyword.operator",
|
||||||
|
regex : /\+|=|\->/
|
||||||
|
}, {
|
||||||
|
token : "punctuation.operator",
|
||||||
|
regex : /,|;/
|
||||||
|
}, {
|
||||||
|
token : "paren.lparen",
|
||||||
|
regex : /[\[{]/
|
||||||
|
}, {
|
||||||
|
token : "paren.rparen",
|
||||||
|
regex : /[\]}]/
|
||||||
|
}, {
|
||||||
|
token: "comment",
|
||||||
|
regex: /^#!.*$/
|
||||||
|
}, {
|
||||||
|
token: function(value) {
|
||||||
|
if (keywords.hasOwnProperty(value.toLowerCase())) {
|
||||||
|
return "keyword";
|
||||||
|
}
|
||||||
|
else if (attributes.hasOwnProperty(value.toLowerCase())) {
|
||||||
|
return "variable";
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return "text";
|
||||||
|
}
|
||||||
|
},
|
||||||
|
regex: "\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"comment" : [
|
||||||
|
{
|
||||||
|
token : "comment", // closing comment
|
||||||
|
regex : "\\*\\/",
|
||||||
|
next : "start"
|
||||||
|
}, {
|
||||||
|
defaultToken : "comment"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"qqstring" : [
|
||||||
|
{
|
||||||
|
token : "string",
|
||||||
|
regex : '[^"\\\\]+',
|
||||||
|
merge : true
|
||||||
|
}, {
|
||||||
|
token : "string",
|
||||||
|
regex : "\\\\$",
|
||||||
|
next : "qqstring",
|
||||||
|
merge : true
|
||||||
|
}, {
|
||||||
|
token : "string",
|
||||||
|
regex : '"|$',
|
||||||
|
next : "start",
|
||||||
|
merge : true
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"qstring" : [
|
||||||
|
{
|
||||||
|
token : "string",
|
||||||
|
regex : "[^'\\\\]+",
|
||||||
|
merge : true
|
||||||
|
}, {
|
||||||
|
token : "string",
|
||||||
|
regex : "\\\\$",
|
||||||
|
next : "qstring",
|
||||||
|
merge : true
|
||||||
|
}, {
|
||||||
|
token : "string",
|
||||||
|
regex : "'|$",
|
||||||
|
next : "start",
|
||||||
|
merge : true
|
||||||
|
}
|
||||||
|
]
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
oop.inherits(DotHighlightRules, TextHighlightRules);
|
||||||
|
|
||||||
|
exports.DotHighlightRules = DotHighlightRules;
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
ace.define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"], function(require, exports, module) {
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
var oop = require("../../lib/oop");
|
||||||
|
var Range = require("../../range").Range;
|
||||||
|
var BaseFoldMode = require("./fold_mode").FoldMode;
|
||||||
|
|
||||||
|
var FoldMode = exports.FoldMode = function(commentRegex) {
|
||||||
|
if (commentRegex) {
|
||||||
|
this.foldingStartMarker = new RegExp(
|
||||||
|
this.foldingStartMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.start)
|
||||||
|
);
|
||||||
|
this.foldingStopMarker = new RegExp(
|
||||||
|
this.foldingStopMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.end)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
oop.inherits(FoldMode, BaseFoldMode);
|
||||||
|
|
||||||
|
(function() {
|
||||||
|
|
||||||
|
this.foldingStartMarker = /([\{\[\(])[^\}\]\)]*$|^\s*(\/\*)/;
|
||||||
|
this.foldingStopMarker = /^[^\[\{\(]*([\}\]\)])|^[\s\*]*(\*\/)/;
|
||||||
|
this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
|
||||||
|
this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
|
||||||
|
this.startRegionRe = /^\s*(\/\*|\/\/)#?region\b/;
|
||||||
|
this._getFoldWidgetBase = this.getFoldWidget;
|
||||||
|
this.getFoldWidget = function(session, foldStyle, row) {
|
||||||
|
var line = session.getLine(row);
|
||||||
|
|
||||||
|
if (this.singleLineBlockCommentRe.test(line)) {
|
||||||
|
if (!this.startRegionRe.test(line) && !this.tripleStarBlockCommentRe.test(line))
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
var fw = this._getFoldWidgetBase(session, foldStyle, row);
|
||||||
|
|
||||||
|
if (!fw && this.startRegionRe.test(line))
|
||||||
|
return "start"; // lineCommentRegionStart
|
||||||
|
|
||||||
|
return fw;
|
||||||
|
};
|
||||||
|
|
||||||
|
this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) {
|
||||||
|
var line = session.getLine(row);
|
||||||
|
|
||||||
|
if (this.startRegionRe.test(line))
|
||||||
|
return this.getCommentRegionBlock(session, line, row);
|
||||||
|
|
||||||
|
var match = line.match(this.foldingStartMarker);
|
||||||
|
if (match) {
|
||||||
|
var i = match.index;
|
||||||
|
|
||||||
|
if (match[1])
|
||||||
|
return this.openingBracketBlock(session, match[1], row, i);
|
||||||
|
|
||||||
|
var range = session.getCommentFoldRange(row, i + match[0].length, 1);
|
||||||
|
|
||||||
|
if (range && !range.isMultiLine()) {
|
||||||
|
if (forceMultiline) {
|
||||||
|
range = this.getSectionRange(session, row);
|
||||||
|
} else if (foldStyle != "all")
|
||||||
|
range = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return range;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (foldStyle === "markbegin")
|
||||||
|
return;
|
||||||
|
|
||||||
|
var match = line.match(this.foldingStopMarker);
|
||||||
|
if (match) {
|
||||||
|
var i = match.index + match[0].length;
|
||||||
|
|
||||||
|
if (match[1])
|
||||||
|
return this.closingBracketBlock(session, match[1], row, i);
|
||||||
|
|
||||||
|
return session.getCommentFoldRange(row, i, -1);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
this.getSectionRange = function(session, row) {
|
||||||
|
var line = session.getLine(row);
|
||||||
|
var startIndent = line.search(/\S/);
|
||||||
|
var startRow = row;
|
||||||
|
var startColumn = line.length;
|
||||||
|
row = row + 1;
|
||||||
|
var endRow = row;
|
||||||
|
var maxRow = session.getLength();
|
||||||
|
while (++row < maxRow) {
|
||||||
|
line = session.getLine(row);
|
||||||
|
var indent = line.search(/\S/);
|
||||||
|
if (indent === -1)
|
||||||
|
continue;
|
||||||
|
if (startIndent > indent)
|
||||||
|
break;
|
||||||
|
var subRange = this.getFoldWidgetRange(session, "all", row);
|
||||||
|
|
||||||
|
if (subRange) {
|
||||||
|
if (subRange.start.row <= startRow) {
|
||||||
|
break;
|
||||||
|
} else if (subRange.isMultiLine()) {
|
||||||
|
row = subRange.end.row;
|
||||||
|
} else if (startIndent == indent) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
endRow = row;
|
||||||
|
}
|
||||||
|
|
||||||
|
return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
|
||||||
|
};
|
||||||
|
this.getCommentRegionBlock = function(session, line, row) {
|
||||||
|
var startColumn = line.search(/\s*$/);
|
||||||
|
var maxRow = session.getLength();
|
||||||
|
var startRow = row;
|
||||||
|
|
||||||
|
var re = /^\s*(?:\/\*|\/\/|--)#?(end)?region\b/;
|
||||||
|
var depth = 1;
|
||||||
|
while (++row < maxRow) {
|
||||||
|
line = session.getLine(row);
|
||||||
|
var m = re.exec(line);
|
||||||
|
if (!m) continue;
|
||||||
|
if (m[1]) depth--;
|
||||||
|
else depth++;
|
||||||
|
|
||||||
|
if (!depth) break;
|
||||||
|
}
|
||||||
|
|
||||||
|
var endRow = row;
|
||||||
|
if (endRow > startRow) {
|
||||||
|
return new Range(startRow, startColumn, endRow, line.length);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
}).call(FoldMode.prototype);
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
ace.define("ace/mode/dot",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/matching_brace_outdent","ace/mode/dot_highlight_rules","ace/mode/folding/cstyle"], function(require, exports, module) {
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
var oop = require("../lib/oop");
|
||||||
|
var TextMode = require("./text").Mode;
|
||||||
|
var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
|
||||||
|
var DotHighlightRules = require("./dot_highlight_rules").DotHighlightRules;
|
||||||
|
var DotFoldMode = require("./folding/cstyle").FoldMode;
|
||||||
|
|
||||||
|
var Mode = function() {
|
||||||
|
this.HighlightRules = DotHighlightRules;
|
||||||
|
this.$outdent = new MatchingBraceOutdent();
|
||||||
|
this.foldingRules = new DotFoldMode();
|
||||||
|
this.$behaviour = this.$defaultBehaviour;
|
||||||
|
};
|
||||||
|
oop.inherits(Mode, TextMode);
|
||||||
|
|
||||||
|
(function() {
|
||||||
|
|
||||||
|
this.lineCommentStart = ["//", "#"];
|
||||||
|
this.blockComment = {start: "/*", end: "*/"};
|
||||||
|
|
||||||
|
this.getNextLineIndent = function(state, line, tab) {
|
||||||
|
var indent = this.$getIndent(line);
|
||||||
|
|
||||||
|
var tokenizedLine = this.getTokenizer().getLineTokens(line, state);
|
||||||
|
var tokens = tokenizedLine.tokens;
|
||||||
|
var endState = tokenizedLine.state;
|
||||||
|
|
||||||
|
if (tokens.length && tokens[tokens.length-1].type == "comment") {
|
||||||
|
return indent;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (state == "start") {
|
||||||
|
var match = line.match(/^.*(?:\bcase\b.*:|[\{\(\[])\s*$/);
|
||||||
|
if (match) {
|
||||||
|
indent += tab;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return indent;
|
||||||
|
};
|
||||||
|
|
||||||
|
this.checkOutdent = function(state, line, input) {
|
||||||
|
return this.$outdent.checkOutdent(line, input);
|
||||||
|
};
|
||||||
|
|
||||||
|
this.autoOutdent = function(state, doc, row) {
|
||||||
|
this.$outdent.autoOutdent(doc, row);
|
||||||
|
};
|
||||||
|
|
||||||
|
this.$id = "ace/mode/dot";
|
||||||
|
}).call(Mode.prototype);
|
||||||
|
|
||||||
|
exports.Mode = Mode;
|
||||||
|
}); (function() {
|
||||||
|
ace.require(["ace/mode/dot"], function(m) {
|
||||||
|
if (typeof module == "object" && typeof exports == "object" && module) {
|
||||||
|
module.exports = m;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
})();
|
||||||
|
|
112
resources/assets/js/lib/ace/theme-monokai.js
vendored
Executable file
112
resources/assets/js/lib/ace/theme-monokai.js
vendored
Executable file
|
@ -0,0 +1,112 @@
|
||||||
|
ace.define("ace/theme/monokai",["require","exports","module","ace/lib/dom"], function(require, exports, module) {
|
||||||
|
|
||||||
|
exports.isDark = true;
|
||||||
|
exports.cssClass = "ace-monokai";
|
||||||
|
exports.cssText = ".ace-monokai .ace_gutter {\
|
||||||
|
background: #2F3129;\
|
||||||
|
color: #8F908A\
|
||||||
|
}\
|
||||||
|
.ace-monokai .ace_print-margin {\
|
||||||
|
width: 1px;\
|
||||||
|
background: #555651\
|
||||||
|
}\
|
||||||
|
.ace-monokai {\
|
||||||
|
background-color: #272822;\
|
||||||
|
color: #F8F8F2\
|
||||||
|
}\
|
||||||
|
.ace-monokai .ace_cursor {\
|
||||||
|
color: #F8F8F0\
|
||||||
|
}\
|
||||||
|
.ace-monokai .ace_marker-layer .ace_selection {\
|
||||||
|
background: #49483E\
|
||||||
|
}\
|
||||||
|
.ace-monokai.ace_multiselect .ace_selection.ace_start {\
|
||||||
|
box-shadow: 0 0 3px 0px #272822;\
|
||||||
|
}\
|
||||||
|
.ace-monokai .ace_marker-layer .ace_step {\
|
||||||
|
background: rgb(102, 82, 0)\
|
||||||
|
}\
|
||||||
|
.ace-monokai .ace_marker-layer .ace_bracket {\
|
||||||
|
margin: -1px 0 0 -1px;\
|
||||||
|
border: 1px solid #49483E\
|
||||||
|
}\
|
||||||
|
.ace-monokai .ace_marker-layer .ace_active-line {\
|
||||||
|
background: #202020\
|
||||||
|
}\
|
||||||
|
.ace-monokai .ace_gutter-active-line {\
|
||||||
|
background-color: #272727\
|
||||||
|
}\
|
||||||
|
.ace-monokai .ace_marker-layer .ace_selected-word {\
|
||||||
|
border: 1px solid #49483E\
|
||||||
|
}\
|
||||||
|
.ace-monokai .ace_invisible {\
|
||||||
|
color: #52524d\
|
||||||
|
}\
|
||||||
|
.ace-monokai .ace_entity.ace_name.ace_tag,\
|
||||||
|
.ace-monokai .ace_keyword,\
|
||||||
|
.ace-monokai .ace_meta.ace_tag,\
|
||||||
|
.ace-monokai .ace_storage {\
|
||||||
|
color: #F92672\
|
||||||
|
}\
|
||||||
|
.ace-monokai .ace_punctuation,\
|
||||||
|
.ace-monokai .ace_punctuation.ace_tag {\
|
||||||
|
color: #fff\
|
||||||
|
}\
|
||||||
|
.ace-monokai .ace_constant.ace_character,\
|
||||||
|
.ace-monokai .ace_constant.ace_language,\
|
||||||
|
.ace-monokai .ace_constant.ace_numeric,\
|
||||||
|
.ace-monokai .ace_constant.ace_other {\
|
||||||
|
color: #AE81FF\
|
||||||
|
}\
|
||||||
|
.ace-monokai .ace_invalid {\
|
||||||
|
color: #F8F8F0;\
|
||||||
|
background-color: #F92672\
|
||||||
|
}\
|
||||||
|
.ace-monokai .ace_invalid.ace_deprecated {\
|
||||||
|
color: #F8F8F0;\
|
||||||
|
background-color: #AE81FF\
|
||||||
|
}\
|
||||||
|
.ace-monokai .ace_support.ace_constant,\
|
||||||
|
.ace-monokai .ace_support.ace_function {\
|
||||||
|
color: #66D9EF\
|
||||||
|
}\
|
||||||
|
.ace-monokai .ace_fold {\
|
||||||
|
background-color: #A6E22E;\
|
||||||
|
border-color: #F8F8F2\
|
||||||
|
}\
|
||||||
|
.ace-monokai .ace_storage.ace_type,\
|
||||||
|
.ace-monokai .ace_support.ace_class,\
|
||||||
|
.ace-monokai .ace_support.ace_type {\
|
||||||
|
font-style: italic;\
|
||||||
|
color: #66D9EF\
|
||||||
|
}\
|
||||||
|
.ace-monokai .ace_entity.ace_name.ace_function,\
|
||||||
|
.ace-monokai .ace_entity.ace_other,\
|
||||||
|
.ace-monokai .ace_entity.ace_other.ace_attribute-name,\
|
||||||
|
.ace-monokai .ace_variable {\
|
||||||
|
color: #A6E22E\
|
||||||
|
}\
|
||||||
|
.ace-monokai .ace_variable.ace_parameter {\
|
||||||
|
font-style: italic;\
|
||||||
|
color: #FD971F\
|
||||||
|
}\
|
||||||
|
.ace-monokai .ace_string {\
|
||||||
|
color: #E6DB74\
|
||||||
|
}\
|
||||||
|
.ace-monokai .ace_comment {\
|
||||||
|
color: #75715E\
|
||||||
|
}\
|
||||||
|
.ace-monokai .ace_indent-guide {\
|
||||||
|
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWPQ0FD0ZXBzd/wPAAjVAoxeSgNeAAAAAElFTkSuQmCC) right repeat-y\
|
||||||
|
}";
|
||||||
|
|
||||||
|
var dom = require("../lib/dom");
|
||||||
|
dom.importCssString(exports.cssText, exports.cssClass);
|
||||||
|
}); (function() {
|
||||||
|
ace.require(["ace/theme/monokai"], function(m) {
|
||||||
|
if (typeof module == "object" && typeof exports == "object" && module) {
|
||||||
|
module.exports = m;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
})();
|
||||||
|
|
|
@ -5,10 +5,90 @@
|
||||||
@section('section')
|
@section('section')
|
||||||
<div class="title">
|
<div class="title">
|
||||||
<h3 class="font-weight-bold">Configuration Settings</h3>
|
<h3 class="font-weight-bold">Configuration Settings</h3>
|
||||||
|
@if($editor == false)
|
||||||
|
<hr>
|
||||||
|
<div class="card bg-light shadow-none rounded-0">
|
||||||
|
<div class="card-body text-center py-5">
|
||||||
|
<p class="lead text-muted font-weight-bold">Configuration Editor is disabled</p>
|
||||||
|
<p class="mb-0">To enable it, add <code>ADMIN_ENV_EDITOR=true</code> to <code>.env</code><br>then run <code>php artisan config:cache</code></p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@else
|
||||||
<p class="lead">Edit configuration settings</p>
|
<p class="lead">Edit configuration settings</p>
|
||||||
|
<p class="alert alert-warning">
|
||||||
|
<strong>Warning:</strong> If you have opcache enabled, you may need to restart php for the changes to take effect.
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<hr>
|
<hr>
|
||||||
<p class="alert alert-warning">
|
<div>
|
||||||
<strong>Feature Unavailable:</strong> This feature will be released in a future version.
|
<div id="editor">{{$config}}</div>
|
||||||
</p>
|
<hr>
|
||||||
|
<div class="d-flex justify-content-between px-3">
|
||||||
|
@if($backup)
|
||||||
|
<button class="btn btn-outline-secondary font-weight-bold py-1 btn-restore">Restore backup .env</button>
|
||||||
|
@else
|
||||||
|
<div></div>
|
||||||
|
@endif
|
||||||
|
<button class="btn btn-primary font-weight-bold py-1 btn-save">Save</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
@endsection
|
@endsection
|
||||||
|
@if($editor == true)
|
||||||
|
@push('scripts')
|
||||||
|
<script src="{{mix('js/ace.js')}}"></script>
|
||||||
|
<script>
|
||||||
|
let editor = ace.edit("editor");
|
||||||
|
editor.session.setUseWrapMode(true);
|
||||||
|
editor.setTheme("ace/theme/monokai");
|
||||||
|
editor.session.setMode("ace/mode/dot");
|
||||||
|
|
||||||
|
$('.btn-restore').on('click', function(e) {
|
||||||
|
e.preventDefault();
|
||||||
|
let confirm = window.confirm('Are you sure you want to restore your backup .env?');
|
||||||
|
if(!confirm) {
|
||||||
|
swal('Cancelled', 'You have cancelled the .env backup restore.', 'warning');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
axios.post('/i/admin/settings/config/restore', {
|
||||||
|
}).then(res => {
|
||||||
|
swal('Success', 'Configuration successfully restored!', 'success');
|
||||||
|
setTimeout(function() {
|
||||||
|
window.location.href = window.location.href;
|
||||||
|
}, 3000);
|
||||||
|
});
|
||||||
|
})
|
||||||
|
|
||||||
|
$('.btn-save').on('click', function(e) {
|
||||||
|
e.preventDefault();
|
||||||
|
let confirm = window.confirm('Are you sure you want to overwrite your current .env?');
|
||||||
|
if(!confirm) {
|
||||||
|
swal('Cancelled', 'You have cancelled the .env update.', 'warning');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
axios.post('/i/admin/settings/config', {
|
||||||
|
res: editor.getValue()
|
||||||
|
}).then(res => {
|
||||||
|
swal('Success', 'Configuration successfully updated!', 'success');
|
||||||
|
setTimeout(function() {
|
||||||
|
window.location.href = window.location.href;
|
||||||
|
}, 3000);
|
||||||
|
});
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
@endpush
|
||||||
|
|
||||||
|
@push('styles')
|
||||||
|
<style type="text/css" media="screen">
|
||||||
|
#editor {
|
||||||
|
display: block;
|
||||||
|
top: 0;
|
||||||
|
right: 0;
|
||||||
|
bottom: 0;
|
||||||
|
left: 0;
|
||||||
|
width: 100%;
|
||||||
|
min-height: 400px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
@endpush
|
||||||
|
@endif
|
|
@ -23,6 +23,8 @@ Route::domain(config('pixelfed.domain.admin'))->prefix('i/admin')->group(functio
|
||||||
Route::get('settings', 'AdminController@settings')->name('admin.settings');
|
Route::get('settings', 'AdminController@settings')->name('admin.settings');
|
||||||
Route::post('settings', 'AdminController@settingsHomeStore');
|
Route::post('settings', 'AdminController@settingsHomeStore');
|
||||||
Route::get('settings/config', 'AdminController@settingsConfig')->name('admin.settings.config');
|
Route::get('settings/config', 'AdminController@settingsConfig')->name('admin.settings.config');
|
||||||
|
Route::post('settings/config', 'AdminController@settingsConfigStore');
|
||||||
|
Route::post('settings/config/restore', 'AdminController@settingsConfigRestore');
|
||||||
Route::get('settings/features', 'AdminController@settingsFeatures')->name('admin.settings.features');
|
Route::get('settings/features', 'AdminController@settingsFeatures')->name('admin.settings.features');
|
||||||
Route::get('settings/pages', 'AdminController@settingsPages')->name('admin.settings.pages');
|
Route::get('settings/pages', 'AdminController@settingsPages')->name('admin.settings.pages');
|
||||||
Route::get('settings/pages/edit', 'PageController@edit')->name('admin.settings.pages.edit');
|
Route::get('settings/pages/edit', 'PageController@edit')->name('admin.settings.pages.edit');
|
||||||
|
|
3
webpack.mix.js
vendored
3
webpack.mix.js
vendored
|
@ -25,6 +25,9 @@ mix.js('resources/assets/js/app.js', 'public/js')
|
||||||
.js('resources/assets/js/developers.js', 'public/js')
|
.js('resources/assets/js/developers.js', 'public/js')
|
||||||
.js('resources/assets/js/loops.js', 'public/js')
|
.js('resources/assets/js/loops.js', 'public/js')
|
||||||
.js('resources/assets/js/quill.js', 'public/js')
|
.js('resources/assets/js/quill.js', 'public/js')
|
||||||
|
.js('resources/assets/js/lib/ace/ace.js', 'public/js')
|
||||||
|
.js('resources/assets/js/lib/ace/mode-dot.js', 'public/js')
|
||||||
|
.js('resources/assets/js/lib/ace/theme-monokai.js', 'public/js')
|
||||||
// .js('resources/assets/js/embed.js', 'public')
|
// .js('resources/assets/js/embed.js', 'public')
|
||||||
// .js('resources/assets/js/direct.js', 'public/js')
|
// .js('resources/assets/js/direct.js', 'public/js')
|
||||||
.extract([
|
.extract([
|
||||||
|
|
Loading…
Reference in a new issue