root
3a8bc2f893
change ports in start
2026-03-23 21:31:26 +00:00
root
d29de100c6
add loccal changes
2026-03-23 21:20:11 +00:00
sdarbinyan
97214c3a90
Merge branch 'back-office-integration'
...
# Conflicts:
# src/app/pages/cart/cart.component.ts
# src/app/pages/category/category.component.html
# src/app/pages/category/category.component.ts
# src/app/pages/item-detail/item-detail.component.html
# src/app/pages/item-detail/item-detail.component.ts
# src/app/pages/legal/company-details/en/company-details-en.component.html
# src/app/pages/legal/company-details/hy/company-details-hy.component.html
# src/app/pages/legal/company-details/ru/company-details-ru.component.html
# src/app/pages/legal/public-offer/en/public-offer-en.component.html
# src/app/pages/legal/public-offer/ru/public-offer-ru.component.html
# src/app/pages/search/search.component.ts
# src/app/services/api.service.ts
2026-03-24 00:18:13 +04:00
sdarbinyan
56f4c56b9e
integration new apis
2026-03-24 00:09:11 +04:00
sdarbinyan
0b3b2ee463
changes
2026-03-06 18:40:58 +04:00
sdarbinyan
c3e4e695eb
changes and optimisations
2026-03-06 17:45:34 +04:00
sdarbinyan
c112aded47
added sceleton for loading
2026-03-06 17:22:35 +04:00
sdarbinyan
75f029b872
added condition
2026-03-06 16:59:01 +04:00
root
f823df7e15
Merge branch 'main' of https://sources.vitanova.network/sdarbinyan/marketplaces
2026-03-05 16:49:39 +00:00
sdarbinyan
af78c053ba
fixed design
2026-03-05 20:45:15 +04:00
root
4ef4223367
Merge branch 'main' of https://sources.vitanova.network/sdarbinyan/marketplaces
2026-03-05 16:27:13 +00:00
sdarbinyan
7b18376d28
added info for legal
2026-03-05 20:23:42 +04:00
root
c64b9cfee8
Merge branch 'main' of https://sources.vitanova.network/sdarbinyan/marketplaces
2026-03-04 14:20:07 +00:00
sdarbinyan
712281d2e8
closed en/am
2026-03-04 16:45:01 +04:00
sdarbinyan
0626dcbe46
changes in legal
2026-03-04 16:40:25 +04:00
root
d288a5fb3c
Merge branch 'main' of https://sources.vitanova.network/sdarbinyan/marketplaces
2026-03-02 08:57:24 +00:00
sdarbinyan
3445f55758
updates
2026-03-01 02:43:14 +04:00
sdarbinyan
350581cbe9
changes for md
2026-02-28 17:42:36 +04:00
sdarbinyan
377da22761
Merge branch 'auth-system' into back-office-integration
2026-02-28 17:37:14 +04:00
sdarbinyan
6689acbe57
created auth system
2026-02-28 17:18:24 +04:00
sdarbinyan
421346d957
Merge remote-tracking branch 'origin' into back-office-integration
2026-02-28 16:13:14 +04:00
sdarbinyan
86d11364f0
git ignore
2026-02-28 15:59:22 +04:00
sdarbinyan
dcb75b8f4e
fixes done for lang bar
2026-02-28 15:57:41 +04:00
sdarbinyan
0cb32a22d9
translated lega
2026-02-28 15:43:22 +04:00
sdarbinyan
caf14eeae1
added translations
2026-02-26 23:09:20 +04:00
sdarbinyan
e4206d8abc
added language routing system
2026-02-26 22:23:08 +04:00
sdarbinyan
a4765ffe98
fixed header icons active state
2026-02-26 22:00:12 +04:00
sdarbinyan
10b4974719
optimising and making it better
2026-02-26 21:54:21 +04:00
sdarbinyan
7a00a8f1e3
changed legal
2026-02-24 21:24:33 +04:00
sdarbinyan
d6097e2b5d
style fixes
2026-02-20 10:58:06 +04:00
sdarbinyan
369af40f20
bo integration
2026-02-20 10:44:03 +04:00
root
75b45abe4f
Merge branch 'main' of https://sources.vitanova.network/sdarbinyan/marketplaces
2026-02-19 21:32:07 +00:00
sdarbinyan
2baa72a022
fixed image and added priority
2026-02-20 00:44:44 +04:00
sdarbinyan
18df968b7a
improvments are done
2026-02-19 01:23:25 +04:00
sdarbinyan
e3efb270dd
styles
2026-02-19 00:55:03 +04:00
root
2bd98b29eb
Merge branch 'main' of https://sources.vitanova.network/sdarbinyan/marketplaces
2026-02-18 14:07:44 +00:00
sdarbinyan
0692cc6360
request check removed
2026-02-14 20:18:55 +04:00
root
82cbf07120
okMerge branch 'main' of https://sources.vitanova.network/sdarbinyan/marketplaces
2026-02-14 15:28:51 +00:00
sdarbinyan
61f441f6b2
some style changes
2026-02-14 18:38:25 +04:00
root
e07356a700
add new server
2026-02-14 09:52:29 +00:00
root
5068a3a114
Merge branch 'main' of https://sources.vitanova.network/sdarbinyan/marketplaces
2026-02-14 09:51:37 +00:00
sdarbinyan
9154660a01
mobile is finished
2026-02-14 02:59:26 +04:00
sdarbinyan
4238d59fc6
style changes
2026-02-14 02:34:11 +04:00
sdarbinyan
751ad48489
home page
2026-02-14 01:28:08 +04:00
sdarbinyan
88ac37ebc4
changed header and hero img
2026-02-14 00:45:17 +04:00
root
333ea45c38
Merge branch 'main' of https://sources.vitanova.network/sdarbinyan/marketplaces
2026-01-22 20:35:13 +00:00
sdarbinyan
39290ef776
style chages
2026-01-23 00:34:16 +04:00
root
b22390f3eb
Merge branch 'main' of https://sources.vitanova.network/sdarbinyan/marketplaces
2026-01-22 20:27:30 +00:00
sdarbinyan
70b730a6ed
feat: implement scalable multi-brand architecture
...
Architecture:
- Each brand has its own pages folder with Angular components
- brand-routes.ts defines routes for default brand (dexar)
- brand-routes.novo.ts defines routes for novo brand
- angular.json fileReplacements swaps brand-routes.ts based on build config
Structure:
- src/app/brands/dexar/pages/ - Dexar HTML templates
- src/app/brands/novo/pages/ - Novo components (TS + HTML)
- src/app/brands/brand-routes.ts - Default (dexar) routes
- src/app/brands/brand-routes.novo.ts - Novo routes
This approach allows:
- Adding 3rd, 4th, 5th brands by creating new folders
- Each brand has completely separate templates
- No @if conditionals needed in templates
- Build-time separation (zero runtime overhead)
2026-01-23 00:00:08 +04:00
sdarbinyan
373b9015aa
chore: major project cleanup
...
Removed unused files:
- Deleted src/app/brands folder (20 unused HTML templates)
- Deleted public/assets/changes.txt (misplaced draft content)
- Deleted src/assets/i18n folder (translations never implemented)
- Deleted 11 redundant docs (Russian notes, duplicate novo docs)
Code cleanup:
- Removed duplicate qrBaseUrl variable in api.service.ts
- Removed all commented-out API code in cart.service.ts
- Removed commented debug logs in cache.interceptor.ts
- Fixed app.spec.ts test (removed failing test, added router provider)
Files kept: 8 essential docs in docs/ folder
2026-01-22 23:52:59 +04:00
