From 5b4dfce5349dfa6124a53a2af6493340f8de0674 Mon Sep 17 00:00:00 2001
From: aria
Date: Wed, 22 Jun 2022 12:08:11 +0200
Subject: [PATCH 2/3] Added 8 more English quotes (#3166) holyhearted
* Added 5 quotes
* fixed lengths and added MORE quotes
* merged current with prior stream
* Fetching upstream (#1)
* extended: language 'code rust' (#3104)
Added all derives and some very common traits as well as `pub(crate)`.
* added one english quote (#3094)
* added one english quote
* added one english quote
* updated the quote id 6095
* Custom Filters [Backend] (#3105)
* Added `ResultFilters` to types
Added customFilters field to user
This field is an optional array of `ResultFilters`
It will store a user's custom filters
* Added Add and Remove functions for `ResultFilters` in user DAL
Also added unit tests
* Added Custom Filter configuration
Can now enable/disable the custom filters feature
Can also set a cap on the number of filters per user
* Add and Remove functions for `ResultFilters` in user controller
* Added one english quote (#3109)
* added one english quote
* added one english quote
* updated the quote id 6095
* Added english quote id 6096
* Custom Filters [Backend] (#3105) (#3110)
* Added `ResultFilters` to types
Added customFilters field to user
This field is an optional array of `ResultFilters`
It will store a user's custom filters
* Added Add and Remove functions for `ResultFilters` in user DAL
Also added unit tests
* Added Custom Filter configuration
Can now enable/disable the custom filters feature
Can also set a cap on the number of filters per user
* Add and Remove functions for `ResultFilters` in user controller
* Added Haskell programming language (#3108)
* added: code_haskell language;
* fixed: missing comma;
* Contributing typos fix (#3114)
* spacebar in presets and tags addition
* super mega spacebar remake
* style fix
* final name removal in ui
* replaceAll in ape removal
* using display above account chart
* create preset in command line addition
* testing removal
* one more testing removal
* create tag command line addition
* Update commandline-lists.ts
* moved add commands to the bottom
hiding if user is not signed in
* refactor
* hiding tags and presets when signed out
* fixed presets and tags display in alerts
* russian_25k and russian_50k addition
* russian 375k addition
* lil fix
* fixed windows auto-reload error
* Revert "fixed windows auto-reload error"
This reverts commit ea226212322db148a9d7923ca1717cb9818161a4.
* Revert "Revert "fixed windows auto-reload error""
This reverts commit 669cec42171e755623fa71bde1a3daf6f91537c6.
* Revert "Revert "Revert "fixed windows auto-reload error"""
This reverts commit d90352633cd3d431505a2b1f02e864e8dc773e14.
* themes popup small fix
* using &&
* some typos fixed
Co-authored-by: Miodec
Co-authored-by: Vasiliy Novozhilov
* Fix yesterday toggle button (#3107)
Co-authored-by: Cody Bloemhard
Co-authored-by: Jitesh Kumar Sahoo <77315098+Jitesh117@users.noreply.github.com>
Co-authored-by: Malo Hamon
Co-authored-by: aNOOBis <69043738+aNOOBisTheGod@users.noreply.github.com>
Co-authored-by: Miodec
Co-authored-by: Vasiliy Novozhilov
Co-authored-by: Bruce Berrios <58147810+Bruception@users.noreply.github.com>
* fixed ids and added more quotes
* i sincerely hope this is the LAST TIME I DO THIS
* more quotes!
* removed inappropriate quote
* added more long english quotes
* added more whitespace between dashes
* fixed lengths for 5999, 6116 & 6117
* fixed lengths
* i don't have eyes
Co-authored-by: Cody Bloemhard
Co-authored-by: Jitesh Kumar Sahoo <77315098+Jitesh117@users.noreply.github.com>
Co-authored-by: Malo Hamon
Co-authored-by: aNOOBis <69043738+aNOOBisTheGod@users.noreply.github.com>
Co-authored-by: Miodec
Co-authored-by: Vasiliy Novozhilov
Co-authored-by: Bruce Berrios <58147810+Bruception@users.noreply.github.com>
---
frontend/static/quotes/english.json | 48 +++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/frontend/static/quotes/english.json b/frontend/static/quotes/english.json
index b7c9e4480..8485618cb 100644
--- a/frontend/static/quotes/english.json
+++ b/frontend/static/quotes/english.json
@@ -35634,6 +35634,54 @@
"source": "The Secret History - Donna Tartt",
"length": 239,
"id": 6114
+ },
+ {
+ "text": "\"Wild women don't get the blues\", but I find that lately I've been crying like a tall child.",
+ "source": "First Love / Late Spring",
+ "length": 92,
+ "id": 6115
+ },
+ {
+ "text": "I drive when it rains; at night when it rains, I drive. And the headlight spirits, they lead me down the Styx - so black it shines.",
+ "source": "Carry Me Out",
+ "length": 131,
+ "id": 6116
+ },
+ {
+ "text": "I never said I'd be alright, just thought I could hold myself together. But I couldn't breathe, I went outside - don't know why I thought it'd be any better.",
+ "source": "Me & My Dog",
+ "length": 157,
+ "id": 6117
+ },
+ {
+ "source": "Shades of Cool",
+ "text": "'Cause you are unfixable, I can't break through your world. 'Cause you live in shades of cool, your heart is unbreakable.",
+ "length": 121,
+ "id": 6118
+ },
+ {
+ "text": "Suzanne takes you down to her place near the river. You can hear the boats go by, you can spend the night beside her. And you know that she's half-crazy, but that's why you wanna be there. And she feeds you tea and oranges that come all the way from China.",
+ "source": "Suzanne",
+ "length": 256,
+ "id": 6119
+ },
+ {
+ "text": "They say I'm too young to love you. I don't know what I need. They think I don't understand the freedom land of the seventies.",
+ "source": "Brooklyn Baby",
+ "length": 126,
+ "id": 6120
+ },
+ {
+ "text": "John met me down on the boulevard. Cry on his shoulder 'cause life is hard, the waves came in over my head. What you been up to my baby? Haven't seen you 'round here lately. All the other guys tell me lies, but you don't. You just crack another beer and pretend that you're still here.",
+ "source": "How To Disappear",
+ "length": 285,
+ "id": 6121
+ },
+ {
+ "text": "Thinking outrageously, I write in cursive. I hide in my bed with the lights on the floor. Wearing three layers of coats and leg-warmers, I see my own breath on the face of the door.",
+ "source": "The Predatory Wasp of the Palisades Is Out to Get Us!",
+ "length": 181,
+ "id": 6122
}
]
}
From daa7529f3d86a289b2b0aac27a481b4a2bc9ac2d Mon Sep 17 00:00:00 2001
From: Bruce Berrios <58147810+Bruception@users.noreply.github.com>
Date: Wed, 22 Jun 2022 06:11:14 -0400
Subject: [PATCH 3/3] Webpack configs housekeeping (#3179) bruception
---
frontend/webpack/config.base.js | 10 ----------
frontend/webpack/config.dev.js | 8 +++++++-
frontend/webpack/config.prod.js | 8 ++++++++
3 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/frontend/webpack/config.base.js b/frontend/webpack/config.base.js
index 9110d05eb..6d6ed9141 100644
--- a/frontend/webpack/config.base.js
+++ b/frontend/webpack/config.base.js
@@ -3,8 +3,6 @@ const CopyPlugin = require("copy-webpack-plugin");
const CircularDependencyPlugin = require("circular-dependency-plugin");
const MiniCssExtractPlugin = require("mini-css-extract-plugin");
const HtmlWebpackPlugin = require("html-webpack-plugin");
-const RemovePlugin = require("remove-files-webpack-plugin");
-const ExtraWatchWebpackPlugin = require("extra-watch-webpack-plugin");
let circularImports = 0;
@@ -114,14 +112,6 @@ const BASE_CONFIG = {
new MiniCssExtractPlugin({
filename: "./css/style.[chunkhash:8].css",
}),
- new RemovePlugin({
- after: {
- include: [resolve(__dirname, "../public/html")],
- },
- }),
- new ExtraWatchWebpackPlugin({
- dirs: [resolve(__dirname, "../static/html")],
- }),
],
};
diff --git a/frontend/webpack/config.dev.js b/frontend/webpack/config.dev.js
index 804be9bdd..e24ce819c 100644
--- a/frontend/webpack/config.dev.js
+++ b/frontend/webpack/config.dev.js
@@ -1,5 +1,7 @@
+const { resolve } = require("path");
const { merge } = require("webpack-merge");
const BASE_CONFIG = require("./config.base");
+const ExtraWatchWebpackPlugin = require("extra-watch-webpack-plugin");
/** @type { import('webpack').Configuration } */
const DEV_CONFIG = {
@@ -10,12 +12,16 @@ const DEV_CONFIG = {
port: 3000,
open: true,
hot: false,
- liveReload: true,
historyApiFallback: true,
client: {
overlay: false,
},
},
+ plugins: [
+ new ExtraWatchWebpackPlugin({
+ dirs: [resolve(__dirname, "../static/html")],
+ }),
+ ],
};
module.exports = merge(BASE_CONFIG, DEV_CONFIG);
diff --git a/frontend/webpack/config.prod.js b/frontend/webpack/config.prod.js
index 8649e4469..0e8a9a554 100644
--- a/frontend/webpack/config.prod.js
+++ b/frontend/webpack/config.prod.js
@@ -1,5 +1,6 @@
const { resolve } = require("path");
const { merge } = require("webpack-merge");
+const RemovePlugin = require("remove-files-webpack-plugin");
const CssMinimizerPlugin = require("css-minimizer-webpack-plugin");
const HtmlMinimizerPlugin = require("html-minimizer-webpack-plugin");
const JsonMinimizerPlugin = require("json-minimizer-webpack-plugin");
@@ -64,6 +65,13 @@ const PRODUCTION_CONFIG = {
new CssMinimizerPlugin(),
],
},
+ plugins: [
+ new RemovePlugin({
+ after: {
+ include: [resolve(__dirname, "../public/html")],
+ },
+ }),
+ ],
};
module.exports = merge(BASE_CONFIG, PRODUCTION_CONFIG);