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 : Enregistrement manuel dans la modale avec choix d'une ville et non d'une région #1284

Open
wants to merge 87 commits into
base: release/siret-cross-recording
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
833ea9f
cta wip
oumeimaelisbihani Oct 10, 2024
dc4a9b6
cta wip badge
oumeimaelisbihani Oct 10, 2024
0fa860d
remove topbar + true badge
oumeimaelisbihani Oct 14, 2024
334390b
header change
oumeimaelisbihani Oct 15, 2024
598aaf0
fix lint
oumeimaelisbihani Oct 15, 2024
5227a6c
change from review
oumeimaelisbihani Oct 15, 2024
3a8a2ed
add modal
oumeimaelisbihani Oct 15, 2024
759d189
add searchbar to modal
oumeimaelisbihani Oct 15, 2024
66d9e44
register siret + wip second step
oumeimaelisbihani Oct 16, 2024
eb57e9e
detail element in modal
oumeimaelisbihani Oct 16, 2024
40bbf62
select size + rename
oumeimaelisbihani Oct 17, 2024
6ecb801
refactor review changes
oumeimaelisbihani Oct 21, 2024
ea62cb2
synchro states between both CTA
oumeimaelisbihani Oct 21, 2024
94b3fe5
siret return
oumeimaelisbihani Oct 21, 2024
6b29e92
Merge remote-tracking branch 'origin/release/siret-cross-recording' i…
oumeimaelisbihani Oct 21, 2024
1a797c7
typographie font-weight + size and siret update+beginning of manual r…
oumeimaelisbihani Oct 22, 2024
e92baa9
Merge branch 'feat/cta-vous-etes' into feat/modal-compagny-data
oumeimaelisbihani Oct 22, 2024
7f408cc
manual register
oumeimaelisbihani Oct 22, 2024
8d91ece
register mobile
oumeimaelisbihani Oct 22, 2024
fd11410
register update infos
oumeimaelisbihani Oct 23, 2024
5e589c8
rename files
oumeimaelisbihani Oct 23, 2024
bd8ee15
fix lint
oumeimaelisbihani Oct 23, 2024
e8c2925
with company utils
oumeimaelisbihani Oct 23, 2024
53c8fe7
fix type
oumeimaelisbihani Oct 23, 2024
a035b62
revet sitemap
oumeimaelisbihani Oct 23, 2024
373fc90
data on refresh
oumeimaelisbihani Oct 23, 2024
3edab65
changes from review
oumeimaelisbihani Oct 24, 2024
abb92e4
fixes
oumeimaelisbihani Oct 24, 2024
638e52a
ajout du debounce
oumeimaelisbihani Oct 24, 2024
321df59
change color tag
oumeimaelisbihani Oct 24, 2024
43cda90
responsive
oumeimaelisbihani Oct 24, 2024
21a6042
fix size change
oumeimaelisbihani Oct 24, 2024
b018d0a
review changes
oumeimaelisbihani Oct 28, 2024
35310fa
Merge remote-tracking branch 'origin/release/siret-cross-recording' i…
oumeimaelisbihani Oct 28, 2024
ed46418
fix ci
oumeimaelisbihani Oct 28, 2024
87f94bb
review changes
oumeimaelisbihani Oct 29, 2024
60d21c7
background-size 100%
oumeimaelisbihani Oct 29, 2024
e7fce4c
Merge remote-tracking branch 'origin/release/siret-cross-recording' i…
oumeimaelisbihani Oct 29, 2024
fb1f2ec
fix merge button
oumeimaelisbihani Oct 29, 2024
21473ab
fix type ci
oumeimaelisbihani Oct 29, 2024
c609e17
fix template button
oumeimaelisbihani Oct 30, 2024
59d1aa1
add close button + remove bold
oumeimaelisbihani Oct 30, 2024
ff53e5d
fix decalage avec header
oumeimaelisbihani Oct 30, 2024
0570c76
provide/inject openModal (à utiliser pour les autres accès à la modale)
oumeimaelisbihani Oct 30, 2024
dbbb1db
register close on header
oumeimaelisbihani Oct 30, 2024
39adb28
fix
oumeimaelisbihani Oct 30, 2024
73e936f
fix close
oumeimaelisbihani Oct 30, 2024
f698223
fixes
oumeimaelisbihani Oct 31, 2024
d1952d9
fix sass
oumeimaelisbihani Oct 31, 2024
9f7ddc5
first wave of fixes
oumeimaelisbihani Oct 31, 2024
5a34bee
fix scss
oumeimaelisbihani Oct 31, 2024
4287101
reviews
oumeimaelisbihani Oct 31, 2024
8b495f6
number of results as parameter
oumeimaelisbihani Oct 31, 2024
3c86f0a
fix close button align
oumeimaelisbihani Oct 31, 2024
1ea4b5d
align button
oumeimaelisbihani Oct 31, 2024
e7d8dbd
Merge remote-tracking branch 'origin/release/siret-cross-recording' i…
oumeimaelisbihani Oct 31, 2024
60070d5
plug highlight in project
oumeimaelisbihani Oct 31, 2024
dac4a0e
spinner search siret
oumeimaelisbihani Nov 4, 2024
238a5b8
close on button click
oumeimaelisbihani Nov 4, 2024
07afa86
fix height
oumeimaelisbihani Nov 4, 2024
a04b064
style fix
oumeimaelisbihani Nov 4, 2024
c918526
input small placeholder text
oumeimaelisbihani Nov 5, 2024
ce7b9d9
lint fix
oumeimaelisbihani Nov 5, 2024
431ec41
resize loader
oumeimaelisbihani Nov 5, 2024
88777c4
Merge branch 'feat/modal-compagny-data' into feat/localisation-register
oumeimaelisbihani Nov 5, 2024
9cc8d21
fix: change image for modal. remove watch. resultcount by query param
yvalentin Nov 5, 2024
2ffa82a
wip api geo
oumeimaelisbihani Nov 5, 2024
c4fb1c9
Merge remote-tracking branch 'origin/main' into feat/modal-compagny-data
oumeimaelisbihani Nov 6, 2024
17f0454
fix style
oumeimaelisbihani Nov 6, 2024
8808efb
review modifications
oumeimaelisbihani Nov 6, 2024
1bbef6e
Merge remote-tracking branch 'origin/feat/modal-compagny-data-review'…
oumeimaelisbihani Nov 6, 2024
b2923e6
automatic selection EI
oumeimaelisbihani Nov 6, 2024
8cd82d1
replace inject with store use
oumeimaelisbihani Nov 6, 2024
7f7d509
Merge remote-tracking branch 'origin/release/siret-cross-recording' i…
oumeimaelisbihani Nov 6, 2024
594a387
Merge remote-tracking branch 'origin/release/siret-cross-recording' i…
oumeimaelisbihani Nov 6, 2024
8add58a
fix lint sass
oumeimaelisbihani Nov 6, 2024
11ddbef
fixlint order
oumeimaelisbihani Nov 6, 2024
ff01353
input white
oumeimaelisbihani Nov 6, 2024
709b7da
Merge remote-tracking branch 'origin/main' into feat/modal-compagny-data
oumeimaelisbihani Nov 6, 2024
2572053
Merge branch 'feat/modal-compagny-data' into feat/localisation-register
oumeimaelisbihani Nov 6, 2024
2a4d8eb
fix merge
oumeimaelisbihani Nov 6, 2024
80527ee
localisation searchBar V0
oumeimaelisbihani Nov 6, 2024
f1c3889
fix init
oumeimaelisbihani Nov 6, 2024
9c96b28
remove console + getAllCities
oumeimaelisbihani Nov 6, 2024
1898844
localisation improvment
oumeimaelisbihani Nov 7, 2024
4dca11f
fix lint
oumeimaelisbihani Nov 7, 2024
239d0cd
fix spacing
oumeimaelisbihani Nov 7, 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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Controller, Route, SuccessResponse, TsoaResponse, Res, Example, Get, Path } from 'tsoa'
import { Controller, Route, SuccessResponse, TsoaResponse, Res, Example, Get, Path, Query } from 'tsoa'
import { ErrorJSON, Establishment, EstablishmentNotFoundError, EstablishmentService, ValidateErrorJSON, Monitor } from '@tee/backend-ddd'
import { EstablishmentSearch } from '@tee/common'

Expand Down Expand Up @@ -38,7 +38,7 @@ export class SireneController extends Controller {
/**
* Retrieve establishments informations used in front end
* for a single establishment using the SIRENE API if search by SIRET
* or for up to 3 establishments using the Recherche-entreprise API otherwise.
* or for up to 9 establishments using the Recherche-entreprise API otherwise.
* Also return the number of matches found
*
* @summary Search for establishments from a query
Expand All @@ -50,11 +50,12 @@ export class SireneController extends Controller {
@Get('{query}')
public async getEstablishmentBySiret(
@Path() query: string,
@Query() resultCount = 3,
@Res() requestFailedResponse: TsoaResponse<500, ErrorJSON>,
@Res() _validationFailedResponse: TsoaResponse<422, ValidateErrorJSON>,
@Res() notFoundResponse: TsoaResponse<404, EstablishmentNotFoundErrorJSON>
): Promise<EstablishmentSearch> {
const establishmentResult = await new EstablishmentService().search(query)
const establishmentResult = await new EstablishmentService().search(query, resultCount)

if (establishmentResult.isErr) {
const err = establishmentResult.error
Expand Down
27 changes: 0 additions & 27 deletions apps/web/public/css/custom.css
Original file line number Diff line number Diff line change
Expand Up @@ -186,43 +186,16 @@ button.fr-link:hover, .tee-router-link:hover {
line-height: 1.2em;
}

/* TRACK INPUT */
.tee-resp-info-block {
text-indent: -3.5rem;
padding-left: 3.5rem;
}

/* CUSTOM BUTTON INPUT */
.tee-btn-next {
justify-content: end;
}
.tee-form-input-large {
display: flex;
}
.tee-input-large {
font-size: 1.1rem;
height: 4rem !important;
max-height: 4rem !important;
border-radius: .25rem 0 0 0;
}
.tee-input-large::placeholder {
font-size: 1rem;
}
.tee-btn-input-large {
max-height: 4rem !important;
max-width: 4rem !important;
}
.tee-btn-input-large::before {
width: 3rem !important;
}

.tee-input-large:focus {
outline-offset: unset;
outline-width: unset;
outline-color: unset;
outline-style: none;
}

.tee-input-hint {
color: #000091;
}
Expand Down
26 changes: 26 additions & 0 deletions apps/web/public/images/TEE-modal-bottom-mobile.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading