Merge branch 'release/0.6.0'

Author: ilyvion

.travis.yml

@@ -10,7 +10,7 @@ install:
 - npm update -g
 - npm install
 script:
-- grunt build
+- grunt
 - npm run print-userscript-banner
 deploy:
   provider: releases

Gruntfile.js

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2016-2018 Alexander Krivács Schrøder <alexschrod@gmail.com>
+ * Copyright (C) 2016-2019 Alexander Krivács Schrøder <alexschrod@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 const resolve = require('rollup-plugin-node-resolve');
 const commonJs = require('rollup-plugin-commonjs');
 const virtual = require('rollup-plugin-virtual');
-const babel  = require('rollup-plugin-babel');
+const babel = require('rollup-plugin-babel');
 
 const licenseBanner = require('./licenseBanner');
 const userScriptBanner = require('./userScriptBanner');
@@ -137,6 +137,7 @@ module.exports = function (grunt) {
 					'assets/generated/extraNav.html': 'assets/templates/extraNav.html',
 					'assets/generated/settings.html': 'assets/templates/settings.html',
 					'assets/generated/editComicData.html': 'assets/templates/editComicData.html',
+					'assets/generated/editLog.html': 'assets/templates/editLog.html',
 					'assets/generated/addItem.html': 'assets/templates/addItem.html',
 					'assets/generated/setTitle.html': 'assets/templates/setTitle.html',
 					'assets/generated/setTagline.html': 'assets/templates/setTagline.html',
@@ -146,7 +147,8 @@ module.exports = function (grunt) {
 					'assets/generated/itemDetails.html': 'assets/templates/itemDetails.html',
 					'assets/generated/comicNav.html': 'assets/templates/comicNav.html',
 					'assets/generated/changeLog.html': 'assets/templates/changeLog.html',
-					'assets/generated/date.html': 'assets/templates/date.html'
+					'assets/generated/date.html': 'assets/templates/date.html',
+					'assets/generated/comic.html': 'assets/templates/comic.html'
 				}
 			}
 		},
@@ -194,16 +196,18 @@ module.exports = function (grunt) {
 	require('load-grunt-tasks')(grunt);
 
 	// Register the tasks.
-	grunt.registerTask('default', ['build']);
+	grunt.registerTask('default', ['build', 'check', 'uglify']);
 	grunt.registerTask('build', [
 		'compass',            // Compile CSS
 		'htmlmin',            // Minify HTML templates
 		'filesToJavascript',  // Convert HTML templates to JS variables
 		'concat:variables',   // Create finished variable.pass2.js file
-		'flow',               // Type-checking
-		'eslint',             // Check for lint
 		'rollup:main',        // Rollup all the javascript files into one
 		'concat:source',      // Add banner to rollup result
-		'uglify',             // Minify the javascript
+	]);
+
+	grunt.registerTask('check', [
+		'flow',               // Type-checking
+		'eslint',             // Check for lint
 	]);
 };

LICENSE

@@ -1,6 +1,6 @@
 // @flow
 /*
- * Copyright (C) 2016-2018 Alexander Krivács Schrøder <alexschrod@gmail.com>
+ * Copyright (C) 2016-2019 Alexander Krivács Schrøder <alexschrod@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

assets/js/app.js

@@ -1,6 +1,6 @@
 // @flow
 /*
- * Copyright (C) 2016-2018 Alexander Krivács Schrøder <alexschrod@gmail.com>
+ * Copyright (C) 2016-2019 Alexander Krivács Schrøder <alexschrod@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,11 +21,7 @@
 const developmentMode = false;
 
 function getSiteUrl() {
-	if (developmentMode) {
-		return 'http://localhost:3000/';
-	} else {
-		return 'https://questionablextensions.net/';
-	}
+	return 'https://questionablextensions.net/';
 }
 
 function getWebserviceBaseUrl() {
@@ -38,6 +34,7 @@ function getWebserviceBaseUrl() {
 
 const comicDataUrl = getWebserviceBaseUrl() + 'comicdata/';
 const itemDataUrl = getWebserviceBaseUrl() + 'itemdata/';
+const editLogUrl = getWebserviceBaseUrl() + 'log';
 
 const constants = {
 	settingsKey: 'settings',
@@ -46,32 +43,44 @@ const constants = {
 	siteUrl: getSiteUrl(),
 	comicDataUrl,
 	itemDataUrl,
+	editLogUrl,
 
 	// Comics after 3132 should have a tagline
 	taglineThreshold: 3132,
 
+	excludedComicsUrl: comicDataUrl + 'excluded',
 	addItemToComicUrl: comicDataUrl + 'additem',
 	removeItemFromComicUrl: comicDataUrl + 'removeitem',
 	setComicTitleUrl: comicDataUrl + 'settitle',
 	setComicTaglineUrl: comicDataUrl + 'settagline',
 	setPublishDateUrl: comicDataUrl + 'setpublishdate',
 	setGuestComicUrl: comicDataUrl + 'setguest',
 	setNonCanonUrl: comicDataUrl + 'setnoncanon',
+	setNoCastUrl: comicDataUrl + 'setnocast',
+	setNoLocationUrl: comicDataUrl + 'setnolocation',
+	setNoStorylineUrl: comicDataUrl + 'setnostoryline',
+	setNoTitleUrl: comicDataUrl + 'setnotitle',
+	setNoTaglineUrl: comicDataUrl + 'setnotagline',
 
+	itemImageUrl: itemDataUrl + 'image/',
 	itemFriendDataUrl: itemDataUrl + 'friends/',
 	itemLocationDataUrl: itemDataUrl + 'locations/',
 	setItemDataPropertyUrl: itemDataUrl + 'setproperty',
 
-	characterImageBaseUrl: getSiteUrl() + 'images/characters/',
-	characterImageExtension: 'png',
-
 	comicExtensions: ['png', 'gif', 'jpg'],
 
 	comicdataLoadingEvent: 'comicdata-loading',
 	comicdataLoadedEvent: 'comicdata-loaded',
 	comicdataErrorEvent: 'comicdata-error',
+
+	itemdataLoadingEvent: 'itemdata-loading',
+	itemdataLoadedEvent: 'itemdata-loaded',
+	itemdataErrorEvent: 'itemdata-error',
+
 	itemsChangedEvent: 'items-changed',
 
+	maintenanceEvent: 'maintenance',
+
 	messages: {
 		maintenance: 'The Questionable Extensions' +
 			' server is currently undergoing maintenance.' +

assets/js/constants.js

@@ -1,6 +1,6 @@
 // @flow
 /*
- * Copyright (C) 2016-2018 Alexander Krivács Schrøder <alexschrod@gmail.com>
+ * Copyright (C) 2016-2019 Alexander Krivács Schrøder <alexschrod@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

assets/js/modules/angular-app.js

@@ -1,6 +1,6 @@
 // @flow
 /*
- * Copyright (C) 2016-2018 Alexander Krivács Schrøder <alexschrod@gmail.com>
+ * Copyright (C) 2016-2019 Alexander Krivács Schrøder <alexschrod@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -51,13 +51,19 @@ export type ComicItem = {
 
 export type ComicData = {
 	comic: number;
+	imageType: "unknown" | "png" | "gif" | "jpeg",
 	hasData: boolean;
 	publishDate: ?string;
 	isAccuratePublishDate: ?boolean;
 	title: ?string;
 	tagline: ?string;
 	isGuestComic: ?boolean;
 	isNonCanon: ?boolean;
+	hasNoCast: ?boolean;
+	hasNoLocation: ?boolean;
+	hasNoStoryline: ?boolean;
+	hasNoTitle: ?boolean;
+	hasNoTagline: ?boolean;
 	news: ?string;
 	previous: ?number;
 	next: ?number;

assets/js/modules/angular/api/comicData.js

@@ -1,6 +1,6 @@
 // @flow
 /*
- * Copyright (C) 2016-2018 Alexander Krivács Schrøder <alexschrod@gmail.com>
+ * Copyright (C) 2016-2019 Alexander Krivács Schrøder <alexschrod@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,4 +47,10 @@ export type DecoratedItemData = ItemData & {
 	highlightColor: string;
 	locations: ItemRelationData[];
 	friends: ItemRelationData[];
+	imageUrls: string[];
+};
+
+export type ItemImageData = {
+	id: number;
+	crC32CHash: number;
 };

assets/js/modules/angular/api/itemData.js

@@ -0,0 +1,30 @@
+// @flow
+/*
+ * Copyright (C) 2016-2019 Alexander Krivács Schrøder <alexschrod@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+export type LogEntry = {
+	identifier: string;
+	dateTime: string;
+	action: string;
+}
+
+export type LogEntryData = {
+	logEntries: LogEntry[];
+	page: number;
+	pageCount: number;
+	logEntryCount: number;
+}

assets/js/modules/angular/api/logEntryData.js

@@ -1,6 +1,6 @@
 // @flow
 /*
- * Copyright (C) 2016-2018 Alexander Krivács Schrøder <alexschrod@gmail.com>
+ * Copyright (C) 2016-2019 Alexander Krivács Schrøder <alexschrod@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,19 +27,22 @@ import titleController from './controllers/titleController';
 
 import colorService from './services/colorService';
 import comicService from './services/comicService';
+import itemService from './services/itemService';
 import eventFactory from './services/eventFactory';
 import eventService from './services/eventService';
 import messageReportingService from './services/messageReportingService';
 import styleService from './services/styleService';
 
 import donutDirective from './directives/donutDirective';
+import fileDataDirective from './directives/fileDataDirective';
 import onErrorDirective from './directives/onErrorDirective';
 import qcAddItemDirective from './directives/qcAddItemDirective';
 import qcChangeLogDirective from './directives/qcChangeLogDirective';
 import qcComicDirective from './directives/qcComicDirective';
 import qcComicNavDirective from './directives/qcComicNavDirective';
 import qcDateDirective from './directives/qcDateDirective';
 import qcEditComicDataDirective from './directives/qcEditComicDataDirective';
+import qcEditLogDirective from './directives/qcEditLogDirective';
 import qcExtraDirective from './directives/qcExtraDirective';
 import qcExtraNavDirective from './directives/qcExtraNavDirective';
 import qcItemDetailsDirective from './directives/qcItemDetailsDirective';
@@ -61,19 +64,22 @@ export default function (app: AngularModule) {
 
 	colorService(app);
 	comicService(app);
+	itemService(app);
 	eventFactory(app);
 	eventService(app);
 	messageReportingService(app);
 	styleService(app);
 
 	donutDirective(app);
+	fileDataDirective(app);
 	onErrorDirective(app);
 	qcAddItemDirective(app);
 	qcChangeLogDirective(app);
 	qcComicDirective(app);
 	qcComicNavDirective(app);
 	qcDateDirective(app);
 	qcEditComicDataDirective(app);
+	qcEditLogDirective(app);
 	qcExtraDirective(app);
 	qcExtraNavDirective(app);
 	qcItemDetailsDirective(app);