Merge pull request #3040 from pixelfed/staging

Staging

CHANGELOG.md

@@ -46,6 +46,11 @@
 - Updated ApiV1Controller, improve statusesById perf and dispatch CommentPipeline job when applicable. ([466286af](https://github.com/pixelfed/pixelfed/commit/466286af))
 - Updated MediaService, return empty array if cant find status. ([c2910e5d](https://github.com/pixelfed/pixelfed/commit/c2910e5d))
 - Updated StatusService, improve cache invalidation. ([83b48b56](https://github.com/pixelfed/pixelfed/commit/83b48b56))
+- Updated Hashtag component, fix spinner. ([fefbc44a](https://github.com/pixelfed/pixelfed/commit/fefbc44a))
+- Updated NotificationCard, update api endpoint and add group notification types. ([e09a14d8](https://github.com/pixelfed/pixelfed/commit/e09a14d8))
+- Updated ContextMenu component, fix account url paths. ([01ca1edd](https://github.com/pixelfed/pixelfed/commit/01ca1edd))
+- Updated PollCard component, add showBorder prop. ([0c8fffbd](https://github.com/pixelfed/pixelfed/commit/0c8fffbd))
+- Updated PhotoPresenter component, add lightbox toggle. ([0cc1365f](https://github.com/pixelfed/pixelfed/commit/0cc1365f))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.1 (2021-09-07)](https://github.com/pixelfed/pixelfed/compare/v0.11.0...v0.11.1)

app/Http/Controllers/Admin/AdminSettingsController.php

@@ -199,30 +199,6 @@ trait AdminSettingsController
 		return view('admin.settings.backups', compact('files'));
 	}
 
-	public function settingsConfig(Request $request)
-	{
-		$editor = config('pixelfed.admin.env_editor');
-		$config = !$editor ? false : file_get_contents(base_path('.env'));
-		$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);
-		}
-		return ['msg' => 200];
-	}
-
-	public function settingsConfigRestore(Request $request)
-	{
-		if(config('pixelfed.admin.env_editor') !== true) {
-			abort(400);
-		}
-		return ['msg' => 200];
-	}
-
 	public function settingsMaintenance(Request $request)
 	{
 		return view('admin.settings.maintenance');

config/pixelfed.php

@@ -257,10 +257,6 @@ return [
 
 	'oauth_enabled' => env('OAUTH_ENABLED', false),
 
-	'admin' => [
-		'env_editor' => env('ADMIN_ENV_EDITOR', false)
-	],
-
 	'bouncer' => [
 		'enabled' => env('PF_BOUNCER_ENABLED', false),
 	],

package.json

@@ -44,7 +44,6 @@
         "laravel-mix": "^4.1.4",
         "node-sass": "^4.14.1",
         "promise-polyfill": "8.1.0",
-        "quill": "^1.3.7",
         "readmore-js": "^2.2.1",
         "sweetalert": "^2.1.2",
         "twitter-text": "^2.0.5",
@@ -52,7 +51,9 @@
         "vue-carousel": "^0.18.0",
         "vue-content-loader": "^0.2.3",
         "vue-cropperjs": "^4.1.0",
+        "vue-i18n": "^8.26.7",
         "vue-infinite-loading": "^2.4.5",
+        "vue-intersect": "^1.1.6",
         "vue-loading-overlay": "^3.3.3",
         "vue-timeago": "^5.1.2",
         "vue-tribute": "^1.0.7",

resources/assets/js/components/Activity.vue

@@ -89,6 +89,18 @@
 								</p>
 							</div>
 
+							<div v-else-if="n.type == 'group.join.approved'">
+								<p class="my-0">
+									Your application to join <a :href="n.group.url" class="font-weight-bold text-dark word-break" :title="n.group.name">{{truncate(n.group.name)}}</a> was approved!
+								</p>
+							</div>
+
+							<div v-else-if="n.type == 'group.join.rejected'">
+								<p class="my-0">
+									Your application to join <a :href="n.group.url" class="font-weight-bold text-dark word-break" :title="n.group.name">{{truncate(n.group.name)}}</a> was rejected. You can re-apply to join in 6 months.
+								</p>
+							</div>
+
 							<div class="align-items-center">
 								<span class="small text-muted" data-toggle="tooltip" data-placement="bottom" :title="n.created_at">{{timeAgo(n.created_at)}}</span>
 							</div>

resources/assets/js/components/ComposeModal.vue

@@ -1024,7 +1024,6 @@ export default {
 	},
 
 	beforeMount() {
-		this.fetchProfile();
 		this.filters = window.App.util.filters;
 		axios.get('/api/compose/v0/settings')
 		.then(res => {
@@ -1038,6 +1037,7 @@ export default {
 					return l.title;
 				})[0];
 			}
+			this.fetchProfile();
 		});
 	},
 
@@ -1047,8 +1047,18 @@ export default {
 
 	methods: {
 		fetchProfile() {
+			let tags = {
+				public: 'Public',
+				private: 'Followers Only',
+				unlisted: 'Unlisted'
+			}
 			if(window._sharedData.curUser.id) {
 				this.profile = window._sharedData.curUser;
+				if(this.composeSettings && this.composeSettings.hasOwnProperty('default_scope') && this.composeSettings.default_scope) {
+					let ds = this.composeSettings.default_scope;
+					this.visibility = ds;
+					this.visibilityTag = tags[ds];
+				}
 				if(this.profile.locked == true) {
 					this.visibility = 'private';
 					this.visibilityTag = 'Followers Only';
@@ -1057,6 +1067,11 @@ export default {
 				axios.get('/api/pixelfed/v1/accounts/verify_credentials').then(res => {
 					window._sharedData.currentUser = res.data;
 					this.profile = res.data;
+					if(this.composeSettings && this.composeSettings.hasOwnProperty('default_scope') && this.composeSettings.default_scope) {
+						let ds = this.composeSettings.default_scope;
+						this.visibility = ds;
+						this.visibilityTag = tags[ds];
+					}
 					if(this.profile.locked == true) {
 						this.visibility = 'private';
 						this.visibilityTag = 'Followers Only';

resources/assets/js/components/Hashtag.vue

@@ -109,8 +109,8 @@
 			<p class="text-center lead font-weight-bold">No public posts found.</p>
 		</div>
 	</div>
-	<div v-else class="container text-center">
+	<div v-else class="mt-5 text-center">
-		<div class="col-12 mt-5 spinner-border" role="status">
+		<div class="spinner-border" role="status">
 			<span class="sr-only">Loading...</span>
 		</div>
 	</div>

resources/assets/js/components/NotificationCard.vue

@@ -11,7 +11,7 @@
 				<div v-if="profile.locked" class="media align-items-center mt-n2 px-3 py-2 border-bottom border-lighter bg-light cursor-pointer" @click="redirect('/account/follow-requests')">
 					<div class="media-body font-weight-light pt-2 small d-flex align-items-center justify-content-between">
 						<p class="mb-0 text-lighter"><i class="fas fa-cog text-light"></i></p>
-						<p class="text-center pt-1 mb-1 text-dark font-weight-bold"><strong>{{followRequests.count}}</strong> Follow Requests</p>
+						<p class="text-center pt-1 mb-1 text-dark font-weight-bold"><strong>{{ followRequests && followRequests.hasOwnProperty('count') ? followRequests.count : 0 }}</strong> Follow Requests</p>
 						<p class="mb-0 text-lighter"><i class="fas fa-chevron-right"></i></p>
 					</div>
 				</div>
@@ -82,6 +82,25 @@
 								<a :href="getProfileUrl(n.account)" class="font-weight-bold text-dark word-break" :title="n.account.username">{{n.account.local == false ? '@':''}}{{truncate(n.account.username)}}</a> sent a <a class="font-weight-bold" v-bind:href="'/account/direct/t/'+n.account.id">dm</a>.
 							</p>
 						</div>
+
+						<div v-else-if="n.type == 'group.join.approved'">
+							<p class="my-0">
+								Your application to join the <a :href="n.group.url" class="font-weight-bold text-dark word-break" :title="n.group.name">{{truncate(n.group.name)}}</a> group was approved!
+							</p>
+						</div>
+
+						<div v-else-if="n.type == 'group.join.rejected'">
+							<p class="my-0">
+								Your application to join <a :href="n.group.url" class="font-weight-bold text-dark word-break" :title="n.group.name">{{truncate(n.group.name)}}</a> was rejected.
+							</p>
+						</div>
+
+						<div v-else-if="n.type == 'group:invite'">
+							<p class="my-0">
+								<a :href="getProfileUrl(n.account)" class="font-weight-bold text-dark word-break" :title="n.account.username">{{n.account.local == false ? '@':''}}{{truncate(n.account.username)}}</a> invited you to join <a :href="n.group.url + '/invite/claim'" class="font-weight-bold text-dark word-break" :title="n.group.name">{{n.group.name}}</a>.
+							</p>
+						</div>
+
 						<div v-else>
 							<p class="my-0">
 								We cannot display this notification at this time.
@@ -146,7 +165,7 @@
 
 		methods: {
 			fetchNotifications() {
-				axios.get('/api/pixelfed/v1/notifications?pg=true')
+				axios.get('/api/v1/notifications?pg=true')
 				.then(res => {
 					let data = res.data.filter(n => {
 						if(n.type == 'share' && !n.status) {

resources/assets/js/components/Timeline.vue

@@ -450,7 +450,7 @@
 				replyStatus: {},
 				replyText: '',
 				replyNsfw: false,
-				emoji: window.App.util.emoji,
+				emoji: [],
 				showHashtagPosts: false,
 				hashtagPosts: [],
 				hashtagPostsName: '',
@@ -514,21 +514,6 @@
 		},
 
 		beforeMount() {
-			// let avop = window.localStorage.getItem('pf.feed:avop') === 'always';
-			// let u = new URLSearchParams(window.location.search);
-			// if(u.has('a')) {
-			// 	switch(u.get('a')) {
-			// 		case 'recent_feed':
-			// 			if(this.scope === 'home') {
-			// 				this.recentFeed = true;
-			// 			}
-			// 		break;
-			// 		case 'vop':
-			// 			this.recentFeed = false;
-			// 		break;
-			// 	}
-			// }
-			// this.recentFeed = avop ? false : this.recentFeed;
 			this.fetchProfile();
 		},
 
@@ -589,17 +574,13 @@
 
 		methods: {
 			fetchProfile() {
-				axios.get('/api/pixelfed/v1/accounts/verify_credentials').then(res => {
+				axios.get('/api/v1/accounts/verify_credentials').then(res => {
 					this.profile = res.data;
 					if(this.profile.is_admin == true) {
 						this.modes.mod = true;
 					}
 					window._sharedData.curUser = res.data;
 					window.App.util.navatar();
-					// this.$nextTick(() => {
-					// 	this.hasStory();
-					// });
-					// this.expRec();
 				}).catch(err => {
 					swal(
 						'Oops, something went wrong',
@@ -633,7 +614,7 @@
 				}).then(res => {
 					let data = res.data;
 
-					if(!data.length) {
+					if(!data || !data.length) {
 						this.loading = false;
 						this.emptyFeed = true;
 						return;
@@ -651,32 +632,15 @@
 					this.min_id = Math.max(...ids).toString();
 					this.max_id = Math.min(...ids).toString();
 					this.loading = false;
-					// $('.timeline .pagination').removeClass('d-none');
-
-					// if(this.hashtagPosts.length == 0) {
-					// 	this.fetchHashtagPosts();
-					// }
 					this.$nextTick(() => {
 						this.hasStory();
 					});
-					// this.fetchStories();
-					// this.rtw();
 
 					setTimeout(function() {
 						document.querySelectorAll('.timeline .card-body .comments .comment-body a').forEach(function(i, e) {
 							i.href = App.util.format.rewriteLinks(i);
 						});
 					}, 500);
-
-					// axios.get('/api/pixelfed/v2/discover/posts/trending', {
-					// 	params: {
-					// 		range: 'daily'
-					// 	}
-					// }).then(res => {
-					// 	let data = res.data.filter(post => this.ids.indexOf(post.id) === -1);
-					// 	this.discover_feed = data;
-					// });
-
 				}).catch(err => {
 					swal(
 						'Oops, something went wrong',
@@ -733,8 +697,8 @@
 								self.feed.push(d);
 								self.ids.push(d.id);
 								// vids.push({
-								// 	sid: d.id,
+								//  sid: d.id,
-								// 	pid: d.account.id
+								//  pid: d.account.id
 								// });
 							}
 						});
@@ -744,7 +708,7 @@
 						$state.loaded();
 						this.loading = false;
 						// axios.post('/api/status/view', {
-						// 	'_v': vids,
+						//  '_v': vids,
 						// });
 					} else {
 						$state.complete();
@@ -915,11 +879,6 @@
 					}
 					$('.postCommentsLoader').addClass('d-none');
 					$('.postCommentsContainer').removeClass('d-none');
-					// setTimeout(function() {
-					// 	document.querySelectorAll('.status-comment .postCommentsContainer .comment-body a').forEach(function(i, e) {
-					// 		i.href = App.util.format.rewriteLinks(i);
-					// 	});
-					// }, 500);
 				}).catch(error => {
 					if(!error.response) {
 						$('.postCommentsLoader .lds-ring')

resources/assets/js/components/partials/ContextMenu.vue

@@ -636,7 +636,7 @@
 			},
 
 			statusUrl(status) {
-				if(status.local == true) {
+				if(status.account.local == true) {
 					return status.url;
 				}
 
@@ -644,7 +644,7 @@
 			},
 
 			profileUrl(status) {
-				if(status.local == true) {
+				if(status.account.local == true) {
 					return status.account.url;
 				}
 

resources/assets/js/components/partials/PollCard.vue

@@ -1,6 +1,6 @@
 <template>
 <div>
-	<div class="card shadow-none border rounded-0" :class="{'border-top-0': !showBorderTop}">
+	<div class="card shadow-none rounded-0" :class="{ border: showBorder, 'border-top-0': !showBorderTop}">
 		<div class="card-body">
 			<div class="media">
 				<img class="rounded-circle box-shadow mr-2" :src="status.account.avatar" width="32px" height="32px" alt="avatar">
@@ -149,6 +149,11 @@
 				type: Object
 			},
 
+			showBorder: {
+				type: Boolean,
+				default: true
+			},
+
 			showBorderTop: {
 				type: Boolean,
 				default: false

resources/assets/js/components/presenter/PhotoPresenter.vue

@@ -29,7 +29,8 @@
 				:alt="altText(status)"
 				:width="width()"
 				:height="height()"
-				onerror="this.onerror=null;this.src='/storage/no-preview.png'">
+				onerror="this.onerror=null;this.src='/storage/no-preview.png'"
+				@click.prevent="toggleLightbox">
 
 				<p v-if="!status.sensitive && sensitive"
 					@click="status.sensitive = true"
@@ -116,6 +117,10 @@
 				this.$emit('togglecw');
 			},
 
+			toggleLightbox() {
+				this.$emit('lightbox');
+			},
+
 			width() {
 				if( !this.status.media_attachments[0].meta ||
 					!this.status.media_attachments[0].meta.original ||

resources/assets/js/lib/ace/mode-dot.js

@@ -1,417 +0,0 @@
-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;
-                        }
-                    });
-                })();
-            

resources/assets/js/lib/ace/theme-monokai.js

@@ -1,112 +0,0 @@
-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;
-                        }
-                    });
-                })();
-            

resources/assets/js/quill.js

@@ -1 +0,0 @@
-window.Quill = require('quill');

resources/assets/sass/quill.scss

@@ -1 +0,0 @@
-@import '~quill/dist/quill.snow.css';

resources/views/admin/pages/home.blade.php

@@ -1,6 +1,4 @@
-@extends('admin.partial.template')
+@extends('admin.partial.template-full')
-
-@include('admin.settings.sidebar')
 
 @section('section')
   <div class="title">
@@ -20,7 +18,7 @@
             <span>Slug</span>
           </th>
           <th scope="col" class="border-0" width="15%">
-            <span>Active</span>
+            <span>State</span>
           </th>
           <th scope="col" class="border-0" width="30%">
             <span>Updated</span>
@@ -34,7 +32,11 @@
             <a href="{{$page->editUrl()}}">{{$page->id}}</a>
           </th>
           <td>{{$page->slug}}</td>
-          <td>{{$page->active ? 'active':'inactive'}}</td>
+          @if($page->active)
+          <td class="text-success font-weight-bold">Live</td>
+          @else
+          <td class="text-muted">Draft</td>
+          @endif
           <td>{{$page->updated_at->diffForHumans(null, true, true, true)}}</td>
         </tr>
         @endforeach
@@ -97,4 +99,4 @@
     </form>
   </div>
   @endif
-@endsection
+@endsection

resources/views/admin/settings/config.blade.php

@@ -1,94 +0,0 @@
-@extends('admin.partial.template')
-
-@include('admin.settings.sidebar')
-
-@section('section')
-  <div class="title">
-    <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="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>
-  <hr>
-  <div>
-    <div id="editor">{{$config}}</div>
-    <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
-@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

routes/web.php

@@ -47,9 +47,6 @@ Route::domain(config('pixelfed.domain.admin'))->prefix('i/admin')->group(functio
 	Route::get('media/show/{id}', 'AdminController@mediaShow');
 	Route::get('settings', 'AdminController@settings')->name('admin.settings');
 	Route::post('settings', 'AdminController@settingsHomeStore');
-	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/pages', 'AdminController@settingsPages')->name('admin.settings.pages');
 	Route::get('settings/pages/edit', 'PageController@edit')->name('admin.settings.pages.edit');

webpack.mix.js

@@ -3,8 +3,7 @@ let mix = require('laravel-mix');
 mix.sass('resources/assets/sass/app.scss', 'public/css')
 .sass('resources/assets/sass/appdark.scss', 'public/css')
 .sass('resources/assets/sass/admin.scss', 'public/css')
-.sass('resources/assets/sass/landing.scss', 'public/css')
+.sass('resources/assets/sass/landing.scss', 'public/css').version();
-.sass('resources/assets/sass/quill.scss', 'public/css').version();
 
 mix.js('resources/assets/js/app.js', 'public/js')
 .js('resources/assets/js/activity.js', 'public/js')
@@ -18,10 +17,6 @@ mix.js('resources/assets/js/app.js', 'public/js')
 .js('resources/assets/js/search.js', 'public/js')
 .js('resources/assets/js/developers.js', 'public/js')
 .js('resources/assets/js/loops.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/hashtag.js', 'public/js')
 .js('resources/assets/js/collectioncompose.js', 'public/js')
 .js('resources/assets/js/collections.js', 'public/js')