Skip to content

Commit 7051bc6

Browse files
authored
Merge pull request #23 from lqez/main
get the site out
2 parents e673d70 + e20de01 commit 7051bc6

File tree

8 files changed

+129
-43
lines changed

8 files changed

+129
-43
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,3 +172,6 @@ cython_debug/
172172

173173
# Misc
174174
.DS_Store
175+
176+
# Node packages
177+
node_modules

Dockerfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
55
ENV PYTHONDONTWRITEBYTECODE=1
66
ENV PYTHONUNBUFFERED=1
77

8+
# Add nodejs v22
9+
RUN apt-get update \
10+
&& apt-get install -y curl gnupg \
11+
&& curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
12+
&& apt-get install -y nodejs \
13+
&& apt-get clean \
14+
&& rm -rf /var/lib/apt/lists/*
15+
816
WORKDIR /app
917

1018
# Copy the project into the image
@@ -16,4 +24,4 @@ RUN find /app -name "*.sqlite3" -delete
1624
# Sync the project into a new environment, using the frozen lockfile
1725
RUN uv sync --frozen
1826

19-
ENTRYPOINT [ "/app/entrypoint.sh" ]
27+
ENTRYPOINT [ "/app/entrypoint.sh" ]

deploy_prod.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ mkdir -p ${LOG_DIR}
2424

2525
# update changes before update
2626
# git pull
27+
npm install
2728
source .venv/bin/activate
2829
uv sync
2930
cd pythonkr_backend

entrypoint.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33

44
cd /app
5+
npm install
56
source .venv/bin/activate
67
uv sync
78
cd /app/pythonkr_backend

package-lock.json

Lines changed: 102 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"devDependencies": {
3+
"cross-env": "^7.0.3"
4+
}
5+
}

pythonkr_backend/fixtures.json

Lines changed: 6 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -17,40 +17,14 @@
1717
}
1818
},
1919
{
20-
"model": "wagtailcore.page",
20+
"model": "wagtailcore.site",
2121
"pk": 1,
2222
"fields": {
23-
"path": "0001",
24-
"depth": 1,
25-
"numchild": 1,
26-
"translation_key": "0bddbb0f-7275-4646-81a5-c89de32daa6c",
27-
"locale": 1,
28-
"latest_revision": null,
29-
"live": true,
30-
"has_unpublished_changes": false,
31-
"first_published_at": null,
32-
"last_published_at": null,
33-
"live_revision": null,
34-
"go_live_at": null,
35-
"expire_at": null,
36-
"expired": false,
37-
"locked": false,
38-
"locked_at": null,
39-
"locked_by": null,
40-
"title": "Root",
41-
"draft_title": "Root",
42-
"slug": "root",
43-
"content_type": [
44-
"wagtailcore",
45-
"page"
46-
],
47-
"url_path": "/",
48-
"owner": null,
49-
"seo_title": "",
50-
"show_in_menus": false,
51-
"search_description": "",
52-
"latest_revision_created_at": null,
53-
"alias_of": null
23+
"hostname": "localhost",
24+
"port": 80,
25+
"site_name": "",
26+
"root_page": 3,
27+
"is_default_site": true
5428
}
5529
},
5630
{

pythonkr_backend/theme/static_src/tailwind.config.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,7 @@ module.exports = {
5151
* comment the line below to disable '@tailwindcss/forms'.
5252
*/
5353
require('@tailwindcss/forms'),
54-
plugins: [
55-
/**
56-
* '@tailwindcss/forms' is the forms plugin that provides a minimal styling
57-
* for forms. If you don't like it or have own styling for forms,
58-
* comment the line below to disable '@tailwindcss/forms'.
59-
*/
60-
require('@tailwindcss/forms'),
61-
require('@tailwindcss/typography'),
62-
require('@tailwindcss/aspect-ratio'),
63-
],
54+
require('@tailwindcss/typography'),
55+
require('@tailwindcss/aspect-ratio'),
6456
],
6557
}

0 commit comments

Comments
 (0)