Skip to content

Commit

Permalink
merge water module (sphinx + rst) build → main (#34)
Browse files Browse the repository at this point in the history
* build(branching scheme): add new publishing configs

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* chore(urls): remove unicode replacement for dash

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* feat(getting started): add new guides as introduction

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* fix(typo): resolve branch name

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* fix(actions): add proper branch references

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* fix(actions): add proper branch references (#3)

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* docs(open science): correct sidebar toc level

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* docs(date): documents now show last updated date

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* docs(updated): deprecate use of people option

.. versionadded:: 2024.09.30

    [1] Added new "On this page" section which represents a quick
        summary of key takeaways from the whole page.

.. deprecated:: 2024.09.30

    [1] Deprecated the use of `people` options from the `contributors`
        directive as part of new change from the underlying theme.

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* docs: fix the issue with sidebar toc levels and people option deprecation (#7)

* fix(actions): add proper branch references

* docs(open science): correct sidebar toc level

* docs(date): documents now show last updated date

* docs(updated): deprecate use of people option

.. versionadded:: 2024.09.30

    [1] Added new "On this page" section which represents a quick
        summary of key takeaways from the whole page.

.. deprecated:: 2024.09.30

    [1] Deprecated the use of `people` options from the `contributors`
        directive as part of new change from the underlying theme.

---------

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* ci(force-build): empty commit to force build

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* chore(process flow): add TOPST git-flow diagram

related to: #9

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* feature/migrate to rst merge to dev (#13)

* fix(actions): add proper branch references

* docs(open science): correct sidebar toc level

* docs(date): documents now show last updated date

* docs(updated): deprecate use of people option

.. versionadded:: 2024.09.30

    [1] Added new "On this page" section which represents a quick
        summary of key takeaways from the whole page.

.. deprecated:: 2024.09.30

    [1] Deprecated the use of `people` options from the `contributors`
        directive as part of new change from the underlying theme.

* ci(force-build): empty commit to force build

* chore(process flow): add TOPST git-flow diagram

related to: #9

---------

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* feature/assets → dev merge (#14)

* chore(processes): add flow and story map diagrams

---------

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* chore: remove older git-flow

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* feature/migrate-to-rst ← dev  (#16)

* feature/migrate to rst merge to dev (#13)

* fix(actions): add proper branch references

* docs(open science): correct sidebar toc level

* docs(date): documents now show last updated date

* docs(updated): deprecate use of people option

.. versionadded:: 2024.09.30

    [1] Added new "On this page" section which represents a quick
        summary of key takeaways from the whole page.

.. deprecated:: 2024.09.30

    [1] Deprecated the use of `people` options from the `contributors`
        directive as part of new change from the underlying theme.

* ci(force-build): empty commit to force build

* chore(process flow): add TOPST git-flow diagram

related to: #9

---------

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* feature/assets → dev merge (#14)

* chore(processes): add flow and story map diagrams

---------

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* chore: remove older git-flow

Signed-off-by: Akshay Mestry <xa@mes3.dev>

---------

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* chore: delete assets/TOPST SCHOOL GitFlow.png

* feature/migrate to rst → dev (#17)

* ci(force-build): empty commit to force build

* chore(process flow): add TOPST git-flow diagram

related to: #9

* feature/migrate-to-rst ← dev  (#16)

* feature/migrate to rst merge to dev (#13)

* fix(actions): add proper branch references

* docs(open science): correct sidebar toc level

* docs(date): documents now show last updated date

* docs(updated): deprecate use of people option

.. versionadded:: 2024.09.30

    [1] Added new "On this page" section which represents a quick
        summary of key takeaways from the whole page.

.. deprecated:: 2024.09.30

    [1] Deprecated the use of `people` options from the `contributors`
        directive as part of new change from the underlying theme.

* ci(force-build): empty commit to force build

* chore(process flow): add TOPST git-flow diagram

related to: #9

* feature/assets → dev merge (#14)

* chore(processes): add flow and story map diagrams

* chore: remove older git-flow

* chore: delete assets/TOPST SCHOOL GitFlow.png

---------

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* feature/migrate to rst ← dev (#18)

* fix(actions): add proper branch references

* docs(open science): correct sidebar toc level

* docs(date): documents now show last updated date

* docs(updated): deprecate use of people option

* feature/migrate-to-rst ← dev  (#16)

* feature/migrate to rst merge to dev (#13)

* fix(actions): add proper branch references

* docs(open science): correct sidebar toc level

* docs(date): documents now show last updated date

* docs(updated): deprecate use of people option

.. versionadded:: 2024.09.30

    [1] Added new "On this page" section which represents a quick
        summary of key takeaways from the whole page.

.. deprecated:: 2024.09.30

    [1] Deprecated the use of `people` options from the `contributors`
        directive as part of new change from the underlying theme.

* ci(force-build): empty commit to force build

* chore(process flow): add TOPST git-flow diagram

related to: #9

* feature/assets → dev merge (#14)

* chore(processes): add flow and story map diagrams

* chore: remove older git-flow

* chore: delete assets/TOPST SCHOOL GitFlow.png

---------

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* feat!: upstream new web-build and i18n

Added support for native i18n.

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* fix(index): resolve issue with indexing

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* ci(sphinx-build): add support for i18n build

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* ci(i18n): add support of i18n to main

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* feature/migrate to rst → dev (#19)

* ci(i18n): add support of i18n to main

---------

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* fix(i18n): resolve issue with i18n URL parsing

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* style!: enable responsiveness of the website

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* chore: add link to the preview site (#24)

* chore: upstream all to remote (no change)

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* fix(wsim): update wsim explanation for python

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* fix(requirements): resolve the pip packages

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* fix(build): resolve page build issue (#29)

- this issue was particularly affecting the page building action due to
  a typo left over from previous merge conflict. this commit resolves
  that issue.

* feature/water module → dev (#30)

* fix(build): resolve page build issue
* fix(merge): remove merge headers

* major! feature/water module → dev (#31)

* fix(build): resolve page build issue

- this issue was particularly affecting the page building action due to
  a typo left over from previous merge conflict. this commit resolves
  that issue.

* fix(merge): remove merge headers

- this commit removes the leftover merge headers (both incoming and
current) from the files which resulted in faulty rendering.

* refactor: drop naming prefixes

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* feature/water module (#32)

* fix(build): resolve page build issue

- this issue was particularly affecting the page building action due to
  a typo left over from previous merge conflict. this commit resolves
  that issue.

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* fix(merge): remove merge headers

- this commit removes the leftover merge headers (both incoming and
current) from the files which resulted in faulty rendering.

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* refactor: drop naming prefixes

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* chore: fix redundancy with archived files

Signed-off-by: Akshay Mestry <xa@mes3.dev>

---------

Signed-off-by: Akshay Mestry <xa@mes3.dev>

* add folium maps (#33)

* fix(build): resolve page build issue

- this issue was particularly affecting the page building action due to
  a typo left over from previous merge conflict. this commit resolves
  that issue.

* fix(merge): remove merge headers

- this commit removes the leftover merge headers (both incoming and
current) from the files which resulted in faulty rendering.

* refactor: drop naming prefixes
* chore: fix redundancy with archived files
* feat(folium): add support for folium maps
* fix: remove leftover merge header
* fix: patch the merge trace
* feat(demo): changes ready for demonstration

---------

Signed-off-by: Akshay Mestry <xa@mes3.dev>

---------

Signed-off-by: Akshay Mestry <xa@mes3.dev>
  • Loading branch information
xames3 authored Oct 4, 2024
1 parent a155555 commit 6ccd53b
Show file tree
Hide file tree
Showing 212 changed files with 10,703 additions and 802 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/publish-dev-pages.yaml
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ jobs:
# -a: Write all output files (default only writes new and changed files).
# -q: Run in quiet mode, with minimal output.
run: |
echo "Building Sphinx documentation..."
sphinx-build -EWaq -b html ${{ env.SOURCE_DIR }} ${{ env.OUTPUT_DIR }}
echo "Building TOPST SCHOOL bilingual documentation..."
sphinx-build -Eaq --builder html --define language=en ${{ env.SOURCE_DIR }} ${{ env.OUTPUT_DIR }} && sphinx-build -Eaq --builder html --define language=es ${{ env.SOURCE_DIR }} ${{ env.OUTPUT_DIR }}/es
# Step 5: Deploy the built HTML files to the specified branch (GitHub Pages).
- name: DEV | Deploy to GitHub Pages
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-feature-pages.yaml
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ jobs:
# -a: Write all output files (default only writes new and changed files).
# -q: Run in quiet mode, with minimal output.
run: |
echo "Building Sphinx documentation..."
sphinx-build -EWaq -b html ${{ env.SOURCE_DIR }} ${{ env.OUTPUT_DIR }}
echo "Building TOPST SCHOOL bilingual documentation..."
sphinx-build -Eaq --builder html --define language=en ${{ env.SOURCE_DIR }} ${{ env.OUTPUT_DIR }} && sphinx-build -Eaq --builder html --define language=es ${{ env.SOURCE_DIR }} ${{ env.OUTPUT_DIR }}/es
# Step 5: Deploy the built HTML files to the specified branch (GitHub Pages).
- name: FEAT | Deploy to GitHub Pages
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-main-pages.yaml
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ jobs:
# -a: Write all output files (default only writes new and changed files).
# -q: Run in quiet mode, with minimal output.
run: |
echo "Building Sphinx documentation..."
sphinx-build -EWaq -b html ${{ env.SOURCE_DIR }} ${{ env.OUTPUT_DIR }}
echo "Building TOPST SCHOOL bilingual documentation..."
sphinx-build -Eaq --builder html --define language=en ${{ env.SOURCE_DIR }} ${{ env.OUTPUT_DIR }} && sphinx-build -Eaq --builder html --define language=es ${{ env.SOURCE_DIR }} ${{ env.OUTPUT_DIR }}/es
# Step 5: Deploy the built HTML files to the specified branch (GitHub Pages).
- name: MAIN | Deploy to GitHub Pages
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -137,5 +137,8 @@ venv/
.vscode/*

# Our mess
_tags/
archive/*
*.bak
*.nc
*.tif
Empty file added Icon
Empty file.
Empty file modified LICENSE
100644 → 100755
Empty file.
1 change: 1 addition & 0 deletions README.md
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# SCHOOL

Please note that the site is currently under construction, and some features may be in development.
But the preview version is [here](https://ciesin-geospatial.github.io/TOPSTSCHOOL-OSDMP/).
36 changes: 36 additions & 0 deletions assets/data-acquisition-visualization-flow.drawio
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<mxfile host="app.diagrams.net" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36 Edg/128.0.0.0" version="24.7.14">
<diagram id="5qNMg-CWW7gJeC52Xjr1" name="Page-1">
<mxGraphModel dx="2946" dy="1183" grid="0" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" background="#ffffff" math="0" shadow="0">
<root>
<mxCell id="0" />
<mxCell id="1" parent="0" />
<mxCell id="74Ja1isYXM9k_7vvSX5o-37" value="" style="group" parent="1" vertex="1" connectable="0">
<mxGeometry x="220" y="504" width="730" height="140" as="geometry" />
</mxCell>
<mxCell id="74Ja1isYXM9k_7vvSX5o-1" value="" style="verticalLabelPosition=bottom;verticalAlign=top;html=1;shape=mxgraph.infographic.shadedCube;isoAngle=15;fillColor=#97D077;strokeColor=none;rounded=0;shadow=0;glass=1;sketch=0;fontFamily=Verdana;fontSize=19;fontColor=#719C59;" parent="74Ja1isYXM9k_7vvSX5o-37" vertex="1">
<mxGeometry width="240" height="140" as="geometry" />
</mxCell>
<mxCell id="74Ja1isYXM9k_7vvSX5o-12" style="edgeStyle=none;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontFamily=Verdana;fontSize=19;fontColor=#719C59;endArrow=none;endFill=0;strokeColor=#719C59;align=left;" parent="74Ja1isYXM9k_7vvSX5o-37" source="74Ja1isYXM9k_7vvSX5o-13" edge="1">
<mxGeometry relative="1" as="geometry">
<mxPoint x="760" y="10" as="targetPoint" />
<Array as="points">
<mxPoint x="270" y="10" />
</Array>
</mxGeometry>
</mxCell>
<mxCell id="74Ja1isYXM9k_7vvSX5o-13" value="" style="shape=waypoint;sketch=0;fillStyle=solid;size=6;pointerEvents=1;points=[];fillColor=none;resizable=0;rotatable=0;perimeter=centerPerimeter;snapToPoint=1;rounded=0;shadow=0;glass=1;fontFamily=Verdana;fontSize=19;fontColor=#719C59;strokeColor=#719C59;align=left;" parent="74Ja1isYXM9k_7vvSX5o-37" vertex="1">
<mxGeometry x="190" y="40" width="40" height="40" as="geometry" />
</mxCell>
<mxCell id="74Ja1isYXM9k_7vvSX5o-16" value="" style="group" parent="74Ja1isYXM9k_7vvSX5o-37" vertex="1" connectable="0">
<mxGeometry x="300" y="10" width="430" height="113" as="geometry" />
</mxCell>
<mxCell id="74Ja1isYXM9k_7vvSX5o-17" value="&lt;font size=&quot;1&quot; face=&quot;Helvetica&quot;&gt;&lt;b style=&quot;font-size: 18px;&quot;&gt;Data Acquisition&lt;/b&gt;&lt;/font&gt;" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=16;fontFamily=Verdana;fontColor=#719C59;" parent="74Ja1isYXM9k_7vvSX5o-16" vertex="1">
<mxGeometry width="158" height="30" as="geometry" />
</mxCell>
<mxCell id="74Ja1isYXM9k_7vvSX5o-18" value="&lt;pre style=&quot;font-size: 14px; line-height: 50%;&quot;&gt;&lt;span style=&quot;caret-color: rgb(0, 0, 0);&quot;&gt;&lt;font style=&quot;font-size: 14px;&quot; face=&quot;Helvetica&quot;&gt;Retrieving raw datasets,&lt;/font&gt;&lt;/span&gt;&lt;/pre&gt;&lt;pre style=&quot;font-size: 14px; line-height: 50%;&quot;&gt;&lt;span style=&quot;caret-color: rgb(0, 0, 0);&quot;&gt;&lt;font style=&quot;font-size: 14px;&quot; face=&quot;Helvetica&quot;&gt;Understanding the format, and&lt;/font&gt;&lt;/span&gt;&lt;/pre&gt;&lt;pre style=&quot;font-size: 14px; line-height: 50%;&quot;&gt;&lt;span style=&quot;caret-color: rgb(0, 0, 0);&quot;&gt;&lt;font style=&quot;font-size: 14px;&quot; face=&quot;Helvetica&quot;&gt;Ensuring all necessary files are downloaded&lt;/font&gt;&lt;/span&gt;&lt;/pre&gt;" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontFamily=Verdana;fontSize=12;textOpacity=60;" parent="1" vertex="1">
<mxGeometry x="520" y="529" width="405" height="89" as="geometry" />
</mxCell>
</root>
</mxGraphModel>
</diagram>
</mxfile>
Loading

0 comments on commit 6ccd53b

Please sign in to comment.