-
-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #224 from hcrudolph/development
minor improvements, bug fixes, and dependency updates
- Loading branch information
Showing
120 changed files
with
217 additions
and
11,072 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| name: Django CI | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ "master", "development" ] | ||
| pull_request: | ||
| branches: [ "master", "development" ] | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| max-parallel: 4 | ||
| matrix: | ||
| python-version: [3.11] | ||
| services: | ||
| postgres: | ||
| image: postgres:latest | ||
| env: | ||
| POSTGRES_USER: postgres | ||
| POSTGRES_PASSWORD: postgres | ||
| POSTGRES_DB: csinfo | ||
| ports: | ||
| - 5432:5432 | ||
| options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 | ||
| env: | ||
| DJANGO_SECRET_KEY: "dummy" | ||
| DATABASE_URL: "postgres://postgres:postgres@127.0.0.1:5432/csinfo" | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - name: Set up Python ${{ matrix.python-version }} | ||
| uses: actions/setup-python@v3 | ||
| with: | ||
| python-version: ${{ matrix.python-version }} | ||
| - name: Install Dependencies | ||
| run: | | ||
| python -m pip install --upgrade pip | ||
| pip install -r requirements/requirements-dev.txt | ||
| - name: Run Migrations | ||
| run: | | ||
| python manage.py migrate | ||
| - name: Run Tests | ||
| run: | | ||
| python manage.py test |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| [submodule "static/bootstrap"] | ||
| path = static/bootstrap | ||
| url = https://github.com/hcrudolph/csi-bootstrap-theme.git |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,2 @@ | ||
| {% load static compress %} | ||
| {% compress js %} | ||
| <script src="{% static 'js/bootstrap.bundle.min.js' %}"></script> | ||
| {% endcompress %} | ||
| {% load static %} | ||
| <script src="{% static 'bootstrap/js/bootstrap.bundle.min.js' %}"></script> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,57 @@ | ||
| {% load static %} | ||
| <nav class="navbar navbar-expand-lg navbar-dark bg-dark"> | ||
| <div class="container"> | ||
| <div class="container-fluid"> | ||
| <a class="navbar-brand" href="/"><img src="{% static 'img/logo.png' %}" height="25"/></a> | ||
| <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#mainNavigation" aria-controls="mainNavigation" aria-expanded="false" aria-label="Toggle navigation"> | ||
|
|
||
| <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#mainNav" aria-controls="mainNav" aria-expanded="false" aria-label="Toggle navigation"> | ||
| <span class="navbar-toggler-icon"></span> | ||
| </button> | ||
|
|
||
| <div class="collapse navbar-collapse" id="mainNavigation"> | ||
| <ul class="navbar-nav me-auto"> | ||
| <li class="nav-item {% if navbar_context == 'cs' %}active{% endif %}"> | ||
| <a class="nav-link d-flex align-items-center" href="/cs/"> | ||
| <i class="bi bi-lock-fill me-1"></i> | ||
| <div class="collapse navbar-collapse" id="mainNav"> | ||
| <ul class="navbar-nav me-auto"> | ||
| <li class="nav-item"> | ||
| <a class="nav-link d-flex align-items-center {% if navbar_context == 'cs' %}active{% endif %}" href="/cs/"> | ||
| <i class="bi bi-lock-fill me-1" aria-hidden="true"></i> | ||
| Cipher Suites | ||
| </a> | ||
| </li> | ||
| <li class="nav-item {% if navbar_context == 'rfc' %}active{% endif %}"> | ||
| <a class="nav-link d-flex align-items-center" href="/rfc/"> | ||
| <i class="bi bi-file-earmark-lock2-fill me-1"></i> | ||
| <li class="nav-item"> | ||
| <a class="nav-link d-flex align-items-center {% if navbar_context == 'rfc' %}active{% endif %}" href="/rfc/"> | ||
| <i class="bi bi-file-earmark-lock2-fill me-1" aria-hidden="true"></i> | ||
| RFCs | ||
| </a> | ||
| </li> | ||
| <li class="nav-item {% if navbar_context == 'blog' %}active{% endif %}"> | ||
| <a class="nav-link d-flex align-items-center" href="/blog/"> | ||
| <i class="bi bi-newspaper me-1"></i> | ||
| <li class="nav-item"> | ||
| <a class="nav-link d-flex align-items-center {% if navbar_context == 'blog' %}active{% endif %}" href="/blog/"> | ||
| <i class="bi bi-newspaper me-1" aria-hidden="true"></i> | ||
| News | ||
| </a> | ||
| </li> | ||
| {% for page in static_pages %} | ||
| {% if page.show_in_nav %} | ||
| <li class="nav-item {% if navbar_context == page.title %}active{% endif %}"> | ||
| <li class="nav-item"> | ||
| {% if page.direct_link and page.content %} | ||
| <a class="nav-link d-flex align-items-center" href="{{ page.content }}" target="_blank" rel="noopener noreferrer"> | ||
| {% else %} | ||
| <a class="nav-link d-flex align-items-center" href="/page/{{ page|lower }}/"> | ||
| <a class="nav-link d-flex align-items-center {% if navbar_context == page.title %}active{% endif %}" href="/page/{{ page|lower }}/"> | ||
| {% endif %} | ||
| {% if page.icon %}<i class="bi bi-{{ page.icon }}"></i>{% endif %} | ||
| {% if page.icon %}<i class="bi bi-{{ page.icon }}" aria-hidden="true"></i>{% endif %} | ||
| {{ page|title }} | ||
| </a> | ||
| </li> | ||
| {% endif %} | ||
| {% endfor %} | ||
| </ul> | ||
| {% if not hide_navbar_search %} | ||
| <form class="form-inline my-2 my-md-0" action="/search?q={{ search_form.get_search_term }}" method="get"> | ||
| <div class="form-group input-group"> | ||
| {{ search_form }} | ||
| <button class="btn btn-primary" type="submit"> | ||
| <i class="bi bi-search"></i> | ||
| </button> | ||
| </div> | ||
| </form> | ||
| {% endif %} | ||
| </ul> | ||
| {% if not hide_navbar_search %} | ||
| <form action="/search?q={{ search_form.get_search_term }}" method="get"> | ||
| <div class="input-group"> | ||
| {{ search_form.q }} | ||
| <button class="btn btn-primary" type="submit"> | ||
| <i class="bi bi-search"></i> | ||
| </button> | ||
| </div> | ||
| </form> | ||
| {% endif %} | ||
| </div> | ||
| </div> | ||
| </nav> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.