update, prepare for flattener

Author: dancrew32

back/db/app/app_setup.ts

@@ -22,7 +22,7 @@ export async function recreateAppTable(tx: Transaction): Promise<void> {
 }
 
 export async function createFakeApps(tx: Transaction): Promise<void> {
-  const fakeNames = await pTimes(50, fakeCompanyName);
+  const fakeNames = await pTimes(0, fakeCompanyName);
   const appNames: string[] = ['One', ...fakeNames.map(({ name }) => name)];
   await pMap(
     appNames,

back/db/db.ts

@@ -3,29 +3,14 @@ import knex, { Knex } from 'knex';
 import log from '../../common/log';
 import { isDevelopment, isTest } from '../util/env';
 import { formatSQL } from './db_format';
-
-/*
-psql -U postgres
-
--- Main
-CREATE DATABASE robot;
-CREATE USER robot WITH ENCRYPTED PASSWORD 'robot';
-GRANT ALL ON DATABASE robot TO robot;
-ALTER DATABASE robot OWNER TO robot;
-GRANT ALL PRIVILEGES ON DATABASE robot TO robot;
-GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO robot;
-
--- Test
-CREATE DATABASE robot_test;
-CREATE USER robot_test WITH ENCRYPTED PASSWORD 'robot_test';
-GRANT ALL ON DATABASE robot_test TO robot_test;
-ALTER DATABASE robot_test OWNER TO robot_test;
-GRANT ALL PRIVILEGES ON DATABASE robot_test TO robot_test;
-GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO robot_test;
-*/
+import { getDatabaseInitSQL } from './db_setup';
 
 const key = isTest() ? 'robot_test' : 'robot';
 
+if (isDevelopment() || isTest()) {
+  log.debug(formatSQL(getDatabaseInitSQL(key)));
+}
+
 export type Transaction = Knex.Transaction;
 export type DB = knex.Knex<any, unknown[]> | Transaction;
 export type QueryBuilder = Knex.QueryBuilder;
@@ -49,7 +34,8 @@ export const db = knex({
 
 db.on('query', async ({ sql }) => {
   if (isDevelopment()) {
-    log.info(formatSQL(sql));
+    log.debug(formatSQL(getDatabaseInitSQL(key)));
+    log.debug(formatSQL(sql));
   }
 });
 

back/db/db_format.ts

@@ -7,7 +7,7 @@ const FORMAT_PARAMS: FormatOptionsWithLanguage = {
   keywordCase: 'upper',
   functionCase: 'upper',
   expressionWidth: 100,
-  linesBetweenQueries: 2,
+  linesBetweenQueries: 0,
 };
 
 export function formatSQL(sql: string): string {

back/db/db_setup.ts

@@ -0,0 +1,11 @@
+export function getDatabaseInitSQL(key: string): string {
+  return `
+psql -U postgres
+CREATE DATABASE ${key};
+CREATE USER robot WITH ENCRYPTED PASSWORD '${key}';
+GRANT ALL ON DATABASE robot TO ${key};
+ALTER DATABASE ${key} OWNER TO ${key};
+GRANT ALL PRIVILEGES ON DATABASE ${key} TO ${key};
+GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO ${key};
+`;
+}

back/db/user/user_setup.ts

@@ -43,7 +43,7 @@ export async function createFakeUsers(tx: Transaction): Promise<void> {
     },
     tx,
   });
-  const fakeNames = await pTimes(50, fakePersonName);
+  const fakeNames = await pTimes(2, fakePersonName);
 
   await pMap(
     fakeNames,

common/log.ts

@@ -1,6 +1,11 @@
 const log = {
   // eslint-disable-next-line no-console
   info: (...args: any[]) => console.info(...args),
+  // eslint-disable-next-line no-console, @typescript-eslint/no-unused-vars
+  debug: (...args: any[]) => {
+    // do nothing
+  },
+  // debug: (...args: any[]) => console.debug(...args),
   // eslint-disable-next-line no-console
   warn: (...args: any[]) => console.warn(...args),
   // eslint-disable-next-line no-console

front/Login.tsx

@@ -12,11 +12,12 @@ interface ModalProps {
   title: string;
 }
 
+const root = document.getElementById('modal-root');
+if (!root) {
+  throw Error('missing modal root');
+}
+
 export function Modal({ children, title, onClose, visible }: ModalProps) {
-  const root = document.getElementById('modal-root');
-  if (!root) {
-    throw Error('missing modal root');
-  }
   return (
     <Dialog
       prefixCls="modal"
@@ -25,6 +26,9 @@ export function Modal({ children, title, onClose, visible }: ModalProps) {
       visible={visible}
       getContainer={root}
       destroyOnClose
+      keyboard={true}
+      animation="fade"
+      maskAnimation="fade"
     >
       {children}
     </Dialog>

front/components/modal/Modal.tsx

@@ -209,6 +209,7 @@
   bottom: 0;
   background-color: #373737;
   background-color: #37373799;
+  background-color: #ffffff55;
   height: 100%;
   filter: alpha(opacity=50);
   z-index: 1050;

front/components/modal/modal.css

@@ -1,5 +1,5 @@
 make:
-	vim makefile
+	vim -o `fzf`
 
 deps:
 	npm i