Merge branch 'valkey-io:main' into main

Author: dmitrypol

.github/workflows/zola-deploy.yml

@@ -40,11 +40,17 @@ jobs:
             repository: valkey-io/valkey-bloom
             path: valkey-bloom
 
+      - name: Checkout valkey-json
+        uses: actions/checkout@v4
+        with:
+            repository: valkey-io/valkey-json
+            path: valkey-json
+
       - name: Init commands, topics and clients
         run: |
           cd website
           ./build/init-topics-and-clients.sh ../valkey-doc/topics ../valkey-doc/clients
-          ./build/init-commands.sh ../valkey-doc/commands ../valkey/src/commands ../valkey-bloom/src/commands
+          ./build/init-commands.sh ../valkey-doc/commands ../valkey/src/commands ../valkey-bloom/src/commands ../valkey-json/src/commands
 
       - name: Build only
         uses: shalzz/[email protected]

README.md

@@ -1,7 +1,7 @@
 # Valkey.io website
 
 This repo contains the source for the valkey.io website (build scripts, template, blog posts, stylesheets, etc.).
-The build integrates content from [`valkey-io/valkey-doc`](https://github.com/valkey-io/valkey-doc) and the commands definitions from [`valkey-io/valkey`](https://github.com/valkey-io/valkey) and [`valkey-io/valkey-bloom`](https://github.com/valkey-io/valkey-bloom) (see [Build Locally](#build-locally) below for more details).
+The build integrates content from [`valkey-io/valkey-doc`](https://github.com/valkey-io/valkey-doc) and the commands definitions from [`valkey-io/valkey`](https://github.com/valkey-io/valkey), [`valkey-io/valkey-bloom`](https://github.com/valkey-io/valkey-bloom), and [`valkey-io/valkey-json`](https://github.com/valkey-io/valkey-json) (see [Build Locally](#build-locally) below for more details) 
 
 ## Contributing
 
@@ -64,7 +64,7 @@ Commit your changes to your local copy of `valkey-io/valkey-doc`.
 ### Building the command reference
 
 The command reference (i.e. `/commands/set/`, `/commands/get/`, `/commands/lolwut/`) sources information from `valkey-io/valkey`, `valkey-io/valkey-bloom`, and `valkey-io/valkey-doc`.
-`valkey-io/valkey` and `valkey-io/valkey-bloom` provides the command metadata (items like computational complexity, version history, arguments, etc) whilst `valkey-io/valkey-doc` provides the command description and the command reply.
+`valkey-io/valkey`, `valkey-io/valkey-bloom` and `valkey-io/valkey-json` provides the command metadata (items like computational complexity, version history, arguments, etc) whilst `valkey-io/valkey-doc` provides the command description and the command reply.
 
 ```mermaid
 flowchart TD
@@ -75,13 +75,13 @@ flowchart TD
     H --> J[Files: /resp2_replies.json,<br/>/resp3_replies.json] --> Z[Command Reply]
 ```
 
-Let's say that this repo and your local copy of `valkey-io/valkey-doc`, `valkey-io/valkey-bloom` and `valkey-io/valkey` reside in the same directories.
+Let's say that this repo and your local copy of `valkey-io/valkey-doc`, `valkey-io/valkey-bloom`, `valkey-io/valkey-json`, and `valkey-io/valkey` reside in the same directories.
 First, stop the `zola serve` process if you're running it.
 From the root directory of this repo run:
 
 ```shell
 # You should only need to run this once or when you add a new command.
-./build/init-commands.sh ../valkey-doc/commands ../valkey/src/commands ../valkey-bloom/src/commands
+./build/init-commands.sh ../valkey-doc/commands ../valkey/src/commands ../valkey-bloom/src/commands ../valkey-json/src/commands
 ```
 
 Then, restart Zola.

build-json-command-json

@@ -0,0 +1 @@
+../valkey-json/src/commands

build/init-commands.sh

@@ -29,9 +29,15 @@ if [ ! -d "$3" ]; then
     exit 1
 fi
 
+if [ ! -d "$4" ]; then
+    echo "The JSON module command JSON directory must exist and be a valid path"
+    exit 1
+fi
+
 ln -s $1 ./build-command-docs
 ln -s $2 ./build-command-json
 ln -s $3 ./build-bloom-command-json
+ln -s $4 ./build-json-command-json
 for fname in $(find $1 -maxdepth 1  -iname "*.md")
 do
     base=${fname##*/}
@@ -42,6 +48,8 @@ do
             metadata_path="/commands/$command.json in the 'valkey' repo"
         elif [ -f "$3/$command.json" ]; then
             metadata_path="/commands/$command.json in the 'valkey-bloom' repo"
+        elif [ -f "$4/$command.json" ]; then
+            metadata_path="/commands/$command.json in the 'valkey-json' repo"
         fi
         cat << EOF > "./content/commands/$command.md"
 +++

config.toml

@@ -22,6 +22,7 @@ highlight_code = true
 command_description_path = "../build-command-docs/"
 command_json_path = "../build-command-json/"
 command_bloom_json_path = "../build-bloom-command-json/"
+command_json_json_path = "../build-json-command-json/"
 client_json_path = "../build-clients/"
 doc_topic_path = "../build-topics/"
 

sass/_valkey.scss

@@ -345,33 +345,81 @@ p {
 }
 
 .footer {
-  border-top: 1px solid $grey-dk-100;
-  background-color: $grey-lt-300;
+  background-color: #1a2026;
   @include sans-serif;
   font-size: 1.4rem;
+  color: #fff;
+  padding: 2rem 0;
+
+  .icon-links {
+    display: flex;
+    flex-direction: column;
+    gap: 15px;
+
+    @include respond-min(768px) {
+      flex-direction: row;
+      border: none;
+    }
+
+    a {
+      display: flex;
+      align-items: center;
+      color: #fff;
+
+      &:hover {
+        color: #fff;
+        text-decoration: underline;
+        opacity: 0.8;
+      }
+
+      img {
+        margin-right: 5px;
+      }
+    }
+
+  }
 
   .links {
     display: flex;
-    flex-flow: row nowrap;
-    justify-content: space-evenly;
-    margin-bottom: 4em;
+    flex-direction: column;
+    gap: 15px;
+    justify-content: flex-end;
+    border-top: 1px solid rgba(255, 255, 255, 0.08);
+    margin-top: 2rem;
+    padding-top: 2rem;
+
+    @include respond-min(768px) {
+      flex-direction: row;
+      border: none;
+      margin-top: 0;
+      padding-top: 0;
+      }
+
+    a {
+      color: #fff;
+      text-decoration: underline;
+
+      &:hover {
+        opacity: 0.8;
+      }
+    }
   }
 
-  nav {
-    font-size: 1.5rem;
-    font-weight: 600;
+  &_bottom {
+    width: 100%;
+    margin-top: 2rem;
+    padding: 2rem;
 
-    h4 {
-      font-weight: 400;
-      @include sans-serif;
-      font-size: 1.5rem;
+    border-top: 1px solid rgba(255, 255, 255, 0.08);
+    text-align: center;
+
+    p {
+      max-width: 720px;
+      margin: 8px auto;
     }
 
     a {
-      display: list-item;
-      list-style: none;
-      white-space: nowrap;
-      margin-bottom: 1em;
+      color: #6983ff;
 
       &:hover {
         text-decoration: underline;
@@ -410,28 +458,35 @@ p {
 
   .col {
     flex: 1 1 100%;
-    padding: 0 2rem;
+    padding-left: 2rem;
+    padding-right: 2rem;
   }
 
   .col-10 {
-    flex: 1 1 83.33%;
+    @include respond-min(768px) {
+      flex: 1 1 83.33%;
+    }
   }
 
   .col-8 {
-    flex: 1 1 66.66%;
+    @include respond-min(768px) {
+      flex: 1 1 66.66%;
+    }
   }
 
   .col-6 {
-    flex: 1 1 50%;
+    @include respond-min(768px) {
+      flex: 1 1 50%;
+    }
   }
 
   .col-4 {
-    flex: 1 1 33.33%;
+    @include respond-min(768px) {
+      flex: 1 1 33.33%;
+    }
   }
 
   .col_3 {
-    flex: 1 1 100%;
-
     @include respond-min(768px) {
       flex: 1 1 25%;
     }