Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.github
docker-compose.yml
k8s
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
workflow_dispatch:
inputs:
tag:
description: Platform image tag
description: Image tag
required: true

jobs:
Expand Down Expand Up @@ -41,8 +41,8 @@ jobs:
context: .
file: Dockerfile
tags: |
blsq/openhexa-platform:${{ steps.version.outputs.number }}
blsq/openhexa-platform:latest
blsq/openhexa-app:${{ steps.version.outputs.number }}
blsq/openhexa-app:latest
- name: Build and push (manual)
if: ${{ github.event_name == 'workflow_dispatch' }}
uses: docker/build-push-action@6efc2b01cbb63cfc68c370c6c806586fa6384a3a
Expand All @@ -51,6 +51,6 @@ jobs:
context: .
file: Dockerfile
tags: |
blsq/openhexa-platform:${{ github.event.inputs.tag }}
blsq/openhexa-platform:latest
blsq/openhexa-app:${{ github.event.inputs.tag }}
blsq/openhexa-app:latest

43 changes: 0 additions & 43 deletions .github/workflows/build_jupyter_image.yml

This file was deleted.

4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
.env
*.env
.coverage

jupyter/dev-config.yaml
2 changes: 1 addition & 1 deletion config/asgi.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
ASGI config for habari_platform project.
ASGI config for hexa.

It exposes the ASGI callable as a module-level variable named ``application``.

Expand Down
28 changes: 14 additions & 14 deletions config/settings.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Django settings for habari_platform project.
Django settings for hexa.

Generated by 'django-admin startproject' using Django 3.1.3.

Expand Down Expand Up @@ -39,14 +39,14 @@
"django.contrib.staticfiles",
"django_countries",
"tailwind",
"habari.common.apps.CommonConfig",
"habari.user_management.apps.UserManagementConfig",
"habari.core.apps.CoreConfig",
"habari.catalog.apps.CatalogConfig",
"habari.notebooks.apps.NotebooksConfig",
"habari.pipelines.apps.PipelinesConfig",
"habari.tailwindui.apps.TailwinduiConfig",
"habari.plugins.connector_dhis2.apps.Dhis2ConnectorConfig",
"hexa.common.apps.CommonConfig",
"hexa.user_management.apps.UserManagementConfig",
"hexa.core.apps.CoreConfig",
"hexa.catalog.apps.CatalogConfig",
"hexa.notebooks.apps.NotebooksConfig",
"hexa.pipelines.apps.PipelinesConfig",
"hexa.tailwindui.apps.TailwinduiConfig",
"hexa.plugins.connector_dhis2.apps.Dhis2ConnectorConfig",
]

MIDDLEWARE = [
Expand All @@ -58,23 +58,23 @@
"django.contrib.auth.middleware.AuthenticationMiddleware",
"django.contrib.messages.middleware.MessageMiddleware",
"django.middleware.clickjacking.XFrameOptionsMiddleware",
"habari.user_management.middleware.login_required_middleware",
"hexa.user_management.middleware.login_required_middleware",
]

ROOT_URLCONF = "config.urls"

TEMPLATES = [
{
"BACKEND": "django.template.backends.django.DjangoTemplates",
"DIRS": [BASE_DIR / "habari" / "templates"],
"DIRS": [BASE_DIR / "hexa" / "templates"],
"APP_DIRS": True,
"OPTIONS": {
"context_processors": [
"django.template.context_processors.debug",
"django.template.context_processors.request",
"django.contrib.auth.context_processors.auth",
"django.contrib.messages.context_processors.messages",
"habari.common.context_processors.global_variables",
"hexa.common.context_processors.global_variables",
],
},
},
Expand Down Expand Up @@ -140,7 +140,7 @@
# https://docs.djangoproject.com/en/3.1/howto/static-files/
STATIC_URL = "/static/"
STATIC_ROOT = BASE_DIR / "static"
STATICFILES_DIRS = [BASE_DIR / "habari" / "static"]
STATICFILES_DIRS = [BASE_DIR / "hexa" / "static"]

# Tailwind
TAILWIND_APP_NAME = "habari.tailwindui"
TAILWIND_APP_NAME = "hexa.tailwindui"
14 changes: 7 additions & 7 deletions config/urls.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""habari_platform URL Configuration
"""hexa URL Configuration

The `urlpatterns` list routes URLs to views. For more information please see:
https://docs.djangoproject.com/en/3.1/topics/http/urls/
Expand All @@ -16,16 +16,16 @@
from django.contrib import admin
from django.urls import include, path

from habari.catalog.connectors import get_connector_app_configs
from hexa.catalog.connectors import get_connector_app_configs

# Core URLs
urlpatterns = [
path("admin/", admin.site.urls),
path("", include("habari.core.urls", namespace="core")),
path("user/", include("habari.user_management.urls", namespace="user")),
path("catalog/", include("habari.catalog.urls", namespace="catalog")),
path("notebooks/", include("habari.notebooks.urls", namespace="notebooks")),
path("pipelines/", include("habari.pipelines.urls", namespace="pipelines")),
path("", include("hexa.core.urls", namespace="core")),
path("user/", include("hexa.user_management.urls", namespace="user")),
path("catalog/", include("hexa.catalog.urls", namespace="catalog")),
path("notebooks/", include("hexa.notebooks.urls", namespace="notebooks")),
path("pipelines/", include("hexa.pipelines.urls", namespace="pipelines")),
path("auth/", include("django.contrib.auth.urls")),
]

Expand Down
2 changes: 1 addition & 1 deletion config/wsgi.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
WSGI config for habari_platform project.
WSGI config for hexa.

It exposes the WSGI callable as a module-level variable named ``application``.

Expand Down
12 changes: 6 additions & 6 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ services:
db:
image: postgres:12.5
environment:
- POSTGRES_DB=habari
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD=postgres
- POSTGRES_DB=openhexa-app
- POSTGRES_USER=openhexa-app
- POSTGRES_PASSWORD=openhexa-app
ports:
- 5432:5432
app:
Expand All @@ -22,8 +22,8 @@ services:
- ALLOWED_HOSTS="*"
- DATABASE_HOST=db
- DATABASE_PORT=5432
- DATABASE_NAME=habari
- DATABASE_USER=postgres
- DATABASE_PASSWORD=postgres
- DATABASE_NAME=openhexa-app
- DATABASE_USER=openhexa-app
- DATABASE_PASSWORD=openhexa-app
- DEBUG=true
- SECRET_KEY='))dodw9%n)7q86l-q1by4e-2z#vonph50!%ep7_je)_=x0m2v-'
Loading