Merge branch 'doocs:main' into main

Author: sarvex

.github/workflows/deploy.yml

@@ -4,10 +4,7 @@ on:
   push:
     branches:
       - main
-      - docs
     paths:
-      - package.json
-      - requirements.txt
       - solution/**
       - lcs/**
       - lcp/**
@@ -72,7 +69,7 @@ jobs:
           mkdocs build -f mkdocs-en.yml
 
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./site

.github/workflows/prettier.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Run prettier
         run: |
           git config --global core.quotepath off
-          changed_files=$(git diff --name-only "${{ github.event.pull_request.base.sha }}" | grep -E '\.js$|\.ts$|\.php$|\.sql$|\.rs$|\.md$' || true)
+          changed_files=$(git diff --name-only "${{ github.event.pull_request.base.sha }}" | grep -E '\.js$|\.ts$|\.php$|\.sql$|\.md$' || true)
           if [ -n "$changed_files" ]; then
             echo "Running prettier on the changed files"
             echo "$changed_files" | xargs -d '\n' npx prettier --write

.husky/_/husky.sh

@@ -1,36 +0,0 @@
-#!/usr/bin/env sh
-if [ -z "$husky_skip_init" ]; then
-  debug () {
-    if [ "$HUSKY_DEBUG" = "1" ]; then
-      echo "husky (debug) - $1"
-    fi
-  }
-
-  readonly hook_name="$(basename -- "$0")"
-  debug "starting $hook_name..."
-
-  if [ "$HUSKY" = "0" ]; then
-    debug "HUSKY env variable is set to 0, skipping hook"
-    exit 0
-  fi
-
-  if [ -f ~/.huskyrc ]; then
-    debug "sourcing ~/.huskyrc"
-    . ~/.huskyrc
-  fi
-
-  readonly husky_skip_init=1
-  export husky_skip_init
-  sh -e "$0" "$@"
-  exitCode="$?"
-
-  if [ $exitCode != 0 ]; then
-    echo "husky - $hook_name hook exited with code $exitCode (error)"
-  fi
-
-  if [ $exitCode = 127 ]; then
-    echo "husky - command not found in PATH=$PATH"
-  fi
-
-  exit $exitCode
-fi

.husky/commit-msg

@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-npx --no -- commitlint --edit $1
+npx --no -- commitlint --edit $1

.husky/pre-commit

@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-npx lint-staged --allow-empty $1
+npx lint-staged --allow-empty $1

.prettierignore

@@ -23,4 +23,6 @@ node_modules/
 /solution/2200-2299/2205.The Number of Users That Are Eligible for Discount/Solution.sql
 /solution/2200-2299/2230.The Users That Are Eligible for Discount/Solution.sql
 /solution/2200-2299/2252.Dynamic Pivoting of a Table/Solution.sql
-/solution/2200-2299/2253.Dynamic Unpivoting of a Table/Solution.sql
+/solution/2200-2299/2253.Dynamic Unpivoting of a Table/Solution.sql
+/solution/3100-3199/3150.Invalid Tweets II/Solution.sql
+/solution/3100-3199/3198.Find Cities in Each State/Solution.sql

.prettierrc

@@ -11,10 +11,12 @@
     "braceStyle": "1tbs",
     "endOfLine": "lf",
     "sqlKeywordCase": "upper",
+    "sqlCanonicalSyntax": false,
     "overrides": [
         {
             "files": ["*.sql"],
             "options": { "parser": "mysql" }
         }
-    ]
+    ],
+    "plugins": ["prettier-plugin-sql-cst", "@prettier/plugin-php"]
 }

Dockerfile

@@ -0,0 +1,20 @@
+# Use Node.js version 14 as the base image
+FROM node:14
+
+# Set the working directory inside the container
+WORKDIR /app
+
+# Copy package.json and package-lock.json (if present) to the working directory
+COPY package*.json ./
+
+# Install npm dependencies
+RUN npm install
+
+# Copy all files from the current directory to the working directory in the container
+COPY . .
+
+# Expose port 80 to allow communication to/from the container
+EXPOSE 80
+
+# Specify the command to run the application
+CMD ["npm", "start"]

README_EN.md

@@ -90,7 +90,7 @@ https://doocs.github.io/leetcode
 -   [Shortest Path Visiting All Nodes](/solution/0800-0899/0847.Shortest%20Path%20Visiting%20All%20Nodes/README_EN.md) - `BFS`, `Minimum steps model`, `A* search`
 -   [Cut Off Trees for Golf Event](/solution/0600-0699/0675.Cut%20Off%20Trees%20for%20Golf%20Event/README_EN.md) - `BFS`, `A* search`
 -   [Minimum Cost to Make at Least One Valid Path in a Grid](/solution/1300-1399/1368.Minimum%20Cost%20to%20Make%20at%20Least%20One%20Valid%20Path%20in%20a%20Grid/README_EN.md) - `BFS using deque`
--   [Minimum Cost to Make at Least One Valid Path in a Grid](/solution/2200-2299/2290.Minimum%20Obstacle%20Removal%20to%20Reach%20Corner/README_EN.md) - `BFS using deque`
+-   [Minimum Obstacle Removal to Reach Corner](/solution/2200-2299/2290.Minimum%20Obstacle%20Removal%20to%20Reach%20Corner/README_EN.md) - `BFS using deque`
 -   [The Maze](/solution/0400-0499/0490.The%20Maze/README_EN.md) - `DFS, Flood fill`
 -   [Word Search](/solution/0000-0099/0079.Word%20Search/README_EN.md) - `DFS`, `Backtracking`
 -   [Path with Maximum Gold](/solution/1200-1299/1219.Path%20with%20Maximum%20Gold/README_EN.md) - `DFS`, `Backtracking`

basic/sorting/BubbleSort/README.md

@@ -8,6 +8,8 @@
 
 <!-- tabs:start -->
 
+#### Python3
+
 ```python
 def bubbleSort(arr):
     n = len(arr)
@@ -37,6 +39,8 @@ bubbleSort(arr)
 print(arr)
 ```
 
+#### Java
+
 ```java
 import java.util.Arrays;
 
@@ -69,6 +73,8 @@ public class BubbleSort {
 }
 ```
 
+#### C++
+
 ```cpp
 #include <iostream>
 #include <vector>
@@ -97,6 +103,8 @@ int main() {
 }
 ```
 
+#### Go
+
 ```go
 package main
 
@@ -122,6 +130,8 @@ func main() {
 }
 ```
 
+#### Rust
+
 ```rust
 fn bubble_sort(nums: &mut Vec<i32>) {
     let n = nums.len();
@@ -143,6 +153,8 @@ fn main() {
 }
 ```
 
+#### JavaScript
+
 ```js
 function bubbleSort(inputArr) {
     for (let i = inputArr.length - 1; i > 0; i--) {
@@ -168,6 +180,8 @@ const arr = [6, 3, 2, 1, 5];
 console.log(bubbleSort(arr));
 ```
 
+#### C#
+
 ```cs
 using static System.Console;
 namespace Pro;
@@ -217,5 +231,3 @@ public class Program
 ```
 
 <!-- tabs:end -->
-
-<!-- end -->