Skip to content

web: Pack client JS and add hamburger menu to web frontend #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
binaryoverload merged 17 commits into from
May 23, 2025
Merged

web: Pack client JS and add hamburger menu to web frontend #121

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1970f19
docker: improve service inter-dependencies
ashquarky May 21, 2025
a9acfff
feat(build): Run client-facing JS+CSS through ESBuild pipeline
ashquarky May 21, 2025
12f0ef9
feat(build): Remove pre-minified versions of client-facing JS+CSS
ashquarky May 21, 2025
cb96d34
fix(build): Don't minify identifiers
ashquarky May 22, 2025
4afd67d
feat(lint): Add EJS linting
ashquarky May 22, 2025
247947e
chore(web): Reformat post_template include
ashquarky May 22, 2025
8dfea73
chore(docker): Add R2 to proxy
ashquarky May 23, 2025
caf6d7e
feat(web): Add hamburger to posts
ashquarky May 23, 2025
ee0020f
feat(web): Add reporting to hamburger (mmm)
ashquarky May 23, 2025
23c40a7
feat(web): Add post delete button for moderators
ashquarky May 23, 2025
a27d1c6
fix(web): Highlights are light now
ashquarky May 23, 2025
76ee157
chore(web): Use hasAttribute for boolean condition
ashquarky May 23, 2025
3bf6b2d
chore(web): Clean up promises for deletePost
ashquarky May 23, 2025
735c423
fix(build): Use npm-run-all instead of sh for cross-platform dev'ving
ashquarky May 23, 2025
01147af
fix(web): Don't error on pages that don't have a report modal
ashquarky May 23, 2025
2381c12
feat(web, console): Use IIFE bundle and unvendor PJAX
ashquarky May 23, 2025
0937eab
feat(build): Enable minification and treeshaking
ashquarky May 23, 2025
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
7 changes: 6 additions & 1 deletion .docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ services:
minio-setup:
image: minio/mc
depends_on:
- minio
minio:
condition: service_healthy
environment:
MINIO_ROOT_USER: minioadmin
MINIO_ROOT_PASSWORD: minioadmin
Expand All @@ -77,8 +78,11 @@ services:

account:
image: ghcr.io/pretendonetwork/account:sha-99aec60
restart: unless-stopped
ports:
- "8123:8123" # grpc
links:
- mongo
environment:
PN_ACT_CONFIG_REDIS_URL: redis://redis:6379
PN_ACT_CONFIG_HTTP_PORT: 8000
Expand All @@ -96,6 +100,7 @@ services:

friends:
image: ghcr.io/pretendonetwork/friends:sha-5560c1d
restart: unless-stopped
ports:
- "8124:8124" # grpc
environment:
Expand Down
1 change: 1 addition & 0 deletions .docker/mitmproxy-local.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

s3_domains = [
"cdn.pretendo.cc",
"r2-cdn.pretendo.cc"
]

def request(flow: http.HTTPFlow):
Expand Down
10 changes: 10 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,16 @@
"[typescript]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
},
"[xml]": {
"editor.defaultFormatter": "redhat.vscode-xml"
},
"[html]": {
"editor.defaultFormatter": "vscode.html-language-features"
},
"html.format.unformatted": "%,%_,%=,%-,%#,%%,-%,_%,a,abbr,area,audio,b,bdi,bdo,br,button,canvas,cite,code,data,datalist,del,dfn,em,embed,i,iframe,img,input,ins,kbd,label,link,map,mark,math,meta,meter,noscript,object,output,picture,progress,q,ruby,s,samp,script,select,slot,small,span,strong,sub,sup,svg,template,textarea,time,u,var,video,wbr",
"emmet.includeLanguages": {
"ejs": "html",
},
"javascript.preferences.importModuleSpecifier": "non-relative",
"typescript.preferences.importModuleSpecifier": "non-relative",
}
9 changes: 9 additions & 0 deletions apps/juxtaposition-ui/nodemon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"watch": [
"src/"
],
"ext": "js,ts,ejs,json,css",
"env": {
"NODE_ENV": "development"
}
}
9 changes: 7 additions & 2 deletions apps/juxtaposition-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"license": "AGPL-3.0-only",
"main": "./dist/server.js",
"scripts": {
"dev": "tsup --watch --onSuccess \"node --enable-source-maps dist/server.js\"",
"dev": "nodemon -x '/bin/sh -c' -- 'tsup && node --enable-source-maps dist/server.js'",
"ejslint": "ejslint **/*.ejs",
"lint": "eslint .",
"lint:fix": "eslint . --fix",
"build": "tsup && tsc --noEmit",
Expand Down Expand Up @@ -50,10 +51,14 @@
"devDependencies": {
"@pretendonetwork/eslint-config": "^0.0.8",
"@types/node": "^22.13.8",
"browserslist": "^4.24.5",
"browserslist-to-esbuild": "^2.1.1",
"ejs-lint": "^2.0.1",
"esbuild-fix-imports-plugin": "^1.0.20",
"eslint": "^9.21.0",
"globals": "^16.0.0",
"tsup": "^8.4.0",
"nodemon": "^3.1.10",
"tsup": "^8.5.0",
"typescript": "^5.7.3"
}
}
1 change: 0 additions & 1 deletion apps/juxtaposition-ui/src/webfiles/ctr/css/juxt.min.css
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion apps/juxtaposition-ui/src/webfiles/ctr/first_run.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<link rel="stylesheet" type="text/css" href="/css/juxt.min.css">
<link rel="stylesheet" type="text/css" href="/css/juxt.css">
<title>First Run</title>
</head>
<style>
Expand Down
2 changes: 1 addition & 1 deletion apps/juxtaposition-ui/src/webfiles/ctr/js/juxt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ function initPostModules() {
cave.toolbar_setCallback(99, back);
}
cave.transition_end();
/* global initNewPost -- Defined in juxt.min.js */
/* global initNewPost -- Defined in juxt.js */
initNewPost();
}
}
Expand Down
1 change: 0 additions & 1 deletion apps/juxtaposition-ui/src/webfiles/ctr/js/juxt.min.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion apps/juxtaposition-ui/src/webfiles/ctr/js/pjax.min.js
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions apps/juxtaposition-ui/src/webfiles/ctr/partials/head.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<!DOCTYPE html>
<html lang="en">
<head>
<link rel="stylesheet" type="text/css" href="/css/juxt.min.css">
<link rel="stylesheet" type="text/css" href="/css/juxt.css">
<script src="/js/debug.js"></script>
<script src="/js/pjax.min.js"></script>
<script src="/js/juxt.min.js"></script>
<script src="/js/pjax.js"></script>
<script src="/js/juxt.js"></script>
<title><%= title %></title>
</head>
1 change: 0 additions & 1 deletion apps/juxtaposition-ui/src/webfiles/portal/css/juxt.min.css
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion apps/juxtaposition-ui/src/webfiles/portal/guest_notice.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<link rel="stylesheet" type="text/css" href="<%= cdnURL %>/css/juxt.css">
<script src="<%= cdnURL %>/js/pjax.min.js"></script>
<script src="<%= cdnURL %>/js/pjax.js"></script>
<script src="<%= cdnURL %>/js/juxt.js"></script>
</head>
<style>
Expand Down
Loading