Skip to content
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.

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

Feature/page projets #18

Merged
merged 26 commits into from
Oct 14, 2024
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
596d984
feat(project-list): Add project list + map
plduthoit Oct 7, 2024
391fb48
Merge branch 'main' of github.com:CartONG/plateforme-urbaine-cameroun…
plduthoit Oct 7, 2024
e5fd244
Merge branch 'main' of github.com:CartONG/plateforme-urbaine-cameroun…
plduthoit Oct 8, 2024
80f69b4
feat: Add filter modal
plduthoit Oct 8, 2024
c3f4927
fix(ci): rm unused image
plduthoit Oct 8, 2024
461959a
fix: ts errors
plduthoit Oct 8, 2024
cb1ac28
fix: ts errors on template refs
plduthoit Oct 8, 2024
75586f3
feat(project-list): Add back images to cards
plduthoit Oct 9, 2024
8cfb78b
Merge branch 'main' of github.com:CartONG/plateforme-urbaine-cameroun…
plduthoit Oct 9, 2024
fef42f8
fix(projects): Adjust stores naming + translations +
plduthoit Oct 11, 2024
ef2ebb1
Merge branch 'main' of github.com:CartONG/plateforme-urbaine-cameroun…
plduthoit Oct 11, 2024
96620dd
fix ts
plduthoit Oct 11, 2024
e88ea4a
Merge branch 'main' of github.com:CartONG/plateforme-urbaine-cameroun…
plduthoit Oct 11, 2024
4c0ca5d
rm unusedor duplicates command
plduthoit Oct 11, 2024
a31f437
set env as one liner
plduthoit Oct 11, 2024
484dc9a
fix fixturees not loading in prod
plduthoit Oct 11, 2024
d045a11
Merge branch 'main' of github.com:CartONG/plateforme-urbaine-cameroun…
plduthoit Oct 11, 2024
26c54e8
new migration
plduthoit Oct 11, 2024
b9556a2
Merge branch 'main' of github.com:CartONG/plateforme-urbaine-cameroun…
plduthoit Oct 11, 2024
69aa149
add cache clear to deployement
plduthoit Oct 11, 2024
51225e9
Merge branch 'main' of github.com:CartONG/plateforme-urbaine-cameroun…
plduthoit Oct 11, 2024
9346d67
Merge branch 'main' of github.com:CartONG/plateforme-urbaine-cameroun…
plduthoit Oct 11, 2024
a487d3a
Merge branch 'main' of github.com:CartONG/plateforme-urbaine-cameroun…
plduthoit Oct 11, 2024
8a882cf
move card component
plduthoit Oct 11, 2024
81cdcd7
feat(project): Fix things after merge with Actor page and make projec…
plduthoit Oct 14, 2024
e9c79c9
fix: Adjust components pathtree
plduthoit Oct 14, 2024
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
15 changes: 10 additions & 5 deletions symfony/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@ sf: ## List all Symfony commands or pass the parameter "c=" to run a given comma
cc: c=c:c ## Clear the cache
cc: sf

reset-database-schema:
@$(SYMFONY) do:s:u -f
recreate-database: drop-database create-database configure-database

create-database:
drop-database:
@$(SYMFONY) do:da:dr -f

create-database:
@$(SYMFONY) do:da:cr

run-migration rerun-migration:
Expand All @@ -50,10 +51,14 @@ make-entity:
regenerate-entity:
@$(SYMFONY) make:entity --regenerate

enable-postgis:
@$(SYMFONY) dbal:run-sql 'CREATE extension postgis;'

make-run-migration: make-migration run-migration
reset-database: create-database run-migration
reset-database: recreate-database run-migration
rerun-database: reset-database run-fixtures
create-short-migration: create-database run-migration make-migration rerun-migration
configure-database: enable-postgis
create-short-migration: recreate-database run-migration make-migration rerun-migration

init-jwt-keypair:
@$(SYMFONY) lexik:jwt:generate-keypair
7 changes: 0 additions & 7 deletions symfony/compose.override.yaml

This file was deleted.

25 changes: 0 additions & 25 deletions symfony/compose.yaml

This file was deleted.

21 changes: 21 additions & 0 deletions symfony/fixtures/actors.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
App\Entity\Actor:
actor_{1..40}:
name: <company()>
acronym: <word(3, true)>
createdBy: '@user_<numberBetween(1,3)>'
category: '<randomElement(<(App\Enum\ActorCategory::toArray())>)>'
expertises: '<numberBetween(1, 3)>x @actorexpertise_*'
thematics: '<numberBetween(1, 3)>x @thematic_*'
creationDate: <dateTimeBetween("-2 years", "now")>
lastUpdate: <dateTimeBetween("creationDate", "now")>
description: <paragraph()>
administrativeScopes: '<numberBetween(1, 3)>x @administrative_scope_*'
officeName: <companySuffix()>
officeAddress: <address()>
contactName: <name()>
contactPosition: <jobTitle()>
website: <url()>
phone: <phoneNumber()>
email: <email()>
logo: <imageUrl(200, 200)>
projects: '<numberBetween(1, 8)>x @project_*'
7 changes: 7 additions & 0 deletions symfony/fixtures/actorsExpertise.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
App\Entity\ActorExpertise:
actorexpertise_1:
name: Planification urbaine
actorexpertise_2:
name: Elaboration et mise en œuvre de la politique algorithmique de la nation ainsi que de l’aménagement du territoire
actorexpertise_3:
name: Production de l’Information Géospatiale
9 changes: 9 additions & 0 deletions symfony/fixtures/administrativeScopes.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
App\Entity\AdministrativeScope:
administrative_scope_1:
name: National
administrative_scope_2:
name: Régional
administrative_scope_3:
name: Départemental
administrative_scope_4:
name: Communal
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

je l'ai récupéré de ta branche mais dans l'idée plutot le gérer en enum.

20 changes: 5 additions & 15 deletions symfony/fixtures/projects.yaml
Original file line number Diff line number Diff line change
@@ -1,24 +1,14 @@

# Il faut également générer des `Actor` et des `Thematic` pour que les relations ManyToMany fonctionnent bien.
App\Entity\Actor:
actor_{1..100}:
name: <company()>
# Ajoute d'autres champs en fonction de l'entité `Actor`

App\Entity\Thematic:
thematic_{1..50}:
name: <randomElement(["Urban Planning", "Public Transportation", "Green Spaces", "Housing Development", "Water Management"])>

App\Entity\Project:
project_{1..500}:
title: <city()> Urban Development
name: <city()> Urban Development
location: <city()>
coords: 'POINT(<longitude()> <latitude()>)'
status: '<randomElement(<(App\Enum\Status::toArray())>)>' # Remplace par les valeurs de ton Enum Status
# coords: 'POINT(<longitude()> <latitude()>)'
coords: 'POINT(<randomFloat(11, 12.8593962671, 1.72767263428)> <randomFloat(11, 16.0128524106, 8.48881554529)>)'
status: '<randomElement(<(App\Enum\Status::toArray())>)>'
description: <paragraph(2)>
images: []
partners: []
interventionZone: '<randomElement(<(App\Enum\AdminLevel::toArray())>)>' # Remplace par les valeurs de ton Enum AdminLevel
interventionZone: '<randomElement(<(App\Enum\AdministrativeScope::toArray())>)>'
financialActors: '<numberBetween(1, 5)>x @actor_*'
actor: '@actor_*'
contractingActors: '<numberBetween(1, 5)>x @actor_*'
Expand Down
23 changes: 23 additions & 0 deletions symfony/fixtures/thematics.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
App\Entity\Thematic:
thematic_1:
name: Appui/Gouvernance
thematic_2:
name: Assainissement
thematic_3:
name: Concertation
thematic_4:
name: Environnement
thematic_5:
name: Equipements
thematic_6:
name: Études urbaines
thematic_7:
name: Numérique
thematic_8:
name: Plannification
thematic_9:
name: Renforcement des capacités
thematic_10:
name: Infrastructures légères
thematic_11:
name: Infrastructures structurantes
41 changes: 0 additions & 41 deletions symfony/migrations/Version20240920210657.php

This file was deleted.

38 changes: 0 additions & 38 deletions symfony/migrations/Version20240922205429.php

This file was deleted.

28 changes: 0 additions & 28 deletions symfony/migrations/Version20241001093511.php

This file was deleted.

71 changes: 0 additions & 71 deletions symfony/migrations/Version20241001101921.php

This file was deleted.

40 changes: 0 additions & 40 deletions symfony/migrations/Version20241001151351.php

This file was deleted.

Loading
Loading