diff --git a/.github/workflows/gdid_tracker.yml b/.github/workflows/gdid_tracker.yml index bd7ac94..ecd12a6 100644 --- a/.github/workflows/gdid_tracker.yml +++ b/.github/workflows/gdid_tracker.yml @@ -41,11 +41,11 @@ jobs: with: fetch-depth: 0 - # Set up the Python 3.14 environment + # Set up the Python 3.13 environment - name: Set up Python uses: actions/setup-python@v6 with: - python-version: '3.14' + python-version: '3.13' # Install required Python dependencies - name: Install dependencies @@ -64,7 +64,7 @@ jobs: # Create a Pull Request with updated GDID sets - name: Create Pull Request id: cpr - uses: peter-evans/create-pull-request@v8 + uses: peter-evans/create-pull-request@v7 with: commit-message: Auto-update GDID sets title: Auto-update GDID sets @@ -77,9 +77,11 @@ jobs: labels: automated, gdid-update token: ${{ secrets.GITHUB_TOKEN }} - # Enable auto-merge for the created Pull Request and auto-delete the branch on merge - - name: Enable Auto-Merge and Auto-Delete Branch + # Enable auto-merge for the created Pull Request + - name: Enable Auto-Merge if: steps.cpr.outputs.pull-request-number != '' - run: gh pr merge --auto --squash --delete-branch ${{ steps.cpr.outputs.pull-request-number }} - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + uses: peter-evans/enable-pull-request-automerge@v3 + with: + pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} + merge-method: squash + token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 1cfe9bd..599095d 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -5,13 +5,13 @@ name: TestHarness (macOS) on: schedule: # Execute on the 31st for months with 31 days - - cron: '0 0 31 1,3,5,7,8,10,12 *' + - cron: '5 4 31 1,3,5,7,8,10,12 *' # Execute on the 30th for months with 30 days - - cron: '0 0 30 4,6,9,11 *' + - cron: '5 4 30 4,6,9,11 *' # Execute on the 29th of February (Leap years) - - cron: '0 0 29 2 *' + - cron: '5 4 29 2 *' # Execute on the 28th of February (Non-leap years) - - cron: '0 0 28 2 *' + - cron: '5 4 28 2 *' workflow_dispatch: jobs: @@ -61,7 +61,7 @@ jobs: export GEM_HOME="$HOME/.gem" export PATH="$GEM_HOME/bin:$PATH" gem install bundler > /dev/null 2>&1 - bundle config set --local path vendor/bundle + bundle config set --local path .vendor/bundle bundle install > /dev/null 2>&1 # Launch the Jekyll server in the background diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 93c45a9..dbc8063 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -5,13 +5,13 @@ name: TestHarness (Ubuntu) on: schedule: # Execute on the 31st for months with 31 days - - cron: '0 1 31 1,3,5,7,8,10,12 *' + - cron: '15 4 31 1,3,5,7,8,10,12 *' # Execute on the 30th for months with 30 days - - cron: '0 1 30 4,6,9,11 *' + - cron: '15 4 30 4,6,9,11 *' # Execute on the 29th of February (Leap years) - - cron: '0 1 29 2 *' + - cron: '15 4 29 2 *' # Execute on the 28th of February (Non-leap years) - - cron: '0 1 28 2 *' + - cron: '15 4 28 2 *' workflow_dispatch: jobs: @@ -53,16 +53,6 @@ jobs: sudo apt-get -qq install -y rustc freeglut3-dev nasm > /dev/null shell: bash - # Install Google Chrome for Selenium-based browser testing - - name: Install Google Chrome - run: | - # Configure the Google Chrome repository and signing key - wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add - - sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list' - sudo apt-get -qq update > /dev/null - sudo apt-get -qq install -y google-chrome-stable > /dev/null - shell: bash - # Initialize the Jekyll server and execute the test suite - name: Start Jekyll Server and Run Tests run: | @@ -75,7 +65,7 @@ jobs: # Install Bundler and required Ruby gems gem install bundler --quiet --no-document > /dev/null - bundle config set --local path vendor/bundle + bundle config set --local path .vendor/bundle bundle install --quiet > /dev/null # Launch the Jekyll server in the background diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 12266cc..4cce620 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -5,13 +5,13 @@ name: TestHarness (Windows) on: schedule: # Execute on the 31st for months with 31 days - - cron: '0 2 31 1,3,5,7,8,10,12 *' + - cron: '25 4 31 1,3,5,7,8,10,12 *' # Execute on the 30th for months with 30 days - - cron: '0 2 30 4,6,9,11 *' + - cron: '25 4 30 4,6,9,11 *' # Execute on the 29th of February (Leap years) - - cron: '0 2 29 2 *' + - cron: '25 4 29 2 *' # Execute on the 28th of February (Non-leap years) - - cron: '0 2 28 2 *' + - cron: '25 4 28 2 *' workflow_dispatch: jobs: @@ -51,7 +51,7 @@ jobs: # Install Bundler and required Ruby gems gem install bundler --quiet > $null 2>&1 - bundle config set --local path vendor/bundle + bundle config set --local path .vendor/bundle bundle install --quiet > $null 2>&1 shell: pwsh diff --git a/.gitignore b/.gitignore index defc46f..cdf752d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,9 @@ _site .jekyll-cache .jekyll-metadata .bundle +.vendor +.venv vendor -Gemfile.lock \ No newline at end of file +venv +Gemfile.lock +__pycache__ diff --git a/.vscode/settings.json b/.vscode/settings.json index 877040b..ef13632 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -11,9 +11,24 @@ // Editor Clarity "editor.wordWrap": "on", // Wrap long lines for readability + // Files and Folders Visibility + "explorer.excludeGitIgnore": true, + // Python Linting & IntelliSense "python.linting.enabled": true, // Enables linting in VS Code "python.linting.pylintEnabled": true, // Uses Pylint for linting "python.formatting.provider": "black", // Uses Black for consistent formatting - "python.analysis.typeCheckingMode": "basic" // Enables basic type checking -} \ No newline at end of file + "python.analysis.typeCheckingMode": "basic", // Enables basic type checking + + // General Formatting & Whitespace + "files.trimTrailingWhitespace": true, // Removes trailing whitespace on save + "files.insertFinalNewline": true, // Ensures files end with a newline + + // Performance: Exclude vendor directories from search and watchers + "search.exclude": { + "**/.vendor": true + }, + "files.watcherExclude": { + "**/.vendor/**": true + } +} diff --git a/404.html b/404.html index 0969aea..22cca7e 100644 --- a/404.html +++ b/404.html @@ -1,11 +1,11 @@ --- title: 404 Page Not Found layout: none +robots: noindex --- - {%- include head.html -%} @@ -16,27 +16,16 @@
404 Page Not Found
- \ No newline at end of file + diff --git a/CNAME b/CNAME index 5f891c4..ed6c9ad 100644 --- a/CNAME +++ b/CNAME @@ -1,2 +1 @@ -godarda.in -www.godarda.in \ No newline at end of file +godarda.in \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 711dba1..442e4e7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -82,21 +82,18 @@ We're thrilled to have you contribute! This guide walks you through the full onb ```bash git checkout -b feature/my-contribution ``` -5. Run the platform-specific setup script to initialize your environment: - #### **macOS:** +5. Run the setup script to initialize your environment: + #### **macOS & Ubuntu:** ``` - $ python3 setups/macos.py full + $ python3 setups/run.py full ``` - #### **Ubuntu:** - ``` - $ python3 setups/ubuntu.py full - ``` - #### **Windows:** Ensure [Visual Studio Code][gdwyygg], [Python][gdkweoz], and [Ruby][gdkwzyw] are installed and then follow these steps: + #### **Windows:** + Ensure [Visual Studio Code][gdwyygg], [Python][gdkweoz], and [Ruby][gdkwzyw] are installed and then follow these steps: ``` PS D:\> Open Visual Studio Code -> Terminal - PS D:\godarda.github.io> python setups/windows.py full + PS D:\godarda.github.io> python setups/run.py full ``` - - All setup scripts are located in the [`setups/`][gdgggza] directory and are platform-specific (`macos.py`, `ubuntu.py`, `windows.py`). + - The setup script is located in the [`setups/`][gdgggza] directory. - The site runs locally on port `4000` by default. You can access it via `http://127.0.0.1:4000` or `http://localhost:4000`. 6. Make your changes 7. Commit and push: diff --git a/Gemfile b/Gemfile index a7b5e3d..c574ed4 100644 --- a/Gemfile +++ b/Gemfile @@ -12,6 +12,8 @@ gem "jekyll", "~> 4.4.1" group :jekyll_plugins do # Generates sitemap.xml for SEO and search engine indexing gem "jekyll-sitemap" + # Required for Faraday v2.0+ middleware + gem "faraday-retry" end # Platform-specific dependencies for Windows and JRuby @@ -23,7 +25,7 @@ platforms :windows, :jruby do end # File system watcher for Windows platforms -gem 'wdm', '~> 0.2.0' if Gem.win_platform? && ENV['CI'].nil? +gem 'wdm', '~> 0.2.0' if Gem.win_platform? # HTTP parser for JRuby compatibility gem "http_parser.rb", "~> 0.6.0", platforms: [:jruby] @@ -33,4 +35,4 @@ gem "csv" # CSV parsing and generation gem "logger" # Logging utilities gem "base64" # Base64 encoding and decoding gem "webrick" # Required for Jekyll 4.x on Ruby 3.x -gem "faraday-retry" # Required for Faraday v2.0+ middleware \ No newline at end of file +gem "net-http" # Required for Faraday v2.0+ default adapter diff --git a/_config.yml b/_config.yml index 2687e30..ed74917 100644 --- a/_config.yml +++ b/_config.yml @@ -1,14 +1,18 @@ -# ----------------------------------------------------------------------------- -# GoDarda — Production Site Configuration -# Maintainer: Shubham Darda +# ============================================================================= # -# This file controls site metadata, asset references, templates, and build settings. +# Project : GoDarda +# File : Site Configuration (_config.yml) +# Created : September 1, 2020 +# Maintainer : Shubham Darda +# Purpose : This file defines the core configuration for the GoDarda site, +# including metadata, asset paths, build settings, and plugin management. # -# Guidelines: -# - Prefer non-breaking changes for production stability. -# - Verify external CDN URLs and SRI hashes before committing. -# - Do not store secrets or private tokens here; use environment variables. -# ----------------------------------------------------------------------------- +# Guidelines : +# 1. Stability First: Prioritize non-breaking changes. +# 2. Security: Verify all external URLs and SRI hashes upon update. +# 3. No Secrets: Use environment variables for sensitive data. +# +# ============================================================================= title: GoDarda url: https://godarda.in @@ -19,8 +23,9 @@ architect: Shubham Darda # -------------------------------------------------------------------------- # Asset References # Define third-party CDN links and local asset paths for consistent usage. -# When updating resources with SRI hashes, ensure both the URL and 'i' (integrity) -# fields are updated. +# When updating resources with Subresource Integrity (SRI) hashes, ensure both the +# URL and the corresponding integrity field (e.g., 'bs_cssi') are updated to +# maintain security. # -------------------------------------------------------------------------- gd_css: assets/css/gd.css gd_color_css: assets/css/color.css @@ -35,7 +40,7 @@ bs_jsi: sha384-FKyoEForCGlyvwx9Hj09JcYn3nv7wiPVlz7YYwJrWVcXK/BmnVDxM+D2scQbITxI # Optional icon/font libraries and client-side helpers bs_icons: https://cdn.jsdelivr.net/npm/bootstrap-icons@1.13.1/font/bootstrap-icons.css -jquery: https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js +jquery: https://code.jquery.com/jquery-4.0.0.min.js crypto_js: https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.2.0/crypto-js.min.js # Open Graph / favicon / logos @@ -49,26 +54,27 @@ analytics: https://www.googletagmanager.com/gtag/js?id=G-8ZJLP1KH1R # -------------------------------------------------------------------------- # UI Defaults & File Icons -# HTML fragments used in templates for file badges, execution hints, and captions. -# Ensure these remain valid HTML when editing. +# Defines reusable HTML snippets for UI elements like file-type headers +# (e.g., 'cfile') and terminal command examples (e.g., 'runc'). These are +# injected into Markdown files for a consistent look and feel. # -------------------------------------------------------------------------- highlighter: rouge -cfile: " gd.c" -cppfile: " gd.cpp" -javafile: " GD.java" -pyfile: " gd.py" -rfile: " gd.r" -juliafile: " gd.jl" -csfile: " Program.cs" -fsfile: " Program.fs" -rustfile: " gd.rs" -lispfile: " gd.lisp" -shfile: " gd.sh" -asmfile: " gd.asm" -vbsfile: " gd.vbs" -csvfile: " gd.csv" -jsonfile: " gd.json" -excelfile: " gd.xlsx" +cfile: "
gd.c
" +cppfile: "
gd.cpp
" +javafile: "
GD.java
" +pyfile: "
gd.py
" +rfile: "
gd.r
" +juliafile: "
gd.jl
" +csfile: "
Program.cs
" +fsfile: "
Program.fs
" +rustfile: "
gd.rs
" +lispfile: "
gd.lisp
" +shfile: "
gd.sh
" +asmfile: "
gd.asm
" +vbsfile: "
gd.vbs
" +csvfile: "
gd.csv
" +jsonfile: "
gd.json
" +excelfile: "
gd.xlsx
" # Execution hints for code blocks runc: "godarda@gd:~$ gcc gd.c
godarda@gd:~$ ./a.out" @@ -87,7 +93,9 @@ runasm: "godarda@gd:~$ nasm -felf64 gd.asm
godarda@gd:~$ l output: " Output" # -------------------------------------------------------------------------- -# Defaults: Configure how Jekyll processes files based on their path. +# Defaults: Sets default front matter values for files based on their path. +# This configuration applies the 'modern' layout to all pages site-wide, +# avoiding the need to specify 'layout: modern' in every file. # -------------------------------------------------------------------------- defaults: - @@ -117,8 +125,9 @@ exclude: - .jekyll-cache - .jekyll-metadata - .vscode + - .vendor + - .venv - android - - codes - CODE_OF_CONDUCT.md - CONTRIBUTING.md - Gemfile @@ -129,7 +138,6 @@ exclude: - SUPPORT.md - setups - tests - - vendor # ----------------------------------------------------------------------------- -# End of configuration. \ No newline at end of file +# End of configuration. diff --git a/_data/calculators.yml b/_data/calculators.yml deleted file mode 100644 index a8d3113..0000000 --- a/_data/calculators.yml +++ /dev/null @@ -1,17 +0,0 @@ -grandparent: -- parent: Common Calculators - subtree: Common - url: calculators/common - children: - - url: calculators/common/gdzzvvv - title: String Length Calculator - - url: calculators/common/gdadocu - title: Character Calculator - - url: calculators/common/gdldvld - title: Expression Calculator -sidenav: -- parent: Calculators - url: calculators - children: - - title: Common Calculators - url: calculators/common \ No newline at end of file diff --git a/_data/gd.yml b/_data/gd.yml index 3f73d5d..e3b74f9 100644 --- a/_data/gd.yml +++ b/_data/gd.yml @@ -1,87 +1,87 @@ segments: - title: C Programming url: c - parent: " / C / " + parent: " / C " - title: C++ Programming url: cpp - parent: " / C++ / " + parent: " / C++ " - title: Java Programming url: java - parent: " / Java / " + parent: " / Java " - title: Python Programming url: python - parent: " / Python / " + parent: " / Python " - title: Data Science url: ds - parent: " / DS / " + parent: " / DS " - title: R Programming url: r - parent: " / R / " + parent: " / R " - title: Julia Programming url: julia - parent: " / Julia / " + parent: " / Julia " - title: GNU Octave url: octave - parent: " / Octave / " + parent: " / Octave " - title: C# Programming url: csharp - parent: " / CSharp / " + parent: " / CSharp " - title: F# Programming url: fsharp - parent: " / FSharp / " + parent: " / FSharp " - title: Rust Programming url: rust - parent: " / Rust / " + parent: " / Rust " - title: LISP Programming url: lisp - parent: " / LISP / " + parent: " / LISP " - title: Data Structures and Algorithms url: dsa - parent: " / DSA / " + parent: " / DSA " - title: Linux Commands and Scripting url: linux - parent: " / Linux / " + parent: " / Linux " - title: MySQL (Relational Database) url: mysql - parent: " / MySQL / " - + parent: " / MySQL " + - title: MongoDB (NoSQL Database) url: mongodb - parent: " / MongoDB / " - + parent: " / MongoDB " + - title: Selenium WebDriver url: selenium - parent: " / Selenium / " + parent: " / Selenium " - title: Computer Graphics url: cg - parent: " / CG / " + parent: " / CG " - title: Assembly Programming url: asm - parent: " / ASM / " + parent: " / ASM " - title: Cluster url: cluster - parent: " / Cluster / " - + parent: " / Cluster " + - title: About Us url: about - parent: " / About / " + parent: " / About " - title: Tools url: tools @@ -89,19 +89,23 @@ segments: - title: Calculators url: calculators - parent: " / Calculators / " + parent: " / Calculators " - title: Converters url: converters - parent: " / Converters / " + parent: " / Converters " + + - title: Generators + url: generators + parent: " / Generators " + + - title: Utilities + url: utilities + parent: " / Utilities " - - title: Programming + - title: Programming and Tutorials url: learn parent: " / Learn " - - - title: GoDarda's Search - url: search - parent: " / Search " - title: Shubham Darda url: shubhamrdarda @@ -109,4 +113,4 @@ segments: - title: GoDarda's TestApp url: testapp - parent: " / TestApp " \ No newline at end of file + parent: " / TestApp " diff --git a/_data/julia.yml b/_data/julia.yml deleted file mode 100644 index 0c61908..0000000 --- a/_data/julia.yml +++ /dev/null @@ -1,17 +0,0 @@ -grandparent: -- parent: Julia Command Line Interface - subtree: CLI - url: julia/cli - children: - - url: julia/cli/gdxkekw - title: Julia Arithmetic Operations - - url: julia/cli/gdavgeq - title: Julia Logical Operations - - url: julia/cli/gdadvew - title: Julia Exponents and Logarithms -sidenav: -- parent: Julia Programming - url: julia - children: - - title: Julia Command Line Interface - url: julia/cli diff --git a/_data/asm.yml b/_data/learn/asm.yml similarity index 100% rename from _data/asm.yml rename to _data/learn/asm.yml diff --git a/_data/c.yml b/_data/learn/c.yml similarity index 100% rename from _data/c.yml rename to _data/learn/c.yml diff --git a/_data/cg.yml b/_data/learn/cg.yml similarity index 100% rename from _data/cg.yml rename to _data/learn/cg.yml diff --git a/_data/cluster.yml b/_data/learn/cluster.yml similarity index 100% rename from _data/cluster.yml rename to _data/learn/cluster.yml diff --git a/_data/cpp.yml b/_data/learn/cpp.yml similarity index 100% rename from _data/cpp.yml rename to _data/learn/cpp.yml diff --git a/_data/csharp.yml b/_data/learn/csharp.yml similarity index 100% rename from _data/csharp.yml rename to _data/learn/csharp.yml diff --git a/_data/ds.yml b/_data/learn/ds.yml similarity index 100% rename from _data/ds.yml rename to _data/learn/ds.yml diff --git a/_data/dsa.yml b/_data/learn/dsa.yml similarity index 100% rename from _data/dsa.yml rename to _data/learn/dsa.yml diff --git a/_data/fsharp.yml b/_data/learn/fsharp.yml similarity index 100% rename from _data/fsharp.yml rename to _data/learn/fsharp.yml diff --git a/_data/java.yml b/_data/learn/java.yml similarity index 100% rename from _data/java.yml rename to _data/learn/java.yml diff --git a/_data/learn/julia.yml b/_data/learn/julia.yml new file mode 100644 index 0000000..8c72788 --- /dev/null +++ b/_data/learn/julia.yml @@ -0,0 +1,17 @@ +grandparent: +- parent: Julia Fundamentals + subtree: Fundamentals + url: julia/fundamentals + children: + - url: julia/fundamentals/gdxkekw + title: Julia Arithmetic Operations + - url: julia/fundamentals/gdavgeq + title: Julia Logical Operations + - url: julia/fundamentals/gdadvew + title: Julia Exponents and Logarithms +sidenav: +- parent: Julia Programming + url: julia + children: + - title: Julia Fundamentals + url: julia/fundamentals \ No newline at end of file diff --git a/_data/learn.yml b/_data/learn/learn.yml similarity index 64% rename from _data/learn.yml rename to _data/learn/learn.yml index b42b0df..8ca6e2b 100644 --- a/_data/learn.yml +++ b/_data/learn/learn.yml @@ -1,80 +1,80 @@ segments: - title: C Programming url: c - parent: " / C / " + parent: "C" - title: C++ Programming url: cpp - parent: " / C++ / " + parent: "C++" - title: Java Programming url: java - parent: " / Java / " + parent: "Java" - title: Python Programming url: python - parent: " / Python / " + parent: "Python" - title: Data Science url: ds - parent: " / DS / " + parent: "DS" - title: R Programming url: r - parent: " / R / " + parent: "R" - title: Julia Programming url: julia - parent: " / Julia / " + parent: "Julia" - title: GNU Octave url: octave - parent: " / Octave / " + parent: "Octave" - title: C# Programming url: csharp - parent: " / CSharp / " + parent: "CSharp" - title: F# Programming url: fsharp - parent: " / FSharp / " + parent: "FSharp" - title: Rust Programming url: rust - parent: " / Rust / " + parent: "Rust" - title: LISP Programming url: lisp - parent: " / LISP / " + parent: "LISP" - title: Data Structures and Algorithms url: dsa - parent: " / DSA / " + parent: "DSA" - title: Linux Commands and Scripting url: linux - parent: " / Linux / " + parent: "Linux" - title: MySQL (Relational Database) url: mysql - parent: " / MySQL / " + parent: "MySQL" - title: MongoDB (NoSQL Database) url: mongodb - parent: " / MongoDB / " + parent: "MongoDB" - title: Selenium WebDriver url: selenium - parent: " / Selenium / " + parent: "Selenium" - title: Computer Graphics url: cg - parent: " / CG / " + parent: "CG" - title: Assembly Programming url: asm - parent: " / ASM / " + parent: "ASM" - title: Cluster url: cluster - parent: " / Cluster / " \ No newline at end of file + parent: "Cluster" \ No newline at end of file diff --git a/_data/linux.yml b/_data/learn/linux.yml similarity index 100% rename from _data/linux.yml rename to _data/learn/linux.yml diff --git a/_data/lisp.yml b/_data/learn/lisp.yml similarity index 100% rename from _data/lisp.yml rename to _data/learn/lisp.yml diff --git a/_data/mongodb.yml b/_data/learn/mongodb.yml similarity index 100% rename from _data/mongodb.yml rename to _data/learn/mongodb.yml diff --git a/_data/mysql.yml b/_data/learn/mysql.yml similarity index 100% rename from _data/mysql.yml rename to _data/learn/mysql.yml diff --git a/_data/octave.yml b/_data/learn/octave.yml similarity index 100% rename from _data/octave.yml rename to _data/learn/octave.yml diff --git a/_data/python.yml b/_data/learn/python.yml similarity index 100% rename from _data/python.yml rename to _data/learn/python.yml diff --git a/_data/r.yml b/_data/learn/r.yml similarity index 100% rename from _data/r.yml rename to _data/learn/r.yml diff --git a/_data/rust.yml b/_data/learn/rust.yml similarity index 100% rename from _data/rust.yml rename to _data/learn/rust.yml diff --git a/_data/selenium.yml b/_data/learn/selenium.yml similarity index 100% rename from _data/selenium.yml rename to _data/learn/selenium.yml diff --git a/_data/tools.yml b/_data/tools.yml deleted file mode 100644 index b5d3e02..0000000 --- a/_data/tools.yml +++ /dev/null @@ -1,8 +0,0 @@ -segments: -- title: Calculators - url: calculators - parent: " / Calculators / " - -- title: Converters - url: converters - parent: " / Converters / " \ No newline at end of file diff --git a/_data/tools/calculators.yml b/_data/tools/calculators.yml new file mode 100644 index 0000000..c58e07a --- /dev/null +++ b/_data/tools/calculators.yml @@ -0,0 +1,31 @@ +grandparent: +- parent: Common Calculators + subtree: Common + url: calculators/common + children: + - url: calculators/common/gdldvld + title: Expression Calculator + - url: calculators/common/gddeqcn + title: Number Calculator + - url: calculators/common/gdzzvvv + title: String Length Calculator + - url: calculators/common/gdadocu + title: Character Calculator + - url: calculators/common/gdpklzu + title: BMI Calculator + - url: calculators/common/gdzoyew + title: Age Calculator +- parent: Scientific Calculators + subtree: Scientific + url: calculators/scientific + children: + - url: calculators/scientific/gdizhat + title: Trigonometry Calculator +sidenav: +- parent: Calculators + url: calculators + children: + - title: Common Calculators + url: calculators/common + - title: Scientific Calculators + url: calculators/scientific diff --git a/_data/converters.yml b/_data/tools/converters.yml similarity index 97% rename from _data/converters.yml rename to _data/tools/converters.yml index 17e189e..0066330 100644 --- a/_data/converters.yml +++ b/_data/tools/converters.yml @@ -15,6 +15,8 @@ grandparent: title: Area Converter - url: converters/common/gdwaaal title: Time Converter + - url: converters/common/gdwzdkr + title: Timezone Converter - parent: Physics Converters subtree: Physics url: converters/physics diff --git a/_data/tools/generators.yml b/_data/tools/generators.yml new file mode 100644 index 0000000..648434b --- /dev/null +++ b/_data/tools/generators.yml @@ -0,0 +1,15 @@ +grandparent: +- parent: Common Generators + subtree: Common + url: generators/common + children: + - url: generators/common/gdhzgsg + title: String Generator + - url: generators/common/gdgeldi + title: Number Generator +sidenav: +- parent: Generators + url: generators + children: + - title: Common Generators + url: generators/common diff --git a/_data/tools/tools.yml b/_data/tools/tools.yml new file mode 100644 index 0000000..59756a4 --- /dev/null +++ b/_data/tools/tools.yml @@ -0,0 +1,16 @@ +segments: +- title: Calculators + url: calculators + parent: "Calculators" + +- title: Converters + url: converters + parent: "Converters" + +- title: Generators + url: generators + parent: "Generators" + +- title: Utilities + url: utilities + parent: "Utilities" diff --git a/_data/tools/utilities.yml b/_data/tools/utilities.yml new file mode 100644 index 0000000..7ffb278 --- /dev/null +++ b/_data/tools/utilities.yml @@ -0,0 +1,15 @@ +grandparent: +- parent: Common Utilities + subtree: Common + url: utilities/common + children: + - url: utilities/common/gdcztzc + title: Timer + - url: utilities/common/gddwork + title: Stopwatch +sidenav: +- parent: Utilities + url: utilities + children: + - title: Common Utilities + url: utilities/common diff --git a/_data/url.yml b/_data/url.yml index fb19203..7f192f0 100644 --- a/_data/url.yml +++ b/_data/url.yml @@ -21,8 +21,11 @@ gddankd: https://en.wikipedia.org/wiki/A._P._J._Abdul_Kalam linkedin: https://in.linkedin.com/company/godarda github: https://github.com/godarda repo: https://github.com/godarda/godarda.github.io +teams: https://github.com/orgs/godarda/teams/orbit/teams +issues: https://github.com/godarda/godarda.github.io/issues +releases: https://github.com/orgs/godarda/discussions/categories/releases sponsor: https://github.com/sponsors/godarda discord: https://discord.gg/GxDtSkFqKQ slack: https://join.slack.com/t/godarda/shared_invite/zt-36lxefpki-dor9VzLkHrV51n7XbHencw -android_app: https://raw.githubusercontent.com/godarda/godarda.github.io/master/android/app/release/godarda.apk -sd_resume: https://raw.githubusercontent.com/shubhamrdarda/shubhamrdarda/master/assets/pdf/Resume%20-%20Shubham%20Darda.pdf \ No newline at end of file +android_app: https://raw.githubusercontent.com/godarda/godarda.github.io/main/android/app/release/godarda.apk +sd_resume: https://raw.githubusercontent.com/shubhamrdarda/shubhamrdarda/master/assets/pdf/Resume%20-%20Shubham%20Darda.pdf diff --git a/_includes/converter.html b/_includes/converter.html deleted file mode 100644 index 913166e..0000000 --- a/_includes/converter.html +++ /dev/null @@ -1,38 +0,0 @@ -
-
-
- -
- -
- - -
- - -
- -
Tip: results update as you type. Use 'Select Conversion Options' to customize the output.
-
-
- -
-
- -
-
-
-
-
- - - \ No newline at end of file diff --git a/_includes/footer.html b/_includes/footer.html deleted file mode 100644 index f1656dd..0000000 --- a/_includes/footer.html +++ /dev/null @@ -1,211 +0,0 @@ -{%- if path[1] == "about" and path[2] == nil -%}{%- assign about_section = "about_home_true" -%} -{%- elsif path[1] == "about" and path[2] != nil -%}{%- assign about_section = "about_home_false" -%}{%- endif -%} - - -{%- if path[1] == nil or path[1] == "testapp" -%}{%- assign flag = "block_webfooter" -%}{%- endif -%} - - - - - - - \ No newline at end of file diff --git a/_includes/footer_app.html b/_includes/footer_app.html new file mode 100644 index 0000000..af7ef6e --- /dev/null +++ b/_includes/footer_app.html @@ -0,0 +1,165 @@ +{%- if path[1] == "about" and path[2] == nil -%}{%- assign about_section = "about_home_true" -%} +{%- elsif path[1] == "about" and path[2] != nil -%}{%- assign about_section = "about_home_false" -%}{%- endif -%} + + + + + diff --git a/_includes/footer_web.html b/_includes/footer_web.html new file mode 100644 index 0000000..2ba792c --- /dev/null +++ b/_includes/footer_web.html @@ -0,0 +1,94 @@ + + + + + + + diff --git a/_includes/head.html b/_includes/head.html index 856387a..df66d89 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -8,13 +8,10 @@ + {%- if page.robots -%}{%- endif -%} - {%- if page.description == nil -%} - - {%- else -%} - {%- endif -%} + {%- if page.description == nil -%}{%- else -%}{%- endif -%} - @@ -29,7 +26,11 @@ const getPreferredTheme = () => { const storedTheme = getStoredTheme(); - return storedTheme ? storedTheme : (window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'); + if (storedTheme) { + return storedTheme; + } + setStoredTheme('auto'); + return 'auto'; }; const setTheme = theme => { @@ -53,13 +54,6 @@ -{%- comment -%} - Data-driven segment lookup with explicit per-segment `parent` support. - Uses `site.data.gd.segments` for titles and `site.data.` for the - segment's dataset (grandparent/children). If a segment entry includes a - `parent` field, that exact string is used (preserves values like ` / DS / `). -{%- endcomment -%} - {%- assign path = page.url | split: '/' -%} {%- assign seg_key = path[1] | default: '' -%} {%- assign seg_obj = site.data.gd.segments | where: 'url', seg_key | first -%} @@ -74,8 +68,21 @@ {%- endif -%} {%- assign gd = nil -%} -{%- if seg_key != '' and site.data[seg_key] -%} - {%- assign gd = site.data[seg_key] -%} +{%- if seg_key != '' -%} + {%- if site.data[seg_key] -%} + {%- assign gd_temp = site.data[seg_key] -%} + {%- if gd_temp.grandparent -%}{%- assign gd = gd_temp -%} + {%- elsif gd_temp[seg_key] and gd_temp[seg_key].grandparent -%}{%- assign gd = gd_temp[seg_key] -%}{%- endif -%} + {%- endif -%} + {%- if gd == nil -%} + {%- for data_file in site.data -%} + {%- assign sub_data = data_file[1] -%} + {%- if sub_data[seg_key] and sub_data[seg_key].grandparent -%} + {%- assign gd = sub_data[seg_key] -%} + {%- break -%} + {%- endif -%} + {%- endfor -%} + {%- endif -%} {%- endif -%} {%- if gd -%} @@ -95,4 +102,4 @@ {%- else -%} {%- assign parent = ' / ' | append: segment | append: ' / ' -%} {%- endif -%} -{%- endunless -%} \ No newline at end of file +{%- endunless -%} diff --git a/_includes/pagination.html b/_includes/pagination.html index a7948a4..2f8d8e1 100644 --- a/_includes/pagination.html +++ b/_includes/pagination.html @@ -1,11 +1,18 @@ + + {%- assign i = 0 -%} {%- assign j = 0 -%} {%- for parent in gd.grandparent -%} -{%- assign j = j | plus:1 -%} + {%- assign j = j | plus:1 -%} {%- if page.url contains parent.url -%} {%- for child in parent.children -%} - {%- assign i = i | plus:1 -%} + {%- assign i = i | plus:1 -%} {%- if page.url contains child.url -%} {%- assign first = i | plus: 0 -%}{%- assign second = i | plus:1 -%}{%- assign third = i | plus:2 -%} {%- if parent.children[third].url != null -%} @@ -34,4 +41,4 @@ {%- endif -%} {%- endfor -%} {%- endif -%} -{%- endfor -%} \ No newline at end of file +{%- endfor -%} diff --git a/_includes/search.html b/_includes/search.html index 7b47802..4c2b3af 100644 --- a/_includes/search.html +++ b/_includes/search.html @@ -1,175 +1,51 @@ + + {%- assign path = page.url | split: '/' -%} + + -
-
- {%- if path[1] == nil -%} +
+
+
+ {%- if path[1] == nil -%} +

GoDarda

{{ site.tagline }}
- {%- endif -%} - -
-
-
- - -
- -
-
- - \ No newline at end of file + +
+
+
diff --git a/_includes/tools.html b/_includes/tools.html new file mode 100644 index 0000000..5291386 --- /dev/null +++ b/_includes/tools.html @@ -0,0 +1,89 @@ + + +{%- assign path = page.url | split: '/' -%} +{%- assign tool_urls = site.data.tools.tools.segments | map: "url" -%} + + + +
+
+
+ +
+ + + {% if tools_inputs %} +
+ {{ tools_inputs }} +
+ {% else %} + +
+ + +
+ {% endif %} + + +
+
+ +
+
+ + +
+
+ +
+
+
+
+
+ + + diff --git a/_layouts/modern.html b/_layouts/modern.html index 649c059..c454998 100644 --- a/_layouts/modern.html +++ b/_layouts/modern.html @@ -3,17 +3,27 @@ {% include head.html %} -