Skip to content

Commit 2da484b

Browse files
committed
Remove old backend/templates directory
1 parent f1d08dc commit 2da484b

File tree

9 files changed

+6
-141
lines changed

9 files changed

+6
-141
lines changed

backend/libbackend/webserver.ml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1430,7 +1430,7 @@ let to_assoc_list etags_json : (string * string) list =
14301430
Exception.internal "etags.json must be a top-level object."
14311431

14321432

1433-
let admin_ui_template = File.readfile ~root:Templates "ui.html"
1433+
let admin_ui_template = ""
14341434

14351435
let admin_ui_html
14361436
~(canvas_id : Uuidm.t)
@@ -1571,7 +1571,7 @@ type login_page =
15711571
; password : string }
15721572
[@@deriving yojson]
15731573

1574-
let login_template = File.readfile ~root:Templates "login.html"
1574+
let login_template = ""
15751575

15761576
(* handle_local_login is used to handle GET/POST to /login for local
15771577
* development, bypassing Auth0. *)

backend/templates/login.html

-65
This file was deleted.

backend/templates/ui.html

-66
This file was deleted.

config/circleci

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ DARK_CONFIG_RUNDIR=/home/dark/app/rundir
33
DARK_CONFIG_ROOT_DIR=/home/dark/app
44

55
# Important dirs
6-
DARK_CONFIG_TEMPLATES_DIR=/home/dark/app/backend/templates
6+
DARK_CONFIG_TEMPLATES_DIR=/home/dark/app/fsharp-backend/src/ApiServer/Templates
77
DARK_CONFIG_WEBROOT_DIR=/home/dark/app/backend/static
88
DARK_CONFIG_SWAGGER_DIR=/home/dark/app/backend/swagger
99
DARK_CONFIG_MIGRATIONS_DIR=/home/dark/app/backend/migrations

config/dev

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ DARK_CONFIG_RUNDIR=/home/dark/app/rundir
88
DARK_CONFIG_ROOT_DIR=/home/dark/app
99

1010
# Important dirs
11-
DARK_CONFIG_TEMPLATES_DIR=/home/dark/app/backend/templates
11+
DARK_CONFIG_TEMPLATES_DIR=/home/dark/app/fsharp-backend/src/ApiServer/Templates
1212
DARK_CONFIG_WEBROOT_DIR=/home/dark/app/backend/static
1313
DARK_CONFIG_SWAGGER_DIR=/home/dark/app/backend/swagger
1414
DARK_CONFIG_MIGRATIONS_DIR=/home/dark/app/backend/migrations

config/dev_prodclone

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ DARK_CONFIG_RUNDIR=/home/dark/app/rundir
77
DARK_CONFIG_ROOT_DIR=/home/dark/app
88

99
# Important dirs
10-
DARK_CONFIG_TEMPLATES_DIR=/home/dark/app/backend/templates
10+
DARK_CONFIG_TEMPLATES_DIR=/home/dark/app/fsharp-backend/src/ApiServer/Templates
1111
DARK_CONFIG_WEBROOT_DIR=/home/dark/app/backend/static
1212
DARK_CONFIG_SWAGGER_DIR=/home/dark/app/backend/swagger
1313
DARK_CONFIG_MIGRATIONS_DIR=/home/dark/app/backend/migrations

containers/gcp-fsharp-apiserver/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM dark-fsharp-service:latest
44

55
WORKDIR /home/dark
66

7-
COPY --chown=dark:dark backend/templates templates
7+
COPY --chown=dark:dark fsharp-backend/src/ApiServer/Templates templates
88
COPY --chown=dark:dark scripts scripts
99

1010
RUN mkdir -p webroot/static

containers/ocaml-container-prep.sh

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ set -euo pipefail
99
DIR=$1
1010

1111
cp scripts/linting/_check-linked-libs "$DIR/"
12-
cp -R backend/templates "$DIR/"
1312
cp -R scripts "$DIR/"
1413

1514
mkdir -p "$DIR/bin"

scripts/build/compile

-3
Original file line numberDiff line numberDiff line change
@@ -529,9 +529,6 @@ def mark(should, f):
529529
else:
530530
should.fsharp_backend_quick_build = True
531531

532-
elif ("/backend/templates/" in f) and (".html" in f):
533-
should.backend_build = True
534-
535532
elif ("/fsharp-backend/src/ApiServer/Templates/" in f) and (".html" in f):
536533
should.reload_fsharp_server = True
537534

0 commit comments

Comments
 (0)