From 466e1dcdcec905ff51fb67d4ceab13d4c4ae100e Mon Sep 17 00:00:00 2001 From: Andreas Knuth Date: Sun, 6 Apr 2025 21:49:44 +0200 Subject: [PATCH] update --- bizmatch-client/package.json | 7 +- bizmatch-client/src/app/app.config.ts | 6 +- .../components/footer/footer.component.html | 846 ++++-------------- .../components/footer/footer.component.scss | 43 +- .../app/components/footer/footer.component.ts | 52 +- .../components/header/header.component.html | 6 +- .../app/components/header/header.component.ts | 30 - .../validated-input.component.ts | 4 +- .../validated-ng-select.component.html | 17 +- .../app/pages/account/account.component.html | 732 +++++++++------ .../app/pages/account/account.component.scss | 2 +- .../app/pages/account/account.component.ts | 42 +- .../business-listings.component.html | 2 +- .../details-business-listing.component.html | 219 ++++- .../details-business-listing.component.ts | 58 +- .../edit-business-listing.component.html | 838 +++++++++-------- .../edit-business-listing.component.scss | 2 +- .../edit-business-listing.component.ts | 18 +- .../pages/email-us/email-us.component.html | 177 +++- .../app/pages/email-us/email-us.component.ts | 17 +- .../src/app/pages/home/home.component.html | 11 +- .../src/app/pages/home/home.component.ts | 4 +- .../login-register.component.html | 25 +- .../pages/my-listing/my-listing.component.ts | 3 +- .../src/app/services/listings.service.ts | 6 +- .../src/app/services/validation.service.ts | 60 ++ .../src/assets/images/advertising.png | Bin 36486 -> 1899 bytes .../src/assets/images/agriculture.png | Bin 40121 -> 6382 bytes .../src/assets/images/automotive.png | Bin 4128 -> 3794 bytes .../src/assets/images/foodAndRestaurant.png | Bin 4643 -> 3972 bytes .../src/assets/images/industrialServices.png | Bin 21981 -> 2117 bytes .../src/assets/images/manufacturing.png | Bin 2313 -> 2214 bytes .../src/assets/images/oilfield.png | Bin 20940 -> 3365 bytes .../src/assets/images/professional.png | Bin 36251 -> 2264 bytes .../src/assets/images/realEstate.png | Bin 41399 -> 1678 bytes bizmatch-client/src/assets/images/retail.png | Bin 44747 -> 1520 bytes bizmatch-client/src/assets/images/service.png | Bin 3245 -> 2703 bytes .../src/assets/images/uncategorized.png | Bin 22336 -> 2423 bytes .../src/assets/images/video-poster1.png | Bin 0 -> 273918 bytes .../src/environments/environment.ts | 8 +- bizmatch-client/src/styles.scss | 55 +- bizmatch-client/tailwind.config.js | 6 +- .../select-options/select-options.service.ts | 2 +- .../components/header/header.component.html | 2 +- 44 files changed, 1780 insertions(+), 1520 deletions(-) create mode 100644 bizmatch-client/src/app/services/validation.service.ts create mode 100644 bizmatch-client/src/assets/images/video-poster1.png diff --git a/bizmatch-client/package.json b/bizmatch-client/package.json index 425a1ac..8ffe283 100644 --- a/bizmatch-client/package.json +++ b/bizmatch-client/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "scripts": { "ng": "ng", - "start": "ng serve --host 0.0.0.0", + "start": "ng serve --host 0.0.0.0 & http-server ../bizmatch-server", "build": "ng build", "watch": "ng build --watch --configuration development", "test": "ng test", @@ -12,6 +12,7 @@ "private": true, "dependencies": { "@angular/animations": "^19.2.5", + "@angular/cdk": "^19.2.8", "@angular/common": "^19.2.0", "@angular/compiler": "^19.2.0", "@angular/core": "^19.2.0", @@ -33,7 +34,6 @@ "browser-bunyan": "^1.8.0", "dayjs": "^1.11.13", "express": "^4.18.2", - "flowbite": "^3.1.2", "jwt-decode": "^4.0.0", "ngx-currency": "^19.0.0", "ngx-image-cropper": "^9.1.5", @@ -55,6 +55,7 @@ "@types/express": "^4.17.17", "@types/jasmine": "~5.1.0", "@types/node": "^18.18.0", + "http-server": "^14.1.1", "jasmine-core": "~5.6.0", "karma": "~6.4.0", "karma-chrome-launcher": "~3.2.0", @@ -63,4 +64,4 @@ "karma-jasmine-html-reporter": "~2.1.0", "typescript": "~5.7.2" } -} \ No newline at end of file +} diff --git a/bizmatch-client/src/app/app.config.ts b/bizmatch-client/src/app/app.config.ts index dc77c4c..c12fae7 100644 --- a/bizmatch-client/src/app/app.config.ts +++ b/bizmatch-client/src/app/app.config.ts @@ -3,12 +3,14 @@ import { APP_INITIALIZER, ApplicationConfig, provideZoneChangeDetection } from ' import { initializeApp, provideFirebaseApp } from '@angular/fire/app'; import { provideClientHydration, withEventReplay } from '@angular/platform-browser'; import { provideRouter, withEnabledBlockingInitialNavigation, withInMemoryScrolling } from '@angular/router'; +import { provideShareButtonsOptions } from 'ngx-sharebuttons'; +import { shareIcons } from 'ngx-sharebuttons/icons'; import { environment } from '../environments/environment'; import { routes } from './app.routes'; +import { AuthInterceptor } from './interceptors/auth.interceptor'; import { LoadingInterceptor } from './interceptors/loading.interceptor'; import { TimeoutInterceptor } from './interceptors/timeout.interceptor'; import { SelectOptionsService } from './services/select-options.service'; - export const appConfig: ApplicationConfig = { providers: [ provideHttpClient(withInterceptorsFromDi()), @@ -28,6 +30,8 @@ export const appConfig: ApplicationConfig = { useClass: TimeoutInterceptor, multi: true, }, + { provide: HTTP_INTERCEPTORS, useClass: AuthInterceptor, multi: true }, + provideShareButtonsOptions(shareIcons()), provideZoneChangeDetection({ eventCoalescing: true }), provideRouter( routes, diff --git a/bizmatch-client/src/app/components/footer/footer.component.html b/bizmatch-client/src/app/components/footer/footer.component.html index 88ceeac..9bcd55f 100644 --- a/bizmatch-client/src/app/components/footer/footer.component.html +++ b/bizmatch-client/src/app/components/footer/footer.component.html @@ -2,7 +2,6 @@ + -
-
- - Privacy Statement -
- -
-
-
-
+ + +
+
+
+ + Privacy Statement +
+ +
+ +
+
+
+

Privacy Policy
We are committed to protecting your privacy. We have established this statement as a testament to our commitment to your privacy.

This Privacy Policy relates to the use of any personal information you provide to us through this websites.

+

By accepting the Privacy Policy during registration or the sending of an enquiry, you expressly consent to our collection, storage, use and disclosure of your personal information as described in this Privacy Policy.

- By accepting the Privacy Policy during registration or the sending of an enquiry, you expressly consent to our collection, storage, use and disclosure of your personal information as described in this Privacy - Policy. -

-

- We may update our Privacy Policy from time to time. Our Privacy Policy was last updated in Febuary 2018 and is effective upon acceptance for new users. By continuing to use our websites or otherwise - continuing to deal with us, you accept this Privacy Policy. + We may update our Privacy Policy from time to time. Our Privacy Policy was last updated in Febuary 2018 and is effective upon acceptance for new users. By continuing to use our websites or otherwise continuing to deal with us, you accept + this Privacy Policy.

Collection of personal information
@@ -122,22 +118,19 @@

We may collect and store the following personal information:

Your name, email address, physical address, telephone numbers, and (depending on the service used), your business information, financial information, such as credit / payment card details;
- transactional information based on your activities on the site; information that you disclose in a forum on any of our websites, feedback, correspondence through our websites, and correspondence sent to - us;
- other information from your interaction with our websites, services, content and advertising, including computer and connection information, statistics on page views, traffic to and from the sites, ad data, - IP address and standard web log information;
- supplemental information from third parties (for example, if you incur a debt, we will generally conduct a credit check by obtaining additional information about you from a credit bureau, as permitted by law; - or if the information you provide cannot be verified,
+ transactional information based on your activities on the site; information that you disclose in a forum on any of our websites, feedback, correspondence through our websites, and correspondence sent to us;
+ other information from your interaction with our websites, services, content and advertising, including computer and connection information, statistics on page views, traffic to and from the sites, ad data, IP address and standard web log + information;
+ supplemental information from third parties (for example, if you incur a debt, we will generally conduct a credit check by obtaining additional information about you from a credit bureau, as permitted by law; or if the information you + provide cannot be verified,
we may ask you to send us additional information, or to answer additional questions online to help verify your information).

How we use your information
- The primary reason we collect your personal information is to improve the services we deliver to you through our website. By registering or sending an enquiry through our website, you agree that we may use - your personal information to:
+ The primary reason we collect your personal information is to improve the services we deliver to you through our website. By registering or sending an enquiry through our website, you agree that we may use your personal information to:
provide the services and customer support you request;
connect you with relevant parties:
- If you are a buyer we will pass some or all of your details on to the seller / intermediary along with any message you have typed. This allows the seller to contact you in order to pursue a possible sale of a - business;
+ If you are a buyer we will pass some or all of your details on to the seller / intermediary along with any message you have typed. This allows the seller to contact you in order to pursue a possible sale of a business;
If you are a seller / intermediary, we will disclose your details where you have given us permission to do so;
resolve disputes, collect fees, and troubleshoot problems;
prevent potentially prohibited or illegal activities, and enforce our Terms and Conditions;
@@ -146,56 +139,53 @@

Our disclosure of your information
- We may disclose personal information to respond to legal requirements, enforce our policies, respond to claims that a listing or other content infringes the rights of others, or protect anyone’s rights, - property, or safety. + We may disclose personal information to respond to legal requirements, enforce our policies, respond to claims that a listing or other content infringes the rights of others, or protect anyone’s rights, property, or safety.

We may also share your personal information with
When you select to register an account as a business buyer, you provide your personal details and we will pass this on to a seller of a business or franchise when you request more information.

- When you select to register an account as a business broker or seller on the site, we provide a public platform on which to establish your business profile. This profile consists of pertinent facts about your - business along with your personal information; namely, the contact information you provide to facilitate contact between you and other users’ of the site. Direct email addresses and telephone numbers will not - be publicly displayed unless you specifically include it on your profile. + When you select to register an account as a business broker or seller on the site, we provide a public platform on which to establish your business profile. This profile consists of pertinent facts about your business along with your + personal information; namely, the contact information you provide to facilitate contact between you and other users’ of the site. Direct email addresses and telephone numbers will not be publicly displayed unless you specifically include + it on your profile.

- The information a user includes within the forums provided on the site is publicly available to other users’ of the site. Please be aware that any personal information you elect to provide in a public forum - may be used to send you unsolicited messages; we are not responsible for the personal information a user elects to disclose within their public profile, or in the private communications that users’ engage in - on the site. + The information a user includes within the forums provided on the site is publicly available to other users’ of the site. Please be aware that any personal information you elect to provide in a public forum may be used to send you + unsolicited messages; we are not responsible for the personal information a user elects to disclose within their public profile, or in the private communications that users’ engage in on the site.

- We post testimonials on the site obtained from users’. These testimonials may include the name, city, state or region and business of the user. We obtain permission from our users’ prior to posting their - testimonials on the site. We are not responsible for any personal information a user selects to include within their testimonial. + We post testimonials on the site obtained from users’. These testimonials may include the name, city, state or region and business of the user. We obtain permission from our users’ prior to posting their testimonials on the site. We are + not responsible for any personal information a user selects to include within their testimonial.

- When you elect to email a friend about the site, or a particular business, we request the third party’s email address to send this one time email. We do not share this information with any third parties for - their promotional purposes and only store the information to gauge the effectiveness of our referral program. + When you elect to email a friend about the site, or a particular business, we request the third party’s email address to send this one time email. We do not share this information with any third parties for their promotional purposes and + only store the information to gauge the effectiveness of our referral program.

We may share your personal information with our service providers where necessary. We employ the services of a payment processor to fulfil payment for services purchased on the site.

- We works with a number of partners or affiliates, where we provide marketing services for these companies. These third party agents collect your personal information to facilitate your service request and the - information submitted here is governed by their privacy policy. + We works with a number of partners or affiliates, where we provide marketing services for these companies. These third party agents collect your personal information to facilitate your service request and the information submitted here is + governed by their privacy policy.

Masking Policy
- In some cases, where the third party agent collects your information, the affiliate portal may appear within a BizMatch.net frame. It is presented as a BizMatch.net page for a streamlined user interface - however the data collected on such pages is governed by the third party agent’s privacy policy. + In some cases, where the third party agent collects your information, the affiliate portal may appear within a BizMatch.net frame. It is presented as a BizMatch.net page for a streamlined user interface however the data collected on such + pages is governed by the third party agent’s privacy policy.

Legal Disclosure
- In certain circumstances, we may be legally required to disclose information collected on the site to law enforcement, government agencies or other third parties. We reserve the right to disclose information - to our service providers and to law enforcement or government agencies where a formal request such as in response to a court order, subpoena or judicial proceeding is made. Where we believe in good faith that - disclosure of information is necessary to prevent imminent physical or financial harm, or loss, or in protecting against illegal activity on the site, we reserve to disclose information. + In certain circumstances, we may be legally required to disclose information collected on the site to law enforcement, government agencies or other third parties. We reserve the right to disclose information to our service providers and + to law enforcement or government agencies where a formal request such as in response to a court order, subpoena or judicial proceeding is made. Where we believe in good faith that disclosure of information is necessary to prevent imminent + physical or financial harm, or loss, or in protecting against illegal activity on the site, we reserve to disclose information.

- Should the company undergo the merger, acquisition or sale of some or all of its assets, your personal information may likely be a part of the transferred assets. In such an event, your personal information - on the site, would be governed by this privacy statement; any changes to the privacy practices governing your information as a result of transfer would be relayed to you by means of a prominent notice on the - Site, or by email. + Should the company undergo the merger, acquisition or sale of some or all of its assets, your personal information may likely be a part of the transferred assets. In such an event, your personal information on the site, would be governed + by this privacy statement; any changes to the privacy practices governing your information as a result of transfer would be relayed to you by means of a prominent notice on the Site, or by email.

Using information from BizMatch.net website
- In certain cases, (where you are receiving contact details of buyers interested in your business opportunity or a business opportunity you represent), you must comply with data protection laws, and give other - users a chance to remove themselves from your database and a chance to review what information you have collected about them. + In certain cases, (where you are receiving contact details of buyers interested in your business opportunity or a business opportunity you represent), you must comply with data protection laws, and give other users a chance to remove + themselves from your database and a chance to review what information you have collected about them.

You agree to use BizMatch.net user information only for: @@ -207,47 +197,43 @@

Marketing
- We do not sell or rent your personal information to third parties for their marketing purposes without your explicit consent. Where you explicitly express your consent at the point of collection to receive - offers from third party partners or affiliates, we will communicate to you on their behalf. We will not pass your information on. + We do not sell or rent your personal information to third parties for their marketing purposes without your explicit consent. Where you explicitly express your consent at the point of collection to receive offers from third party partners + or affiliates, we will communicate to you on their behalf. We will not pass your information on.

- You will receive email marketing communications from us throughout the duration of your relationship with our websites. If you do not wish to receive marketing communications from us you may unsubscribe and / - or change your preferences at any time by following instructions included within a communication or emailing Customer Services. + You will receive email marketing communications from us throughout the duration of your relationship with our websites. If you do not wish to receive marketing communications from us you may unsubscribe and / or change your preferences at + any time by following instructions included within a communication or emailing Customer Services.

If you have an account with one of our websites you can also log in and click the email preferences link to unsubscribe and / or change your preferences.

- Please note that we reserve the right to send all website users notifications and administrative emails where necessary which are considered a part of the service. Given that these messages aren’t promotional - in nature, you will be unable to opt-out of them. + Please note that we reserve the right to send all website users notifications and administrative emails where necessary which are considered a part of the service. Given that these messages aren’t promotional in nature, you will be unable + to opt-out of them.

Cookies
- A cookie is a small text file written to your hard drive that contains information about you. Cookies do not contain any personal information about users. Once you close your browser or log out of the - website, the cookie simply terminates. We use cookies so that we can personalise your experience of our websites. + A cookie is a small text file written to your hard drive that contains information about you. Cookies do not contain any personal information about users. Once you close your browser or log out of the website, the cookie simply + terminates. We use cookies so that we can personalise your experience of our websites.

- If you set up your browser to reject the cookie, you may still use the website however; doing so may interfere with your use of some aspects of our websites. Some of our business partners use cookies on our - site (for example, advertisers). We have no access to or control over these cookies. + If you set up your browser to reject the cookie, you may still use the website however; doing so may interfere with your use of some aspects of our websites. Some of our business partners use cookies on our site (for example, + advertisers). We have no access to or control over these cookies.

For more information about how BizMatch.net uses cookies please read our Cookie Policy.

Spam, spyware or spoofing
- We and our users do not tolerate spam. Make sure to set your email preferences so we can communicate with you, as you prefer. Please add us to your safe senders list. To report spam or spoof emails, please - contact us using the contact information provided in the Contact Us section of this privacy statement. + We and our users do not tolerate spam. Make sure to set your email preferences so we can communicate with you, as you prefer. Please add us to your safe senders list. To report spam or spoof emails, please contact us using the contact + information provided in the Contact Us section of this privacy statement.

- You may not use our communication tools to send spam or otherwise send content that would breach our Terms and Conditions. We automatically scan and may manually filter messages to check for spam, viruses, - phishing attacks and other malicious activity or illegal or prohibited content. We may also store these messages for back up purposes only. -

-

- If you send an email to an email address that is not registered in our community, we do not permanently store that email or use that email address for any marketing purpose. We do not rent or sell these email - addresses. + You may not use our communication tools to send spam or otherwise send content that would breach our Terms and Conditions. We automatically scan and may manually filter messages to check for spam, viruses, phishing attacks and other + malicious activity or illegal or prohibited content. We may also store these messages for back up purposes only.

+

If you send an email to an email address that is not registered in our community, we do not permanently store that email or use that email address for any marketing purpose. We do not rent or sell these email addresses.

Account protection
- Your password is the key to your account. Make sure this is stored safely. Use unique numbers, letters and special characters, and do not disclose your password to anyone. If you do share your password or - your personal information with others, remember that you are responsible for all actions taken in the name of your account. If you lose control of your password, you may lose substantial control over your - personal information and may be subject to legally binding actions taken on your behalf. Therefore, if your password has been compromised for any reason, you should immediately notify us and change your - password. + Your password is the key to your account. Make sure this is stored safely. Use unique numbers, letters and special characters, and do not disclose your password to anyone. If you do share your password or your personal information with + others, remember that you are responsible for all actions taken in the name of your account. If you lose control of your password, you may lose substantial control over your personal information and may be subject to legally binding + actions taken on your behalf. Therefore, if your password has been compromised for any reason, you should immediately notify us and change your password.

Accessing, reviewing and changing your personal information
@@ -256,72 +242,71 @@

If at any time you wish to close your account, please contact Customer Services and instruct us to do so. We will process your request as soon as we can.

You may also contact us at any time to find out what information we hold about you, what we do with it and ask us to update it for you.

- We do retain personal information from closed accounts to comply with law, prevent fraud, collect any fees owed, resolve disputes, troubleshoot problems, assist with any investigations, enforce our Terms and - Conditions, and take other actions otherwise permitted by law. + We do retain personal information from closed accounts to comply with law, prevent fraud, collect any fees owed, resolve disputes, troubleshoot problems, assist with any investigations, enforce our Terms and Conditions, and take other + actions otherwise permitted by law.

Security
- Your information is stored on our servers located in the USA. We treat data as an asset that must be protected and use a variety of tools (encryption, passwords, physical security, etc.) to protect your - personal information against unauthorized access and disclosure. However, no method of security is 100% effective and while we take every measure to protect your personal information, we make no guarantees of - its absolute security. + Your information is stored on our servers located in the USA. We treat data as an asset that must be protected and use a variety of tools (encryption, passwords, physical security, etc.) to protect your personal information against + unauthorized access and disclosure. However, no method of security is 100% effective and while we take every measure to protect your personal information, we make no guarantees of its absolute security.

We employ the use of SSL encryption during the transmission of sensitive data across our websites.

Third parties
- Except as otherwise expressly included in this Privacy Policy, this document addresses only the use and disclosure of information we collect from you. If you disclose your information to others, whether they - are buyers or sellers on our websites or other sites throughout the internet, different rules may apply to their use or disclosure of the information you disclose to them. Dynamis does not control the privacy - policies of third parties, and you are subject to the privacy policies of those third parties where applicable. + Except as otherwise expressly included in this Privacy Policy, this document addresses only the use and disclosure of information we collect from you. If you disclose your information to others, whether they are buyers or sellers on our + websites or other sites throughout the internet, different rules may apply to their use or disclosure of the information you disclose to them. Dynamis does not control the privacy policies of third parties, and you are subject to the + privacy policies of those third parties where applicable.

We encourage you to ask questions before you disclose your personal information to others.

General
- We may change this Privacy Policy from time to time as we add new products and applications, as we improve our current offerings, and as technologies and laws change. You can determine when this Privacy - Policy was last revised by referring to the “Last Updated” legend at the top of this page. + We may change this Privacy Policy from time to time as we add new products and applications, as we improve our current offerings, and as technologies and laws change. You can determine when this Privacy Policy was last revised by + referring to the “Last Updated” legend at the top of this page.

- Any changes will become effective upon our posting of the revised Privacy Policy on our affected websites. We will provide notice to you if these changes are material and, where required by applicable law, we - will obtain your consent. This notice may be provided by email, by posting notice of the changes on our affected websites or by other means, consistent with applicable laws. + Any changes will become effective upon our posting of the revised Privacy Policy on our affected websites. We will provide notice to you if these changes are material and, where required by applicable law, we will obtain your consent. + This notice may be provided by email, by posting notice of the changes on our affected websites or by other means, consistent with applicable laws.

Contact Us
- If you have any questions or comments about our privacy policy, and you can’t find the answer to your question on our help pages, please contact us using this form or email support@bizmatch.net, or write - to us at BizMatch, 715 S. Tanahua, Corpus Christi, TX 78401.) + If you have any questions or comments about our privacy policy, and you can’t find the answer to your question on our help pages, please contact us using this form or email support@bizmatch.net, or write to us at BizMatch, 715 S. + Tanahua, Corpus Christi, TX 78401.)

-
-
- - Terms of use -
- -
-
-
-
+ + +
+
+
+ + Terms of use +
+ +
+ +
+
+
+
AGREEMENT BETWEEN USER AND BizMatch

The BizMatch Web Site is comprised of various Web pages operated by BizMatch.

The BizMatch Web Site is offered to you conditioned on your acceptance without modification of the terms, conditions, and notices contained herein. Your use of the BizMatch Web Site constitutes your - agreement to all such terms, conditions, and notices.The BizMatch Web Site is offered to you conditioned on your acceptance without modification of the terms, conditions, and notices contained herein. Your use of the BizMatch Web Site constitutes your agreement to all such terms, + conditions, and notices.

@@ -329,10 +314,7 @@ >

- BizMatch reserves the right to change the terms, conditions, and notices under which the BizMatch Web Site is offered, including but not limited to the charges associated with the use of the BizMatch Web - Site. + BizMatch reserves the right to change the terms, conditions, and notices under which the BizMatch Web Site is offered, including but not limited to the charges associated with the use of the BizMatch Web Site.

LINKS TO THIRD PARTY SITES

The BizMatch Web Site may contain links to other Web Sites ("Linked Sites"). The Linked Sites are not under the control of BizMatch and BizMatch is not responsible for the contents of any Linked Site, - including without limitation any link contained in a Linked Site, or any changes or updates to a Linked Site. BizMatch is not responsible for webcasting or any other form of transmission received from any - Linked Site. BizMatch is providing these links to you only as a convenience, and the inclusion of any link does not imply endorsement by BizMatch of the site or any association with its operators.The BizMatch Web Site may contain links to other Web Sites ("Linked Sites"). The Linked Sites are not under the control of BizMatch and BizMatch is not responsible for the contents of any Linked Site, including without limitation any + link contained in a Linked Site, or any changes or updates to a Linked Site. BizMatch is not responsible for webcasting or any other form of transmission received from any Linked Site. BizMatch is providing these links to you only as + a convenience, and the inclusion of any link does not imply endorsement by BizMatch of the site or any association with its operators.

@@ -351,9 +333,9 @@

As a condition of your use of the BizMatch Web Site, you warrant to BizMatch that you will not use the BizMatch Web Site for any purpose that is unlawful or prohibited by these terms, conditions, and - notices. You may not use the BizMatch Web Site in any manner which could damage, disable, overburden, or impair the BizMatch Web Site or interfere with any other party’s use and enjoyment of the BizMatch - Web Site. You may not obtain or attempt to obtain any materials or information through any means not intentionally made available or provided for through the BizMatch Web Sites.As a condition of your use of the BizMatch Web Site, you warrant to BizMatch that you will not use the BizMatch Web Site for any purpose that is unlawful or prohibited by these terms, conditions, and notices. You may not use the + BizMatch Web Site in any manner which could damage, disable, overburden, or impair the BizMatch Web Site or interfere with any other party’s use and enjoyment of the BizMatch Web Site. You may not obtain or attempt to obtain any + materials or information through any means not intentionally made available or provided for through the BizMatch Web Sites.

@@ -362,9 +344,9 @@

The BizMatch Web Site may contain bulletin board services, chat areas, news groups, forums, communities, personal web pages, calendars, and/or other message or communication facilities designed to enable - you to communicate with the public at large or with a group (collectively, "Communication Services"), you agree to use the Communication Services only to post, send and receive messages and material that - are proper and related to the particular Communication Service. By way of example, and not as a limitation, you agree that when using a Communication Service, you will not:The BizMatch Web Site may contain bulletin board services, chat areas, news groups, forums, communities, personal web pages, calendars, and/or other message or communication facilities designed to enable you to communicate with the + public at large or with a group (collectively, "Communication Services"), you agree to use the Communication Services only to post, send and receive messages and material that are proper and related to the particular Communication + Service. By way of example, and not as a limitation, you agree that when using a Communication Service, you will not:

 

@@ -383,10 +365,7 @@

§  Upload files that contain software or other material protected by intellectual property laws (or by rights of privacy of publicity) unless you own or control the rights thereto or have received all - necessary consents. + >Upload files that contain software or other material protected by intellectual property laws (or by rights of privacy of publicity) unless you own or control the rights thereto or have received all necessary consents.

§  Falsify or delete any author attributions, legal or other proper notices or proprietary designations or labels of the origin or source of software or other material contained in a file that is - uploaded. + >Falsify or delete any author attributions, legal or other proper notices or proprietary designations or labels of the origin or source of software or other material contained in a file that is uploaded.

BizMatch has no obligation to monitor the Communication Services. However, BizMatch reserves the right to review materials posted to a Communication Service and to remove any materials in its sole - discretion. BizMatch reserves the right to terminate your access to any or all of the Communication Services at any time without notice for any reason whatsoever.BizMatch has no obligation to monitor the Communication Services. However, BizMatch reserves the right to review materials posted to a Communication Service and to remove any materials in its sole discretion. BizMatch reserves the + right to terminate your access to any or all of the Communication Services at any time without notice for any reason whatsoever.

BizMatch reserves the right at all times to disclose any information as necessary to satisfy any applicable law, regulation, legal process or governmental request, or to edit, refuse to post or to remove - any information or materials, in whole or in part, in BizMatch’s sole discretion.BizMatch reserves the right at all times to disclose any information as necessary to satisfy any applicable law, regulation, legal process or governmental request, or to edit, refuse to post or to remove any information or materials, + in whole or in part, in BizMatch’s sole discretion.

Always use caution when giving out any personally identifying information about yourself or your children in any Communication Service. BizMatch does not control or endorse the content, messages or - information found in any Communication Service and, therefore, BizMatch specifically disclaims any liability with regard to the Communication Services and any actions resulting from your participation in - any Communication Service. Managers and hosts are not authorized BizMatch spokespersons, and their views do not necessarily reflect those of BizMatch.Always use caution when giving out any personally identifying information about yourself or your children in any Communication Service. BizMatch does not control or endorse the content, messages or information found in any + Communication Service and, therefore, BizMatch specifically disclaims any liability with regard to the Communication Services and any actions resulting from your participation in any Communication Service. Managers and hosts are not + authorized BizMatch spokespersons, and their views do not necessarily reflect those of BizMatch.

- Materials uploaded to a Communication Service may be subject to posted limitations on usage, reproduction and/or dissemination. You are responsible for adhering to such limitations if you download the - materials.Materials uploaded to a Communication Service may be subject to posted limitations on usage, reproduction and/or dissemination. You are responsible for adhering to such limitations if you download the materials.

@@ -467,22 +441,22 @@

BizMatch does not claim ownership of the materials you provide to BizMatch (including feedback and suggestions) or post, upload, input or submit to any BizMatch Web Site or its associated services - (collectively "Submissions"). However, by posting, uploading, inputting, providing or submitting your Submission you are granting BizMatch, its affiliated companies and necessary sublicensees permission - to use your Submission in connection with the operation of their Internet businesses including, without limitation, the rights to: copy, distribute, transmit, publicly display, publicly perform, - reproduce, edit, translate and reformat your Submission; and to publish your name in connection with your Submission.BizMatch does not claim ownership of the materials you provide to BizMatch (including feedback and suggestions) or post, upload, input or submit to any BizMatch Web Site or its associated services (collectively "Submissions"). + However, by posting, uploading, inputting, providing or submitting your Submission you are granting BizMatch, its affiliated companies and necessary sublicensees permission to use your Submission in connection with the operation of + their Internet businesses including, without limitation, the rights to: copy, distribute, transmit, publicly display, publicly perform, reproduce, edit, translate and reformat your Submission; and to publish your name in connection + with your Submission.

No compensation will be paid with respect to the use of your Submission, as provided herein. BizMatch is under no obligation to post or use any Submission you may provide and may remove any Submission at - any time in BizMatch’s sole discretion.No compensation will be paid with respect to the use of your Submission, as provided herein. BizMatch is under no obligation to post or use any Submission you may provide and may remove any Submission at any time in BizMatch’s sole + discretion.

By posting, uploading, inputting, providing or submitting your Submission you warrant and represent that you own or otherwise control all of the rights to your Submission as described in this section - including, without limitation, all the rights necessary for you to provide, post, upload, input or submit the Submissions.By posting, uploading, inputting, providing or submitting your Submission you warrant and represent that you own or otherwise control all of the rights to your Submission as described in this section including, without limitation, + all the rights necessary for you to provide, post, upload, input or submit the Submissions.

@@ -491,27 +465,27 @@

THE INFORMATION, SOFTWARE, PRODUCTS, AND SERVICES INCLUDED IN OR AVAILABLE THROUGH THE BizMatch WEB SITE MAY INCLUDE INACCURACIES OR TYPOGRAPHICAL ERRORS. CHANGES ARE PERIODICALLY ADDED TO THE - INFORMATION HEREIN. BizMatch AND/OR ITS SUPPLIERS MAY MAKE IMPROVEMENTS AND/OR CHANGES IN THE BizMatch WEB SITE AT ANY TIME. ADVICE RECEIVED VIA THE BizMatch WEB SITE SHOULD NOT BE RELIED UPON FOR - PERSONAL, MEDICAL, LEGAL OR FINANCIAL DECISIONS AND YOU SHOULD CONSULT AN APPROPRIATE PROFESSIONAL FOR SPECIFIC ADVICE TAILORED TO YOUR SITUATION.THE INFORMATION, SOFTWARE, PRODUCTS, AND SERVICES INCLUDED IN OR AVAILABLE THROUGH THE BizMatch WEB SITE MAY INCLUDE INACCURACIES OR TYPOGRAPHICAL ERRORS. CHANGES ARE PERIODICALLY ADDED TO THE INFORMATION HEREIN. BizMatch AND/OR ITS + SUPPLIERS MAY MAKE IMPROVEMENTS AND/OR CHANGES IN THE BizMatch WEB SITE AT ANY TIME. ADVICE RECEIVED VIA THE BizMatch WEB SITE SHOULD NOT BE RELIED UPON FOR PERSONAL, MEDICAL, LEGAL OR FINANCIAL DECISIONS AND YOU SHOULD CONSULT AN + APPROPRIATE PROFESSIONAL FOR SPECIFIC ADVICE TAILORED TO YOUR SITUATION.

BizMatch AND/OR ITS SUPPLIERS MAKE NO REPRESENTATIONS ABOUT THE SUITABILITY, RELIABILITY, AVAILABILITY, TIMELINESS, AND ACCURACY OF THE INFORMATION, SOFTWARE, PRODUCTS, SERVICES AND RELATED GRAPHICS - CONTAINED ON THE BizMatch WEB SITE FOR ANY PURPOSE. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, ALL SUCH INFORMATION, SOFTWARE, PRODUCTS, SERVICES AND RELATED GRAPHICS ARE PROVIDED "AS IS" WITHOUT - WARRANTY OR CONDITION OF ANY KIND. BizMatch AND/OR ITS SUPPLIERS HEREBY DISCLAIM ALL WARRANTIES AND CONDITIONS WITH REGARD TO THIS INFORMATION, SOFTWARE, PRODUCTS, SERVICES AND RELATED GRAPHICS, INCLUDING - ALL IMPLIED WARRANTIES OR CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT.BizMatch AND/OR ITS SUPPLIERS MAKE NO REPRESENTATIONS ABOUT THE SUITABILITY, RELIABILITY, AVAILABILITY, TIMELINESS, AND ACCURACY OF THE INFORMATION, SOFTWARE, PRODUCTS, SERVICES AND RELATED GRAPHICS CONTAINED ON THE BizMatch WEB SITE + FOR ANY PURPOSE. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, ALL SUCH INFORMATION, SOFTWARE, PRODUCTS, SERVICES AND RELATED GRAPHICS ARE PROVIDED "AS IS" WITHOUT WARRANTY OR CONDITION OF ANY KIND. BizMatch AND/OR ITS SUPPLIERS + HEREBY DISCLAIM ALL WARRANTIES AND CONDITIONS WITH REGARD TO THIS INFORMATION, SOFTWARE, PRODUCTS, SERVICES AND RELATED GRAPHICS, INCLUDING ALL IMPLIED WARRANTIES OR CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, + TITLE AND NON-INFRINGEMENT.

TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL BizMatch AND/OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, PUNITIVE, INCIDENTAL, SPECIAL, CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF USE, DATA OR PROFITS, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE USE OR PERFORMANCE OF THE BizMatch WEB SITE, WITH THE DELAY OR INABILITY - TO USE THE BizMatch WEB SITE OR RELATED SERVICES, THE PROVISION OF OR FAILURE TO PROVIDE SERVICES, OR FOR ANY INFORMATION, SOFTWARE, PRODUCTS, SERVICES AND RELATED GRAPHICS OBTAINED THROUGH THE BizMatch - WEB SITE, OR OTHERWISE ARISING OUT OF THE USE OF THE BizMatch WEB SITE, WHETHER BASED ON CONTRACT, TORT, NEGLIGENCE, STRICT LIABILITY OR OTHERWISE, EVEN IF BizMatch OR ANY OF ITS SUPPLIERS HAS BEEN - ADVISED OF THE POSSIBILITY OF DAMAGES. BECAUSE SOME STATES/JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF LIABILITY FOR CONSEQUENTIAL OR INCIDENTAL DAMAGES, THE ABOVE LIMITATION MAY NOT APPLY - TO YOU. IF YOU ARE DISSATISFIED WITH ANY PORTION OF THE BizMatch WEB SITE, OR WITH ANY OF THESE TERMS OF USE, YOUR SOLE AND EXCLUSIVE REMEDY IS TO DISCONTINUE USING THE BizMatch WEB SITE.TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL BizMatch AND/OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, PUNITIVE, INCIDENTAL, SPECIAL, CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER INCLUDING, WITHOUT + LIMITATION, DAMAGES FOR LOSS OF USE, DATA OR PROFITS, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE USE OR PERFORMANCE OF THE BizMatch WEB SITE, WITH THE DELAY OR INABILITY TO USE THE BizMatch WEB SITE OR RELATED SERVICES, THE + PROVISION OF OR FAILURE TO PROVIDE SERVICES, OR FOR ANY INFORMATION, SOFTWARE, PRODUCTS, SERVICES AND RELATED GRAPHICS OBTAINED THROUGH THE BizMatch WEB SITE, OR OTHERWISE ARISING OUT OF THE USE OF THE BizMatch WEB SITE, WHETHER BASED + ON CONTRACT, TORT, NEGLIGENCE, STRICT LIABILITY OR OTHERWISE, EVEN IF BizMatch OR ANY OF ITS SUPPLIERS HAS BEEN ADVISED OF THE POSSIBILITY OF DAMAGES. BECAUSE SOME STATES/JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF + LIABILITY FOR CONSEQUENTIAL OR INCIDENTAL DAMAGES, THE ABOVE LIMITATION MAY NOT APPLY TO YOU. IF YOU ARE DISSATISFIED WITH ANY PORTION OF THE BizMatch WEB SITE, OR WITH ANY OF THESE TERMS OF USE, YOUR SOLE AND EXCLUSIVE REMEDY IS TO + DISCONTINUE USING THE BizMatch WEB SITE.

SERVICE CONTACT : info@bizmatch.net

@@ -521,18 +495,17 @@

BizMatch reserves the right, in its sole discretion, to terminate your access to the BizMatch Web Site and the related services or any portion thereof at any time, without notice. GENERAL To the maximum - extent permitted by law, this agreement is governed by the laws of the State of Washington, U.S.A. and you hereby consent to the exclusive jurisdiction and venue of courts in King County, Washington, - U.S.A. in all disputes arising out of or relating to the use of the BizMatch Web Site. Use of the BizMatch Web Site is unauthorized in any jurisdiction that does not give effect to all provisions of these - terms and conditions, including without limitation this paragraph. You agree that no joint venture, partnership, employment, or agency relationship exists between you and BizMatch as a result of this - agreement or use of the BizMatch Web Site. BizMatch’s performance of this agreement is subject to existing laws and legal process, and nothing contained in this agreement is in derogation of BizMatch’s - right to comply with governmental, court and law enforcement requests or requirements relating to your use of the BizMatch Web Site or information provided to or gathered by BizMatch with respect to such - use. If any part of this agreement is determined to be invalid or unenforceable pursuant to applicable law including, but not limited to, the warranty disclaimers and liability limitations set forth - above, then the invalid or unenforceable provision will be deemed superseded by a valid, enforceable provision that most closely matches the intent of the original provision and the remainder of the - agreement shall continue in effect. Unless otherwise specified herein, this agreement constitutes the entire agreement between the user and BizMatch with respect to the BizMatch Web Site and it supersedes - all prior or contemporaneous communications and proposals, whether electronic, oral or written, between the user and BizMatch with respect to the BizMatch Web Site. A printed version of this agreement and - of any notice given in electronic form shall be admissible in judicial or administrative proceedings based upon or relating to this agreement to the same extent an d subject to the same conditions as - other business documents and records originally generated and maintained in printed form. It is the express wish to the parties that this agreement and all related documents be drawn up in English.BizMatch reserves the right, in its sole discretion, to terminate your access to the BizMatch Web Site and the related services or any portion thereof at any time, without notice. GENERAL To the maximum extent permitted by law, this + agreement is governed by the laws of the State of Washington, U.S.A. and you hereby consent to the exclusive jurisdiction and venue of courts in King County, Washington, U.S.A. in all disputes arising out of or relating to the use of + the BizMatch Web Site. Use of the BizMatch Web Site is unauthorized in any jurisdiction that does not give effect to all provisions of these terms and conditions, including without limitation this paragraph. You agree that no joint + venture, partnership, employment, or agency relationship exists between you and BizMatch as a result of this agreement or use of the BizMatch Web Site. BizMatch’s performance of this agreement is subject to existing laws and legal + process, and nothing contained in this agreement is in derogation of BizMatch’s right to comply with governmental, court and law enforcement requests or requirements relating to your use of the BizMatch Web Site or information + provided to or gathered by BizMatch with respect to such use. If any part of this agreement is determined to be invalid or unenforceable pursuant to applicable law including, but not limited to, the warranty disclaimers and liability + limitations set forth above, then the invalid or unenforceable provision will be deemed superseded by a valid, enforceable provision that most closely matches the intent of the original provision and the remainder of the agreement + shall continue in effect. Unless otherwise specified herein, this agreement constitutes the entire agreement between the user and BizMatch with respect to the BizMatch Web Site and it supersedes all prior or contemporaneous + communications and proposals, whether electronic, oral or written, between the user and BizMatch with respect to the BizMatch Web Site. A printed version of this agreement and of any notice given in electronic form shall be admissible + in judicial or administrative proceedings based upon or relating to this agreement to the same extent an d subject to the same conditions as other business documents and records originally generated and maintained in printed form. It + is the express wish to the parties that this agreement and all related documents be drawn up in English.

@@ -546,10 +519,7 @@

The names of actual companies and products mentioned herein may be the trademarks of their respective owners.

- The example companies, organizations, products, people and events depicted herein are fictitious. No association with any real company, organization, product, person, or event is intended or should be - inferred. + The example companies, organizations, products, people and events depicted herein are fictitious. No association with any real company, organization, product, person, or event is intended or should be inferred.

Any rights not expressly granted herein are reserved.

@@ -558,492 +528,20 @@

Pursuant to Title 17, United States Code, Section 512(c)(2), notifications of claimed copyright infringement under United States copyright law should be sent to Service Provider’s Designated Agent. ALL - INQUIRIES NOT RELEVANT TO THE FOLLOWING PROCEDURE WILL RECEIVE NO RESPONSE. See Notice and Procedure for Making Claims of Copyright Infringement.Pursuant to Title 17, United States Code, Section 512(c)(2), notifications of claimed copyright infringement under United States copyright law should be sent to Service Provider’s Designated Agent. ALL INQUIRIES NOT RELEVANT TO THE + FOLLOWING PROCEDURE WILL RECEIVE NO RESPONSE. See Notice and Procedure for Making Claims of Copyright Infringement.

 

- We reserve the right to update or revise these Terms of Use at any time without notice. Please check the Terms of Use periodically for changes. The revised terms will be effective immediately as - soon as they are posted on the WebSite and by continuing to use the Site you agree to be bound by the revised terms


- - + +
diff --git a/bizmatch-client/src/app/components/footer/footer.component.scss b/bizmatch-client/src/app/components/footer/footer.component.scss index db345dd..aa9d26e 100644 --- a/bizmatch-client/src/app/components/footer/footer.component.scss +++ b/bizmatch-client/src/app/components/footer/footer.component.scss @@ -1,14 +1,43 @@ -:host { - width: 100%; +// Drawer animation styles +.translate-x-0 { + transform: translateX(0); } -@media (max-width: 1023px) { - .order-2 { - order: 2; +.translate-x-full { + transform: translateX(100%); +} + +// Custom scrollbar for drawers +.overflow-y-auto { + &::-webkit-scrollbar { + width: 6px; } - .order-3 { - order: 3; + + &::-webkit-scrollbar-track { + background-color: #f1f1f1; + border-radius: 10px; } + + &::-webkit-scrollbar-thumb { + background-color: #888; + border-radius: 10px; + } + + &::-webkit-scrollbar-thumb:hover { + background-color: #555; + } +} + +// Fix for iOS Safari elastic scroll behavior +.fixed { + -webkit-overflow-scrolling: touch; +} + +// Focus styles for accessibility +button:focus, +a:focus { + outline: 2px solid #3b82f6; + outline-offset: 2px; } section p { display: block; diff --git a/bizmatch-client/src/app/components/footer/footer.component.ts b/bizmatch-client/src/app/components/footer/footer.component.ts index 22a7961..eee1f2a 100644 --- a/bizmatch-client/src/app/components/footer/footer.component.ts +++ b/bizmatch-client/src/app/components/footer/footer.component.ts @@ -1,9 +1,8 @@ import { CommonModule } from '@angular/common'; -import { Component } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { NavigationEnd, Router, RouterModule } from '@angular/router'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { initFlowbite } from 'flowbite'; @Component({ selector: 'app-footer', @@ -12,17 +11,62 @@ import { initFlowbite } from 'flowbite'; templateUrl: './footer.component.html', styleUrl: './footer.component.scss', }) -export class FooterComponent { +export class FooterComponent implements OnInit { privacyVisible = false; termsVisible = false; currentYear: number = new Date().getFullYear(); isHomeRoute = false; + constructor(private router: Router) {} + ngOnInit() { this.router.events.subscribe(event => { if (event instanceof NavigationEnd) { - initFlowbite(); + this.isHomeRoute = event.url === '/home'; + } + }); + + // Listen for escape key to close drawers + document.addEventListener('keydown', event => { + if (event.key === 'Escape') { + this.closeDrawers(); } }); } + + // Toggle privacy drawer + togglePrivacy() { + this.termsVisible = false; // Close other drawer if open + this.privacyVisible = !this.privacyVisible; + this.toggleBodyScroll(); + } + + // Toggle terms drawer + toggleTerms() { + this.privacyVisible = false; // Close other drawer if open + this.termsVisible = !this.termsVisible; + this.toggleBodyScroll(); + } + + // Close all drawers + closeDrawers() { + this.privacyVisible = false; + this.termsVisible = false; + this.toggleBodyScroll(); + } + + // Prevent body scroll when drawer is open + private toggleBodyScroll() { + if (this.privacyVisible || this.termsVisible) { + document.body.style.overflow = 'hidden'; + } else { + document.body.style.overflow = ''; + } + } + + // Clean up event listener on component destroy + ngOnDestroy() { + document.removeEventListener('keydown', () => {}); + document.body.style.overflow = ''; // Ensure body scroll is restored + } } diff --git a/bizmatch-client/src/app/components/header/header.component.html b/bizmatch-client/src/app/components/header/header.component.html index 2c05c8d..64696e3 100644 --- a/bizmatch-client/src/app/components/header/header.component.html +++ b/bizmatch-client/src/app/components/header/header.component.html @@ -1,7 +1,7 @@
+ }
diff --git a/bizmatch-client/src/app/components/header/header.component.ts b/bizmatch-client/src/app/components/header/header.component.ts index 52a2500..b340b57 100644 --- a/bizmatch-client/src/app/components/header/header.component.ts +++ b/bizmatch-client/src/app/components/header/header.component.ts @@ -12,7 +12,6 @@ import { environment } from '../../../environments/environment'; import { SharedService } from '../../services/shared.service'; -import { Collapse, Dropdown } from 'flowbite'; import { AuthService } from '../../services/auth.service'; import { CriteriaChangeService } from '../../services/criteria-change.service'; import { ListingsService } from '../../services/listings.service'; @@ -37,7 +36,6 @@ export class HeaderComponent { faUserGear = faUserGear; profileUrl: string; env = environment; - private filterDropdown: Dropdown | null = null; isMobile: boolean = false; private destroy$ = new Subject(); prompt: string; @@ -158,34 +156,6 @@ export class HeaderComponent { isProfessionalListing(): boolean { return ['/brokerListings'].includes(this.router.url); } - // isSortingUrl(): boolean { - // return ['/businessListings', '/commercialPropertyListings'].includes(this.router.url); - // } - closeDropdown() { - const dropdownButton = document.getElementById('user-menu-button'); - const dropdownMenu = this.user ? document.getElementById('user-login') : document.getElementById('user-unknown'); - - if (dropdownButton && dropdownMenu) { - const dropdown = new Dropdown(dropdownMenu, dropdownButton); - dropdown.hide(); - } - } - closeMobileMenu() { - const targetElement = document.getElementById('navbar-user'); - const triggerElement = document.querySelector('[data-collapse-toggle="navbar-user"]'); - - if (targetElement instanceof HTMLElement && triggerElement instanceof HTMLElement) { - const collapse = new Collapse(targetElement, triggerElement); - collapse.collapse(); - } - } - closeMenusAndSetCriteria(path: string) { - this.closeDropdown(); - this.closeMobileMenu(); - const criteria = getCriteriaProxy(path, this); - criteria.page = 1; - criteria.start = 0; - } ngOnDestroy() { this.destroy$.next(); diff --git a/bizmatch-client/src/app/components/validated-input/validated-input.component.ts b/bizmatch-client/src/app/components/validated-input/validated-input.component.ts index 5275ea1..9ae410f 100644 --- a/bizmatch-client/src/app/components/validated-input/validated-input.component.ts +++ b/bizmatch-client/src/app/components/validated-input/validated-input.component.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { Component, forwardRef, Input } from '@angular/core'; import { FormsModule, NG_VALUE_ACCESSOR } from '@angular/forms'; -import { NgxMaskDirective, NgxMaskPipe, provideNgxMask } from 'ngx-mask'; +import { NgxMaskDirective, provideNgxMask } from 'ngx-mask'; import { BaseInputComponent } from '../base-input/base-input.component'; import { TooltipComponent } from '../tooltip/tooltip.component'; import { ValidationMessagesService } from '../validation-messages.service'; @@ -10,7 +10,7 @@ import { ValidationMessagesService } from '../validation-messages.service'; selector: 'app-validated-input', templateUrl: './validated-input.component.html', standalone: true, - imports: [CommonModule, FormsModule, TooltipComponent, NgxMaskDirective, NgxMaskPipe], + imports: [CommonModule, FormsModule, TooltipComponent, NgxMaskDirective], providers: [ { provide: NG_VALUE_ACCESSOR, diff --git a/bizmatch-client/src/app/components/validated-ng-select/validated-ng-select.component.html b/bizmatch-client/src/app/components/validated-ng-select/validated-ng-select.component.html index 86c4df9..49fb87e 100644 --- a/bizmatch-client/src/app/components/validated-ng-select/validated-ng-select.component.html +++ b/bizmatch-client/src/app/components/validated-ng-select/validated-ng-select.component.html @@ -1,16 +1 @@ -
- - -
+ diff --git a/bizmatch-client/src/app/pages/account/account.component.html b/bizmatch-client/src/app/pages/account/account.component.html index 2c27409..192f97b 100644 --- a/bizmatch-client/src/app/pages/account/account.component.html +++ b/bizmatch-client/src/app/pages/account/account.component.html @@ -1,55 +1,66 @@
@if (user){
-
-

Account Details

-
+ +

Account Details

+ + +
- - + +
+ + + + +

You can only modify your email by contacting us at support@bizmatch.net

+ @if (isProfessional || (authService.isAdmin() | async)){
+

Company Logo

-
+
@if(user?.hasCompanyLogo){ - Company logo + Company logo
} @else { - + }
+ +

Your Profile Picture

-
+
@if(user?.hasProfile){ - Profile picture + Profile picture
} @else { - + }
-
- - -
- -
- - @if ((authService.isAdmin() | async) && !id){ + +
+
- - ADMIN -
- - } - - @if (isProfessional){ - - - } -
- @if (isProfessional){ -
- - - - -
- -
- - - - - - -
- - -
- -
-
- - -
- -
-

- Areas We Serve @if(getValidationMessage('areasServed')){ -
- ! -
- - } -

-
-
- -
-
- -
-
- @for (areasServed of user.areasServed; track areasServed; let i=$index){ -
-
- -
-
- - -
-
- -
-
- } -
- - - [Add more Areas or remove existing ones.] -
-
- -
-

- Licensed In@if(getValidationMessage('licensedIn')){ -
- ! -
- - } -

-
-
- -
-
- -
-
- @for (licensedIn of user.licensedIn; track licensedIn; let i=$index){ -
-
- -
-
+ +
+ + +
- +
+ + +
+ +
+ + + + +
+
+
+ + +
+ @if ((authService.isAdmin() | async) && !id){ +
+ + ADMIN
} -
- - [Add more licenses or remove existing ones.] + + +
+ +
+ + + + + + + +
+
+ + @if (isProfessional){ + +
+ +
+ + + + + + + +
+
+ } +
+ + @if (isProfessional){ + +
+ +
+ +
+ + + + +
+
+ + +
+ +
+ + + + +
+
+
+ + +
+ +
+ +
+ + + + +
+
+ + +
+ +
+ + + + +
+
+ + +
+ +
+ +
+
+
+ + +
+ + +
+ +
+ + +
+ + +
+

+ Areas We Serve +
+ ! + +
+

+ +
+
+ State +
+
+ County +
+
+
+ + @for (areasServed of user.areasServed; track areasServed; let i=$index){ +
+
+
+ +
+
+
+ +
+
+ +
+
+ } + +
+ + [Add more Areas or remove existing ones.] +
+
+ + +
+

+ Licensed In +
+ ! + +
+

+ +
+
+ State +
+
+ License Number +
+
+
+ + @for (licensedIn of user.licensedIn; track licensedIn; let i=$index){ +
+
+
+ +
+
+
+
+ +
+
+
+ +
+
+ } + +
+ + [Add more licenses or remove existing ones.]
} - +
-
- -
}
diff --git a/bizmatch-client/src/app/pages/account/account.component.scss b/bizmatch-client/src/app/pages/account/account.component.scss index 7640bee..c7331ef 100644 --- a/bizmatch-client/src/app/pages/account/account.component.scss +++ b/bizmatch-client/src/app/pages/account/account.component.scss @@ -38,5 +38,5 @@ quill-editor { width: 100%; } :host ::ng-deep .ng-select.ng-select-single .ng-select-container { - height: 42px; + height: 50px; } diff --git a/bizmatch-client/src/app/pages/account/account.component.ts b/bizmatch-client/src/app/pages/account/account.component.ts index 488ba11..8afc9f9 100644 --- a/bizmatch-client/src/app/pages/account/account.component.ts +++ b/bizmatch-client/src/app/pages/account/account.component.ts @@ -6,8 +6,6 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { faTrash } from '@fortawesome/free-solid-svg-icons'; import { NgSelectModule } from '@ng-select/ng-select'; -import { NgxCurrencyDirective } from 'ngx-currency'; -import { ImageCropperComponent } from 'ngx-image-cropper'; import { QuillModule } from 'ngx-quill'; import { lastValueFrom } from 'rxjs'; import { User } from '../../../../../bizmatch-server/src/models/db.model'; @@ -15,15 +13,10 @@ import { AutoCompleteCompleteEvent, Invoice, UploadParams, emailToDirName } from import { environment } from '../../../environments/environment'; import { ConfirmationComponent } from '../../components/confirmation.component'; import { ImageCropAndUploadComponent, UploadReponse } from '../../components/image-crop-and-upload/image-crop-and-upload.component'; -import { MessageComponent } from '../../components/message/message.component'; -import { TooltipComponent } from '../../components/tooltip/tooltip.component'; -import { ValidatedCityComponent } from '../../components/validated-city/validated-city.component'; import { ValidatedCountyComponent } from '../../components/validated-county/validated-county.component'; -import { ValidatedInputComponent } from '../../components/validated-input/validated-input.component'; import { ValidatedLocationComponent } from '../../components/validated-location/validated-location.component'; import { ValidatedQuillComponent } from '../../components/validated-quill/validated-quill.component'; -import { ValidatedSelectComponent } from '../../components/validated-select/validated-select.component'; -import { ValidationMessage, ValidationMessagesService } from '../../components/validation-messages.service'; +import { ValidationMessage } from '../../components/validation-messages.service'; import { AuthService } from '../../services/auth.service'; import { ConfirmationService } from '../../services/confirmation.service'; import { GeoService } from '../../services/geo.service'; @@ -33,31 +26,13 @@ import { MessageService } from '../../services/message.service'; import { SelectOptionsService } from '../../services/select-options.service'; import { SharedService } from '../../services/shared.service'; import { UserService } from '../../services/user.service'; +import { ValidationService } from '../../services/validation.service'; import { TOOLBAR_OPTIONS, map2User } from '../../utils/utils'; @Component({ selector: 'app-account', standalone: true, - imports: [ - CommonModule, - FormsModule, - RouterModule, - FontAwesomeModule, - QuillModule, - NgxCurrencyDirective, - NgSelectModule, - ImageCropperComponent, - ConfirmationComponent, - ImageCropAndUploadComponent, - MessageComponent, - ValidatedInputComponent, - ValidatedSelectComponent, - ValidatedQuillComponent, - ValidatedCityComponent, - TooltipComponent, - ValidatedCountyComponent, - ValidatedLocationComponent, - ], + imports: [CommonModule, FormsModule, RouterModule, FontAwesomeModule, QuillModule, NgSelectModule, ConfirmationComponent, ImageCropAndUploadComponent, ValidatedQuillComponent, ValidatedCountyComponent, ValidatedLocationComponent], providers: [TitleCasePipe, DatePipe], templateUrl: './account.component.html', styleUrl: './account.component.scss', @@ -95,7 +70,7 @@ export class AccountComponent { private messageService: MessageService, private sharedService: SharedService, private titleCasePipe: TitleCasePipe, - private validationMessagesService: ValidationMessagesService, + public validationService: ValidationService, // private subscriptionService: SubscriptionsService, private datePipe: DatePipe, private router: Router, @@ -133,7 +108,7 @@ export class AccountComponent { } ngOnDestroy() { - this.validationMessagesService.clearMessages(); // Löschen Sie alle bestehenden Validierungsnachrichten + this.validationService.clearMessages(); // Löschen Sie alle bestehenden Validierungsnachrichten } printInvoice(invoice: Invoice) {} @@ -142,7 +117,7 @@ export class AccountComponent { await this.userService.save(this.user); this.userService.changeUser(this.user); this.messageService.addMessage({ severity: 'success', text: 'Account changes have been persisted', duration: 3000 }); - this.validationMessagesService.clearMessages(); // Löschen Sie alle bestehenden Validierungsnachrichten + this.validationService.clearMessages(); // Löschen Sie alle bestehenden Validierungsnachrichten this.validationMessages = []; } catch (error) { this.messageService.addMessage({ @@ -150,10 +125,7 @@ export class AccountComponent { text: 'An error occurred while saving the profile - Please check your inputs', duration: 5000, }); - if (error.error && Array.isArray(error.error?.message)) { - this.validationMessagesService.updateMessages(error.error.message); - this.validationMessages = error.error.message; - } + this.validationService.handleApiError(error.error); } } diff --git a/bizmatch-client/src/app/pages/business-listings/business-listings.component.html b/bizmatch-client/src/app/pages/business-listings/business-listings.component.html index ea19ef2..58a2fb2 100644 --- a/bizmatch-client/src/app/pages/business-listings/business-listings.component.html +++ b/bizmatch-client/src/app/pages/business-listings/business-listings.component.html @@ -10,7 +10,7 @@ Image - {{ selectOptions.getBusiness(listing.type) }} + {{ selectOptions.getBusiness(listing.type) }}

diff --git a/bizmatch-client/src/app/pages/details-business-listing/details-business-listing.component.html b/bizmatch-client/src/app/pages/details-business-listing/details-business-listing.component.html index 91e79bf..3c09d47 100644 --- a/bizmatch-client/src/app/pages/details-business-listing/details-business-listing.component.html +++ b/bizmatch-client/src/app/pages/details-business-listing/details-business-listing.component.html @@ -29,14 +29,24 @@

@if(listing && listingUser && (listingUser?.email===user?.email || (authService.isAdmin() | async))){ -
+ +
+
} @if(user){ -
+ +
+
} -
-
@@ -68,26 +95,180 @@
+ +
- -
Contact the Author of this Listing
-

Please include your contact info below

-
-
- - +
Contact the Author of this Listing
+

Please include your contact info below

+ + + +
+ +
+ +
+ + + + +
+
+ + +
+ +
+ + + + +
+
-
- - - + +
+ +
+ +
+ + + + +
+
+ + +
+ +
+ + + + + + + +
+
+
- + + +
+ + +
+
-
diff --git a/bizmatch-client/src/app/pages/details-business-listing/details-business-listing.component.ts b/bizmatch-client/src/app/pages/details-business-listing/details-business-listing.component.ts index b925b06..1d6a253 100644 --- a/bizmatch-client/src/app/pages/details-business-listing/details-business-listing.component.ts +++ b/bizmatch-client/src/app/pages/details-business-listing/details-business-listing.component.ts @@ -14,10 +14,6 @@ import { BusinessListing, EventTypeEnum, ShareByEMail, User } from '../../../../ import { KeycloakUser, MailInfo } from '../../../../../bizmatch-server/src/models/main.model'; import { environment } from '../../../environments/environment'; import { EMailService } from '../../components/email/email.service'; -import { ValidatedInputComponent } from '../../components/validated-input/validated-input.component'; -import { ValidatedNgSelectComponent } from '../../components/validated-ng-select/validated-ng-select.component'; -import { ValidatedTextareaComponent } from '../../components/validated-textarea/validated-textarea.component'; -import { ValidationMessagesService } from '../../components/validation-messages.service'; import { AuditService } from '../../services/audit.service'; import { AuthService } from '../../services/auth.service'; import { GeoService } from '../../services/geo.service'; @@ -27,14 +23,56 @@ import { MailService } from '../../services/mail.service'; import { MessageService } from '../../services/message.service'; import { SelectOptionsService } from '../../services/select-options.service'; import { UserService } from '../../services/user.service'; +import { ValidationService } from '../../services/validation.service'; import { createMailInfo, map2User } from '../../utils/utils'; @Component({ selector: 'app-details-business-listing', standalone: true, - imports: [CommonModule, FormsModule, RouterModule, FontAwesomeModule, ValidatedInputComponent, ValidatedTextareaComponent, ShareButton, ValidatedNgSelectComponent], + imports: [CommonModule, FormsModule, RouterModule, FontAwesomeModule, ShareButton], providers: [], templateUrl: './details-business-listing.component.html', + styles: ` + .inline .sb-wrapper { + margin: var(--sb-margin, .3125em); + padding: var(--sb-padding, 0); + min-width: var(--sb-min-width, 4.125em); + height: var(--sb-height, 2.5em); + color: var(--sb-color, #fff); + background: var(--sb-background); + font-size: var(--sb-font-size, 13px); + line-height: var(--sb-line-height, 2.571em); + border: var(--sb-border); + border-radius: var(--sb-border-radius, 4px); + transition: var(--sb-transition); + box-shadow: var(--sb-box-shadow); + text-shadow: var(--sb-text-shadow); + overflow: var(--sb-overflow, hidden); + --sb-color: #fff; + --sb-background: var(--button-color); + cursor: pointer; + position: relative; + outline: 0; +} + +.inline .sb-content { + display: flex; + align-items: center; + justify-content: center; + height: 100%; + padding: 0 1em; +} + +.inline .sb-icon { + display: flex; + align-items: center; +} + +.inline .sb-text { + margin-left: 0.5em; + font-weight: bold; +} + `, }) export class DetailsBusinessListingComponent { // listings: Array; @@ -76,13 +114,13 @@ export class DetailsBusinessListingComponent { private mailService: MailService, private sanitizer: DomSanitizer, public historyService: HistoryService, - private validationMessagesService: ValidationMessagesService, private messageService: MessageService, private auditService: AuditService, public emailService: EMailService, private geoService: GeoService, public authService: AuthService, private cdref: ChangeDetectorRef, + public validationService: ValidationService, ) { this.router.events.subscribe(event => { if (event instanceof NavigationEnd) { @@ -112,7 +150,7 @@ export class DetailsBusinessListingComponent { } ngOnDestroy() { - this.validationMessagesService.clearMessages(); // Löschen Sie alle bestehenden Validierungsnachrichten + this.validationService.clearMessages(); // Löschen Sie alle bestehenden Validierungsnachrichten } async mail() { @@ -120,7 +158,7 @@ export class DetailsBusinessListingComponent { this.mailinfo.email = this.listingUser.email; this.mailinfo.listing = this.listing; await this.mailService.mail(this.mailinfo); - this.validationMessagesService.clearMessages(); + this.validationService.clearMessages(); this.auditService.createEvent(this.listing.id, 'contact', this.user?.email, this.mailinfo.sender); this.messageService.addMessage({ severity: 'success', text: 'Your message has been sent to the creator of the listing', duration: 3000 }); this.mailinfo = createMailInfo(this.user); @@ -130,9 +168,7 @@ export class DetailsBusinessListingComponent { text: 'An error occurred while sending the request - Please check your inputs', duration: 5000, }); - if (error.error && Array.isArray(error.error?.message)) { - this.validationMessagesService.updateMessages(error.error.message); - } + this.validationService.handleApiError(error.error); } } get listingDetails() { diff --git a/bizmatch-client/src/app/pages/edit-business-listing/edit-business-listing.component.html b/bizmatch-client/src/app/pages/edit-business-listing/edit-business-listing.component.html index 3e0801b..c7cbe55 100644 --- a/bizmatch-client/src/app/pages/edit-business-listing/edit-business-listing.component.html +++ b/bizmatch-client/src/app/pages/edit-business-listing/edit-business-listing.component.html @@ -1,382 +1,520 @@
-

Edit Listing

+

Edit Listing

@if(listing){ -
-
- - - -
- - + +
- -
- - -
- -
- - -
- -
- - -
- - - -
- +
+ +
-
-
- - -
-
--> -
- - -
- - - - - -
- - -
- -
-
- - -
-
- - -
-
- - + + +
- -
- - + +
+ +
- +
+ +
+
-
- - -
-
--> -
+
+ + +
+
- - - - - @for (licensedIn of listingUser?.licensedIn; track listingUser?.licensedIn) { - {{ licensedIn.state }} {{ licensedIn.registerNo }} - } - + + +
+ + +
+ +
+ + + + +
- -
- + +
+ +
+ +
+ + + + +
+
+ + +
+ +
+ + + + +
+
+
+ + +
+ +
+ +
+ + + + +
+
+ + +
+ +
+ + + + +
+
+
+ +
- + +
+ +
+ + +
+ + +
+ + +
+ + +
+ + +
+
-
+ +
+ +
+ +
+ + + + +
+
+ + +
+ +
+ + + + +
+
+
+ + +
+ +
+ +
+ + @for (licensedIn of listingUser?.licensedIn; track listingUser?.licensedIn) { + {{ licensedIn.state }} {{ licensedIn.registerNo }} + } + +
+
+ + +
+ +
+ + + + +
+
+
+ + +
+ +
+ +
+
+ + +
- @if (mode==='create'){ - - } @else { - - } + + +
+ @if (mode==='create'){ + + } @else { + + } +
}
- - diff --git a/bizmatch-client/src/app/pages/edit-business-listing/edit-business-listing.component.scss b/bizmatch-client/src/app/pages/edit-business-listing/edit-business-listing.component.scss index 81411a5..dbba880 100644 --- a/bizmatch-client/src/app/pages/edit-business-listing/edit-business-listing.component.scss +++ b/bizmatch-client/src/app/pages/edit-business-listing/edit-business-listing.component.scss @@ -27,7 +27,7 @@ transition: all 0.3s ease-in-out; } ::ng-deep .ng-select.ng-select-single .ng-select-container { - height: 42px; + height: 50px; } quill-editor { width: 100%; diff --git a/bizmatch-client/src/app/pages/edit-business-listing/edit-business-listing.component.ts b/bizmatch-client/src/app/pages/edit-business-listing/edit-business-listing.component.ts index a1959fc..4dd079c 100644 --- a/bizmatch-client/src/app/pages/edit-business-listing/edit-business-listing.component.ts +++ b/bizmatch-client/src/app/pages/edit-business-listing/edit-business-listing.component.ts @@ -14,15 +14,12 @@ import { NgxCurrencyDirective } from 'ngx-currency'; import { BusinessListing, CommercialPropertyListing, User } from '../../../../../bizmatch-server/src/models/db.model'; import { AutoCompleteCompleteEvent, createDefaultBusinessListing, emailToDirName, ImageProperty } from '../../../../../bizmatch-server/src/models/main.model'; import { environment } from '../../../environments/environment'; -import { ValidatedCityComponent } from '../../components/validated-city/validated-city.component'; import { ValidatedInputComponent } from '../../components/validated-input/validated-input.component'; import { ValidatedLocationComponent } from '../../components/validated-location/validated-location.component'; import { ValidatedNgSelectComponent } from '../../components/validated-ng-select/validated-ng-select.component'; import { ValidatedPriceComponent } from '../../components/validated-price/validated-price.component'; import { ValidatedQuillComponent } from '../../components/validated-quill/validated-quill.component'; import { ValidatedTextareaComponent } from '../../components/validated-textarea/validated-textarea.component'; -import { ValidationMessagesService } from '../../components/validation-messages.service'; -import { ArrayToStringPipe } from '../../pipes/array-to-string.pipe'; import { AuthService } from '../../services/auth.service'; import { GeoService } from '../../services/geo.service'; import { ImageService } from '../../services/image.service'; @@ -31,6 +28,7 @@ import { LoadingService } from '../../services/loading.service'; import { MessageService } from '../../services/message.service'; import { SelectOptionsService } from '../../services/select-options.service'; import { UserService } from '../../services/user.service'; +import { ValidationService } from '../../services/validation.service'; import { map2User, routeListingWithState, TOOLBAR_OPTIONS } from '../../utils/utils'; @Component({ @@ -41,18 +39,16 @@ import { map2User, routeListingWithState, TOOLBAR_OPTIONS } from '../../utils/ut FormsModule, RouterModule, FontAwesomeModule, - ArrayToStringPipe, DragDropModule, QuillModule, - NgxCurrencyDirective, NgSelectModule, ValidatedInputComponent, ValidatedQuillComponent, ValidatedNgSelectComponent, ValidatedPriceComponent, ValidatedTextareaComponent, - ValidatedCityComponent, ValidatedLocationComponent, + NgxCurrencyDirective, ], providers: [], templateUrl: './edit-business-listing.component.html', @@ -89,7 +85,7 @@ export class EditBusinessListingComponent { private loadingService: LoadingService, private messageService: MessageService, private route: ActivatedRoute, - private validationMessagesService: ValidationMessagesService, + public validationService: ValidationService, private authService: AuthService, ) { this.router.events.subscribe(event => { @@ -124,23 +120,21 @@ export class EditBusinessListingComponent { } } ngOnDestroy() { - this.validationMessagesService.clearMessages(); // Löschen Sie alle bestehenden Validierungsnachrichten + this.validationService.clearMessages(); // Löschen Sie alle bestehenden Validierungsnachrichten } async save() { try { this.listing = await this.listingsService.save(this.listing); this.router.navigate(['editBusinessListing', this.listing.id]); this.messageService.addMessage({ severity: 'success', text: 'Listing changes have been persisted', duration: 3000 }); - this.validationMessagesService.clearMessages(); // Löschen Sie alle bestehenden Validierungsnachrichten + this.validationService.clearMessages(); // Löschen Sie alle bestehenden Validierungsnachrichten } catch (error) { this.messageService.addMessage({ severity: 'danger', text: 'An error occurred while saving the profile - Please check your inputs', duration: 5000, }); - if (error.error && Array.isArray(error.error?.message)) { - this.validationMessagesService.updateMessages(error.error.message); - } + this.validationService.handleApiError(error.error); } } diff --git a/bizmatch-client/src/app/pages/email-us/email-us.component.html b/bizmatch-client/src/app/pages/email-us/email-us.component.html index a40bdd3..2ddc60c 100644 --- a/bizmatch-client/src/app/pages/email-us/email-us.component.html +++ b/bizmatch-client/src/app/pages/email-us/email-us.component.html @@ -1,27 +1,172 @@

Contact Us

-
-
- - -
-
- + + +
+
- + +
+ + + + +
+
+ + +
+ +
+ + + + +
-
- + + +
+ +
+ +
+ + + + +
+
+ + +
+ +
+ + + + + + + +
+
+ +
-
+ + +
+
diff --git a/bizmatch-client/src/app/pages/email-us/email-us.component.ts b/bizmatch-client/src/app/pages/email-us/email-us.component.ts index db827b6..496141e 100644 --- a/bizmatch-client/src/app/pages/email-us/email-us.component.ts +++ b/bizmatch-client/src/app/pages/email-us/email-us.component.ts @@ -5,22 +5,19 @@ import { RouterModule } from '@angular/router'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { User } from '../../../../../bizmatch-server/src/models/db.model'; import { ErrorResponse, KeycloakUser, MailInfo } from '../../../../../bizmatch-server/src/models/main.model'; -import { ValidatedInputComponent } from '../../components/validated-input/validated-input.component'; -import { ValidatedNgSelectComponent } from '../../components/validated-ng-select/validated-ng-select.component'; -import { ValidatedTextareaComponent } from '../../components/validated-textarea/validated-textarea.component'; -import { ValidationMessagesService } from '../../components/validation-messages.service'; import { AuditService } from '../../services/audit.service'; import { AuthService } from '../../services/auth.service'; import { MailService } from '../../services/mail.service'; import { MessageService } from '../../services/message.service'; import { SelectOptionsService } from '../../services/select-options.service'; import { UserService } from '../../services/user.service'; +import { ValidationService } from '../../services/validation.service'; import { createMailInfo, map2User } from '../../utils/utils'; @Component({ selector: 'app-email-us', standalone: true, - imports: [CommonModule, FormsModule, RouterModule, FontAwesomeModule, ValidatedInputComponent, ValidatedTextareaComponent, ValidatedNgSelectComponent], + imports: [CommonModule, FormsModule, RouterModule, FontAwesomeModule], providers: [], templateUrl: './email-us.component.html', styleUrl: './email-us.component.scss', @@ -33,7 +30,7 @@ export class EmailUsComponent { constructor( private mailService: MailService, private userService: UserService, - private validationMessagesService: ValidationMessagesService, + public validationService: ValidationService, private messageService: MessageService, public selectOptions: SelectOptionsService, private auditService: AuditService, @@ -50,11 +47,11 @@ export class EmailUsComponent { } } ngOnDestroy() { - this.validationMessagesService.clearMessages(); // Löschen Sie alle bestehenden Validierungsnachrichten + this.validationService.clearMessages(); // Löschen Sie alle bestehenden Validierungsnachrichten } async mail() { try { - this.validationMessagesService.updateMessages([]); + this.validationService.clearMessages(); this.mailinfo.email = 'support@bizmatch.net'; await this.mailService.mail(this.mailinfo); this.messageService.addMessage({ severity: 'success', text: 'Your request has been forwarded to the support team of bizmatch.', duration: 3000 }); @@ -66,9 +63,7 @@ export class EmailUsComponent { text: 'Please check your inputs', duration: 5000, }); - if (error.error && Array.isArray(error.error?.message)) { - this.validationMessagesService.updateMessages(error.error.message); - } + this.validationService.handleApiError(error.error); } } containsError(fieldname: string) { diff --git a/bizmatch-client/src/app/pages/home/home.component.html b/bizmatch-client/src/app/pages/home/home.component.html index 2e767db..3652553 100644 --- a/bizmatch-client/src/app/pages/home/home.component.html +++ b/bizmatch-client/src/app/pages/home/home.component.html @@ -118,10 +118,13 @@

See How We Work

- +
+ + +
diff --git a/bizmatch-client/src/app/pages/home/home.component.ts b/bizmatch-client/src/app/pages/home/home.component.ts index 725687b..1cb7e4a 100644 --- a/bizmatch-client/src/app/pages/home/home.component.ts +++ b/bizmatch-client/src/app/pages/home/home.component.ts @@ -1,6 +1,6 @@ import { CommonModule } from '@angular/common'; import { Component, OnInit } from '@angular/core'; -import { RouterLink, RouterOutlet } from '@angular/router'; +import { RouterLink } from '@angular/router'; import { User } from '../../../../../bizmatch-server/src/models/db.model'; import { KeycloakUser } from '../../../../../bizmatch-server/src/models/main.model'; import { AuthService } from '../../services/auth.service'; @@ -12,7 +12,7 @@ import { map2User } from '../../utils/utils'; templateUrl: './home.component.html', styleUrls: ['./home.component.scss'], standalone: true, - imports: [CommonModule, RouterOutlet, RouterLink], + imports: [CommonModule, RouterLink], }) export class HomeComponent implements OnInit { showMobileMenu = false; diff --git a/bizmatch-client/src/app/pages/login-register/login-register.component.html b/bizmatch-client/src/app/pages/login-register/login-register.component.html index 39df5fc..42c1d95 100644 --- a/bizmatch-client/src/app/pages/login-register/login-register.component.html +++ b/bizmatch-client/src/app/pages/login-register/login-register.component.html @@ -4,7 +4,6 @@ {{ isLoginMode ? 'Login' : 'Sign Up' }} -
Login