Merge pull request #284 from PretendoNetwork/feat/even-more-jsx

Porting more to JSX and typescript

Author: mrjvs

apps/juxtaposition-ui/package.json

@@ -56,6 +56,7 @@
   },
   "devDependencies": {
     "@pretendonetwork/eslint-config": "^0.1.3",
+    "@types/cookie-parser": "^1.4.10",
     "@types/express-session": "^1.18.2",
     "@types/hashmap": "^2.3.4",
     "@types/luxon": "^3.7.1",

…taposition-ui/src/middleware/checkBan.ts …aposition-ui/src/middleware/checkBan.tsxapps/juxtaposition-ui/src/middleware/checkBan.ts renamed to apps/juxtaposition-ui/src/middleware/checkBan.tsx apps/juxtaposition-ui/src/middleware/checkBan.ts renamed to apps/juxtaposition-ui/src/middleware/checkBan.tsx

@@ -2,6 +2,8 @@ import moment from 'moment';
 import { database as db } from '@/database';
 import { config } from '@/config';
 import { humanDate, humanFromNow } from '@/util';
+import { WebLoginView } from '@/services/juxt-web/views/web/loginView';
+import { buildContext } from '@/services/juxt-web/views/context';
 import type { RequestHandler } from 'express';
 
 export const checkBan: RequestHandler = async (request, response, next) => {
@@ -42,7 +44,7 @@ export const checkBan: RequestHandler = async (request, response, next) => {
 	if (!accessAllowed) {
 		response.status(500);
 		if (request.directory === 'web') {
-			return response.render('web/login.ejs', { toast: 'No access. Must be tester or dev', redirect: request.originalUrl });
+			return response.jsx(<WebLoginView ctx={buildContext(response)} toast="No access. Must be tester or dev" redirect={request.originalUrl} />);
 		} else {
 			return response.render('portal/error_fatal.ejs', {
 				code: 5989999,
@@ -80,10 +82,7 @@ export const checkBan: RequestHandler = async (request, response, next) => {
 		banMessage += `\n\nIf you have any questions, please contact the moderators on the Pretendo Network Forum (https://preten.do/ban-appeal/).`;
 
 		if (request.directory === 'web') {
-			return response.render('web/login.ejs', {
-				toast: banMessage,
-				redirect: request.originalUrl
-			});
+			return response.jsx(<WebLoginView ctx={buildContext(response)} toast={banMessage} redirect={request.originalUrl} />);
 		} else {
 			return response.render(request.directory + '/error_fatal.ejs', {
 				message: banMessage,

apps/juxtaposition-ui/src/middleware/consoleAuth.ts

@@ -24,7 +24,7 @@ export const consoleAuth: RequestHandler = async (request, response, next) => {
 	request.paramPackData = ppack ? decodeParamPack(ppack) : null;
 	response.header('X-Nintendo-WhiteList', config.whitelist);
 
-	if (!request.user) {
+	if (!request.user && request.cookies.access_token) {
 		try {
 			// Developer accounts may also use an OAuth token for console frontends
 			const user = await getUserDataFromToken(request.cookies.access_token);

…ition-ui/src/middleware/detectVersion.js …ition-ui/src/middleware/detectVersion.tsapps/juxtaposition-ui/src/middleware/detectVersion.js renamed to apps/juxtaposition-ui/src/middleware/detectVersion.ts apps/juxtaposition-ui/src/middleware/detectVersion.js renamed to apps/juxtaposition-ui/src/middleware/detectVersion.ts

@@ -1,7 +1,7 @@
 import { processLanguage } from '@/util';
+import type { Request, RequestHandler } from 'express';
 
-export async function detectVersion(request, response, next) {
-	request.timerDate = Date.now();
+export const detectVersion: RequestHandler = async (request, response, next) => {
 	// Check the domain and set the directory
 	if (includes(request, 'juxt')) {
 		request.directory = 'web';
@@ -13,8 +13,8 @@ export async function detectVersion(request, response, next) {
 	request.isWrite = request.method === 'POST' || request.method === 'PUT' || request.method === 'DELETE';
 
 	next();
-}
+};
 
-function includes(request, domain) {
+function includes(request: Request, domain: string): boolean {
 	return request.subdomains.findIndex(element => element.includes(domain)) !== -1;
 }

…aposition-ui/src/middleware/discovery.js …position-ui/src/middleware/discovery.tsxapps/juxtaposition-ui/src/middleware/discovery.js renamed to apps/juxtaposition-ui/src/middleware/discovery.tsx apps/juxtaposition-ui/src/middleware/discovery.js renamed to apps/juxtaposition-ui/src/middleware/discovery.tsx

@@ -1,7 +1,10 @@
 import { database as db } from '@/database';
 import { config } from '@/config';
+import { WebLoginView } from '@/services/juxt-web/views/web/loginView';
+import { buildContext } from '@/services/juxt-web/views/context';
+import type { RequestHandler } from 'express';
 
-export async function checkDiscovery(request, response, next) {
+export const checkDiscovery: RequestHandler = async (request, response, next) => {
 	const discovery = await db.getEndPoint(config.serverEnvironment);
 
 	if (!discovery || discovery.status !== 0) {
@@ -19,7 +22,7 @@ export async function checkDiscovery(request, response, next) {
 				break;
 		}
 		if (request.directory === 'web') {
-			return response.render('web/login.ejs', { toast: message, redirect: request.originalUrl });
+			return response.jsx(<WebLoginView ctx={buildContext(response)} toast={message} redirect={request.originalUrl} />);
 		} else {
 			return response.render('portal/error_fatal.ejs', {
 				message,
@@ -33,4 +36,4 @@ export async function checkDiscovery(request, response, next) {
 	}
 
 	next();
-}
+};

apps/juxtaposition-ui/src/middleware/jsx.ts

@@ -15,7 +15,7 @@ export function renderJsx(el: ReactElement): string {
  */
 export const jsxRenderer: RequestHandler = (request, response, next) => {
 	response.jsx = (el, addDoctype): typeof response => {
-		const prefix = addDoctype ? htmlDoctype + '\n' : '';
+		const prefix = (addDoctype ?? true) ? htmlDoctype + '\n' : '';
 		response.send(prefix + renderJsx(el));
 		return response;
 	};

apps/juxtaposition-ui/src/models/endpoint.js

@@ -0,0 +1,34 @@
+import { Schema, model } from 'mongoose';
+import type { HydratedDocument } from 'mongoose';
+
+export type Endpoint = {
+	status: number;
+	server_access_level: string;
+	topics: boolean;
+	guest_access: boolean;
+	new_users: boolean;
+	host: string;
+	api_host: string;
+	portal_host: string;
+	n3ds_host: string;
+} & Document;
+
+export type HydratedEndpointDocument = HydratedDocument<Endpoint>;
+
+export const endpointSchema = new Schema<Endpoint>({
+	status: Number,
+	server_access_level: String,
+	topics: Boolean,
+	guest_access: Boolean,
+	new_users: {
+		type: Boolean,
+		default: true
+	},
+	host: String,
+	api_host: String,
+	portal_host: String,
+	n3ds_host: String
+});
+
+export const Endpoint = model('Endpoint', endpointSchema);
+export const ENDPOINT = Endpoint;

apps/juxtaposition-ui/src/models/endpoint.ts

@@ -0,0 +1,68 @@
+import { Schema, model } from 'mongoose';
+import type { HydratedDocument, Model } from 'mongoose';
+
+export interface IReport {
+	pid: number;
+	reported_by: number;
+	post_id: string;
+	reason: number;
+	message: string;
+	created_at: Date;
+	resolved?: boolean | null;
+	note?: string | null;
+	resolved_by?: number | null;
+	resolved_at?: Date | null;
+}
+
+export type ReportModel = Model<IReport>;
+export type HydratedReportDocument = HydratedDocument<IReport>;
+
+export interface IReportMethods {
+	resolve(pid: number, note: string | null): Promise<void>;
+}
+
+export const ReportSchema = new Schema<IReport, ReportModel, IReportMethods>({
+	pid: {
+		type: Number,
+		required: true
+	},
+	reported_by: {
+		type: Number,
+		required: true
+	},
+	post_id: {
+		type: String,
+		required: true
+	},
+	reason: {
+		type: Number,
+		required: true
+	},
+	message: {
+		type: String,
+		required: true
+	},
+	created_at: {
+		type: Date,
+		required: true,
+		default: new Date()
+	},
+	resolved: {
+		type: Boolean,
+		default: false
+	},
+	note: String,
+	resolved_by: Number,
+	resolved_at: Date
+});
+
+ReportSchema.method<HydratedReportDocument>('resolve', async function (pid, note) {
+	this.set('resolved', true);
+	this.set('resolved_by', pid);
+	this.set('resolved_at', new Date());
+	this.set('note', note);
+	await this.save();
+});
+
+export const Report = model<IReport, ReportModel>('Report', ReportSchema);
+export const REPORT = Report;