Skip to content

Commit f2af78c

Browse files
authored
style(gym): line path form has color indicators in list (#642)
Closes #641 build: compose setup uses hmr and updates package.json
1 parent 0575ca5 commit f2af78c

File tree

4 files changed

+15
-2
lines changed

4 files changed

+15
-2
lines changed

client/src/app/modules/line-path-editor/line-path-editor.module.ts

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { SharedModule } from '../shared/shared.module';
99
import { TRANSLOCO_SCOPE, TranslocoModule } from '@jsverse/transloco';
1010
import { DropdownModule } from 'primeng/dropdown';
1111
import { TopoImagesModule } from '../topo-images/topo-images.module';
12+
import { GymModeDirective } from '../shared/directives/gym-mode.directive';
1213

1314
@NgModule({
1415
declarations: [LinePathEditorComponent, LinePathFormComponent],
@@ -23,6 +24,7 @@ import { TopoImagesModule } from '../topo-images/topo-images.module';
2324
ReactiveFormsModule,
2425
DropdownModule,
2526
TopoImagesModule,
27+
GymModeDirective,
2628
],
2729
providers: [{ provide: TRANSLOCO_SCOPE, useValue: 'linePath' }],
2830
})

client/src/app/modules/line-path-editor/line-path-form/line-path-form.component.html

+5
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@
2323
data-cy="line-dropdown-item"
2424
>
2525
<div>
26+
<span
27+
*isGymMode="true"
28+
class="color-indicator mr-3"
29+
[style]="{ '--arrow-color': line.color }"
30+
></span>
2631
{{ line.name }}
2732
{{ line | lineGrade }}
2833
</div>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.color-indicator {
2+
outline: 0.5px solid black;
3+
border-radius: 1em;
4+
background-color: var(--arrow-color);
5+
padding: 0 0.55em;
6+
}

docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,20 +79,20 @@ services:
7979
command:
8080
- sh
8181
- "-c"
82-
# - "while true; do sleep 60; done"
8382
- "pipenv run flask db upgrade && pipenv run python util/scripts/database_setup.py && pipenv run flask run --host=0.0.0.0"
8483

8584
client:
8685
build:
8786
target: localcragapp-client
8887
volumes:
8988
- ./client/src:/localcragapp/src
89+
- ./client/package.json:/localcragapp/package.json
9090
ports:
9191
- "127.0.0.1:4200:4200" # Web Frontend
9292
command:
9393
- sh
9494
- "-c"
95-
- "npx ng serve --host 0.0.0.0"
95+
- "npx ng serve --host 0.0.0.0 --hmr"
9696

9797
volumes:
9898
database:

0 commit comments

Comments
 (0)