Merge pull request #461 from 30-seconds/restructure-configs

Restructure content
Chalarangelo · May 7, 2023 · 01fc991 · 01fc991
2 parents 4a49890 + 1b42c3d
commit 01fc991
Show file tree

Hide file tree

Showing 63 changed files with 1,194 additions and 3,889 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,35 +1,5 @@
-[submodule "content/sources/30python"]
-	path = content/sources/30python
-	url = https://github.com/30-seconds/30-seconds-of-python
-	branch = master
-	update = checkout
 [submodule "content/sources/30code"]
-	path = content/sources/30code
+	path = content
 	url = https://github.com/30-seconds/30-seconds-of-code
 	branch = master
 	update = checkout
-[submodule "content/sources/30css"]
-	path = content/sources/30css
-	url = https://github.com/30-seconds/30-seconds-of-css
-	branch = master
-	update = checkout
-[submodule "content/sources/30react"]
-	path = content/sources/30react
-	url = https://github.com/30-seconds/30-seconds-of-react
-	branch = master
-	update = checkout
-[submodule "content/sources/30blog"]
-	path = content/sources/30blog
-	url = https://github.com/30-seconds/30-seconds-blog
-	branch = master
-	update = checkout
-[submodule "content/configs"]
-	path = content/configs
-	url = https://github.com/30-seconds/30-seconds-content
-	branch = master
-	update = checkout
-[submodule "content/sources/30git"]
-	path = content/sources/30git
-	url = https://github.com/30-seconds/30-seconds-of-git
-	branch = master
-	update = checkout
diff --git a/content b/content
diff --git a/content/configs b/content/configs
diff --git a/content/sources/30blog b/content/sources/30blog
diff --git a/content/sources/30code b/content/sources/30code
diff --git a/content/sources/30css b/content/sources/30css
diff --git a/content/sources/30git b/content/sources/30git
diff --git a/content/sources/30python b/content/sources/30python
diff --git a/content/sources/30react b/content/sources/30react
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -33,6 +33,7 @@
     "remark-gfm": "^1.0.0",
     "sass": "^1.58.3",
     "sharp": "^0.31.3",
+    "unist-util-select": "3.0.4",
     "unist-util-visit": "^2.0.3",
     "unist-util-visit-parents": "^3.1.1",
     "webfonts-generator": "^0.4.0"

diff --git a/public/_redirects b/public/_redirects
@@ -40,10 +40,18 @@
 #   SORTED LISTING PAGE REDIRECTS:
 #
 # * Redirect alternative sorting listings to page 1 of the dedicated listing.
+# * Redirect articles listings to page 1 of the relevant snippet listing.
 # -----------------------------------------------------------------------------
-/blog/n/*                              /articles/p/1                            301!
-/blog/e/*                              /articles/p/1                            301!
-/blog/a/*                              /articles/p/1                            301!
+/blog/n/*                              /list/p/1                                301!
+/blog/e/*                              /list/p/1                                301!
+/blog/a/*                              /list/p/1                                301!
+/blog/p/*                              /list/p/1                                301!
+/artiles/p/*                           /list/p/1                                301!
+/articles/t/css/*                      /css/p/1                                 301!
+/articles/t/javascript/*               /js/p/1                                  301!
+/articles/t/python/*                   /python/p/1                              301!
+/articles/t/react/*                    /react/p/1                               301!
+/articles/t/webdev/*                   /c/web-development/:splat                301!
 /list/e/*                              /list/p/1                                301!
 /list/a/*                              /list/p/1                                301!
 /:lang/a/*                             /:lang/p/1                               301!