mirror of
https://github.com/ZeppelinBot/Zeppelin.git
synced 2025-05-10 04:25:01 +00:00
Reformat all files with Prettier
This commit is contained in:
Dragory
parent
0cde0d46d2
commit
ac79eb09f5
206 changed files with 727 additions and 888 deletions
|
|
@ -1,3 +1,3 @@
|
|||
module.exports = {
|
||||
collapseWhitespace: false
|
||||
collapseWhitespace: false,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@ function buildQueryString(params: QueryParamObject) {
|
|||
return (
|
||||
"?" +
|
||||
Array.from(Object.entries(params))
|
||||
.map(pair => `${encodeURIComponent(pair[0])}=${encodeURIComponent(pair[1] || "")}`)
|
||||
.map((pair) => `${encodeURIComponent(pair[0])}=${encodeURIComponent(pair[1] || "")}`)
|
||||
.join("&")
|
||||
);
|
||||
}
|
||||
|
||||
export function request(resource, fetchOpts: RequestInit = {}) {
|
||||
return fetch(`${apiUrl}/${resource}`, fetchOpts).then(async res => {
|
||||
return fetch(`${apiUrl}/${resource}`, fetchOpts).then(async (res) => {
|
||||
if (!res.ok) {
|
||||
if (res.status === 401) {
|
||||
RootStore.dispatch("auth/expiredLogin");
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ Vue.directive("trim-indents", {
|
|||
|
||||
el.innerHTML = withoutStartEndWhitespace
|
||||
.split("\n")
|
||||
.map(line => line.slice(spacesToTrim))
|
||||
.map((line) => line.slice(spacesToTrim))
|
||||
.join("\n");
|
||||
},
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,18 +1,20 @@
|
|||
<!doctype html>
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport"
|
||||
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
|
||||
<meta http-equiv="X-UA-Compatible" content="ie=edge">
|
||||
<title>Zeppelin - Moderation bot for Discord</title>
|
||||
</head>
|
||||
<body>
|
||||
<noscript>
|
||||
<h1>Zeppelin</h1>
|
||||
The Zeppelin website requires JavaScript to load.
|
||||
</noscript>
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta
|
||||
name="viewport"
|
||||
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"
|
||||
/>
|
||||
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
|
||||
<title>Zeppelin - Moderation bot for Discord</title>
|
||||
</head>
|
||||
<body>
|
||||
<noscript>
|
||||
<h1>Zeppelin</h1>
|
||||
The Zeppelin website requires JavaScript to load.
|
||||
</noscript>
|
||||
|
||||
<div id="app"></div>
|
||||
</body>
|
||||
<div id="app"></div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<div id="error"></div>
|
||||
<div class="wrapper">
|
||||
<div class="logo-column">
|
||||
<img class="logo" src="./img/logo.png" alt="Zeppelin Logo">
|
||||
<img class="logo" src="./img/logo.png" alt="Zeppelin Logo" />
|
||||
</div>
|
||||
<div class="info-column">
|
||||
<h1>Zeppelin</h1>
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ export const GuildStore: Module<GuildState, RootState> = {
|
|||
Vue.set(
|
||||
state.guildPermissionAssignments,
|
||||
guildId,
|
||||
permissionAssignments.map(p => ({
|
||||
permissionAssignments.map((p) => ({
|
||||
...p,
|
||||
permissions: new Set(p.permissions),
|
||||
})),
|
||||
|
|
@ -102,12 +102,12 @@ export const GuildStore: Module<GuildState, RootState> = {
|
|||
if (permissions.length === 0) {
|
||||
// No permissions -> remove permission assignment
|
||||
guildPermissionAssignments.splice(
|
||||
guildPermissionAssignments.findIndex(p => p.target_id === targetId && p.type === type),
|
||||
guildPermissionAssignments.findIndex((p) => p.target_id === targetId && p.type === type),
|
||||
1,
|
||||
);
|
||||
} else {
|
||||
// Update/add permission assignment
|
||||
const itemToEdit = guildPermissionAssignments.find(p => p.target_id === targetId && p.type === type);
|
||||
const itemToEdit = guildPermissionAssignments.find((p) => p.target_id === targetId && p.type === type);
|
||||
if (itemToEdit) {
|
||||
itemToEdit.permissions = new Set(permissions);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -3,22 +3,22 @@ module.exports = {
|
|||
theme: {
|
||||
extend: {
|
||||
lineHeight: {
|
||||
zero: '0'
|
||||
zero: "0",
|
||||
},
|
||||
flex: {
|
||||
full: '0 0 100%',
|
||||
flexible: '1 1 0'
|
||||
}
|
||||
full: "0 0 100%",
|
||||
flexible: "1 1 0",
|
||||
},
|
||||
},
|
||||
screens: {
|
||||
sm: '640px',
|
||||
md: '768px',
|
||||
'until-lg': { max: '1023px' },
|
||||
lg: '1024px',
|
||||
xl: '1280px',
|
||||
'2xl': '1536px'
|
||||
}
|
||||
sm: "640px",
|
||||
md: "768px",
|
||||
"until-lg": { max: "1023px" },
|
||||
lg: "1024px",
|
||||
xl: "1280px",
|
||||
"2xl": "1536px",
|
||||
},
|
||||
},
|
||||
variants: {},
|
||||
plugins: []
|
||||
}
|
||||
plugins: [],
|
||||
};
|
||||
|
|
|
|||
|
|
@ -9,10 +9,7 @@
|
|||
"experimentalDecorators": true,
|
||||
"emitDecoratorMetadata": true,
|
||||
"strict": false,
|
||||
"lib": [
|
||||
"esnext",
|
||||
"dom"
|
||||
],
|
||||
"lib": ["esnext", "dom"],
|
||||
"baseUrl": ".",
|
||||
"resolveJsonModule": true,
|
||||
"esModuleInterop": true,
|
||||
|
|
|
|||
|
|
@ -1,42 +1,40 @@
|
|||
require('dotenv').config();
|
||||
require("dotenv").config();
|
||||
|
||||
const path = require('path');
|
||||
const VueLoaderPlugin = require('vue-loader/lib/plugin');
|
||||
const HtmlWebpackPlugin = require('html-webpack-plugin');
|
||||
const DotenvPlugin = require('dotenv-webpack');
|
||||
const merge = require('webpack-merge');
|
||||
const path = require("path");
|
||||
const VueLoaderPlugin = require("vue-loader/lib/plugin");
|
||||
const HtmlWebpackPlugin = require("html-webpack-plugin");
|
||||
const DotenvPlugin = require("dotenv-webpack");
|
||||
const merge = require("webpack-merge");
|
||||
|
||||
const targetDir = path.normalize(path.join(__dirname, 'dist'));
|
||||
const targetDir = path.normalize(path.join(__dirname, "dist"));
|
||||
|
||||
if (! process.env.NODE_ENV) {
|
||||
console.error('Please set NODE_ENV');
|
||||
if (!process.env.NODE_ENV) {
|
||||
console.error("Please set NODE_ENV");
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
const babelOpts = {
|
||||
presets: [
|
||||
'@babel/preset-env',
|
||||
],
|
||||
presets: ["@babel/preset-env"],
|
||||
};
|
||||
|
||||
const tsconfig = require('./tsconfig.json');
|
||||
const tsconfig = require("./tsconfig.json");
|
||||
const pathAliases = Object.entries(tsconfig.compilerOptions.paths || []).reduce((aliases, pair) => {
|
||||
let alias = pair[0];
|
||||
if (alias.endsWith('/*')) alias = alias.slice(0, -2);
|
||||
if (alias.endsWith("/*")) alias = alias.slice(0, -2);
|
||||
|
||||
let aliasPath = pair[1][0];
|
||||
if (aliasPath.endsWith('/*')) aliasPath = aliasPath.slice(0, -2);
|
||||
if (aliasPath.endsWith("/*")) aliasPath = aliasPath.slice(0, -2);
|
||||
|
||||
aliases[alias] = path.resolve(__dirname, aliasPath);
|
||||
return aliases;
|
||||
}, {});
|
||||
|
||||
let config = {
|
||||
entry: './src/main.ts',
|
||||
entry: "./src/main.ts",
|
||||
output: {
|
||||
filename: '[name].[hash].js',
|
||||
filename: "[name].[hash].js",
|
||||
path: targetDir,
|
||||
publicPath: '/',
|
||||
publicPath: "/",
|
||||
},
|
||||
module: {
|
||||
rules: [
|
||||
|
|
@ -50,11 +48,11 @@ let config = {
|
|||
exclude: /node_modules/,
|
||||
use: [
|
||||
{
|
||||
loader: 'babel-loader',
|
||||
loader: "babel-loader",
|
||||
options: babelOpts,
|
||||
},
|
||||
{
|
||||
loader: 'ts-loader',
|
||||
loader: "ts-loader",
|
||||
options: {
|
||||
appendTsSuffixTo: [/\.vue$/],
|
||||
},
|
||||
|
|
@ -65,7 +63,7 @@ let config = {
|
|||
test: /\.m?js$/,
|
||||
exclude: /node_modules/,
|
||||
use: {
|
||||
loader: 'babel-loader',
|
||||
loader: "babel-loader",
|
||||
options: babelOpts,
|
||||
},
|
||||
},
|
||||
|
|
@ -90,26 +88,23 @@ let config = {
|
|||
loader: "postcss-loader",
|
||||
options: {
|
||||
ident: "postcss",
|
||||
plugins: loader => {
|
||||
plugins: (loader) => {
|
||||
const plugins = [
|
||||
require('postcss-import')({
|
||||
require("postcss-import")({
|
||||
resolve(id, base, options) {
|
||||
// Since WebStorm doesn't resolve imports from node_modules without a tilde (~) prefix,
|
||||
// strip the tilde here to get the best of both worlds (webstorm support + postcss-import support)
|
||||
if (id[0] === '~') id = id.slice(1);
|
||||
if (id[0] === "~") id = id.slice(1);
|
||||
// Call the original resolver after stripping the tilde
|
||||
return require('postcss-import/lib/resolve-id')(id, base, options);
|
||||
return require("postcss-import/lib/resolve-id")(id, base, options);
|
||||
},
|
||||
}),
|
||||
require('postcss-nesting')(),
|
||||
require('tailwindcss')(),
|
||||
require("postcss-nesting")(),
|
||||
require("tailwindcss")(),
|
||||
];
|
||||
|
||||
if (process.env.NODE_ENV === "production") {
|
||||
plugins.push(
|
||||
require('postcss-preset-env')(),
|
||||
require('cssnano')(),
|
||||
);
|
||||
plugins.push(require("postcss-preset-env")(), require("cssnano")());
|
||||
}
|
||||
|
||||
return plugins;
|
||||
|
|
@ -137,9 +132,9 @@ let config = {
|
|||
{
|
||||
loader: "html-loader",
|
||||
options: {
|
||||
root: path.resolve(__dirname, 'src'),
|
||||
attrs: ['img:src', 'link:href'],
|
||||
...(process.env.NODE_ENV === 'production' && {
|
||||
root: path.resolve(__dirname, "src"),
|
||||
attrs: ["img:src", "link:href"],
|
||||
...(process.env.NODE_ENV === "production" && {
|
||||
minimize: true,
|
||||
removeComments: true,
|
||||
collapseWhitespace: true,
|
||||
|
|
@ -153,29 +148,29 @@ let config = {
|
|||
plugins: [
|
||||
new VueLoaderPlugin(),
|
||||
new HtmlWebpackPlugin({
|
||||
template: 'src/index.html',
|
||||
template: "src/index.html",
|
||||
files: {
|
||||
"css": ["./src/style/initial.pcss"],
|
||||
"js": ["./src/main.ts"],
|
||||
css: ["./src/style/initial.pcss"],
|
||||
js: ["./src/main.ts"],
|
||||
},
|
||||
}),
|
||||
new DotenvPlugin(),
|
||||
],
|
||||
resolve: {
|
||||
extensions: ['.ts', '.tsx', '.js', '.mjs', '.vue'],
|
||||
extensions: [".ts", ".tsx", ".js", ".mjs", ".vue"],
|
||||
alias: pathAliases,
|
||||
},
|
||||
};
|
||||
|
||||
if (process.env.NODE_ENV === 'production') {
|
||||
if (process.env.NODE_ENV === "production") {
|
||||
config = merge(config, {
|
||||
mode: 'production',
|
||||
devtool: 'source-map',
|
||||
mode: "production",
|
||||
devtool: "source-map",
|
||||
});
|
||||
} else {
|
||||
config = merge(config, {
|
||||
mode: 'development',
|
||||
devtool: 'eval',
|
||||
mode: "development",
|
||||
devtool: "eval",
|
||||
devServer: {
|
||||
...(process.env.DEV_HOST ? { host: process.env.DEV_HOST } : undefined),
|
||||
historyApiFallback: true,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue