Skip to content

Commit 47630be

Browse files
JacobCoffeeclaudeewdurbin
authored
UI redesign frontend (#159)
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: Ee Durbin <ewdurbin@gmail.com> Co-authored-by: Ee Durbin <ee@astral.sh>
1 parent e58abc2 commit 47630be

68 files changed

Lines changed: 15111 additions & 1865 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/.git
22
/.ruff_cache
33
/dev
4+
/node_modules
45
__pycache__
56
.swp
67
buildanddeploy

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,8 @@ __pycache__
44
/buildanddeploy
55
/celerybeat-schedule
66
/dev
7+
/node_modules
8+
cabotage/client/static/tailwind.css
9+
cabotage/client/static/tailwind.min.css
10+
cabotage/client/static/main.min.css
11+
cabotage/client/static/main.min.js

.oxfmtrc.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"printWidth": 120,
3+
"tabWidth": 2,
4+
"useTabs": false,
5+
"semi": true,
6+
"singleQuote": true,
7+
"trailingComma": "all",
8+
"bracketSpacing": true,
9+
"insertFinalNewline": true,
10+
"endOfLine": "lf",
11+
"ignorePatterns": ["*.min.js", "*.min.css"]
12+
}

Dockerfile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,12 @@ RUN --mount=type=cache,target=/root/.cache/pip \
3838
COPY . /opt/cabotage-app/src/
3939
WORKDIR /opt/cabotage-app/src/
4040

41+
# Build and minify static assets for production
42+
COPY --from=oven/bun:1-slim /usr/local/bin/bun /usr/local/bin/bun
43+
RUN if [ "$DEVEL" != "yes" ]; then \
44+
cd /opt/cabotage-app/src && \
45+
bun install --frozen-lockfile && \
46+
bun run build && \
47+
rm -rf node_modules; \
48+
fi
49+

bun.lock

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

cabotage/celery/tasks/build.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -541,25 +541,25 @@ def file_path(filename):
541541
return os.path.join(image.application.subdirectory, filename)
542542
return filename
543543

544-
dockerfile_candidates = ["Dockerfile.cabotage", "Dockerfile"]
545-
if image.application.dockerfile_path:
546-
dockerfile_candidates = [image.application.dockerfile_path]
547-
548544
dockerfile_name = None
549-
dockerfile_body = None
550-
for candidate in dockerfile_candidates:
545+
dockerfile_body = _fetch_github_file(
546+
image.application.github_repository,
547+
image.commit_sha,
548+
access_token=access_token,
549+
filename=file_path("Dockerfile.cabotage"),
550+
)
551+
dockerfile_name = "Dockerfile.cabotage"
552+
if dockerfile_body is None:
551553
dockerfile_body = _fetch_github_file(
552554
image.application.github_repository,
553555
image.commit_sha,
554556
access_token=access_token,
555-
filename=file_path(candidate),
557+
filename=file_path("Dockerfile"),
556558
)
557-
if dockerfile_body is not None:
558-
dockerfile_name = candidate
559-
break
559+
dockerfile_name = "Dockerfile"
560560
if dockerfile_body is None:
561561
raise BuildError(
562-
f"No Dockerfile found in "
562+
"No Dockerfile.cabotage or Dockerfile found in root of "
563563
f"{git_ref(image.application.github_repository, image.commit_sha)}"
564564
)
565565

0 commit comments

Comments
 (0)