Skip to content

Commit d339bfd

Browse files
fix mozilla#7341 chore(project): move legacy-ui to legacy app (mozilla#7348)
Because * legacy-ui is only used in legacy This commit * Moves legacy-ui to legacy Co-authored-by: yashika-khurana <[email protected]>
1 parent e0f6176 commit d339bfd

File tree

116 files changed

+92
-90
lines changed

Some content is hidden

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

116 files changed

+92
-90
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ target/
8181

8282
# Hosted assets
8383
app/experimenter/served/
84-
app/experimenter/legacy-ui/assets/
84+
app/experimenter/legacy/legacy-ui/assets/
8585
app/experimenter/reporting/reporting-ui/assets/
8686

8787
# Key files

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ volumes_rm:
106106

107107
static_rm:
108108
rm -Rf app/node_modules
109-
rm -Rf app/experimenter/legacy-ui/core/node_modules/
109+
rm -Rf app/experimenter/legacy/legacy-ui/core/node_modules/
110110
rm -Rf app/experimenter/nimbus-ui/node_modules/
111-
rm -Rf app/experimenter/legacy-ui/assets/
111+
rm -Rf app/experimenter/legacy/legacy-ui/assets/
112112
rm -Rf app/experimenter/nimbus-ui/build/
113113

114114
kill: compose_stop compose_rm volumes_rm

README.md

+6-6

app/.dockerignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
**/node_modules
1212
**/yarn-error.log
1313
docs
14-
experimenter/legacy-ui/assets
14+
experimenter/legacy/legacy-ui/assets
1515
experimenter/nimbus-ui/build
1616
experimenter/reporting/reporting-ui/assets/
1717
experimenter/served/

app/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ RUN poetry check
5858
# Node packages
5959
COPY --from=file-loader /app/package.json /app/package.json
6060
COPY --from=file-loader /app/yarn.lock /app/yarn.lock
61-
COPY --from=file-loader /app/experimenter/legacy-ui/core/package.json /app/experimenter/legacy-ui/core/package.json
61+
COPY --from=file-loader /app/experimenter/legacy/legacy-ui/core/package.json /app/experimenter/legacy/legacy-ui/core/package.json
6262
RUN yarn install --frozen-lockfile
6363

6464
COPY --from=file-loader /app/experimenter/nimbus-ui/package.json /app/experimenter/nimbus-ui/package.json
@@ -76,7 +76,7 @@ FROM dev AS ui
7676

7777

7878
# Build assets
79-
COPY --from=file-loader /app/experimenter/legacy-ui/ /app/experimenter/legacy-ui/
79+
COPY --from=file-loader /app/experimenter/legacy/legacy-ui/ /app/experimenter/legacy/legacy-ui/
8080
RUN yarn workspace @experimenter/core build
8181
COPY --from=file-loader /app/experimenter/nimbus-ui/ /app/experimenter/nimbus-ui/
8282
RUN yarn workspace @experimenter/nimbus-ui build
@@ -106,5 +106,5 @@ COPY --from=dev /usr/local/lib/python3.9/site-packages/ /usr/local/lib/python3.9
106106
COPY --from=dev /app/bin/ /app/bin/
107107
COPY --from=file-loader /app/manage.py /app/manage.py
108108
COPY --from=file-loader /app/experimenter/ /app/experimenter/
109-
COPY --from=ui /app/experimenter/legacy-ui/assets/ /app/experimenter/legacy-ui/assets/
109+
COPY --from=ui /app/experimenter/legacy/legacy-ui/assets/ /app/experimenter/legacy/legacy-ui/assets/
110110
COPY --from=ui /app/experimenter/nimbus-ui/build/ /app/experimenter/nimbus-ui/build/

app/experimenter/docs/adrs/0002-nimbus-front-end-directory-tree-and-stack.md

+68-66

app/experimenter/settings.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
{
107107
"BACKEND": "django.template.backends.django.DjangoTemplates",
108108
"DIRS": [
109-
os.path.join(BASE_DIR, "legacy-ui", "templates"),
109+
os.path.join(BASE_DIR, "legacy", "legacy-ui", "templates"),
110110
os.path.join(BASE_DIR, "nimbus-ui", "templates"),
111111
os.path.join(BASE_DIR, "docs"),
112112
],
@@ -189,9 +189,9 @@
189189
STATIC_ROOT = os.path.join(os.path.join(BASE_DIR, "served"), "static")
190190

191191
STATICFILES_DIRS = [
192-
("assets", os.path.join(BASE_DIR, "legacy-ui", "assets")),
193-
("scripts", os.path.join(BASE_DIR, "legacy-ui", "scripts")),
194-
("imgs", os.path.join(BASE_DIR, "legacy-ui", "imgs")),
192+
("assets", os.path.join(BASE_DIR, "legacy", "legacy-ui", "assets")),
193+
("scripts", os.path.join(BASE_DIR, "legacy", "legacy-ui", "scripts")),
194+
("imgs", os.path.join(BASE_DIR, "legacy", "legacy-ui", "imgs")),
195195
("nimbus", os.path.join(BASE_DIR, "nimbus-ui", "build")),
196196
]
197197

app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"license": "MPL-2.0",
44
"private": true,
55
"workspaces": [
6-
"experimenter/legacy-ui/*",
6+
"experimenter/legacy/legacy-ui/*",
77
"experimenter/nimbus-ui"
88
],
99
"dependencies": {

docker-compose-legacy.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ services:
88
volumes:
99
- ./app:/app
1010
- media_volume:/app/experimenter/media
11-
- /app/experimenter/legacy-ui/core/.cache/
12-
- /app/experimenter/legacy-ui/core/node_modules/
11+
- /app/experimenter/legacy/legacy-ui/core/.cache/
12+
- /app/experimenter/legacy/legacy-ui/core/node_modules/
1313
- /app/experimenter/nimbus-ui/node_modules/
1414
- /app/experimenter/served/
1515
- /app/node_modules/

docker-compose.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ services:
1515
volumes:
1616
- ./app:/app
1717
- media_volume:/app/experimenter/media
18-
- /app/experimenter/legacy-ui/core/.cache/
19-
- /app/experimenter/legacy-ui/core/node_modules/
18+
- /app/experimenter/legacy/legacy-ui/core/.cache/
19+
- /app/experimenter/legacy/legacy-ui/core/node_modules/
2020
- /app/experimenter/nimbus-ui/node_modules/
2121
- /app/experimenter/served/
2222
- /app/node_modules/
@@ -32,8 +32,8 @@ services:
3232
volumes:
3333
- ./app:/app
3434
- media_volume:/app/experimenter/media
35-
- /app/experimenter/legacy-ui/core/.cache/
36-
- /app/experimenter/legacy-ui/core/node_modules/
35+
- /app/experimenter/legacy/legacy-ui/core/.cache/
36+
- /app/experimenter/legacy/legacy-ui/core/node_modules/
3737
- /app/experimenter/nimbus-ui/node_modules/
3838
- /app/experimenter/served/
3939
- /app/node_modules/

0 commit comments

Comments
 (0)