From c718fb3fa932712e4efaa396a7f7d81b4ec70036 Mon Sep 17 00:00:00 2001 From: Software Shinobi Date: Thu, 5 Jun 2025 19:18:37 -0400 Subject: [PATCH] automated terminal push --- Jenkinsfile | 4 +- compose.yaml | 12 ++--- docs/mkdocs.yml | 41 ------------------ {docs => landing}/Dockerfile | 4 +- {docs => landing}/compose.bash | 0 {docs => landing}/compose.yaml | 0 {docs => landing}/docs/.recycle/.gemini.md | 0 {docs => landing}/docs/.recycle/sql-101.md | 0 .../004-basic-syntax.md | 0 .../Introduction-To-Databases/005-select.md | 0 .../Introduction-To-Databases/006-where.md | 0 .../007-order-and-group-by.md | 0 .../Introduction-To-Databases/008-insert.md | 0 .../Introduction-To-Databases/009-update.md | 0 .../Introduction-To-Databases/010-delete.md | 0 .../Introduction-To-Databases/011-join.md | 0 .../012-sql-commnad-categories.md | 0 .../013-sub-queries.md | 0 .../Introduction-To-Databases/014-unions.md | 0 .../015-Keys-in-a-Relational Database.md | 0 .../016-Logical-operator-keywords.md | 0 .../017-having-clause_aggregate-functions.md | 0 .../018-essential-mysql-functions.md | 0 .../020-TCL-commands.md | 0 .../docs/Introduction-To-Databases/index.md | 0 {docs => landing}/docs/cover.png | Bin {docs => landing}/docs/index.md | 0 {docs => landing}/docs/schema.md | 0 {docs => landing}/docs/styling.css | 0 {docs => landing}/mkdocs.bash | 0 landing/mkdocs.yml | 39 +++++++++++++++++ {docs => landing}/provision.bash | 0 Dockerfile => server/Dockerfile | 0 .../datasets}/local-real-estate.sql | 0 .../datasets}/mega-mart-grocery.sql | 0 .../datasets}/monaco-motors-dealership.sql | 0 .../datasets}/user-readonly-create.sql | 0 .../datasets}/user-shinobi-create.sql | 0 38 files changed, 49 insertions(+), 51 deletions(-) delete mode 100644 docs/mkdocs.yml rename {docs => landing}/Dockerfile (81%) rename {docs => landing}/compose.bash (100%) rename {docs => landing}/compose.yaml (100%) rename {docs => landing}/docs/.recycle/.gemini.md (100%) rename {docs => landing}/docs/.recycle/sql-101.md (100%) rename {docs => landing}/docs/Introduction-To-Databases/004-basic-syntax.md (100%) rename {docs => landing}/docs/Introduction-To-Databases/005-select.md (100%) rename {docs => landing}/docs/Introduction-To-Databases/006-where.md (100%) rename {docs => landing}/docs/Introduction-To-Databases/007-order-and-group-by.md (100%) rename {docs => landing}/docs/Introduction-To-Databases/008-insert.md (100%) rename {docs => landing}/docs/Introduction-To-Databases/009-update.md (100%) rename {docs => landing}/docs/Introduction-To-Databases/010-delete.md (100%) rename {docs => landing}/docs/Introduction-To-Databases/011-join.md (100%) rename {docs => landing}/docs/Introduction-To-Databases/012-sql-commnad-categories.md (100%) rename {docs => landing}/docs/Introduction-To-Databases/013-sub-queries.md (100%) rename {docs => landing}/docs/Introduction-To-Databases/014-unions.md (100%) rename {docs => landing}/docs/Introduction-To-Databases/015-Keys-in-a-Relational Database.md (100%) rename {docs => landing}/docs/Introduction-To-Databases/016-Logical-operator-keywords.md (100%) rename {docs => landing}/docs/Introduction-To-Databases/017-having-clause_aggregate-functions.md (100%) rename {docs => landing}/docs/Introduction-To-Databases/018-essential-mysql-functions.md (100%) rename {docs => landing}/docs/Introduction-To-Databases/020-TCL-commands.md (100%) rename {docs => landing}/docs/Introduction-To-Databases/index.md (100%) rename {docs => landing}/docs/cover.png (100%) rename {docs => landing}/docs/index.md (100%) rename {docs => landing}/docs/schema.md (100%) rename {docs => landing}/docs/styling.css (100%) rename {docs => landing}/mkdocs.bash (100%) create mode 100644 landing/mkdocs.yml rename {docs => landing}/provision.bash (100%) rename Dockerfile => server/Dockerfile (100%) rename {datasets => server/datasets}/local-real-estate.sql (100%) rename {datasets => server/datasets}/mega-mart-grocery.sql (100%) rename {datasets => server/datasets}/monaco-motors-dealership.sql (100%) rename {datasets => server/datasets}/user-readonly-create.sql (100%) rename {datasets => server/datasets}/user-shinobi-create.sql (100%) diff --git a/Jenkinsfile b/Jenkinsfile index 1989729..580599a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -51,4 +51,6 @@ pipeline { } -}} + } + +} diff --git a/compose.yaml b/compose.yaml index 6be4097..fede60e 100644 --- a/compose.yaml +++ b/compose.yaml @@ -7,9 +7,9 @@ services: image: softwareshinobi/databases.softwareshinobi.com:server - build: + build: - context: . + context: server dockerfile: Dockerfile @@ -32,13 +32,13 @@ services: MYSQL_USER: sandbox MYSQL_PASSWORD: sandbox - + databases.softwareshinobi.com-browser: container_name: databases.softwareshinobi.com-browser image: beeyev/phpmyadmin-lightweight - + restart: unless-stopped depends_on: @@ -61,9 +61,9 @@ services: image: softwareshinobi/databases.softwareshinobi.com:docs - build: + build: - context: docs + context: landing dockerfile: Dockerfile diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml deleted file mode 100644 index a6bf97b..0000000 --- a/docs/mkdocs.yml +++ /dev/null @@ -1,41 +0,0 @@ - -docs_dir: docs - -site_name: Shinobi Academy Database - - ## - ## Find More Themes Here: - ## - ## https://mkdocs.github.io/mkdocs-bootswatch/ - ## - ## List of theme values: - ## - ## mkdocs, readthedocs, material, cerulean, cosmo, - ## cyborg, darkly, flatly, journal, litera, lumen, lux, - ## materia, minty, pulse, sandstone, simplex, slate, solar, - ## spacelab, superhero, united, yeti - ## - - - - -theme: - name: material - features: - - navigation.top - - navigation.tabs - - navigation.sections - - toc.integrate - - toc.follow - - search.highlight - # Disable search and sidebars - palette: - primary: 'indigo' - accent: 'indigo' - features: - - navigation.tabs - - toc.integrate - - toc.follow - - -extra_css: [styling.css] diff --git a/docs/Dockerfile b/landing/Dockerfile similarity index 81% rename from docs/Dockerfile rename to landing/Dockerfile index a40ebfe..3f3a508 100644 --- a/docs/Dockerfile +++ b/landing/Dockerfile @@ -2,11 +2,9 @@ FROM titom73/mkdocs AS MKDOCS_BUILD RUN pip install markupsafe==2.0.1 -RUN pip install mkdocs-blog-plugin - WORKDIR /docs -COPY . . +COPY . . RUN mkdocs build diff --git a/docs/compose.bash b/landing/compose.bash similarity index 100% rename from docs/compose.bash rename to landing/compose.bash diff --git a/docs/compose.yaml b/landing/compose.yaml similarity index 100% rename from docs/compose.yaml rename to landing/compose.yaml diff --git a/docs/docs/.recycle/.gemini.md b/landing/docs/.recycle/.gemini.md similarity index 100% rename from docs/docs/.recycle/.gemini.md rename to landing/docs/.recycle/.gemini.md diff --git a/docs/docs/.recycle/sql-101.md b/landing/docs/.recycle/sql-101.md similarity index 100% rename from docs/docs/.recycle/sql-101.md rename to landing/docs/.recycle/sql-101.md diff --git a/docs/docs/Introduction-To-Databases/004-basic-syntax.md b/landing/docs/Introduction-To-Databases/004-basic-syntax.md similarity index 100% rename from docs/docs/Introduction-To-Databases/004-basic-syntax.md rename to landing/docs/Introduction-To-Databases/004-basic-syntax.md diff --git a/docs/docs/Introduction-To-Databases/005-select.md b/landing/docs/Introduction-To-Databases/005-select.md similarity index 100% rename from docs/docs/Introduction-To-Databases/005-select.md rename to landing/docs/Introduction-To-Databases/005-select.md diff --git a/docs/docs/Introduction-To-Databases/006-where.md b/landing/docs/Introduction-To-Databases/006-where.md similarity index 100% rename from docs/docs/Introduction-To-Databases/006-where.md rename to landing/docs/Introduction-To-Databases/006-where.md diff --git a/docs/docs/Introduction-To-Databases/007-order-and-group-by.md b/landing/docs/Introduction-To-Databases/007-order-and-group-by.md similarity index 100% rename from docs/docs/Introduction-To-Databases/007-order-and-group-by.md rename to landing/docs/Introduction-To-Databases/007-order-and-group-by.md diff --git a/docs/docs/Introduction-To-Databases/008-insert.md b/landing/docs/Introduction-To-Databases/008-insert.md similarity index 100% rename from docs/docs/Introduction-To-Databases/008-insert.md rename to landing/docs/Introduction-To-Databases/008-insert.md diff --git a/docs/docs/Introduction-To-Databases/009-update.md b/landing/docs/Introduction-To-Databases/009-update.md similarity index 100% rename from docs/docs/Introduction-To-Databases/009-update.md rename to landing/docs/Introduction-To-Databases/009-update.md diff --git a/docs/docs/Introduction-To-Databases/010-delete.md b/landing/docs/Introduction-To-Databases/010-delete.md similarity index 100% rename from docs/docs/Introduction-To-Databases/010-delete.md rename to landing/docs/Introduction-To-Databases/010-delete.md diff --git a/docs/docs/Introduction-To-Databases/011-join.md b/landing/docs/Introduction-To-Databases/011-join.md similarity index 100% rename from docs/docs/Introduction-To-Databases/011-join.md rename to landing/docs/Introduction-To-Databases/011-join.md diff --git a/docs/docs/Introduction-To-Databases/012-sql-commnad-categories.md b/landing/docs/Introduction-To-Databases/012-sql-commnad-categories.md similarity index 100% rename from docs/docs/Introduction-To-Databases/012-sql-commnad-categories.md rename to landing/docs/Introduction-To-Databases/012-sql-commnad-categories.md diff --git a/docs/docs/Introduction-To-Databases/013-sub-queries.md b/landing/docs/Introduction-To-Databases/013-sub-queries.md similarity index 100% rename from docs/docs/Introduction-To-Databases/013-sub-queries.md rename to landing/docs/Introduction-To-Databases/013-sub-queries.md diff --git a/docs/docs/Introduction-To-Databases/014-unions.md b/landing/docs/Introduction-To-Databases/014-unions.md similarity index 100% rename from docs/docs/Introduction-To-Databases/014-unions.md rename to landing/docs/Introduction-To-Databases/014-unions.md diff --git a/docs/docs/Introduction-To-Databases/015-Keys-in-a-Relational Database.md b/landing/docs/Introduction-To-Databases/015-Keys-in-a-Relational Database.md similarity index 100% rename from docs/docs/Introduction-To-Databases/015-Keys-in-a-Relational Database.md rename to landing/docs/Introduction-To-Databases/015-Keys-in-a-Relational Database.md diff --git a/docs/docs/Introduction-To-Databases/016-Logical-operator-keywords.md b/landing/docs/Introduction-To-Databases/016-Logical-operator-keywords.md similarity index 100% rename from docs/docs/Introduction-To-Databases/016-Logical-operator-keywords.md rename to landing/docs/Introduction-To-Databases/016-Logical-operator-keywords.md diff --git a/docs/docs/Introduction-To-Databases/017-having-clause_aggregate-functions.md b/landing/docs/Introduction-To-Databases/017-having-clause_aggregate-functions.md similarity index 100% rename from docs/docs/Introduction-To-Databases/017-having-clause_aggregate-functions.md rename to landing/docs/Introduction-To-Databases/017-having-clause_aggregate-functions.md diff --git a/docs/docs/Introduction-To-Databases/018-essential-mysql-functions.md b/landing/docs/Introduction-To-Databases/018-essential-mysql-functions.md similarity index 100% rename from docs/docs/Introduction-To-Databases/018-essential-mysql-functions.md rename to landing/docs/Introduction-To-Databases/018-essential-mysql-functions.md diff --git a/docs/docs/Introduction-To-Databases/020-TCL-commands.md b/landing/docs/Introduction-To-Databases/020-TCL-commands.md similarity index 100% rename from docs/docs/Introduction-To-Databases/020-TCL-commands.md rename to landing/docs/Introduction-To-Databases/020-TCL-commands.md diff --git a/docs/docs/Introduction-To-Databases/index.md b/landing/docs/Introduction-To-Databases/index.md similarity index 100% rename from docs/docs/Introduction-To-Databases/index.md rename to landing/docs/Introduction-To-Databases/index.md diff --git a/docs/docs/cover.png b/landing/docs/cover.png similarity index 100% rename from docs/docs/cover.png rename to landing/docs/cover.png diff --git a/docs/docs/index.md b/landing/docs/index.md similarity index 100% rename from docs/docs/index.md rename to landing/docs/index.md diff --git a/docs/docs/schema.md b/landing/docs/schema.md similarity index 100% rename from docs/docs/schema.md rename to landing/docs/schema.md diff --git a/docs/docs/styling.css b/landing/docs/styling.css similarity index 100% rename from docs/docs/styling.css rename to landing/docs/styling.css diff --git a/docs/mkdocs.bash b/landing/mkdocs.bash similarity index 100% rename from docs/mkdocs.bash rename to landing/mkdocs.bash diff --git a/landing/mkdocs.yml b/landing/mkdocs.yml new file mode 100644 index 0000000..94b4b16 --- /dev/null +++ b/landing/mkdocs.yml @@ -0,0 +1,39 @@ + +docs_dir: docs + +site_name: "Java Team Six: Databases" + +theme: + + palette: + + scheme: slate + + primary: deep orange + + accent: purple + + ## + ## Find More Themes Here: + ## + ## https://mkdocs.github.io/mkdocs-bootswatch/ + ## + ## List of theme values: + ## + ## mkdocs, readthedocs, material, cerulean, cosmo, + ## cyborg, darkly, flatly, journal, litera, lumen, lux, + ## materia, minty, pulse, sandstone, simplex, slate, solar, + ## spacelab, superhero, united, yeti + ## + + name: material + + ## + ## you can alternate colors for the navigation header. + ## + ## Allowed values: primary (the default), dark, and light: + ## + + nav_style: primary + +extra_css: [assets/styling.css] diff --git a/docs/provision.bash b/landing/provision.bash similarity index 100% rename from docs/provision.bash rename to landing/provision.bash diff --git a/Dockerfile b/server/Dockerfile similarity index 100% rename from Dockerfile rename to server/Dockerfile diff --git a/datasets/local-real-estate.sql b/server/datasets/local-real-estate.sql similarity index 100% rename from datasets/local-real-estate.sql rename to server/datasets/local-real-estate.sql diff --git a/datasets/mega-mart-grocery.sql b/server/datasets/mega-mart-grocery.sql similarity index 100% rename from datasets/mega-mart-grocery.sql rename to server/datasets/mega-mart-grocery.sql diff --git a/datasets/monaco-motors-dealership.sql b/server/datasets/monaco-motors-dealership.sql similarity index 100% rename from datasets/monaco-motors-dealership.sql rename to server/datasets/monaco-motors-dealership.sql diff --git a/datasets/user-readonly-create.sql b/server/datasets/user-readonly-create.sql similarity index 100% rename from datasets/user-readonly-create.sql rename to server/datasets/user-readonly-create.sql diff --git a/datasets/user-shinobi-create.sql b/server/datasets/user-shinobi-create.sql similarity index 100% rename from datasets/user-shinobi-create.sql rename to server/datasets/user-shinobi-create.sql