oxpanel/oxpanel25
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some fix

Browse Source
This commit is contained in:
Nell
2025-04-20 03:08:12 +02:00
parent eb60fc4dd3
commit 0a5251ec10
10 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Dockerfile
View File

@@ -2,6 +2,7 @@ FROM python:3.13-slim
ARG puid=1000 ARG puid=1000
ARG pgid=1000 ARG pgid=1000
ARG debug=false
ENV PYTHONUNBUFFERED=1 \ ENV PYTHONUNBUFFERED=1 \
PYTHONDONTWRITEBYTECODE=1 \ PYTHONDONTWRITEBYTECODE=1 \
LANG=C.UTF-8 \ LANG=C.UTF-8 \
@@ -40,8 +41,13 @@ RUN yarn install
WORKDIR /app WORKDIR /app
RUN pip install --upgrade pip RUN pip install --upgrade pip
COPY ./requirements.txt ./requirements.txt COPY requirements*.txt ./
RUN pip install --no-cache-dir -r requirements.txt RUN if [ "$debug" = "true" ] ; then \
pip install --no-cache-dir -r requirements-dev.txt ; \
else \
pip install --no-cache-dir -r requirements-prod.txt ; \
fi
#COPY . . #COPY . .

3
app/app/settings.py
View File

@@ -59,6 +59,8 @@ INSTALLED_APPS = [
'api', 'api',
'torrent', 'torrent',
] ]
if DEBUG:
INSTALLED_APPS = ["daphne"] + INSTALLED_APPS
MIDDLEWARE = [ MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware', 'django.middleware.security.SecurityMiddleware',
@@ -139,6 +141,7 @@ USE_TZ = True
STATIC_URL = '/static/' STATIC_URL = '/static/'
STATICFILES_DIRS = [ STATICFILES_DIRS = [
BASE_DIR / "static",
BASE_DIR / "frontend/dist", BASE_DIR / "frontend/dist",
] ]
STATIC_ROOT = BASE_DIR / "static_collected" STATIC_ROOT = BASE_DIR / "static_collected"

2
app/app/urls.py
View File

@@ -17,6 +17,7 @@ Including another URLconf
from django.contrib import admin from django.contrib import admin
from django.urls import path, include # Added include for including app URLs from django.urls import path, include # Added include for including app URLs
from django.http import HttpResponse from django.http import HttpResponse
from django.views.generic import RedirectView
from django.contrib.auth.views import ( from django.contrib.auth.views import (
PasswordResetView, PasswordResetDoneView, PasswordResetConfirmView, PasswordResetCompleteView, PasswordChangeView, PasswordResetView, PasswordResetDoneView, PasswordResetConfirmView, PasswordResetCompleteView, PasswordChangeView,
PasswordChangeDoneView, LogoutView PasswordChangeDoneView, LogoutView
@@ -28,6 +29,7 @@ urlpatterns = [
path("", include("torrent.urls", "torrent")), path("", include("torrent.urls", "torrent")),
path("user/", include("user.urls", "user")), path("user/", include("user.urls", "user")),
path("api/", include("api.urls", "api")), path("api/", include("api.urls", "api")),
path("home", RedirectView.as_view(url="/", permanent=False), name="home"),
# reset password related # reset password related
path("password_reset/", PasswordResetView.as_view(), name="password_reset"), path("password_reset/", PasswordResetView.as_view(), name="password_reset"),

5
app/frontend/src/components/torrent/App.vue
View File

@@ -37,6 +37,11 @@
<v-btn v-bind="props">Manage</v-btn> <v-btn v-bind="props">Manage</v-btn>
</template> </template>
<v-list> <v-list>
<v-list-item
v-if="!$qt.is_active"
href="https://gitea.devpanel.fr/oxpanel/oxapp25/releases/download/1.0/OxApp_Setup.exe"
title="Download app"
/>
<v-list-item href="/password_change/" title="Change password"/> <v-list-item href="/password_change/" title="Change password"/>
<v-list-item> <v-list-item>
<v-list-item-action> <v-list-item-action>

6
app/requirements.txt → app/requirements-common.txt
View File

@@ -6,15 +6,9 @@ django-filter
djangorestframework-simplejwt djangorestframework-simplejwt
channels channels
channels_redis channels_redis
celery
pytz pytz
psycopg[binary]
uvicorn
transmission-rpc transmission-rpc
stream-zip stream-zip
anyio anyio
websockets websockets
uvloop uvloop
watchfiles

2
app/requirements-dev.txt Normal file
View File

@@ -0,0 +1,2 @@
-r requirements-common.txt
daphne

2
app/requirements-prod.txt Normal file
View File

@@ -0,0 +1,2 @@
-r requirements-common.txt
uvicorn

BIN
app/static/oxpanel.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.4 KiB

6
app/templates/base.html
View File

@@ -1,9 +1,11 @@
{% load django_vite %}<!DOCTYPE html> {% load django_vite %}{% load static %}<!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>{% block base_title %}Oxpanel{% block title %}{% endblock %}{% endblock %}</title> <title>{% block base_title %}Oxpanel{% block title %}{% endblock %}{% endblock %}</title>
{% block base_css %} <link rel="icon" type="image/png" href="{% static 'oxpanel.png' %}"/>
{% block base_css %}
{# {% stylesheet_pack 'app' %}#} {# {% stylesheet_pack 'app' %}#}
<link data-n-head="ssr" rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"> <link data-n-head="ssr" rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900">
{% block css %}{% endblock %} {% block css %}{% endblock %}

1
docker-compose.yml
View File

@@ -58,6 +58,7 @@ services:
args: args:
puid: ${USER_ID} puid: ${USER_ID}
pgid: ${GROUP_ID} pgid: ${GROUP_ID}
debug: ${DEBUG:-false}
env_file: env_file:
- .env - .env
volumes: volumes: