Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
f68e5b4573 | |||
db39c38594 | |||
38d768a584 | |||
fb39818be3 | |||
f04c243470 | |||
f7a4e16d03 |
|
@ -66,7 +66,7 @@ $ docker run --rm -it \
|
|||
-e HOTPOCKET_BACKEND_INITIAL_ACCOUNT_USERNAME=hotpocket \
|
||||
-e HOTPOCKET_BACKEND_INITIAL_ACCOUNT_PASSWORD=hotpocketm4st3r \
|
||||
-p 8000:8000 \
|
||||
docker-hosted.nexus.bthlabs.pl/hotpocket/backend:aio-v1.0.0-01
|
||||
docker-hosted.nexus.bthlabs.pl/hotpocket/backend:aio-v1.0.2-01
|
||||
```
|
||||
|
||||
The command above will set up and start the application. The SQLite file will
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
services:
|
||||
backend:
|
||||
image: "docker-hosted.nexus.bthlabs.pl/hotpocket/backend:aio-v1.0.0-01"
|
||||
image: "docker-hosted.nexus.bthlabs.pl/hotpocket/backend:aio-v1.0.2-01"
|
||||
environment:
|
||||
HOTPOCKET_BACKEND_SECRET_KEY: "thisisntright"
|
||||
HOTPOCKET_BACKEND_INITIAL_ACCOUNT_USERNAME: "hotpocket"
|
||||
|
|
|
@ -8,7 +8,7 @@ x-backend-environment: &x-backend-environment
|
|||
|
||||
services:
|
||||
webapp:
|
||||
image: "docker-hosted.nexus.bthlabs.pl/hotpocket/backend:deployment-v1.0.0-01"
|
||||
image: "docker-hosted.nexus.bthlabs.pl/hotpocket/backend:deployment-v1.0.2-01"
|
||||
environment:
|
||||
<<: *x-backend-environment
|
||||
HOTPOCKET_BACKEND_ALLOWED_HOSTS: "app.staging.hotpocket.bthlab.bthlabs.net"
|
||||
|
@ -21,7 +21,7 @@ services:
|
|||
restart: "unless-stopped"
|
||||
|
||||
admin:
|
||||
image: "docker-hosted.nexus.bthlabs.pl/hotpocket/backend:deployment-v1.0.0-01"
|
||||
image: "docker-hosted.nexus.bthlabs.pl/hotpocket/backend:deployment-v1.0.2-01"
|
||||
environment:
|
||||
<<: *x-backend-environment
|
||||
HOTPOCKET_BACKEND_APP: "admin"
|
||||
|
@ -35,7 +35,7 @@ services:
|
|||
restart: "unless-stopped"
|
||||
|
||||
celery-worker:
|
||||
image: "docker-hosted.nexus.bthlabs.pl/hotpocket/backend:deployment-v1.0.0-01"
|
||||
image: "docker-hosted.nexus.bthlabs.pl/hotpocket/backend:deployment-v1.0.2-01"
|
||||
command:
|
||||
- "/srv/venv/bin/celery"
|
||||
- "-A"
|
||||
|
@ -57,7 +57,7 @@ services:
|
|||
restart: "unless-stopped"
|
||||
|
||||
celery-beat:
|
||||
image: "docker-hosted.nexus.bthlabs.pl/hotpocket/backend:deployment-v1.0.0-01"
|
||||
image: "docker-hosted.nexus.bthlabs.pl/hotpocket/backend:deployment-v1.0.2-01"
|
||||
command:
|
||||
- "/srv/venv/bin/celery"
|
||||
- "-A"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
from __future__ import annotations
|
||||
|
||||
version = '1.0.0'
|
||||
version = '1.0.2'
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
from __future__ import annotations
|
||||
|
||||
from django.contrib import messages
|
||||
import django.db
|
||||
from django.http import HttpRequest, HttpResponse
|
||||
from django.shortcuts import redirect
|
||||
from django.urls import reverse
|
||||
|
@ -21,6 +22,7 @@ class CreateSaveWorkflow(SaveWorkflow):
|
|||
url: str,
|
||||
force_post_save: bool = False,
|
||||
) -> HttpResponse:
|
||||
with django.db.transaction.atomic():
|
||||
save = self.create(
|
||||
account.pk,
|
||||
SaveIn(url=url),
|
||||
|
@ -28,9 +30,6 @@ class CreateSaveWorkflow(SaveWorkflow):
|
|||
|
||||
association = self.associate(account.pk, save)
|
||||
|
||||
if save.last_processed_at is None:
|
||||
processing_result = self.schedule_processing(save) # noqa: F841
|
||||
|
||||
response = redirect(reverse('ui.associations.browse'))
|
||||
if force_post_save is True or save.is_netloc_banned is True:
|
||||
response = redirect(reverse(
|
||||
|
@ -47,4 +46,7 @@ class CreateSaveWorkflow(SaveWorkflow):
|
|||
response.headers['X-HotPocket-Testing-Save-PK'] = save.pk
|
||||
response.headers['X-HotPocket-Testing-Association-PK'] = association.pk
|
||||
|
||||
if save.last_processed_at is None:
|
||||
processing_result = self.schedule_processing(save) # noqa: F841
|
||||
|
||||
return response
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
{% if association.title %}
|
||||
{{ association.title }}
|
||||
{% else %}
|
||||
{% translate 'Untitled' %}
|
||||
{{ association.target.url }}
|
||||
{% endif %}
|
||||
</a>
|
||||
</h5>
|
||||
|
|
|
@ -4,7 +4,6 @@ from __future__ import annotations
|
|||
import http
|
||||
import logging
|
||||
|
||||
import django.db
|
||||
from django.http import HttpRequest, HttpResponse
|
||||
from django.shortcuts import render
|
||||
from django.views.decorators.csrf import csrf_exempt
|
||||
|
@ -21,7 +20,6 @@ def share_sheet(request: HttpRequest) -> HttpResponse:
|
|||
LOGGER.debug('POST=`%s`', request.POST)
|
||||
|
||||
try:
|
||||
with django.db.transaction.atomic():
|
||||
assert request.user.is_anonymous is False, 'Login required'
|
||||
assert 'text' in request.POST, 'Bad request: Missing `text`'
|
||||
|
||||
|
|
|
@ -4,7 +4,6 @@ from __future__ import annotations
|
|||
import http
|
||||
import logging
|
||||
|
||||
import django.db
|
||||
from django.http import HttpRequest, HttpResponse
|
||||
from django.shortcuts import render
|
||||
|
||||
|
@ -19,7 +18,6 @@ def shortcut(request: HttpRequest) -> HttpResponse:
|
|||
LOGGER.debug('GET=`%s`', request.GET)
|
||||
|
||||
try:
|
||||
with django.db.transaction.atomic():
|
||||
assert request.user.is_anonymous is False, 'Login required'
|
||||
assert 'url' in request.GET, 'Bad request: Missing `url`'
|
||||
|
||||
|
|
|
@ -4,7 +4,6 @@ from __future__ import annotations
|
|||
import http
|
||||
import logging
|
||||
|
||||
import django.db
|
||||
from django.http import HttpRequest, HttpResponse
|
||||
from django.shortcuts import render
|
||||
from django.urls import reverse
|
||||
|
@ -24,7 +23,6 @@ class CreateView(AccountRequiredMixin, FormView):
|
|||
form_class = CreateForm
|
||||
|
||||
def form_valid(self, form: CreateForm) -> HttpResponse:
|
||||
with django.db.transaction.atomic():
|
||||
return CreateSaveWorkflow().run(
|
||||
request=self.request,
|
||||
account=self.request.user,
|
||||
|
|
|
@ -13,7 +13,7 @@ cat <<EOF
|
|||
|_|
|
||||
production
|
||||
|
||||
HotPocket v1.0.0 [${HOTPOCKET_BACKEND_IMAGE_ID}] (https://hotpocket.app/)
|
||||
HotPocket v1.0.2 [${HOTPOCKET_BACKEND_IMAGE_ID}] (https://hotpocket.app/)
|
||||
Copyright 2025-present by BTHLabs. All rights reserved. (https://bthlabs.pl/)
|
||||
Licensed under Apache-2.0
|
||||
EOF
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "hotpocket-backend",
|
||||
"version": "1.0.0",
|
||||
"version": "1.0.2",
|
||||
"description": "HotPocket Backend",
|
||||
"main": "hotpocket_backend/apps/frontend/src/index.js",
|
||||
"repository": "https://git.bthlabs.pl/tomekwojcik/hotpocket",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[tool.poetry]
|
||||
name = "hotpocket-backend"
|
||||
version = "1.0.0"
|
||||
version = "1.0.2"
|
||||
description = "HotPocket Backend"
|
||||
authors = ["Tomek Wójcik <contact@bthlabs.pl>"]
|
||||
license = "Apache-2.0"
|
||||
|
|
|
@ -2,8 +2,9 @@
|
|||
extend-exclude =
|
||||
hotpocket_backend/apps/*/migrations/*.py,
|
||||
node_modules/**/*.py,
|
||||
skel/*.py
|
||||
skel/*/*.py
|
||||
skel/*.py,
|
||||
skel/*/*.py,
|
||||
playground.py
|
||||
ignore = E131,W503,W504
|
||||
max-line-length = 119
|
||||
hang-closing = False
|
||||
|
@ -13,7 +14,7 @@ addopts = --disable-warnings
|
|||
django_debug_mode = keep
|
||||
|
||||
[isort]
|
||||
known_first_party=hotpocket_backend,hotpocket_backend_testing,hotpocket_common,hotpocket_soa,hotpocket_testing
|
||||
known_first_party=hotpocket_backend,hotpocket_backend_testing,hotpocket_common,hotpocket_soa,hotpocket_testing,hotpocket_workspace_tools
|
||||
multi_line_output=3
|
||||
include_trailing_comma=true
|
||||
force_sort_within_sections=true
|
||||
|
|
|
@ -9,7 +9,7 @@ import os
|
|||
from invoke import task
|
||||
from invoke.exceptions import UnexpectedExit
|
||||
|
||||
from hotpocket_workspace_tools import get_workspace_mode, WorkspaceMode
|
||||
from hotpocket_workspace_tools import WorkspaceMode, get_workspace_mode
|
||||
|
||||
WORKSPACE_MODE = get_workspace_mode()
|
||||
ENV = os.getenv('HOTPOCKET_BACKEND_ENV', 'docker')
|
||||
|
|
|
@ -7,7 +7,7 @@ max-line-length = 119
|
|||
hang-closing = False
|
||||
|
||||
[isort]
|
||||
known_first_party=hotpocket_backend,hotpocket_backend_testing,hotpocket_common,hotpocket_soa,hotpocket_testing
|
||||
known_first_party=hotpocket_backend,hotpocket_backend_testing,hotpocket_common,hotpocket_soa,hotpocket_testing,hotpocket_workspace_tools
|
||||
multi_line_output=3
|
||||
include_trailing_comma=true
|
||||
force_sort_within_sections=true
|
||||
|
|
Loading…
Reference in New Issue
Block a user