Skip to content

Commit

Permalink
refactor: use consistent import ordering
Browse files Browse the repository at this point in the history
- global modules
- NPM modules (defaults first, then expansions)
- local modules
  • Loading branch information
Josh Moore committed Oct 16, 2023
1 parent 5832a69 commit 5d06745
Show file tree
Hide file tree
Showing 10 changed files with 40 additions and 25 deletions.
4 changes: 3 additions & 1 deletion backend/UserConfig.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { UserConfiguration, UserConfigTypeChecker } from 'ass';

import fs from 'fs-extra';
import { path } from '@tycrek/joint';
import { UserConfiguration, UserConfigTypeChecker } from 'ass';

import { log } from './log';

const FILEPATH = path.join('.ass-data/userconfig.json');
Expand Down
10 changes: 6 additions & 4 deletions backend/app.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
import express, { Request, Response, NextFunction, RequestHandler, json as BodyParserJson } from 'express';
import { ServerConfiguration } from 'ass';

import fs from 'fs-extra';
import tailwindcss from 'tailwindcss';
import session from 'express-session';
import MemoryStore from 'memorystore';
import fs from 'fs-extra';
import express, { Request, Response, NextFunction, RequestHandler, json as BodyParserJson } from 'express';
import { path, isProd } from '@tycrek/joint';
import { epcss } from '@tycrek/express-postcss';
import tailwindcss from 'tailwindcss';

import { log } from './log';
import { ensureFiles } from './data';
import { UserConfig } from './UserConfig';
import { ServerConfiguration } from 'ass';
import { MySql } from './sql/mysql';
import { buildFrontendRouter } from './routers/_frontend';

Expand Down
6 changes: 4 additions & 2 deletions backend/data.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { AssFile, AssUser, NID, FilesSchema, UsersSchema } from 'ass';

import fs from 'fs-extra';
import { path } from '@tycrek/joint';
import { nanoid } from './generators';

import { log } from './log';
import { AssFile, AssUser, NID, FilesSchema, UsersSchema } from 'ass';
import { nanoid } from './generators';
import { UserConfig } from './UserConfig';
import { MySql } from './sql/mysql';

Expand Down
2 changes: 1 addition & 1 deletion backend/generators.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import fs from 'fs-extra';
import { randomBytes, getRandomValues } from 'crypto';
import cryptoRandomString from 'crypto-random-string';
import { randomBytes, getRandomValues } from 'crypto';
import { path } from '@tycrek/joint';

type Length = { length: number, gfyLength?: number };
Expand Down
3 changes: 2 additions & 1 deletion backend/operations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ import sharp from 'sharp';
import Vibrant from 'node-vibrant';
import ffmpeg from 'ffmpeg-static';
import { exec } from 'child_process';
import { removeLocation } from '@xoi/gps-metadata-remover';
import { isProd } from '@tycrek/joint';
import { removeLocation } from '@xoi/gps-metadata-remover';

//@ts-ignore
import shell from 'any-shell-escape';

Expand Down
5 changes: 3 additions & 2 deletions backend/routers/_frontend.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { path } from '@tycrek/joint';
import { Router } from 'express';
import { UserConfig } from '../UserConfig';
import { path } from '@tycrek/joint';

import { App } from '../app';
import { UserConfig } from '../UserConfig';

/**
* Builds a basic router for loading a page with frontend JS
Expand Down
10 changes: 6 additions & 4 deletions backend/routers/api.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { Router, json as BodyParserJson, RequestHandler } from 'express';
import { AssUser, AssUserNewReq } from 'ass';

import * as bcrypt from 'bcrypt'
import { log } from '../log';
import { UserConfig } from '../UserConfig';
import { Router, json as BodyParserJson, RequestHandler } from 'express';

import * as data from '../data';
import { AssUser, AssUserNewReq } from 'ass';
import { log } from '../log';
import { nanoid } from '../generators';
import { UserConfig } from '../UserConfig';
import { MySql } from '../sql/mysql';

/**
Expand Down
14 changes: 8 additions & 6 deletions backend/routers/index.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
import { BusBoyFile, AssFile } from 'ass';

import fs from 'fs-extra';
import bb from 'express-busboy';
import { Router } from 'express';
import crypto from 'crypto';
import { log } from '../log';
import { UserConfig } from '../UserConfig';
import { random } from '../generators';
import { BusBoyFile, AssFile } from 'ass';
import { getFileS3, uploadFileS3 } from '../s3';
import { Router } from 'express';
import { Readable } from 'stream';

import * as data from '../data';
import { log } from '../log';
import { App } from '../app';
import { random } from '../generators';
import { UserConfig } from '../UserConfig';
import { getFileS3, uploadFileS3 } from '../s3';

const router = Router({ caseSensitive: true });

Expand Down
5 changes: 3 additions & 2 deletions backend/s3.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import { UserConfig } from './UserConfig';
import { log } from './log';
import {
S3Client,
S3ClientConfig,
Expand All @@ -14,6 +12,9 @@ import {
AbortMultipartUploadCommand,
} from "@aws-sdk/client-s3";

import { log } from './log';
import { UserConfig } from './UserConfig';

const NYR = 'S3 not ready';

/**
Expand Down
6 changes: 4 additions & 2 deletions backend/sql/mysql.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { AssFile, AssUser, NID, UploadToken } from 'ass';

import mysql, { Pool } from 'mysql2/promise';
import { UserConfig } from '../UserConfig';

import { log } from '../log';
import { AssFile, AssUser, NID, UploadToken } from 'ass';
import { UserConfig } from '../UserConfig';

type TableNamesType = 'assfiles' | 'assusers' | 'asstokens';

Expand Down

0 comments on commit 5d06745

Please sign in to comment.