diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index ffbaa92d..00000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,14 +0,0 @@ -version: 2 - -updates: - - package-ecosystem: 'npm' - directory: '/' - schedule: - interval: 'weekly' - day: 'monday' - time: '08:00' - timezone: 'Etc/GMT' - target-branch: 'workflow/dependency-update' - labels: - - 'workflow' - milestone: 2 diff --git a/.github/lighthouserc.yml b/.github/lighthouserc.yml new file mode 100644 index 00000000..0f6da6e3 --- /dev/null +++ b/.github/lighthouserc.yml @@ -0,0 +1,4 @@ +ci: + collect: + settings: + preset: "desktop" diff --git a/.github/workflows/cron-dependency-checker-workflow.yml b/.github/workflows/cron-dependency-checker-workflow.yml index 70522fd4..f8104219 100644 --- a/.github/workflows/cron-dependency-checker-workflow.yml +++ b/.github/workflows/cron-dependency-checker-workflow.yml @@ -17,7 +17,7 @@ jobs: - name: Install Node uses: actions/setup-node@v1 with: - node-version: 12 + node-version: 16 - name: NPM Install run: npm i @@ -26,9 +26,18 @@ jobs: - name: Build run: npm run buildProd + - name: Check for Changes + run: | + if git diff --exit-code; then + echo "changes_exist=false" >> $GITHUB_ENV + else + echo "changes_exist=true" >> $GITHUB_ENV + fi + - name: Git Commit and Push + if: ${{ env.changes_exist == 'true' }} run: | - git config --global user.email "furknyavuz@gmail.com" - git config --global user.name "Furkan Yavuz" + git config --global user.email "98660390+oth-service-user@users.noreply.github.com" + git config --global user.name "OTH Service User" git commit -am "Workflow/dependency check" git push diff --git a/.github/workflows/cron-lighthouse-report-generator-workflow.yml b/.github/workflows/cron-lighthouse-report-generator-workflow.yml new file mode 100644 index 00000000..dafa83ff --- /dev/null +++ b/.github/workflows/cron-lighthouse-report-generator-workflow.yml @@ -0,0 +1,44 @@ +name: Cron Lighthouse Report Generator + +on: + schedule: + - cron: '0 5 * * 1' + +jobs: + cron-lighthouse-report-generator: + name: 'Cron Lighthouse Report Generator' + runs-on: ubuntu-latest + steps: + - name: Checkout Repo + uses: actions/checkout@v2 + with: + token: ${{ secrets.MASTER_BRANCH_ACCESS_TOKEN }} + + - name: Audit URLs using Lighthouse + uses: treosh/lighthouse-ci-action@v9 + with: + urls: | + https://web.opentemplatehub.com + uploadArtifacts: true + configPath: .github/lighthouserc.yml + + - name: Check for Changes + run: | + rm docs/lighthouse/* + find .lighthouseci -name 'lhr-*.html' -exec sh -c 'x="{}"; cp "$x" "docs/lighthouse/lighthouse-report.html"' \; + rm .lighthouseci/* + + if git status --porcelain; then + echo "changes_exist=true" >> $GITHUB_ENV + else + echo "changes_exist=false" >> $GITHUB_ENV + fi + + - name: Git Commit and Push + if: ${{ env.changes_exist == 'true' }} + run: | + git config --global user.email "98660390+oth-service-user@users.noreply.github.com" + git config --global user.name "OTH Service User" + git add --all + git commit -am "Workflow/lighthouse report update" + git push diff --git a/.github/workflows/issue-assigned-workflows.yml b/.github/workflows/issue-assigned-workflows.yml index 8bc46b6b..dc78cf9d 100644 --- a/.github/workflows/issue-assigned-workflows.yml +++ b/.github/workflows/issue-assigned-workflows.yml @@ -13,6 +13,6 @@ jobs: - name: Move Issue to In-Progress uses: alex-page/github-project-automation-plus@v0.3.0 with: - project: Open Template Hub Servers + project: Open Template Hub User Interfaces column: In progress repo-token: ${{ secrets.MASTER_BRANCH_ACCESS_TOKEN }} diff --git a/.github/workflows/issue-open-workflows.yml b/.github/workflows/issue-open-workflows.yml index c179dec2..34b5eda1 100644 --- a/.github/workflows/issue-open-workflows.yml +++ b/.github/workflows/issue-open-workflows.yml @@ -13,7 +13,7 @@ jobs: - name: Move Issue to In-Progress uses: alex-page/github-project-automation-plus@v0.3.0 with: - project: Open Template Hub Servers + project: Open Template Hub User Interfaces column: To do repo-token: ${{ secrets.MASTER_BRANCH_ACCESS_TOKEN }} diff --git a/.github/workflows/on-version-update.yml b/.github/workflows/on-version-update.yml index 113154cb..7d2f9cf1 100644 --- a/.github/workflows/on-version-update.yml +++ b/.github/workflows/on-version-update.yml @@ -4,6 +4,8 @@ on: push: paths-ignore: - 'package.json' + - 'src/version.ts' + - 'src/index.html' branches: - 'master' @@ -21,7 +23,7 @@ jobs: - name: Install Node uses: actions/setup-node@v1 with: - node-version: 12 + node-version: 16 - name: Bump Version and Create Tag uses: phips28/gh-action-bump-version@master @@ -29,10 +31,39 @@ jobs: tag-prefix: '' token: ${{ secrets.MASTER_BRANCH_ACCESS_TOKEN }} + update-version-ts-file: + name: 'Update Version.ts File' + runs-on: ubuntu-latest + needs: bump-version + + steps: + - name: Checkout Repo + uses: actions/checkout@v2 + with: + token: ${{ secrets.MASTER_BRANCH_ACCESS_TOKEN }} + ref: master + + - name: Install Node + uses: actions/setup-node@v1 + with: + node-version: 16 + + - name: Run version-generator.ts + run: | + npm install + node src/version-generator.ts > ./src/version.ts + + - name: Git Commit and Push + run: | + git config --global user.email "98660390+oth-service-user@users.noreply.github.com" + git config --global user.name "OTH Service User" + git commit -am "Workflow/version update" + git push + create-version-update-pr: name: 'Create Version Update PR' runs-on: ubuntu-latest - needs: bump-version + needs: update-version-ts-file steps: - name: Checkout Repo diff --git a/.github/workflows/pr-open-workflows.yml b/.github/workflows/pr-open-workflows.yml index ec17d3d3..99f7d9cd 100644 --- a/.github/workflows/pr-open-workflows.yml +++ b/.github/workflows/pr-open-workflows.yml @@ -24,7 +24,7 @@ jobs: - name: Move PR to In-Progress uses: alex-page/github-project-automation-plus@v0.3.0 with: - project: Open Template Hub Servers + project: Open Template Hub User Interfaces column: In progress repo-token: ${{ secrets.MASTER_BRANCH_ACCESS_TOKEN }} diff --git a/.gitignore b/.gitignore index 67a55f2d..31d58dc4 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ package-lock.json .env icon.png +.angular diff --git a/.run/buildLocal.run.xml b/.run/buildLocal.run.xml index 366dbda6..1d8ec3f1 100644 --- a/.run/buildLocal.run.xml +++ b/.run/buildLocal.run.xml @@ -1,14 +1,14 @@ - - + + - - - - - diff --git a/docs/lighthouse-report-mobile.html b/docs/lighthouse-report-mobile.html deleted file mode 100644 index 3b2322af..00000000 --- a/docs/lighthouse-report-mobile.html +++ /dev/null @@ -1,266 +0,0 @@ - - - - - - - - Lighthouse Report - - - - -
- -
- - - - - - diff --git a/docs/lighthouse/lighthouse-report.html b/docs/lighthouse/lighthouse-report.html new file mode 100644 index 00000000..f7185ea6 --- /dev/null +++ b/docs/lighthouse/lighthouse-report.html @@ -0,0 +1,266 @@ + + + + + + + + Lighthouse Report + + + + + +
+ + + + + + diff --git a/e2e/protractor.conf.js b/e2e/protractor.conf.js index 3a85f4df..ee81e8a5 100644 --- a/e2e/protractor.conf.js +++ b/e2e/protractor.conf.js @@ -16,13 +16,11 @@ exports.config = { browserName: "chrome" }, directConnect: true, - baseUrl: "http://localhost:4200/", + baseUrl: "http://localhost:4201/", framework: "jasmine", jasmineNodeOpts: { showColors: true, defaultTimeoutInterval: 30000, - print: function () { - } }, onPrepare() { require( "ts-node" ).register( { diff --git a/env.sh b/env.sh index 56ae331c..d197a10d 100644 --- a/env.sh +++ b/env.sh @@ -4,7 +4,7 @@ if [ ! -f .env ]; then echo "Generating .env file.." touch .env { - echo "PORT=4200" + echo "PORT=4201" } >>.env else echo ".env file already exists. Nothing to do..." diff --git a/messages.xlf b/messages.xlf index 09ec69ad..029938a2 100644 --- a/messages.xlf +++ b/messages.xlf @@ -5,18 +5,21 @@ Read more - src/app/component/card/blog-holder-card/blog-holder-card.component.html + src/app/component/card/blog-holder-card/blog-holder-card.component.html + 22 - src/app/component/card/doc-holder-card/doc-holder-card.component.html + src/app/component/card/doc-holder-card/doc-holder-card.component.html + 22 Learn more - src/app/component/card/presentation-card/presentation-card.component.html + src/app/component/card/presentation-card/presentation-card.component.html + 18 @@ -35,42 +38,42 @@ - About + About src/app/component/nav/footer/footer.component.html 30,32 - Customers + Customers src/app/component/nav/footer/footer.component.html 33,35 - Partners + Partners src/app/component/nav/footer/footer.component.html 36,38 - Branding + Branding src/app/component/nav/footer/footer.component.html 39,41 - Jobs + Jobs src/app/component/nav/footer/footer.component.html 45,47 - Blog + Blog src/app/component/nav/footer/footer.component.html 49,51 @@ -84,28 +87,28 @@ - Open Source + Open Source src/app/component/nav/footer/footer.component.html 59,61 - Docs + Docs src/app/component/nav/footer/footer.component.html 63,65 - API + API src/app/component/nav/footer/footer.component.html 66,68 - Status + Status src/app/component/nav/footer/footer.component.html 69,71 @@ -119,42 +122,42 @@ - Support + Support src/app/component/nav/footer/footer.component.html 75,77 - Contact + Contact src/app/component/nav/footer/footer.component.html 78,80 - Terms & Conditions + Terms & Conditions src/app/component/nav/footer/footer.component.html 81,83 - Privacy + Privacy src/app/component/nav/footer/footer.component.html 84,86 - Cookies + Cookies src/app/component/nav/footer/footer.component.html 87,89 - Sitemap + Sitemap src/app/component/nav/footer/footer.component.html 90,92 @@ -163,33 +166,44 @@ Products - src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.html + + src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.html + 16 Services - src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.html + + src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.html + 25 About - src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.html + + src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.html + 33 Contact Us - src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.html + + src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.html + 40 - By continuing to use this site you agree to our Cookie Policy. + By continuing to use this site you agree to our + Cookie Policy. + src/app/component/popup/cookie-popup/cookie-popup.component.html 2,4 @@ -219,47 +233,61 @@ Some of the preconfigured systems: - src/app/component/product-represantation/product-presentation.component.html + + src/app/component/product-represantation/product-presentation.component.html + 43 *configuration still requires some level of developer experience - src/app/component/product-represantation/product-presentation.component.html + + src/app/component/product-represantation/product-presentation.component.html + 49,50 Integrate your servers with social login providers in minutes. - src/app/component/product-represantation/product-presentation.component.ts + + src/app/component/product-represantation/product-presentation.component.ts + 66 Integrate your servers with payment solution providers in minutes. - src/app/component/product-represantation/product-presentation.component.ts + + src/app/component/product-represantation/product-presentation.component.ts + 70 Integrate your servers with file storage solution providers in minutes. - src/app/component/product-represantation/product-presentation.component.ts + + src/app/component/product-represantation/product-presentation.component.ts + 74 Integrate your servers with email service providers in minutes. - src/app/component/product-represantation/product-presentation.component.ts + + src/app/component/product-represantation/product-presentation.component.ts + 78 - Open Source first organization that helps you to minimize the effort while building a new software business with our server and UI templates + Open Source first organization that helps you to minimize the effort while building a new software + business with our server and UI templates + src/app/data/brand/brand.data.ts 3 @@ -1733,14 +1761,21 @@ - Furkan is an experienced full-stack developer who has worked on various projects, including online payment solutions and fraud detection areas, in a well-known airline company. He's co-founded a startup to discover talents from the open-source community. After one year, Furkan successfully exited from his startup and then co-founded Open Template Hub. + Furkan is an experienced full-stack developer who has worked on various projects, including online + payment solutions and fraud detection areas, in a well-known airline company. He's co-founded a startup + to discover talents from the open-source community. After one year, Furkan successfully exited from his + startup and then co-founded Open Template Hub. + src/app/data/employee/employee.data.ts 8 - Fatih is a young professional with wide-ranging experience in software design and technology. He worked several years on Finance and Telecom business areas. He is now a Founder and CEO at Remoklify. He also co-founded Open Template Hub. + Fatih is a young professional with wide-ranging experience in software design and technology. He worked + several years on Finance and Telecom business areas. He is now a Founder and CEO at Remoklify. He also + co-founded Open Template Hub. + src/app/data/employee/employee.data.ts 23 @@ -1754,7 +1789,10 @@ - Mert is a new grad software engineer who has been experienced various technologies in his bachelor years. He worked on e-commercial and banking areas. Now, he is a full-stack developer at Open Template Hub and also working on native iOS applications. + Mert is a new grad software engineer who has been experienced various technologies in his bachelor + years. He worked on e-commercial and banking areas. Now, he is a full-stack developer at Open Template Hub and + also working on native iOS applications. + src/app/data/employee/employee.data.ts 38 @@ -1768,7 +1806,9 @@ - Would you like to join our team? Please feel free to reach us from info@opentemplatehub.com or from jobs page. + Would you like to join our team? Please feel free to reach us from info@opentemplatehub.com or from jobs + page. + src/app/data/employee/employee.data.ts 53 @@ -1782,7 +1822,12 @@ - Do not lost on functional dependencies, you can only focus on your business. All other layers like authentication, payment, mail, storage, analytics are covered by us with extremely lightweight and configurable microservices. Always be safe with encrypted service communications. Order your out-of-transaction requests with message queues. Do not spend your resources on performance enhancements, enjoy fastest service response times. + Do not lost on functional dependencies, you can only focus on your business. All other layers like + authentication, payment, mail, storage, analytics are covered by us with extremely lightweight and + configurable microservices. Always be safe with encrypted service communications. Order your + out-of-transaction requests with message queues. Do not spend your resources on performance enhancements, + enjoy fastest service response times. + src/app/data/feature/feature.data.ts 6 @@ -1796,7 +1841,10 @@ - Store your data efficiently and do not waste your time on your data architecture and performance analysis. Open Template Hub provides you efficient storage, orients and keeps your data in NOSQL and RDBMS, handles connection pools and management. + Store your data efficiently and do not waste your time on your data architecture and performance + analysis. Open Template Hub provides you efficient storage, orients and keeps your data in NOSQL and RDBMS, + handles connection pools and management. + src/app/data/feature/feature.data.ts 11 @@ -1810,14 +1858,18 @@ - Shout your business out to the world using responsive user interfaces with handy and highly customizable components. + Shout your business out to the world using responsive user interfaces with handy and highly customizable + components. + src/app/data/feature/feature.data.ts 16 - : Minimizes your effort while building a new software business with our open source GitHub micro server templates and responsive web UI + mobile UI templates + : Minimizes your effort while building a new software business with our open source GitHub micro server + templates and responsive web UI + mobile UI templates + src/app/data/navigation/navigation.data.ts 9 @@ -2193,7 +2245,9 @@ - No need to pay a price to get started. Get the latest updates from community driven open source project. + No need to pay a price to get started. Get the latest updates from community driven open source + project. + src/app/data/product/product.data.ts 12 @@ -2372,42 +2426,56 @@ - Auth Server Template is a generic open source authentication server that has simple yet powerful design to connect your business with all OAuth 2.0 and OAuth supporting third party companies (like Google, Facebook, Twitter or LinkedIn). It also supports basic username password authentication system. + Auth Server Template is a generic open source authentication server that has simple yet powerful design + to connect your business with all OAuth 2.0 and OAuth supporting third party companies (like Google, Facebook, + Twitter or LinkedIn). It also supports basic username password authentication system. + src/app/data/product/product.data.ts 111 - Payment Server Template is a generic open source payment server that has simple yet powerful design to connect your business with third party payment solution provider companies (like Stripe or Coinbase). + Payment Server Template is a generic open source payment server that has simple yet powerful design to + connect your business with third party payment solution provider companies (like Stripe or Coinbase). + src/app/data/product/product.data.ts 130 - File Storage Server Template is a generic open source file storage server that has simple yet powerful design to connect your business with third party file storage provider companies (like AWS S3). + File Storage Server Template is a generic open source file storage server that has simple yet powerful + design to connect your business with third party file storage provider companies (like AWS S3). + src/app/data/product/product.data.ts 150 - Mail Server Template is a generic open source mail server that has simple yet powerful design to connect your business with third party email service providers (like Gmail, Yahoo or Outlook). + Mail Server Template is a generic open source mail server that has simple yet powerful design to connect + your business with third party email service providers (like Gmail, Yahoo or Outlook). + src/app/data/product/product.data.ts 170 - Analytics Server Template is a generic open source analytics server that has simple yet powerful design to connect your business with third party analytics service providers (like Google Analytics or Matomo). + Analytics Server Template is a generic open source analytics server that has simple yet powerful design + to connect your business with third party analytics service providers (like Google Analytics or Matomo). + src/app/data/product/product.data.ts 188 - Business Logic Server Template is a generic open source server that encodes the real-world business rules that determine how data can be created, stored, and changed. It saves you from rewriting boilerplate code. It works best with other Open Template Hub products. + Business Logic Server Template is a generic open source server that encodes the real-world business + rules that determine how data can be created, stored, and changed. It saves you from rewriting boilerplate + code. It works best with other Open Template Hub products. + src/app/data/product/product.data.ts 207 @@ -2428,7 +2496,9 @@ - Company Profile UI Template is modern, responsive and customisable company profile ui template for your business. It contains reusable components, theme color and design support along with dark theme support. + Company Profile UI Template is modern, responsive and customisable company profile ui template for your + business. It contains reusable components, theme color and design support along with dark theme support. + src/app/data/product/product.data.ts 241 @@ -2497,7 +2567,9 @@ - Web UI Template is modern, responsive and customisable web ui template for your business. It contains reusable components, theme color and design support along with dark theme support. + Web UI Template is modern, responsive and customisable web ui template for your business. It contains + reusable components, theme color and design support along with dark theme support. + src/app/data/product/product.data.ts 286 @@ -2511,7 +2583,9 @@ - Mobile UI Template is modern, responsive and customisable mobile ui template for your business. It contains reusable components, theme color and design support along with dark theme support. + Mobile UI Template is modern, responsive and customisable mobile ui template for your business. It + contains reusable components, theme color and design support along with dark theme support. + src/app/data/product/product.data.ts 331 @@ -2574,7 +2648,10 @@ - Orchestration Server Template is a middleware server that has simple yet powerful design to connect your business with all Open Template Hub servers (like Auth Server, Payment Server, File Storage Server or Mail Server). It also has generic design to integrate any other servers. + Orchestration Server Template is a middleware server that has simple yet powerful design to connect your + business with all Open Template Hub servers (like Auth Server, Payment Server, File Storage Server or Mail + Server). It also has generic design to integrate any other servers. + src/app/data/product/product.data.ts 489 @@ -2665,7 +2742,10 @@ - We perform world-class custom software development services from startups to enterprise businesses. Our highly experienced software developers have a deep understanding of how to leverage top programming languages, frameworks, and other software development tools to create the ideal solution for your business. + We perform world-class custom software development services from startups to enterprise businesses. Our + highly experienced software developers have a deep understanding of how to leverage top programming languages, + frameworks, and other software development tools to create the ideal solution for your business. + src/app/data/product/product.data.ts 570 @@ -2686,7 +2766,9 @@ - We rely on our industry-specific technology experience to deliver highly scalable, flexible, and interoperable web, mobile, desktop, and hybrid applications. + We rely on our industry-specific technology experience to deliver highly scalable, flexible, and + interoperable web, mobile, desktop, and hybrid applications. + src/app/data/product/product.data.ts 578 @@ -2700,7 +2782,9 @@ - Our app maintenance & modernization services are designed to ensure the scalability, performance, and sustainability of your entire software infrastructure. + Our app maintenance & modernization services are designed to ensure the scalability, performance, + and sustainability of your entire software infrastructure. + src/app/data/product/product.data.ts 582 @@ -2714,14 +2798,20 @@ - We devise an in-depth, comprehensive software implementation & deployment plan, assessing your needs to deliver enhanced technologies to end-users. + We devise an in-depth, comprehensive software implementation & deployment plan, assessing your needs + to deliver enhanced technologies to end-users. + src/app/data/product/product.data.ts 586 - When a company adopts a new technology or business process, they face many challenges between their current applications and systems and the complicated software implementation process. Our industry-specific software engineers handle all of your challenging integration & implementation obstacles, including architectural design, testing, debugging, and execution. + When a company adopts a new technology or business process, they face many challenges between their + current applications and systems and the complicated software implementation process. Our industry-specific + software engineers handle all of your challenging integration & implementation obstacles, including + architectural design, testing, debugging, and execution. + src/app/data/product/product.data.ts 595 @@ -2742,7 +2832,9 @@ - We perform data integration services, including merging data, consolidating business processes, and creating Database Management Systems to ensure complete data integrity during the transfer process. + We perform data integration services, including merging data, consolidating business processes, and + creating Database Management Systems to ensure complete data integrity during the transfer process. + src/app/data/product/product.data.ts 603 @@ -2756,7 +2848,10 @@ - We provide integrating custom-built and third-party APIs service. We, integrate, and customize add web service functionality to mobile and web applications, and seamlessly synchronize data formats across these applications. + We provide integrating custom-built and third-party APIs service. We, integrate, and customize add web + service functionality to mobile and web applications, and seamlessly synchronize data formats across these + applications. + src/app/data/product/product.data.ts 607 @@ -2770,14 +2865,20 @@ - We provide Enterprise Application Integration solutions, facilitating seamless communications between business platforms. We are providing integrations for content management, accounting, customer relationship management, analytics, and marketing. + We provide Enterprise Application Integration solutions, facilitating seamless communications between + business platforms. We are providing integrations for content management, accounting, customer relationship + management, analytics, and marketing. + src/app/data/product/product.data.ts 611 - We deliver full-cycle QA automated software testing for web, mobile, and desktop applications to enable improved test coverage, enhance product quality, optimize testing activities, boost productivity, and decrease overall testing times. + We deliver full-cycle QA automated software testing for web, mobile, and desktop applications to enable + improved test coverage, enhance product quality, optimize testing activities, boost productivity, and decrease + overall testing times. + src/app/data/product/product.data.ts 620 @@ -2798,7 +2899,10 @@ - We deliver full-cycle QA automated software testing for web, mobile, and desktop applications to enable improved test coverage, enhance product quality, optimize testing activities, boost productivity, and decrease overall testing times. + We deliver full-cycle QA automated software testing for web, mobile, and desktop applications to enable + improved test coverage, enhance product quality, optimize testing activities, boost productivity, and decrease + overall testing times. + src/app/data/product/product.data.ts 628 @@ -2812,7 +2916,10 @@ - Our dedicated QA team will test your mobile, web, or desktop application manually to identify & fix bugs, detect & eradicate errors, and confirm its compliance with regulatory standards, providing you with the highest quality result possible. + Our dedicated QA team will test your mobile, web, or desktop application manually to identify & fix + bugs, detect & eradicate errors, and confirm its compliance with regulatory standards, providing you with + the highest quality result possible. + src/app/data/product/product.data.ts 632 @@ -2826,7 +2933,10 @@ - We design QA usability testing platforms that incorporate specific usability testing tools and UX research methods selected based on the client, focused on measuring how user-friendly and flexible your application or website is. + We design QA usability testing platforms that incorporate specific usability testing tools and UX + research methods selected based on the client, focused on measuring how user-friendly and flexible your + application or website is. + src/app/data/product/product.data.ts 636 @@ -2868,49 +2978,68 @@ - I can say, without a doubt, that Open Template Hub's products scale quickly and provide the best performance in the market. The best part is that we don't have to worry about any licensing fees at all... I highly recommend this affordable and reliable products! + I can say, without a doubt, that Open Template Hub's products scale quickly and provide the best + performance in the market. The best part is that we don't have to worry about any licensing fees at + all... I highly recommend this affordable and reliable products! + src/app/data/testimonial/testimonial.data.ts 8 - Working with the team at Open Template Hub has been a very satisfying experience. The team was communicative and supportive throughout the project, which made for a pleasant working environment. They were able to complete my project in an expert and timely manner. + Working with the team at Open Template Hub has been a very satisfying experience. The team was + communicative and supportive throughout the project, which made for a pleasant working environment. They were + able to complete my project in an expert and timely manner. + src/app/data/testimonial/testimonial.data.ts 21 - I've been researching for days about microserver templates and didn't really find much. But then I found Open Template Hub... This is an excellent way to save money and time for startups or small companies who don't have the means to pay hefty prices for licenses. Thank you so much. + I've been researching for days about microserver templates and didn't really find much. But + then I found Open Template Hub... This is an excellent way to save money and time for startups or small + companies who don't have the means to pay hefty prices for licenses. Thank you so much. + src/app/data/testimonial/testimonial.data.ts 34 - As a startup, time is of the essence for us. That's why Open Template Hub has been so helpful for us. It has saved us hours of time when it comes to creating the perfect website for our company. + As a startup, time is of the essence for us. That's why Open Template Hub has been so helpful for + us. It has saved us hours of time when it comes to creating the perfect website for our company. + src/app/data/testimonial/testimonial.data.ts 47 - Open Template Hub's Orchestration Server was easy to set up and integrate with our existing servers. I liked how the system automatically synced over all of the latest updates, it made managing our company's server so much easier. The customer service is also top-notch! + Open Template Hub's Orchestration Server was easy to set up and integrate with our existing + servers. I liked how the system automatically synced over all of the latest updates, it made managing our + company's server so much easier. The customer service is also top-notch! + src/app/data/testimonial/testimonial.data.ts 60 - I'm a big fan of Open Template Hub. The process was really easy, the team is efficient, and the payment service is really accurate. I would recommend this to any business owner. + I'm a big fan of Open Template Hub. The process was really easy, the team is efficient, and the + payment service is really accurate. I would recommend this to any business owner. + src/app/data/testimonial/testimonial.data.ts 73 - Would you like to tell us how was your Open Template Hub experience or are you planning to use our products but need some professional help? Please feel free to reach us from info@opentemplatehub.com or from contact us page. + Would you like to tell us how was your Open Template Hub experience or are you planning to use our + products but need some professional help? Please feel free to reach us from info@opentemplatehub.com or from + contact us page. + src/app/data/testimonial/testimonial.data.ts 86 @@ -2926,463 +3055,668 @@ Team Behind the Open Template Hub - src/app/page/landing-layout/about-us-page/about-us-page.component.ts + src/app/page/landing-layout/about-us-page/about-us-page.component.ts + 19 Follow us on social media - src/app/page/landing-layout/about-us-page/about-us-page.component.ts + src/app/page/landing-layout/about-us-page/about-us-page.component.ts + 22 - Minimizes your effort while building a new software business with our open source GitHub micro server templates and responsive web UI + mobile UI templates + Minimizes your effort while building a new software business with our open source GitHub micro server + templates and responsive web UI + mobile UI templates + - src/app/page/landing-layout/about-us-page/about-us-page.component.ts + src/app/page/landing-layout/about-us-page/about-us-page.component.ts + 23 History of the Open Template Hub - src/app/page/landing-layout/about-us-page/about-us-page.component.ts + src/app/page/landing-layout/about-us-page/about-us-page.component.ts + 26 - Minimizes your effort while building a new software business with our open source GitHub micro server templates and responsive web UI + mobile UI templates + Minimizes your effort while building a new software business with our open source GitHub micro server + templates and responsive web UI + mobile UI templates + - src/app/page/landing-layout/about-us-page/about-us-page.component.ts + src/app/page/landing-layout/about-us-page/about-us-page.component.ts + 27 - All of Open Template Hub’s brand features including Open Template Hub, OTH and the Open Template Hub logo are protected by applicable trademark, copyright and other intellectual property laws. Any use of a Open Template Hub trademark is subject to the Open Template Hub Trademark Standards for Use. Basic usage guidelines can be found below. If you have any questions or want to request approval to use these assets, please do not hesitate to contact us or email info@opentemplatehub.com Basic Usage Guidelines: - Do not rotate the Open Template Hub logo. - Do not change the color of the Open Template Hub logo. - Do not distort the Open Template Hub logo (be sure to scale proportionately). - Allow an appropriate amount of white space around the Open Template Hub logo, at least as much as the x-height of the logo (suggested). - Preferred minimum size for the Open Template Hub logo is 100px wide. For smaller sizes, you must seek permission from the Open Template Hub team. - - src/app/page/landing-layout/branding-page/branding-page.component.html + + + All of Open Template Hub’s brand features includingOpen Template Hub,OTH + + and theOpen Template Hub + + logo are protected by applicable trademark, copyright and other intellectual property laws. Any use of aOpen Template Hub trademark + + is subject to theOpen Template Hub + Trademark Standards + + for Use. + + + Basic usage guidelines can be found below. If you have any questions or want to request approval to use these + assets, please do not hesitate to contact us or emailinfo@opentemplatehub.com + + + + + + Basic Usage Guidelines: + + + + - Do not rotate theOpen Template Hub + + logo. + + + - Do not change the color of theOpen + Template Hub + + logo. + + + - Do not distort theOpen Template Hub + + logo (be sure to scale proportionately). + + + - Allow an appropriate amount of white space around theOpen Template Hublogo, at least as much as the x-height + of the logo (suggested). + + + - Preferred minimum size for theOpen + Template Hub + + logo is 100px wide. For smaller sizes, you must seek permission from the Open Template Hub team. + + + + src/app/page/landing-layout/branding-page/branding-page.component.html + 8,46 Thank you for reaching us. Our team will contact with you soon. - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 8 First Name - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 20 Last Name - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 30 Email - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 41 Phone Number - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 51 Website - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 61 - Select range of employees + Select range of employees - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 65,67 Company Size - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 72 Select a country - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 76 Country - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 81 Tell us more about your project, needs, and timeline.... - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 90 Your Message - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 93 CONTACT US - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 96 General Communication - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 115 - For general queries, including partnership opportunities, please email - - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + For general queries, including partnership opportunities, please email + + + + + + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 116,119 Technical or account support - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 126 - We're here to help! If you have technical issues, contact support - - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + We're here to help! If you have technical issues, + + contact support + + + + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 127,130 Contact Us - src/app/page/landing-layout/contact-us-page/contact-us-page.component.ts + src/app/page/landing-layout/contact-us-page/contact-us-page.component.ts + 30 Please provide a first name - src/app/page/landing-layout/contact-us-page/contact-us-page.component.ts + src/app/page/landing-layout/contact-us-page/contact-us-page.component.ts + 68 Customer Testimonials - src/app/page/landing-layout/customers-page/customers-page.component.ts + src/app/page/landing-layout/customers-page/customers-page.component.ts + 15 What our customers are saying... - src/app/page/landing-layout/customers-page/customers-page.component.ts + src/app/page/landing-layout/customers-page/customers-page.component.ts + 16 Username... - src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.html + + src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.html + 12 SEND - src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.html + + src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.html + 17 'Reset email sent!' - src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.html + + src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.html + 23 'Please check you inbox' - src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.html + + src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.html + 24 LOG IN - src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.html + + src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.html + 27 Forget password - src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.ts + + src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.ts + 25 Please provide a valid username. - src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.ts + + src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.ts + 62 or - src/app/page/landing-layout/form-pages/login-page/login-page.component.html + + src/app/page/landing-layout/form-pages/login-page/login-page.component.html + 15 Username or Email... - src/app/page/landing-layout/form-pages/login-page/login-page.component.html + + src/app/page/landing-layout/form-pages/login-page/login-page.component.html + 20 Password... - src/app/page/landing-layout/form-pages/login-page/login-page.component.html + + src/app/page/landing-layout/form-pages/login-page/login-page.component.html + 24 Remember Me - src/app/page/landing-layout/form-pages/login-page/login-page.component.html + + src/app/page/landing-layout/form-pages/login-page/login-page.component.html + 31 LOG IN - src/app/page/landing-layout/form-pages/login-page/login-page.component.html + + src/app/page/landing-layout/form-pages/login-page/login-page.component.html + 36 Don't have an account? - src/app/page/landing-layout/form-pages/login-page/login-page.component.html + + src/app/page/landing-layout/form-pages/login-page/login-page.component.html + 38 - Sign Up + Sign Up - src/app/page/landing-layout/form-pages/login-page/login-page.component.html + + src/app/page/landing-layout/form-pages/login-page/login-page.component.html + 39,41 - Forget password? + Forget password? - src/app/page/landing-layout/form-pages/login-page/login-page.component.html + + src/app/page/landing-layout/form-pages/login-page/login-page.component.html + 44,46 Welcome - src/app/page/landing-layout/form-pages/login-page/login-page.component.ts + src/app/page/landing-layout/form-pages/login-page/login-page.component.ts + 35 Please provide a valid username - src/app/page/landing-layout/form-pages/login-page/login-page.component.ts + src/app/page/landing-layout/form-pages/login-page/login-page.component.ts + 78 Please provide a valid password - src/app/page/landing-layout/form-pages/login-page/login-page.component.ts + src/app/page/landing-layout/form-pages/login-page/login-page.component.ts + 79 Password... - src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.html + + src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.html + 12 Confirm Password... - src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.html + + src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.html + 16 DONE - src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.html + + src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.html + 21 Please proceed with login - src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.html + + src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.html + 26 'LOG IN' - src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.html + + src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.html + 29 Reset password - src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.ts + + src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.ts + 27 Please provide a valid password (min length 6) - src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.ts + + src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.ts + 71 Please provide the same value for confirm password - src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.ts + + src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.ts + 72 or - src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + + src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + 15 Username... - src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + + src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + 21 Email... - src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + + src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + 25 Password... - src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + + src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + 29 Confirm Password... - src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + + src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + 33 CONTINUE - src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + + src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + 38 - By signing up, you agree Terms of Use, Privacy Policy and Cookie Policy - - src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + By signing up, you agree + Terms of Use, + Privacy Policy + + and + Cookie Policy + + + + + src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + 40,46 - Already have an account? Login - - src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + Already have an account? + + Login + + + + + src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + 50,54 Register - src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.ts + + src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.ts + 32 Please provide a valid username - src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.ts + + src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.ts + 75 Please provide a valid email address - src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.ts + + src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.ts + 76 Please provide a valid password (min length 6) - src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.ts + + src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.ts + 77 Please provide the same value for confirm password - src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.ts + + src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.ts + 78 @@ -3414,7 +3748,8 @@ 49 - src/app/page/landing-layout/product-page/product-page.component.html + src/app/page/landing-layout/product-page/product-page.component.html + 111 @@ -3440,7 +3775,9 @@ - Thousands of companies in over 50 countries use Open Template Hub to start, run, and scale their businesses. + Thousands of companies in over 50 countries use Open Template Hub to start, run, and scale their + businesses. + src/app/page/landing-layout/home-page/home-page.component.ts 54 @@ -3481,7 +3818,8 @@ 155 - src/app/page/landing-layout/product-page/product-page.component.ts + src/app/page/landing-layout/product-page/product-page.component.ts + 141 @@ -3492,343 +3830,407 @@ 155 - src/app/page/landing-layout/product-page/product-page.component.ts + src/app/page/landing-layout/product-page/product-page.component.ts + 141 Business Partners - src/app/page/landing-layout/partners-page/partners-page.component.ts + src/app/page/landing-layout/partners-page/partners-page.component.ts + 17 Create and run your online business with Open Template Hub and our partners. - src/app/page/landing-layout/partners-page/partners-page.component.ts + src/app/page/landing-layout/partners-page/partners-page.component.ts + 18 - Pricing Plan + Pricing Plan - src/app/page/landing-layout/pricing-page/pricing-page.component.ts + src/app/page/landing-layout/pricing-page/pricing-page.component.ts + 57 No hidden fees. Cancel at any time. - src/app/page/landing-layout/pricing-page/pricing-page.component.ts + src/app/page/landing-layout/pricing-page/pricing-page.component.ts + 58 Open Source - src/app/page/landing-layout/product-page/product-page.component.html + src/app/page/landing-layout/product-page/product-page.component.html + 23 Professional Help - src/app/page/landing-layout/product-page/product-page.component.html + src/app/page/landing-layout/product-page/product-page.component.html + 30 Download Package - src/app/page/landing-layout/product-page/product-page.component.html + src/app/page/landing-layout/product-page/product-page.component.html + 37 Activity history - src/app/page/landing-layout/product-page/product-page.component.html + src/app/page/landing-layout/product-page/product-page.component.html + 148 Customer testimonials - src/app/page/landing-layout/product-page/product-page.component.ts + src/app/page/landing-layout/product-page/product-page.component.ts + 33 What our customers are saying... - src/app/page/landing-layout/product-page/product-page.component.ts + src/app/page/landing-layout/product-page/product-page.component.ts + 34 Related Products - src/app/page/landing-layout/product-page/product-page.component.ts + src/app/page/landing-layout/product-page/product-page.component.ts + 38 Package Installation & Usage - src/app/page/landing-layout/product-page/product-page.component.ts + src/app/page/landing-layout/product-page/product-page.component.ts + 42 Contact Us - src/app/page/landing-layout/product-page/product-page.component.ts + src/app/page/landing-layout/product-page/product-page.component.ts + 136 Request for Demo - src/app/page/landing-layout/product-page/product-page.component.ts + src/app/page/landing-layout/product-page/product-page.component.ts + 137 HOME - src/app/page/landing-layout/raw-content-pages/maintenance-page/maintenance-page.component.html + + src/app/page/landing-layout/raw-content-pages/maintenance-page/maintenance-page.component.html + 10 Under maintenance - src/app/page/landing-layout/raw-content-pages/maintenance-page/maintenance-page.component.ts + + src/app/page/landing-layout/raw-content-pages/maintenance-page/maintenance-page.component.ts + 19 Please check again later - src/app/page/landing-layout/raw-content-pages/maintenance-page/maintenance-page.component.ts + + src/app/page/landing-layout/raw-content-pages/maintenance-page/maintenance-page.component.ts + 20 HOME - src/app/page/landing-layout/raw-content-pages/not-found-page/not-found-page.component.html + + src/app/page/landing-layout/raw-content-pages/not-found-page/not-found-page.component.html + 10 404 Page not found - src/app/page/landing-layout/raw-content-pages/not-found-page/not-found-page.component.ts + + src/app/page/landing-layout/raw-content-pages/not-found-page/not-found-page.component.ts + 19 Something went wrong! - src/app/page/landing-layout/raw-content-pages/not-found-page/not-found-page.component.ts + + src/app/page/landing-layout/raw-content-pages/not-found-page/not-found-page.component.ts + 20 Registration successful 🎉 - src/app/page/landing-layout/raw-content-pages/sign-up-success-page/sign-up-success-page.component.ts + + src/app/page/landing-layout/raw-content-pages/sign-up-success-page/sign-up-success-page.component.ts + 27 - Verification email sent to: + Verification email sent to: - src/app/page/landing-layout/raw-content-pages/sign-up-success-page/sign-up-success-page.component.ts + + src/app/page/landing-layout/raw-content-pages/sign-up-success-page/sign-up-success-page.component.ts + 28 HOME - src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.html + + src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.html + 16 LOG IN - src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.html + + src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.html + 23 Verifying account... - src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.ts + + src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.ts + 28 Account verification failed - src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.ts + + src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.ts + 31 Something went wrong! - src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.ts + + src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.ts + 32 Account verified 🎉 - src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.ts + + src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.ts + 35 Please proceed with login - src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.ts + + src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.ts + 36 Products - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 8 Company - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 39 About - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 41 Customers - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 42 Enterprise - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 43 Partners - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 44 Branding - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 45 Jobs - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 46 Blog - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 47 Developers - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 53 Docs - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 55 API - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 56 Status - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 57 Resources - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 61 Support - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 63 Contact - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 64 Terms & Conditions - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 65 Privacy - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 66 Cookies - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 67 @@ -3842,84 +4244,107 @@ Dark/Light Mode - src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + + src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + 7 Light theme - src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + + src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + 12 Dark theme - src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + + src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + 14 Auto - src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + + src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + 16 Color - src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + + src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + 20 Design - src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + + src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + 30 Default - src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + + src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + 40 Payment succeeded - src/app/page/splash-layout/callback-page/callback-page.component.ts + src/app/page/splash-layout/callback-page/callback-page.component.ts + 56 Home - src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.html + + src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.html + 24 Proceed - src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.html + + src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.html + 25 - Will be redirected to: + Will be redirected to: - src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.ts + + src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.ts + 66 - Looks like the link is broken: + Looks like the link is broken: - src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.ts + + src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.ts + 67 diff --git a/package.json b/package.json index b0af98b9..f681bfd3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "web-ui-template", - "description": "Web UI Template is modern, responsive and customisable web ui template for your business. It contains reusable components, theme color and design support along with dark theme support.", - "version": "3.1.1", + "description": "Web UI Template is a modern, responsive, and customizable web UI template for your business. It contains reusable components, theme color, and design support along with dark theme support.", + "version": "5.0.1", "license": "MIT", "scripts": { "buildLocal": "ng build --configuration=local --localize", @@ -13,11 +13,11 @@ "lint": "ng lint", "sitemap": "node src/sitemap-generator.ts > seo/sitemap.xml", "ng": "ng", - "startLocal": "node src/version-generator.ts > ./src/environments/version.ts && ng serve --configuration=local", - "startLocalFromIPhone": "node src/version-generator.ts > ./src/environments/version.ts && ng serve --configuration=local --host 0.0.0.0 --disable-host-check true", - "startLocalToStagingApi": "node src/version-generator.ts > ./src/environments/version.ts && ng serve --configuration=local-to-staging-api", - "startLocalFromIPhoneToStagingApi": "node src/version-generator.ts > ./src/environments/version.ts && ng serve --configuration=local-to-staging-api --host 0.0.0.0 --disable-host-check true", - "startStaging": "node src/version-generator.ts > ./src/environments/version.ts && node server.js --configuration=staging", + "startLocal": "ng serve --configuration=local --port 4201", + "startLocalFromIPhone": "ng serve --configuration=local --port 4201 --host 0.0.0.0 --disable-host-check true", + "startLocalToStagingApi": "ng serve --configuration=local-to-staging-api --port 4201", + "startLocalFromIPhoneToStagingApi": "ng serve --configuration=local-to-staging-api --port 4201 --host 0.0.0.0 --disable-host-check true", + "startStaging": "node server.js --configuration=staging", "start": "node server.js --configuration=production", "outdated": "node src/dependency-checker.ts > docs/OUTDATED.md", "test": "ng test", @@ -26,69 +26,67 @@ "serve:local:fr": "ng serve -c=fr" }, "dependencies": { - "@angular/animations": "^12.2.5", - "@angular/cdk": "^12.2.5", - "@angular/common": "^12.2.5", - "@angular/compiler": "^12.2.5", - "@angular/core": "^12.2.5", - "@angular/forms": "^12.2.5", - "@angular/platform-browser": "^12.2.5", - "@angular/platform-browser-dynamic": "^12.2.5", - "@angular/router": "^12.2.5", - "@angular/service-worker": "^12.2.5", - "@fortawesome/fontawesome-free": "^5.15.3", - "@fullcalendar/angular": "^5.8.0", - "@fullcalendar/daygrid": "^5.8.0", - "@fullcalendar/interaction": "^5.8.0", - "@ng-toolkit/universal": "^8.1.0", - "@stripe/stripe-js": "^1.15.1", - "@swimlane/ngx-charts": "^19.0.1", - "@types/simple-icons": "^5.0.0", - "angular-google-tag-manager": "^1.4.2", - "angular-in-memory-web-api": "^0.11.0", + "@angular/animations": "^15.1.0", + "@angular/cdk": "^15.1.0", + "@angular/common": "^15.1.0", + "@angular/compiler": "^15.1.0", + "@angular/core": "^15.1.0", + "@angular/forms": "^15.1.0", + "@angular/platform-browser": "^15.1.0", + "@angular/platform-browser-dynamic": "^15.1.0", + "@angular/router": "^15.1.0", + "@angular/service-worker": "^15.1.0", + "@fortawesome/fontawesome-free": "^6.2.1", + "@open-template-hub/animated-code-editor": "^5.0.1", + "@open-template-hub/button": "^5.0.1", + "@open-template-hub/card": "^5.0.1", + "@open-template-hub/countdown": "^5.0.1", + "@open-template-hub/hero": "^5.0.1", + "@open-template-hub/led": "^5.0.1", + "@stripe/stripe-js": "^1.46.0", "compression": "^1.7.4", - "countup.js": "^2.0.7", - "dotenv": "^10.0.0", - "express": "^4.17.1", - "graphql": "^15.5.3", - "graphql-tag": "^2.12.5", - "helmet": "^4.6.0", - "ics": "^2.29.0", - "jsdom": "^17.0.0", - "ng2-date-picker": "^12.0.3", - "ng2-tooltip-directive": "^2.10.1", - "ngx-image-cropper": "^4.0.1", - "ngx-markdown": "^12.0.1", - "ngx-toastr": "^14.1.3", + "countup.js": "^2.3.2", + "dotenv": "^16.0.3", + "express": "^4.18.2", + "graphql": "^16.6.0", + "graphql-tag": "^2.12.6", + "helmet": "^6.0.1", + "ics": "^2.41.0", + "jsdom": "^21.0.0", + "mixpanel-browser": "^2.45.0", + "ngx-image-cropper": "^6.3.2", + "ngx-markdown": "^15.1.0", + "ngx-toastr": "^16.0.2", "path": "^0.12.7", - "rxjs": "^7.3.0", - "simple-icons": "^5.13.0", - "swiper": "^7.0.4", - "tslib": "^2.3.0", + "rxjs": "^7.8.0", + "simple-icons": "^8.2.0", + "socket.io-client": "^4.5.4", + "swiper": "^8.4.5", + "tslib": "^2.4.1", "xmlserializer": "^0.6.1", - "zone.js": "^0.11.4" + "zone.js": "~0.12.0" }, "devDependencies": { - "@angular-devkit/build-angular": "^12.2.5", - "@angular/cli": "^12.2.5", - "@angular/compiler-cli": "^12.2.5", - "@angular/language-service": "^12.2.5", - "@angular/localize": "^12.2.5", - "@types/jasmine": "^3.9.0", - "@types/jasminewd2": "^2.0.9", - "@types/node": "^16.9.0", + "@angular-devkit/build-angular": "^15.1.1", + "@angular/cli": "^15.1.1", + "@angular/compiler-cli": "^15.1.0", + "@angular/language-service": "^15.1.0", + "@angular/localize": "^15.1.0", + "@types/jasmine": "^4.3.1", + "@types/jasminewd2": "^2.0.10", + "@types/node": "^18.11.18", "codelyzer": "^6.0.2", - "jasmine-core": "^3.9.0", + "jasmine-core": "^4.5.0", "jasmine-spec-reporter": "^7.0.0", - "karma": "^6.3.4", - "karma-chrome-launcher": "^3.1.0", - "karma-coverage-istanbul-reporter": "^3.0.2", - "karma-jasmine": "^4.0.0", - "karma-jasmine-html-reporter": "^1.6.0", + "karma": "^6.4.1", + "karma-chrome-launcher": "^3.1.1", + "karma-coverage-istanbul-reporter": "^3.0.3", + "karma-jasmine": "^5.1.0", + "karma-jasmine-html-reporter": "^2.0.0", "protractor": "^7.0.0", - "ts-node": "^10.2.1", - "tslint": "^6.1.0", - "typescript": "~4.3.5" + "ts-node": "^10.9.1", + "tslint": "^6.1.3", + "typescript": "^4.9.4" }, "git repository": "https://github.com/open-template-hub/web-ui-template", "repository": { diff --git a/seo/sitemap.xml b/seo/sitemap.xml index 6735363c..d82df97b 100644 --- a/seo/sitemap.xml +++ b/seo/sitemap.xml @@ -1 +1,123 @@ -https://opentemplatehub.com2021-10-22https://opentemplatehub.com/about2021-10-22https://opentemplatehub.com/contact-us2021-10-22https://opentemplatehub.com/branding2021-10-22https://opentemplatehub.com/blog2021-10-22https://opentemplatehub.com/docs2021-10-22https://opentemplatehub.com/partners2021-10-22https://opentemplatehub.com/customers2021-10-22https://opentemplatehub.com/terms2021-10-22https://opentemplatehub.com/sitemap2021-10-22https://opentemplatehub.com/product2021-10-22https://opentemplatehub.com/product/servers2021-10-22https://opentemplatehub.com/product/servers/auth-server-template2021-10-22https://opentemplatehub.com/product/servers/payment-server-template2021-10-22https://opentemplatehub.com/product/servers/file-storage-server-template2021-10-22https://opentemplatehub.com/product/servers/analytics-server-template2021-10-22https://opentemplatehub.com/product/servers/business-logic-server-template2021-10-22https://opentemplatehub.com/product/user-interface2021-10-22https://opentemplatehub.com/product/user-interface/company-profile-ui-template2021-10-22https://opentemplatehub.com/product/user-interface/web-ui-template2021-10-22https://opentemplatehub.com/product/user-interface/mobile-ui-template2021-10-22https://opentemplatehub.com/product/generator2021-10-22https://opentemplatehub.com/product/generator/server-generator2021-10-22https://opentemplatehub.com/product/generator/app-generator2021-10-22https://opentemplatehub.com/product/premium2021-10-22https://opentemplatehub.com/product/premium/orchestration-server2021-10-22https://opentemplatehub.com/product/services2021-10-22https://opentemplatehub.com/product/services/software-consultancy2021-10-22https://opentemplatehub.com/product/services/software-integration2021-10-22https://opentemplatehub.com/product/services/quality-assurance2021-10-22 + + + + https://opentemplatehub.com + 2021-10-22 + + + https://opentemplatehub.com/about + 2021-10-22 + + + https://opentemplatehub.com/contact-us + 2021-10-22 + + + https://opentemplatehub.com/branding + 2021-10-22 + + + https://opentemplatehub.com/blog + 2021-10-22 + + + https://opentemplatehub.com/docs + 2021-10-22 + + + https://opentemplatehub.com/partners + 2021-10-22 + + + https://opentemplatehub.com/customers + 2021-10-22 + + + https://opentemplatehub.com/terms + 2021-10-22 + + + https://opentemplatehub.com/sitemap + 2021-10-22 + + + https://opentemplatehub.com/product + 2021-10-22 + + + https://opentemplatehub.com/product/servers + 2021-10-22 + + + https://opentemplatehub.com/product/servers/auth-server-template + 2021-10-22 + + + https://opentemplatehub.com/product/servers/payment-server-template + 2021-10-22 + + + https://opentemplatehub.com/product/servers/file-storage-server-template + 2021-10-22 + + + https://opentemplatehub.com/product/servers/analytics-server-template + 2021-10-22 + + + https://opentemplatehub.com/product/servers/business-logic-server-template + 2021-10-22 + + + https://opentemplatehub.com/product/user-interface + 2021-10-22 + + + https://opentemplatehub.com/product/user-interface/company-profile-ui-template + 2021-10-22 + + + https://opentemplatehub.com/product/user-interface/web-ui-template + 2021-10-22 + + + https://opentemplatehub.com/product/user-interface/mobile-ui-template + 2021-10-22 + + + https://opentemplatehub.com/product/generator + 2021-10-22 + + + https://opentemplatehub.com/product/generator/server-generator + 2021-10-22 + + + https://opentemplatehub.com/product/generator/app-generator + 2021-10-22 + + + https://opentemplatehub.com/product/premium + 2021-10-22 + + + https://opentemplatehub.com/product/premium/orchestration-server + 2021-10-22 + + + https://opentemplatehub.com/product/services + 2021-10-22 + + + https://opentemplatehub.com/product/services/software-consultancy + 2021-10-22 + + + https://opentemplatehub.com/product/services/software-integration + 2021-10-22 + + + https://opentemplatehub.com/product/services/quality-assurance + 2021-10-22 + + diff --git a/server.js b/server.js index 4033a556..7d7e1056 100644 --- a/server.js +++ b/server.js @@ -18,16 +18,8 @@ app.disable( "x-powered-by" ); // directory that we will serve app.use( express.static( __dirname + "/dist/web-ui-template" ) ); -app.get( "*", function ( req, res, next ) { - - if ( "https" !== req.headers[ "x-forwarded-proto" ] && "production" === process.env.NODE_ENV ) { - res.redirect( "https://" + req.hostname + req.url ); - } else { - // Continue to other routes if we're not redirecting - next(); - } - -} ); +// If not using Cloudflare Flexible SSL configuration redirect all requests to https +// https://support.cloudflare.com/hc/en-us/articles/115000219871-Troubleshooting-redirect-loop-errors- // redirect all requests to index.html app.get( "/*", function ( req, res ) { @@ -41,7 +33,7 @@ app.get( "/*", function ( req, res ) { } ); // listen port -const port = process.env.PORT || 4200; +const port = process.env.PORT || 4201; app.listen( port, () => { console.info( "UI Server is running on port: ", port ); } ); diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index e43ea2a0..7df40be9 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -3,45 +3,67 @@ import { RouterModule, Routes } from '@angular/router'; import { environmentCommon } from '../environments/environment-common'; import { NAVIGATIONS } from './data/navigation/navigation.data'; import { AuthGuard } from './guard/auth/auth.guard'; -import { PublicProfileGuard } from './guard/public-profile/public-profile.guard'; import { NavigationInterceptor } from './interceptor/navigation/navigation.interceptor'; -import { CreateEventPageComponent } from './page/dashboard-layout/create-event-page/create-event-page.component'; import { DashboardLayoutComponent } from './page/dashboard-layout/dashboard-layout.component'; import { DashboardPageComponent } from './page/dashboard-layout/dashboard-page/dashboard-page.component'; -import { EventPageComponent } from './page/dashboard-layout/event-page/event-page.component'; -import { LearnPageComponent } from './page/dashboard-layout/learn-page/learn-page.component'; import { MyProfilePageComponent } from './page/dashboard-layout/my-profile-page/my-profile-page.component'; -import { PublicProfilePageComponent } from './page/dashboard-layout/public-profile-page/public-profile-page.component'; +import { NotificationsPageComponent } from './page/dashboard-layout/notifications-page/notifications-page.component'; +import { PremiumPageComponent } from './page/dashboard-layout/premium-page/premium-page.component'; import { AboutUsPageComponent } from './page/landing-layout/about-us-page/about-us-page.component'; -import { BlogContentPageComponent } from './page/landing-layout/blog-page/blog-content-page/blog-content-page.component'; +import { + BlogContentPageComponent +} from './page/landing-layout/blog-page/blog-content-page/blog-content-page.component'; import { BlogPageComponent } from './page/landing-layout/blog-page/blog-page.component'; import { BrandingPageComponent } from './page/landing-layout/branding-page/branding-page.component'; import { ContactUsPageComponent } from './page/landing-layout/contact-us-page/contact-us-page.component'; import { CustomersPageComponent } from './page/landing-layout/customers-page/customers-page.component'; -import { DocsContentPageComponent } from './page/landing-layout/docs-page/docs-content-page/docs-content-page.component'; +import { + DocsContentPageComponent +} from './page/landing-layout/docs-page/docs-content-page/docs-content-page.component'; import { DocsPageComponent } from './page/landing-layout/docs-page/docs-page.component'; -import { ForgetPasswordPageComponent } from './page/landing-layout/form-pages/forget-password-page/forget-password-page.component'; +import { + ForgetPasswordPageComponent +} from './page/landing-layout/form-pages/forget-password-page/forget-password-page.component'; import { LoginPageComponent } from './page/landing-layout/form-pages/login-page/login-page.component'; -import { ResetPasswordPageComponent } from './page/landing-layout/form-pages/reset-password-page/reset-password-page.component'; +import { + ResetPasswordPageComponent +} from './page/landing-layout/form-pages/reset-password-page/reset-password-page.component'; import { SignUpPageComponent } from './page/landing-layout/form-pages/sign-up-page/sign-up-page.component'; +import { + TwoFactorAuthenticationPageComponent +} from './page/landing-layout/form-pages/two-factor-authentication-page/two-factor-authentication-page.component'; import { HomePageComponent } from './page/landing-layout/home-page/home-page.component'; import { LandingLayoutComponent } from './page/landing-layout/landing-layout.component'; import { PartnersPageComponent } from './page/landing-layout/partners-page/partners-page.component'; -import { CookiePolicyPageComponent } from './page/landing-layout/policy-pages/cookie-policy-page/cookie-policy-page.component'; -import { PrivacyPolicyPageComponent } from './page/landing-layout/policy-pages/privacy-policy-page/privacy-policy-page.component'; +import { + CookiePolicyPageComponent +} from './page/landing-layout/policy-pages/cookie-policy-page/cookie-policy-page.component'; +import { + PrivacyPolicyPageComponent +} from './page/landing-layout/policy-pages/privacy-policy-page/privacy-policy-page.component'; import { TermsPageComponent } from './page/landing-layout/policy-pages/terms-page/terms-page.component'; import { PricingPageComponent } from './page/landing-layout/pricing-page/pricing-page.component'; import { ProductPageComponent } from './page/landing-layout/product-page/product-page.component'; -import { MaintenancePageComponent } from './page/landing-layout/raw-content-pages/maintenance-page/maintenance-page.component'; +import { + MaintenancePageComponent +} from './page/landing-layout/raw-content-pages/maintenance-page/maintenance-page.component'; import { NotFoundPageComponent } from './page/landing-layout/raw-content-pages/not-found-page/not-found-page.component'; -import { SignUpSuccessPageComponent } from './page/landing-layout/raw-content-pages/sign-up-success-page/sign-up-success-page.component'; -import { VerifyAccountPageComponent } from './page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component'; +import { + SignUpSuccessPageComponent +} from './page/landing-layout/raw-content-pages/sign-up-success-page/sign-up-success-page.component'; +import { + VerifyAccountPageComponent +} from './page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component'; import { SitemapPageComponent } from './page/landing-layout/sitemap-page/sitemap-page.component'; import { StatusPageComponent } from './page/landing-layout/status-page/status-page.component'; +import { EditProfilePageComponent } from './page/settings-layout/edit-profile-page/edit-profile-page.component'; +import { EditSecurityComponent } from './page/settings-layout/edit-security/edit-security.component'; import { EditThemePageComponent } from './page/settings-layout/edit-theme-page/edit-theme-page.component'; import { SettingsLayoutComponent } from './page/settings-layout/settings-layout.component'; import { CallbackPageComponent } from './page/splash-layout/callback-page/callback-page.component'; -import { ExternalRedirectPageComponent } from './page/splash-layout/external-redirect-page/external-redirect-page.component'; +import { + ExternalRedirectPageComponent +} from './page/splash-layout/external-redirect-page/external-redirect-page.component'; import { SplashLayoutComponent } from './page/splash-layout/splash-layout.component'; const routes: Routes = [ @@ -104,6 +126,11 @@ const routes: Routes = [ component: LoginPageComponent, canActivate: [ NavigationInterceptor ], }, + { + path: NAVIGATIONS.twoFactorVerification.url, + component: TwoFactorAuthenticationPageComponent, + canActivate: [ NavigationInterceptor ] + }, { path: NAVIGATIONS.branding.url, component: BrandingPageComponent, @@ -154,12 +181,6 @@ const routes: Routes = [ component: SitemapPageComponent, canActivate: [ NavigationInterceptor ], }, - { - path: NAVIGATIONS.u.url + '/' + ':username', - component: PublicProfilePageComponent, - data: { isPublic: true }, - canActivate: [ NavigationInterceptor ], - }, { path: NAVIGATIONS.pricing.url + '/' + ':productLine' + '/' + ':product', component: PricingPageComponent, @@ -242,42 +263,21 @@ const routes: Routes = [ path: NAVIGATIONS.dashboard.url, component: DashboardLayoutComponent, children: [ - { path: '', component: DashboardPageComponent, canActivate: [ AuthGuard ] }, + { path: '', component: DashboardPageComponent, canActivate: [ AuthGuard, NavigationInterceptor ] }, { path: NAVIGATIONS.myProfile.url, component: MyProfilePageComponent, - canActivate: [ AuthGuard ], - }, - { - path: NAVIGATIONS.createEvent.url, - component: CreateEventPageComponent, - canActivate: [ AuthGuard ], - }, - { - path: NAVIGATIONS.learn.url, - component: LearnPageComponent, - canActivate: [ AuthGuard ], - }, - { - path: NAVIGATIONS.event.url, - component: EventPageComponent, - canActivate: [ AuthGuard ], + canActivate: [ AuthGuard, NavigationInterceptor ], }, { - path: NAVIGATIONS.privacy.url, - component: MaintenancePageComponent, - canActivate: [ AuthGuard ], + path: NAVIGATIONS.premium.url, + component: PremiumPageComponent, + canActivate: [ AuthGuard, NavigationInterceptor ], }, - ], - }, - { - path: NAVIGATIONS.user.url, - component: DashboardLayoutComponent, - children: [ { - path: ':username', - component: PublicProfilePageComponent, - canActivate: [ PublicProfileGuard ], + path: NAVIGATIONS.notifications.url, + component: NotificationsPageComponent, + canActivate: [ AuthGuard, NavigationInterceptor ], }, ], }, @@ -288,11 +288,21 @@ const routes: Routes = [ { path: NAVIGATIONS.editTheme.url, component: EditThemePageComponent, - canActivate: [ AuthGuard ] + canActivate: [ AuthGuard, NavigationInterceptor ] }, + { + path: NAVIGATIONS.editProfile.url, + component: EditProfilePageComponent, + canActivate: [ AuthGuard, NavigationInterceptor ] + }, + { + path: NAVIGATIONS.editSecurity.url, + component: EditSecurityComponent, + canActivate: [ AuthGuard, NavigationInterceptor ] + } ], }, - // otherwise redirect to error + // otherwise, redirect to error { path: '**', redirectTo: NAVIGATIONS.notFound.url }, ]; diff --git a/src/app/oth/oth.component.html b/src/app/app.component.html similarity index 87% rename from src/app/oth/oth.component.html rename to src/app/app.component.html index cc05ddd0..962c8ceb 100644 --- a/src/app/oth/oth.component.html +++ b/src/app/app.component.html @@ -1,5 +1,5 @@
+ id="app-component">
diff --git a/src/app/component/button/brand-button/brand-button.component.scss b/src/app/app.component.scss similarity index 100% rename from src/app/component/button/brand-button/brand-button.component.scss rename to src/app/app.component.scss diff --git a/src/app/oth/oth.component.spec.ts b/src/app/app.component.spec.ts similarity index 78% rename from src/app/oth/oth.component.spec.ts rename to src/app/app.component.spec.ts index 5ebc86f8..91f85f55 100644 --- a/src/app/oth/oth.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -1,6 +1,6 @@ import { async, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { OthComponent } from './oth.component'; +import { AppComponent } from './app.component'; describe( 'OthComponent', () => { beforeEach( async( () => { @@ -9,25 +9,25 @@ describe( 'OthComponent', () => { RouterTestingModule ], declarations: [ - OthComponent + AppComponent ], } ).compileComponents(); } ) ); it( 'should create the app', () => { - const fixture = TestBed.createComponent( OthComponent ); + const fixture = TestBed.createComponent( AppComponent ); const app = fixture.debugElement.componentInstance; expect( app ).toBeTruthy(); } ); it( `should have as title 'web-ui-template'`, () => { - const fixture = TestBed.createComponent( OthComponent ); + const fixture = TestBed.createComponent( AppComponent ); const app = fixture.debugElement.componentInstance; expect( app.title ).toEqual( 'web-ui-template' ); } ); it( 'should render title', () => { - const fixture = TestBed.createComponent( OthComponent ); + const fixture = TestBed.createComponent( AppComponent ); fixture.detectChanges(); const compiled = fixture.debugElement.nativeElement; expect( compiled.querySelector( '.content span' ).textContent ).toContain( 'web-ui-template app is running!' ); diff --git a/src/app/oth/oth.component.ts b/src/app/app.component.ts similarity index 59% rename from src/app/oth/oth.component.ts rename to src/app/app.component.ts index 2b542889..f6c00cb5 100644 --- a/src/app/oth/oth.component.ts +++ b/src/app/app.component.ts @@ -1,14 +1,14 @@ import { Component } from '@angular/core'; -import { NavigationEnd, Router } from '@angular/router'; -import { GoogleTagManagerService } from 'angular-google-tag-manager'; -import { ThemeService } from '../service/theme/theme.service'; +import { Router } from '@angular/router'; +import { SocketService } from './service/socket/socket.service'; +import { ThemeService } from './service/theme/theme.service'; @Component( { selector: 'app-root', - templateUrl: './oth.component.html', - styleUrls: [ './oth.component.scss' ] + templateUrl: './app.component.html', + styleUrls: [ './app.component.scss' ] } ) -export class OthComponent { +export class AppComponent { darkLightSetting: string; themeColorSetting: string; @@ -16,21 +16,9 @@ export class OthComponent { constructor( private themeService: ThemeService, - private googleTagManagerService: GoogleTagManagerService, + private socketService: SocketService, private router: Router ) { - this.router.events.forEach( item => { - if ( item instanceof NavigationEnd ) { - - const googleTagManagerTag = { - event: 'page', - pageName: item.url - }; - - this.googleTagManagerService.pushTag( googleTagManagerTag ); - } - } ); - this.themeService.darkLightSetting.subscribe( darkLightSetting => { this.darkLightSetting = darkLightSetting; } ); diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 16cd9953..6e70892d 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -7,13 +7,12 @@ import { BrowserModule } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { ServiceWorkerModule } from '@angular/service-worker'; -import { FullCalendarModule } from '@fullcalendar/angular'; // must go before plugins -import dayGridPlugin from '@fullcalendar/daygrid'; // a plugin! -import interactionPlugin from '@fullcalendar/interaction'; -import { NgxChartsModule } from '@swimlane/ngx-charts'; -import { GoogleTagManagerModule } from 'angular-google-tag-manager'; -import { DpDatePickerModule } from 'ng2-date-picker'; -import { TooltipModule } from 'ng2-tooltip-directive'; +import { AnimatedCodeEditorModule } from '@open-template-hub/animated-code-editor'; +import { ButtonModule } from '@open-template-hub/button'; +import { CardModule } from '@open-template-hub/card'; +import { CountdownModule } from '@open-template-hub/countdown'; +import { HeroModule } from '@open-template-hub/hero'; +import { LedModule } from '@open-template-hub/led'; import { ImageCropperModule } from 'ngx-image-cropper'; import { MarkdownModule } from 'ngx-markdown'; import { ToastrModule } from 'ngx-toastr'; @@ -21,114 +20,139 @@ import { SwiperModule } from 'swiper/angular'; import { environment } from '../environments/environment'; import { AppRoutingModule } from './app-routing.module'; -import { AnimatedCodeEditorComponent } from './component/animated-code-editor/animated-code-editor.component'; -import { BrandButtonComponent } from './component/button/brand-button/brand-button.component'; -import { ButtonComponent } from './component/button/button.component'; -import { EventButtonComponent } from './component/button/event-button/event-button.component'; -import { InformationButtonComponent } from './component/button/information-button/information-button.component'; -import { CalendarComponent } from './component/calendar/calendar.component'; +import { AppComponent } from './app.component'; +import { ActivityCardComponent } from './component/card/activity-card/activity-card.component'; import { ActivityHistoryCardComponent } from './component/card/activity-history-card/activity-history-card.component'; -import { CardComponent } from './component/card/card.component'; +import { AnalyticsEventCardComponent } from './component/card/analytics-event-card/analytics-event-card.component'; +import { AssetCardComponent } from './component/card/asset-card/asset-card.component'; +import { BlogCardComponent } from './component/card/blog-card/blog-card.component'; +import { BlogHolderCardComponent } from './component/card/blog-holder-card/blog-holder-card.component'; +import { + ContactInformationCardComponent +} from './component/card/contact-information-card/contact-information-card.component'; +import { DocCardComponent } from './component/card/doc-card/doc-card.component'; +import { DocHolderCardComponent } from './component/card/doc-holder-card/doc-holder-cardcomponent'; import { EmployeeCardComponent } from './component/card/employee-card/employee-card.component'; -import { EventCardComponent } from './component/card/event-card/event-card.component'; import { FeatureCardComponent } from './component/card/feature-card/feature-card.component'; import { PolicyCardComponent } from './component/card/policy-card/policy-card.component'; import { PresentationCardComponent } from './component/card/presentation-card/presentation-card.component'; import { PricingCardComponent } from './component/card/pricing-card/pricing-card.component'; +import { ProfileCardComponent } from './component/card/profile-card/profile-card.component'; import { StatusCardComponent } from './component/card/status-card/status-card.component'; +import { TechStackCardComponent } from './component/card/tech-stack-card/tech-stack-card.component'; import { TestimonialCardComponent } from './component/card/testimonial-card/testimonial-card.component'; +import { + StepTimelineCardComponent +} from './component/card/timeline-card/step-timeline-card/step-timeline-card.component'; import { TimelineCardComponent } from './component/card/timeline-card/timeline-card.component'; import { ColorChartComponent } from './component/color-chart/color-chart.component'; -import { CommandLineComponent } from './component/command-line/command-line.component'; import { BoxContentLoaderComponent } from './component/content-loader/box-content-loader/box-content-loader.component'; import { ContentLoaderComponent } from './component/content-loader/content-loader.component'; -import { ImageContentLoaderComponent } from './component/content-loader/image-content-loader/image-content-loader.component'; -import { TextContentLoaderComponent } from './component/content-loader/text-content-loader/text-content-loader.component'; -import { CounterBordersTopSvgComponent } from './component/design/top-svg/counter-borders-top-svg/counter-borders-top-svg.component'; -import { DefaultTopSvgComponent } from './component/design/top-svg/default-top-svg/default-top-svg.component'; -import { LeafTopSvgComponent } from './component/design/top-svg/leaf-top-svg/leaf-top-svg.component'; -import { SharpTopSvgComponent } from './component/design/top-svg/sharp-top-svg/sharp-top-svg.component'; +import { + ImageContentLoaderComponent +} from './component/content-loader/image-content-loader/image-content-loader.component'; +import { + TextContentLoaderComponent +} from './component/content-loader/text-content-loader/text-content-loader.component'; +import { BottomSvgComponent } from './component/design/bottom-svg/bottom-svg.component'; import { TopSvgComponent } from './component/design/top-svg/top-svg.component'; -import { DropdownMenuComponent } from './component/dropdown-menu/dropdown-menu.component'; import { ExtLinkComponent } from './component/ext-link/ext-link.component'; -import { HeroComponent } from './component/hero/hero.component'; -import { EventDataComponent } from './component/label/deprecated/event-data/event-data.component'; -import { EventHamburgerMenuComponent } from './component/label/deprecated/event-hamburger-menu/event-hamburger-menu.component'; -import { LabelDataComponent } from './component/label/deprecated/label-data/label-data.component'; -import { LabelWithIconDataComponent } from './component/label/deprecated/label-with-icon-data/label-with-icon-data.component'; -import { LedComponent } from './component/led/led.component'; -import { BottomNavComponent } from './component/nav/bottom-nav/bottom-nav.component'; -import { DashboardLayoutSideNavComponent } from './component/nav/dashboard/dashboard-layout-side-nav/dashboard-layout-side-nav.component'; -import { DashboardLayoutTopNavComponent } from './component/nav/dashboard/dashboard-layout-top-nav/dashboard-layout-top-nav.component'; +import { + DashboardLayoutBottomNavComponent +} from './component/nav/dashboard/dashboard-layout-bottom-nav/dashboard-layout-bottom-nav.component'; +import { + DashboardLayoutSideNavComponent +} from './component/nav/dashboard/dashboard-layout-side-nav/dashboard-layout-side-nav.component'; +import { + DashboardLayoutTopNavComponent +} from './component/nav/dashboard/dashboard-layout-top-nav/dashboard-layout-top-nav.component'; import { FooterComponent } from './component/nav/footer/footer.component'; -import { LandingLayoutTopNavComponent } from './component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component'; +import { + LandingLayoutBottomNavComponent +} from './component/nav/landing/landing-layout-bottom-nav/landing-layout-bottom-nav.component'; +import { + LandingLayoutTopNavComponent +} from './component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component'; import { CookiePopupComponent } from './component/popup/cookie-popup/cookie-popup.component'; import { PricePlanComponent } from './component/price-plan/price-plan.component'; import { ProductPresentationComponent } from './component/product-represantation/product-presentation.component'; import { RateBarComponent } from './component/rate-bar/rate-bar.component'; import { SearchComponent } from './component/search/search.component'; +import { SettingsDropdownMenuComponent } from './component/settings-dropdown-menu/settings-dropdown-menu.component'; import { SideContentComponent } from './component/side-content/side-content.component'; -import { BusinessPartnerSwiperComponent } from './component/swiper/business-partner-swiper/business-partner-swiper.component'; +import { + BusinessPartnerSwiperComponent +} from './component/swiper/business-partner-swiper/business-partner-swiper.component'; import { PresentationSwiperComponent } from './component/swiper/presentation-swiper/presentation-swiper.component'; +import { ScreenshotSwiperComponent } from './component/swiper/screenshot-swiper/screenshot-swiper.component'; import { RequestInterceptor } from './interceptor/request/request.interceptor'; import { ResponseInterceptor } from './interceptor/response/response.interceptor'; -import { OthComponent } from './oth/oth.component'; -import { CreateEventPageComponent } from './page/dashboard-layout/create-event-page/create-event-page.component'; import { DashboardLayoutComponent } from './page/dashboard-layout/dashboard-layout.component'; import { DashboardPageComponent } from './page/dashboard-layout/dashboard-page/dashboard-page.component'; -import { EventPageComponent } from './page/dashboard-layout/event-page/event-page.component'; -import { LearnPageComponent } from './page/dashboard-layout/learn-page/learn-page.component'; import { MyProfilePageComponent } from './page/dashboard-layout/my-profile-page/my-profile-page.component'; -import { PublicProfilePageComponent } from './page/dashboard-layout/public-profile-page/public-profile-page.component'; +import { NotificationsPageComponent } from './page/dashboard-layout/notifications-page/notifications-page.component'; +import { PremiumPageComponent } from './page/dashboard-layout/premium-page/premium-page.component'; import { AboutUsPageComponent } from './page/landing-layout/about-us-page/about-us-page.component'; +import { + BlogContentPageComponent +} from './page/landing-layout/blog-page/blog-content-page/blog-content-page.component'; +import { BlogPageComponent } from './page/landing-layout/blog-page/blog-page.component'; import { BrandingPageComponent } from './page/landing-layout/branding-page/branding-page.component'; import { ContactUsPageComponent } from './page/landing-layout/contact-us-page/contact-us-page.component'; -import { ForgetPasswordPageComponent } from './page/landing-layout/form-pages/forget-password-page/forget-password-page.component'; +import { CustomersPageComponent } from './page/landing-layout/customers-page/customers-page.component'; +import { + DocsContentPageComponent +} from './page/landing-layout/docs-page/docs-content-page/docs-content-page.component'; +import { DocsPageComponent } from './page/landing-layout/docs-page/docs-page.component'; +import { + ForgetPasswordPageComponent +} from './page/landing-layout/form-pages/forget-password-page/forget-password-page.component'; import { LoginPageComponent } from './page/landing-layout/form-pages/login-page/login-page.component'; -import { ResetPasswordPageComponent } from './page/landing-layout/form-pages/reset-password-page/reset-password-page.component'; +import { + ResetPasswordPageComponent +} from './page/landing-layout/form-pages/reset-password-page/reset-password-page.component'; import { SignUpPageComponent } from './page/landing-layout/form-pages/sign-up-page/sign-up-page.component'; +import { + TwoFactorAuthenticationPageComponent +} from './page/landing-layout/form-pages/two-factor-authentication-page/two-factor-authentication-page.component'; import { HomePageComponent } from './page/landing-layout/home-page/home-page.component'; import { LandingLayoutComponent } from './page/landing-layout/landing-layout.component'; -import { CookiePolicyPageComponent } from './page/landing-layout/policy-pages/cookie-policy-page/cookie-policy-page.component'; -import { PrivacyPolicyPageComponent } from './page/landing-layout/policy-pages/privacy-policy-page/privacy-policy-page.component'; +import { PartnersPageComponent } from './page/landing-layout/partners-page/partners-page.component'; +import { + CookiePolicyPageComponent +} from './page/landing-layout/policy-pages/cookie-policy-page/cookie-policy-page.component'; +import { + PrivacyPolicyPageComponent +} from './page/landing-layout/policy-pages/privacy-policy-page/privacy-policy-page.component'; import { TermsPageComponent } from './page/landing-layout/policy-pages/terms-page/terms-page.component'; import { PricingPageComponent } from './page/landing-layout/pricing-page/pricing-page.component'; import { ProductPageComponent } from './page/landing-layout/product-page/product-page.component'; -import { MaintenancePageComponent } from './page/landing-layout/raw-content-pages/maintenance-page/maintenance-page.component'; +import { + MaintenancePageComponent +} from './page/landing-layout/raw-content-pages/maintenance-page/maintenance-page.component'; import { NotFoundPageComponent } from './page/landing-layout/raw-content-pages/not-found-page/not-found-page.component'; -import { SignUpSuccessPageComponent } from './page/landing-layout/raw-content-pages/sign-up-success-page/sign-up-success-page.component'; -import { VerifyAccountPageComponent } from './page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component'; +import { + SignUpSuccessPageComponent +} from './page/landing-layout/raw-content-pages/sign-up-success-page/sign-up-success-page.component'; +import { + VerifyAccountPageComponent +} from './page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component'; import { SitemapPageComponent } from './page/landing-layout/sitemap-page/sitemap-page.component'; import { StatusPageComponent } from './page/landing-layout/status-page/status-page.component'; +import { EditProfilePageComponent } from './page/settings-layout/edit-profile-page/edit-profile-page.component'; +import { EditSecurityComponent } from './page/settings-layout/edit-security/edit-security.component'; import { EditThemePageComponent } from './page/settings-layout/edit-theme-page/edit-theme-page.component'; import { SettingsLayoutComponent } from './page/settings-layout/settings-layout.component'; import { CallbackPageComponent } from './page/splash-layout/callback-page/callback-page.component'; -import { ExternalRedirectPageComponent } from './page/splash-layout/external-redirect-page/external-redirect-page.component'; +import { + ExternalRedirectPageComponent +} from './page/splash-layout/external-redirect-page/external-redirect-page.component'; import { SplashLayoutComponent } from './page/splash-layout/splash-layout.component'; -import { CustomersPageComponent } from './page/landing-layout/customers-page/customers-page.component'; -import { AssetCardComponent } from './component/card/asset-card/asset-card.component'; -import { BlogPageComponent } from './page/landing-layout/blog-page/blog-page.component'; -import { BlogCardComponent } from './component/card/blog-card/blog-card.component'; -import { DocsPageComponent } from './page/landing-layout/docs-page/docs-page.component'; -import { DocCardComponent } from './component/card/doc-card/doc-card.component'; -import { PartnersPageComponent } from './page/landing-layout/partners-page/partners-page.component'; -import { BlogHolderCardComponent } from './component/card/blog-holder-card/blog-holder-card.component'; -import { BlogContentPageComponent } from './page/landing-layout/blog-page/blog-content-page/blog-content-page.component'; -import { ScreenshotSwiperComponent } from './component/swiper/screenshot-swiper/screenshot-swiper.component'; -import { TechStackCardComponent } from './component/card/tech-stack-card/tech-stack-card.component'; -import { DocHolderCardComponent } from './component/card/doc-holder-card/doc-holder-cardcomponent'; -import { DocsContentPageComponent } from './page/landing-layout/docs-page/docs-content-page/docs-content-page.component'; -import { StepTimelineCardComponent } from './component/card/timeline-card/step-timeline-card/step-timeline-card.component'; - -FullCalendarModule.registerPlugins( [ - dayGridPlugin, - interactionPlugin -] ); @NgModule( { declarations: [ - OthComponent, + AppComponent, HomePageComponent, LoginPageComponent, DashboardPageComponent, @@ -141,36 +165,27 @@ FullCalendarModule.registerPlugins( [ ForgetPasswordPageComponent, LandingLayoutTopNavComponent, DashboardLayoutSideNavComponent, - BottomNavComponent, + LandingLayoutBottomNavComponent, FooterComponent, SplashLayoutComponent, CallbackPageComponent, - LabelDataComponent, DashboardLayoutTopNavComponent, - LabelWithIconDataComponent, NotFoundPageComponent, - LearnPageComponent, MaintenancePageComponent, CookiePopupComponent, - CreateEventPageComponent, CookiePolicyPageComponent, PrivacyPolicyPageComponent, TermsPageComponent, - PublicProfilePageComponent, - EventDataComponent, SettingsLayoutComponent, SideContentComponent, MyProfilePageComponent, - EventPageComponent, - EventHamburgerMenuComponent, - CalendarComponent, SearchComponent, RateBarComponent, EditThemePageComponent, PricingPageComponent, PricingCardComponent, TestimonialCardComponent, - DropdownMenuComponent, + SettingsDropdownMenuComponent, EditThemePageComponent, ColorChartComponent, ProductPageComponent, @@ -179,39 +194,25 @@ FullCalendarModule.registerPlugins( [ AboutUsPageComponent, PricePlanComponent, ContactUsPageComponent, - AnimatedCodeEditorComponent, - CommandLineComponent, StatusPageComponent, ProductPresentationComponent, - CardComponent, EmployeeCardComponent, ProductPresentationComponent, StatusCardComponent, PolicyCardComponent, TimelineCardComponent, - ButtonComponent, - BrandButtonComponent, - InformationButtonComponent, BrandingPageComponent, PresentationCardComponent, - HeroComponent, - EventButtonComponent, - EventCardComponent, ActivityHistoryCardComponent, ContentLoaderComponent, ImageContentLoaderComponent, TextContentLoaderComponent, BoxContentLoaderComponent, - LedComponent, BusinessPartnerSwiperComponent, PresentationSwiperComponent, SitemapPageComponent, FeatureCardComponent, - SharpTopSvgComponent, - DefaultTopSvgComponent, - CounterBordersTopSvgComponent, TopSvgComponent, - LeafTopSvgComponent, CustomersPageComponent, AssetCardComponent, BlogPageComponent, @@ -226,25 +227,37 @@ FullCalendarModule.registerPlugins( [ DocHolderCardComponent, DocsContentPageComponent, StepTimelineCardComponent, + BottomSvgComponent, + ActivityCardComponent, + ProfileCardComponent, + EditProfilePageComponent, + DashboardLayoutBottomNavComponent, + ContactInformationCardComponent, + EditSecurityComponent, + TwoFactorAuthenticationPageComponent, + AnalyticsEventCardComponent, + PremiumPageComponent, + NotificationsPageComponent, ], imports: [ BrowserModule, AppRoutingModule, ReactiveFormsModule, HttpClientModule, - NgxChartsModule, BrowserAnimationsModule, LayoutModule, ImageCropperModule, - TooltipModule, - DpDatePickerModule, FormsModule, BrowserModule, - FullCalendarModule, SwiperModule, + CardModule, + ButtonModule, + AnimatedCodeEditorModule, + LedModule, + HeroModule, + CountdownModule, ToastrModule.forRoot( { preventDuplicates: true } ), - MarkdownModule.forRoot( { loader: HttpClient }), - GoogleTagManagerModule.forRoot( { id: environment.analytics.googleAnalytics.tag } ), + MarkdownModule.forRoot( { loader: HttpClient } ), ServiceWorkerModule.register( 'ngsw-worker.js', { enabled: [ 'production', 'staging' ].includes( environment.identity ), // Register the ServiceWorker as soon as the app is stable @@ -258,7 +271,7 @@ FullCalendarModule.registerPlugins( [ { provide: HTTP_INTERCEPTORS, useClass: RequestInterceptor, multi: true }, { provide: HTTP_INTERCEPTORS, useClass: ResponseInterceptor, multi: true } ], - bootstrap: [ OthComponent ] + bootstrap: [ AppComponent ] } ) export class AppModule { } diff --git a/src/app/component/animated-code-editor/animated-code-editor.component.html b/src/app/component/animated-code-editor/animated-code-editor.component.html deleted file mode 100644 index 91a133f3..00000000 --- a/src/app/component/animated-code-editor/animated-code-editor.component.html +++ /dev/null @@ -1,10 +0,0 @@ -
-
-

Terminal

-
-
- -
- -
-
diff --git a/src/app/component/animated-code-editor/animated-code-editor.component.scss b/src/app/component/animated-code-editor/animated-code-editor.component.scss deleted file mode 100644 index 6bc26aaf..00000000 --- a/src/app/component/animated-code-editor/animated-code-editor.component.scss +++ /dev/null @@ -1,47 +0,0 @@ -@use '../../../styles/util/util'; - -.code-editor { - @include util.default-border-radius; - @include util.default-shadow; - - background: var(--card-dark-mode); - width: 100%; - height: 400px; - overflow: auto; - text-align: left; - box-sizing: border-box; - - & .header { - background-color: var(--darker-light-mode); - box-shadow: 0 0 3px 2px var(--shadow-dark-mode); - display: flex; - flex-direction: row; - } - - & .content { - @include util.default-padding-line; - font-family: 'JetBrains Mono', monospace; - } - - & .title { - border-radius: 0; - font-size: 12px; - background: var(--theme-color-darker-3); - text-transform: uppercase; - box-sizing: border-box; - width: 100px; - color: var(--darker-contrast); - font-weight: 500; - text-align: center; - height: 25px; - line-height: 25px; - } - - & .arrow { - width: 8px; - border-top: 12px solid transparent; - border-bottom: 12px solid transparent; - border-left: 12px solid var(--theme-color-darker-3); - margin-left: -0.2px; - } -} diff --git a/src/app/component/animated-code-editor/animated-code-editor.component.spec.ts b/src/app/component/animated-code-editor/animated-code-editor.component.spec.ts deleted file mode 100644 index 292aeed2..00000000 --- a/src/app/component/animated-code-editor/animated-code-editor.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { AnimatedCodeEditorComponent } from './animated-code-editor.component'; - -describe( 'AnimatedCodeEditorComponent', () => { - let component: AnimatedCodeEditorComponent; - let fixture: ComponentFixture; - - beforeEach( async () => { - await TestBed.configureTestingModule( { - declarations: [ AnimatedCodeEditorComponent ] - } ) - .compileComponents(); - } ); - - beforeEach( () => { - fixture = TestBed.createComponent( AnimatedCodeEditorComponent ); - component = fixture.componentInstance; - fixture.detectChanges(); - } ); - - it( 'should create', () => { - expect( component ).toBeTruthy(); - } ); -} ); diff --git a/src/app/component/animated-code-editor/animated-code-editor.component.ts b/src/app/component/animated-code-editor/animated-code-editor.component.ts deleted file mode 100644 index 70895937..00000000 --- a/src/app/component/animated-code-editor/animated-code-editor.component.ts +++ /dev/null @@ -1,64 +0,0 @@ -import { - AfterViewInit, - Component, - ComponentFactory, - ComponentFactoryResolver, - Input, - OnChanges, - OnInit, - ViewChild, - ViewContainerRef, -} from '@angular/core'; -import { CommandLine } from 'src/app/model/product/product.model'; -import { CommandLineComponent } from '../command-line/command-line.component'; - -@Component( { - selector: 'app-animated-code-editor', - templateUrl: './animated-code-editor.component.html', - styleUrls: [ './animated-code-editor.component.scss' ], -} ) -export class AnimatedCodeEditorComponent implements OnInit, OnChanges, AfterViewInit { - @ViewChild( 'codeEditorContent', { static: true, read: ViewContainerRef } ) - codeEditorContentRef: ViewContainerRef; - factory: ComponentFactory; - index = 0; - @Input() commandLines: CommandLine[]; - - constructor( private resolver: ComponentFactoryResolver ) { - } - - ngOnInit(): void { - this.initializeComponent(); - } - - initializeComponent = () => { - this.codeEditorContentRef.clear(); - this.index = 0; - this.factory = this.resolver.resolveComponentFactory( CommandLineComponent ); - }; - - ngAfterViewInit(): void { - this.animationTrigger(); - } - - ngOnChanges(): void { - this.initializeComponent(); - this.animationTrigger(); - } - - createComponent = ( commandLine: CommandLine ) => { - if ( this.index < this.commandLines.length ) { - this.index++; - const componentRef = this.codeEditorContentRef.createComponent( - this.factory - ); - componentRef.instance.commandLine = commandLine; - componentRef.instance.animationComplete = this.animationTrigger; - } - }; - - animationTrigger = () => { - console.log( 'Animation triggered with index: ', this.index ); - this.createComponent( this.commandLines[ this.index ] ); - }; -} diff --git a/src/app/component/button/brand-button/brand-button.component.html b/src/app/component/button/brand-button/brand-button.component.html deleted file mode 100644 index 4ad515f2..00000000 --- a/src/app/component/button/brand-button/brand-button.component.html +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/src/app/component/button/brand-button/brand-button.component.spec.ts b/src/app/component/button/brand-button/brand-button.component.spec.ts deleted file mode 100644 index f17ccc02..00000000 --- a/src/app/component/button/brand-button/brand-button.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { BrandButtonComponent } from './brand-button.component'; - -describe( 'BrandButtonComponent', () => { - let component: BrandButtonComponent; - let fixture: ComponentFixture; - - beforeEach( async () => { - await TestBed.configureTestingModule( { - declarations: [ BrandButtonComponent ] - } ) - .compileComponents(); - } ); - - beforeEach( () => { - fixture = TestBed.createComponent( BrandButtonComponent ); - component = fixture.componentInstance; - fixture.detectChanges(); - } ); - - it( 'should create', () => { - expect( component ).toBeTruthy(); - } ); -} ); diff --git a/src/app/component/button/brand-button/brand-button.component.ts b/src/app/component/button/brand-button/brand-button.component.ts deleted file mode 100644 index 0a92ba3c..00000000 --- a/src/app/component/button/brand-button/brand-button.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { Component, Input } from '@angular/core'; - -@Component( { - selector: 'app-brand-button', - templateUrl: './brand-button.component.html', - styleUrls: [ './brand-button.component.scss' ] -} ) -export class BrandButtonComponent { - - @Input() icon: string; - @Input() text: string; - - constructor() { - // Intentionally blank - } -} diff --git a/src/app/component/button/button.component.html b/src/app/component/button/button.component.html deleted file mode 100644 index 429d8520..00000000 --- a/src/app/component/button/button.component.html +++ /dev/null @@ -1,20 +0,0 @@ - diff --git a/src/app/component/button/button.component.scss b/src/app/component/button/button.component.scss deleted file mode 100644 index 7490f745..00000000 --- a/src/app/component/button/button.component.scss +++ /dev/null @@ -1,138 +0,0 @@ -@use '../../../styles/util/util'; -@use '../../../styles/social/social'; -@use '../../../styles/information/information'; - -@mixin default-button { - @include util.flex-layout-row; - @include util.flex-center-center; - @include util.default-border-radius; - - padding: 12px; - - background-color: var(--theme-color); - - width: 100%; - min-width: 150px; -} - -@mixin default-icon { - margin-right: 5px; -} - -@mixin default-content { - color: var(--darker-contrast); - font-weight: 400; -} - -@mixin selected-button-shadow { - box-shadow: 0 0 3px 3px var(--theme-color-lighter-1); -} - -.button { - // Include - @include default-button; - - // Position - position: relative; - - // Design - border: none; - cursor: pointer; - - // Aligning - vertical-align: text-bottom; - - // Font - font-weight: 300; - font-size: 14px; - - & .content { - @include default-content; - - & .icon { - @include default-icon; - } - } - - &:hover { - @include util.default-shadow; - } - - &.information-button { - background-color: var(--info); - } - - &.brand-button { - background-color: var(--social); - - &.just-icon { - min-width: 50px; - } - - & .content { - color: white; - } - } - - &.transparent-button { - background-color: transparent; - } - - // Borders - $border-colors: ( - "theme-color": var(--theme-color), - "lighter-contrast": var(--lighter-contrast) - ); - @each $border-color-name, $border-color in $border-colors { - &.#{$border-color-name}-border-color { - border: 1px solid #{$border-color}; - } - } - - // Font Colors - $font-colors: ( - "theme-color": var(--theme-color), - "lighter-contrast": var(--lighter-contrast), - "whitesmoke": whitesmoke - ); - @each $font-color-name, $font-color in $font-colors { - &.#{$font-color-name}-font-color .content { - color: #{$font-color}; - } - } - - // Background Colors - $background-colors: ( - "theme-color-lighter-4": var(--theme-color-lighter-4) - ); - @each $background-color-name, $background-color in $background-colors { - &.#{$background-color-name}-background-color { - background-color: #{$background-color}; - } - } - - // Shadows - &.selected-button-shadow { - @include selected-button-shadow; - } - - &.no-shadow-box { - box-shadow: initial; - } - - // Cursor - &.cursor-not-allowed { - cursor: not-allowed; - } - - // Dark Light Themes - &.disable-dark-mode { - color: var(--contrast-light-mode); - background-color: var(--color-light-mode); - } - - &.disable-light-mode { - color: var(--contrast-dark-mode); - background-color: var(--color-dark-mode); - } -} diff --git a/src/app/component/button/button.component.ts b/src/app/component/button/button.component.ts deleted file mode 100644 index eb678782..00000000 --- a/src/app/component/button/button.component.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { Component, Input, TemplateRef } from '@angular/core'; - -export const ButtonClasses = { - - roundedBox: 'button-rounded-box', - - transparent: 'transparent-button', - - // Borders - borderAndFontByDefaultTheme: 'border-and-font', - - // Dark Light Mode - disableLightMode: 'disable-light-mode', - disableDarkMode: 'disable-dark-mode' -}; - -@Component( { - selector: 'app-button', - templateUrl: './button.component.html', - styleUrls: [ './button.component.scss' ] -} ) -export class ButtonComponent { - @Input() iconTemplate: TemplateRef; - @Input() textTemplate: TemplateRef; - - @Input() buttonClasses: string[]; - - @Input() icon: string; - @Input() text: string; - - constructor() { - // Intentionally blank - } -} diff --git a/src/app/component/button/event-button/event-button.component.html b/src/app/component/button/event-button/event-button.component.html deleted file mode 100644 index 0981d90b..00000000 --- a/src/app/component/button/event-button/event-button.component.html +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/src/app/component/button/event-button/event-button.component.scss b/src/app/component/button/event-button/event-button.component.scss deleted file mode 100644 index 5e7c0d23..00000000 --- a/src/app/component/button/event-button/event-button.component.scss +++ /dev/null @@ -1 +0,0 @@ -/* Intentionally blank */ diff --git a/src/app/component/button/event-button/event-button.component.ts b/src/app/component/button/event-button/event-button.component.ts deleted file mode 100644 index 3530d241..00000000 --- a/src/app/component/button/event-button/event-button.component.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { Component, Input } from '@angular/core'; - -@Component( { - selector: 'app-event-button', - templateUrl: './event-button.component.html', - styleUrls: [ './event-button.component.scss' ] -} ) -export class EventButtonComponent { - eventTypes = { - drop: 'lighter-contrast-border-color lighter-contrast-font-color transparent-button', - attended: 'whitesmoke-font-color theme-color-lighter-4-background-color no-shadow-box', - completed: 'whitesmoke-font-color theme-color-lighter-4-background-color no-shadow-box cursor-not-allowed', - inProgress: 'whitesmoke-font-color cursor-not-allowed' - }; - - @Input() icon: string; - @Input() text: string; - @Input() eventType: string; - - constructor() { - // Intentionally blank - } -} diff --git a/src/app/component/button/information-button/information-button.component.html b/src/app/component/button/information-button/information-button.component.html deleted file mode 100644 index c10e876e..00000000 --- a/src/app/component/button/information-button/information-button.component.html +++ /dev/null @@ -1,3 +0,0 @@ - - diff --git a/src/app/component/button/information-button/information-button.component.scss b/src/app/component/button/information-button/information-button.component.scss deleted file mode 100644 index 5e7c0d23..00000000 --- a/src/app/component/button/information-button/information-button.component.scss +++ /dev/null @@ -1 +0,0 @@ -/* Intentionally blank */ diff --git a/src/app/component/button/information-button/information-button.component.ts b/src/app/component/button/information-button/information-button.component.ts deleted file mode 100644 index 88ede7e9..00000000 --- a/src/app/component/button/information-button/information-button.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { Component, Input } from '@angular/core'; - -@Component( { - selector: 'app-information-button', - templateUrl: './information-button.component.html', - styleUrls: [ './information-button.component.scss' ] -} ) -export class InformationButtonComponent { - - @Input() informationType: any; - @Input() text: string; - - constructor() { - // Intentionally blank - } -} diff --git a/src/app/component/calendar/calendar.component.html b/src/app/component/calendar/calendar.component.html deleted file mode 100644 index c78954dd..00000000 --- a/src/app/component/calendar/calendar.component.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/app/component/calendar/calendar.component.scss b/src/app/component/calendar/calendar.component.scss deleted file mode 100644 index 3e2738ab..00000000 --- a/src/app/component/calendar/calendar.component.scss +++ /dev/null @@ -1,3 +0,0 @@ -::ng-deep .fc-event { - cursor: pointer; -} diff --git a/src/app/component/calendar/calendar.component.ts b/src/app/component/calendar/calendar.component.ts deleted file mode 100644 index 392490b9..00000000 --- a/src/app/component/calendar/calendar.component.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core'; -import { CalendarOptions } from '@fullcalendar/angular'; - -export interface CalendarEvent { - id: string, - title: string, - backgroundColor: string, - start: string, - end: string -} - -@Component( { - selector: 'app-calendar', - templateUrl: './calendar.component.html', - styleUrls: [ './calendar.component.scss' ] -} ) -export class CalendarComponent implements OnChanges { - @Output() handleEventClick = new EventEmitter(); - @Output() handleDateClick = new EventEmitter(); - - // callback function runs when months are changed by user. - @Output() handleDatesSet = new EventEmitter(); - - @Input() calendarEvents: CalendarEvent[] = []; - - calendarOptions: CalendarOptions; - - ngOnChanges( changes: SimpleChanges ): void { - this.createCalendar(); - } - - public createCalendar() { - this.calendarOptions = { - initialView: 'dayGridMonth', - events: [ ...this.calendarEvents ], - dateClick: ( arg => { - this.handleDateClick.emit( arg ); - } ), - eventClick: ( arg => { - this.handleEventClick.emit( arg ); - } ), - datesSet: ( data => { - this.handleDatesSet.emit( data ); - } ) - }; - } -} diff --git a/src/app/component/card/activity-card/activity-card.component.html b/src/app/component/card/activity-card/activity-card.component.html new file mode 100644 index 00000000..4c59c09b --- /dev/null +++ b/src/app/component/card/activity-card/activity-card.component.html @@ -0,0 +1,21 @@ + + +
+

Recent Activities

+
+ + +
+
+ activity icon +
+

{{ categories[ event.category ] }}

+

{{ timestampToString( event.timestamp ) }}

+
+
+
+ + diff --git a/src/app/component/card/activity-card/activity-card.component.scss b/src/app/component/card/activity-card/activity-card.component.scss new file mode 100644 index 00000000..4ae78fbc --- /dev/null +++ b/src/app/component/card/activity-card/activity-card.component.scss @@ -0,0 +1,63 @@ +@use '../../../../styles/util/util'; + +.activity-card { + font-size: 18px; + + & .header { + text-align: left; + padding: 1em 1em 0; + + & i { + color: var(--theme-color); + } + + & p { + color: var(--lighter); + font-weight: 600; + margin-top: 10px; + padding-bottom: 10px; + border-bottom: 2px solid var(--theme-color-lighter-4); + text-align: center; + } + } + + & .body { + text-align: left; + padding: 0 1em 1em; + height: -webkit-fit-content; + + & .row { + @include util.flex-layout-row; + + padding: 10px 5px; + border-bottom: 2px solid var(--theme-color-lighter-8); + + & img { + width: 40px; + height: 40px; + margin-top: auto; + margin-bottom: auto; + margin-left: 5px; + } + + & .column { + @include util.flex-layout-column; + margin-left: 5px; + + padding: 0 10px; + + p { + color: var(--lighter); + font-weight: 300; + padding-bottom: 5px; + text-overflow: ellipsis; + overflow: auto; + } + + & .date { + font-size: 15px; + } + } + } + } +} diff --git a/src/app/component/button/button.component.spec.ts b/src/app/component/card/activity-card/activity-card.component.spec.ts similarity index 53% rename from src/app/component/button/button.component.spec.ts rename to src/app/component/card/activity-card/activity-card.component.spec.ts index 173fa09a..f4096388 100644 --- a/src/app/component/button/button.component.spec.ts +++ b/src/app/component/card/activity-card/activity-card.component.spec.ts @@ -1,20 +1,20 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ButtonComponent } from './button.component'; +import { ActivityCardComponent } from './activity-card.component'; -describe( 'ButtonComponent', () => { - let component: ButtonComponent; - let fixture: ComponentFixture; +describe( 'ActivityCardComponent', () => { + let component: ActivityCardComponent; + let fixture: ComponentFixture; beforeEach( async () => { await TestBed.configureTestingModule( { - declarations: [ ButtonComponent ] + declarations: [ ActivityCardComponent ] } ) .compileComponents(); } ); beforeEach( () => { - fixture = TestBed.createComponent( ButtonComponent ); + fixture = TestBed.createComponent( ActivityCardComponent ); component = fixture.componentInstance; fixture.detectChanges(); } ); diff --git a/src/app/component/card/activity-card/activity-card.component.ts b/src/app/component/card/activity-card/activity-card.component.ts new file mode 100644 index 00000000..05bac779 --- /dev/null +++ b/src/app/component/card/activity-card/activity-card.component.ts @@ -0,0 +1,15 @@ +import { Component, Input } from '@angular/core'; + +@Component( { + selector: 'app-activity-card', + templateUrl: './activity-card.component.html', + styleUrls: [ './activity-card.component.scss' ] +} ) +export class ActivityCardComponent { + @Input() events: any[] = []; + @Input() categories: any = {}; + + timestampToString( timestamp: any ): string { + return new Date( timestamp ).toLocaleString(); + } +} diff --git a/src/app/component/card/activity-history-card/activity-history-card.component.html b/src/app/component/card/activity-history-card/activity-history-card.component.html index 40ea907a..45fae3a9 100644 --- a/src/app/component/card/activity-history-card/activity-history-card.component.html +++ b/src/app/component/card/activity-history-card/activity-history-card.component.html @@ -1,4 +1,4 @@ - @@ -25,4 +25,4 @@ - + diff --git a/src/app/component/card/activity-history-card/activity-history-card.component.scss b/src/app/component/card/activity-history-card/activity-history-card.component.scss index 6fa50cfc..aae6e5c6 100644 --- a/src/app/component/card/activity-history-card/activity-history-card.component.scss +++ b/src/app/component/card/activity-history-card/activity-history-card.component.scss @@ -1,5 +1,5 @@ @use '../../../../styles/util/util'; -@use '../card.component'; +@use 'node_modules/@open-template-hub/card/styles/card/card'; @use '../../color-chart/color-chart.component'; .activity-history-card { diff --git a/src/app/component/card/activity-history-card/activity-history-card.component.ts b/src/app/component/card/activity-history-card/activity-history-card.component.ts index 229d968a..1c1af2c3 100644 --- a/src/app/component/card/activity-history-card/activity-history-card.component.ts +++ b/src/app/component/card/activity-history-card/activity-history-card.component.ts @@ -34,7 +34,7 @@ export class ActivityHistoryCardComponent implements OnChanges { } - ngOnChanges( changes: SimpleChanges ): void { + ngOnChanges( _changes: SimpleChanges ): void { this.activitySumByDate = new Map(); this.days = new Array( 365 ); diff --git a/src/app/component/card/analytics-event-card/analytics-event-card.component.html b/src/app/component/card/analytics-event-card/analytics-event-card.component.html new file mode 100644 index 00000000..24feb801 --- /dev/null +++ b/src/app/component/card/analytics-event-card/analytics-event-card.component.html @@ -0,0 +1,64 @@ + + +
+
+

Recent Activities

+
+
+
+ + +
+
+ + + + +
+
+
+ + +
+
+ activity icon +
+

{{ mappedCategories[ event.category ] }}

+

{{ timestampToString( event.timestamp ) }}

+
+
+

+ No results found. +

+
+ + +
+
+ {{ events.length + paginationConfig.skip }} / {{ paginationConfig.totalEventCount }} +
+
+ + {{ paginationConfig.currentPageCount }} + +
+
+ + diff --git a/src/app/component/card/analytics-event-card/analytics-event-card.component.scss b/src/app/component/card/analytics-event-card/analytics-event-card.component.scss new file mode 100644 index 00000000..25302d8c --- /dev/null +++ b/src/app/component/card/analytics-event-card/analytics-event-card.component.scss @@ -0,0 +1,219 @@ +@use '../../../../styles/util/util'; + +.analytics-event-card { + + font-size: 18px; + + & .header { + display: flex; + flex-direction: column; + text-align: left; + padding: 1em 1em 0; + + & .upper-header-wrapper { + display: flex; + justify-content: space-between; + align-items: center; + + & i { + color: var(--theme-color); + } + + & h3 { + color: var(--lighter); + font-weight: 600; + font-size: 19px; + margin-top: 10px; + padding-bottom: 10px; + border-bottom: 2px solid var(--theme-color-lighter-4); + text-align: center; + width: 100%; + } + } + + & .filters-wrapper { + padding: 15px; + display: flex; + justify-content: space-around; + height: 50px; + + & .category-filter-wrapper, & .date-filter-wrapper { + @include util.default-border-radius; + @include util.default-shadow; + // border: 1px solid var(--lighter-contrast); + + & i { + color: var(--color); + } + } + + & .category-filter-wrapper { + display: flex; + align-items: center; + padding-left: 25px; + + & select { + border: initial; + -webkit-appearance: borderless-attachment; + -moz-appearance: none; + -o-appearance: none; + appearance: none; + } + + & select::-ms-expand { + display: none; + } + + & i { + padding-right: 7px; + } + } + + & .date-filter-wrapper { + display: flex; + align-items: center; + margin-left: 25px; + padding-left: 25px; + + & p { + white-space: nowrap; + } + + & input { + border-bottom: initial; + } + + } + } + } + + & .body { + @include util.flex-layout-row; + + flex-wrap: wrap; + text-align: left; + padding: 0 2em 1em; + height: -webkit-fit-content; + margin-top: 40px; + + & .row { + @include util.flex-layout-row; + width: 33.333%; + + box-sizing: border-box; + padding: 10px 15px; + border-bottom: 2px solid var(--theme-color-lighter-8); + align-items: center; + + & img { + width: 40px; + height: 40px; + margin-top: auto; + margin-bottom: auto; + } + + & .column { + @include util.flex-layout-column; + margin-left: 5px; + margin-right: auto; + padding: 0 10px; + + p { + color: var(--lighter); + font-weight: 300; + padding-bottom: 5px; + text-overflow: ellipsis; + overflow: auto; + } + + & .date { + font-size: 15px; + } + } + } + + & .empty-body { + margin-left: auto; + margin-right: auto; + color: var(--lighter-contrast); + padding-top: 20px; + padding-bottom: 20px; + } + } + + & .footer { + @include util.flex-layout-row; + + justify-content: space-between; + align-items: center; + + box-sizing: border-box; + + padding: 1em 2.5em 2em; + width: 100%; + margin-left: auto; + color: var(--lighter-contrast); + + & .page-routing-wrapper { + display: flex; + font-size: 20px; + align-items: center; + width: -webkit-fit-content; + + & * { + padding: 5px; + } + + & span { + color: var(--lighter); + } + + & i { + cursor: initial; + color: var(--lighter-contrast); + + &.active-routing-item { + color: var(--theme-color); + cursor: pointer; + } + } + } + } +} + +@media only screen and (max-width: 999px) { + .analytics-event-card { + & .header { + & .filters-wrapper { + flex-direction: column; + height: -webkit-fit-content; + padding: 0; + margin-top: 20px; + + & .category-filter-wrapper { + & select { + white-space: break-spaces; + } + } + + & .date-filter-wrapper { + flex-wrap: wrap; + margin-top: 20px; + margin-left: 0; + + & input { + width: -webkit-fit-content; + } + } + } + } + + & .body { + & .row { + width: 100%; + padding-left: 0; + padding-right: 0; + } + } + } +} diff --git a/src/app/component/label/deprecated/event-hamburger-menu/event-hamburger-menu.component.spec.ts b/src/app/component/card/analytics-event-card/analytics-event-card.component.spec.ts similarity index 51% rename from src/app/component/label/deprecated/event-hamburger-menu/event-hamburger-menu.component.spec.ts rename to src/app/component/card/analytics-event-card/analytics-event-card.component.spec.ts index 88409d57..6c5ec7ea 100644 --- a/src/app/component/label/deprecated/event-hamburger-menu/event-hamburger-menu.component.spec.ts +++ b/src/app/component/card/analytics-event-card/analytics-event-card.component.spec.ts @@ -1,20 +1,20 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { EventHamburgerMenuComponent } from './event-hamburger-menu.component'; +import { AnalyticsEventCardComponent } from './analytics-event-card.component'; -describe( 'EventHamburgerMenuComponent', () => { - let component: EventHamburgerMenuComponent; - let fixture: ComponentFixture; +describe( 'AnalyticsEventCardComponent', () => { + let component: AnalyticsEventCardComponent; + let fixture: ComponentFixture; beforeEach( async () => { await TestBed.configureTestingModule( { - declarations: [ EventHamburgerMenuComponent ] + declarations: [ AnalyticsEventCardComponent ] } ) .compileComponents(); } ); beforeEach( () => { - fixture = TestBed.createComponent( EventHamburgerMenuComponent ); + fixture = TestBed.createComponent( AnalyticsEventCardComponent ); component = fixture.componentInstance; fixture.detectChanges(); } ); diff --git a/src/app/component/card/analytics-event-card/analytics-event-card.component.ts b/src/app/component/card/analytics-event-card/analytics-event-card.component.ts new file mode 100644 index 00000000..91eb56c1 --- /dev/null +++ b/src/app/component/card/analytics-event-card/analytics-event-card.component.ts @@ -0,0 +1,138 @@ +import { Component, OnInit } from '@angular/core'; +import { AnalyticsService } from 'src/app/service/analytics/analytics.service'; + +@Component( { + selector: 'app-analytics-event-card', + templateUrl: './analytics-event-card.component.html', + styleUrls: [ './analytics-event-card.component.scss' ] +} ) +export class AnalyticsEventCardComponent implements OnInit { + + paginationConfig = { + skip: 0, + totalEventCount: undefined, + currentPageCount: 1, + limit: this.analyticsService.configs.editSecurityLimit, + shouldShowNavigationBars: false, + hasNextPage: false, + hasPreviousPage: false + }; + + selectedCategory: any; + selectedStartDate: Date; + selectedEndDate: Date; + + categories: []; + mappedCategories: any; + + currentDate = new Date(); + + events: any[]; + + constructor( + // private scrollService: InfiniteScrollingService, + private analyticsService: AnalyticsService + ) { + const startDate = new Date(); + startDate.setDate( startDate.getDate() - 7 ); + + this.selectedStartDate = startDate; + this.selectedEndDate = new Date(); + } + + ngOnInit(): void { + + this.analyticsService.getCategories().subscribe( response => { + this.categories = response; + this.mappedCategories = this.analyticsService.convertCategoriesToMappedObject( response ); + + if ( response?.length > 0 ) { + this.selectedCategory = response[ 0 ]; + } + + this.fetchAnalyticsEvent( this.paginationConfig.skip, this.paginationConfig.limit, () => { + // Intentionally blank + } ); + } ); + } + + fetchAnalyticsEvent( skip: number, limit: number, callback: ( _: void ) => void ) { + this.analyticsService.getEvents( + this.selectedCategory.key, + this.selectedStartDate?.getTime(), + this.selectedEndDate?.getTime(), + skip, + limit + ).subscribe( response => { + this.paginationConfig.totalEventCount = response.meta.count; + if ( response.meta.limit ) { + this.paginationConfig.limit = response.meta.limit; + } else { + this.paginationConfig.limit = this.analyticsService.configs.editSecurityLimit; + } + + this.paginationConfig.skip = skip; + this.setShouldShowNextAndPrevious(); + + this.events = response.data; + callback(); + } ); + } + + timestampToString( timestamp: any ): string { + return new Date( timestamp ).toLocaleString(); + } + + goToNextPage() { + if ( !this.paginationConfig.hasNextPage ) { + return; + } + + this.fetchAnalyticsEvent( this.paginationConfig.skip + this.paginationConfig.limit, this.paginationConfig.limit, () => { + this.paginationConfig.currentPageCount += 1; + } ); + } + + goToPreviousPage() { + if ( !this.paginationConfig.hasPreviousPage ) { + return; + } + + this.fetchAnalyticsEvent( this.paginationConfig.skip - this.paginationConfig.limit, this.paginationConfig.limit, () => { + this.paginationConfig.currentPageCount -= 1; + } ); + } + + setShouldShowNextAndPrevious(): void { + this.paginationConfig.hasNextPage = this.paginationConfig.skip + this.paginationConfig.limit < this.paginationConfig.totalEventCount; + this.paginationConfig.hasPreviousPage = this.paginationConfig.skip - this.paginationConfig.limit >= 0; + + this.paginationConfig.shouldShowNavigationBars = this.paginationConfig.hasNextPage || this.paginationConfig.hasPreviousPage; + } + + changeCategory( event: any ): void { + const selectedIndex = event.srcElement.selectedIndex; + this.selectedCategory = this.categories[ selectedIndex ]; + this.fetchAnalyticsEvent( 0, this.paginationConfig.limit, () => { + this.paginationConfig.currentPageCount = 1; + } ); + } + + changeStartDate( event: any ): void { + const selectedDate = event.srcElement.valueAsDate; + console.log( 'startDate: ', selectedDate ); + this.selectedStartDate = selectedDate; + this.fetchAnalyticsEvent( 0, this.paginationConfig.limit, () => { + this.paginationConfig.currentPageCount = 1; + } ); + } + + changeEndDate( event: any ): void { + const selectedDate = event.srcElement.valueAsDate; + console.log( 'endDate: ', selectedDate ); + this.selectedEndDate = selectedDate; + this.fetchAnalyticsEvent( 0, this.paginationConfig.limit, () => { + this.paginationConfig.currentPageCount = 1; + } ); + } +} diff --git a/src/app/component/card/asset-card/asset-card.component.html b/src/app/component/card/asset-card/asset-card.component.html index 600aa55b..5260390f 100644 --- a/src/app/component/card/asset-card/asset-card.component.html +++ b/src/app/component/card/asset-card/asset-card.component.html @@ -1,4 +1,4 @@ - @@ -16,5 +16,4 @@

{{ footerText }}

 - - + diff --git a/src/app/component/card/asset-card/asset-card.component.scss b/src/app/component/card/asset-card/asset-card.component.scss index 13927279..a7a9a6a5 100644 --- a/src/app/component/card/asset-card/asset-card.component.scss +++ b/src/app/component/card/asset-card/asset-card.component.scss @@ -1,5 +1,5 @@ @use '../../../../styles/util/util'; -@use '../card.component'; +@use 'node_modules/@open-template-hub/card/styles/card/card'; .asset-card { diff --git a/src/app/component/card/asset-card/asset-card.component.spec.ts b/src/app/component/card/asset-card/asset-card.component.spec.ts index 1132b069..71c9f4dc 100644 --- a/src/app/component/card/asset-card/asset-card.component.spec.ts +++ b/src/app/component/card/asset-card/asset-card.component.spec.ts @@ -2,24 +2,24 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AssetCardComponent } from './asset-card.component'; -describe('AssetCardComponent', () => { +describe( 'AssetCardComponent', () => { let component: AssetCardComponent; let fixture: ComponentFixture; - beforeEach(async () => { - await TestBed.configureTestingModule({ + beforeEach( async () => { + await TestBed.configureTestingModule( { declarations: [ AssetCardComponent ] - }) + } ) .compileComponents(); - }); + } ); - beforeEach(() => { - fixture = TestBed.createComponent(AssetCardComponent); + beforeEach( () => { + fixture = TestBed.createComponent( AssetCardComponent ); component = fixture.componentInstance; fixture.detectChanges(); - }); + } ); - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); + it( 'should create', () => { + expect( component ).toBeTruthy(); + } ); +} ); diff --git a/src/app/component/card/blog-card/blog-card.component.html b/src/app/component/card/blog-card/blog-card.component.html index 72aaf56e..b9ecae17 100644 --- a/src/app/component/card/blog-card/blog-card.component.html +++ b/src/app/component/card/blog-card/blog-card.component.html @@ -1,4 +1,4 @@ - @@ -16,7 +16,7 @@
- +

{{ date }}

 @@ -25,7 +25,7 @@
- Open Template Hub © 2021 + {{ BRAND.name }} © 2023
- + diff --git a/src/app/component/card/blog-card/blog-card.component.scss b/src/app/component/card/blog-card/blog-card.component.scss index 34da666e..ea4b5b5e 100644 --- a/src/app/component/card/blog-card/blog-card.component.scss +++ b/src/app/component/card/blog-card/blog-card.component.scss @@ -1,5 +1,5 @@ @use '../../../../styles/util/util'; -@use '../../card/card.component'; +@use 'node_modules/@open-template-hub/card/styles/card/card'; .blog-card { diff --git a/src/app/component/card/blog-card/blog-card.component.spec.ts b/src/app/component/card/blog-card/blog-card.component.spec.ts index 700da4b5..54af70c5 100644 --- a/src/app/component/card/blog-card/blog-card.component.spec.ts +++ b/src/app/component/card/blog-card/blog-card.component.spec.ts @@ -2,24 +2,24 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { BlogCardComponent } from './blog-card.component'; -describe('BlogCardComponent', () => { +describe( 'BlogCardComponent', () => { let component: BlogCardComponent; let fixture: ComponentFixture; - beforeEach(async () => { - await TestBed.configureTestingModule({ + beforeEach( async () => { + await TestBed.configureTestingModule( { declarations: [ BlogCardComponent ] - }) + } ) .compileComponents(); - }); + } ); - beforeEach(() => { - fixture = TestBed.createComponent(BlogCardComponent); + beforeEach( () => { + fixture = TestBed.createComponent( BlogCardComponent ); component = fixture.componentInstance; fixture.detectChanges(); - }); + } ); - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); + it( 'should create', () => { + expect( component ).toBeTruthy(); + } ); +} ); diff --git a/src/app/component/card/blog-holder-card/blog-holder-card.component.html b/src/app/component/card/blog-holder-card/blog-holder-card.component.html index fbb2ce03..6dc34a86 100644 --- a/src/app/component/card/blog-holder-card/blog-holder-card.component.html +++ b/src/app/component/card/blog-holder-card/blog-holder-card.component.html @@ -1,9 +1,9 @@ -
- author + author

{{ blog.title }}

 @@ -19,10 +19,10 @@
-

Read more

+

Read more

{{ blog.date }}

 - + diff --git a/src/app/component/card/blog-holder-card/blog-holder-card.component.scss b/src/app/component/card/blog-holder-card/blog-holder-card.component.scss index b1632300..cb80a18e 100644 --- a/src/app/component/card/blog-holder-card/blog-holder-card.component.scss +++ b/src/app/component/card/blog-holder-card/blog-holder-card.component.scss @@ -1,5 +1,5 @@ @use '../../../../styles/util/util'; -@use '../../card/card.component'; +@use 'node_modules/@open-template-hub/card/styles/card/card'; .blog-holder-card { & .header { @@ -20,10 +20,8 @@ & img { @include util.default-border-radius-image; - // Color background-color: var(--card); - // Design border: 2px solid var(--shadow-lighter); box-shadow: 0 -6px 15px -7px var(--shadow); } diff --git a/src/app/component/card/blog-holder-card/blog-holder-card.component.spec.ts b/src/app/component/card/blog-holder-card/blog-holder-card.component.spec.ts index acdfbc15..3fc391e3 100644 --- a/src/app/component/card/blog-holder-card/blog-holder-card.component.spec.ts +++ b/src/app/component/card/blog-holder-card/blog-holder-card.component.spec.ts @@ -2,24 +2,24 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { BlogHolderCardComponent } from './blog-holder-card.component'; -describe('BlogHolderCardComponent', () => { +describe( 'BlogHolderCardComponent', () => { let component: BlogHolderCardComponent; let fixture: ComponentFixture; - beforeEach(async () => { - await TestBed.configureTestingModule({ + beforeEach( async () => { + await TestBed.configureTestingModule( { declarations: [ BlogHolderCardComponent ] - }) + } ) .compileComponents(); - }); + } ); - beforeEach(() => { - fixture = TestBed.createComponent(BlogHolderCardComponent); + beforeEach( () => { + fixture = TestBed.createComponent( BlogHolderCardComponent ); component = fixture.componentInstance; fixture.detectChanges(); - }); + } ); - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); + it( 'should create', () => { + expect( component ).toBeTruthy(); + } ); +} ); diff --git a/src/app/component/card/blog-holder-card/blog-holder-card.component.ts b/src/app/component/card/blog-holder-card/blog-holder-card.component.ts index b5c7b84a..b71effda 100644 --- a/src/app/component/card/blog-holder-card/blog-holder-card.component.ts +++ b/src/app/component/card/blog-holder-card/blog-holder-card.component.ts @@ -1,11 +1,11 @@ import { Component, Input } from '@angular/core'; import { Blog } from 'src/app/model/blog/blog.model'; -@Component({ +@Component( { selector: 'app-blog-holder-card', templateUrl: './blog-holder-card.component.html', - styleUrls: ['./blog-holder-card.component.scss'], -}) + styleUrls: [ './blog-holder-card.component.scss' ], +} ) export class BlogHolderCardComponent { @Input() blog: Blog = { title: '', diff --git a/src/app/component/card/card.component.html b/src/app/component/card/card.component.html deleted file mode 100644 index 27034de8..00000000 --- a/src/app/component/card/card.component.html +++ /dev/null @@ -1,39 +0,0 @@ -
- - - - - - - - -
- {{ header }} -
- - - - - - -
- {{ body }} -
- - - - - - -
- {{ footer }} -
- - - - - - -
- -
diff --git a/src/app/component/card/card.component.scss b/src/app/component/card/card.component.scss deleted file mode 100644 index 00b74e9f..00000000 --- a/src/app/component/card/card.component.scss +++ /dev/null @@ -1,184 +0,0 @@ -@use '../../../styles/util/util'; -@use '../../../styles/ribbon/ribbon'; - -@mixin card-header-width-sm { - max-width: 92%; - min-width: 92%; - width: 92%; -} - -@mixin default-card { - @include util.default-shadow; - - box-sizing: border-box; - background-color: var(--card); -} - -@mixin default-header { - // Include - @include util.flex-center-center; - @include util.flex-layout-column; - @include util.margin-x-auto; - @include util.default-shadow; - @include util.default-border-radius; - - box-sizing: border-box; - - // Position - z-index: 10; - - // Design - overflow: hidden; - width: 100%; - padding: 15px 0; -} - -@mixin default-body { - // Include - @include util.flex-center-center; - @include util.flex-layout-column; - @include util.margin-x-auto; - - // Design - box-sizing: border-box; - min-height: 180px; -} - -@mixin default-footer { - @include util.flex-center-center; - @include util.flex-layout-column; - @include util.margin-x-auto; - - // Design - box-sizing: border-box; - width: 100%; - min-height: 70px; - border-top: { - width: 2px; - style: solid; - } -} - -@mixin default-footer-border-color { - border-color: var(--darker-contrast); -} - -@mixin default-bottom-wrapper { - @include util.default-border-radius; - @include util.default-height-bottom-line; - - // Position - position: absolute; - z-index: 9; - bottom: 0; - right: 0; - - // Color - background-color: var(--darker-contrast); - - // Design - overflow: hidden; - width: 100%; -} - -.card { - // Include - @include util.flex-layout-column; - @include default-card; - @include util.default-border-radius; - - // Position - position: relative; - - // Color - color: var(--contrast); - - & .header { - @include default-header; - } - - & .body { - @include default-body; - } - - & .footer { - @include default-footer; - @include default-footer-border-color; - } - - & .bottom-wrapper { - @include default-bottom-wrapper; - } - - &.transparent-card { - background-color: transparent; - box-shadow: initial; - } -} - -.cards-wrapper, .flexible-cards-wrapper { - @include util.flex-center-center; - @include util.margin-x-auto; - - padding-bottom: 120px; - box-sizing: border-box; - text-align: center; - - & > * { - margin-top: 80px; - } -} - -.cards-wrapper { - width: 100%; -} - -@media only screen and (max-width: 999px) { - - .cards-wrapper, .flexible-cards-wrapper { - @include util.flex-layout-column; - - padding: 50px 0; - - font-size: 18px; - - & > * { - width: 94vw; - - &:first-child { - margin-top: 0; - } - } - } -} - -@media only screen and (min-width: 1000px) { - .cards-wrapper, .flexible-cards-wrapper { - @include util.flex-layout-row; - - flex-wrap: wrap; - font-size: 18px; - padding-top: 20px; - - & > * { - width: 300px; - - margin: { - left: 15px; - right: 15px; - } - } - } - - .cards-wrapper { - width: 1000px; - } - - .flexible-cards-wrapper { - @include util.flex-layout-row; - - justify-content: center; - - width: 85vw; - } -} diff --git a/src/app/component/card/card.component.ts b/src/app/component/card/card.component.ts deleted file mode 100644 index 9d618108..00000000 --- a/src/app/component/card/card.component.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { Component, Input, TemplateRef } from '@angular/core'; -import { Ribbon } from '../../model/ribbon/ribbon.model'; - -@Component( { - selector: 'app-card', - templateUrl: './card.component.html', - styleUrls: [ './card.component.scss' ] -} ) -export class CardComponent { - @Input() headerTemplate: TemplateRef; - @Input() bodyTemplate: TemplateRef; - @Input() footerTemplate: TemplateRef; - @Input() bottomWrapperTemplate: TemplateRef; - - @Input() cardClass: string; - - @Input() header: string; - @Input() body: string; - @Input() footer: string; - - @Input() ribbon: Ribbon; - - constructor() { - // Intentionally blank - } -} diff --git a/src/app/component/card/contact-information-card/contact-information-card.component.html b/src/app/component/card/contact-information-card/contact-information-card.component.html new file mode 100644 index 00000000..eb98b35b --- /dev/null +++ b/src/app/component/card/contact-information-card/contact-information-card.component.html @@ -0,0 +1,40 @@ + + + +
+
+

+ {{ + CONTACT_INFO.phone + }} +
+
+

+ {{ + CONTACT_INFO.email + }} +
+
+

+ +

+ {{ CONTACT_INFO.address }} +
+
+ +
+
+ + diff --git a/src/app/component/card/contact-information-card/contact-information-card.component.scss b/src/app/component/card/contact-information-card/contact-information-card.component.scss new file mode 100644 index 00000000..899e6ec6 --- /dev/null +++ b/src/app/component/card/contact-information-card/contact-information-card.component.scss @@ -0,0 +1,55 @@ +@use '../../../../styles/util/util'; +@use 'node_modules/@open-template-hub/card/styles/card/card'; + +.contact-information-card { + & .body { + @include util.default-padding-line; + @include card.default-body; + + text-align: center; + width: 100%; + + & .info-line { + @include util.flex-layout-row; + align-self: flex-start; + margin-top: 10px; + + & .title { + font-weight: 500; + text-align: right; + min-width: 20px; + } + + & .info { + text-align: left; + } + } + + & p { + color: var(--color); + font-size: 18px; + margin-left: 15px; + + & i { + color: var(--theme-color); + size: 16px; + } + } + + & a { + font-size: 18px; + margin-left: 15px; + color: var(--theme-color); + } + + & .map { + margin-top: 20px; + width: 90%; + + & iframe { + @include util.default-border-radius; + @include util.default-shadow; + } + } + } +} diff --git a/src/app/component/card/contact-information-card/contact-information-card.component.spec.ts b/src/app/component/card/contact-information-card/contact-information-card.component.spec.ts new file mode 100644 index 00000000..5c343a92 --- /dev/null +++ b/src/app/component/card/contact-information-card/contact-information-card.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ContactInformationCardComponent } from './contact-information-card.component'; + +describe( 'ContactInformationCardComponent', () => { + let component: ContactInformationCardComponent; + let fixture: ComponentFixture; + + beforeEach( async () => { + await TestBed.configureTestingModule( { + declarations: [ ContactInformationCardComponent ] + } ) + .compileComponents(); + } ); + + beforeEach( () => { + fixture = TestBed.createComponent( ContactInformationCardComponent ); + component = fixture.componentInstance; + fixture.detectChanges(); + } ); + + it( 'should create', () => { + expect( component ).toBeTruthy(); + } ); +} ); diff --git a/src/app/component/card/contact-information-card/contact-information-card.component.ts b/src/app/component/card/contact-information-card/contact-information-card.component.ts new file mode 100644 index 00000000..1bda8102 --- /dev/null +++ b/src/app/component/card/contact-information-card/contact-information-card.component.ts @@ -0,0 +1,15 @@ +import { Component } from '@angular/core'; +import { CONTACT_INFO } from 'src/app/data/contact-info/contact-info.data'; + +@Component( { + selector: 'app-contact-information-card', + templateUrl: './contact-information-card.component.html', + styleUrls: [ './contact-information-card.component.scss' ] +} ) +export class ContactInformationCardComponent { + CONTACT_INFO = CONTACT_INFO; + + constructor() { + // Intentionally blank + } +} diff --git a/src/app/component/card/doc-card/doc-card.component.html b/src/app/component/card/doc-card/doc-card.component.html index d4b05808..1ccc7f9d 100644 --- a/src/app/component/card/doc-card/doc-card.component.html +++ b/src/app/component/card/doc-card/doc-card.component.html @@ -1,4 +1,4 @@ - @@ -16,7 +16,7 @@
- +

{{ date }}

 @@ -25,7 +25,7 @@
- Open Template Hub © 2021 + {{ BRAND.name }} © 2023
- + diff --git a/src/app/component/card/doc-card/doc-card.component.scss b/src/app/component/card/doc-card/doc-card.component.scss index 7e2fd61e..20826739 100644 --- a/src/app/component/card/doc-card/doc-card.component.scss +++ b/src/app/component/card/doc-card/doc-card.component.scss @@ -1,5 +1,5 @@ @use '../../../../styles/util/util'; -@use '../../card/card.component'; +@use 'node_modules/@open-template-hub/card/styles/card/card'; .doc-card { diff --git a/src/app/component/card/doc-card/doc-card.component.spec.ts b/src/app/component/card/doc-card/doc-card.component.spec.ts index bb4cf7c8..fd766dce 100644 --- a/src/app/component/card/doc-card/doc-card.component.spec.ts +++ b/src/app/component/card/doc-card/doc-card.component.spec.ts @@ -2,24 +2,24 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { DocCardComponent } from './doc-card.component'; -describe('DocCardComponent', () => { +describe( 'DocCardComponent', () => { let component: DocCardComponent; let fixture: ComponentFixture; - beforeEach(async () => { - await TestBed.configureTestingModule({ + beforeEach( async () => { + await TestBed.configureTestingModule( { declarations: [ DocCardComponent ] - }) + } ) .compileComponents(); - }); + } ); - beforeEach(() => { - fixture = TestBed.createComponent(DocCardComponent); + beforeEach( () => { + fixture = TestBed.createComponent( DocCardComponent ); component = fixture.componentInstance; fixture.detectChanges(); - }); + } ); - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); + it( 'should create', () => { + expect( component ).toBeTruthy(); + } ); +} ); diff --git a/src/app/component/card/doc-holder-card/doc-holder-card.component.html b/src/app/component/card/doc-holder-card/doc-holder-card.component.html index d5d27277..fe5ce5ea 100644 --- a/src/app/component/card/doc-holder-card/doc-holder-card.component.html +++ b/src/app/component/card/doc-holder-card/doc-holder-card.component.html @@ -1,9 +1,9 @@ -
- doc + doc

{{ doc.title }}

 @@ -19,10 +19,10 @@
-

Read more

+

Read more

{{ doc.date }}

 - + diff --git a/src/app/component/card/doc-holder-card/doc-holder-card.component.scss b/src/app/component/card/doc-holder-card/doc-holder-card.component.scss index 3d52f66f..68bd1291 100644 --- a/src/app/component/card/doc-holder-card/doc-holder-card.component.scss +++ b/src/app/component/card/doc-holder-card/doc-holder-card.component.scss @@ -1,5 +1,5 @@ @use '../../../../styles/util/util'; -@use '../../card/card.component'; +@use 'node_modules/@open-template-hub/card/styles/card/card'; .doc-holder-card { & .header { @@ -20,10 +20,8 @@ & img { @include util.default-border-radius-image; - // Color background-color: var(--card); - // Design border: 2px solid var(--shadow-lighter); box-shadow: 0 -6px 15px -7px var(--shadow); } diff --git a/src/app/component/card/doc-holder-card/doc-holder-card.component.spec.ts b/src/app/component/card/doc-holder-card/doc-holder-card.component.spec.ts index ac8dc08f..c6424acc 100644 --- a/src/app/component/card/doc-holder-card/doc-holder-card.component.spec.ts +++ b/src/app/component/card/doc-holder-card/doc-holder-card.component.spec.ts @@ -2,24 +2,24 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { DocHolderCardComponent } from './doc-holder-cardcomponent'; -describe('DocCardHolderComponent', () => { +describe( 'DocCardHolderComponent', () => { let component: DocHolderCardComponent; let fixture: ComponentFixture; - beforeEach(async () => { - await TestBed.configureTestingModule({ + beforeEach( async () => { + await TestBed.configureTestingModule( { declarations: [ DocHolderCardComponent ] - }) + } ) .compileComponents(); - }); + } ); - beforeEach(() => { - fixture = TestBed.createComponent(DocHolderCardComponent); + beforeEach( () => { + fixture = TestBed.createComponent( DocHolderCardComponent ); component = fixture.componentInstance; fixture.detectChanges(); - }); + } ); - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); + it( 'should create', () => { + expect( component ).toBeTruthy(); + } ); +} ); diff --git a/src/app/component/card/doc-holder-card/doc-holder-cardcomponent.ts b/src/app/component/card/doc-holder-card/doc-holder-cardcomponent.ts index f828ff33..d4b95c88 100644 --- a/src/app/component/card/doc-holder-card/doc-holder-cardcomponent.ts +++ b/src/app/component/card/doc-holder-card/doc-holder-cardcomponent.ts @@ -1,11 +1,11 @@ import { Component, Input } from '@angular/core'; import { Doc } from 'src/app/model/doc/doc.model'; -@Component({ +@Component( { selector: 'app-doc-holder-card', templateUrl: './doc-holder-card.component.html', - styleUrls: ['./doc-holder-card.component.scss'], -}) + styleUrls: [ './doc-holder-card.component.scss' ], +} ) export class DocHolderCardComponent { @Input() doc: Doc = { title: '', diff --git a/src/app/component/card/employee-card/employee-card.component.html b/src/app/component/card/employee-card/employee-card.component.html index 25d7cf9e..c6c3fed5 100644 --- a/src/app/component/card/employee-card/employee-card.component.html +++ b/src/app/component/card/employee-card/employee-card.component.html @@ -1,4 +1,4 @@ - @@ -50,4 +50,4 @@ - + diff --git a/src/app/component/card/employee-card/employee-card.component.scss b/src/app/component/card/employee-card/employee-card.component.scss index e9c71c25..5ab843ba 100644 --- a/src/app/component/card/employee-card/employee-card.component.scss +++ b/src/app/component/card/employee-card/employee-card.component.scss @@ -1,27 +1,11 @@ @use '../../../../styles/util/util'; -@use '../../card/card.component'; +@use 'node_modules/@open-template-hub/card/styles/card/card'; .employee-card { & .header { - // Design margin-top: -50px; text-align: center; align-self: center; - - & .profile-image { - @include util.margin-x-auto; - @include util.default-border-radius-image; - - // Color - background-color: var(--card); - - // Design - border: 2px solid var(--shadow-lighter); - box-shadow: 0 -6px 15px -7px var(--shadow); - width: 120px; - height: 120px; - padding: 5px; - } } & .body { @@ -29,12 +13,10 @@ justify-content: flex-start; - // Design min-height: 265px; padding: 10px 20px 20px; & .name { - // Design font: { size: 21px; weight: 500; @@ -42,18 +24,14 @@ } & .title { - // Color color: var(--lighter-contrast); - // Design font-size: 18px; } & .bio { - // Color color: var(--lighter); - // Design font-size: 17px; margin-top: 10px; text-overflow: ellipsis; @@ -67,15 +45,12 @@ @include util.flex-layout-row; & i { - // Color color: var(--theme-color-lighter-6); - // Design margin: 0 3px; font-size: 27px; &:hover { - // Color color: var(--theme-color); } } diff --git a/src/app/component/card/event-card/event-card.component.html b/src/app/component/card/event-card/event-card.component.html deleted file mode 100644 index bce4c6e9..00000000 --- a/src/app/component/card/event-card/event-card.component.html +++ /dev/null @@ -1,1650 +0,0 @@ - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - diff --git a/src/app/component/card/event-card/event-card.component.scss b/src/app/component/card/event-card/event-card.component.scss deleted file mode 100644 index c3eabb2d..00000000 --- a/src/app/component/card/event-card/event-card.component.scss +++ /dev/null @@ -1,43 +0,0 @@ -.event-card { - & .header { - filter: opacity(70%); - cursor: pointer; - - &:hover { - filter: opacity(100%); - } - - &.no-hover:hover { - transform: initial; - transition: initial; - filter: initial; - } - } - - &:hover { - transform: scale(1.03); - transition: transform .5s; - } - - &.no-hover:hover { - transform: initial; - transition: initial; - filter: initial; - } -} - -@media only screen and (max-width: 999px) { - .event-card { - & .header { - width: 75%; - } - } -} - -@media only screen and (min-width: 1000px) { - .event-card { - & .header { - width: 90%; - } - } -} diff --git a/src/app/component/card/event-card/event-card.component.spec.ts b/src/app/component/card/event-card/event-card.component.spec.ts deleted file mode 100644 index f46eef50..00000000 --- a/src/app/component/card/event-card/event-card.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { EventCardComponent } from './event-card.component'; - -describe( 'NewEventCardComponent', () => { - let component: EventCardComponent; - let fixture: ComponentFixture; - - beforeEach( async () => { - await TestBed.configureTestingModule( { - declarations: [ EventCardComponent ] - } ) - .compileComponents(); - } ); - - beforeEach( () => { - fixture = TestBed.createComponent( EventCardComponent ); - component = fixture.componentInstance; - fixture.detectChanges(); - } ); - - it( 'should create', () => { - expect( component ).toBeTruthy(); - } ); -} ); diff --git a/src/app/component/card/event-card/event-card.component.ts b/src/app/component/card/event-card/event-card.component.ts deleted file mode 100644 index 14900739..00000000 --- a/src/app/component/card/event-card/event-card.component.ts +++ /dev/null @@ -1,60 +0,0 @@ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { Router } from '@angular/router'; -import { DEFAULT_RIBBON, EVENT_RIBBONS } from 'src/app/data/ribbon/ribbon.data'; -import { URLS } from '../../../data/navigation/navigation.data'; -import { BusinessLogicService } from '../../../service/business-logic/business-logic.service'; - -@Component( { - selector: 'app-event-card', - templateUrl: './event-card.component.html', - styleUrls: [ './event-card.component.scss' ] -} ) -export class EventCardComponent implements OnInit { - DEFAULT_RIBBON = DEFAULT_RIBBON; - EVENT_RIBBONS = EVENT_RIBBONS; - - username: string; - - @Input() event: any; - @Input() isPublicPage = false; - @Input() isEditable = false; - @Input() fillLayout = false; - @Input() maxHeight = false; - @Input() addMarginToDescription = false; - @Input() profileImg; - @Input() centeredTitle = false; - @Input() showCalendar = true; - @Input() markAsCompleted = false; - @Input() inProgress = false; - @Input() showHamburgerMenu = true; - @Input() showRateBar = false; - @Input() completed = false; - - @Output() itemIdForFillingForm = new EventEmitter(); - @Output() markAsCompletedButtonClicked = new EventEmitter(); - @Output() rateButtonClicked = new EventEmitter(); - - constructor( - private router: Router, - private businessLogicService: BusinessLogicService - ) { - } - - ngOnInit(): void { - this.businessLogicService.userInfo.subscribe( userInfo => { - this.username = userInfo?.username; - } ); - } - - routeToEvent() { - this.router.navigate( [ URLS.dashboard.event ], { queryParams: { event_id: this.event._id } } ); - } - - emitIdForFillingForm( event ): void { - this.itemIdForFillingForm.emit( event ); - } - - emitIdForCompletedButton( event ): void { - this.markAsCompletedButtonClicked.emit( event ); - } -} diff --git a/src/app/component/card/feature-card/feature-card.component.html b/src/app/component/card/feature-card/feature-card.component.html index d1dafbb5..810aa82f 100644 --- a/src/app/component/card/feature-card/feature-card.component.html +++ b/src/app/component/card/feature-card/feature-card.component.html @@ -1,4 +1,4 @@ -{{ feature.description }}

- + diff --git a/src/app/component/card/policy-card/policy-card.component.html b/src/app/component/card/policy-card/policy-card.component.html index 7d0e3dc9..8b36ab5f 100644 --- a/src/app/component/card/policy-card/policy-card.component.html +++ b/src/app/component/card/policy-card/policy-card.component.html @@ -1,4 +1,4 @@ - @@ -30,7 +30,7 @@
- Open Template Hub © 2021 + {{ BRAND.name }} © 2023
- + diff --git a/src/app/component/card/policy-card/policy-card.component.scss b/src/app/component/card/policy-card/policy-card.component.scss index 71724952..610070f3 100644 --- a/src/app/component/card/policy-card/policy-card.component.scss +++ b/src/app/component/card/policy-card/policy-card.component.scss @@ -1,5 +1,5 @@ @use '../../../../styles/util/util'; -@use '../../card/card.component'; +@use 'node_modules/@open-template-hub/card/styles/card/card'; .policy-content a { color: var(--theme-color); diff --git a/src/app/component/card/presentation-card/presentation-card.component.html b/src/app/component/card/presentation-card/presentation-card.component.html index 4ced1d5d..0bfeeda7 100644 --- a/src/app/component/card/presentation-card/presentation-card.component.html +++ b/src/app/component/card/presentation-card/presentation-card.component.html @@ -1,10 +1,12 @@ - +
- logo + logo

{{ title }}

@@ -15,9 +17,10 @@

{{ secondaryText }}

- - + +
@@ -27,5 +30,4 @@

{{ footerText }}

 - - + diff --git a/src/app/component/card/presentation-card/presentation-card.component.scss b/src/app/component/card/presentation-card/presentation-card.component.scss index 795f1488..d3245e01 100644 --- a/src/app/component/card/presentation-card/presentation-card.component.scss +++ b/src/app/component/card/presentation-card/presentation-card.component.scss @@ -1,5 +1,5 @@ @use '../../../../styles/util/util'; -@use '../card.component'; +@use 'node_modules/@open-template-hub/card/styles/card/card'; .presentation-card { cursor: pointer; diff --git a/src/app/component/card/presentation-card/presentation-card.component.ts b/src/app/component/card/presentation-card/presentation-card.component.ts index 15f2612a..3cd927c5 100644 --- a/src/app/component/card/presentation-card/presentation-card.component.ts +++ b/src/app/component/card/presentation-card/presentation-card.component.ts @@ -14,6 +14,7 @@ export class PresentationCardComponent { @Input() secondaryText: string; @Input() footerText: string; @Input() imgHeight: number; + @Input() maintenance = false; constructor( private router: Router ) { // Intentionally blank diff --git a/src/app/component/card/pricing-card/pricing-card.component.html b/src/app/component/card/pricing-card/pricing-card.component.html index c185152a..06a5c4d4 100644 --- a/src/app/component/card/pricing-card/pricing-card.component.html +++ b/src/app/component/card/pricing-card/pricing-card.component.html @@ -1,4 +1,4 @@ - @@ -25,7 +25,7 @@

{{ pricingOption.title | uppercase }}

- + {{ pricingFeatures[ i ].details[ j ].name }}

@@ -37,14 +37,14 @@

{{ pricingOption.title | uppercase }}

- + - - + +
- + diff --git a/src/app/component/card/pricing-card/pricing-card.component.scss b/src/app/component/card/pricing-card/pricing-card.component.scss index dc0a9079..0cf64dd8 100644 --- a/src/app/component/card/pricing-card/pricing-card.component.scss +++ b/src/app/component/card/pricing-card/pricing-card.component.scss @@ -1,18 +1,16 @@ @use '../../../../styles/util/util'; -@use '../../card/card.component'; +@use 'node_modules/@open-template-hub/card/styles/card/card'; .pricing-card { font-size: 0.85rem; & .header { - // Design padding-top: 35px; & h4 { letter-spacing: 0.6em; - // Design text-align: center; } @@ -65,7 +63,6 @@ & .body { @include card.default-body; - // Design min-height: 140px; margin-top: 20px; margin-bottom: 40px; @@ -78,6 +75,10 @@ align-items: center; height: 22px; + & i { + color: var(--theme-color); + } + & span { padding-left: 1em; } @@ -90,7 +91,7 @@ border: 0; padding-bottom: 35px; - & app-brand-button { + & oth-brand-button { @include util.flex-layout-column; @include util.flex-center-center; diff --git a/src/app/component/card/pricing-card/pricing-card.component.ts b/src/app/component/card/pricing-card/pricing-card.component.ts index f5bce073..d7350ff6 100644 --- a/src/app/component/card/pricing-card/pricing-card.component.ts +++ b/src/app/component/card/pricing-card/pricing-card.component.ts @@ -1,8 +1,11 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; +import { environment } from '../../../../environments/environment'; import { URLS } from '../../../data/navigation/navigation.data'; +import { PremiumProducts } from '../../../data/premium-products/premium-product.data'; import { PricingOption } from '../../../model/pricing/pricing.model'; import { PricingFeature } from '../../../model/product/product.model'; +import { PaymentService } from '../../../service/payment/payment.service'; @Component( { selector: 'app-pricing-card', @@ -19,7 +22,7 @@ export class PricingCardComponent { @Input() pricingOption: PricingOption; - constructor( private router: Router ) { + constructor( private router: Router, private paymentService: PaymentService ) { // Intentionally blank } @@ -29,7 +32,7 @@ export class PricingCardComponent { } else if ( this.pricingOption.link ) { this.redirect( this.pricingOption.link ); } else { - this.redirect( URLS.maintenance ); + this.buy(); } } @@ -40,4 +43,8 @@ export class PricingCardComponent { window.location.href = href; } } + + buy() { + this.paymentService.initPayment( environment.payment.stripe, PremiumProducts.premiumAccount, 1 ); + } } diff --git a/src/app/component/card/profile-card/profile-card.component.html b/src/app/component/card/profile-card/profile-card.component.html new file mode 100644 index 00000000..6b7cb44b --- /dev/null +++ b/src/app/component/card/profile-card/profile-card.component.html @@ -0,0 +1,95 @@ + + + +
+ + profile-img +

(premium)

+

@{{ user.username }}

+
+ + + + +
+
+

First Name

+

{{ user.payload?.firstName }}

+
+ +
+

Last Name

+

{{ user.payload?.lastName }}

+
+ +
+

Bio

+

{{ user.payload?.bio }}

+
+ +
+

Location

+

{{ user.payload?.location }}

+
+ +
+

Phone

+

{{ user.payload?.phone }}

+
+ +
+

Website

+
+ {{ user.payload?.website }} +
+
+
+ + + + +
+ + + +
+ + diff --git a/src/app/component/card/profile-card/profile-card.component.scss b/src/app/component/card/profile-card/profile-card.component.scss new file mode 100644 index 00000000..ccdb130c --- /dev/null +++ b/src/app/component/card/profile-card/profile-card.component.scss @@ -0,0 +1,117 @@ +@use '../../../../styles/util/util'; +@use 'node_modules/@open-template-hub/card/styles/card/card'; + +.profile-card { + + & .header { + + margin-top: -50px; + margin-left: auto; + margin-right: auto; + padding: 10px; + + text-align: center; + + & p { + font-size: 18px; + + margin-top: 10px; + + &:last-child { + margin-bottom: 30px; + } + } + } + + & .body { + + justify-content: flex-start; + + padding: 0px 20px 50px; + + & .key-value-area { + display: flex; + margin-top: 30px; + + & .key { + width: -webkit-fill-available; + text-align: right; + color: var(--lighter-contrast); + font: { + size: 20px; + } + } + + & .value { + margin-top: auto; + margin-bottom: auto; + margin-left: 30px; + width: 100%; + text-align: left; + + font: { + size: 18px; + } + + & .website { + color: var(--theme-color-lighter-4); + } + } + } + } + + & .footer { + @include card.default-footer; + @include card.default-footer-border-color; + @include util.flex-layout-row; + + & .social-area { + display: flex; + + & i { + color: var(--theme-color-lighter-6); + + margin: 0 3px; + font-size: 27px; + + &:hover { + color: var(--theme-color); + } + } + + & p { + color: var(--lighter-contrast); + margin-right: 20px; + font-size: 17px; + margin-top: 5px; + } + } + } +} + +@media only screen and (max-width: 999px) { + .profile-card { + & .body { + & .key-value-area { + flex-direction: column; + + & .key { + text-align: center; + } + + & .value { + text-align: center; + margin-left: 0; + } + } + } + + & .footer { + & .social-area { + & p { + display: none; + } + } + } + } +} diff --git a/src/app/component/button/event-button/event-button.component.spec.ts b/src/app/component/card/profile-card/profile-card.component.spec.ts similarity index 54% rename from src/app/component/button/event-button/event-button.component.spec.ts rename to src/app/component/card/profile-card/profile-card.component.spec.ts index 121a14f0..5a217040 100644 --- a/src/app/component/button/event-button/event-button.component.spec.ts +++ b/src/app/component/card/profile-card/profile-card.component.spec.ts @@ -1,20 +1,20 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { EventButtonComponent } from './event-button.component'; +import { ProfileCardComponent } from './profile-card.component'; -describe( 'EventButtonComponent', () => { - let component: EventButtonComponent; - let fixture: ComponentFixture; +describe( 'ProfileCardComponent', () => { + let component: ProfileCardComponent; + let fixture: ComponentFixture; beforeEach( async () => { await TestBed.configureTestingModule( { - declarations: [ EventButtonComponent ] + declarations: [ ProfileCardComponent ] } ) .compileComponents(); } ); beforeEach( () => { - fixture = TestBed.createComponent( EventButtonComponent ); + fixture = TestBed.createComponent( ProfileCardComponent ); component = fixture.componentInstance; fixture.detectChanges(); } ); diff --git a/src/app/component/card/profile-card/profile-card.component.ts b/src/app/component/card/profile-card/profile-card.component.ts new file mode 100644 index 00000000..a42d9473 --- /dev/null +++ b/src/app/component/card/profile-card/profile-card.component.ts @@ -0,0 +1,43 @@ +import { Component, Input } from '@angular/core'; +import { environment } from 'src/environments/environment'; +import { environmentCommon } from 'src/environments/environment-common'; + +@Component( { + selector: 'app-profile-card', + templateUrl: './profile-card.component.html', + styleUrls: [ './profile-card.component.scss' ], +} ) +export class ProfileCardComponent { + environment = environment; + environmentCommon = environmentCommon; + employeePhotoLoaded = false; + + @Input() user: any = { + username: '', + name: '', + title: '', + bio: '', + social: { + linkedIn: '', + twitter: '', + github: '', + }, + }; + + @Input() photoUri: string = undefined; + + @Input() userIsPremium; + + constructor() { + // Intentionally blank + } + + setEmployeePhotoLoaded = () => { + this.employeePhotoLoaded = true; + }; + + parseSocialUrl( url: string ): string { + const directories = url.split( '/' ); + return directories[ ( directories.length - 1 ) ]; + } +} diff --git a/src/app/component/card/status-card/status-card.component.html b/src/app/component/card/status-card/status-card.component.html index 0d73f163..51d8c67b 100644 --- a/src/app/component/card/status-card/status-card.component.html +++ b/src/app/component/card/status-card/status-card.component.html @@ -1,33 +1,30 @@ - +
- +

{{ systemStatus.name | titlecase }}

- +

{{ status.name | titlecase}}

-
- +

{{ status.name | titlecase}}

-
@@ -40,8 +37,8 @@

{{ status.name | titlecase}} {{ overallSystemStatus.checkDate ? 'Last check ' + ( overallSystemStatus.checkDate | date: 'dd MMM, HH:mm:ss' ) : '' }}
Overall Status: - +

- + diff --git a/src/app/component/card/status-card/status-card.component.scss b/src/app/component/card/status-card/status-card.component.scss index 81a3148f..d5c51a60 100644 --- a/src/app/component/card/status-card/status-card.component.scss +++ b/src/app/component/card/status-card/status-card.component.scss @@ -1,5 +1,5 @@ @use '../../../../styles/util/util'; -@use '../../card/card.component'; +@use 'node_modules/@open-template-hub/card/styles/card/card'; .status-card { & .header { @@ -16,7 +16,7 @@ color: var(--color); padding: 15px; - & app-led { + & oth-led { margin-right: 12px; } } @@ -24,7 +24,6 @@ & .body { - // Design min-height: 120px; display: flex; flex-wrap: wrap; @@ -58,7 +57,7 @@ color: var(--lighter-contrast); } - & app-led { + & oth-led { margin-right: 14px; } diff --git a/src/app/component/card/status-card/status-card.component.ts b/src/app/component/card/status-card/status-card.component.ts index 89217dca..681b3ba1 100644 --- a/src/app/component/card/status-card/status-card.component.ts +++ b/src/app/component/card/status-card/status-card.component.ts @@ -1,6 +1,4 @@ import { Component, Input } from '@angular/core'; -import { Router } from '@angular/router'; -import { URLS } from '../../../data/navigation/navigation.data'; import { PRODUCT_LINES } from '../../../data/product/product.data'; import { DEFAULT_SYSTEM_STATUS } from '../../../data/status/status.data'; @@ -14,23 +12,10 @@ export class StatusCardComponent { PRODUCT_LINES = PRODUCT_LINES; - constructor( private router: Router ) { + constructor() { // Intentionally blank } - navigate( overallStatusName: string, statusName: string ) { - for ( const product of PRODUCT_LINES ) { - if ( product.name.toLowerCase() === overallStatusName.toLowerCase() ) { - for ( const subProduct of product.products ) { - if ( statusName.toLowerCase() === subProduct.name.toLowerCase() ) { - this.router.navigate( [ URLS.product + '/' + product.key + '/' + subProduct.key ] ); - break; - } - } - } - } - } - setStatusLed( status: string ) { switch ( status ) { case 'UP': { diff --git a/src/app/component/card/tech-stack-card/tech-stack-card.component.html b/src/app/component/card/tech-stack-card/tech-stack-card.component.html index 4145c828..e92e54b2 100644 --- a/src/app/component/card/tech-stack-card/tech-stack-card.component.html +++ b/src/app/component/card/tech-stack-card/tech-stack-card.component.html @@ -1,12 +1,12 @@ - +
-
- +
+

{{ tech.description }}

- + diff --git a/src/app/component/card/tech-stack-card/tech-stack-card.component.scss b/src/app/component/card/tech-stack-card/tech-stack-card.component.scss index 694dda95..ba2c927d 100644 --- a/src/app/component/card/tech-stack-card/tech-stack-card.component.scss +++ b/src/app/component/card/tech-stack-card/tech-stack-card.component.scss @@ -1,5 +1,5 @@ @use '../../../../styles/util/util'; -@use '../../card/card.component'; +@use 'node_modules/@open-template-hub/card/styles/card/card'; .tech-stack-card { & .body { diff --git a/src/app/component/card/tech-stack-card/tech-stack-card.component.spec.ts b/src/app/component/card/tech-stack-card/tech-stack-card.component.spec.ts index 4ed937cd..27501955 100644 --- a/src/app/component/card/tech-stack-card/tech-stack-card.component.spec.ts +++ b/src/app/component/card/tech-stack-card/tech-stack-card.component.spec.ts @@ -2,24 +2,24 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TechStackCardComponent } from './tech-stack-card.component'; -describe('TechStackCardComponent', () => { +describe( 'TechStackCardComponent', () => { let component: TechStackCardComponent; let fixture: ComponentFixture; - beforeEach(async () => { - await TestBed.configureTestingModule({ + beforeEach( async () => { + await TestBed.configureTestingModule( { declarations: [ TechStackCardComponent ] - }) + } ) .compileComponents(); - }); + } ); - beforeEach(() => { - fixture = TestBed.createComponent(TechStackCardComponent); + beforeEach( () => { + fixture = TestBed.createComponent( TechStackCardComponent ); component = fixture.componentInstance; fixture.detectChanges(); - }); + } ); - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); + it( 'should create', () => { + expect( component ).toBeTruthy(); + } ); +} ); diff --git a/src/app/component/card/testimonial-card/testimonial-card.component.html b/src/app/component/card/testimonial-card/testimonial-card.component.html index be59789c..eba36eb1 100644 --- a/src/app/component/card/testimonial-card/testimonial-card.component.html +++ b/src/app/component/card/testimonial-card/testimonial-card.component.html @@ -1,4 +1,4 @@ - @@ -22,8 +22,8 @@ fill-opacity="0.4" transform="translate(100 100)"> logo + alt="logo" class="profile-img" height="100" onerror="this.src='./assets/common/profile-img.png'" + width="100"/> - + diff --git a/src/app/component/card/testimonial-card/testimonial-card.component.scss b/src/app/component/card/testimonial-card/testimonial-card.component.scss index aa37edc6..9e9d353c 100644 --- a/src/app/component/card/testimonial-card/testimonial-card.component.scss +++ b/src/app/component/card/testimonial-card/testimonial-card.component.scss @@ -1,5 +1,5 @@ @use '../../../../styles/util/util'; -@use '../../card/card.component'; +@use 'node_modules/@open-template-hub/card/styles/card/card'; .testimonial-card { @@ -18,7 +18,6 @@ align-items: flex-end; justify-content: flex-end; - // Design padding: 25px; text-align: center; @@ -69,6 +68,7 @@ background-color: var(--card); height: 100px; + width: 100px; margin-top: 30px; border-bottom: 2px solid var(--theme-color); z-index: 2; diff --git a/src/app/component/card/timeline-card/step-timeline-card/step-timeline-card.component.html b/src/app/component/card/timeline-card/step-timeline-card/step-timeline-card.component.html index 1cb6aa2c..a0b31086 100644 --- a/src/app/component/card/timeline-card/step-timeline-card/step-timeline-card.component.html +++ b/src/app/component/card/timeline-card/step-timeline-card/step-timeline-card.component.html @@ -1,24 +1,15 @@ - +
-
-
+
+

{{ num }}

-
+

{{ step.text }}

- - -
- - + diff --git a/src/app/component/card/timeline-card/step-timeline-card/step-timeline-card.component.scss b/src/app/component/card/timeline-card/step-timeline-card/step-timeline-card.component.scss index 38f2988a..e53b1b44 100644 --- a/src/app/component/card/timeline-card/step-timeline-card/step-timeline-card.component.scss +++ b/src/app/component/card/timeline-card/step-timeline-card/step-timeline-card.component.scss @@ -26,6 +26,7 @@ & .divider { height: 100%; + &.right { @include link; diff --git a/src/app/component/card/timeline-card/step-timeline-card/step-timeline-card.component.spec.ts b/src/app/component/card/timeline-card/step-timeline-card/step-timeline-card.component.spec.ts index 252ab58a..0b456b0a 100644 --- a/src/app/component/card/timeline-card/step-timeline-card/step-timeline-card.component.spec.ts +++ b/src/app/component/card/timeline-card/step-timeline-card/step-timeline-card.component.spec.ts @@ -2,24 +2,24 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { StepTimelineCardComponent } from './step-timeline-card.component'; -describe('StepTimelineCardComponent', () => { +describe( 'StepTimelineCardComponent', () => { let component: StepTimelineCardComponent; let fixture: ComponentFixture; - beforeEach(async () => { - await TestBed.configureTestingModule({ + beforeEach( async () => { + await TestBed.configureTestingModule( { declarations: [ StepTimelineCardComponent ] - }) + } ) .compileComponents(); - }); + } ); - beforeEach(() => { - fixture = TestBed.createComponent(StepTimelineCardComponent); + beforeEach( () => { + fixture = TestBed.createComponent( StepTimelineCardComponent ); component = fixture.componentInstance; fixture.detectChanges(); - }); + } ); - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); + it( 'should create', () => { + expect( component ).toBeTruthy(); + } ); +} ); diff --git a/src/app/component/card/timeline-card/step-timeline-card/step-timeline-card.component.ts b/src/app/component/card/timeline-card/step-timeline-card/step-timeline-card.component.ts index 4bfdfe0a..2fa03ae1 100644 --- a/src/app/component/card/timeline-card/step-timeline-card/step-timeline-card.component.ts +++ b/src/app/component/card/timeline-card/step-timeline-card/step-timeline-card.component.ts @@ -1,17 +1,17 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input } from '@angular/core'; import { StepTimeLineItem } from 'src/app/model/timeline/step-timeline.model'; -@Component({ +@Component( { selector: 'app-step-timeline-card', templateUrl: './step-timeline-card.component.html', - styleUrls: ['./step-timeline-card.component.scss'], -}) -export class StepTimelineCardComponent implements OnInit { + styleUrls: [ './step-timeline-card.component.scss' ], +} ) +export class StepTimelineCardComponent { @Input() step: StepTimeLineItem; @Input() rotation: string; @Input() num: number; - - constructor() {} - ngOnInit(): void {} + constructor() { + // Intentionally blank + } } diff --git a/src/app/component/card/timeline-card/timeline-card.component.html b/src/app/component/card/timeline-card/timeline-card.component.html index e209ec55..b867c73b 100644 --- a/src/app/component/card/timeline-card/timeline-card.component.html +++ b/src/app/component/card/timeline-card/timeline-card.component.html @@ -1,4 +1,4 @@ - @@ -25,4 +25,4 @@ {{ timelineItem.footerText }}
- + diff --git a/src/app/component/card/timeline-card/timeline-card.component.scss b/src/app/component/card/timeline-card/timeline-card.component.scss index 1740bfab..89e0e2fb 100644 --- a/src/app/component/card/timeline-card/timeline-card.component.scss +++ b/src/app/component/card/timeline-card/timeline-card.component.scss @@ -1,5 +1,5 @@ @use '../../../../styles/util/util'; -@use '../../card/card.component'; +@use 'node_modules/@open-template-hub/card/styles/card/card'; @mixin arrow { position: absolute; @@ -28,11 +28,9 @@ z-index: 2; - // Design height: 80px; font-size: 22px; - // Color background-color: var(--theme-color); border-bottom: 1px solid var(--theme-color-darker-2); @@ -163,7 +161,6 @@ } } - // Design height: 350px; } diff --git a/src/app/component/command-line/command-line.component.html b/src/app/component/command-line/command-line.component.html deleted file mode 100644 index 8d1be5a4..00000000 --- a/src/app/component/command-line/command-line.component.html +++ /dev/null @@ -1,5 +0,0 @@ -

- $ - > - {{ animatedText }} -

diff --git a/src/app/component/command-line/command-line.component.scss b/src/app/component/command-line/command-line.component.scss deleted file mode 100644 index 72daa407..00000000 --- a/src/app/component/command-line/command-line.component.scss +++ /dev/null @@ -1,23 +0,0 @@ -.command-line { - color: var(--contrast-light-mode); - font-size: 14px; - margin-top: 5px; - - & .text { - margin-left: 10px; - white-space: pre-line; - } - - & .response { - color: var(--warning); - } - - & .request { - color: var(--error); - } - - & .command { - font-size: 14px; - font-weight: 600; - } -} diff --git a/src/app/component/command-line/command-line.component.ts b/src/app/component/command-line/command-line.component.ts deleted file mode 100644 index 2abd2e58..00000000 --- a/src/app/component/command-line/command-line.component.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { Component, Input, OnInit } from '@angular/core'; -import { CommandLine } from 'src/app/model/product/product.model'; - -@Component( { - selector: 'app-command-line', - templateUrl: './command-line.component.html', - styleUrls: [ './command-line.component.scss' ], -} ) -export class CommandLineComponent implements OnInit { - @Input() commandLine: CommandLine; - animatedText = ''; - counter = 0; - - defaultCallback = () => { - // Intentionally blank - }; - - @Input() animationComplete?: any = this.defaultCallback; - - ngOnInit(): void { - this.animateCommand(); - } - - animateCommand = () => { - if ( this.counter < this.commandLine.command.length ) { - this.animatedText += this.commandLine.command.charAt( this.counter ); - this.counter++; - setTimeout( this.animateCommand, this.commandLine.timeout ); - } else { - this.animationComplete(); - } - }; -} diff --git a/src/app/component/content-loader/image-content-loader/image-content-loader.component.scss b/src/app/component/content-loader/image-content-loader/image-content-loader.component.scss index fc0044ef..058bec34 100644 --- a/src/app/component/content-loader/image-content-loader/image-content-loader.component.scss +++ b/src/app/component/content-loader/image-content-loader/image-content-loader.component.scss @@ -20,6 +20,8 @@ &.employee-photo { width: 120px; height: 120px; + margin-left: auto; + margin-right: auto; @include util.default-border-radius-image; } } diff --git a/src/app/component/design/bottom-svg/bottom-svg.component.html b/src/app/component/design/bottom-svg/bottom-svg.component.html new file mode 100644 index 00000000..bc40e02d --- /dev/null +++ b/src/app/component/design/bottom-svg/bottom-svg.component.html @@ -0,0 +1,12 @@ +
+ + + + Layer 1 + + + + + +
diff --git a/src/app/component/design/top-svg/counter-borders-top-svg/counter-borders-top-svg.component.scss b/src/app/component/design/bottom-svg/bottom-svg.component.scss similarity index 100% rename from src/app/component/design/top-svg/counter-borders-top-svg/counter-borders-top-svg.component.scss rename to src/app/component/design/bottom-svg/bottom-svg.component.scss diff --git a/src/app/component/card/card.component.spec.ts b/src/app/component/design/bottom-svg/bottom-svg.component.spec.ts similarity index 55% rename from src/app/component/card/card.component.spec.ts rename to src/app/component/design/bottom-svg/bottom-svg.component.spec.ts index d1983659..fd51d011 100644 --- a/src/app/component/card/card.component.spec.ts +++ b/src/app/component/design/bottom-svg/bottom-svg.component.spec.ts @@ -1,20 +1,20 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { CardComponent } from './card.component'; +import { BottomSvgComponent } from './bottom-svg.component'; -describe( 'CardComponent', () => { - let component: CardComponent; - let fixture: ComponentFixture; +describe( 'BottomSvgComponent', () => { + let component: BottomSvgComponent; + let fixture: ComponentFixture; beforeEach( async () => { await TestBed.configureTestingModule( { - declarations: [ CardComponent ] + declarations: [ BottomSvgComponent ] } ) .compileComponents(); } ); beforeEach( () => { - fixture = TestBed.createComponent( CardComponent ); + fixture = TestBed.createComponent( BottomSvgComponent ); component = fixture.componentInstance; fixture.detectChanges(); } ); diff --git a/src/app/component/design/bottom-svg/bottom-svg.component.ts b/src/app/component/design/bottom-svg/bottom-svg.component.ts new file mode 100644 index 00000000..397216cb --- /dev/null +++ b/src/app/component/design/bottom-svg/bottom-svg.component.ts @@ -0,0 +1,21 @@ +import { Component } from '@angular/core'; +import { ThemeDesignSettings } from '../../../data/theme/theme.data'; +import { ThemeService } from '../../../service/theme/theme.service'; + +@Component( { + selector: 'app-bottom-svg', + templateUrl: './bottom-svg.component.html', + styleUrls: [ './bottom-svg.component.scss' ] +} ) +export class BottomSvgComponent { + + themeDesignSetting; + + ThemeDesignSettings = ThemeDesignSettings; + + constructor( + private themeService: ThemeService + ) { + this.themeService.themeDesignSetting.subscribe( themeDesignSetting => this.themeDesignSetting = themeDesignSetting ); + } +} diff --git a/src/app/component/design/top-svg/counter-borders-top-svg/counter-borders-top-svg.component.html b/src/app/component/design/top-svg/counter-borders-top-svg/counter-borders-top-svg.component.html deleted file mode 100644 index 6155da0a..00000000 --- a/src/app/component/design/top-svg/counter-borders-top-svg/counter-borders-top-svg.component.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/src/app/component/design/top-svg/counter-borders-top-svg/counter-borders-top-svg.component.spec.ts b/src/app/component/design/top-svg/counter-borders-top-svg/counter-borders-top-svg.component.spec.ts deleted file mode 100644 index a81583f8..00000000 --- a/src/app/component/design/top-svg/counter-borders-top-svg/counter-borders-top-svg.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { CounterBordersTopSvgComponent } from './counter-borders-top-svg.component'; - -describe( 'CounterBordersTopSvgComponent', () => { - let component: CounterBordersTopSvgComponent; - let fixture: ComponentFixture; - - beforeEach( async () => { - await TestBed.configureTestingModule( { - declarations: [ CounterBordersTopSvgComponent ] - } ) - .compileComponents(); - } ); - - beforeEach( () => { - fixture = TestBed.createComponent( CounterBordersTopSvgComponent ); - component = fixture.componentInstance; - fixture.detectChanges(); - } ); - - it( 'should create', () => { - expect( component ).toBeTruthy(); - } ); -} ); diff --git a/src/app/component/design/top-svg/counter-borders-top-svg/counter-borders-top-svg.component.ts b/src/app/component/design/top-svg/counter-borders-top-svg/counter-borders-top-svg.component.ts deleted file mode 100644 index 343a6f01..00000000 --- a/src/app/component/design/top-svg/counter-borders-top-svg/counter-borders-top-svg.component.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { Component } from '@angular/core'; - -@Component( { - selector: 'app-counter-borders-top-svg', - templateUrl: './counter-borders-top-svg.component.html', - styleUrls: [ './counter-borders-top-svg.component.scss' ] -} ) -export class CounterBordersTopSvgComponent { - - constructor() { - // Intentionally Blank - } -} diff --git a/src/app/component/design/top-svg/default-top-svg/default-top-svg.component.html b/src/app/component/design/top-svg/default-top-svg/default-top-svg.component.html deleted file mode 100644 index 35b4211c..00000000 --- a/src/app/component/design/top-svg/default-top-svg/default-top-svg.component.html +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/src/app/component/design/top-svg/default-top-svg/default-top-svg.component.scss b/src/app/component/design/top-svg/default-top-svg/default-top-svg.component.scss deleted file mode 100644 index 94850d76..00000000 --- a/src/app/component/design/top-svg/default-top-svg/default-top-svg.component.scss +++ /dev/null @@ -1 +0,0 @@ -/* Intentionally Blank */ diff --git a/src/app/component/design/top-svg/default-top-svg/default-top-svg.component.spec.ts b/src/app/component/design/top-svg/default-top-svg/default-top-svg.component.spec.ts deleted file mode 100644 index 6b3d2b9a..00000000 --- a/src/app/component/design/top-svg/default-top-svg/default-top-svg.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { DefaultTopSvgComponent } from './default-top-svg.component'; - -describe( 'DefaultTopSvgComponent', () => { - let component: DefaultTopSvgComponent; - let fixture: ComponentFixture; - - beforeEach( async () => { - await TestBed.configureTestingModule( { - declarations: [ DefaultTopSvgComponent ] - } ) - .compileComponents(); - } ); - - beforeEach( () => { - fixture = TestBed.createComponent( DefaultTopSvgComponent ); - component = fixture.componentInstance; - fixture.detectChanges(); - } ); - - it( 'should create', () => { - expect( component ).toBeTruthy(); - } ); -} ); diff --git a/src/app/component/design/top-svg/default-top-svg/default-top-svg.component.ts b/src/app/component/design/top-svg/default-top-svg/default-top-svg.component.ts deleted file mode 100644 index 3df7aaf8..00000000 --- a/src/app/component/design/top-svg/default-top-svg/default-top-svg.component.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { Component } from '@angular/core'; - -@Component( { - selector: 'app-default-top-svg', - templateUrl: './default-top-svg.component.html', - styleUrls: [ './default-top-svg.component.scss' ] -} ) -export class DefaultTopSvgComponent { - - constructor() { - // Intentionally Blank - } -} diff --git a/src/app/component/design/top-svg/leaf-top-svg/leaf-top-svg.component.html b/src/app/component/design/top-svg/leaf-top-svg/leaf-top-svg.component.html deleted file mode 100644 index fa5a109e..00000000 --- a/src/app/component/design/top-svg/leaf-top-svg/leaf-top-svg.component.html +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/src/app/component/design/top-svg/leaf-top-svg/leaf-top-svg.component.scss b/src/app/component/design/top-svg/leaf-top-svg/leaf-top-svg.component.scss deleted file mode 100644 index 94850d76..00000000 --- a/src/app/component/design/top-svg/leaf-top-svg/leaf-top-svg.component.scss +++ /dev/null @@ -1 +0,0 @@ -/* Intentionally Blank */ diff --git a/src/app/component/design/top-svg/leaf-top-svg/leaf-top-svg.component.spec.ts b/src/app/component/design/top-svg/leaf-top-svg/leaf-top-svg.component.spec.ts deleted file mode 100644 index b2207a13..00000000 --- a/src/app/component/design/top-svg/leaf-top-svg/leaf-top-svg.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { LeafTopSvgComponent } from './leaf-top-svg.component'; - -describe( 'LeafTopSvgComponent', () => { - let component: LeafTopSvgComponent; - let fixture: ComponentFixture; - - beforeEach( async () => { - await TestBed.configureTestingModule( { - declarations: [ LeafTopSvgComponent ] - } ) - .compileComponents(); - } ); - - beforeEach( () => { - fixture = TestBed.createComponent( LeafTopSvgComponent ); - component = fixture.componentInstance; - fixture.detectChanges(); - } ); - - it( 'should create', () => { - expect( component ).toBeTruthy(); - } ); -} ); diff --git a/src/app/component/design/top-svg/leaf-top-svg/leaf-top-svg.component.ts b/src/app/component/design/top-svg/leaf-top-svg/leaf-top-svg.component.ts deleted file mode 100644 index a8e85540..00000000 --- a/src/app/component/design/top-svg/leaf-top-svg/leaf-top-svg.component.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { Component } from '@angular/core'; - -@Component( { - selector: 'app-leaf-top-svg', - templateUrl: './leaf-top-svg.component.html', - styleUrls: [ './leaf-top-svg.component.scss' ] -} ) -export class LeafTopSvgComponent { - - constructor() { - // Intentionally Blank - } -} diff --git a/src/app/component/design/top-svg/sharp-top-svg/sharp-top-svg.component.html b/src/app/component/design/top-svg/sharp-top-svg/sharp-top-svg.component.html deleted file mode 100644 index 1168b96c..00000000 --- a/src/app/component/design/top-svg/sharp-top-svg/sharp-top-svg.component.html +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/app/component/design/top-svg/sharp-top-svg/sharp-top-svg.component.scss b/src/app/component/design/top-svg/sharp-top-svg/sharp-top-svg.component.scss deleted file mode 100644 index 94850d76..00000000 --- a/src/app/component/design/top-svg/sharp-top-svg/sharp-top-svg.component.scss +++ /dev/null @@ -1 +0,0 @@ -/* Intentionally Blank */ diff --git a/src/app/component/design/top-svg/sharp-top-svg/sharp-top-svg.component.spec.ts b/src/app/component/design/top-svg/sharp-top-svg/sharp-top-svg.component.spec.ts deleted file mode 100644 index 1d4da8fc..00000000 --- a/src/app/component/design/top-svg/sharp-top-svg/sharp-top-svg.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { SharpTopSvgComponent } from './sharp-top-svg.component'; - -describe( 'SharpTopSvgComponent', () => { - let component: SharpTopSvgComponent; - let fixture: ComponentFixture; - - beforeEach( async () => { - await TestBed.configureTestingModule( { - declarations: [ SharpTopSvgComponent ] - } ) - .compileComponents(); - } ); - - beforeEach( () => { - fixture = TestBed.createComponent( SharpTopSvgComponent ); - component = fixture.componentInstance; - fixture.detectChanges(); - } ); - - it( 'should create', () => { - expect( component ).toBeTruthy(); - } ); -} ); diff --git a/src/app/component/design/top-svg/sharp-top-svg/sharp-top-svg.component.ts b/src/app/component/design/top-svg/sharp-top-svg/sharp-top-svg.component.ts deleted file mode 100644 index 7c65d4aa..00000000 --- a/src/app/component/design/top-svg/sharp-top-svg/sharp-top-svg.component.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { Component } from '@angular/core'; - -@Component( { - selector: 'app-sharp-top-svg', - templateUrl: './sharp-top-svg.component.html', - styleUrls: [ './sharp-top-svg.component.scss' ] -} ) -export class SharpTopSvgComponent { - - constructor() { - // Intentionally Blank - } -} diff --git a/src/app/component/design/top-svg/top-svg.component.html b/src/app/component/design/top-svg/top-svg.component.html index a5006f6b..b2edaa8c 100644 --- a/src/app/component/design/top-svg/top-svg.component.html +++ b/src/app/component/design/top-svg/top-svg.component.html @@ -1,8 +1,21 @@
- - - - - - + + + + + +
diff --git a/src/app/component/design/top-svg/top-svg.component.ts b/src/app/component/design/top-svg/top-svg.component.ts index 4986d741..4b4cd864 100644 --- a/src/app/component/design/top-svg/top-svg.component.ts +++ b/src/app/component/design/top-svg/top-svg.component.ts @@ -1,5 +1,4 @@ import { Component } from '@angular/core'; -import { Router } from '@angular/router'; import { ThemeDesignSettings } from '../../../data/theme/theme.data'; import { ThemeService } from '../../../service/theme/theme.service'; @@ -15,7 +14,6 @@ export class TopSvgComponent { ThemeDesignSettings = ThemeDesignSettings; constructor( - private router: Router, private themeService: ThemeService ) { this.themeService.themeDesignSetting.subscribe( themeDesignSetting => this.themeDesignSetting = themeDesignSetting ); diff --git a/src/app/component/dropdown-menu/dropdown-menu.component.html b/src/app/component/dropdown-menu/dropdown-menu.component.html deleted file mode 100644 index 992fd66d..00000000 --- a/src/app/component/dropdown-menu/dropdown-menu.component.html +++ /dev/null @@ -1,63 +0,0 @@ -
-
- -
- -
- -
- -
- -
-
-
-

- {{ productLine.name }} -

-

- {{ productLine.description.length < 80 ? productLine.description : productLine.description.substring( 0, 80 ) + '..' }} -

-
-
- - - - - -
-
- {{ product.name }} -
-

- {{ product.description.length < 180 ? product.description : product.description.substring( 0, 180 ) + '..' }} -

-
- -
-
-
-
diff --git a/src/app/component/hero/hero.component.html b/src/app/component/hero/hero.component.html deleted file mode 100644 index a25f5d9a..00000000 --- a/src/app/component/hero/hero.component.html +++ /dev/null @@ -1,17 +0,0 @@ -
-
-
- - -

{{ content.text }}

-

{{ content.text }}

-

{{ content.text }}

-

{{ content.text }}

-
{{ content.text }}
-
{{ content.text }}
-

{{ content.text }}

- - -
-
-
diff --git a/src/app/component/hero/hero.component.scss b/src/app/component/hero/hero.component.scss deleted file mode 100644 index c8c079ec..00000000 --- a/src/app/component/hero/hero.component.scss +++ /dev/null @@ -1,75 +0,0 @@ -@use '../../../styles/util/util'; - -.hero { - padding-top: 80px; - - &.no-padding { - padding-top: 0; - } - - & .body { - @include util.flex-layout-column; - - position: relative; - - text-align: center; - align-items: center; - - & .contents { - display: flex; - } - } -} - -@media only screen and (max-width: 999px) { - .hero { - & .body { - & .contents { - @include util.flex-layout-column; - - & > * { - @include util.flex-layout-column; - @include util.card-width-sm; - margin-bottom: 20px; - } - - & img { - min-width: initial; - width: initial; - max-width: initial; - } - } - } - } -} - -@media only screen and (min-width: 1000px) { - .hero { - - & .body { - padding-bottom: 50px; - - & .contents { - flex-direction: column; - max-width: 800px; - - & > * { - flex-direction: column; - margin-bottom: 30px; - } - } - } - - &.no-padding { - & .body { - padding-bottom: 0; - - & .contents { - & > * { - margin-bottom: 0; - } - } - } - } - } -} diff --git a/src/app/component/hero/hero.component.spec.ts b/src/app/component/hero/hero.component.spec.ts deleted file mode 100644 index 0dcd1950..00000000 --- a/src/app/component/hero/hero.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { HeroComponent } from './hero.component'; - -describe( 'HeroComponent', () => { - let component: HeroComponent; - let fixture: ComponentFixture; - - beforeEach( async () => { - await TestBed.configureTestingModule( { - declarations: [ HeroComponent ] - } ) - .compileComponents(); - } ); - - beforeEach( () => { - fixture = TestBed.createComponent( HeroComponent ); - component = fixture.componentInstance; - fixture.detectChanges(); - } ); - - it( 'should create', () => { - expect( component ).toBeTruthy(); - } ); -} ); diff --git a/src/app/component/hero/hero.component.ts b/src/app/component/hero/hero.component.ts deleted file mode 100644 index 3cbdcabc..00000000 --- a/src/app/component/hero/hero.component.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Component, Input } from '@angular/core'; -import { Hero } from '../../model/hero/hero.model'; - -@Component( { - selector: 'app-hero', - templateUrl: './hero.component.html', - styleUrls: [ './hero.component.scss' ] -} ) -export class HeroComponent { - - @Input() contents: Hero[]; - - @Input() heroClass: string; - - constructor() { - // Intentionally blank - } -} diff --git a/src/app/component/label/deprecated/event-data/event-data.component.html b/src/app/component/label/deprecated/event-data/event-data.component.html deleted file mode 100644 index 34e2e162..00000000 --- a/src/app/component/label/deprecated/event-data/event-data.component.html +++ /dev/null @@ -1,92 +0,0 @@ -
-
-
-

{{title}}

- -
-
-
-

by {{isEditable ? 'you' : ( user.username.length > 12 ? user.username.slice( 0, 12 ) + '...' : user.username )}} -

-

- - join meeting - -

-
-
-

{{dateItem}}

-

{{timeItem}}

-
-
-
-
-
-
- -

{{duration}} - Minutes

-
-
- -

{{count}} - Attendees

-
-
- -
- - - - - - - - - - -
- -
- {{description}} -
-
-
- - - - - - - - - - -
-

{{'#' + category.name}}

-

{{'#' + subCategory.name}}

-

{{'#' + leafCategory.name}}

-
-
-
-
- -
diff --git a/src/app/component/label/deprecated/event-data/event-data.component.scss b/src/app/component/label/deprecated/event-data/event-data.component.scss deleted file mode 100644 index 08d1e3e0..00000000 --- a/src/app/component/label/deprecated/event-data/event-data.component.scss +++ /dev/null @@ -1,242 +0,0 @@ -@use '../../../../../styles/util/util'; -@use '../../../card/card.component'; - -.event { - display: flex; - flex-direction: column; - position: relative; - height: 360px; - padding: 0 1em 0; -} - -.event.not-fixed-height { - height: auto; -} - -.event.max-height { - height: 600px; -} - -.event.rate-height { - height: 270px; -} - -.event-description.add-margin-to-description { - margin-left: 50px; - margin-right: 50px; - margin-top: 50px; -} - -.event-content { - padding-left: 0.25em; - padding-right: 0.25em; -} - -.event-calendar { - text-align: center; - margin-bottom: 1em; -} - -.event-calendar.min-margin { - margin-bottom: 0.1em; -} - -.apple-calendar { - margin-right: 1em; -} - -.event.background-color { - background-color: var(--background-color); -} - -.event-bottom-wrapper { - width: 100%; - height: 2px; - position: relative; - overflow: hidden; - background-color: var(--darker-contrast); -} - -.event-header { - display: flex; - justify-content: center; - flex-direction: column; - width: 90%; - padding: 1em 0 0.5em; - border-bottom: 1px solid var(--lighter-contrast); - margin-bottom: 0.7em; -} - -.centered-title h3, .centered-title h4 { - text-align: center; -} - -.is-small-title.event h3 { - font-size: 1.2em; - padding-bottom: 2px; -} - -.event-description { - color: var(--color); - font-size: 0.9em; - font-weight: 300; - - overflow: hidden; - text-overflow: ellipsis; - white-space: pre-line; - display: -webkit-box; - -webkit-line-clamp: 4; /* number of lines to show */ - -webkit-box-orient: vertical; -} - -.event-description.remove-line-clamp, .show-calendar .event-description.remove-line-clamp { - -webkit-line-clamp: initial; -} - -.show-calendar .event-description { - -webkit-line-clamp: 3; /* number of lines to show */ -} - -.show-calendar { - -webkit-line-clamp: 1; - -} - -.event-categories { - display: flex; - justify-content: flex-end; - flex-wrap: wrap; - font-size: 0.8em; - width: 100%; -} - -.event-categories p { - margin-right: 5px; -} - -.centered-title .event-header { - width: 75%; -} - -.content-information-row { - display: flex; - width: 100%; - justify-content: space-evenly; - padding-bottom: 0.5em; -} - -.content-information-row-inner-row { - display: flex; - align-items: center; - height: 36px; - width: 43%; - justify-content: center; - color: var(--lighter); -} - -.content-information-row-duration { - margin-left: 4px; -} - -.content-information-row-attendees { - margin-left: 7px; -} - -.content-information-row-data { - color: var(--theme-color); - font-weight: 400; - font-size: 1.1em; -} - -.event.editable .event-header-title { - display: flex; - flex-direction: row; - align-items: center; - justify-content: space-between; -} - -.event-header-title { - display: flex; - justify-content: space-between; - cursor: pointer; -} - -.event-header-title h3 { - overflow: hidden; - text-overflow: ellipsis; - white-space: pre-line; - display: -webkit-box; - -webkit-line-clamp: 2; /* number of lines to show */ - -webkit-box-orient: vertical; -} - -.event-header-title.remove-line-clamp h3 { - -webkit-line-clamp: initial; -} - -.event-header-title i { - color: var(--color); -} - -.event-last-item { - display: flex; - flex-direction: column; - margin-top: auto; - margin-bottom: 1em; - padding-top: 5px; -} - -.event.editable i { - font-size: 1em; -} - -.event-sub-header-title { - display: flex; - justify-content: space-between; - align-items: center; -} - -.event-sub-header-title-date, .event-sub-header-title-user { - @include util.flex-layout-column; - justify-content: center; -} - -.event-sub-header-title-date { - align-items: center; -} - -.event h3 { - font-size: 1.4em; - font-weight: 500; -} - -.rate-badge-wrapper { - @include util.margin-x-auto; - margin-top: 20px; -} - -@media only screen and (max-width: 999px) { - - .event-header { - @include card.card-header-width-sm; - @include util.margin-x-auto; - } -} - -@media only screen and (min-width: 1000px) { - .event app-button { - @include util.margin-x-auto; - } - - .event { - width: -webkit-fill-available; - } - - .event-header { - @include util.margin-x-auto; - } - - .event-content .section-output { - max-width: 50%; - } -} diff --git a/src/app/component/label/deprecated/event-data/event-data.component.spec.ts b/src/app/component/label/deprecated/event-data/event-data.component.spec.ts deleted file mode 100644 index a94205e8..00000000 --- a/src/app/component/label/deprecated/event-data/event-data.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { EventDataComponent } from './event-data.component'; - -describe( 'EventComponent', () => { - let component: EventDataComponent; - let fixture: ComponentFixture; - - beforeEach( async () => { - await TestBed.configureTestingModule( { - declarations: [ EventDataComponent ] - } ) - .compileComponents(); - } ); - - beforeEach( () => { - fixture = TestBed.createComponent( EventDataComponent ); - component = fixture.componentInstance; - fixture.detectChanges(); - } ); - - it( 'should create', () => { - expect( component ).toBeTruthy(); - } ); -} ); diff --git a/src/app/component/label/deprecated/event-data/event-data.component.ts b/src/app/component/label/deprecated/event-data/event-data.component.ts deleted file mode 100644 index c6e4104d..00000000 --- a/src/app/component/label/deprecated/event-data/event-data.component.ts +++ /dev/null @@ -1,228 +0,0 @@ -import { formatDate } from '@angular/common'; -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { Router } from '@angular/router'; -import { createEvent, DateArray, EventAttributes } from 'ics'; -import { environment } from 'src/environments/environment'; -import { environmentCommon } from '../../../../../environments/environment-common'; -import { URLS } from '../../../../data/navigation/navigation.data'; -import { EventService } from '../../../../service/event/event.service'; -import { InformationService } from '../../../../service/information/information.service'; -import { LoadingService } from '../../../../service/loading/loading.service'; -import { PaymentService } from '../../../../service/payment/payment.service'; -import { UserActivityService } from '../../../../service/user-activity/user-activity.service'; - -@Component( { - selector: 'app-event-data', - templateUrl: './event-data.component.html', - styleUrls: [ './event-data.component.scss' ] -} ) -export class EventDataComponent implements OnInit { - - selectedRate = 0; - - environment = environment; - environmentCommon = environmentCommon; - - @Input() title: string = undefined; - @Input() user: any = undefined; - @Input() date: string = undefined; - @Input() description: string = undefined; - @Input() link: string = undefined; - @Input() category: any = undefined; - @Input() subCategory: any = undefined; - @Input() leafCategory: any = undefined; - @Input() isLastItem: boolean = undefined; - @Input() isBackgroundColor = false; - @Input() isTitleClickable = false; - @Input() isSmallTitle = false; - @Input() id; - @Input() attendeeButton = false; - @Input() dropButton = false; - @Input() duration = undefined; - @Input() count = undefined; - @Input() price = undefined; - @Input() isEditable = false; - @Input() showCalendar = false; - @Input() isEmailAllowed = false; - @Input() isPublicPage = false; - @Input() notFixedHeight = false; - @Input() maxHeight = false; - @Input() addMarginToDescription = false; - @Input() centeredTitle = false; - @Input() ribbon = { text: '', theme: '' }; - @Input() isPremium = false; - @Input() removeLineClamp = false; - @Input() markAsCompleted = false; - @Input() inProgress = false; - @Input() showHamburgerMenu = true; - @Input() showRateBar = false; - @Input() rateHeight = false; - @Input() completed = false; - - @Output() titleClicked = new EventEmitter(); - @Output() editButtonClicked = new EventEmitter(); - @Output() markAsCompletedButtonClicked = new EventEmitter(); - @Output() rateButtonClicked = new EventEmitter(); - - loading = false; - dateItem: string = undefined; - timeItem: string = undefined; - - URLS = URLS; - - constructor( - private loadingService: LoadingService, - private paymentService: PaymentService, - private router: Router, - private eventService: EventService, - private informationService: InformationService, - private userActivityService: UserActivityService - ) { - this.loadingService.sharedLoading.subscribe( loading => this.loading = loading ); - } - - ngOnInit(): void { - if ( this.date ) { - this.dateItem = formatDate( new Date( this.date ), 'MM/dd/yyyy', 'en-US' ); - this.timeItem = formatDate( new Date( this.date ), 'HH:mm', 'en-US' ); - } - } - - onClick(): void { - this.titleClicked.emit( this.id ); - } - - createCalendarEvent(): void { - const tmpDate: any = new Date( this.date ); - const start: DateArray = [ - tmpDate.getUTCFullYear(), - tmpDate.getUTCMonth() + 1, - tmpDate.getUTCDate(), - tmpDate.getUTCHours(), - tmpDate.getUTCMinutes() - ]; - - const categories: string[] = [ this.category.name ]; - if ( this.subCategory ) categories.push( this.subCategory.name ); - if ( this.leafCategory ) categories.push( this.leafCategory.name ); - - const organizer = { name: this.user.username }; - let description = this.description; - if ( this.user.email ) { - description += ` <${ this.user.email }>`; - } - - const event: EventAttributes = { - start, - startInputType: 'utc', - duration: { minutes: this.duration }, - title: this.title, - description, - url: this.link, - location: this.link, - categories, - organizer - }; - - createEvent( event, ( error, value ) => { - if ( error ) { - console.error( 'Error occurred while creating .ics file: ' + error ); - } else { - const blob = new Blob( [ value ], { type: 'text/calendar' } ); - - const anchor = document.createElement( 'a' ); - anchor.download = this.title + '.ics'; - anchor.href = ( window.webkitURL || window.URL ).createObjectURL( blob ); - anchor.dataset.downloadurl = [ 'text/calendar', anchor.download, anchor.href ].join( ':' ); - anchor.click(); - anchor.remove(); - } - } - ); - } - - buy() { - this.loadingService.setLoading( true ); - this.paymentService.initPayment( environment.payment.stripe, this.id, 1 ); - } - - onBuyNowClick() { - if ( this.isPublicPage ) { - this.router.navigate( [ URLS.dashboard.event ], { queryParams: { event_id: this.id } } ); - } else { - this.buy(); - } - } - - onAttendClick() { - if ( this.isPublicPage ) { - this.router.navigate( [ URLS.dashboard.event ], { queryParams: { event_id: this.id } } ); - } else { - this.eventService.attend( this.id ).subscribe( () => { - this.informationService.setInformation( `Attended to ${ this.title }`, 'info' ); - } ); - } - } - - onDropClick() { - if ( !this.isPublicPage ) { - this.eventService.drop( this.id ).subscribe( () => { - this.informationService.setInformation( `Drop ${ this.title }`, 'info' ); - } ); - } - } - - onMarkAsCompletedClick() { - this.eventService.markAsCompleted( this.id ).subscribe( () => { - this.informationService.setInformation( `Completed ${ this.title }`, 'info' ); - this.markAsCompletedButtonClicked.emit( this.id ); - } ); - } - - onEditClick() { - if ( this.isEditable ) { - this.editButtonClicked.emit( this.id ); - } - } - - onCategoryClick() { - this.router.navigate( [ URLS.dashboard.learn ], - { - queryParams: { - category: this.category.id, - 'sub-category': this.subCategory?.id, - 'leaf-category': this.leafCategory?.id - } - } ); - } - - onRateClick() { - this.userActivityService.rate( this.id, this.selectedRate ).subscribe( () => { - this.informationService.setInformation( `Rated ${ this.title }`, 'info' ); - this.rateButtonClicked.emit(); - } ); - } - - shareVia( brand: string ) { - let eventUrl: string; - - switch ( brand ) { - case 'twitter': - const related = this.category.name + ( this.subCategory ? ',' + this.subCategory.name : '' ) + - ( this.leafCategory ? ',' + this.leafCategory.name : '' ); - eventUrl = environmentCommon.website.twitter.shareUrl + environment.clientUrl - + URLS.dashboard.event + '?event_id=' + this.id + '&text=' + this.title + '&via=wecontribute_io' - + '&related=' + related; - break; - case 'linkedin': - eventUrl = environmentCommon.website.linkedin.shareUrl + encodeURIComponent( environment.clientUrl + URLS.dashboard.event - + '?event_id=' + this.id ); - } - - window.open( eventUrl, '_blank' ); - } - - onStarClick( rate: number ) { - this.selectedRate = rate; - } -} diff --git a/src/app/component/label/deprecated/event-hamburger-menu/event-hamburger-menu.component.html b/src/app/component/label/deprecated/event-hamburger-menu/event-hamburger-menu.component.html deleted file mode 100644 index 25169d77..00000000 --- a/src/app/component/label/deprecated/event-hamburger-menu/event-hamburger-menu.component.html +++ /dev/null @@ -1,27 +0,0 @@ -
- -
- -
-

Calendar

-
-
- - -
-
-
-
diff --git a/src/app/component/label/deprecated/event-hamburger-menu/event-hamburger-menu.component.scss b/src/app/component/label/deprecated/event-hamburger-menu/event-hamburger-menu.component.scss deleted file mode 100644 index d306cce8..00000000 --- a/src/app/component/label/deprecated/event-hamburger-menu/event-hamburger-menu.component.scss +++ /dev/null @@ -1,27 +0,0 @@ -.menu-list { - position: absolute; - right: 40px; - background-color: var(--card); - width: 140px; - border: none; - padding: 20px; - border-radius: 5px; - box-shadow: 0 3px 15px 0 var(--shadow); -} - -.content { - margin-top: 10px; - text-align: center; - width: -webkit-fit-content; - margin-left: auto; - margin-right: auto; - font-size: 13px; -} - -.calendar { - margin-top: 20px; -} - -.hamburger-menu i { - color: var(--color); -} diff --git a/src/app/component/label/deprecated/event-hamburger-menu/event-hamburger-menu.component.ts b/src/app/component/label/deprecated/event-hamburger-menu/event-hamburger-menu.component.ts deleted file mode 100644 index 95e97b05..00000000 --- a/src/app/component/label/deprecated/event-hamburger-menu/event-hamburger-menu.component.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { Component, ElementRef, EventEmitter, HostListener, Input, Output, ViewChild } from '@angular/core'; -import { environment } from '../../../../../environments/environment'; -import { environmentCommon } from '../../../../../environments/environment-common'; - -@Component( { - selector: 'app-event-hamburger-menu', - templateUrl: './event-hamburger-menu.component.html', - styleUrls: [ './event-hamburger-menu.component.scss' ] -} ) -export class EventHamburgerMenuComponent { - - display = false; - - environment = environment; - environmentCommon = environmentCommon; - - @ViewChild( 'menu' ) menu: ElementRef; - @ViewChild( 'icon' ) icon: ElementRef; - - @Input() showCalendar = false; - @Output() calendarClicked = new EventEmitter(); - @Output() shareViaClicked = new EventEmitter(); - - constructor( - private _eref: ElementRef - ) { - } - - @HostListener( 'document:click', [ '$event' ] ) - onDocumentClick( event ) { - if ( this.icon?.nativeElement.contains( event.target ) ) { - this.display = !this.display; - } else this.display = !!this.menu?.nativeElement.contains( event.target ); - } -} diff --git a/src/app/component/label/deprecated/label-data/label-data.component.html b/src/app/component/label/deprecated/label-data/label-data.component.html deleted file mode 100644 index c2599a09..00000000 --- a/src/app/component/label/deprecated/label-data/label-data.component.html +++ /dev/null @@ -1,12 +0,0 @@ -
-

{{label}}

-

{{data}}

- -
- {{data}} -
- -
diff --git a/src/app/component/label/deprecated/label-data/label-data.component.scss b/src/app/component/label/deprecated/label-data/label-data.component.scss deleted file mode 100644 index a8f54942..00000000 --- a/src/app/component/label/deprecated/label-data/label-data.component.scss +++ /dev/null @@ -1,18 +0,0 @@ -.label-data-block { - margin-bottom: 1em; - margin-left: 0.4em; -} - -.label-data-block.no-margin { - margin-bottom: 0; -} - -.label-data-block.contrast p { - color: var(--darker-contrast) -} - -.label-data-block.left-top-margin { - margin-left: 35px; - margin-bottom: 0px; - margin-top: 7px; -} diff --git a/src/app/component/label/deprecated/label-data/label-data.component.spec.ts b/src/app/component/label/deprecated/label-data/label-data.component.spec.ts deleted file mode 100644 index 920c9970..00000000 --- a/src/app/component/label/deprecated/label-data/label-data.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { LabelDataComponent } from './label-data.component'; - -describe( 'LabelDataComponent', () => { - let component: LabelDataComponent; - let fixture: ComponentFixture; - - beforeEach( async( () => { - TestBed.configureTestingModule( { - declarations: [ LabelDataComponent ] - } ) - .compileComponents(); - } ) ); - - beforeEach( () => { - fixture = TestBed.createComponent( LabelDataComponent ); - component = fixture.componentInstance; - fixture.detectChanges(); - } ); - - it( 'should create', () => { - expect( component ).toBeTruthy(); - } ); -} ); diff --git a/src/app/component/label/deprecated/label-data/label-data.component.ts b/src/app/component/label/deprecated/label-data/label-data.component.ts deleted file mode 100644 index 966fce6f..00000000 --- a/src/app/component/label/deprecated/label-data/label-data.component.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Component, Input } from '@angular/core'; - -@Component( { - selector: 'app-label-data', - templateUrl: './label-data.component.html', - styleUrls: [ './label-data.component.scss' ] -} ) -export class LabelDataComponent { - - @Input() label = ''; - @Input() data = ''; - @Input() isClickable = false; - @Input() noMargin = false; - @Input() contrast = false; - @Input() leftTopMargin = false; - @Input() dim = false; - @Input() highlight = false; -} diff --git a/src/app/component/label/deprecated/label-with-icon-data/label-with-icon-data.component.html b/src/app/component/label/deprecated/label-with-icon-data/label-with-icon-data.component.html deleted file mode 100644 index 799e7b35..00000000 --- a/src/app/component/label/deprecated/label-with-icon-data/label-with-icon-data.component.html +++ /dev/null @@ -1,28 +0,0 @@ -
- - -
- {{ data }} -
- -
- -
- -

{{data}}

- - - - {{data}} - - - {{data}} - -
diff --git a/src/app/component/label/deprecated/label-with-icon-data/label-with-icon-data.component.scss b/src/app/component/label/deprecated/label-with-icon-data/label-with-icon-data.component.scss deleted file mode 100644 index d54c6235..00000000 --- a/src/app/component/label/deprecated/label-with-icon-data/label-with-icon-data.component.scss +++ /dev/null @@ -1,44 +0,0 @@ -.icon-data-block { - margin-bottom: 0.5em; - width: fit-content; - color: var(--color); - white-space: pre-line; -} - -.icon-data-block a { - width: fit-content; -} - -.icon-data-block.fix-width a, .icon-data-block.fix-width p { - width: 260px; -} - -.icon-data-block.no-margin { - margin-bottom: 0; -} - -.icon-data-block.no-margin-icon i { - margin-top: auto; - margin-bottom: auto; -} - -.icon-data-block i { - margin-top: 0.2em; - margin-right: 0.5em; -} - -.twitter.icon-data-block { - color: var(--twitter); -} - -.facebook.icon-data-block { - color: var(--facebook); -} - -.youtube.icon-data-block { - color: var(--youtube); -} - -.times.icon-data-block { - color: var(--error); -} diff --git a/src/app/component/label/deprecated/label-with-icon-data/label-with-icon-data.component.spec.ts b/src/app/component/label/deprecated/label-with-icon-data/label-with-icon-data.component.spec.ts deleted file mode 100644 index 326e8eb5..00000000 --- a/src/app/component/label/deprecated/label-with-icon-data/label-with-icon-data.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { LabelWithIconDataComponent } from './label-with-icon-data.component'; - -describe( 'LabelWithIconDataComponent', () => { - let component: LabelWithIconDataComponent; - let fixture: ComponentFixture; - - beforeEach( async () => { - await TestBed.configureTestingModule( { - declarations: [ LabelWithIconDataComponent ] - } ) - .compileComponents(); - } ); - - beforeEach( () => { - fixture = TestBed.createComponent( LabelWithIconDataComponent ); - component = fixture.componentInstance; - fixture.detectChanges(); - } ); - - it( 'should create', () => { - expect( component ).toBeTruthy(); - } ); -} ); diff --git a/src/app/component/label/deprecated/label-with-icon-data/label-with-icon-data.component.ts b/src/app/component/label/deprecated/label-with-icon-data/label-with-icon-data.component.ts deleted file mode 100644 index 4740cd33..00000000 --- a/src/app/component/label/deprecated/label-with-icon-data/label-with-icon-data.component.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { Component, Input } from '@angular/core'; -import { URLS } from '../../../../data/navigation/navigation.data'; - -@Component( { - selector: 'app-label-with-icon-data', - templateUrl: './label-with-icon-data.component.html', - styleUrls: [ './label-with-icon-data.component.scss' ] -} ) -export class LabelWithIconDataComponent { - @Input() data = ''; - @Input() brand = ''; - @Input() user = ''; - @Input() solid = ''; - @Input() urlPrefix = 'http://'; - @Input() noMargin = false; - @Input() isClickable = false; - @Input() isClickableWithinApp = false; - @Input() highlight = false; - @Input() noMarginIcon = false; - @Input() target = '_blank'; - @Input() urlData: string = undefined; - @Input() queryParams: any = undefined; - @Input() fixWidth = false; - - URLS = URLS; - -} diff --git a/src/app/component/led/led.component.html b/src/app/component/led/led.component.html deleted file mode 100644 index b00444a1..00000000 --- a/src/app/component/led/led.component.html +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/src/app/component/led/led.component.scss b/src/app/component/led/led.component.scss deleted file mode 100644 index ab87988b..00000000 --- a/src/app/component/led/led.component.scss +++ /dev/null @@ -1,41 +0,0 @@ -@mixin set-led-color($information-type) { - .led.#{$information-type} { - background-color: var(--#{$information-type}); - box-shadow: var(--shadow-darker) 0 -1px 7px 1px, inset var(--#{$information-type}-darker) 0 -1px 9px, var(--#{$information-type}-lighter) 0 2px 12px; - - &.animate { - animation: { - name: led-keyframes-#{$information-type}; - duration: 1.5s; - direction: normal; - timing-function: ease-in-out; - iteration-count: infinite; - } - } - } - - @keyframes led-keyframes-#{$information-type} { - 0% { - box-shadow: var(--shadow-darker) 0 -1px 7px 1px, inset var(--#{$information-type}-darker) 0 -1px 9px, var(--#{$information-type}-lighter) 0 2px 12px; - } - - 50% { - box-shadow: var(--shadow-darker) 0 -1px 7px 1px, inset var(--#{$information-type}-lighter) 0 -1px 9px, var(--#{$information-type}-lighter) 0 2px 12px; - } - - 100% { - box-shadow: var(--shadow-darker) 0 -1px 7px 1px, inset var(--#{$information-type}-darker) 0 -1px 9px, var(--#{$information-type}-lighter) 0 2px 12px; - } - } -} - -@include set-led-color("error"); -@include set-led-color("warning"); -@include set-led-color("success"); -@include set-led-color("info"); - -.led { - width: 12px; - height: 12px; - border-radius: 50%; -} diff --git a/src/app/component/led/led.component.spec.ts b/src/app/component/led/led.component.spec.ts deleted file mode 100644 index faf6a6e6..00000000 --- a/src/app/component/led/led.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { LedComponent } from './led.component'; - -describe( 'LedComponent', () => { - let component: LedComponent; - let fixture: ComponentFixture; - - beforeEach( async () => { - await TestBed.configureTestingModule( { - declarations: [ LedComponent ] - } ) - .compileComponents(); - } ); - - beforeEach( () => { - fixture = TestBed.createComponent( LedComponent ); - component = fixture.componentInstance; - fixture.detectChanges(); - } ); - - it( 'should create', () => { - expect( component ).toBeTruthy(); - } ); -} ); diff --git a/src/app/component/led/led.component.ts b/src/app/component/led/led.component.ts deleted file mode 100644 index ad590d7c..00000000 --- a/src/app/component/led/led.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, Input } from '@angular/core'; - -@Component( { - selector: 'app-led', - templateUrl: './led.component.html', - styleUrls: [ './led.component.scss' ] -} ) -export class LedComponent { - - @Input() informationType = ''; - - constructor() { - // Intentionally blank - } -} diff --git a/src/app/component/nav/bottom-nav/bottom-nav.component.html b/src/app/component/nav/bottom-nav/bottom-nav.component.html deleted file mode 100644 index 440e5b0d..00000000 --- a/src/app/component/nav/bottom-nav/bottom-nav.component.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - diff --git a/src/app/component/nav/bottom-nav/bottom-nav.component.scss b/src/app/component/nav/bottom-nav/bottom-nav.component.scss deleted file mode 100644 index 28ed675f..00000000 --- a/src/app/component/nav/bottom-nav/bottom-nav.component.scss +++ /dev/null @@ -1,86 +0,0 @@ -.bottom-nav { - position: fixed; - bottom: 0; - left: 0; - height: 55px; - width: 100vw; - display: flex; - justify-content: flex-start; - overflow-x: auto; - - box-shadow: 0 0 5px var(--shadow); - z-index: 11; - padding-bottom: env(safe-area-inset-bottom); - - background-color: var(--background-color-alpha); - -webkit-backdrop-filter: blur(10px); - backdrop-filter: blur(10px); -} - -.bottom-nav a { - flex: 1; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - min-width: 25vw; - overflow: hidden; - white-space: nowrap; - font-size: 13px; - transition: background-color 0.1s ease-in-out; - cursor: pointer; -} - -.login { - color: var(--theme-color); - border-bottom: var(--theme-color) 1px solid; -} - -.bottom-nav a i { - margin: 0.2em; - font-size: 19px; -} - -.bottom-nav .contact { - color: var(--theme-color); - border-radius: 0; - border-bottom: var(--theme-color) 1px solid; -} - -.bottom-nav .contact span { - font-size: 0.8em; -} - -.bottom-nav .contact:hover { - color: white; - border-radius: 3px; - background: var(--theme-color); -} - -@media only screen and (max-width: 999px) { - .bottom-nav { - visibility: visible; - } -} - -@media only screen and (min-width: 1000px) { - .bottom-nav { - visibility: hidden; - } -} - -@media (hover: hover) { - .bottom-nav a:hover { - background: var(--hover); - } - - .bottom-nav .non-clickable:hover { - background: none; - cursor: auto; - } - - .bottom-nav .login:hover { - color: white; - background: var(--theme-color); - } -} diff --git a/src/app/component/nav/bottom-nav/bottom-nav.component.spec.ts b/src/app/component/nav/bottom-nav/bottom-nav.component.spec.ts deleted file mode 100644 index 58477520..00000000 --- a/src/app/component/nav/bottom-nav/bottom-nav.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { BottomNavComponent } from './bottom-nav.component'; - -describe( 'BottomNavComponent', () => { - let component: BottomNavComponent; - let fixture: ComponentFixture; - - beforeEach( async( () => { - TestBed.configureTestingModule( { - declarations: [ BottomNavComponent ] - } ) - .compileComponents(); - } ) ); - - beforeEach( () => { - fixture = TestBed.createComponent( BottomNavComponent ); - component = fixture.componentInstance; - fixture.detectChanges(); - } ); - - it( 'should create', () => { - expect( component ).toBeTruthy(); - } ); -} ); diff --git a/src/app/component/nav/bottom-nav/bottom-nav.component.ts b/src/app/component/nav/bottom-nav/bottom-nav.component.ts deleted file mode 100644 index 8de9001f..00000000 --- a/src/app/component/nav/bottom-nav/bottom-nav.component.ts +++ /dev/null @@ -1,66 +0,0 @@ -import { Component, ElementRef, ViewChild } from '@angular/core'; -import { Router } from '@angular/router'; -import { PRODUCT_LINES, SERVICES } from 'src/app/data/product/product.data'; -import { URLS } from '../../../data/navigation/navigation.data'; -import { AuthToken } from '../../../model/auth/auth-token.model'; -import { ProductLine } from '../../../model/product/product.model'; -import { AuthenticationService } from '../../../service/auth/authentication.service'; -import { BusinessLogicService } from '../../../service/business-logic/business-logic.service'; -import { LoadingService } from '../../../service/loading/loading.service'; - -@Component( { - selector: 'app-bottom-nav', - templateUrl: './bottom-nav.component.html', - styleUrls: [ './bottom-nav.component.scss' ] -} ) -export class BottomNavComponent { - - currentUser: AuthToken; - userInfo: any = {}; - loading = false; - openSettings = false; - openOtherSettings = false; - - URLS = URLS; - - PRODUCT_LINES: ProductLine[] = PRODUCT_LINES; - SERVICES: ProductLine[] = SERVICES; - - @ViewChild( 'dropdownMenuProducts' ) dropdownMenuProducts: ElementRef; - @ViewChild( 'dropdownMenuServices' ) dropdownMenuServices: ElementRef; - - constructor( - private router: Router, - private authenticationService: AuthenticationService, - private loadingService: LoadingService, - private businessLogicService: BusinessLogicService, - ) { - this.authenticationService.currentUser.subscribe( currentUser => { - this.currentUser = currentUser; - } ); - - this.loadingService.sharedLoading.subscribe( loading => this.loading = loading ); - - this.businessLogicService.userInfo.subscribe( userInfo => { - if ( userInfo ) { - this.userInfo = userInfo; - } - } - ); - } - - logout() { - this.authenticationService.logout(); - this.router.navigate( [ '/' ] ).then( () => { - return true; - } ); - } - - closeSettings() { - if ( this.openOtherSettings ) { - this.openOtherSettings = false; - } else { - this.openSettings = false; - } - } -} diff --git a/src/app/component/nav/dashboard/dashboard-layout-bottom-nav/dashboard-layout-bottom-nav.component.html b/src/app/component/nav/dashboard/dashboard-layout-bottom-nav/dashboard-layout-bottom-nav.component.html new file mode 100644 index 00000000..5b9c24b3 --- /dev/null +++ b/src/app/component/nav/dashboard/dashboard-layout-bottom-nav/dashboard-layout-bottom-nav.component.html @@ -0,0 +1,50 @@ + diff --git a/src/app/component/nav/dashboard/dashboard-layout-bottom-nav/dashboard-layout-bottom-nav.component.scss b/src/app/component/nav/dashboard/dashboard-layout-bottom-nav/dashboard-layout-bottom-nav.component.scss new file mode 100644 index 00000000..e8d61ce8 --- /dev/null +++ b/src/app/component/nav/dashboard/dashboard-layout-bottom-nav/dashboard-layout-bottom-nav.component.scss @@ -0,0 +1,21 @@ +@use '../../../../../styles/bottom-nav/bottom-nav'; + +.profile-img-small { + width: 24px; + height: 24px; + margin: 0.2em; + box-shadow: 0 2px 2px var(--shadow-dark-mode); + box-sizing: border-box; +} + +@media only screen and (max-width: 999px) { + .bottom-nav { + visibility: visible; + } +} + +@media only screen and (min-width: 1000px) { + .bottom-nav { + visibility: hidden; + } +} diff --git a/src/app/component/nav/dashboard/dashboard-layout-bottom-nav/dashboard-layout-bottom-nav.component.spec.ts b/src/app/component/nav/dashboard/dashboard-layout-bottom-nav/dashboard-layout-bottom-nav.component.spec.ts new file mode 100644 index 00000000..0aed3adc --- /dev/null +++ b/src/app/component/nav/dashboard/dashboard-layout-bottom-nav/dashboard-layout-bottom-nav.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { DashboardLayoutBottomNavComponent } from './dashboard-layout-bottom-nav.component'; + +describe( 'DashboardLayoutBottomNavComponent', () => { + let component: DashboardLayoutBottomNavComponent; + let fixture: ComponentFixture; + + beforeEach( async () => { + await TestBed.configureTestingModule( { + declarations: [ DashboardLayoutBottomNavComponent ] + } ) + .compileComponents(); + } ); + + beforeEach( () => { + fixture = TestBed.createComponent( DashboardLayoutBottomNavComponent ); + component = fixture.componentInstance; + fixture.detectChanges(); + } ); + + it( 'should create', () => { + expect( component ).toBeTruthy(); + } ); +} ); diff --git a/src/app/component/nav/dashboard/dashboard-layout-bottom-nav/dashboard-layout-bottom-nav.component.ts b/src/app/component/nav/dashboard/dashboard-layout-bottom-nav/dashboard-layout-bottom-nav.component.ts new file mode 100644 index 00000000..c6d974c4 --- /dev/null +++ b/src/app/component/nav/dashboard/dashboard-layout-bottom-nav/dashboard-layout-bottom-nav.component.ts @@ -0,0 +1,86 @@ +import { Component, ElementRef, ViewChild } from '@angular/core'; +import { Router } from '@angular/router'; +import { URLS } from '../../../../data/navigation/navigation.data'; +import { PROFILE_IMG } from '../../../../data/profile/profile.data'; +import { AuthToken } from '../../../../model/auth/auth-token.model'; +import { AuthenticationService } from '../../../../service/auth/authentication.service'; +import { BusinessLogicService } from '../../../../service/business-logic/business-logic.service'; +import { FileStorageService } from '../../../../service/file-storage/file-storage.service'; +import { LoadingService } from '../../../../service/loading/loading.service'; +import { NotificationService } from '../../../../service/notification/notification.service'; +import { ProductService } from '../../../../service/product/product.service'; + +@Component( { + selector: 'app-dashboard-layout-bottom-nav', + templateUrl: './dashboard-layout-bottom-nav.component.html', + styleUrls: [ './dashboard-layout-bottom-nav.component.scss' ], +} ) +export class DashboardLayoutBottomNavComponent { + currentUser: AuthToken; + userInfo: any = {}; + loading = false; + settingsOpened = false; + moreOpened = false; + profileImg = PROFILE_IMG; + userIsPremium = undefined; + + notifications: any[] = []; + + URLS = URLS; + + @ViewChild( 'dropdownMenuProducts' ) dropdownMenuProducts: ElementRef; + @ViewChild( 'dropdownMenuServices' ) dropdownMenuServices: ElementRef; + + constructor( + private router: Router, + private authenticationService: AuthenticationService, + private loadingService: LoadingService, + private businessLogicService: BusinessLogicService, + private fileStorageService: FileStorageService, + private productService: ProductService, + private notificationService: NotificationService + ) { + this.authenticationService.currentUser.subscribe( ( currentUser ) => { + this.currentUser = currentUser; + } ); + + this.loadingService.sharedLoading.subscribe( + ( loading ) => ( this.loading = loading ) + ); + + this.businessLogicService.userInfo.subscribe( ( userInfo ) => { + if ( userInfo ) { + this.userInfo = userInfo; + } + + if ( this.userInfo.profileImg ) { + this.profileImg = userInfo.profileImg; + } + } ); + + this.fileStorageService.sharedProfileImage.subscribe( ( profileImg ) => { + if ( profileImg?.file?.url ) { + this.profileImg = profileImg.file.url; + } else if ( profileImg?.file?.data ) { + this.profileImg = 'data:image/png;base64,' + profileImg.file.data; + } + } ); + + this.productService.premiumProducts.subscribe( ( products ) => { + this.userIsPremium = products?.length > 0; + } ); + + this.notificationService.notifications.subscribe( ( notifications ) => { + this.notifications = notifications.filter( + ( notification ) => !notification.read + ); + } ); + } + + logout() { + this.authenticationService.logout(); + this.router.navigate( [ '/' ] ).then( () => { + return true; + } ); + } +} diff --git a/src/app/component/nav/dashboard/dashboard-layout-side-nav/dashboard-layout-side-nav.component.html b/src/app/component/nav/dashboard/dashboard-layout-side-nav/dashboard-layout-side-nav.component.html index 91343da6..cdd97275 100644 --- a/src/app/component/nav/dashboard/dashboard-layout-side-nav/dashboard-layout-side-nav.component.html +++ b/src/app/component/nav/dashboard/dashboard-layout-side-nav/dashboard-layout-side-nav.component.html @@ -2,97 +2,92 @@ diff --git a/src/app/component/nav/dashboard/dashboard-layout-side-nav/dashboard-layout-side-nav.component.scss b/src/app/component/nav/dashboard/dashboard-layout-side-nav/dashboard-layout-side-nav.component.scss index 1a78a84d..221843d5 100644 --- a/src/app/component/nav/dashboard/dashboard-layout-side-nav/dashboard-layout-side-nav.component.scss +++ b/src/app/component/nav/dashboard/dashboard-layout-side-nav/dashboard-layout-side-nav.component.scss @@ -1,3 +1,5 @@ +@use "../../../../../styles/util/util"; + .side-nav-wrapper { height: 100vh; margin: 0; @@ -19,6 +21,32 @@ overflow-x: hidden; overflow-y: scroll; padding: 0 0 0 env(safe-area-inset-left); + + & a { + position: relative; + + & .notifications { + @include util.flex-layout-row; + @include util.flex-center-center; + + border-radius: 100%; + width: 18px; + height: 18px; + box-sizing: border-box; + box-shadow: 0 -6px 15px -7px var(--shadow); + border: 1px solid var(--card); + background-color: var(--error); + color: var(--card); + + position: absolute; + left: 40px; + top: 24px; + + &.smaller-font { + font-size: 11px; + } + } + } } .side-nav a, .side-nav .dashboard-layout-side-nav-search { @@ -66,7 +94,7 @@ .side-nav-sub { display: flex; width: 100%; - min-height: 240px; + min-height: 160px; flex-direction: column; box-shadow: 0 0 14px 0 var(--shadow); } diff --git a/src/app/component/nav/dashboard/dashboard-layout-side-nav/dashboard-layout-side-nav.component.ts b/src/app/component/nav/dashboard/dashboard-layout-side-nav/dashboard-layout-side-nav.component.ts index 536e57aa..6ab561b4 100644 --- a/src/app/component/nav/dashboard/dashboard-layout-side-nav/dashboard-layout-side-nav.component.ts +++ b/src/app/component/nav/dashboard/dashboard-layout-side-nav/dashboard-layout-side-nav.component.ts @@ -1,4 +1,4 @@ -import { Component, ElementRef, HostListener, ViewChild } from '@angular/core'; +import { Component, ElementRef, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { BRAND } from '../../../../data/brand/brand.data'; import { URLS } from '../../../../data/navigation/navigation.data'; @@ -6,76 +6,78 @@ import { PROFILE_IMG } from '../../../../data/profile/profile.data'; import { AuthToken } from '../../../../model/auth/auth-token.model'; import { AuthenticationService } from '../../../../service/auth/authentication.service'; import { BusinessLogicService } from '../../../../service/business-logic/business-logic.service'; -import { CategoryService } from '../../../../service/category/category.service'; import { FileStorageService } from '../../../../service/file-storage/file-storage.service'; +import { NotificationService } from '../../../../service/notification/notification.service'; +import { ProductService } from '../../../../service/product/product.service'; import { ThemeService } from '../../../../service/theme/theme.service'; @Component( { selector: 'app-dashboard-layout-side-nav', templateUrl: './dashboard-layout-side-nav.component.html', - styleUrls: [ './dashboard-layout-side-nav.component.scss' ] + styleUrls: [ './dashboard-layout-side-nav.component.scss' ], } ) export class DashboardLayoutSideNavComponent { - + userIsPremium; sideNavClosed = 'false'; userInfo: any = {}; profileImg = PROFILE_IMG; - userSearchResults = []; - categorySearchResults = []; - searchEnabled = true; URLS = URLS; BRAND = BRAND; currentUser: AuthToken; - openSettings = false; - openOtherSettings = false; + settingsOpened = false; + settingsMoreOpened = false; @ViewChild( 'searchArea' ) searchArea: ElementRef; + notifications: any[] = []; + constructor( private router: Router, private authenticationService: AuthenticationService, private businessLogicService: BusinessLogicService, private fileStorageService: FileStorageService, private themeService: ThemeService, - private categoryService: CategoryService + private productService: ProductService, + private notificationService: NotificationService ) { - this.authenticationService.currentUser.subscribe( currentUser => { + this.authenticationService.currentUser.subscribe( ( currentUser ) => { this.currentUser = currentUser; } ); - this.themeService.sideNavClosed.subscribe( sideNavClosed => { + this.themeService.sideNavClosed.subscribe( ( sideNavClosed ) => { this.sideNavClosed = sideNavClosed; } ); - this.businessLogicService.userInfo.subscribe( userInfo => { - if ( userInfo ) { - this.userInfo = userInfo; - } + this.businessLogicService.userInfo.subscribe( ( userInfo ) => { + if ( userInfo ) { + this.userInfo = userInfo; + } - if ( this.userInfo.profileImg ) { - this.profileImg = userInfo.profileImg; - } - } - ); + if ( this.userInfo.profileImg ) { + this.profileImg = userInfo.profileImg; + } + } ); - this.fileStorageService.sharedProfileImage.subscribe( profileImg => { - if ( profileImg?.file?.data ) { - this.profileImg = 'data:image/png;base64,' + profileImg.file.data; - } - } - ); - } + this.fileStorageService.sharedProfileImage?.subscribe( ( profileImg ) => { + if ( profileImg?.file?.url ) { + this.profileImg = profileImg.file.url; + } else if ( profileImg?.file?.data ) { + this.profileImg = 'data:image/png;base64,' + profileImg.file.data; + } + } ); + + this.productService.premiumProducts.subscribe( ( products ) => { + this.userIsPremium = products?.length > 0; + } ); - @HostListener( 'document:click', [ '$event' ] ) - onDocumentClick( event ) { - if ( this.searchArea?.nativeElement.contains( event.target ) ) { - this.searchEnabled = true; - } else { - this.searchEnabled = false; - } + this.notificationService.notifications.subscribe( ( notifications ) => { + this.notifications = notifications.filter( + ( notification ) => !notification.read + ); + } ); } logout() { @@ -88,22 +90,4 @@ export class DashboardLayoutSideNavComponent { toggleSideNav() { this.themeService.toggleSideNav(); } - - search( event: any ) { - const q = event.target.value; - - if ( !q || q.length < 3 ) { - this.userSearchResults = []; - this.categorySearchResults = []; - return; - } - - this.businessLogicService.search( q ).subscribe( results => { - this.userSearchResults = results.slice( 0, 10 ); - } ); - - this.categoryService.search( q ).subscribe( results => { - this.categorySearchResults = results.slice( 0, 10 ); - } ); - } } diff --git a/src/app/component/nav/dashboard/dashboard-layout-top-nav/dashboard-layout-top-nav.component.html b/src/app/component/nav/dashboard/dashboard-layout-top-nav/dashboard-layout-top-nav.component.html index c81398f9..1542c9ae 100644 --- a/src/app/component/nav/dashboard/dashboard-layout-top-nav/dashboard-layout-top-nav.component.html +++ b/src/app/component/nav/dashboard/dashboard-layout-top-nav/dashboard-layout-top-nav.component.html @@ -8,26 +8,9 @@ - - profile img - -
- - - - -
- - - +
diff --git a/src/app/component/nav/dashboard/dashboard-layout-top-nav/dashboard-layout-top-nav.component.ts b/src/app/component/nav/dashboard/dashboard-layout-top-nav/dashboard-layout-top-nav.component.ts index c200e9ae..d33b66fb 100644 --- a/src/app/component/nav/dashboard/dashboard-layout-top-nav/dashboard-layout-top-nav.component.ts +++ b/src/app/component/nav/dashboard/dashboard-layout-top-nav/dashboard-layout-top-nav.component.ts @@ -3,23 +3,22 @@ import { BRAND } from '../../../../data/brand/brand.data'; import { URLS } from '../../../../data/navigation/navigation.data'; import { PROFILE_IMG } from '../../../../data/profile/profile.data'; import { BusinessLogicService } from '../../../../service/business-logic/business-logic.service'; -import { CategoryService } from '../../../../service/category/category.service'; import { FileStorageService } from '../../../../service/file-storage/file-storage.service'; import { LoadingService } from '../../../../service/loading/loading.service'; +import { ProductService } from '../../../../service/product/product.service'; @Component( { selector: 'app-dashboard-layout-top-nav', templateUrl: './dashboard-layout-top-nav.component.html', - styleUrls: [ './dashboard-layout-top-nav.component.scss' ] + styleUrls: [ './dashboard-layout-top-nav.component.scss' ], } ) export class DashboardLayoutTopNavComponent { - userInfo: any = {}; loading = false; profileImg = PROFILE_IMG; + userIsPremium; - userSearchResults = []; - categorySearchResults = []; + searchResults = []; searchEnabled = true; @@ -33,27 +32,33 @@ export class DashboardLayoutTopNavComponent { private fileStorageService: FileStorageService, private loadingService: LoadingService, private _eref: ElementRef, - private categoryService: CategoryService + private productService: ProductService ) { - this.businessLogicService.userInfo.subscribe( userInfo => { - if ( userInfo ) { - this.userInfo = userInfo; - } + this.businessLogicService.userInfo.subscribe( ( userInfo ) => { + if ( userInfo ) { + this.userInfo = userInfo; + } - if ( this.userInfo.profileImg ) { - this.profileImg = userInfo.profileImg; - } - } - ); + if ( this.userInfo.profileImg ) { + this.profileImg = userInfo.profileImg; + } + } ); + + this.fileStorageService.sharedProfileImage.subscribe( ( profileImg ) => { + if ( profileImg?.file?.url ) { + this.profileImg = profileImg.file.url; + } else if ( profileImg?.file?.data ) { + this.profileImg = 'data:image/png;base64,' + profileImg.file.data; + } + } ); - this.fileStorageService.sharedProfileImage.subscribe( profileImg => { - if ( profileImg?.file?.data ) { - this.profileImg = 'data:image/png;base64,' + profileImg.file.data; - } - } + this.loadingService.sharedLoading.subscribe( + ( loading ) => ( this.loading = loading ) ); - this.loadingService.sharedLoading.subscribe( loading => this.loading = loading ); + this.productService.premiumProducts.subscribe( ( products ) => { + this.userIsPremium = products?.length > 0; + } ); } @HostListener( 'document:click', [ '$event' ] ) @@ -65,17 +70,7 @@ export class DashboardLayoutTopNavComponent { const q = event.target.value; if ( !q || q.length < 3 ) { - this.userSearchResults = []; - this.categorySearchResults = []; - return; + this.searchResults = []; } - - this.businessLogicService.search( q ).subscribe( results => { - this.userSearchResults = results.slice( 0, 10 ); - } ); - - this.categoryService.search( q ).subscribe( results => { - this.categorySearchResults = results.slice( 0, 10 ); - } ); } } diff --git a/src/app/component/nav/footer/footer.component.html b/src/app/component/nav/footer/footer.component.html index bee6d563..570580f3 100644 --- a/src/app/component/nav/footer/footer.component.html +++ b/src/app/component/nav/footer/footer.component.html @@ -1,128 +1,59 @@
-

Products

-
-

{{ productLine.name }}

- - {{ product.name }} + +

Company

+ + {{ companyPage.name }} + + {{ companyPage.name }} + + + +
+
+ +

Developers

+ + + {{ developersPage.name }} -
+ + {{ developersPage.name }} + + +
-
-
-
-

{{ productLine.name }}

- - {{ product.name }} - -
-
-

Company

- - About - - - Customers - - - Partners - - - Branding - - - - Jobs - - - - Blog - -
-
-
-
-

Developers

- - - Open Source - - - - Docs - - - API - - - Status - -
-
-

Resources

- - Support - - - Contact - - - Terms & Conditions - - - Privacy - - - Cookies - - - Sitemap - -
-
+
+ +

Resources

+ + + {{ resourcePage.name }} + + + {{ resourcePage.name }} + + +
- + -

Open Template Hub © 2021

+

{{ BRAND.name }} © 2023
- - - - - - - - - - - + +
@@ -138,7 +69,6 @@

Open Template Hub © 2021

-
diff --git a/src/app/component/nav/footer/footer.component.scss b/src/app/component/nav/footer/footer.component.scss index 054e9d09..41d6384c 100644 --- a/src/app/component/nav/footer/footer.component.scss +++ b/src/app/component/nav/footer/footer.component.scss @@ -1,5 +1,9 @@ @use '../../../../styles/util/util'; +p { + word-break: initial; +} + .footer { display: flex; flex-direction: column; @@ -14,7 +18,9 @@ width: 95%; display: flex; flex-direction: row; - justify-content: flex-start; + justify-content: space-around; + margin-left: 65px; + margin-right: auto; align-items: flex-start; flex-wrap: wrap; } @@ -25,6 +31,7 @@ width: 90%; margin-top: 25px; justify-content: flex-start; + flex-wrap: wrap; & a { display: flex; @@ -68,6 +75,8 @@ align-items: center; justify-content: center; flex-direction: column; + margin-left: 65px; + margin-right: auto; & .footer-link-group { width: 100%; @@ -115,6 +124,10 @@ margin-bottom: calc(55px + env(safe-area-inset-bottom)); } + .footer-links-wrapper { + margin-left: 0; + } + .footer-link-column { max-width: 50%; width: 50%; @@ -179,7 +192,6 @@ } .footer-link-column { - width: 33%; & p, & a, & app-ext-link { width: 200px; diff --git a/src/app/component/nav/footer/footer.component.ts b/src/app/component/nav/footer/footer.component.ts index 3164f9b3..bb53860c 100644 --- a/src/app/component/nav/footer/footer.component.ts +++ b/src/app/component/nav/footer/footer.component.ts @@ -1,10 +1,14 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { PRODUCT_LINES, SERVICES } from 'src/app/data/product/product.data'; +import { PRODUCT_LINES } from 'src/app/data/product/product.data'; import { environment } from 'src/environments/environment'; import { environmentCommon } from 'src/environments/environment-common'; +import { BRAND_PAGES } from '../../../data/brand-pages/brand-pages.data'; import { BRAND } from '../../../data/brand/brand.data'; +import { COMPANY_PAGES } from '../../../data/company/company.data'; +import { DEVELOPERS_PAGES } from '../../../data/developers/developers.data'; import { URLS } from '../../../data/navigation/navigation.data'; +import { RESOURCES_PAGES } from '../../../data/resources/resources.data'; import { DarkLightSettings } from '../../../data/theme/theme.data'; import { ProductLine } from '../../../model/product/product.model'; import { ThemeService } from '../../../service/theme/theme.service'; @@ -22,9 +26,12 @@ export class FooterComponent { popupPadding = false; PRODUCT_LINES: ProductLine[] = PRODUCT_LINES; - SERVICES: ProductLine[] = SERVICES; BRAND = BRAND; URLS = URLS; + COMPANY_PAGES = COMPANY_PAGES; + DEVELOPERS_PAGES = DEVELOPERS_PAGES; + RESOURCES_PAGES = RESOURCES_PAGES; + BRAND_PAGES = BRAND_PAGES; POWERED_BY_LIGHT = 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/badge/powered-by-light-mode.min.png'; POWERED_BY_DARK = 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/badge/powered-by-dark-mode.min.png'; @@ -51,8 +58,12 @@ export class FooterComponent { getSrcWithDarkLightSetting( darkLightSetting: string, light: string, dark: string ) { switch ( darkLightSetting ) { - case DarkLightSettings.light: { return light; } - case DarkLightSettings.dark: { return dark; } + case DarkLightSettings.light: { + return light; + } + case DarkLightSettings.dark: { + return dark; + } case DarkLightSettings.auto: default: { window.matchMedia( '(prefers-color-scheme: dark)' ).addEventListener( 'change', () => { diff --git a/src/app/component/nav/landing/landing-layout-bottom-nav/landing-layout-bottom-nav.component.html b/src/app/component/nav/landing/landing-layout-bottom-nav/landing-layout-bottom-nav.component.html new file mode 100644 index 00000000..78e85ba9 --- /dev/null +++ b/src/app/component/nav/landing/landing-layout-bottom-nav/landing-layout-bottom-nav.component.html @@ -0,0 +1,22 @@ + diff --git a/src/app/component/nav/landing/landing-layout-bottom-nav/landing-layout-bottom-nav.component.scss b/src/app/component/nav/landing/landing-layout-bottom-nav/landing-layout-bottom-nav.component.scss new file mode 100644 index 00000000..04af51a9 --- /dev/null +++ b/src/app/component/nav/landing/landing-layout-bottom-nav/landing-layout-bottom-nav.component.scss @@ -0,0 +1,13 @@ +@use '../../../../../styles/bottom-nav/bottom-nav'; + +@media only screen and (max-width: 999px) { + .bottom-nav { + visibility: visible; + } +} + +@media only screen and (min-width: 1000px) { + .bottom-nav { + visibility: hidden; + } +} diff --git a/src/app/component/nav/landing/landing-layout-bottom-nav/landing-layout-bottom-nav.component.spec.ts b/src/app/component/nav/landing/landing-layout-bottom-nav/landing-layout-bottom-nav.component.spec.ts new file mode 100644 index 00000000..c764a897 --- /dev/null +++ b/src/app/component/nav/landing/landing-layout-bottom-nav/landing-layout-bottom-nav.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { LandingLayoutBottomNavComponent } from './landing-layout-bottom-nav.component'; + +describe( 'LandingLayoutBottomNavComponent', () => { + let component: LandingLayoutBottomNavComponent; + let fixture: ComponentFixture; + + beforeEach( async( () => { + TestBed.configureTestingModule( { + declarations: [ LandingLayoutBottomNavComponent ] + } ) + .compileComponents(); + } ) ); + + beforeEach( () => { + fixture = TestBed.createComponent( LandingLayoutBottomNavComponent ); + component = fixture.componentInstance; + fixture.detectChanges(); + } ); + + it( 'should create', () => { + expect( component ).toBeTruthy(); + } ); +} ); diff --git a/src/app/component/nav/landing/landing-layout-bottom-nav/landing-layout-bottom-nav.component.ts b/src/app/component/nav/landing/landing-layout-bottom-nav/landing-layout-bottom-nav.component.ts new file mode 100644 index 00000000..dc3324bf --- /dev/null +++ b/src/app/component/nav/landing/landing-layout-bottom-nav/landing-layout-bottom-nav.component.ts @@ -0,0 +1,44 @@ +import { Component } from '@angular/core'; +import { Router } from '@angular/router'; +import { environmentCommon } from '../../../../../environments/environment-common'; +import { URLS } from '../../../../data/navigation/navigation.data'; +import { AuthToken } from '../../../../model/auth/auth-token.model'; +import { AuthenticationService } from '../../../../service/auth/authentication.service'; +import { BusinessLogicService } from '../../../../service/business-logic/business-logic.service'; +import { LoadingService } from '../../../../service/loading/loading.service'; + +@Component( { + selector: 'app-landing-layout-bottom-nav', + templateUrl: './landing-layout-bottom-nav.component.html', + styleUrls: [ './landing-layout-bottom-nav.component.scss' ] +} ) +export class LandingLayoutBottomNavComponent { + + currentUser: AuthToken; + userInfo: any = {}; + loading = false; + + environmentCommon = environmentCommon; + + URLS = URLS; + + constructor( + private router: Router, + private authenticationService: AuthenticationService, + private loadingService: LoadingService, + private businessLogicService: BusinessLogicService, + ) { + this.authenticationService.currentUser.subscribe( currentUser => { + this.currentUser = currentUser; + } ); + + this.loadingService.sharedLoading.subscribe( loading => this.loading = loading ); + + this.businessLogicService.userInfo.subscribe( userInfo => { + if ( userInfo ) { + this.userInfo = userInfo; + } + } + ); + } +} diff --git a/src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.html b/src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.html index 6db9007f..133b94d7 100644 --- a/src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.html +++ b/src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.html @@ -1,43 +1,62 @@ - diff --git a/src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.scss b/src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.scss index 71aff322..3ec21fef 100644 --- a/src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.scss +++ b/src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.scss @@ -1,56 +1,101 @@ @use '../../../../../styles/util/util'; .top-nav { - height: 50px; - padding: 20px 45px; - display: flex; + @include util.flex-layout-row; + @include util.flex-center-center; + + height: 90px; + padding: 0 45px; box-shadow: 5px 0 10px var(--shadow); background-color: var(--background-color-alpha); -webkit-backdrop-filter: blur(10px); backdrop-filter: blur(10px); & a { - padding: 10px 17px; - display: inline-flex; + @include util.flex-layout-column; + + justify-content: flex-end; align-items: center; - font-size: 14px; + + padding: 0 20px; + box-sizing: border-box; + + height: 50px; + + font-size: 13px; font-weight: 500; - margin-right: 10px; + margin-left: 5px; + + position: relative; + + & .notifications { + @include util.flex-layout-row; + @include util.flex-center-center; + + border-radius: 100%; + width: 18px; + height: 18px; + box-sizing: border-box; + box-shadow: 0 -6px 15px -7px var(--shadow); + border: 1px solid var(--card); + background-color: var(--error); + color: var(--card); + + position: absolute; + left: 57px; + top: 2px; + + &.smaller-font { + font-size: 11px; + } + } + + & i { + font-size: 21px; + + margin-right: 0.15em; + + &.caret { + font-size: 18px; + margin-left: 0.25em; + } + } + + & span { + padding-top: 5px; + } + + &.brand { + @include util.flex-layout-row; + font-size: 14px; + margin-right: 10px; + } } } -.brand { - margin-right: 10px; -} - -.top-nav .right-item-wrapper .contact { - +.top-nav .right-item-wrapper .sign-up { border-bottom: var(--theme-color) 2px solid; + padding-bottom: 3px; + box-sizing: content-box; } .top-nav .brand > * { margin: 0.2em; } -app-dropdown-menu i { - font-size: 22px; - margin: 0.2em 0.2em 0.2em 0; - color: var(--theme-color); -} - .top-nav .left-item-wrapper { margin-right: auto; } -.top-nav .right-item-wrapper { - margin-right: 1em; - margin-left: auto; - margin-top: 0.5em; +.right-item-wrapper { + display: flex; + padding-bottom: 5px; } -.top-nav a i { - font-size: 24px; - margin-left: 0.05em; +.profile-img-small { + margin-right: 10px; + width: 28px; + height: 28px; } @media only screen and (max-width: 999px) { @@ -61,7 +106,7 @@ app-dropdown-menu i { @media only screen and (min-width: 1000px) { .top-nav a { - display: inline-flex; + display: flex; } } @@ -69,22 +114,4 @@ app-dropdown-menu i { .top-nav a:first-child:hover { background: none; } - - .top-nav .right-item-wrapper .contact:hover { - @include util.default-border-radius; - - transition: 0.3s ease-in-out; - - color: white; - background-color: var(--theme-color); - } - - .bottom-nav a:hover { - background: var(--hover); - } - - .bottom-nav .right-item-wrapper .contact:hover { - color: white; - background: var(--theme-color); - } } diff --git a/src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.ts b/src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.ts index 2f495c59..92c27b92 100644 --- a/src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.ts +++ b/src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.ts @@ -1,30 +1,74 @@ import { Component, ElementRef, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; -import { PRODUCT_LINES, SERVICES } from 'src/app/data/product/product.data'; +import { environmentCommon } from '../../../../../environments/environment-common'; import { BRAND } from '../../../../data/brand/brand.data'; import { URLS } from '../../../../data/navigation/navigation.data'; -import { ProductLine } from '../../../../model/product/product.model'; +import { PROFILE_IMG } from '../../../../data/profile/profile.data'; +import { AuthToken } from '../../../../model/auth/auth-token.model'; +import { AuthenticationService } from '../../../../service/auth/authentication.service'; +import { FileStorageService } from '../../../../service/file-storage/file-storage.service'; import { LoadingService } from '../../../../service/loading/loading.service'; +import { NotificationService } from '../../../../service/notification/notification.service'; +import { ProductService } from '../../../../service/product/product.service'; @Component( { selector: 'app-landing-layout-top-nav', templateUrl: './landing-layout-top-nav.component.html', - styleUrls: [ './landing-layout-top-nav.component.scss' ] + styleUrls: [ './landing-layout-top-nav.component.scss' ], } ) export class LandingLayoutTopNavComponent { + profileImg = PROFILE_IMG; + userIsPremium; + currentUser: AuthToken; loading = false; + environmentCommon = environmentCommon; + URLS = URLS; BRAND = BRAND; - PRODUCT_LINES: ProductLine[] = PRODUCT_LINES; - SERVICES: ProductLine[] = SERVICES; - - @ViewChild( 'dropdownMenuProducts' ) dropdownMenuProducts: ElementRef; - @ViewChild( 'dropdownMenuServices' ) dropdownMenuServices: ElementRef; @ViewChild( 'dropdownMenuParent' ) dropdownMenuParent: ElementRef; - constructor( private router: Router, private loadingService: LoadingService ) { - this.loadingService.sharedLoading.subscribe( loading => this.loading = loading ); + notifications: any[] = []; + + settings = [ + { name: 'Edit Profile', icon: 'user', url: URLS.settings.editProfile }, + { name: 'Security', icon: 'shield-alt', url: URLS.settings.editSecurity }, + { name: 'Logout', icon: 'sign-out-alt', logout: true }, + ]; + + constructor( + private router: Router, + private loadingService: LoadingService, + private authenticationService: AuthenticationService, + private fileStorageService: FileStorageService, + private productService: ProductService, + private notificationService: NotificationService + ) { + this.loadingService.sharedLoading.subscribe( + ( loading ) => ( this.loading = loading ) + ); + + this.authenticationService.currentUser.subscribe( ( currentUser ) => { + this.currentUser = currentUser; + } ); + + this.fileStorageService.sharedProfileImage.subscribe( ( profileImg ) => { + if ( profileImg?.file?.url ) { + this.profileImg = profileImg.file.url; + } else if ( profileImg?.file?.data ) { + this.profileImg = 'data:image/png;base64,' + profileImg.file.data; + } + } ); + + this.productService.premiumProducts.subscribe( ( products ) => { + this.userIsPremium = products?.length > 0; + } ); + + this.notificationService.notifications.subscribe( ( notifications ) => { + this.notifications = notifications.filter( + ( notification ) => !notification.read + ); + } ); } } diff --git a/src/app/component/popup/cookie-popup/cookie-popup.component.html b/src/app/component/popup/cookie-popup/cookie-popup.component.html index 06276409..c694ec28 100644 --- a/src/app/component/popup/cookie-popup/cookie-popup.component.html +++ b/src/app/component/popup/cookie-popup/cookie-popup.component.html @@ -1,5 +1,5 @@
-

By continuing to use this site you agree to our +

By continuing to use this site you agree to our Cookie Policy.

diff --git a/src/app/component/price-plan/price-plan.component.html b/src/app/component/price-plan/price-plan.component.html index 1752e99a..5a1bf908 100644 --- a/src/app/component/price-plan/price-plan.component.html +++ b/src/app/component/price-plan/price-plan.component.html @@ -1,6 +1,6 @@
-
Available Plans
+
Available Plans
@@ -8,8 +8,8 @@

{{ pricingOption.title }}

{{ pricingOption.description }}

- +
diff --git a/src/app/component/price-plan/price-plan.component.scss b/src/app/component/price-plan/price-plan.component.scss index ab527055..4a69a998 100644 --- a/src/app/component/price-plan/price-plan.component.scss +++ b/src/app/component/price-plan/price-plan.component.scss @@ -120,6 +120,8 @@ p { @include util.flex-center-center; text-align: center; + padding: 0 + } @@ -134,10 +136,6 @@ p { padding: 12px; } - .column-header-feature { - padding: 0 - } - .feature-by-price-plan-wrapper { display: flex; justify-content: space-evenly; diff --git a/src/app/component/product-represantation/product-presentation.component.html b/src/app/component/product-represantation/product-presentation.component.html index 9070a9aa..bbf8212a 100644 --- a/src/app/component/product-represantation/product-presentation.component.html +++ b/src/app/component/product-represantation/product-presentation.component.html @@ -1,29 +1,29 @@ -
+
- +

Generate your project in couple of seconds.

 - +

{{ product.video.description }}

 - + - @@ -31,8 +31,8 @@

{{ presentationText }}

@@ -50,26 +50,27 @@ experience
- + -
- - + +

{{ product.demonstrationImg.description }}

 - + - +
@@ -82,7 +83,7 @@
- +
diff --git a/src/app/component/product-represantation/product-presentation.component.scss b/src/app/component/product-represantation/product-presentation.component.scss index 8e1d0ca6..03e543e4 100644 --- a/src/app/component/product-represantation/product-presentation.component.scss +++ b/src/app/component/product-represantation/product-presentation.component.scss @@ -1,5 +1,5 @@ @use '../../../styles/util/util'; -@use '../../component/card/card.component'; +@use 'node_modules/@open-template-hub/card/styles/card/card'; .product-presentation { @include util.flex-layout-column; @@ -121,10 +121,6 @@ max-height: 400px; max-width: 100%; } - - & app-animated-code-editor { - width: 100%; - } } .social-login-wrapper { diff --git a/src/app/component/product-represantation/product-presentation.component.ts b/src/app/component/product-represantation/product-presentation.component.ts index 0176397b..6c90979f 100644 --- a/src/app/component/product-represantation/product-presentation.component.ts +++ b/src/app/component/product-represantation/product-presentation.component.ts @@ -54,7 +54,7 @@ export class ProductPresentationComponent implements OnInit { // filter only oauth configured websites if ( environmentCommon.website[ website ].logo ) { this.presentationPartners.push( { - name: website, + name: environmentCommon.website[ website ].name, src: environmentCommon.website[ website ].logo, website: environmentCommon.website[ website ].url } ); @@ -95,7 +95,7 @@ export class ProductPresentationComponent implements OnInit { } partnerNameFormat( name: string, isLast: boolean ) { - return name.split( /(?=[A-Z])/ ).join( ' ' ) + ( isLast ? '*' : ',' ); + return name + ( isLast ? '*' : ',' ); } getDemonstrationImg( product: Product ) { diff --git a/src/app/component/search/search.component.html b/src/app/component/search/search.component.html index 9cb11525..a6369387 100644 --- a/src/app/component/search/search.component.html +++ b/src/app/component/search/search.component.html @@ -1,35 +1,10 @@
- +
- - - - -
- - - - -
- - - - +
diff --git a/src/app/component/search/search.component.scss b/src/app/component/search/search.component.scss index 41342f39..1c7084f1 100644 --- a/src/app/component/search/search.component.scss +++ b/src/app/component/search/search.component.scss @@ -1,13 +1,18 @@ +@use '../../../styles/util/util'; + .search-area { + @include util.default-shadow; + @include util.default-border-radius; display: flex; color: var(--color); align-items: center; position: fixed; - width: 400px; + width: 380px; z-index: 12; - background-color: var(--background-color); - height: 70px; - padding-bottom: 10px; + background-color: var(--card); + height: 55px; + margin-top: 20px; + right: 10px; } .search-area ::placeholder { @@ -15,8 +20,8 @@ } .search-area input { - border-bottom: 1px solid var(--lighter); margin-right: 20px; + border-bottom: initial; } .search-area input, .search-area ::placeholder { @@ -24,23 +29,18 @@ font-weight: 500; } -.search-area input:focus { - border-bottom: 1px solid var(--color); -} - .search-area i { cursor: pointer; align-items: center; margin-right: 20px; - margin-left: 10px; + margin-left: 25px; } .search-results { position: fixed; - top: 80px; + top: 82px; min-height: 55px; - width: 400px; - display: flex; + width: 380px; flex-direction: column; justify-content: flex-start; overflow-x: auto; diff --git a/src/app/component/search/search.component.ts b/src/app/component/search/search.component.ts index cc745dd0..342ddb2c 100644 --- a/src/app/component/search/search.component.ts +++ b/src/app/component/search/search.component.ts @@ -1,8 +1,5 @@ import { Component, ElementRef, HostListener, ViewChild } from '@angular/core'; import { URLS } from '../../data/navigation/navigation.data'; -import { BusinessLogicService } from '../../service/business-logic/business-logic.service'; -import { CategoryService } from '../../service/category/category.service'; -import { EventService } from '../../service/event/event.service'; @Component( { selector: 'app-search', @@ -10,22 +7,13 @@ import { EventService } from '../../service/event/event.service'; styleUrls: [ './search.component.scss' ] } ) export class SearchComponent { - userSearchResults = []; - categorySearchResults = []; - eventSearchResults = []; + searchResults = []; searchEnabled = true; URLS = URLS; @ViewChild( 'searchArea' ) searchArea: ElementRef; - constructor( - private eventService: EventService, - private businessLogicService: BusinessLogicService, - private categoryService: CategoryService - ) { - } - @HostListener( 'document:click', [ '$event' ] ) onDocumentClick( event ) { if ( this.searchArea?.nativeElement.contains( event.target ) ) { @@ -39,23 +27,7 @@ export class SearchComponent { const q = event.target.value; if ( !q || q.length < 3 ) { - this.userSearchResults = []; - this.categorySearchResults = []; - return; + this.searchResults = []; } - - this.businessLogicService.search( q ).subscribe( results => { - this.userSearchResults = results.slice( 0, 10 ); - } ); - - this.categoryService.search( q ).subscribe( results => { - this.categorySearchResults = results.slice( 0, 10 ); - } ); - - this.eventService.search( undefined, undefined, new Date().toISOString(), q, [] ) - .subscribe( results => { - this.eventSearchResults = results; - } ); } - } diff --git a/src/app/component/settings-dropdown-menu/settings-dropdown-menu.component.html b/src/app/component/settings-dropdown-menu/settings-dropdown-menu.component.html new file mode 100644 index 00000000..8f3b7d73 --- /dev/null +++ b/src/app/component/settings-dropdown-menu/settings-dropdown-menu.component.html @@ -0,0 +1,42 @@ +
+
+ +
+ +
+ +
+ +
+ +
+
+ + +
+ +
+ {{ item.name }} +
+
+ + +
+ +
+ {{ item.name }} +
+
+ + +
+
+
+
diff --git a/src/app/component/dropdown-menu/dropdown-menu.component.scss b/src/app/component/settings-dropdown-menu/settings-dropdown-menu.component.scss similarity index 92% rename from src/app/component/dropdown-menu/dropdown-menu.component.scss rename to src/app/component/settings-dropdown-menu/settings-dropdown-menu.component.scss index dbd130d5..eeacf979 100644 --- a/src/app/component/dropdown-menu/dropdown-menu.component.scss +++ b/src/app/component/settings-dropdown-menu/settings-dropdown-menu.component.scss @@ -12,13 +12,15 @@ -webkit-backdrop-filter: blur(10px); backdrop-filter: blur(10px); - // this is removing caret at top but also needed to hide overflowing hover effects - // overflow: hidden; + /* this is removing caret at top but also needed to hide overflowing hover effects + overflow: hidden; + */ } .dropdown-content i { - font-size: 15px; + font-size: 20px; color: var(--theme-color-lighter-2); + margin-right: 20px; } .dropdown-top-menu { @@ -48,7 +50,12 @@ } .dropdown-item-content { + display: flex; height: 100%; + align-items: center; + margin-left: auto; + margin-right: auto; + width: 130px; } .dropdown-item-content h6, .dropdown-item-content p { @@ -177,9 +184,8 @@ @media only screen and (min-width: 1000px) { .dropdown-content { position: absolute; - padding: 12px 0 0; - top: 60px; - left: - 138px; + top: 40px; + left: - 74px; box-shadow: inset 0 7px 5px -7px var(--shadow), 0 8px 16px 0 var(--shadow); max-width: calc(100vw - 240px); } @@ -198,14 +204,13 @@ .dropdown-caret { position: absolute; - top: -9px; - left: 155px; + top: -10px; + left: 85px; } .section-column-wrapper { overflow-y: auto; flex-wrap: wrap; - max-width: calc(100vw - 255px); max-height: calc(100vh - 200px); } @@ -213,8 +218,7 @@ box-sizing: border-box; flex-grow: 1; - min-width: 330px; - width: 330px; + width: 200px; max-width: 330px; overflow-y: auto; @@ -225,8 +229,7 @@ .dropdown-item { margin: auto; - width: 299px; - height: 120px; + height: 30px; padding: 15px; } diff --git a/src/app/component/dropdown-menu/dropdown-menu.component.spec.ts b/src/app/component/settings-dropdown-menu/settings-dropdown-menu.component.spec.ts similarity index 56% rename from src/app/component/dropdown-menu/dropdown-menu.component.spec.ts rename to src/app/component/settings-dropdown-menu/settings-dropdown-menu.component.spec.ts index da8a3d93..2dfa40d7 100644 --- a/src/app/component/dropdown-menu/dropdown-menu.component.spec.ts +++ b/src/app/component/settings-dropdown-menu/settings-dropdown-menu.component.spec.ts @@ -1,20 +1,20 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { DropdownMenuComponent } from './dropdown-menu.component'; +import { SettingsDropdownMenuComponent } from './settings-dropdown-menu.component'; describe( 'DropdownMenuComponent', () => { - let component: DropdownMenuComponent; - let fixture: ComponentFixture; + let component: SettingsDropdownMenuComponent; + let fixture: ComponentFixture; beforeEach( async () => { await TestBed.configureTestingModule( { - declarations: [ DropdownMenuComponent ] + declarations: [ SettingsDropdownMenuComponent ] } ) .compileComponents(); } ); beforeEach( () => { - fixture = TestBed.createComponent( DropdownMenuComponent ); + fixture = TestBed.createComponent( SettingsDropdownMenuComponent ); component = fixture.componentInstance; fixture.detectChanges(); } ); diff --git a/src/app/component/dropdown-menu/dropdown-menu.component.ts b/src/app/component/settings-dropdown-menu/settings-dropdown-menu.component.ts similarity index 53% rename from src/app/component/dropdown-menu/dropdown-menu.component.ts rename to src/app/component/settings-dropdown-menu/settings-dropdown-menu.component.ts index df96beec..578fa62f 100644 --- a/src/app/component/dropdown-menu/dropdown-menu.component.ts +++ b/src/app/component/settings-dropdown-menu/settings-dropdown-menu.component.ts @@ -1,72 +1,40 @@ import { Component, ElementRef, HostListener, Input, ViewChild, } from '@angular/core'; +import { Router } from '@angular/router'; import { URLS } from '../../data/navigation/navigation.data'; -import { Product, ProductLine } from '../../model/product/product.model'; +import { AuthenticationService } from '../../service/auth/authentication.service'; import { UtilService } from '../../service/util/util.service'; @Component( { selector: 'app-dropdown-menu', - templateUrl: './dropdown-menu.component.html', - styleUrls: [ './dropdown-menu.component.scss' ], + templateUrl: './settings-dropdown-menu.component.html', + styleUrls: [ './settings-dropdown-menu.component.scss' ], } ) -export class DropdownMenuComponent { +export class SettingsDropdownMenuComponent { URLS = URLS; @Input() isDropdownOpen = false; - @Input() minimumColumns = 1; - @Input() minimumRows = 6; @Input() dropdownParent: ElementRef = null; - - calculatedColumns; - calculatedRows; - - @Input() productLines: ProductLine[] = []; - - closeDropdownInternalClicked = false; + @Input() items: any[] = []; @ViewChild( 'toggleButton' ) toggleButton: ElementRef; @ViewChild( 'dropdownContent' ) dropdownContent: ElementRef; - constructor( private utilService: UtilService ) { - this.calculatedColumns = this.minimumColumns; - this.calculatedRows = this.minimumRows; - } - - @HostListener( 'window:resize', [ '$event' ] ) - onResize() { - if ( this.isDropdownOpen && window.innerWidth > 999 ) { - let wantedColumns = this.minimumColumns; - - while ( wantedColumns * 330 > window.innerWidth - 240 ) { - wantedColumns = wantedColumns - 2; - } - - this.calculatedColumns = wantedColumns; + closeDropdownInternalClicked = false; - if ( this.calculatedColumns < this.minimumColumns ) { - this.calculatedRows = - this.minimumRows - ( this.minimumColumns - this.calculatedColumns + 2 ); - } else { - this.calculatedRows = this.minimumRows; - } - } + constructor( + private utilService: UtilService, + private authenticationService: AuthenticationService, + private router: Router + ) { } - setImageLoaded = ( product: Product ) => { - product.imageLoaded = true; - }; - toggleDropdown() { this.isDropdownOpen = !this.isDropdownOpen; - - if ( this.isDropdownOpen ) { - this.onResize(); - } } openDropdown() { this.isDropdownOpen = true; this.closeDropdownInternalClicked = true; - this.onResize(); } @HostListener( 'document:mouseover', [ '$event' ] ) @@ -102,11 +70,10 @@ export class DropdownMenuComponent { } ); } - getProductLineMaxHeight() { - if (this.utilService.isSmallScreen() || this.calculatedRows >= this.minimumRows) { - return ''; - } - - return 'max-height: ' + ( 60 + 150 * this.calculatedRows + 1 ) + 'px;'; + logout() { + this.authenticationService.logout(); + this.router.navigate( [ '/' ] ).then( () => { + return true; + } ); } } diff --git a/src/app/component/side-content/side-content.component.html b/src/app/component/side-content/side-content.component.html index 88dfe7d4..4d2635a5 100644 --- a/src/app/component/side-content/side-content.component.html +++ b/src/app/component/side-content/side-content.component.html @@ -1,67 +1,5 @@ +
-
- - - -
-

Explore Events

-
- - - - -

Followed Contributors

-
- - - - -
- - -
+
diff --git a/src/app/component/side-content/side-content.component.scss b/src/app/component/side-content/side-content.component.scss index a7c9dcf9..aafbf58b 100644 --- a/src/app/component/side-content/side-content.component.scss +++ b/src/app/component/side-content/side-content.component.scss @@ -1,46 +1,32 @@ -.side-content-wrapper { - height: 100vh; - margin: 0; - position: fixed; - right: 0; - background-color: var(--background-color); - overflow-x: hidden; - overflow-y: auto; -} - -.side-content { - width: 400px; - min-height: 100vh; - display: flex; - flex-direction: column; - align-items: center; - overflow-x: hidden; - overflow-y: scroll; -} - -.side-content app-card a { - width: 95%; -} - app-search { display: flex; color: var(--color); align-items: center; position: fixed; - width: 400px; z-index: 12; - background-color: var(--background-color); + background-color: transparent; height: 70px; - padding-bottom: 10px; + justify-content: center; } -.upcoming-card { +.side-content-wrapper { + height: calc(100% - 105px); position: fixed; - margin-top: 108px; + right: 0; + overflow-x: hidden; + overflow-y: auto; width: 400px; - height: calc(100% - 120px); - overflow: auto; - padding: 10px calc(10px + env(safe-area-inset-right)) 0 10px; + display: flex; + flex-direction: column; + align-items: center; + background-color: transparent; + z-index: 2; + margin: 100px 0 0; + + & app-activity-card { + width: 95%; + margin-bottom: 20px; + } } #more-settings { @@ -48,20 +34,13 @@ app-search { } @media only screen and (max-width: 999px) { - .side-content-wrapper { + .side-content-wrapper, app-search { visibility: hidden; } } @media only screen and (min-width: 1000px) { - .side-content-wrapper { + .side-content-wrapper, app-search { visibility: visible; } } - -@media (hover: hover) { - /* - .search-results a:hover { - background-color: var(--hover); - }*/ -} diff --git a/src/app/component/side-content/side-content.component.ts b/src/app/component/side-content/side-content.component.ts index 5fd91fd8..2b4b6467 100644 --- a/src/app/component/side-content/side-content.component.ts +++ b/src/app/component/side-content/side-content.component.ts @@ -2,10 +2,8 @@ import { Component } from '@angular/core'; import { Router } from '@angular/router'; import { environment } from 'src/environments/environment'; import { URLS } from '../../data/navigation/navigation.data'; +import { AnalyticsService } from '../../service/analytics/analytics.service'; import { BusinessLogicService } from '../../service/business-logic/business-logic.service'; -import { CategoryService } from '../../service/category/category.service'; -import { EventService } from '../../service/event/event.service'; -import { InformationService } from '../../service/information/information.service'; @Component( { selector: 'app-side-content', @@ -16,90 +14,33 @@ export class SideContentComponent { userInfo: any = {}; URLS = URLS; - recommendedEvents: any = []; - recommendedEventsByFollowingList: any = []; environment = environment; - numberOfAttemptedRetrieveInitSearchEvents = 0; - maxNumberOfServiceCall = 1; + events: any[] = []; + categories: any = {}; constructor( - private categoryService: CategoryService, private businessLogicService: BusinessLogicService, - private eventService: EventService, - private informationService: InformationService, + private analyticsService: AnalyticsService, private router: Router ) { this.businessLogicService.userInfo.subscribe( userInfo => { this.userInfo = userInfo; - this.eventService.recommendedEvents.subscribe( recommendedEvents => { - if ( recommendedEvents ) { - this.recommendedEvents = recommendedEvents; - } else if ( this.numberOfAttemptedRetrieveInitSearchEvents < this.maxNumberOfServiceCall ) { - // purpose of this control is to fix side content is null when user refreshed the page outside of the dasboard page - const userInterests = userInfo?.payload?.interests; - const categories: any[] = []; - - if ( userInterests && userInterests.length > 0 ) { - for ( const interest of userInterests ) { - categories.push( - { - category: interest.category, - subCategory: interest.subCategory, - leafCategory: interest.leafCategory - } - ); - } - } - - this.eventService.initSearchEvents( categories ); - this.numberOfAttemptedRetrieveInitSearchEvents += 1; - } - } ); - - this.eventService.recommendedEventsByFollowingList.subscribe( recommendedEvents => { - this.recommendedEventsByFollowingList = recommendedEvents; - } ); + if ( userInfo ) { + this.analyticsService.getCategories().subscribe( getCategoriesResponse => { + this.categories = this.analyticsService.convertCategoriesToMappedObject( getCategoriesResponse ); + this.analyticsService.getEvents( undefined, undefined, undefined, 0, analyticsService.configs.sideContentLimit ).subscribe( getEventsResponse => { + this.events = getEventsResponse.data; + } ); + } ); + } } ); - - } - /* - @HostListener( 'document:click', [ '$event' ] ) - onDocumentClick( event ) { - if ( this.searchArea?.nativeElement.contains( event.target ) ) { - this.searchEnabled = true; - } else { - this.searchEnabled = false; - } - } - - search( event: any ) { - const q = event.target.value; - - if ( !q || q.length < 3 ) { - this.userSearchResults = []; - this.categorySearchResults = []; - return; - } - - this.businessLogicService.search( q ).subscribe( results => { - this.userSearchResults = results.slice( 0, 10 ); - } ); - - this.categoryService.search( q ).subscribe( results => { - this.categorySearchResults = results.slice( 0, 10 ); - } ); - - this.eventService.search( undefined, undefined, new Date().toISOString(), q, [] ) - .subscribe( results => { - this.eventSearchResults = results; - } ); - }*/ - openEventDetails( event ) { this.router.navigate( [ URLS.dashboard.event ], { queryParams: { event_id: event } } ); } } + + diff --git a/src/app/component/swiper/presentation-swiper/presentation-swiper.component.html b/src/app/component/swiper/presentation-swiper/presentation-swiper.component.html index b756c7f4..757aad3d 100644 --- a/src/app/component/swiper/presentation-swiper/presentation-swiper.component.html +++ b/src/app/component/swiper/presentation-swiper/presentation-swiper.component.html @@ -13,6 +13,7 @@ [slidesPerView]="1" [spaceBetween]="10"> - + diff --git a/src/app/component/swiper/screenshot-swiper/screenshot-swiper.component.html b/src/app/component/swiper/screenshot-swiper/screenshot-swiper.component.html index 7028c2d2..241f8e22 100644 --- a/src/app/component/swiper/screenshot-swiper/screenshot-swiper.component.html +++ b/src/app/component/swiper/screenshot-swiper/screenshot-swiper.component.html @@ -8,8 +8,8 @@ [slidesPerView]="1" [spaceBetween]="10"> -
- +

{{ screenshot.description }}

diff --git a/src/app/component/swiper/screenshot-swiper/screenshot-swiper.component.spec.ts b/src/app/component/swiper/screenshot-swiper/screenshot-swiper.component.spec.ts index 5b57612a..268cfa40 100644 --- a/src/app/component/swiper/screenshot-swiper/screenshot-swiper.component.spec.ts +++ b/src/app/component/swiper/screenshot-swiper/screenshot-swiper.component.spec.ts @@ -2,24 +2,24 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ScreenshotSwiperComponent } from './screenshot-swiper.component'; -describe('ScreenshotSwiperComponent', () => { +describe( 'ScreenshotSwiperComponent', () => { let component: ScreenshotSwiperComponent; let fixture: ComponentFixture; - beforeEach(async () => { - await TestBed.configureTestingModule({ + beforeEach( async () => { + await TestBed.configureTestingModule( { declarations: [ ScreenshotSwiperComponent ] - }) + } ) .compileComponents(); - }); + } ); - beforeEach(() => { - fixture = TestBed.createComponent(ScreenshotSwiperComponent); + beforeEach( () => { + fixture = TestBed.createComponent( ScreenshotSwiperComponent ); component = fixture.componentInstance; fixture.detectChanges(); - }); + } ); - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); + it( 'should create', () => { + expect( component ).toBeTruthy(); + } ); +} ); diff --git a/src/app/data/brand-pages/brand-pages.data.ts b/src/app/data/brand-pages/brand-pages.data.ts new file mode 100644 index 00000000..09e37892 --- /dev/null +++ b/src/app/data/brand-pages/brand-pages.data.ts @@ -0,0 +1,24 @@ +import { environmentCommon } from '../../../environments/environment-common'; + +export const BRAND_PAGES: { url: string, icon: string }[] = [ + { + url: environmentCommon.website.twitter.url + '/' + environmentCommon.company.social.twitter, + icon: environmentCommon.website.twitter.cssClass + }, + { + url: environmentCommon.website.github.url + '/' + environmentCommon.company.social.github, + icon: environmentCommon.website.github.cssClass + }, + { + url: environmentCommon.website.productHunt.url + '/' + environmentCommon.company.social.productHunt, + icon: environmentCommon.website.productHunt.cssClass + }, + { + url: environmentCommon.website.linkedin.companyUrl + '/' + environmentCommon.company.social.linkedin, + icon: environmentCommon.website.linkedin.cssClass + }, + { + url: environmentCommon.website.discord.companyUrl + '/' + environmentCommon.company.social.discord, + icon: environmentCommon.website.discord.cssClass + } +]; diff --git a/src/app/data/brand/brand.data.ts b/src/app/data/brand/brand.data.ts index c787d10e..cb9832f6 100644 --- a/src/app/data/brand/brand.data.ts +++ b/src/app/data/brand/brand.data.ts @@ -23,5 +23,6 @@ export const BRAND = { 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/wallpaper/oth-packages-color.min.png', 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/wallpaper/oth-packages-light.min.png', 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/wallpaper/oth-packages-dark.min.png' - ] + ], + mobileWallpapers: [] }; diff --git a/src/app/data/command-type/command-type.enum.ts b/src/app/data/command-type/command-type.enum.ts deleted file mode 100644 index 56d409c4..00000000 --- a/src/app/data/command-type/command-type.enum.ts +++ /dev/null @@ -1,4 +0,0 @@ -export enum CommandType { - Request = 1, - Response = 2, -} diff --git a/src/app/data/company/company.data.ts b/src/app/data/company/company.data.ts new file mode 100644 index 00000000..8040648e --- /dev/null +++ b/src/app/data/company/company.data.ts @@ -0,0 +1,15 @@ +import { environmentCommon } from '../../../environments/environment-common'; +import { URLS } from '../navigation/navigation.data'; + +export const COMPANY_PAGES: { name: string, url: string, isExternal?: boolean }[] = [ + { name: $localize`:@@footer.about:About`, url: URLS.about }, + { name: $localize`:@@footer.customers:Customers`, url: URLS.customers }, + { name: $localize`:@@footer.partners:Partners`, url: URLS.partners }, + { name: $localize`:@@footer.branding:Branding`, url: URLS.branding }, + { + name: $localize`:@@footer.jobs:Jobs`, + url: environmentCommon.website.linkedin.companyUrl + '/' + environmentCommon.company.social.linkedin + '/jobs', + isExternal: true + }, + { name: $localize`:@@footer.blog:Blog`, url: URLS.blog }, +]; diff --git a/src/app/data/contact-info/contact-info.data.ts b/src/app/data/contact-info/contact-info.data.ts new file mode 100644 index 00000000..83ec43d7 --- /dev/null +++ b/src/app/data/contact-info/contact-info.data.ts @@ -0,0 +1,6 @@ +export const CONTACT_INFO = { + address: 'Sepapaja 6, 15551 Tallinn, Estonia', + email: 'info@opentemplatehub.com', + phone: '', + map: 'https://goo.gl/maps/qKdzpwkhLKuQsaWv6', +}; diff --git a/src/app/data/contact-us/contact-us.data.ts b/src/app/data/contact-us/contact-us.data.ts index a83ecb40..282694a3 100644 --- a/src/app/data/contact-us/contact-us.data.ts +++ b/src/app/data/contact-us/contact-us.data.ts @@ -3,10 +3,10 @@ import { ContactUsFeatures } from '../../model/contact-us/contact-us.model'; export const SIZE_OPTIONS = [ '1-99', '100-999', '1000-4999', '5000+' ]; export const CONTACT_US_FEATURES: ContactUsFeatures = { - title: $localize `:@@contactUsData.title:With Open Template Hub you can:`, + title: $localize`:@@contactUsData.title:With Open Template Hub you can:`, features: [ - $localize `:@@contactUsData.features.1:Minimize your effort while building a new software business`, - $localize `:@@contactUsData.features.2:Focus your resources on your core business`, - $localize `:@@contactUsData.features.3:Grow even more faster with our premium solutions` + $localize`:@@contactUsData.features.1:Minimize your effort while building a new software business`, + $localize`:@@contactUsData.features.2:Focus your resources on your core business`, + $localize`:@@contactUsData.features.3:Grow even more faster with our premium solutions` ] }; diff --git a/src/app/data/country/country.data.ts b/src/app/data/country/country.data.ts index 64db432b..67fee665 100644 --- a/src/app/data/country/country.data.ts +++ b/src/app/data/country/country.data.ts @@ -1,206 +1,206 @@ export const COUNTRIES = [ - $localize `:@@countries.afghanistan:Afghanistan`, - $localize `:@@countries.albania:Albania`, - $localize `:@@countries.algeria:Algeria`, - $localize `:@@countries.andorra:Andorra`, - $localize `:@@countries.angola:Angola`, - $localize `:@@countries.anguilla:Anguilla`, - $localize `:@@countries.antigua:Antigua & Barbuda`, - $localize `:@@countries.argentina:Argentina`, - $localize `:@@countries.armenia:Armenia`, - $localize `:@@countries.aruba:Aruba`, - $localize `:@@countries.australia:Australia`, - $localize `:@@countries.austria:Austria`, - $localize `:@@countries.azerbaijan:Azerbaijan`, - $localize `:@@countries.bahamas:Bahamas`, - $localize `:@@countries.bahrain:Bahrain`, - $localize `:@@countries.bangladesh:Bangladesh`, - $localize `:@@countries.barbados:Barbados`, - $localize `:@@countries.belarus:Belarus`, - $localize `:@@countries.belgium:Belgium`, - $localize `:@@countries.belize:Belize`, - $localize `:@@countries.benin:Benin`, - $localize `:@@countries.bermuda:Bermuda`, - $localize `:@@countries.bhutan:Bhutan`, - $localize `:@@countries.bolivia:Bolivia`, - $localize `:@@countries.bosnia:Bosnia & Herzegovina`, - $localize `:@@countries.botswana:Botswana`, - $localize `:@@countries.brazil:Brazil`, - $localize `:@@countries.britishVirginIslands:British Virgin Islands`, - $localize `:@@countries.brunei:Brunei`, - $localize `:@@countries.bulgaria:Bulgaria`, - $localize `:@@countries.burkinaFaso:Burkina Faso`, - $localize `:@@countries.burundi:Burundi`, - $localize `:@@countries.cambodia:Cambodia`, - $localize `:@@countries.cameroon:Cameroon`, - $localize `:@@countries.capeVerde:Cape Verde`, - $localize `:@@countries.caymanIslands:Cayman Islands`, - $localize `:@@countries.chad:Chad`, - $localize `:@@countries.chile:Chile`, - $localize `:@@countries.china:China`, - $localize `:@@countries.colombia:Colombia`, - $localize `:@@countries.congo:Congo`, - $localize `:@@countries.cookIslands:Cook Islands`, - $localize `:@@countries.costaRica:Costa Rica`, - $localize `:@@countries.coteDIvoire:Cote D Ivoire`, - $localize `:@@countries.croatia:Croatia`, - $localize `:@@countries.cruiseShip:Cruise Ship`, - $localize `:@@countries.cuba:Cuba`, - $localize `:@@countries.cyprus:Cyprus`, - $localize `:@@countries.czechRepublic:Czech Republic`, - $localize `:@@countries.denmark:Denmark`, - $localize `:@@countries.djibouti:Djibouti`, - $localize `:@@countries.dominica:Dominica`, - $localize `:@@countries.dominicanRepublic:Dominican Republic`, - $localize `:@@countries.ecuador:Ecuador`, - $localize `:@@countries.egypt:Egypt`, - $localize `:@@countries.elSalvador:El Salvador`, - $localize `:@@countries.equatorialGuinea:Equatorial Guinea`, - $localize `:@@countries.estonia:Estonia`, - $localize `:@@countries.ethiopia:Ethiopia`, - $localize `:@@countries.falklandIslands:Falkland Islands`, - $localize `:@@countries.faroeIslands:Faroe Islands`, - $localize `:@@countries.fiji:Fiji`, - $localize `:@@countries.finland:Finland`, - $localize `:@@countries.france:France`, - $localize `:@@countries.frenchPolynesia:French Polynesia`, - $localize `:@@countries.frenchWestIndies:French West Indies`, - $localize `:@@countries.gabon:Gabon`, - $localize `:@@countries.gambia:Gambia`, - $localize `:@@countries.georgia:Georgia`, - $localize `:@@countries.germany:Germany`, - $localize `:@@countries.ghana:Ghana`, - $localize `:@@countries.gibraltar:Gibraltar`, - $localize `:@@countries.greece:Greece`, - $localize `:@@countries.greenland:Greenland`, - $localize `:@@countries.grenada:Grenada`, - $localize `:@@countries.guam:Guam`, - $localize `:@@countries.guatemala:Guatemala`, - $localize `:@@countries.guernsey:Guernsey`, - $localize `:@@countries.guinea:Guinea`, - $localize `:@@countries.guineaBissau:Guinea Bissau`, - $localize `:@@countries.guyana:Guyana`, - $localize `:@@countries.haiti:Haiti`, - $localize `:@@countries.honduras:Honduras`, - $localize `:@@countries.hongKong:Hong Kong`, - $localize `:@@countries.hungary:Hungary`, - $localize `:@@countries.iceland:Iceland`, - $localize `:@@countries.india:India`, - $localize `:@@countries.indonesia:Indonesia`, - $localize `:@@countries.iran:Iran`, - $localize `:@@countries.iraq:Iraq`, - $localize `:@@countries.ireland:Ireland`, - $localize `:@@countries.isleOfMan:Isle of Man`, - $localize `:@@countries.israel:Israel`, - $localize `:@@countries.italy:Italy`, - $localize `:@@countries.jamaica:Jamaica`, - $localize `:@@countries.japan:Japan`, - $localize `:@@countries.jersey:Jersey`, - $localize `:@@countries.jordan:Jordan`, - $localize `:@@countries.kazakhstan:Kazakhstan`, - $localize `:@@countries.kenya:Kenya`, - $localize `:@@countries.kuwait:Kuwait`, - $localize `:@@countries.kyrgyzRepublic:Kyrgyz Republic`, - $localize `:@@countries.laous:Laos`, - $localize `:@@countries.latvia:Latvia`, - $localize `:@@countries.lebanon:Lebanon`, - $localize `:@@countries.lesotho:Lesotho`, - $localize `:@@countries.liberia:Liberia`, - $localize `:@@countries.libya:Libya`, - $localize `:@@countries.liechtenstein:Liechtenstein`, - $localize `:@@countries.lithunia:Lithuania`, - $localize `:@@countries.luxemburg:Luxembourg`, - $localize `:@@countries.macau:Macau`, - $localize `:@@countries.macedonia:Macedonia`, - $localize `:@@countries.madagascar:Madagascar`, - $localize `:@@countries.malawi:Malawi`, - $localize `:@@countries.malaysia:Malaysia`, - $localize `:@@countries.maldives:Maldives`, - $localize `:@@countries.mali:Mali`, - $localize `:@@countries.malta:Malta`, - $localize `:@@countries.mauritania:Mauritania`, - $localize `:@@countries.mauritius:Mauritius`, - $localize `:@@countries.mexico:Mexico`, - $localize `:@@countries.moldova:Moldova`, - $localize `:@@countries.monaco:Monaco`, - $localize `:@@countries.mongolia:Mongolia`, - $localize `:@@countries.montenagro:Montenegro`, - $localize `:@@countries.montserrat:Montserrat`, - $localize `:@@countries.morocco:Morocco`, - $localize `:@@countries.mozambique:Mozambique`, - $localize `:@@countries.namibia:Namibia`, - $localize `:@@countries.nepal:Nepal`, - $localize `:@@countries.netherlands:Netherlands`, - $localize `:@@countries.netherlandsAntilles:Netherlands Antilles`, - $localize `:@@countries.newCaledonia:New Caledonia`, - $localize `:@@countries.newZeeland:New Zealand`, - $localize `:@@countries.nicaragua:Nicaragua`, - $localize `:@@countries.niger:Niger`, - $localize `:@@countries.nigeria:Nigeria`, - $localize `:@@countries.norway:Norway`, - $localize `:@@countries.oman:Oman`, - $localize `:@@countries.pakistan:Pakistan`, - $localize `:@@countries.palestine:Palestine`, - $localize `:@@countries.panama:Panama`, - $localize `:@@countries.papuaNewGuinea:Papua New Guinea`, - $localize `:@@countries.paraguay:Paraguay`, - $localize `:@@countries.peru:Peru`, - $localize `:@@countries.philippines:Philippines`, - $localize `:@@countries.poland:Poland`, - $localize `:@@countries.portugal:Portugal`, - $localize `:@@countries.puertoRico:Puerto Rico`, - $localize `:@@countries.qatar:Qatar`, - $localize `:@@countries.reunion:Reunion`, - $localize `:@@countries.romania:Romania`, - $localize `:@@countries.russia:Russia`, - $localize `:@@countries.rwanda:Rwanda`, - $localize `:@@countries.saintPierre:Saint Pierre & Miquelon`, - $localize `:@@countries.samoa:Samoa`, - $localize `:@@countries.sanMorina:San Marino`, - $localize `:@@countries.satellite:Satellite`, - $localize `:@@countries.saudiArabia:Saudi Arabia`, - $localize `:@@countries.senegal:Senegal`, - $localize `:@@countries.serbia:Serbia`, - $localize `:@@countries.seychelles:Seychelles`, - $localize `:@@countries.sierraLeone:Sierra Leone`, - $localize `:@@countries.singapore:Singapore`, - $localize `:@@countries.slovakia:Slovakia`, - $localize `:@@countries.slovenia:Slovenia`, - $localize `:@@countries.southAfrica:South Africa`, - $localize `:@@countries.southKorea:South Korea`, - $localize `:@@countries.spain:Spain`, - $localize `:@@countries.sriLanka:Sri Lanka`, - $localize `:@@countries.stKitts:St Kitts & Nevis`, - $localize `:@@countries.stLucia:St. Lucia`, - $localize `:@@countries.stVincent:St Vincent`, - $localize `:@@countries.sudan:Sudan`, - $localize `:@@countries.suriname:Suriname`, - $localize `:@@countries.swaziland:Swaziland`, - $localize `:@@countries.sweden:Sweden`, - $localize `:@@countries.switzerland:Switzerland`, - $localize `:@@countries.syria:Syria`, - $localize `:@@countries.taiwan:Taiwan`, - $localize `:@@countries.tajikistan:Tajikistan`, - $localize `:@@countries.tanzania:Tanzania`, - $localize `:@@countries.thailand:Thailand`, - $localize `:@@countries.timor:Timor L\'Este`, - $localize `:@@countries.togo:Togo`, - $localize `:@@countries.tonga:Tonga`, - $localize `:@@countries.trinidad:Trinidad & Tobago`, - $localize `:@@countries.tunisia:Tunisia`, - $localize `:@@countries.turkey:Turkey`, - $localize `:@@countries.turkmenistan:Turkmenistan`, - $localize `:@@countries.turks:Turks & Caicos`, - $localize `:@@countries.uganda:Uganda`, - $localize `:@@countries.ukraine:Ukraine`, - $localize `:@@countries.unitedArabEmirates:United Arab Emirates`, - $localize `:@@countries.unitedKingdom:United Kingdom`, - $localize `:@@countries.uruguay:Uruguay`, - $localize `:@@countries.uzbekistan:Uzbekistan`, - $localize `:@@countries.venezuela:Venezuela`, - $localize `:@@countries.vietnam:Vietnam`, - $localize `:@@countries.virginIslands:Virgin Islands (US)`, - $localize `:@@countries.yemen:Yemen`, - $localize `:@@countries.zambia:Zambia`, - $localize `:@@countries.zimbabwe:Zimbabwe` + $localize`:@@countries.afghanistan:Afghanistan`, + $localize`:@@countries.albania:Albania`, + $localize`:@@countries.algeria:Algeria`, + $localize`:@@countries.andorra:Andorra`, + $localize`:@@countries.angola:Angola`, + $localize`:@@countries.anguilla:Anguilla`, + $localize`:@@countries.antigua:Antigua & Barbuda`, + $localize`:@@countries.argentina:Argentina`, + $localize`:@@countries.armenia:Armenia`, + $localize`:@@countries.aruba:Aruba`, + $localize`:@@countries.australia:Australia`, + $localize`:@@countries.austria:Austria`, + $localize`:@@countries.azerbaijan:Azerbaijan`, + $localize`:@@countries.bahamas:Bahamas`, + $localize`:@@countries.bahrain:Bahrain`, + $localize`:@@countries.bangladesh:Bangladesh`, + $localize`:@@countries.barbados:Barbados`, + $localize`:@@countries.belarus:Belarus`, + $localize`:@@countries.belgium:Belgium`, + $localize`:@@countries.belize:Belize`, + $localize`:@@countries.benin:Benin`, + $localize`:@@countries.bermuda:Bermuda`, + $localize`:@@countries.bhutan:Bhutan`, + $localize`:@@countries.bolivia:Bolivia`, + $localize`:@@countries.bosnia:Bosnia & Herzegovina`, + $localize`:@@countries.botswana:Botswana`, + $localize`:@@countries.brazil:Brazil`, + $localize`:@@countries.britishVirginIslands:British Virgin Islands`, + $localize`:@@countries.brunei:Brunei`, + $localize`:@@countries.bulgaria:Bulgaria`, + $localize`:@@countries.burkinaFaso:Burkina Faso`, + $localize`:@@countries.burundi:Burundi`, + $localize`:@@countries.cambodia:Cambodia`, + $localize`:@@countries.cameroon:Cameroon`, + $localize`:@@countries.capeVerde:Cape Verde`, + $localize`:@@countries.caymanIslands:Cayman Islands`, + $localize`:@@countries.chad:Chad`, + $localize`:@@countries.chile:Chile`, + $localize`:@@countries.china:China`, + $localize`:@@countries.colombia:Colombia`, + $localize`:@@countries.congo:Congo`, + $localize`:@@countries.cookIslands:Cook Islands`, + $localize`:@@countries.costaRica:Costa Rica`, + $localize`:@@countries.coteDIvoire:Cote D Ivoire`, + $localize`:@@countries.croatia:Croatia`, + $localize`:@@countries.cruiseShip:Cruise Ship`, + $localize`:@@countries.cuba:Cuba`, + $localize`:@@countries.cyprus:Cyprus`, + $localize`:@@countries.czechRepublic:Czech Republic`, + $localize`:@@countries.denmark:Denmark`, + $localize`:@@countries.djibouti:Djibouti`, + $localize`:@@countries.dominica:Dominica`, + $localize`:@@countries.dominicanRepublic:Dominican Republic`, + $localize`:@@countries.ecuador:Ecuador`, + $localize`:@@countries.egypt:Egypt`, + $localize`:@@countries.elSalvador:El Salvador`, + $localize`:@@countries.equatorialGuinea:Equatorial Guinea`, + $localize`:@@countries.estonia:Estonia`, + $localize`:@@countries.ethiopia:Ethiopia`, + $localize`:@@countries.falklandIslands:Falkland Islands`, + $localize`:@@countries.faroeIslands:Faroe Islands`, + $localize`:@@countries.fiji:Fiji`, + $localize`:@@countries.finland:Finland`, + $localize`:@@countries.france:France`, + $localize`:@@countries.frenchPolynesia:French Polynesia`, + $localize`:@@countries.frenchWestIndies:French West Indies`, + $localize`:@@countries.gabon:Gabon`, + $localize`:@@countries.gambia:Gambia`, + $localize`:@@countries.georgia:Georgia`, + $localize`:@@countries.germany:Germany`, + $localize`:@@countries.ghana:Ghana`, + $localize`:@@countries.gibraltar:Gibraltar`, + $localize`:@@countries.greece:Greece`, + $localize`:@@countries.greenland:Greenland`, + $localize`:@@countries.grenada:Grenada`, + $localize`:@@countries.guam:Guam`, + $localize`:@@countries.guatemala:Guatemala`, + $localize`:@@countries.guernsey:Guernsey`, + $localize`:@@countries.guinea:Guinea`, + $localize`:@@countries.guineaBissau:Guinea Bissau`, + $localize`:@@countries.guyana:Guyana`, + $localize`:@@countries.haiti:Haiti`, + $localize`:@@countries.honduras:Honduras`, + $localize`:@@countries.hongKong:Hong Kong`, + $localize`:@@countries.hungary:Hungary`, + $localize`:@@countries.iceland:Iceland`, + $localize`:@@countries.india:India`, + $localize`:@@countries.indonesia:Indonesia`, + $localize`:@@countries.iran:Iran`, + $localize`:@@countries.iraq:Iraq`, + $localize`:@@countries.ireland:Ireland`, + $localize`:@@countries.isleOfMan:Isle of Man`, + $localize`:@@countries.israel:Israel`, + $localize`:@@countries.italy:Italy`, + $localize`:@@countries.jamaica:Jamaica`, + $localize`:@@countries.japan:Japan`, + $localize`:@@countries.jersey:Jersey`, + $localize`:@@countries.jordan:Jordan`, + $localize`:@@countries.kazakhstan:Kazakhstan`, + $localize`:@@countries.kenya:Kenya`, + $localize`:@@countries.kuwait:Kuwait`, + $localize`:@@countries.kyrgyzRepublic:Kyrgyz Republic`, + $localize`:@@countries.laous:Laos`, + $localize`:@@countries.latvia:Latvia`, + $localize`:@@countries.lebanon:Lebanon`, + $localize`:@@countries.lesotho:Lesotho`, + $localize`:@@countries.liberia:Liberia`, + $localize`:@@countries.libya:Libya`, + $localize`:@@countries.liechtenstein:Liechtenstein`, + $localize`:@@countries.lithunia:Lithuania`, + $localize`:@@countries.luxemburg:Luxembourg`, + $localize`:@@countries.macau:Macau`, + $localize`:@@countries.macedonia:Macedonia`, + $localize`:@@countries.madagascar:Madagascar`, + $localize`:@@countries.malawi:Malawi`, + $localize`:@@countries.malaysia:Malaysia`, + $localize`:@@countries.maldives:Maldives`, + $localize`:@@countries.mali:Mali`, + $localize`:@@countries.malta:Malta`, + $localize`:@@countries.mauritania:Mauritania`, + $localize`:@@countries.mauritius:Mauritius`, + $localize`:@@countries.mexico:Mexico`, + $localize`:@@countries.moldova:Moldova`, + $localize`:@@countries.monaco:Monaco`, + $localize`:@@countries.mongolia:Mongolia`, + $localize`:@@countries.montenagro:Montenegro`, + $localize`:@@countries.montserrat:Montserrat`, + $localize`:@@countries.morocco:Morocco`, + $localize`:@@countries.mozambique:Mozambique`, + $localize`:@@countries.namibia:Namibia`, + $localize`:@@countries.nepal:Nepal`, + $localize`:@@countries.netherlands:Netherlands`, + $localize`:@@countries.netherlandsAntilles:Netherlands Antilles`, + $localize`:@@countries.newCaledonia:New Caledonia`, + $localize`:@@countries.newZeeland:New Zealand`, + $localize`:@@countries.nicaragua:Nicaragua`, + $localize`:@@countries.niger:Niger`, + $localize`:@@countries.nigeria:Nigeria`, + $localize`:@@countries.norway:Norway`, + $localize`:@@countries.oman:Oman`, + $localize`:@@countries.pakistan:Pakistan`, + $localize`:@@countries.palestine:Palestine`, + $localize`:@@countries.panama:Panama`, + $localize`:@@countries.papuaNewGuinea:Papua New Guinea`, + $localize`:@@countries.paraguay:Paraguay`, + $localize`:@@countries.peru:Peru`, + $localize`:@@countries.philippines:Philippines`, + $localize`:@@countries.poland:Poland`, + $localize`:@@countries.portugal:Portugal`, + $localize`:@@countries.puertoRico:Puerto Rico`, + $localize`:@@countries.qatar:Qatar`, + $localize`:@@countries.reunion:Reunion`, + $localize`:@@countries.romania:Romania`, + $localize`:@@countries.russia:Russia`, + $localize`:@@countries.rwanda:Rwanda`, + $localize`:@@countries.saintPierre:Saint Pierre & Miquelon`, + $localize`:@@countries.samoa:Samoa`, + $localize`:@@countries.sanMorina:San Marino`, + $localize`:@@countries.satellite:Satellite`, + $localize`:@@countries.saudiArabia:Saudi Arabia`, + $localize`:@@countries.senegal:Senegal`, + $localize`:@@countries.serbia:Serbia`, + $localize`:@@countries.seychelles:Seychelles`, + $localize`:@@countries.sierraLeone:Sierra Leone`, + $localize`:@@countries.singapore:Singapore`, + $localize`:@@countries.slovakia:Slovakia`, + $localize`:@@countries.slovenia:Slovenia`, + $localize`:@@countries.southAfrica:South Africa`, + $localize`:@@countries.southKorea:South Korea`, + $localize`:@@countries.spain:Spain`, + $localize`:@@countries.sriLanka:Sri Lanka`, + $localize`:@@countries.stKitts:St Kitts & Nevis`, + $localize`:@@countries.stLucia:St. Lucia`, + $localize`:@@countries.stVincent:St Vincent`, + $localize`:@@countries.sudan:Sudan`, + $localize`:@@countries.suriname:Suriname`, + $localize`:@@countries.swaziland:Swaziland`, + $localize`:@@countries.sweden:Sweden`, + $localize`:@@countries.switzerland:Switzerland`, + $localize`:@@countries.syria:Syria`, + $localize`:@@countries.taiwan:Taiwan`, + $localize`:@@countries.tajikistan:Tajikistan`, + $localize`:@@countries.tanzania:Tanzania`, + $localize`:@@countries.thailand:Thailand`, + $localize`:@@countries.timor:Timor L\'Este`, + $localize`:@@countries.togo:Togo`, + $localize`:@@countries.tonga:Tonga`, + $localize`:@@countries.trinidad:Trinidad & Tobago`, + $localize`:@@countries.tunisia:Tunisia`, + $localize`:@@countries.turkey:Turkey`, + $localize`:@@countries.turkmenistan:Turkmenistan`, + $localize`:@@countries.turks:Turks & Caicos`, + $localize`:@@countries.uganda:Uganda`, + $localize`:@@countries.ukraine:Ukraine`, + $localize`:@@countries.unitedArabEmirates:United Arab Emirates`, + $localize`:@@countries.unitedKingdom:United Kingdom`, + $localize`:@@countries.uruguay:Uruguay`, + $localize`:@@countries.uzbekistan:Uzbekistan`, + $localize`:@@countries.venezuela:Venezuela`, + $localize`:@@countries.vietnam:Vietnam`, + $localize`:@@countries.virginIslands:Virgin Islands (US)`, + $localize`:@@countries.yemen:Yemen`, + $localize`:@@countries.zambia:Zambia`, + $localize`:@@countries.zimbabwe:Zimbabwe` ]; diff --git a/src/app/data/deprecated/category/category.data.ts b/src/app/data/deprecated/category/category.data.ts deleted file mode 100644 index 0862b626..00000000 --- a/src/app/data/deprecated/category/category.data.ts +++ /dev/null @@ -1,150 +0,0 @@ -export const CATEGORIES = [ - { - name: 'Development', - id: 1, - payload: { - subCategories: [ - { - name: 'Web Development', - id: 1, - leafCategories: [ { name: 'JavaScript', id: 1 }, { name: 'React', id: 2 }, { - name: 'Angular', - id: 3 - }, { name: 'CSS', id: 4 }, { name: 'PHP', id: 5 }, { name: 'Node.Js', id: 6 }, { name: 'Vue JS', id: 7 } ] - }, - { - name: 'Data Science', - id: 2, - leafCategories: [ { name: 'Python', id: 1 }, { name: 'Machine Learning', id: 2 }, { - name: 'Deep Learning', - id: 3 - }, { name: 'Data Analysis', id: 4 }, { name: 'Artificial Intelligence', id: 5 }, { - name: 'R', - id: 6 - }, { name: 'TensorFlow', id: 7 }, { name: 'Neural Networks', id: 8 } ] - }, - { - name: 'Mobile Development', - id: 3, - leafCategories: [ { name: 'Google Flutter', id: 1 }, { - name: 'Android Development', - id: 2 - }, { name: 'iOS Development', id: 3 }, { name: 'Swift', id: 4 }, { - name: 'React Native', - id: 5 - }, { name: 'Dart Programming Language', id: 6 }, { name: 'Kotlin', id: 7 }, { - name: 'Redux Framework', - id: 8 - } ] - }, - { - name: 'Programming Languages', - id: 4, - leafCategories: [ { name: 'Python', id: 1 }, { name: 'Java', id: 2 }, { name: 'C#', id: 3 }, { - name: 'C++', - id: 4 - }, { name: 'React', id: 5 }, { name: 'JavaScript', id: 6 }, { name: 'C', id: 7 }, { - name: 'Spring Framework', - id: 8 - }, { name: 'Go', id: 9 }, { name: 'Programming Language', id: 10 } ] - }, - { - name: 'Game Development', - id: 5, - leafCategories: [ { name: 'Unity', id: 1 }, { - name: 'Game Development Fundamentals', - id: 2 - }, { name: 'Unreal Engine', id: 3 }, { name: 'C#', id: 4 }, { - name: '3D Game Development', - id: 5 - }, { name: 'C++', id: 6 }, { name: '2D Game Development', id: 7 }, { - name: 'Unreal Engine', - id: 8 - }, { name: 'Blueprints', id: 9 }, { name: 'Blender', id: 10 } ] - }, - { - name: 'Database Design & Development', - id: 6, - leafCategories: [ { name: 'SQL', id: 1 }, { name: 'MySQL', id: 2 }, { - name: 'Oracle SQL', - id: 3 - }, { name: 'Oracle Certification', id: 4 }, { name: 'MongoDB', id: 5 }, { - name: 'Apache Kafka', - id: 6 - }, { name: 'SQL Server', id: 7 }, { name: 'PostgreSQL', id: 8 }, { name: 'Database Management', id: 9 } ] - }, - { - name: 'Software Testing', - id: 7, - leafCategories: [ { name: 'Selenium WebDriver', id: 1 }, { - name: 'Java', - id: 2 - }, { name: 'Automation Testing', id: 3 }, { - name: 'Selenium Testing Framework', - id: 4 - }, { name: 'API Testing', id: 5 }, { name: 'REST Assured', id: 6 }, { - name: 'Appium', - id: 7 - }, { name: 'Cypress.io', id: 8 } ] - }, - { - name: 'Software Engineering', - id: 8, - leafCategories: [ { name: 'AWS Certification', id: 1 }, { - name: 'AWS Certified Developer - Associate', - id: 2 - }, { name: 'Coding Interview', id: 3 }, { - name: 'Kubernetes', - id: 4 - }, { name: 'Certified Kubernetes Application Developer (CKAD)', id: 5 }, { - name: 'Microservices', - id: 6 - }, { name: 'Python', id: 7 }, { name: 'Agile', id: 8 }, { name: 'Elasticsearch', id: 9 } ] - }, - { - name: 'Development Tools', - id: 9, - leafCategories: [ { name: 'Docker', id: 1 }, { name: 'Kubernetes', id: 2 }, { - name: 'Git', - id: 3 - }, { name: 'DevOps', id: 4 }, { name: 'Jenkins', id: 5 }, { - name: 'AWS Certification', - id: 6 - }, { name: 'AWS Certified Developer - Associate', id: 7 }, { - name: 'JIRA', - id: 8 - }, { name: 'AWS Certified Solutions Architect - Associate', id: 9 } ] - }, - { - name: 'No-Code Development', - id: 10, - leafCategories: [ { name: 'Elementor', id: 1 }, { name: 'Wix', id: 2 }, { - name: 'Software Development', - id: 3 - }, { name: 'Bubble Visual Programming', id: 4 }, { name: 'WordPress', id: 5 }, { - name: 'Microsoft PowerApps', - id: 6 - }, { name: 'Microsoft Power Automate', id: 7 }, { name: 'Web Design', id: 8 }, { name: 'Startup', id: 9 } ] - } - ] - } - } -]; - -const CATEGORIES_MAP_INIT = new Map(); - -for ( const category of CATEGORIES ) { - CATEGORIES_MAP_INIT.set( category.id, { name: category.name, subCategories: new Map() } ); - for ( const subCategory of category.payload.subCategories ) { - CATEGORIES_MAP_INIT.get( category.id ).subCategories.set( subCategory.id, { - name: subCategory.name, - leafCategories: new Map() - } ); - for ( const leafCategory of subCategory.leafCategories ) { - CATEGORIES_MAP_INIT.get( category.id ).subCategories.get( subCategory.id ) - .leafCategories.set( leafCategory.id, { name: leafCategory.name } ); - } - } -} - -export const CATEGORIES_MAP = CATEGORIES_MAP_INIT; diff --git a/src/app/data/deprecated/event/events.data.ts b/src/app/data/deprecated/event/events.data.ts deleted file mode 100644 index 3ba196b1..00000000 --- a/src/app/data/deprecated/event/events.data.ts +++ /dev/null @@ -1,203 +0,0 @@ -import { Event } from '../../../model/event/event.model'; - -export const enum EventTypes { - Recommended, - Searched, - Attended, - Other -} - -export const attendedEventsData = [ - { - _id: '60e01a519f57c99fe18e641b', - title: 'Java 101', - isPremium: true, - date: new Date().toISOString(), - link: 'http://localhost:4200/dashboard/contribute', - duration: 45, - createdDate: '2021-07-03T08:05:54.001Z', - user: { - username: 'instructor1', - email: null - }, - payload: { - description: 'Java Basics', - category: 1, - subCategory: 4, - leafCategory: 2, - price: '5.00', - isCompleted: false, - }, - __v: 0, - count: 5, - isFeatured: false, - isNew: false, - attended: true - }, - { - _id: '60e01b6d9f57c99fe18e641c', - title: 'Python 101', - isPremium: false, - date: '2023-07-03T08:11:00.000Z', - link: 'http://localhost:4200/dashboard/contribute', - duration: 45, - createdDate: '2021-07-03T08:10:48.916Z', - user: { - username: 'instructor1', email: null - }, - payload: { - description: 'Python basics', - category: 1, - subCategory: 4, - leafCategory: 1, - isCompleted: true - }, - __v: 0, - count: 20, - isFeatured: true, - isNew: false, - attended: true - }, - { - _id: '60e01b6d9f57c99fe18e641c', - title: 'C# 101', - isPremium: false, - date: new Date( Date.now() + ( 3600 * 1000 * 24 ) ), - link: 'http://localhost:4200/dashboard/contribute', - duration: 50, - createdDate: '2021-07-03T08:10:48.916Z', - user: { - username: 'instructor2', email: null - }, - payload: { - description: 'Python basics', - category: 1, - subCategory: 4, - leafCategory: 1, - isCompleted: true, - }, - __v: 0, - count: 30, - isFeatured: false, - isNew: true, - attended: true - }, - { - _id: '60e01a519f57c99fe18e641b', - title: 'Java 101', - isPremium: true, - date: new Date( Date.now() + ( 3600 * 1000 * 24 * 2 ) ), - link: 'http://localhost:4200/dashboard/contribute', - duration: 45, - createdDate: '2021-07-03T08:05:54.001Z', - user: { - username: 'instructor3', - email: null - }, - payload: { - description: 'Java Basics', - category: 1, - subCategory: 4, - leafCategory: 2, - price: '5.00', - isCompleted: false, - }, - __v: 0, - count: 5, - isFeatured: false, - isNew: false, - attended: true - }, - { - _id: '60e01b6d9f57c99fe18e641c', - title: 'Python 101', - isPremium: false, - date: new Date( Date.now() + ( 3600 * 1000 * 24 * 3 ) ), - link: 'http://localhost:4200/dashboard/contribute', - duration: 45, - createdDate: '2021-07-03T08:10:48.916Z', - user: { - username: 'instructor4', email: null - }, - payload: { - description: 'Python basics', - category: 1, - subCategory: 4, - leafCategory: 1, - isCompleted: true - }, - __v: 0, - count: 20, - isFeatured: true, - isNew: false, - attended: true - }, - { - _id: '60e01b6d9f57c99fe18e641c', - title: 'C# 101', - isPremium: false, - date: new Date( Date.now() + ( 3600 * 1000 * 24 * 4 ) ), - link: 'http://localhost:4200/dashboard/contribute', - duration: 50, - createdDate: '2021-07-03T08:10:48.916Z', - user: { - username: 'instructor5', email: null - }, - payload: { - description: 'Python basics', - category: 1, - subCategory: 4, - leafCategory: 1, - isCompleted: true, - }, - __v: 0, - count: 30, - isFeatured: false, - isNew: true, - attended: true - }, -] as Event[]; - -export const unratedCompletedEventsData = [ - { - _id: 'user1', - completedEvents: [ - { - _id: '60e08389fdc012001e1ad181', - user: { - username: 'gandalf', email: null - }, - title: 'Programming Languages Fundamentals', - payload: { - category: 1, - subCategory: 4, - leafCategory: null - } - }, - { - _id: '60e1855f14c710001efecfb5', - user: { - username: 'instructor1', email: null - }, - title: 'Mobile Development Fundamentals', - payload: - { - category: 1, - subCategory: 3, - leafCategory: null - } - }, - { - _id: '60e184f414c710001efecfa0', - user: { - username: 'instructor2', email: null - }, - title: 'Data Science 101', - payload: - { - category: 1, - subCategory: 2, - leafCategory: null - } - } ] - } ] as any; diff --git a/src/app/data/developers/developers.data.ts b/src/app/data/developers/developers.data.ts new file mode 100644 index 00000000..752b8e84 --- /dev/null +++ b/src/app/data/developers/developers.data.ts @@ -0,0 +1,12 @@ +import { environmentCommon } from '../../../environments/environment-common'; +import { URLS } from '../navigation/navigation.data'; + +export const DEVELOPERS_PAGES: { name: string, url: string, isExternal?: boolean }[] = [ + { + name: $localize`:@@footer.about:Open Source`, + url: environmentCommon.website.github.url + '/' + environmentCommon.company.social.github, + isExternal: true + }, + { name: $localize`:@@footer.customers:Docs`, url: URLS.docs }, + { name: $localize`:@@footer.partners:Status`, url: URLS.status } +]; diff --git a/src/app/data/doc/doc.data.ts b/src/app/data/doc/doc.data.ts index d0251858..c49aeace 100644 --- a/src/app/data/doc/doc.data.ts +++ b/src/app/data/doc/doc.data.ts @@ -1,14 +1,18 @@ import { Doc } from '../../model/doc/doc.model'; +import { URLS } from '../navigation/navigation.data'; import { PRODUCT_LINES } from '../product/product.data'; const README = '/README.md'; export const DOCS: Doc[] = []; -for (const productLine of PRODUCT_LINES) { - if (productLine.key !== 'premium') { - for (const product of productLine.products) { - DOCS.push({ +for ( const productLine of PRODUCT_LINES ) { + if ( productLine.key !== 'premium' ) { + for ( const product of productLine.products ) { + if ( product.url === URLS.maintenance ) { + continue; + } + DOCS.push( { key: product.key, url: productLine.key + '/' + product.key + README, tag: productLine.key, @@ -16,7 +20,7 @@ for (const productLine of PRODUCT_LINES) { title: product.name, excerpt: product.description, date: '', - } as Doc); + } as Doc ); } } } diff --git a/src/app/data/employee/employee.data.ts b/src/app/data/employee/employee.data.ts index 2c77efd4..ab1a052c 100644 --- a/src/app/data/employee/employee.data.ts +++ b/src/app/data/employee/employee.data.ts @@ -4,10 +4,10 @@ export const EMPLOYEES: Employee[] = [ { profile: { name: 'Furkan Yavuz', - title: $localize `:@@employeesData.coFounder:Co-Founder`, + title: $localize`:@@employeesData.coFounder:Co-Founder`, bio: $localize`:@@employees.furkan.bio:Furkan is an experienced full-stack developer who has worked on various projects, including online payment solutions and fraud detection areas, in a well-known airline company. He\'s co-founded a startup to discover talents from the open-source community. After one year, Furkan successfully exited from his startup and then co-founded Open Template Hub.`, photoUri: - 'https://avatars0.githubusercontent.com/u/2248168?s=460&u=435ef6ade0785a7a135ce56cae751fb3ade1d126&v=4', + 'https://raw.githubusercontent.com/furknyavuz/furknyavuz/master/assets/images/15114CB7-AD1E-480F-A547-8634109C620A_1_105_c.jpeg', social: { linkedIn: 'https://www.linkedin.com/in/furkanyavuz', twitter: 'https://twitter.com/furknyavuz', @@ -19,7 +19,7 @@ export const EMPLOYEES: Employee[] = [ { profile: { name: 'Fatih Turker', - title: $localize `:@@employeesData.coFounder:Co-Founder`, + title: $localize`:@@employeesData.coFounder:Co-Founder`, bio: $localize`:@@employees.fatih.bio:Fatih is a young professional with wide-ranging experience in software design and technology. He worked several years on Finance and Telecom business areas. He is now a Founder and CEO at Remoklify. He also co-founded Open Template Hub.`, photoUri: 'https://avatars1.githubusercontent.com/u/2202179?s=460&u=261b1129e7106c067783cb022ab9999aad833bdc&v=4', @@ -34,7 +34,7 @@ export const EMPLOYEES: Employee[] = [ { profile: { name: 'Mert Sarac', - title: $localize `:@@employeesData.fullStackDeveloper:Full-Stack Developer`, + title: $localize`:@@employeesData.fullStackDeveloper:Full-Stack Developer`, bio: $localize`:@@employees.mert.bio:Mert is a new grad software engineer who has been experienced various technologies in his bachelor years. He worked on e-commercial and banking areas. Now, he is a full-stack developer at Open Template Hub and also working on native iOS applications.`, photoUri: 'https://avatars1.githubusercontent.com/u/38442589?s=400&u=aa3cda11724fc297a0bfa6beb35c9be81687cf3c&v=4', @@ -49,7 +49,7 @@ export const EMPLOYEES: Employee[] = [ { profile: { name: '???', - title: $localize `:@@employeesData.joinOurTeam:Join our team`, + title: $localize`:@@employeesData.joinOurTeam:Join our team`, bio: $localize`:@@employees.???.bio:Would you like to join our team? Please feel free to reach us from info@opentemplatehub.com or from jobs page.`, photoUri: '', diff --git a/src/app/data/navigation/navigation.data.ts b/src/app/data/navigation/navigation.data.ts index ef4e27af..9e3de39f 100644 --- a/src/app/data/navigation/navigation.data.ts +++ b/src/app/data/navigation/navigation.data.ts @@ -81,6 +81,12 @@ export const NAVIGATIONS = { description: BRAND.name + $localize`:@@navigationData.login.description:: Login`, keywords: [ BRAND.name, 'oth', 'Login' ], }, + twoFactorVerification: { + url: 'two-factor-authentication', + titlw: 'Two Factor Verification - ' + BRAND.name, + description: BRAND.name + 'Two Factor Verification', + keywords: [ BRAND.name, 'oth', 'Two Factor Authentication' ] + }, branding: { url: 'branding', title: 'Branding - ' + BRAND.name, @@ -177,6 +183,12 @@ export const NAVIGATIONS = { description: BRAND.name + $localize`:@@navigationData.analyticsServerTemplate.description:: Analytics Server Template`, keywords: [ BRAND.name, 'oth', 'Analytics Server Template' ], }, + smsServerTemplate: { + url: 'sms-server-template', + title: 'SMS Server Template - ' + BRAND.name, + description: BRAND.name + $localize`:@@navigationData.smsServerTemplate.description:: SMS Server Template`, + keywords: [ BRAND.name, 'oth', 'SMS Server Template' ], + }, businessLogicServerTemplate: { url: 'business-logic-server-template', title: 'Business Logic Server Template - ' + BRAND.name, @@ -331,6 +343,18 @@ export const NAVIGATIONS = { description: BRAND.name + $localize`:@@navigationData.root.description:: Minimizes your effort while building a new software business with our open source GitHub micro server templates and responsive web UI + mobile UI templates`, keywords: [ BRAND.name, 'oth', 'software business', 'open source' ], }, + premium: { + url: 'premium', + title: BRAND.name, + description: BRAND.name + $localize`:@@navigationData.root.description:: Minimizes your effort while building a new software business with our open source GitHub micro server templates and responsive web UI + mobile UI templates`, + keywords: [ BRAND.name, 'oth', 'software business', 'open source' ], + }, + notifications: { + url: 'notifications', + title: BRAND.name, + description: BRAND.name + $localize`:@@navigationData.root.description:: Minimizes your effort while building a new software business with our open source GitHub micro server templates and responsive web UI + mobile UI templates`, + keywords: [ BRAND.name, 'oth', 'software business', 'open source' ], + }, createEvent: { url: 'create-event', title: BRAND.name, @@ -349,12 +373,6 @@ export const NAVIGATIONS = { description: BRAND.name + $localize`:@@navigationData.root.description:: Minimizes your effort while building a new software business with our open source GitHub micro server templates and responsive web UI + mobile UI templates`, keywords: [ BRAND.name, 'oth', 'software business', 'open source' ], }, - privacy: { - url: 'privacy', - title: BRAND.name, - description: BRAND.name + $localize`:@@navigationData.root.description:: Minimizes your effort while building a new software business with our open source GitHub micro server templates and responsive web UI + mobile UI templates`, - keywords: [ BRAND.name, 'oth', 'software business', 'open source' ], - }, user: { url: 'user', title: BRAND.name, @@ -375,6 +393,18 @@ export const NAVIGATIONS = { description: BRAND.name + $localize`:@@navigationData.root.description:: Minimizes your effort while building a new software business with our open source GitHub micro server templates and responsive web UI + mobile UI templates`, keywords: [ BRAND.name, 'oth', 'software business', 'open source' ], }, + editProfile: { + url: 'edit-profile', + title: BRAND.name, + description: BRAND.name + $localize`:@@navigationData.root.description:: Minimizes your effort while building a new software business with our open source GitHub micro server templates and responsive web UI + mobile UI templates`, + keywords: [ BRAND.name, 'oth', 'software business', 'open source' ], + }, + editSecurity: { + url: 'edit-security', + title: BRAND.name, + description: BRAND.name + $localize`:@@navigationData.root.description:: Minimizes your effort while building a new software business with our open source GitHub micro server templates and responsive web UI + mobile UI templates`, + keywords: [ BRAND.name, 'oth', 'software business', 'open source' ], + }, // Localization english: { @@ -406,6 +436,7 @@ export const URLS = { about: '/' + NAVIGATIONS.about.url, signup: '/' + NAVIGATIONS.signup.url, login: '/' + NAVIGATIONS.login.url, + twoFactorVerification: '/' + NAVIGATIONS.twoFactorVerification.url, branding: '/' + NAVIGATIONS.branding.url, blog: '/' + NAVIGATIONS.blog.url, docs: '/' + NAVIGATIONS.docs.url, @@ -436,12 +467,12 @@ export const URLS = { // Dashboard Layout dashboard: { root: '/' + NAVIGATIONS.dashboard.url, - myProfile: - '/' + NAVIGATIONS.dashboard.url + '/' + NAVIGATIONS.myProfile.url, + myProfile: '/' + NAVIGATIONS.dashboard.url + '/' + NAVIGATIONS.myProfile.url, + premium: '/' + NAVIGATIONS.dashboard.url + '/' + NAVIGATIONS.premium.url, + notifications: '/' + NAVIGATIONS.dashboard.url + '/' + NAVIGATIONS.notifications.url, contribute: '/' + NAVIGATIONS.dashboard.url + '/' + NAVIGATIONS.event.url, learn: '/' + NAVIGATIONS.dashboard.url + '/' + NAVIGATIONS.learn.url, event: '/' + NAVIGATIONS.dashboard.url + '/' + NAVIGATIONS.createEvent.url, - privacy: '/' + NAVIGATIONS.dashboard.url + '/' + NAVIGATIONS.privacy.url, }, user: { root: '/' + NAVIGATIONS.user.url, @@ -450,6 +481,8 @@ export const URLS = { // Settings Layout settings: { editTheme: '/' + NAVIGATIONS.settings.url + '/' + NAVIGATIONS.editTheme.url, + editProfile: '/' + NAVIGATIONS.settings.url + '/' + NAVIGATIONS.editProfile.url, + editSecurity: '/' + NAVIGATIONS.settings.url + '/' + NAVIGATIONS.editSecurity.url }, // Languages diff --git a/src/app/data/premium-products/premium-product.data.ts b/src/app/data/premium-products/premium-product.data.ts new file mode 100644 index 00000000..1cab8a5a --- /dev/null +++ b/src/app/data/premium-products/premium-product.data.ts @@ -0,0 +1,26 @@ +import { PricingOption } from '../../model/pricing/pricing.model'; +import { PricingFeature } from '../../model/product/product.model'; + +export const PremiumProducts = { + premiumAccount: '0276d8d1-0945-412b-92d1-084a6e3f7554', + starter: '0276d8d1-0945-412b-92d1-084a6e3f7556' +}; + +export const premiumAccountPricingOptions: PricingOption[ ] = [ + { + title: `Premium`, + description: `Full access to premium features`, + features: [ [ 'true' ] ], + price: { + currency: '$', + value: '19.99', + subscriptionTime: '', + }, + } +]; + +export const premiumAccountPricingFeatures: PricingFeature[ ] = [ { + name: 'Full Access', + details: [ { name: 'Full access to premium features', description: 'Full access to premium features' } ] +} ]; + diff --git a/src/app/data/product/product.data.ts b/src/app/data/product/product.data.ts index ee9ab849..6205ac60 100644 --- a/src/app/data/product/product.data.ts +++ b/src/app/data/product/product.data.ts @@ -1,11 +1,8 @@ -import { CommandType } from 'src/app/data/command-type/command-type.enum'; import { environment } from '../../../environments/environment'; import { environmentCommon } from '../../../environments/environment-common'; import { ProductLine } from '../../model/product/product.model'; -import { URLS } from '../navigation/navigation.data'; import { PRODUCT_RIBBONS } from '../ribbon/ribbon.data'; import { TECH_STACK } from '../tech-stack/tech-stack.data'; -import { ThemeColorSettings } from '../theme/theme.data'; const OPEN_SOURCE_FEATURE = { name: $localize`:@@productData.openSource.name:Open Source`, @@ -109,7 +106,7 @@ export const PRODUCT_LINES: ProductLine[] = [ key: 'auth-server-template', name: 'Auth Server', description: $localize`:@@productLinesData.authServerTemplate.description:Auth Server Template is a generic open source authentication server that has simple yet powerful design to connect your business with all OAuth 2.0 and OAuth supporting third party companies (like Google, Facebook, Twitter or LinkedIn). It also supports basic username password authentication system.`, - url: environmentCommon.website.github.url + '/' + environmentCommon.oth.social.github + '/' + 'auth-server-template', + url: environmentCommon.website.github.url + '/' + environmentCommon.company.social.github + '/' + 'auth-server-template', logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/logo/server/auth-server-logo.min.png', openSource: true, features: DEFAULT_OPEN_SOURCE_SERVER_FEATURES, @@ -128,7 +125,7 @@ export const PRODUCT_LINES: ProductLine[] = [ key: 'payment-server-template', name: 'Payment Server', description: $localize`:@@productLinesData.paymentServerTemplate.description:Payment Server Template is a generic open source payment server that has simple yet powerful design to connect your business with third party payment solution provider companies (like Stripe or Coinbase).`, - url: environmentCommon.website.github.url + '/' + environmentCommon.oth.social.github + '/' + 'payment-server-template', + url: environmentCommon.website.github.url + '/' + environmentCommon.company.social.github + '/' + 'payment-server-template', logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/logo/server/payment-server-logo.min.png', openSource: true, features: DEFAULT_OPEN_SOURCE_SERVER_FEATURES, @@ -148,7 +145,7 @@ export const PRODUCT_LINES: ProductLine[] = [ key: 'file-storage-server-template', name: 'File Storage Server', description: $localize`:@@productLinesData.fileStorageTemplate.description:File Storage Server Template is a generic open source file storage server that has simple yet powerful design to connect your business with third party file storage provider companies (like AWS S3).`, - url: environmentCommon.website.github.url + '/' + environmentCommon.oth.social.github + '/' + 'file-storage-server-template', + url: environmentCommon.website.github.url + '/' + environmentCommon.company.social.github + '/' + 'file-storage-server-template', logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/logo/server/file-storage-server-logo.min.png', openSource: true, features: DEFAULT_OPEN_SOURCE_SERVER_FEATURES, @@ -168,7 +165,7 @@ export const PRODUCT_LINES: ProductLine[] = [ key: 'mail-server-template', name: 'Mail Server', description: $localize`:@@productLinesData.mailServerTemplate.description:Mail Server Template is a generic open source mail server that has simple yet powerful design to connect your business with third party email service providers (like Gmail, Yahoo or Outlook).`, - url: environmentCommon.website.github.url + '/' + environmentCommon.oth.social.github + '/' + 'mail-server-template', + url: environmentCommon.website.github.url + '/' + environmentCommon.company.social.github + '/' + 'mail-server-template', logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/logo/server/mail-server-logo.min.png', openSource: true, features: DEFAULT_OPEN_SOURCE_SERVER_FEATURES, @@ -186,7 +183,7 @@ export const PRODUCT_LINES: ProductLine[] = [ key: 'analytics-server-template', name: 'Analytics Server', description: $localize`:@@productLinesData.analyticsServerTemplate.description:Analytics Server Template is a generic open source analytics server that has simple yet powerful design to connect your business with third party analytics service providers (like Google Analytics or Matomo).`, - url: environmentCommon.website.github.url + '/' + environmentCommon.oth.social.github + '/' + 'analytics-server-template', + url: environmentCommon.website.github.url + '/' + environmentCommon.company.social.github + '/' + 'analytics-server-template', logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/logo/server/analytics-server-logo.min.png', openSource: true, features: DEFAULT_OPEN_SOURCE_SERVER_FEATURES, @@ -201,448 +198,47 @@ export const PRODUCT_LINES: ProductLine[] = [ TECH_STACK.npm ] }, - { - key: 'business-logic-server-template', - name: 'Business Logic Server', - description: $localize`:@@productLinesData.businessLogicServerTemplate.description:Business Logic Server Template is a generic open source server that encodes the real-world business rules that determine how data can be created, stored, and changed. It saves you from rewriting boilerplate code. It works best with other Open Template Hub products.`, - url: environmentCommon.website.github.url + '/' + environmentCommon.oth.social.github + '/' + 'business-logic-server-template', - logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/logo/server/business-logic-server-logo.min.png', - demonstrationImg: { - src: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/demo/server/business-logic-server-demo.min.png', - description: 'Server That Manages Your Core Business Functionalities' - }, - openSource: true, - features: DEFAULT_OPEN_SOURCE_SERVER_FEATURES, - pricingOptions: DEFAULT_OPEN_SOURCE_SERVER_PRICING_OPTIONS, - techStack: [ - TECH_STACK.typeScript, - TECH_STACK.node, - TECH_STACK.express, - TECH_STACK.mongoDb, - TECH_STACK.heroku, - TECH_STACK.npm - ] - }, { key: 'sms-server-template', name: 'Sms Server', - color: ThemeColorSettings.gray, - description: $localize`:@@productLinesData.smsServerTemplate.description:Coming soon..`, - url: URLS.maintenance, - logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/logo/product-logo-question.min.png', - openSource: true - } - ], - }, - { - key: 'user-interface', - name: 'User Interfaces', - description: $localize`:@@productLinesData.userInterface.description:User interface solutions for your needs`, - products: [ - { - key: 'company-profile-ui-template', - name: 'Company Profile UI', - description: $localize`:@@userInterfaces.companyProfileUITemplate.description:Company Profile UI Template is modern, responsive and customisable company profile ui template for your business. It contains reusable components, theme color and design support along with dark theme support.`, - url: environmentCommon.website.github.url + '/' + environmentCommon.oth.social.github + '/' + 'company-profile-ui-template', - logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/logo/ui/web-ui-logo.min.png', - video: { - url: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/demo/ui/videos/company-profile-ui-video-1.mp4', - description: $localize`:@@userInterfaces.companyProfileUITemplate.video.description:Modern, responsive and customisable company profile ui template written with Angular`, - }, - screenshots: [ - { - src: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/demo/ui/web-ui-demo-light.min.png', - description: $localize`:@@userInterfaces.companyProfileUITemplate.screenshot.1:Responsive Design` - }, - { - src: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/demo/ui/web-ui-demo-dark.min.png', - description: $localize`:@@userInterfaces.companyProfileUITemplate.screenshot.2:Dark Mode Support` - }, - { - src: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/demo/ui/screenshots/company-profile-ui-screenshot-1.min.png', - description: $localize`:@@userInterfaces.companyProfileUITemplate.screenshot.3:Reusable Components` - }, - { - src: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/demo/ui/screenshots/company-profile-ui-screenshot-2.min.png', - description: $localize`:@@userInterfaces.companyProfileUITemplate.screenshot.4:Customisable Theme Colors` - }, - { - src: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/demo/ui/screenshots/company-profile-ui-screenshot-3.min.png', - description: $localize`:@@userInterfaces.companyProfileUITemplate.screenshot.5:Customisable Theme Design` - } - ], - openSource: true, - features: DEFAULT_OPEN_SOURCE_SERVER_FEATURES, - pricingOptions: DEFAULT_OPEN_SOURCE_SERVER_PRICING_OPTIONS, - techStack: [ - TECH_STACK.typeScript, - TECH_STACK.angular, - TECH_STACK.fontAwesome, - TECH_STACK.heroku, - TECH_STACK.sass, - TECH_STACK.markdown, - TECH_STACK.npm - ], - }, - { - key: 'web-ui-template', - name: 'Web UI', - description: $localize`:@@userInterfaces.webUITemplate.description:Web UI Template is modern, responsive and customisable web ui template for your business. It contains reusable components, theme color and design support along with dark theme support.`, - url: environmentCommon.website.github.url + '/' + environmentCommon.oth.social.github + '/' + 'web-ui-template', - logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/logo/ui/web-ui-logo.min.png', - video: { - url: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/demo/ui/videos/web-ui-video-1.mp4', - description: $localize`:@@userInterfaces.webUITemplate.video.description:Modern, responsive and customisable company profile ui template written with Angular`, - }, - screenshots: [ - { - src: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/demo/ui/web-ui-demo-light.min.png', - description: $localize`:@@userInterfaces.companyProfileUITemplate.screenshot.1:Responsive Design` - }, - { - src: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/demo/ui/web-ui-demo-dark.min.png', - description: $localize`:@@userInterfaces.companyProfileUITemplate.screenshot.2:Dark Mode Support` - }, - { - src: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/demo/ui/screenshots/company-profile-ui-screenshot-1.min.png', - description: $localize`:@@userInterfaces.companyProfileUITemplate.screenshot.3:Reusable Components` - }, - { - src: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/demo/ui/screenshots/company-profile-ui-screenshot-2.min.png', - description: $localize`:@@userInterfaces.companyProfileUITemplate.screenshot.4:Customisable Theme Colors` - }, - { - src: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/demo/ui/screenshots/company-profile-ui-screenshot-3.min.png', - description: $localize`:@@userInterfaces.companyProfileUITemplate.screenshot.5:Customisable Theme Design` - } - ], + description: $localize`:@@productLinesData.smsServerTemplate.description:SMS Server Template is a generic open source sms server that has simple yet powerful design to connect your business with third party sms service providers (like Twillio or AWS SNS).`, + url: environmentCommon.website.github.url + '/' + environmentCommon.company.social.github + '/' + 'sms-server-template', + logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/logo/server/sms-server-logo.min.png', openSource: true, features: DEFAULT_OPEN_SOURCE_SERVER_FEATURES, pricingOptions: DEFAULT_OPEN_SOURCE_SERVER_PRICING_OPTIONS, + integrations: environment.sms, techStack: [ TECH_STACK.typeScript, - TECH_STACK.angular, - TECH_STACK.fontAwesome, + TECH_STACK.node, + TECH_STACK.express, TECH_STACK.heroku, - TECH_STACK.sass, - TECH_STACK.markdown, TECH_STACK.npm ] }, { - key: 'mobile-ui-template', - name: 'Mobile UI', - description: $localize`:@@userInterfaces.mobileUITemplate.description:Mobile UI Template is modern, responsive and customisable mobile ui template for your business. It contains reusable components, theme color and design support along with dark theme support.`, - url: environmentCommon.website.github.url + '/' + environmentCommon.oth.social.github + '/' + 'mobile-ui-template', - logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/logo/ui/mobile-ui-logo.min.png', - video: { - url: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/demo/ui/videos/mobile-ui-video-1.mp4', - description: $localize`:@@userInterfaces.mobileUITemplate.video.description:Modern, responsive and customisable company profile ui template written with React Native`, + key: 'business-logic-server-template', + name: 'Business Logic Server', + description: $localize`:@@productLinesData.businessLogicServerTemplate.description:Business Logic Server Template is a generic open source server that encodes the real-world business rules that determine how data can be created, stored, and changed. It saves you from rewriting boilerplate code. It works best with other Open Template Hub products.`, + url: environmentCommon.website.github.url + '/' + environmentCommon.company.social.github + '/' + 'business-logic-server-template', + logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/logo/server/business-logic-server-logo.min.png', + demonstrationImg: { + src: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/demo/server/business-logic-server-demo.min.png', + description: 'Server That Manages Your Core Business Functionalities' }, - screenshots: [ - { - src: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/demo/ui/mobile-ui-ios-demo-light.min.png', - description: $localize`:@@userInterfaces.mobileUITemplate.screenshot.1:iOS Support` - }, - { - src: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/demo/ui/mobile-ui-ios-demo-dark.min.png', - description: $localize`:@@userInterfaces.mobileUITemplate.screenshot.2:Dark Mode Support` - }, - { - src: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/demo/ui/mobile-ui-android-demo-light.min.png', - description: $localize`:@@userInterfaces.mobileUITemplate.screenshot.3:Android Support` - } - ], openSource: true, features: DEFAULT_OPEN_SOURCE_SERVER_FEATURES, pricingOptions: DEFAULT_OPEN_SOURCE_SERVER_PRICING_OPTIONS, - techStack: [ - TECH_STACK.typeScript, - TECH_STACK.reactNative, - TECH_STACK.fontAwesome, - TECH_STACK.npm - ] - }, - ], - }, - { - key: 'generator', - name: 'CLI Generators', - description: $localize`:@@productLinesData.generator.description:Command line interface generators`, - products: [ - { - key: 'server-generator', - name: 'Server Generator', - description: $localize`:@@generators.serverGenerator.description:Command line interface generator of the servers at Open Template Hub`, - url: environmentCommon.website.github.url + '/' + environmentCommon.oth.social.github + '/' + 'server-generator', - urlAlter: environmentCommon.website.npm.url + '/package/' + environmentCommon.oth.social.npm + '/' + 'server-generator', - logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/logo/generator/server-generator-logo.min.png', - openSource: true, - features: DEFAULT_OPEN_SOURCE_SERVER_FEATURES, - commandLines: [ - { - command: 'open-template-hub-server-generator', - type: CommandType.Request, - timeout: 90, - }, - { - command: - '1) Payment Server\n2) Auth Server\n3) Business Logic Server\n4) File Storage Server\n5) Analytics Server\n6) Mail Server\nPlease enter a server type you want to generate:', - type: CommandType.Response, - timeout: 20, - }, - { - command: '1', - type: CommandType.Request, - timeout: 1200, - }, - { - command: 'Project name:', - type: CommandType.Response, - timeout: 30, - }, - { - command: 'my_project', - type: CommandType.Request, - timeout: 160, - }, - { - command: 'Done.\nGo into the project: cd my_project', - type: CommandType.Response, - timeout: 30, - }, - ], - steps: [ - { text: 'Package Installation', level: 1}, - { text: 'Open the terminal and type:\nnpm install -g @open-template-hub/server-generator', level: 2}, - { text: 'Package Usage', level: 1}, - { - text: 'Go to the directory on terminal where you want to generate the project and type:\n$ cd PATH', level: 2 - }, - { - text: 'Run the generator command:\nopen-template-hub-server-generator', level: 2 - }, - ], - }, - { - key: 'app-generator', - name: 'UI Generator', - description: - $localize`:@@generators.appGenerator.description:Command line interface generator of the user interfaces at Open Template Hub`, - url: environmentCommon.website.github.url + '/' + environmentCommon.oth.social.github + '/' + 'app-generator', - urlAlter: environmentCommon.website.npm.url + '/package/' + environmentCommon.oth.social.npm + '/' + 'app-generator', - logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/logo/generator/server-generator-logo.min.png', - openSource: true, - features: DEFAULT_OPEN_SOURCE_SERVER_FEATURES, - commandLines: [ - { - command: 'open-template-hub-app-generator', - type: CommandType.Request, - timeout: 90, - }, - { - command: - '1) Web UI\n2) Mobile Application\n3) Company Profile UI\nPlease enter the application type you want to generate:', - type: CommandType.Response, - timeout: 20, - }, - { - command: '2', - type: CommandType.Request, - timeout: 1200, - }, - { - command: 'Project name:', - type: CommandType.Response, - timeout: 30, - }, - { - command: 'my_mobile_app', - type: CommandType.Request, - timeout: 160, - }, - { - command: 'Done.\nGo into the project: cd my_mobile_app', - type: CommandType.Response, - timeout: 30, - }, - ], - steps: [ - { text: 'Package Installation', level: 1}, - { text: 'Open the terminal and type:\nnpm install -g @open-template-hub/app-generator', level: 2}, - { text: 'Package Usage', level: 1}, - { - text: 'Go to the directory on terminal where you want to generate the project and type:\n$ cd PATH', level: 2 - }, - { - text: 'Run the generator command:\nopen-template-hub-app-generator', level: 2 - }, - ], - }, - ], - }, - { - key: 'premium', - name: 'Premium', - description: $localize`:@@servicesData.premium.description:Get more things done with our premium solutions`, - color: ThemeColorSettings.yellow, - products: [ - { - key: 'orchestration-server-template', - name: 'Orchestration Server', - description: $localize`:@@premium.orchestrationServerTemplate.description:Orchestration Server Template is a middleware server that has simple yet powerful design to connect your business with all Open Template Hub servers (like Auth Server, Payment Server, File Storage Server or Mail Server). It also has generic design to integrate any other servers.`, - url: environmentCommon.website.github.url + '/' + environmentCommon.oth.social.github, - logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/logo/server/orchestration-server-logo.min.png', - color: ThemeColorSettings.yellow, - demonstrationImg: { - src: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/demo/server/orchestration-server-demo.min.png', - description: 'Orchestration Server Architectural Design' - }, - features: [ - { - name: $localize`:@@premium.orchestrationServerTemplate.feature.1:Core Features`, - details: [ - { - name: $localize`:@@premium.orchestrationServerTemplate.feature.1.detail.1:Integrated with OTH Servers`, - description: $localize`:@@premium.orchestrationServerTemplate.feature.1.detail.2:Works seamlessly with Open Template Hub Servers.`, - }, - PROFESSIONAL_HELP_FEATURE, - CUSTOMISED_SOLUTIONS_FEATURE, - ], - }, - { - name: `Quality and DX`, - details: [ - CI_CD_AUTOMATION_FEATURE, - CUSTOMISED_AUTOMATIONS_FEATURE, - ], - }, - { - name: `Security`, - details: [ - SECURITY_REPORTS_FEATURE, - CUSTOM_SECURITY_COMPLIANCE_FEATURE, - ], - }, - ], - pricingOptions: [ - { - title: $localize`:@@premium.orchestrationServer.basic.title:Basic`, - description: $localize`:@@premium.orchestrationServer.basic.description:For Individuals`, - features: [ [ 'true', '', '' ], [ '', '' ], [ '', '' ] ], - price: { - currency: '$', - value: '99', - subscriptionTime: '', - }, - }, - { - title: $localize`:@@premium.orchestrationServer.standard.title:Standard`, - description: $localize`:@@premium.orchestrationServer.standard.description:For Startups`, - ribbon: PRODUCT_RIBBONS.get( 'deal' ), - contactRequired: true, - features: [ [ 'true', 'true', '' ], [ 'true', '' ], [ $localize`:@@premium.orchestrationServer.standard.feature.1:Up to 10 users`, '' ] ] - }, - { - title: $localize`:@@premium.orchestrationServer.enterprise.title:Enterprise`, - description: $localize`:@@premium.orchestrationServer.enterprise.description:For Enterprises`, - contactRequired: true, - features: [ [ 'true', 'true', 'true' ], [ 'true', 'true' ], [ $localize`:@@premium.orchestrationServer.enterprise.feature.1:Unlimited users`, 'true' ] ] - }, - ], techStack: [ TECH_STACK.typeScript, TECH_STACK.node, TECH_STACK.express, + TECH_STACK.mongoDb, TECH_STACK.heroku, TECH_STACK.npm ] - }, + } ], - }, + } ]; -export const SERVICES: ProductLine[] = [ - { - key: 'services', - name: 'Services', - description: $localize`:@@servicesData.description:Services that we provide`, - products: [ - { - key: 'software-consultancy', - name: 'Software Consultancy', - description: $localize`:@@servicesData.softwareConsultancy.description:We perform world-class custom software development services from startups to enterprise businesses. Our highly experienced software developers have a deep understanding of how to leverage top programming languages, frameworks, and other software development tools to create the ideal solution for your business.`, - url: environmentCommon.website.github.url + '/' + environmentCommon.oth.social.github, - logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/logo/brand-logo.min.png', - features: [ { - name: $localize`:@@servicesData.softwareConsultancy.features.name:Features`, - details: [ - { - name: $localize`:@@servicesData.softwareConsultancy.features.details.1.name:Custom Application Development`, - description: $localize`:@@servicesData.softwareConsultancy.features.details.1.description:We rely on our industry-specific technology experience to deliver highly scalable, flexible, and interoperable web, mobile, desktop, and hybrid applications.` - }, - { - name: $localize`:@@servicesData.softwareConsultancy.features.details.2.name:Application Maintenance`, - description: $localize`:@@servicesData.softwareConsultancy.features.details.2.description:Our app maintenance & modernization services are designed to ensure the scalability, performance, and sustainability of your entire software infrastructure.` - }, - { - name: $localize`:@@servicesData.softwareConsultancy.features.details.3.name:Implementation & Deployment`, - description: $localize`:@@servicesData.softwareConsultancy.features.details.3.description:We devise an in-depth, comprehensive software implementation & deployment plan, assessing your needs to deliver enhanced technologies to end-users.` - }, - ], - } - ], - }, - { - key: 'software-integration', - name: 'Software Integration', - description: $localize`:@@servicesData.softwareIntegration.description:When a company adopts a new technology or business process, they face many challenges between their current applications and systems and the complicated software implementation process. Our industry-specific software engineers handle all of your challenging integration & implementation obstacles, including architectural design, testing, debugging, and execution.`, - url: environmentCommon.website.github.url + '/' + environmentCommon.oth.social.github, - logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/logo/brand-logo-pieces.min.png', - features: [ { - name: $localize`:@@servicesData.softwareIntegration.features.name:Features`, - details: [ - { - name: $localize`:@@servicesData.softwareIntegration.features.details.1.name:Data Integration Services`, - description: $localize`:@@servicesData.softwareIntegration.features.details.1.description:We perform data integration services, including merging data, consolidating business processes, and creating Database Management Systems to ensure complete data integrity during the transfer process.` - }, - { - name: $localize`:@@servicesData.softwareIntegration.features.details.2.name:API Integration Services`, - description: $localize`:@@servicesData.softwareIntegration.features.details.2.description:We provide integrating custom-built and third-party APIs service. We, integrate, and customize add web service functionality to mobile and web applications, and seamlessly synchronize data formats across these applications.` - }, - { - name: $localize`:@@servicesData.softwareIntegration.features.details.3.name:Enterprise Application Integrations`, - description: $localize`:@@servicesData.softwareIntegration.features.details.3.description:We provide Enterprise Application Integration solutions, facilitating seamless communications between business platforms. We are providing integrations for content management, accounting, customer relationship management, analytics, and marketing.` - }, - ], - } - ], - }, - { - key: 'quality-assurance', - name: 'Quality Assurance', - description: $localize`:@@servicesData.qualityAssurance.description:We deliver full-cycle QA automated software testing for web, mobile, and desktop applications to enable improved test coverage, enhance product quality, optimize testing activities, boost productivity, and decrease overall testing times.`, - url: environmentCommon.website.github.url + '/' + environmentCommon.oth.social.github, - logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/min/logo/brand-logo-shine.min.png', - features: [ { - name: $localize`:@@servicesData.qualityAssurance.features.name:Features`, - details: [ - { - name: $localize`:@@servicesData.qualityAssurance.features.details.1.name:Software QA Automation Testing`, - description: $localize`:@@servicesData.qualityAssurance.features.details.1.description:We deliver full-cycle QA automated software testing for web, mobile, and desktop applications to enable improved test coverage, enhance product quality, optimize testing activities, boost productivity, and decrease overall testing times.` - }, - { - name: $localize`:@@servicesData.qualityAssurance.features.details.2.name:Software QA Manual Testing`, - description: $localize`:@@servicesData.qualityAssurance.features.details.2.description:Our dedicated QA team will test your mobile, web, or desktop application manually to identify & fix bugs, detect & eradicate errors, and confirm its compliance with regulatory standards, providing you with the highest quality result possible.` - }, - { - name: $localize`:@@servicesData.qualityAssurance.features.details.3.name:Software QA Usability Testing`, - description: $localize`:@@servicesData.qualityAssurance.features.details.3.description:We design QA usability testing platforms that incorporate specific usability testing tools and UX research methods selected based on the client, focused on measuring how user-friendly and flexible your application or website is.` - }, - ], - } - ] - }, - ], - }, -]; diff --git a/src/app/data/resources/resources.data.ts b/src/app/data/resources/resources.data.ts new file mode 100644 index 00000000..ee2c2335 --- /dev/null +++ b/src/app/data/resources/resources.data.ts @@ -0,0 +1,10 @@ +import { URLS } from '../navigation/navigation.data'; + +export const RESOURCES_PAGES: { name: string, url: string, isExternal?: boolean }[] = [ + { name: $localize`:@@footer.about:Support`, url: URLS.contactUs }, + { name: $localize`:@@footer.customers:Contact`, url: URLS.contactUs }, + { name: $localize`:@@footer.partners:Terms And Conditions`, url: URLS.terms }, + { name: $localize`:@@footer.partners:Privacy`, url: URLS.privacyPolicy }, + { name: $localize`:@@footer.partners:Cookies`, url: URLS.cookiePolicy }, + { name: $localize`:@@footer.partners:Sitemap`, url: URLS.sitemap } +]; diff --git a/src/app/data/ribbon/ribbon.data.ts b/src/app/data/ribbon/ribbon.data.ts index e7c705a1..c187de74 100644 --- a/src/app/data/ribbon/ribbon.data.ts +++ b/src/app/data/ribbon/ribbon.data.ts @@ -1,14 +1,13 @@ -import { Ribbon } from '../../model/ribbon/ribbon.model'; +import { Ribbon } from '@open-template-hub/card'; export const DEFAULT_RIBBON = { theme: '', text: '' }; -// TODO: DEPRECATED -export const EVENT_RIBBONS = new Map( [ - [ 'new', { theme: 'blue', text: $localize`:@@ribbonData.new:New 🎉` } ], - [ 'featured', { theme: 'yellow', text: $localize`:@@ribbonData.featured:Featured 🚀` } ], - [ 'premium', { theme: 'green', text: $localize`:@@ribbonData.premium:Premium ⭐` } ], +export const PRODUCT_RIBBONS = new Map( [ + [ 'deal', { theme: 'blue', text: $localize`:@@ribbonData.deal:Deal` } ], + [ 'premium', { theme: 'yellow', text: $localize`:@@ribbonData.premium:Premium` } ], ] ); -export const PRODUCT_RIBBONS = new Map( [ - [ 'deal', { theme: 'blue', text: $localize`:@@ribbonData.deal:Deal` } ] +export const INFORMATION_RIBBONS = new Map( [ + [ 'maintenance', { theme: 'yellow', text: 'Under Maintenance' } ], + [ 'development', { theme: 'red', text: 'Under Development' } ], ] ); diff --git a/src/app/data/status/status.data.ts b/src/app/data/status/status.data.ts index 7e12f17e..8263da62 100644 --- a/src/app/data/status/status.data.ts +++ b/src/app/data/status/status.data.ts @@ -1,7 +1,7 @@ export const DEFAULT_SYSTEM_STATUS = { systemStatuses: [ { - name: $localize `:@@statusData.servers:servers`, + name: $localize`:@@statusData.servers:servers`, overall: '', statuses: [ { name: 'Auth Server', alive: '' }, @@ -10,6 +10,7 @@ export const DEFAULT_SYSTEM_STATUS = { { name: 'Payment Server', alive: '' }, { name: 'Analytics Server', alive: '' }, { name: 'Mail Server', alive: '' }, + { name: 'Sms Server', alive: '' }, ] } ], diff --git a/src/app/guard/auth/auth.guard.ts b/src/app/guard/auth/auth.guard.ts index 0e5d1a9e..903cb8e6 100644 --- a/src/app/guard/auth/auth.guard.ts +++ b/src/app/guard/auth/auth.guard.ts @@ -15,15 +15,14 @@ export class AuthGuard implements CanActivate { } canActivate( - next: ActivatedRouteSnapshot, + _next: ActivatedRouteSnapshot, state: RouterStateSnapshot ): | Observable | Promise | boolean | UrlTree { - const currentUser = this.authenticationService.currentUserValue; - if ( currentUser ) { + if ( this.authenticationService.currentUserValue ) { // logged in so return true return true; } diff --git a/src/app/guard/public-profile/public-profile.guard.ts b/src/app/guard/public-profile/public-profile.guard.ts index 25402dee..9d4b2b48 100644 --- a/src/app/guard/public-profile/public-profile.guard.ts +++ b/src/app/guard/public-profile/public-profile.guard.ts @@ -19,7 +19,7 @@ export class PublicProfileGuard implements CanActivate { canActivate( next: ActivatedRouteSnapshot, - state: RouterStateSnapshot ): Observable | Promise | boolean | UrlTree { + _state: RouterStateSnapshot ): Observable | Promise | boolean | UrlTree { const currentUser = this.authenticationService.currentUserValue; if ( currentUser ) { diff --git a/src/app/interceptor/navigation/navigation.interceptor.ts b/src/app/interceptor/navigation/navigation.interceptor.ts index eb3879ad..d033a750 100644 --- a/src/app/interceptor/navigation/navigation.interceptor.ts +++ b/src/app/interceptor/navigation/navigation.interceptor.ts @@ -4,16 +4,17 @@ import { Observable } from 'rxjs'; import { NAVIGATIONS } from 'src/app/data/navigation/navigation.data'; import { SeoMetaData } from 'src/app/model/seo/seo.model'; import { SeoService } from 'src/app/service/seo/seo.service'; +import { AnalyticsService } from '../../service/analytics/analytics.service'; @Injectable( { providedIn: 'root', } ) export class NavigationInterceptor implements CanActivate { - constructor( private seoService: SeoService ) { + constructor( private seoService: SeoService, private analyticsService: AnalyticsService ) { } canActivate( - next: ActivatedRouteSnapshot, + _next: ActivatedRouteSnapshot, state: RouterStateSnapshot ): | Observable @@ -29,6 +30,7 @@ export class NavigationInterceptor implements CanActivate { robots: navObj.keywords, } as SeoMetaData; this.seoService.setMetaData( seoMetaData ); + this.analyticsService.logEvent( 'Route', navObj ); } return true; diff --git a/src/app/interceptor/response/response.interceptor.ts b/src/app/interceptor/response/response.interceptor.ts index f538498e..5d0379cd 100644 --- a/src/app/interceptor/response/response.interceptor.ts +++ b/src/app/interceptor/response/response.interceptor.ts @@ -44,7 +44,7 @@ export class ResponseInterceptor implements HttpInterceptor { return this.refreshTokenSubject.pipe( filter( currentUser => currentUser != null ), take( 1 ), - switchMap( jwt => { + switchMap( () => { request = this.authenticationService.addAuthorizationHeader( request ); return next.handle( request ); } ) ); diff --git a/src/app/model/analytics/analytics.model.ts b/src/app/model/analytics/analytics.model.ts index fa845f35..42995cb4 100644 --- a/src/app/model/analytics/analytics.model.ts +++ b/src/app/model/analytics/analytics.model.ts @@ -1,3 +1,4 @@ export interface AnalyticsModel { tag: string; + id: string; } diff --git a/src/app/model/environment-common/environment-common.model.ts b/src/app/model/environment-common/environment-common.model.ts new file mode 100644 index 00000000..daa39c87 --- /dev/null +++ b/src/app/model/environment-common/environment-common.model.ts @@ -0,0 +1,62 @@ +import { WebsiteModel } from '../website/website.model'; + +export interface EnvironmentCommonModel { + company: { + website: string, + email: string, + social: { + twitter: string, + linkedin: string, + github: string, + productHunt: string, + npm: string, + discord: string + } + }, + + website: { + // oauth + twitter: WebsiteModel + google: WebsiteModel + facebook: WebsiteModel + linkedin: WebsiteModel + twitch: WebsiteModel + github: WebsiteModel + dribbble: WebsiteModel + reddit: WebsiteModel + + // payment + stripe: WebsiteModel + coinbase: WebsiteModel + paypal: WebsiteModel + + // file storage + aws: WebsiteModel + googleCloud: WebsiteModel + + // mail + gmail: WebsiteModel + yahoo: WebsiteModel + outlook: WebsiteModel + + // sms + twillio: WebsiteModel + awsSns: WebsiteModel + + // analytics + googleAnalytics: WebsiteModel + matomo: WebsiteModel + mixPanel: WebsiteModel + + // other + instagram: WebsiteModel + youtube: WebsiteModel + productHunt: WebsiteModel + appleCalendar: WebsiteModel + googleCalendar: WebsiteModel + discord: WebsiteModel + npm: WebsiteModel + }, + + languages: { name: string, code: string, emoji: string }[] +} diff --git a/src/app/model/environment/environment.model.ts b/src/app/model/environment/environment.model.ts index 541126e2..55105853 100644 --- a/src/app/model/environment/environment.model.ts +++ b/src/app/model/environment/environment.model.ts @@ -3,13 +3,13 @@ import { FileStorageModel } from '../file-storage/file-storage.model'; import { MailModel } from '../mail/mail.model'; import { OauthModel } from '../oauth/oauth.model'; import { PaymentModel } from '../payment/payment.model'; +import { SmsModel } from '../sms/sms.model'; export interface EnvironmentModel { identity: 'local' | 'staging' | 'production'; production: boolean; serverUrl: string; clientUrl: string; - mockDataEnabled: boolean; oauth: { twitter: OauthModel @@ -39,8 +39,14 @@ export interface EnvironmentModel { outlook: MailModel }; + sms: { + twillio: SmsModel + awsSns: SmsModel + }; + analytics: { googleAnalytics: AnalyticsModel, - matomo: AnalyticsModel + matomo: AnalyticsModel, + mixPanel: AnalyticsModel }; } diff --git a/src/app/model/hero/hero.model.ts b/src/app/model/hero/hero.model.ts deleted file mode 100644 index 6bef691e..00000000 --- a/src/app/model/hero/hero.model.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface Hero { - text: string; - level?: number; -} diff --git a/src/app/model/pricing/pricing.model.ts b/src/app/model/pricing/pricing.model.ts index c5ea00bc..a2c94933 100644 --- a/src/app/model/pricing/pricing.model.ts +++ b/src/app/model/pricing/pricing.model.ts @@ -1,4 +1,4 @@ -import { Ribbon } from '../ribbon/ribbon.model'; +import { Ribbon } from '@open-template-hub/card'; export interface PricingOption { title: string, diff --git a/src/app/model/product/product.model.ts b/src/app/model/product/product.model.ts index 667423f3..0d08f546 100644 --- a/src/app/model/product/product.model.ts +++ b/src/app/model/product/product.model.ts @@ -1,4 +1,4 @@ -import { CommandType } from 'src/app/data/command-type/command-type.enum'; +import { CommandType } from '@open-template-hub/animated-code-editor'; import { Image } from '../image/image.model'; import { PricingOption } from '../pricing/pricing.model'; import { StepTimeLineItem } from '../timeline/step-timeline.model'; @@ -10,12 +10,13 @@ export interface PricingFeature { } export interface Product { - key?: string; + key: string; name: string; description: string; color?: string; url: string; urlAlter?: string; + urlDemo?: string; logo: string; video?: Video; demonstrationImg?: Image; @@ -31,6 +32,8 @@ export interface Product { imageLoaded?: boolean; techStack?: Image[]; integrations?: any; + redirectToUrl?: boolean; + hasNpmPackage?: boolean; } export interface ProductLine { diff --git a/src/app/model/ribbon/ribbon.model.ts b/src/app/model/ribbon/ribbon.model.ts deleted file mode 100644 index a7bae051..00000000 --- a/src/app/model/ribbon/ribbon.model.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface Ribbon { - text: string, - theme: string -} diff --git a/src/app/model/sms/sms.model.ts b/src/app/model/sms/sms.model.ts new file mode 100644 index 00000000..bd12f959 --- /dev/null +++ b/src/app/model/sms/sms.model.ts @@ -0,0 +1,3 @@ +export interface SmsModel { + tag: string; +} diff --git a/src/app/model/user/user.model.ts b/src/app/model/user/user.model.ts new file mode 100644 index 00000000..039117e7 --- /dev/null +++ b/src/app/model/user/user.model.ts @@ -0,0 +1,9 @@ +import { Social } from '../social/social.model'; + +export interface User { + name: string; + title: string; + bio: string; + photoUri: string; + social: Social; +} diff --git a/src/app/model/website/website.model.ts b/src/app/model/website/website.model.ts new file mode 100644 index 00000000..dedf9a73 --- /dev/null +++ b/src/app/model/website/website.model.ts @@ -0,0 +1,17 @@ +export interface WebsiteModel { + name: string + logo?: string, + cssClass: string, + url?: string, + companyUrl?: string, + channelUrl?: string, + shareUrl?: string, + callbackParams?: string[] + tag?: string + api?: { repo?: string, download?: string } + publishableKey?: string + version?: string + clientId?: string + env?: string + websiteType: 'oauth' | 'payment' | 'file-storage' | 'mail' | 'sms' | 'analytics' | 'other' +} diff --git a/src/app/oth/oth.component.scss b/src/app/oth/oth.component.scss deleted file mode 100644 index 5e7c0d23..00000000 --- a/src/app/oth/oth.component.scss +++ /dev/null @@ -1 +0,0 @@ -/* Intentionally blank */ diff --git a/src/app/page/dashboard-layout/create-event-page/create-event-page.component.scss b/src/app/page/dashboard-layout/create-event-page/create-event-page.component.scss deleted file mode 100644 index 52108dd8..00000000 --- a/src/app/page/dashboard-layout/create-event-page/create-event-page.component.scss +++ /dev/null @@ -1,276 +0,0 @@ -.section { - display: flex; - flex-direction: column; - justify-content: center; - align-items: initial; - margin-top: 1.5em; -} - -.contribute-search-results a { - box-sizing: border-box; - padding: 10px 15px; - display: flex; - justify-content: flex-start; - align-items: center; - min-height: 55px; - border-bottom: 1px solid var(--darker-contrast); - cursor: pointer; -} - -.input-without-icon { - margin-left: 45px; - margin-bottom: 0.5em; -} - -.no-event-info { - margin-bottom: 40px; -} - -.input-checkbox-label span:after { - margin-left: 7px; - left: auto; -} - -.input-checkbox p { - margin-right: 10px; -} - -.input-checkbox i { - color: var(--contrast); -} - -.my-events { - width: 100%; - display: flex; - justify-content: space-evenly; - align-items: center; - -webkit-flex-wrap: wrap; - flex-wrap: wrap; -} - -.section .section-footer { - margin-top: 40px; - display: flex; - align-items: center; - margin-bottom: 20px; - margin-right: 30px; -} - -.section .section-footer .section-footer-icons { - margin-left: 30px; - width: -webkit-fill-available; -} - -.section .section-footer .section-footer-icons span { - margin-right: 20px; - padding: 5px; - border-radius: 50%; - cursor: pointer; -} - -.section .section-footer .section-footer-icons span .button-active { - color: var(--theme-color); -} - -.section .section-footer .section-footer-icons i { - color: var(--contrast); -} - -.selected-category-area { - margin-top: 20px; -} - -.search-area { - display: flex; - position: relative; - flex-direction: column; - align-items: center; - - color: var(--color); - margin-left: auto; - margin-right: auto; - width: -webkit-fill-available; - max-width: 800px; - height: 120px; - z-index: 10; - background-color: var(--background-color); - padding-bottom: 10px; -} - -.search-area ::placeholder { - color: var(--lighter-contrast); -} - -.search-area input, .search-area ::placeholder { - font-size: 14px; - font-weight: 500; -} - -.search-area i { - cursor: pointer; - align-items: center; - padding: 4px; -} - -.search-bar { - display: flex; - width: -webkit-fill-available; - align-items: center; - margin-bottom: 40px; -} - -.searched-events { - width: 100%; - display: flex; - justify-content: space-evenly; - align-items: center; - -webkit-flex-wrap: wrap; - flex-wrap: wrap; -} - -@media only screen and (min-width: 1000px) { - .contribute-page { - display: block; - padding-top: 110px; - } - - .contribute-page .contribute-card { - width: -webkit-fill-available; - min-width: 400px; - } - - .contribute-page .upcoming-card { - padding-right: 2em; - margin-left: 2em; - margin-right: -2em; - } - - .contribute-page .upcoming-card.sticky { - position: fixed; - top: 50px; - right: 32px; - } - - .contribute-search-results { - position: absolute; - min-height: 55px; - width: -webkit-fill-available; - margin-right: 40px; - display: flex; - flex-direction: column; - justify-content: flex-start; - background-color: var(--background-color); - box-shadow: 0 0 5px var(--shadow); - z-index: 12; - border-bottom-left-radius: 3px; - border-bottom-right-radius: 3px; - overflow: auto; - max-height: calc(100% - 240px); - } - - .contribute-search-results app-label-with-icon-data i { - margin-top: auto; - margin-bottom: auto; - } -} - -@media only screen and (max-width: 999px) { - .contribute-page { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - padding-top: 85px; - } - - .contribute-page app-card { - display: flex; - justify-content: center; - align-items: center; - } - - .contribute-search-results { - position: absolute; - left: 0; - min-height: 70px; - width: 100vw; - display: flex; - flex-direction: column; - justify-content: flex-start; - overflow-x: auto; - background-color: var(--background-color); - box-shadow: 0 0 5px var(--shadow); - z-index: 12; - border-bottom-left-radius: 3px; - border-bottom-right-radius: 3px; - max-height: calc(100% - 200px); - } - - .contribute-search-results .search-result-user-label { - box-sizing: border-box; - padding: 2px; - display: flex; - justify-content: center; - align-items: center; - border-bottom: 1px solid var(--darker-contrast); - background-color: var(--theme-color); - color: var(--darker-contrast); - } - - .section .section-footer .section-footer-icons { - margin-left: 0; - text-align: center; - } - - .section .section-footer .section-footer-icons span { - margin-right: 10px; - } - - .section .section-footer { - display: block; - margin-right: 0; - margin-left: 0; - } - - .contribute-button-area { - text-align: center; - margin-top: 50px; - } - - .contribute-button-area .contribute-button { - margin: 0; - } -} - -@media only screen and (min-width: 1400px) { - .left-column, .right-column { - width: 50%; - } - - .left-column { - padding-right: 10px; - } - - .right-column { - padding-left: 10px; - } - - .form-content { - display: flex; - flex-direction: row; - } - - .contribute-search-results { - width: 45%; - } -} - -@media (hover: hover) { - .contribute-search-results a:hover { - background-color: var(--hover); - } - - .section .section-footer .section-footer-icons span i:hover { - color: var(--theme-color); - } -} diff --git a/src/app/page/dashboard-layout/create-event-page/create-event-page.component.ts b/src/app/page/dashboard-layout/create-event-page/create-event-page.component.ts deleted file mode 100644 index bda6bc8e..00000000 --- a/src/app/page/dashboard-layout/create-event-page/create-event-page.component.ts +++ /dev/null @@ -1,351 +0,0 @@ -import { formatDate } from '@angular/common'; -import { Component, ElementRef, HostListener, OnInit, ViewChild } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { ActivatedRoute, Router } from '@angular/router'; -import { DatePickerComponent, IDayCalendarConfig } from 'ng2-date-picker'; -import { environment } from '../../../../environments/environment'; -import { URLS } from '../../../data/navigation/navigation.data'; -import { BusinessLogicService } from '../../../service/business-logic/business-logic.service'; -import { CategoryService } from '../../../service/category/category.service'; -import { EventService } from '../../../service/event/event.service'; -import { InformationService } from '../../../service/information/information.service'; -import { LoadingService } from '../../../service/loading/loading.service'; -import { ToastService } from '../../../service/toast/toast.service'; - -@Component( { - selector: 'app-contribute-page', - templateUrl: './create-event.html', - styleUrls: [ './create-event-page.component.scss' ] -} ) -export class CreateEventPageComponent implements OnInit { - - form: FormGroup; - submitted = false; - loading = false; - URLS = URLS; - - isSticky = false; - - cardTitle = 'Create Event'; - - searchedEvents = []; - - defaultCategory: any = { - category: { name: 'Development', id: 1 }, - subCategory: { name: 'Web Development', id: 1 }, - leafCategory: undefined - }; - - selectedCategory: any = { ...this.defaultCategory }; - - categorySearchResults = []; - - searchEnabled = true; - - searchQuery = ''; - - todayDateTime = formatDate( new Date(), 'yyyy/MM/ddTHH:mmZ', 'en-US' ); - - dayPickerConfig = { - locale: 'en', - format: 'yyyy/MM/DD HH:mm', - firstDayOfWeek: 'mo', - min: this.todayDateTime - } as unknown as IDayCalendarConfig; - - myUpcomingEvents = []; - myRecentlyCompletedEvents = []; - myPassedEvents = []; - - defaultFormValues = { - _id: null, - title: '', - description: '', - link: '', - date: '', - durationHour: '0', - durationMin: '45', - isDurationActive: false, - isEmailAllowed: false, - isPremium: false, - price: '5.00', - category: '' - }; - - // for "Premium content cannot be changed to free" - previousPrice: string; - - @ViewChild( 'searchArea' ) searchArea: ElementRef; - @ViewChild( 'dateArea' ) public dateFromDp: DatePickerComponent; - - constructor( - private formBuilder: FormBuilder, - private loadingService: LoadingService, - private toastService: ToastService, - private route: ActivatedRoute, - private router: Router, - private informationService: InformationService, - private eventService: EventService, - private categoryService: CategoryService, - private activatedRoute: ActivatedRoute, - private businessLogicService: BusinessLogicService - ) { - } - - ngOnInit(): void { - const userInfo = this.businessLogicService.userInfoSubject.getValue(); - if ( !userInfo?.payload?.userProfileActivated ) { - this.router.navigate( [ URLS.dashboard.root ] ).then( () => { - this.informationService.setInformation( `Enable user profile to view this page`, 'info' ); - } ); - } - - this.form = this.formBuilder.group( { - _id: [ this.defaultFormValues._id ], - title: [ this.defaultFormValues.title, Validators.required ], - description: [ this.defaultFormValues.description, Validators.maxLength( 500 ) ], - link: [ this.defaultFormValues.link, Validators.pattern( '^.+:\\/\\/.*$' ) ], - date: [ this.defaultFormValues.date, Validators.required ], - durationHour: [ this.defaultFormValues.durationHour, Validators.pattern( '^([0-1]?[0-9]|2[0-3])$' ) ], - durationMin: [ this.defaultFormValues.durationMin, Validators.pattern( '^([0-9]|([0-5][0-9]))$' ) ], - isDurationActive: [ this.defaultFormValues.isDurationActive ], - isEmailAllowed: [ this.defaultFormValues.isEmailAllowed ], - isPremium: [ this.defaultFormValues.isPremium ], - price: [ this.defaultFormValues.price, Validators.pattern( '^[+-]?[0-9]{1,3}(?:,?[0-9]{3})*(?:\.[0-9]{2})?$' ) ], - category: [ this.defaultFormValues.category ] - } ); - - this.eventService.me( 'true' ) - .subscribe( myUpcomingEvents => { - this.myUpcomingEvents = myUpcomingEvents; - - if ( this.activatedRoute.snapshot.queryParams.editable && this.activatedRoute.snapshot.queryParams.event_id ) { - this.fillForm( this.activatedRoute.snapshot.queryParams.event_id ); - } - } ); - - this.eventService.me( 'false' ) - .subscribe( myRecentlyCompletedEvents => { - this.myRecentlyCompletedEvents = myRecentlyCompletedEvents; - } ); - - this.eventService.me( 'false', 'true' ) - .subscribe( myPassedEvents => { - this.myPassedEvents = myPassedEvents; - this.searchedEvents = [ ...myPassedEvents ]; - } ); - - this.dayPickerConfig = { - ...this.dayPickerConfig - }; - - this.selectedCategory = { ...this.defaultCategory }; - } - - @HostListener( 'document:click', [ '$event' ] ) - onDocumentClick( event ) { - if ( this.searchArea.nativeElement.contains( event.target ) ) { - this.searchEnabled = true; - } else { - this.searchEnabled = false; - } - } - - @HostListener( 'window:scroll', [ '$event' ] ) - checkScroll() { - this.isSticky = window.pageYOffset >= 90; - } - - onSubmit() { - if ( this.loading ) { - return; - } - - this.submitted = true; - - // set errors manually - if ( this.form.controls.isPremium.value && - ( this.form.controls.price.value === '' || parseFloat( this.form.controls.price.value ) < 5 ) ) { - this.form.controls.price.setErrors( { incorrect: true } ); - } - - if ( this.form.controls.link.value === '' ) { - this.form.controls.link.setErrors( { incorrect: true } ); - } - - // for "Premium content cannot be changed to free" - this.previousPrice = this.form.controls.price.value; - if ( !this.form.controls.isPremium.value ) { - this.form.controls.price.setValue( this.defaultFormValues.price ); - } - - const errorMessages = { - title: 'Please provide a title', - date: 'Please provide a date', - durationMin: 'Please provide a valid duration', - durationHour: 'Please provide a valid duration', - link: 'Please provide a valid url (Ex. "https://opentemplatehub.com")', - price: 'Price must be minimum 5.00$' - }; - - if ( this.form.invalid ) { - for ( const control in this.form.controls ) { - if ( this.form.controls[ control ].invalid ) { - this.toastService.error( errorMessages[ control ], '' ); - } - } - return; - } - - this.addEditEvent(); - } - - resetEventForm() { - this.cardTitle = 'Add Event'; - this.submitted = false; - this.form.reset( this.defaultFormValues ); - this.selectedCategory = { ...this.defaultCategory }; - } - - getUserEvents() { - this.eventService.me( 'true' ) - .subscribe( myEvents => { - this.myUpcomingEvents = myEvents; - } ); - } - - fillForm( id: string ): void { - for ( const event of this.myUpcomingEvents ) { - if ( event._id === id ) { - this.form = this.formBuilder.group( { - _id: [ event._id ], - title: [ event.title, Validators.required ], - description: [ event.payload.description, Validators.maxLength( 500 ) ], - link: [ event.link, Validators.pattern( '^.+:\\/\\/.*$' ) ], - date: [ formatDate( new Date( event.date ), 'yyyy/MM/dd HH:mm', 'en-US' ), Validators.required ], - durationHour: [ Math.floor( event.duration / 60 ).toString(), Validators.pattern( '^([0-1]?[0-9]|2[0-3])$' ) ], - durationMin: [ ( event.duration % 60 ).toString(), Validators.pattern( '^([0-9]|([0-5][0-9]))$' ) ], - isDurationActive: [ true ], - isEmailAllowed: [ !!event.user.email ], - isPremium: [ event.isPremium ], - price: [ event.payload.price ? event.payload.price : this.defaultFormValues.price, Validators.pattern( '^[+-]?[0-9]{1,3}(?:,?[0-9]{3})*(?:\.[0-9]{2})?$' ) ], - category: [ event.category ] - } ); - - this.form.controls.category.markAsTouched(); - - this.selectedCategory = { - category: event.payload.category, - subCategory: event.payload.subCategory, - leafCategory: event.payload.leafCategory - }; - - window.scroll( 0, 0 ); - this.cardTitle = 'Edit Event'; - return; - } - } - } - - search( event: any ) { - const q = event.target.value; - - if ( !q || q.length < 3 ) { - this.categorySearchResults = []; - return; - } - - this.categoryService.search( q ).subscribe( results => { - this.categorySearchResults = results.slice( 0, 10 ); - } ); - } - - searchInAllEvents( event: any ) { - let q = ''; - - if ( !event ) { - q = this.searchQuery; - } else { - q = event.target.value; - this.searchQuery = q; - } - - if ( !q || q.length < 3 ) { - this.searchedEvents = [ ...this.myPassedEvents ]; - return; - } - - this.eventService.me( 'false', 'true', q ) - .subscribe( searchedEvents => { - this.searchedEvents = searchedEvents; - } ); - } - - markAsCompletedButtonClicked( event: string ) { - // remove the item from recentlyPassedEvents - this.myRecentlyCompletedEvents.forEach( ( item, index ) => { - if ( item._id === event ) { - this.myRecentlyCompletedEvents.splice( index, 1 ); - } - } ); - - // refresh passedEvents - this.eventService.me( 'false', 'true' ) - .subscribe( myPassedEvents => { - this.myPassedEvents = myPassedEvents; - this.searchedEvents = [ ...myPassedEvents ]; - } ); - } - - private addEditEvent() { - const payload: any = { - description: this.form.controls.description.value, - category: this.selectedCategory.category.id, - subCategory: this.selectedCategory.subCategory?.id, - leafCategory: this.selectedCategory.leafCategory?.id - }; - - if ( this.form.controls.isPremium.value ) { - payload.price = this.form.controls.price.value; - } - - const date = new Date( this.form.controls.date.value ); - - const event = { - _id: this.form.controls._id.value, - title: this.form.controls.title.value, - isPremium: this.form.controls.isPremium.value, - date: date.toISOString(), - duration: this.form.controls.isDurationActive.value ? - ( +this.form.controls.durationHour.value ) * 60 + ( +this.form.controls.durationMin.value ) : 45, - isEmailAllowed: this.form.controls.isEmailAllowed.value, - link: this.form.controls.link.value, - payload, - paymentConfigKey: environment.payment.stripe.tag, - imageUrl: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/logo/brand-logo.png' - }; - - // if event._id is not null, update, else create - if ( event._id ) { - this.eventService.update( event ) - .subscribe( () => { - this.toastService.info( 'Event updated' ); - this.resetEventForm(); - this.getUserEvents(); - this.router.navigate( [ URLS.dashboard.contribute ] ); - }, ( error ) => { - if ( error.error.message.startsWith( 'Premium content cannot be changed to free' ) ) { - this.form.controls.isPremium.setValue( true ); - this.form.controls.price.setValue( this.previousPrice ); - } - } ); - } else { - this.eventService.create( event ) - .subscribe( () => { - this.resetEventForm(); - this.getUserEvents(); - } - ); - } - } -} diff --git a/src/app/page/dashboard-layout/create-event-page/create-event.html b/src/app/page/dashboard-layout/create-event-page/create-event.html deleted file mode 100644 index 800b7c02..00000000 --- a/src/app/page/dashboard-layout/create-event-page/create-event.html +++ /dev/null @@ -1,146 +0,0 @@ -
- - -
- -
-
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - - - -
-
-

{{ ( selectedCategory.category ? selectedCategory.category.name : '' ) + - ( selectedCategory.subCategory ? ' - ' + selectedCategory.subCategory.name : '' ) + - ( selectedCategory.leafCategory ? ' - ' + selectedCategory.leafCategory.name : '' ) }}

-
-
-
-
- - -
-
- -

:

- -

Duration:

- -
-
- -

$

- -
-
-
-
-
- - - - - - - - - -
-
- -
-
-
-
- - -
-

Recently Completed Events

-
-
- -
-
-

Your Upcoming Events

-
- -
-

Nothing in here..

-
- -
- -
-
-

Your Passed Events

-
- -
-
- - -
- -
- -
- - -
-
-

No results were found

-
-
diff --git a/src/app/page/dashboard-layout/dashboard-layout.component.html b/src/app/page/dashboard-layout/dashboard-layout.component.html index e8ae234f..c227f1fa 100644 --- a/src/app/page/dashboard-layout/dashboard-layout.component.html +++ b/src/app/page/dashboard-layout/dashboard-layout.component.html @@ -1,4 +1,4 @@ -
+
@@ -12,5 +12,5 @@
- +
diff --git a/src/app/page/dashboard-layout/dashboard-layout.component.scss b/src/app/page/dashboard-layout/dashboard-layout.component.scss index a84f76a7..f2432787 100644 --- a/src/app/page/dashboard-layout/dashboard-layout.component.scss +++ b/src/app/page/dashboard-layout/dashboard-layout.component.scss @@ -1,41 +1,46 @@ @use '../../../styles/util/util'; @use '../../../styles/page/page'; -.page-content { - padding: 0 2rem 2em; +.wrapper { + background-color: var(--background-color); + + & .page { + & .page-content { + padding: 0 2rem 2em; + } + } } @media only screen and (max-width: 999px) { - .page { - min-height: 200vh; - margin-top: 55px; - } + .wrapper { + & .page { + min-height: 200vh; + margin-top: 55px; + } - .page, .footer-wrap { - margin-left: 0; + & .page, & .footer-wrap { + margin-left: 0; + } } } @media only screen and (min-width: 1000px) { - .side-nav-closed .page, .side-nav-closed .footer-wrap, .page, .footer-wrap { - margin-left: 80px; - } - .page, .footer-wrap { - margin-right: 320px; - } -} + .wrapper { + & .page, & .footer-wrap { + margin-left: 256px; + margin-right: 400px; -@media only screen and (min-width: 1000px) { - .page { - margin-top: 0; - } + } - .page, .footer-wrap { - margin-left: 256px; - margin-right: 400px; - } + &.side-nav-closed { + & .page, & .footer-wrap { + margin-left: 80px; + } + } - .side-nav-closed .page, .side-nav-closed .footer-wrap { - margin-left: 80px; + & .page { + margin-top: 0; + min-height: calc(100vh - 480px); + } } } diff --git a/src/app/page/dashboard-layout/dashboard-page/dashboard-page.component.html b/src/app/page/dashboard-layout/dashboard-page/dashboard-page.component.html index 5817229c..0d644231 100644 --- a/src/app/page/dashboard-layout/dashboard-page/dashboard-page.component.html +++ b/src/app/page/dashboard-layout/dashboard-page/dashboard-page.component.html @@ -1,132 +1,3 @@
- - - - wallpaper - - - -
-
- -

- - 🥇 - 🥈 - 🥉 - - 📚 - 👋 - 🎓 -

-
-
-
-

{{( userInfo?.payload?.firstName && userInfo?.payload?.lastName ) ? - ( userInfo.payload.firstName + ' ' + userInfo.payload.lastName + ' (@' + userInfo.username + ')' ) - : ( userInfo?.username ? userInfo.username : '' ) }} -

-
-
- - -
-
- {{followerCount}} Following -
-
- {{followeeCount}} Followers -
-
- {{ numberOfEventsMade }} Events -
-
-
-
-
-
-

Interests

-
-
-
- - -
-
-
- - - - -
-

Recently Passed Events

-
- -
- - -
- - -
-
-

Your Upcoming Events

-
- -
-

Nothing in here..

-
- -
- - -
-
- - -
-

Attended Events

-
- -
-

Nothing in here..

-
- -
- -
- - -
-

Completed Events

-
-
- - -
- - +
diff --git a/src/app/page/dashboard-layout/dashboard-page/dashboard-page.component.scss b/src/app/page/dashboard-layout/dashboard-page/dashboard-page.component.scss index 9d1be4e8..36d23ef9 100644 --- a/src/app/page/dashboard-layout/dashboard-page/dashboard-page.component.scss +++ b/src/app/page/dashboard-layout/dashboard-page/dashboard-page.component.scss @@ -1,139 +1,117 @@ +@use "../../../../styles/util/util"; +@use 'node_modules/@open-template-hub/card/styles/card/card'; + .dashboard-page { - & app-card { - & .content-column-wrapper { - & .rate-badge-wrapper { - position: absolute; - top: 45px; - left: 26px; + padding-top: 120px; + margin-left: 60px; + margin-right: 60px; + + & .socket-activity-card { + margin: 30px; + + & .body { + @include util.flex-layout-row; + + height: 246px; + + padding: 0.5em 1.5em 1.5em; + + font-size: 16px; + + & .chat { + overflow: auto; display: flex; - align-items: center; - justify-content: center; + flex-direction: column-reverse; - & label { - font-size: 1.5em; - } + padding-right: 0.5em; + width: 70%; + + box-sizing: border-box; } - & .column-first { - & .section-output { - & .follower-following-count-area { - display: flex; - margin-top: 0.7em; - margin-left: 0.4em; - font-weight: 300; - color: var(--color); - flex-wrap: wrap; - - & .follower-count-area { - margin-right: 20px; - - & .follower-count { - font-style: normal; - color: var(--theme-color); - } - } + & .users { + font-size: 15px; - & .following-count-area { - margin-right: 20px; + width: 30%; + padding-top: 0.5em; + padding-bottom: 0.5em; - & .following-count { - font-style: normal; - color: var(--theme-color); - } - } + & .title { + border-bottom: 1px solid var(--theme-color); + margin-bottom: 0.5em; + } + + & .users-list { + @include util.default-border-radius; - & .event-count-area { - & .event-count { - font-style: normal; - color: var(--theme-color); - } + background-color: var(--card); + border: 2px solid var(--shadow-lighter); + box-shadow: 0 -6px 15px -7px var(--shadow); + + box-sizing: border-box; + padding: 0.5em; + + overflow-y: auto; + + height: -webkit-fill-available; + + & .user-wrapper { + @include util.flex-layout-row; + + justify-content: flex-start; + align-items: center; + + & p { + margin-left: 0.5em; + font-weight: 400; + color: var(--theme-color-darker-2); } } } } - & .column-second { - & .interest-list { - width: 100%; - display: flex; - justify-content: flex-start; - position: relative; - margin-top: 0.5em; - margin-bottom: 0.5em; - flex-wrap: wrap; - & app-label-with-icon-data { - margin: 5px; - min-width: -webkit-fit-content; - display: flex; - align-items: center; - } + & p { + &.even { + background-color: var(--darker-contrast); + } + + & .author { + font-weight: 500; + color: var(--theme-color-darker-2); } } } - } - & .dashboard-page-events { - width: 100%; - display: flex; - justify-content: space-evenly; - align-items: center; - -webkit-flex-wrap: wrap; - flex-wrap: wrap; - } -} - -@media only screen and (min-width: 1300px) { - .dashboard-page { - & app-card { - &.bigger-card:hover { - transform: scale(1.15); + & .footer { + @include card.default-footer; + padding: 1em; - &:hover { - transform: scale(1.18); - } + & form { + width: 100%; } - & .content-column-wrapper { - display: flex; + & .input-with-icon { flex-direction: row; - & .column-second { - display: flex; - flex-direction: column; - max-width: 40%; - } - } - } - } -} + & i { + @include util.default-border-radius; -@media only screen and (min-width: 1000px) { - .dashboard-page { - display: block; - align-items: center; - padding-top: 110px; - - & app-card { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - - & .content-column-wrapper { - & .column-first { - display: flex; - flex-direction: column; - width: -webkit-fill-available; + border: 1px solid var(--lighter-contrast); + box-shadow: 0 0 15px -4px var(--shadow); + + padding: 0.65em 1.1em; + cursor: pointer; + + color: var(--lighter-contrast); } - & .column-second { - width: -webkit-fill-available; + & input:focus { + border-color: var(--theme-color-lighter-6); - & .interest-list { - flex-direction: row; - place-content: center flex-start; - align-items: center; + & + i { + border-color: var(--theme-color-lighter-6); + color: var(--theme-color); } } } @@ -143,57 +121,36 @@ @media only screen and (max-width: 999px) { .dashboard-page { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - padding-top: 85px; - - & app-card { - display: flex; - justify-content: center; - align-items: center; - - & .content-column-wrapper { - & .rate-badge-wrapper { - left: 0; - width: 100%; - display: block; + margin-left: 0; + margin-right: 0; - & .badge-area { - padding-top: 5px; - margin-left: initial; - text-align: center; - } + & .socket-activity-card { + margin: 30px; - & label { - font-size: 1.4em; - } + & .body { + @include util.flex-layout-column-reverse; + + & .chat, & .users { + width: 100%; } - & .column-first { - &.with-rate { - margin-top: 30px; - } + height: auto; + + & .chat { + height: 300px; + padding-right: 0; } - & .column-second { - & .interest-list { - flex-direction: column; - place-content: flex-start; + & .users { + height: auto; + padding-bottom: 0.5em; + border-bottom: 1px solid var(--shadow-lighter); + + & .users-list { + height: 150px; } } } } } } - -app-event-card { - &.bigger-card:hover { - transform: scale(1.15); - - &:hover { - transform: scale(1.18); - } - } -} diff --git a/src/app/page/dashboard-layout/dashboard-page/dashboard-page.component.ts b/src/app/page/dashboard-layout/dashboard-page/dashboard-page.component.ts index f8a25305..ee712da9 100644 --- a/src/app/page/dashboard-layout/dashboard-page/dashboard-page.component.ts +++ b/src/app/page/dashboard-layout/dashboard-page/dashboard-page.component.ts @@ -1,267 +1,102 @@ -import { formatDate } from '@angular/common'; import { Component, OnDestroy, OnInit } from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Router } from '@angular/router'; import { environment } from '../../../../environments/environment'; -import { CalendarEvent } from '../../../component/calendar/calendar.component'; import { Rate } from '../../../component/rate-bar/rate-bar.component'; -import { EventTypes } from '../../../data/deprecated/event/events.data'; import { URLS } from '../../../data/navigation/navigation.data'; import { PROFILE_IMG } from '../../../data/profile/profile.data'; import { AuthToken } from '../../../model/auth/auth-token.model'; import { AuthenticationService } from '../../../service/auth/authentication.service'; import { BusinessLogicService } from '../../../service/business-logic/business-logic.service'; -import { CategoryService } from '../../../service/category/category.service'; -import { EventService } from '../../../service/event/event.service'; import { FileStorageService } from '../../../service/file-storage/file-storage.service'; -import { FolloweeService } from '../../../service/followee/followee.service'; -import { FollowerService } from '../../../service/follower/follower.service'; import { InformationService } from '../../../service/information/information.service'; import { LoadingService } from '../../../service/loading/loading.service'; -import { UserActivityService } from '../../../service/user-activity/user-activity.service'; +import { PaymentService } from '../../../service/payment/payment.service'; +import { ProductService } from '../../../service/product/product.service'; +import { ToastService } from '../../../service/toast/toast.service'; @Component( { selector: 'app-dashboard-page', templateUrl: './dashboard-page.component.html', - styleUrls: [ './dashboard-page.component.scss' ] + styleUrls: [ './dashboard-page.component.scss' ], } ) export class DashboardPageComponent implements OnInit, OnDestroy { - currentUser: AuthToken; userInfo: any = {}; environment = environment; profileImg = PROFILE_IMG; loading = false; - userInterests = []; - attendedEvents = []; - myRecentlyCompletedEvents = []; - myUpcomingEvents = []; - unratedEvents = []; - + userIsPremium; URLS = URLS; - followerCount: number; - followeeCount: number; - - rate = 0; - formattedRateNumber: string; - numberOfRate: number; + form: FormGroup; rateObject: Rate; - numberOfEventsMade: number; - numberOfEventsTaken: number; - topContributor: number; - - calendarEvents: CalendarEvent[] = []; - events: CalendarEvent[] = []; - constructor( + private formBuilder: FormBuilder, private router: Router, private authenticationService: AuthenticationService, private loadingService: LoadingService, private businessLogicService: BusinessLogicService, private fileStorageService: FileStorageService, private informationService: InformationService, - private categoryService: CategoryService, - private followerService: FollowerService, - private followeeService: FolloweeService, - private eventService: EventService, - private userActivityService: UserActivityService + private toastService: ToastService, + private paymentService: PaymentService, + private productService: ProductService ) { - this.authenticationService.currentUser.subscribe( currentUser => { - this.currentUser = currentUser; - } - ); + this.authenticationService.currentUser.subscribe( ( currentUser ) => { + this.currentUser = currentUser; + } ); - this.businessLogicService.userInfo.subscribe( userInfo => { + this.businessLogicService.userInfo.subscribe( ( userInfo ) => { this.userInfo = userInfo; - - if ( userInfo?.username ) { - this.userActivityService.getNumberOfEventsTaken( userInfo.username ).subscribe( result => { - this.numberOfEventsTaken = result[ 0 ].numberOfEventsTaken; - } ); - - if ( userInfo.payload?.userProfileActivated ) { - this.userActivityService.getNumberOfEventsMade( userInfo.username ).subscribe( result => { - this.numberOfEventsMade = result.numberOfEventsMade; - } ); - - this.userActivityService.getContributorRate( userInfo.username ).subscribe( rate => { - this.rateObject = { - userRating: rate.userRating, - numberOfRates: rate.numberOfRates - }; - } ); - - this.userActivityService.getTopContributors().subscribe( topContributors => { - topContributors.forEach( ( value, index ) => { - if ( value.username === userInfo.username ) { - this.topContributor = index; - } - } ); - } ); - } else { - this.numberOfEventsMade = undefined; - this.rateObject = undefined; - this.topContributor = undefined; - } - } } ); - this.loadingService.sharedLoading.subscribe( loading => this.loading = loading ); - - this.businessLogicService.me() - .subscribe( userInfo => { - this.userInfo = userInfo; - - if ( !this.userInfo.payload ) { - this.businessLogicService.createMyInfo() - .subscribe( () => { - this.router.navigate( [ URLS.maintenance ] ); - } - ); - } else { - this.followerService.count( userInfo.username ).subscribe( followerCount => { - this.followerCount = followerCount[ 0 ].count; - } ); - - this.followeeService.count( userInfo.username ).subscribe( followeeCount => { - this.followeeCount = followeeCount[ 0 ].count; - } ); - - this.fetchUnratedCompletedEvents(); - - this.categoryService.getCategoriesFromId( this.userInfo?.payload?.interests ).subscribe( result => { - this.userInterests = result; - } ); - - if ( this.userInfo?.payload?.profileImageId ) { - this.fileStorageService.downloadProfileImage( this.userInfo.payload.profileImageId ).subscribe(); - } - - const userInterests = userInfo?.payload?.interests; - const categories: any[] = []; - - if ( userInterests && userInterests.length > 0 ) { - for ( const interest of userInterests ) { - categories.push( - { - category: interest.category, - subCategory: interest.subCategory, - leafCategory: interest.leafCategory - } - ); - } - } - - this.eventService.initSearchEvents( categories ); - } - } + this.loadingService.sharedLoading.subscribe( + ( loading ) => ( this.loading = loading ) ); - this.eventService.attendedEvents.subscribe( attendedEvents => { - this.attendedEvents = attendedEvents; + this.businessLogicService.me().subscribe( ( userInfo ) => { + this.userInfo = userInfo; + this.productService.checkProduct(); + if ( !this.userInfo.payload ) { + this.businessLogicService.createMyInfo().subscribe( () => { + this.router.navigate( [ URLS.settings.editProfile ] ); + } ); + } else { + if ( this.userInfo?.payload?.profileImageId ) { + this.fileStorageService + .downloadProfileImage( this.userInfo.payload.profileImageId ) + .subscribe(); + } + } } ); - this.eventService.getAttendedEvents().subscribe(); - - this.fileStorageService.sharedProfileImage.subscribe( profileImg => { - if ( profileImg?.file?.data ) { + this.fileStorageService.sharedProfileImage.subscribe( ( profileImg ) => { + if ( profileImg?.file?.url ) { + this.profileImg = profileImg.file.url; + } else if ( profileImg?.file?.data ) { this.profileImg = 'data:image/png;base64,' + profileImg.file.data; } } ); - } - - updateCalendar( events: any[], backgroundColor: 'red' | 'blue' ) { - if ( events === null ) { - return; - } - events.forEach( ( event, index ) => { - const start = formatDate( new Date( event.date ), 'yyyy-MM-dd HH:mm', 'en-US' ); - const end = formatDate( new Date( new Date( event.date ).getTime() + event.duration * 60000 ), 'yyyy-MM-dd HH:mm', 'en-US' ); - this.calendarEvents.push( { id: event._id, title: event.title, start, end, backgroundColor } ); - this.events = [ ...this.calendarEvents ]; + this.productService.premiumProducts.subscribe( ( products ) => { + this.userIsPremium = products?.length > 0; } ); } - datesSet( data ) { - this.calendarEvents = []; - const startDate = data.start.toDateString(); - const endDate = data.end.toDateString(); - this.getUserEventsWithDate( startDate, endDate ); - this.getAttendedEventsWithDate( startDate, endDate ); - } - - ngOnInit(): void { - this.getUserEvents(); + ngOnInit() { + this.initForm(); } - getUserEvents() { - this.eventService.me( 'true' ) - .subscribe( myEvents => { - this.myUpcomingEvents = myEvents; - } ); - - this.eventService.me( 'false' ) - .subscribe( myRecentlyCompletedEvents => { - this.myRecentlyCompletedEvents = myRecentlyCompletedEvents; - } ); - } - - getUserEventsWithDate( startDate: string, endDate: string ) { - this.eventService.me( 'false', 'false', startDate, endDate ).subscribe( events => { - this.updateCalendar( events, 'red' ); - } ); - } - - getAttendedEventsWithDate( startDate: string, endDate: string ) { - this.eventService.getAttendedEvents( startDate, endDate ).subscribe( events => { - this.updateCalendar( events, 'blue' ); + initForm() { + this.form = this.formBuilder.group( { + message: [ '', Validators.required ], } ); } ngOnDestroy() { this.informationService.clearInformation(); - this.eventService.resetEvents( EventTypes.Attended ); - } - - // handleDateClick(arg) {} - - handleEventClick( arg ) { - this.router.navigate( [ URLS.dashboard.event ], { queryParams: { event_id: arg.event.id } } ); - } - - goToUrl( url: string ) { - window.open( url, '_blank' ); - } - - fillForm( id: string ) { - this.router.navigate( [ URLS.dashboard.contribute ], { queryParams: { event_id: id, editable: true } } ); - } - - markAsCompletedButtonClicked( event: string ) { - // remove the item from recentlyPassedEvents - this.myRecentlyCompletedEvents.forEach( ( item, index ) => { - if ( item._id === event ) { - this.myRecentlyCompletedEvents.splice( index, 1 ); - } - } ); - - // refresh passedEvents - this.eventService.me( 'false', 'true' ) - .subscribe( myPassedEvents => { - this.myUpcomingEvents = myPassedEvents; - } ); - } - - handleDateClick( arg ) { - // Intentionally blank - } - - fetchUnratedCompletedEvents() { - this.userActivityService.getUnratedCompletedEvents().subscribe( unratedEvents => { - this.unratedEvents = unratedEvents[ 0 ].completedEvents; - } ); } } diff --git a/src/app/page/dashboard-layout/event-page/event-page.component.html b/src/app/page/dashboard-layout/event-page/event-page.component.html deleted file mode 100644 index 02d3634f..00000000 --- a/src/app/page/dashboard-layout/event-page/event-page.component.html +++ /dev/null @@ -1,22 +0,0 @@ -
-
-
- -
-
-
-

Attendees

-
-
- - {{ user }} - -
-

None

-
-
-
diff --git a/src/app/page/dashboard-layout/event-page/event-page.component.scss b/src/app/page/dashboard-layout/event-page/event-page.component.scss deleted file mode 100644 index e900d2f2..00000000 --- a/src/app/page/dashboard-layout/event-page/event-page.component.scss +++ /dev/null @@ -1,60 +0,0 @@ -.attendees-container { - width: -webkit-fill-available; -} - -.attendees-area { - margin-top: 30px; - display: flex; - flex-wrap: wrap; - padding-left: 30px; - padding-right: 30px; -} - -.attendees-area div { - margin-bottom: 10px; - width: 50%; - text-align: left; -} - -.attendees-name-area a { - color: var(--theme-color); -} - -h2, h3 { - text-align: center; -} - -@media (hover: hover) { - .attendees-name-area a:hover { - color: var(--darker); - } -} - -@media only screen and (max-width: 999px) { - .event-page { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - padding-top: 85px; - } - - .attendees-area div { - width: 100%; - text-align: center; - } -} - -@media only screen and (min-width: 1000px) { - .event-page { - display: block; - padding-top: 110px; - min-height: 100vh; - } -} - -@media only screen and (min-width: 1600px) { - .attendees-area div { - width: 33%; - } -} diff --git a/src/app/page/dashboard-layout/event-page/event-page.component.spec.ts b/src/app/page/dashboard-layout/event-page/event-page.component.spec.ts deleted file mode 100644 index 6ca8aa6d..00000000 --- a/src/app/page/dashboard-layout/event-page/event-page.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { EventPageComponent } from './event-page.component'; - -describe( 'EventPageComponent', () => { - let component: EventPageComponent; - let fixture: ComponentFixture; - - beforeEach( async () => { - await TestBed.configureTestingModule( { - declarations: [ EventPageComponent ] - } ) - .compileComponents(); - } ); - - beforeEach( () => { - fixture = TestBed.createComponent( EventPageComponent ); - component = fixture.componentInstance; - fixture.detectChanges(); - } ); - - it( 'should create', () => { - expect( component ).toBeTruthy(); - } ); -} ); diff --git a/src/app/page/dashboard-layout/event-page/event-page.component.ts b/src/app/page/dashboard-layout/event-page/event-page.component.ts deleted file mode 100644 index 2922d46e..00000000 --- a/src/app/page/dashboard-layout/event-page/event-page.component.ts +++ /dev/null @@ -1,79 +0,0 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { EventTypes } from '../../../data/deprecated/event/events.data'; -import { URLS } from '../../../data/navigation/navigation.data'; -import { PROFILE_IMG } from '../../../data/profile/profile.data'; -import { BusinessLogicService } from '../../../service/business-logic/business-logic.service'; -import { EventService } from '../../../service/event/event.service'; -import { FileStorageService } from '../../../service/file-storage/file-storage.service'; - -@Component( { - selector: 'app-event-page', - templateUrl: './event-page.component.html', - styleUrls: [ './event-page.component.scss' ] -} ) -export class EventPageComponent implements OnInit, OnDestroy { - - event; - - profileImg = PROFILE_IMG; - PROFILE_IMG = PROFILE_IMG; - isProfileImageLoading; - - URLS = URLS; - completed = false; - - constructor( - private route: ActivatedRoute, - private eventService: EventService, - private businessLogicService: BusinessLogicService, - private fileStorageService: FileStorageService, - private router: Router - ) { - } - - ngOnInit(): void { - this.eventService.searchedEvents.subscribe( searchedEvent => { - this.isProfileImageLoading = true; - if ( searchedEvent && searchedEvent.length > 0 ) { - this.event = searchedEvent[ 0 ]; - if ( new Date() > new Date( new Date( this.event.date ).getTime() + this.event.duration * 60000 ) ) { - this.completed = true; - } else { - this.completed = false; - } - - this.businessLogicService.getUser( this.event.user.username ) - .subscribe( visitedUserInfo => { - if ( visitedUserInfo.payload?.profileImageId ) { - this.fileStorageService.downloadVisitedProfileImage( visitedUserInfo.payload?.profileImageId ).subscribe( profileImg => { - this.profileImg = 'data:image/png;base64,' + profileImg.file.data; - this.isProfileImageLoading = false; - } ); - } - } ); - } - } ); - - this.route.queryParams.subscribe( params => { - this.eventService.search( params.event_id, undefined, undefined, - undefined, [], EventTypes.Searched ).subscribe( () => { - // Intentionally blank - }, () => { - this.router.navigate( [ URLS.dashboard.learn ] ); - } ); - } ); - } - - ngOnDestroy() { - this.eventService.resetEvents( EventTypes.Searched ); - } - - updateSearchedEvents( updatedEvent ) { - this.event = updatedEvent; - } - - fillForm() { - this.router.navigate( [ URLS.dashboard.contribute ], { queryParams: { event_id: this.event._id, editable: true } } ); - } -} diff --git a/src/app/page/dashboard-layout/learn-page/learn-page.component.html b/src/app/page/dashboard-layout/learn-page/learn-page.component.html deleted file mode 100644 index 9f2d7706..00000000 --- a/src/app/page/dashboard-layout/learn-page/learn-page.component.html +++ /dev/null @@ -1,47 +0,0 @@ - -
-
- - -
- -
-
- - - - -
-
- -
-
-

Events

-
-
-
- - -
-
- -
-
- -
-
- -
-

No results were found

-
-
diff --git a/src/app/page/dashboard-layout/learn-page/learn-page.component.scss b/src/app/page/dashboard-layout/learn-page/learn-page.component.scss deleted file mode 100644 index 3c84a0fc..00000000 --- a/src/app/page/dashboard-layout/learn-page/learn-page.component.scss +++ /dev/null @@ -1,145 +0,0 @@ -.section { - display: flex; - flex-direction: column; - justify-content: center; - align-items: initial; - margin-top: 1.5em; -} - -.search-area { - display: flex; - position: relative; - flex-direction: column; - align-items: center; - - color: var(--color); - margin-left: auto; - margin-right: auto; - margin-top: 100px; - width: -webkit-fill-available; - max-width: 800px; - height: 120px; - z-index: 10; - background-color: var(--background-color); - padding-bottom: 10px; -} - -.search-area ::placeholder { - color: var(--lighter-contrast); -} - -.search-area input, .search-area ::placeholder { - font-size: 14px; - font-weight: 500; -} - -.search-area i { - cursor: pointer; - align-items: center; - padding: 4px; -} - -.search-bar { - display: flex; - width: -webkit-fill-available; - align-items: center; - margin-bottom: 40px; -} - -.search-results { - min-height: 80px; - position: absolute; - width: -webkit-fill-available; - display: flex; - flex-direction: column; - justify-content: flex-start; - top: 50px; - background-color: var(--background-color); - box-shadow: 0 0 5px var(--shadow); - z-index: 12; - border-bottom-left-radius: 3px; - border-bottom-right-radius: 3px; - overflow: auto; - max-height: min(calc(100vh - 260px), 640px); - font-size: 14px; -} - -.search-results a { - box-sizing: border-box; - padding: 10px 15px; - display: flex; - justify-content: flex-start; - align-items: center; - min-height: 80px; - border-bottom: 1px solid var(--darker-contrast); -} - -.search-results app-label-with-icon-data i { - margin-top: auto; - margin-bottom: auto; -} - -.input-without-icon { - margin-left: 45px; - margin-bottom: 0.5em; -} - -.learn-page-events { - width: 100%; - display: flex; - justify-content: space-evenly; - align-items: center; - -webkit-flex-wrap: wrap; - flex-wrap: wrap; -} - -@media only screen and (min-width: 1000px) { - .learn-page { - display: block; - padding-top: 110px; - min-height: 100vh; - } - - .learn-page .learn-card { - width: -webkit-fill-available; - min-width: 400px; - } - - .learn-page .upcoming-card { - margin-left: 2em; - } - - .learn-page .upcoming-card.sticky { - position: fixed; - top: 50px; - right: 32px; - } -} - -@media only screen and (max-width: 999px) { - .learn-page { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - padding-top: 85px; - } - - .learn-page app-card1 { - display: flex; - justify-content: center; - align-items: center; - } - - -} - -@media (hover: hover) { - .search-results a:hover { - background-color: var(--hover); - } - - .search-area i:hover { - border-color: var(--theme-color) - } -} diff --git a/src/app/page/dashboard-layout/learn-page/learn-page.component.spec.ts b/src/app/page/dashboard-layout/learn-page/learn-page.component.spec.ts deleted file mode 100644 index 7f3f2f4a..00000000 --- a/src/app/page/dashboard-layout/learn-page/learn-page.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { LearnPageComponent } from './learn-page.component'; - -describe( 'LearnPageComponent', () => { - let component: LearnPageComponent; - let fixture: ComponentFixture; - - beforeEach( async () => { - await TestBed.configureTestingModule( { - declarations: [ LearnPageComponent ] - } ) - .compileComponents(); - } ); - - beforeEach( () => { - fixture = TestBed.createComponent( LearnPageComponent ); - component = fixture.componentInstance; - fixture.detectChanges(); - } ); - - it( 'should create', () => { - expect( component ).toBeTruthy(); - } ); -} ); diff --git a/src/app/page/dashboard-layout/learn-page/learn-page.component.ts b/src/app/page/dashboard-layout/learn-page/learn-page.component.ts deleted file mode 100644 index f86e3aad..00000000 --- a/src/app/page/dashboard-layout/learn-page/learn-page.component.ts +++ /dev/null @@ -1,149 +0,0 @@ -import { formatDate } from '@angular/common'; -import { Component, ElementRef, HostListener, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { FormBuilder } from '@angular/forms'; -import { ActivatedRoute, Router } from '@angular/router'; -import { IDayCalendarConfig } from 'ng2-date-picker'; -import { ToastrService } from 'ngx-toastr'; -import { EventTypes } from '../../../data/deprecated/event/events.data'; -import { URLS } from '../../../data/navigation/navigation.data'; -import { BusinessLogicService } from '../../../service/business-logic/business-logic.service'; -import { CategoryService } from '../../../service/category/category.service'; -import { EventService } from '../../../service/event/event.service'; -import { InformationService } from '../../../service/information/information.service'; -import { LoadingService } from '../../../service/loading/loading.service'; - -@Component( { - selector: 'app-learn-page', - templateUrl: './learn-page.component.html', - styleUrls: [ './learn-page.component.scss' ] -} ) -export class LearnPageComponent implements OnInit, OnDestroy { - - searchedEvents: any; - recommendedEvents = []; - submitted = false; - loading = false; - - userSearchResults = []; - categorySearchResults = []; - eventSearchResults = []; - searchEnabled = true; - - isSearchedWithCategory = false; - - todayDateTime = formatDate( new Date(), 'yyyy/MM/ddTHH:mmZ', 'en-US' ); - - searchQuery = ''; - - dayPickerConfig = { - locale: 'en', - format: 'yyyy/MM/DD HH:mm', - firstDayOfWeek: 'mo', - min: this.todayDateTime - } as unknown as IDayCalendarConfig; - - URLS = URLS; - - userInterests = []; - - userInfo; - - @ViewChild( 'searchArea' ) - searchArea: ElementRef; - - constructor( - private route: ActivatedRoute, - private eventService: EventService, - private categoryService: CategoryService, - private loadingService: LoadingService, - private toastService: ToastrService, - private router: Router, - private activatedRoute: ActivatedRoute, - private informationService: InformationService, - private formBuilder: FormBuilder, - private businessLogicService: BusinessLogicService - ) { - this.eventService.recommendedEvents.subscribe( recommendedEvents => { - this.recommendedEvents = recommendedEvents; - } ); - this.eventService.searchedEvents.subscribe( searchedEvents => { - this.searchedEvents = searchedEvents; - } ); - } - - ngOnInit(): void { - this.loadingService.sharedLoading.subscribe( loading => this.loading = loading ); - this.route.queryParams.subscribe( params => { - this.businessLogicService.userInfo.subscribe( userInfo => { - this.userInfo = userInfo; - // if params given - this.userInterests = []; - if ( params.category ) { - this.isSearchedWithCategory = true; - // reset search events.data.ts before search calling - this.searchedEvents = []; - const categories = [ - { - category: +params.category, - subCategory: +params[ 'sub-category' ], - leafCategory: +params[ 'leaf-category' ] - } - ]; - this.eventService.search( undefined, undefined, new Date().toISOString(), - undefined, categories, EventTypes.Searched ).subscribe(); - } - } ); - } ); - } - - @HostListener( 'document:click', [ '$event' ] ) - onDocumentClick( event ) { - if ( this.searchArea?.nativeElement.contains( event.target ) ) { - this.searchEnabled = true; - } else { - this.searchEnabled = false; - } - } - - search( event: any ) { - - let q = ''; - - if ( !event ) { - q = this.searchQuery; - } else { - q = event.target.value; - this.searchQuery = q; - } - - - if ( this.activatedRoute.snapshot.queryParams.category ) { - this.isSearchedWithCategory = false; - this.router.navigate( [] ); - } - - if ( !q || q.length < 3 ) { - this.categorySearchResults = []; - this.eventService.resetEvents( EventTypes.Searched ); - return; - } - - this.categoryService.search( q ).subscribe( results => { - this.categorySearchResults = results.slice( 0, 10 ); - } ); - - this.eventService.search( undefined, undefined, new Date().toISOString(), q, [] ) - .subscribe( titleResults => { - this.eventService.search( undefined, q, new Date().toISOString(), undefined, [] ) - .subscribe( userResults => { - this.searchedEvents = [ ...titleResults, ...userResults ]; - } ); - } ); - } - - ngOnDestroy() { - this.informationService.clearInformation(); - this.eventService.resetEvents( EventTypes.Searched ); - } -} - diff --git a/src/app/page/dashboard-layout/my-profile-page/my-profile-page.component.html b/src/app/page/dashboard-layout/my-profile-page/my-profile-page.component.html index 56c43392..5151de1f 100644 --- a/src/app/page/dashboard-layout/my-profile-page/my-profile-page.component.html +++ b/src/app/page/dashboard-layout/my-profile-page/my-profile-page.component.html @@ -1,208 +1,3 @@
- - - - wallpaper - - - -
-
- -

- - 🥇 - 🥈 - 🥉 - - 📚 - 👋 - 🎓 -

-
-
-
-

{{( userInfo?.payload?.firstName && userInfo?.payload?.lastName ) ? - ( userInfo.payload.firstName + ' ' + userInfo.payload.lastName + ' (@' + userInfo.username + ')' ) - : ( userInfo?.username ? userInfo.username : '' ) }} -

-
- - - - -
-
- {{followerCount}} Following -
-
- {{followeeCount}} Followers -
-
- {{ numberOfEventsMade }} Events -
-
-
-
-

Interests

-
-
-
- - -
-
-

Contact

-
-
-
- - - - - - - - - - - - - - - -
-
-
- - - - - - - -

Lessons Taken

- - - -
-
- - - -
- - - - - -

Lessons Taken

- - - -
-

No results found

-
- - - - - - - -

Events

- - - -
-
- - -
- - Less - - - - - - - - - - - - - - - - - - More - -
-
- - -

Events

- - - -
-

No results found

-
- - - - - +
diff --git a/src/app/page/dashboard-layout/my-profile-page/my-profile-page.component.scss b/src/app/page/dashboard-layout/my-profile-page/my-profile-page.component.scss index 995e9964..4274761a 100644 --- a/src/app/page/dashboard-layout/my-profile-page/my-profile-page.component.scss +++ b/src/app/page/dashboard-layout/my-profile-page/my-profile-page.component.scss @@ -1,194 +1,12 @@ -.interest-list app-label-with-icon-data { - margin: 5px; - min-width: -webkit-fit-content; - display: flex; - align-items: center; -} - -.interest-list { - width: 100%; - display: flex; - justify-content: flex-start; - position: relative; - margin-top: 0.5em; - margin-bottom: 0.5em; - flex-wrap: wrap; -} - -.follower-following-count-area { - display: flex; - margin-top: 0.7em; - margin-left: 0.4em; - font-weight: 300; - color: var(--color); - flex-wrap: wrap; -} - -.follower-count-area, .following-count-area { - margin-right: 20px; -} - -.follower-count, .following-count, .event-count { - font-style: normal; - color: var(--theme-color); -} - -.color-chart { - float: right; - color: var(--color); -} - -.color-chart svg { - margin-left: 2px; - margin-right: 2px; -} - -.section-header i { - color: var(--theme-color); - margin-left: 15px; -} - -.rate-badge-wrapper { - position: absolute; - top: 45px; - left: 26px; - display: flex; - align-items: center; - justify-content: center; -} - -.rate-badge-wrapper label { - font-size: 1.5em; -} - -.rate-wrapper { - display: flex; - margin-right: 30px; -} - -@media only screen and (min-width: 1300px) { - app-card .content-column-wrapper { - display: flex; - flex-direction: row; - } - - app-card .column-second { - display: flex; - flex-direction: column; - max-width: 40%; - } -} - -@media only screen and (min-width: 1000px) { - .my-profile-page { - display: block; - align-items: center; - padding-top: 110px; - } - - .my-profile-page app-card { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - } - - app-card .column-first { - display: flex; - flex-direction: column; - } - - app-card .img-wrapper { - padding-bottom: 0.5em; - margin-bottom: 1.5em; - margin-top: 0.5em; - margin-left: 1.1em; - overflow-x: auto; - text-align: left; - flex-direction: row; - box-sizing: border-box; - display: flex; - place-content: center flex-start; - align-items: center; - } - - app-card .column-first, app-card .column-second { - width: -webkit-fill-available; - } - - .interest-list { - flex-direction: row; - place-content: center flex-start; - align-items: center; - } -} - -.chart-wrapper { - width: 100%; - min-height: 150px; -} - -::ng-deep .ngx-charts { - text { - fill: var(--color) !important; - } +.my-profile-page { + padding-top: 120px; + margin-left: 60px; + margin-right: 60px; } @media only screen and (max-width: 999px) { .my-profile-page { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - padding-top: 85px; - } - - .my-profile-page app-card { - display: flex; - justify-content: center; - align-items: center; - } - - app-card .img-wrapper { - margin-bottom: 1.5em; - margin-top: 0.5em; - overflow-x: auto; - text-align: center; - flex-direction: column; - box-sizing: border-box; - display: flex; - place-content: center; - align-items: center; - } - - .interest-list { - flex-direction: column; - place-content: flex-start; - } - - .rate-badge-wrapper label { - font-size: 1.4em; - } - - .rate-badge-wrapper { - left: 0; - width: 100%; - display: block; - } - - .column-first.with-rate { - margin-top: 30px; - } - - .badge-area { - padding-top: 5px; - margin-left: initial; - text-align: center; - } - - .rate-wrapper { - width: -webkit-fit-content; - margin-left: auto; - margin-right: auto; + margin-left: 0; + margin-right: 0; } } diff --git a/src/app/page/dashboard-layout/my-profile-page/my-profile-page.component.ts b/src/app/page/dashboard-layout/my-profile-page/my-profile-page.component.ts index 972d3e1c..82d4753a 100644 --- a/src/app/page/dashboard-layout/my-profile-page/my-profile-page.component.ts +++ b/src/app/page/dashboard-layout/my-profile-page/my-profile-page.component.ts @@ -1,72 +1,33 @@ import { Component, OnDestroy } from '@angular/core'; import { Router } from '@angular/router'; import { environment } from '../../../../environments/environment'; -import { environmentCommon } from '../../../../environments/environment-common'; import { Rate } from '../../../component/rate-bar/rate-bar.component'; import { URLS } from '../../../data/navigation/navigation.data'; import { PROFILE_IMG } from '../../../data/profile/profile.data'; import { AuthToken } from '../../../model/auth/auth-token.model'; import { AuthenticationService } from '../../../service/auth/authentication.service'; import { BusinessLogicService } from '../../../service/business-logic/business-logic.service'; -import { CategoryService } from '../../../service/category/category.service'; -import { EventService } from '../../../service/event/event.service'; import { FileStorageService } from '../../../service/file-storage/file-storage.service'; -import { FolloweeService } from '../../../service/followee/followee.service'; -import { FollowerService } from '../../../service/follower/follower.service'; import { InformationService } from '../../../service/information/information.service'; import { LoadingService } from '../../../service/loading/loading.service'; -import { ThemeService } from '../../../service/theme/theme.service'; -import { UserActivityService } from '../../../service/user-activity/user-activity.service'; +import { ProductService } from '../../../service/product/product.service'; @Component( { selector: 'app-my-profile-page', templateUrl: './my-profile-page.component.html', - styleUrls: [ './my-profile-page.component.scss' ] + styleUrls: [ './my-profile-page.component.scss' ], } ) export class MyProfilePageComponent implements OnDestroy { - currentUser: AuthToken; userInfo: any = {}; - environment = environment; - environmentCommon = environmentCommon; - profileImg = PROFILE_IMG; loading = false; - loadingCount = false; - loadingLessonsTaken = false; - userInterests = []; - numberOfEventsMade: number; - numberOfEventsTaken: number; - topContributor: number; - - rate = 0; - rateObject: Rate; + userIsPremium; - showBadge = false; URLS = URLS; - followerCount: number; - followeeCount: number; - - eventsInfo: any[] = []; - lessonsInfo: any[] = []; - colors: any[] = []; - - showXAxis = true; - showYAxis = true; - gradient = false; - showLegend = false; - showXAxisLabel = true; - showYAxisLabel = false; - - eventsTakenXAxisLabel = '# of events taken'; - - eventsXAxisLabel = '# of events.data.ts'; - - eduMailPattern = '^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-.]+\.edu\.[a-z]{2}$'; - - formattedRateNumber: string; + rateObject: Rate; constructor( private router: Router, @@ -75,98 +36,50 @@ export class MyProfilePageComponent implements OnDestroy { private businessLogicService: BusinessLogicService, private fileStorageService: FileStorageService, private informationService: InformationService, - private categoryService: CategoryService, - private followerService: FollowerService, - private followeeService: FolloweeService, - private eventService: EventService, - private themeService: ThemeService, - private userActivityService: UserActivityService ) { - this.loadingCount = true; - this.loadingLessonsTaken = true; - - this.authenticationService.currentUser.subscribe( currentUser => { - this.currentUser = currentUser; - } - ); + private productService: ProductService + ) { + this.authenticationService.currentUser.subscribe( ( currentUser ) => { + this.currentUser = currentUser; + } ); - this.businessLogicService.userInfo.subscribe( userInfo => { + this.businessLogicService.userInfo.subscribe( ( userInfo ) => { this.userInfo = userInfo; + } ); - // check interests area defined before service calling. - if ( this.userInfo?.payload?.interests ) { - this.categoryService.getCategoriesFromId( this.userInfo?.payload?.interests ).subscribe( result => { - this.userInterests = result; - } ); - } - - if ( userInfo?.username ) { - this.eventService.countUserEvents( userInfo.username ).subscribe( eventList => { - this.eventsInfo = eventList; - this.loadingCount = false; - } ); - - this.userActivityService.getEventsTaken( userInfo.username ).subscribe( eventList => { - this.lessonsInfo = eventList; - this.loadingLessonsTaken = false; - } ); - - this.followerService.count( userInfo.username ).subscribe( followerCount => { - this.followerCount = followerCount[ 0 ].count; - } ); + this.loadingService.sharedLoading.subscribe( + ( loading ) => ( this.loading = loading ) + ); - this.followeeService.count( userInfo.username ).subscribe( followeeCount => { - this.followeeCount = followeeCount[ 0 ].count; - } ); + this.businessLogicService.me().subscribe( ( userInfo ) => { + this.userInfo = userInfo; - this.userActivityService.getNumberOfEventsTaken( userInfo.username ).subscribe( result => { - this.numberOfEventsTaken = result[ 0 ].numberOfEventsTaken; + if ( !this.userInfo.payload ) { + this.businessLogicService.createMyInfo().subscribe( () => { + this.router.navigate( [ URLS.settings.editProfile ] ); } ); - - if ( userInfo.payload?.userProfileActivated ) { - this.userActivityService.getNumberOfEventsMade( userInfo.username ).subscribe( result => { - this.numberOfEventsMade = result.numberOfEventsMade; - } ); - - this.userActivityService.getContributorRate( userInfo.username ).subscribe( rate => { - this.rateObject = { - userRating: rate.userRating, - numberOfRates: rate.numberOfRates - }; - } ); - - this.userActivityService.getTopContributors().subscribe( topContributors => { - topContributors.forEach( ( value, index ) => { - if ( value.username === userInfo.username ) { - this.topContributor = index; - } - } ); - } ); - } else { - this.numberOfEventsMade = undefined; - this.rateObject = undefined; - this.topContributor = undefined; + } else { + if ( this.userInfo?.payload?.profileImageId ) { + this.fileStorageService + .downloadProfileImage( this.userInfo.payload.profileImageId ) + .subscribe(); } - - this.categoryService.getCategoriesFromId( this.userInfo.payload?.interests ).subscribe( result => { - this.userInterests = result; - } ); } } ); - this.loadingService.sharedLoading.subscribe( loading => this.loading = loading ); - - this.fileStorageService.sharedProfileImage.subscribe( profileImg => { - if ( profileImg?.file?.data ) { + this.fileStorageService.sharedProfileImage.subscribe( ( profileImg ) => { + if ( profileImg?.file?.url ) { + this.profileImg = profileImg.file.url; + } else if ( profileImg?.file?.data ) { this.profileImg = 'data:image/png;base64,' + profileImg.file.data; } } ); + + this.productService.premiumProducts.subscribe( ( products ) => { + this.userIsPremium = products?.length > 0; + } ); } ngOnDestroy() { this.informationService.clearInformation(); } - - goToUrl( url: string ) { - window.open( url, '_blank' ); - } } diff --git a/src/app/page/dashboard-layout/notifications-page/notifications-page.component.html b/src/app/page/dashboard-layout/notifications-page/notifications-page.component.html new file mode 100644 index 00000000..26d3797e --- /dev/null +++ b/src/app/page/dashboard-layout/notifications-page/notifications-page.component.html @@ -0,0 +1,32 @@ +
+ + + + +
+

+ No new notifications! +

+
+
+ +
+

+ {{ notification.message }} +

+

+ {{ timestampToDate( notification.timestamp ) | date: 'dd MMM HH:mm' }} +

+
+
+ + + + +
+
+ + +
diff --git a/src/app/page/dashboard-layout/notifications-page/notifications-page.component.scss b/src/app/page/dashboard-layout/notifications-page/notifications-page.component.scss new file mode 100644 index 00000000..f358f903 --- /dev/null +++ b/src/app/page/dashboard-layout/notifications-page/notifications-page.component.scss @@ -0,0 +1,65 @@ +@use '../../../../styles/util/util'; +@use 'node_modules/@open-template-hub/card/styles/card/card'; + +.notifications-card { + + & .body { + @include card.default-body; + + justify-content: flex-start; + + width: 100%; + + padding-left: 20px; + padding-right: 20px; + + & .notification { + @include util.flex-layout-row; + + align-items: center; + + width: 100%; + height: 50px; + + border-bottom: 1px solid var(--theme-color-lighter-7); + + &:last-child { + border-bottom: none; + } + + &.dim { + color: var(--lighter-contrast); + + &:hover { + cursor: auto; + } + } + + & .led-wrapper { + @include util.flex-layout-row; + @include util.flex-center-center; + + width: 4%; + } + + & .date { + width: 25%; + padding-right: 10px; + } + + & .message { + width: 71%; + text-align: left; + padding-left: 10px; + } + + &:hover { + cursor: pointer; + } + } + } + + & .footer { + @include card.default-footer; + } +} diff --git a/src/app/component/button/information-button/information-button.component.spec.ts b/src/app/page/dashboard-layout/notifications-page/notifications-page.component.spec.ts similarity index 53% rename from src/app/component/button/information-button/information-button.component.spec.ts rename to src/app/page/dashboard-layout/notifications-page/notifications-page.component.spec.ts index 2aee4ed2..97f47b32 100644 --- a/src/app/component/button/information-button/information-button.component.spec.ts +++ b/src/app/page/dashboard-layout/notifications-page/notifications-page.component.spec.ts @@ -1,20 +1,20 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { InformationButtonComponent } from './information-button.component'; +import { NotificationsPageComponent } from './notifications-page.component'; -describe( 'InformationButtonComponent', () => { - let component: InformationButtonComponent; - let fixture: ComponentFixture; +describe( 'NotificationsPageComponent', () => { + let component: NotificationsPageComponent; + let fixture: ComponentFixture; beforeEach( async () => { await TestBed.configureTestingModule( { - declarations: [ InformationButtonComponent ] + declarations: [ NotificationsPageComponent ] } ) .compileComponents(); } ); beforeEach( () => { - fixture = TestBed.createComponent( InformationButtonComponent ); + fixture = TestBed.createComponent( NotificationsPageComponent ); component = fixture.componentInstance; fixture.detectChanges(); } ); diff --git a/src/app/page/dashboard-layout/notifications-page/notifications-page.component.ts b/src/app/page/dashboard-layout/notifications-page/notifications-page.component.ts new file mode 100644 index 00000000..15187e38 --- /dev/null +++ b/src/app/page/dashboard-layout/notifications-page/notifications-page.component.ts @@ -0,0 +1,26 @@ +import { Component } from '@angular/core'; +import { NotificationService } from '../../../service/notification/notification.service'; + +@Component( { + selector: 'app-notifications-page', + templateUrl: './notifications-page.component.html', + styleUrls: [ './notifications-page.component.scss' ] +} ) +export class NotificationsPageComponent { + + notifications: any[] = []; + + constructor( private notificationService: NotificationService ) { + this.notificationService.notifications.subscribe( notifications => { + this.notifications = notifications; + } ); + } + + read( index: any ) { + this.notificationService.readNotification( index ); + } + + timestampToDate( timestamp: any ): Date { + return new Date( timestamp ); + } +} diff --git a/src/app/page/dashboard-layout/premium-page/premium-page.component.html b/src/app/page/dashboard-layout/premium-page/premium-page.component.html new file mode 100644 index 00000000..b1ce3f93 --- /dev/null +++ b/src/app/page/dashboard-layout/premium-page/premium-page.component.html @@ -0,0 +1,31 @@ +
+ + + + +
+

+ You have access to premium features! +

+
+ + + + +
+
+ + +
+ +
+ + + +
diff --git a/src/app/page/dashboard-layout/premium-page/premium-page.component.scss b/src/app/page/dashboard-layout/premium-page/premium-page.component.scss new file mode 100644 index 00000000..fd3ce62d --- /dev/null +++ b/src/app/page/dashboard-layout/premium-page/premium-page.component.scss @@ -0,0 +1,16 @@ +@use 'node_modules/@open-template-hub/card/styles/card/card'; + +.premium-card { + + & .body { + @include card.default-body; + } + + & .footer { + @include card.default-footer; + } +} + +.cards-wrapper { + width: 100%; +} diff --git a/src/app/component/command-line/command-line.component.spec.ts b/src/app/page/dashboard-layout/premium-page/premium-page.component.spec.ts similarity index 54% rename from src/app/component/command-line/command-line.component.spec.ts rename to src/app/page/dashboard-layout/premium-page/premium-page.component.spec.ts index 323b80da..98e6029c 100644 --- a/src/app/component/command-line/command-line.component.spec.ts +++ b/src/app/page/dashboard-layout/premium-page/premium-page.component.spec.ts @@ -1,20 +1,20 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { CommandLineComponent } from './command-line.component'; +import { PremiumPageComponent } from './premium-page.component'; -describe( 'CommandLineComponent', () => { - let component: CommandLineComponent; - let fixture: ComponentFixture; +describe( 'PremiumPageComponent', () => { + let component: PremiumPageComponent; + let fixture: ComponentFixture; beforeEach( async () => { await TestBed.configureTestingModule( { - declarations: [ CommandLineComponent ] + declarations: [ PremiumPageComponent ] } ) .compileComponents(); } ); beforeEach( () => { - fixture = TestBed.createComponent( CommandLineComponent ); + fixture = TestBed.createComponent( PremiumPageComponent ); component = fixture.componentInstance; fixture.detectChanges(); } ); diff --git a/src/app/page/dashboard-layout/premium-page/premium-page.component.ts b/src/app/page/dashboard-layout/premium-page/premium-page.component.ts new file mode 100644 index 00000000..59adb805 --- /dev/null +++ b/src/app/page/dashboard-layout/premium-page/premium-page.component.ts @@ -0,0 +1,28 @@ +import { Component } from '@angular/core'; +import { PRODUCT_RIBBONS } from 'src/app/data/ribbon/ribbon.data'; +import { + premiumAccountPricingFeatures, + premiumAccountPricingOptions +} from '../../../data/premium-products/premium-product.data'; +import { ProductService } from '../../../service/product/product.service'; + +@Component( { + selector: 'app-premium-page', + templateUrl: './premium-page.component.html', + styleUrls: [ './premium-page.component.scss' ] +} ) +export class PremiumPageComponent { + + products = undefined; + + PRODUCT_RIBBONS = PRODUCT_RIBBONS; + + premiumAccountPricingFeatures = premiumAccountPricingFeatures; + premiumAccountPricingOptions = premiumAccountPricingOptions; + + constructor( private productService: ProductService ) { + this.productService.premiumProducts.subscribe( product => { + this.products = product; + } ); + } +} diff --git a/src/app/page/dashboard-layout/public-profile-page/public-profile-page.component.html b/src/app/page/dashboard-layout/public-profile-page/public-profile-page.component.html deleted file mode 100644 index 8f1d0338..00000000 --- a/src/app/page/dashboard-layout/public-profile-page/public-profile-page.component.html +++ /dev/null @@ -1,207 +0,0 @@ -
- - - - wallpaper - - - -
-
- -

- - 🥇 - 🥈 - 🥉 - - 📚 - 👋 - 🎓 -

-
- -
-
-

{{( userInfo?.payload?.firstName && userInfo?.payload?.lastName ) ? - ( userInfo.payload.firstName + ' ' + userInfo.payload.lastName + ' (@' + userInfo.username + ')' ) - : ( userInfo?.username ? userInfo.username : '' ) }} -

-
-
- - - - -
-
- {{followerCount}} Following -
-
- {{followeeCount}} Followers -
-
- {{ numberOfEventsMade }} Events -
-
-
-
-

Interests

-
-
-
- - -
-
-

Contact

-
-
-
- - - - - - - - - - - -
-
-
- - - - - - -

Events Taken

- - - -
-
- - -
- - Less - - - - - - - - - - - - - - - - - - More - -
-
- - - - -

Events Taken

- - - -
-

No results found

-
- - - - - - - -

Events

- - - -
-
- - - -
- - - - -

Events

- - - -
-

No results found

-
- - -
diff --git a/src/app/page/dashboard-layout/public-profile-page/public-profile-page.component.scss b/src/app/page/dashboard-layout/public-profile-page/public-profile-page.component.scss deleted file mode 100644 index c0b45e96..00000000 --- a/src/app/page/dashboard-layout/public-profile-page/public-profile-page.component.scss +++ /dev/null @@ -1,209 +0,0 @@ -.interest-list app-label-with-icon-data { - margin: 5px; - min-width: -webkit-fit-content; - display: flex; - align-items: center; -} - -.interest-list { - width: 100%; - display: flex; - justify-content: flex-start; - position: relative; - margin-top: 0.5em; - margin-bottom: 0.5em; - flex-wrap: wrap; -} - -.follower-count, .following-count, .event-count { - font-style: normal; - color: var(--theme-color); -} - -.follower-following-count-area { - display: flex; - margin-top: 0.7em; - margin-left: 0.4em; - font-weight: 300; - flex-wrap: wrap; - color: var(--color); -} - -.follower-count-area, .following-count-area { - margin-right: 20px; -} - -.rate-badge-wrapper { - position: absolute; - top: 45px; - left: 26px; - display: flex; - align-items: center; - justify-content: center; -} - -.rate-wrapper { - display: flex; - margin-right: 30px; -} - -.rate-badge-wrapper label { - font-size: 1.5em; -} - -@media only screen and (min-width: 1000px) { - - .is-public app-card { - max-width: 90%; - margin-left: auto; - margin-right: auto; - } - - .public-profile-page { - display: block; - align-items: center; - padding-top: 110px; - } - - .public-profile-page app-card { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - } - - app-card .content-column-wrapper { - display: flex; - flex-direction: row; - } - - app-card .column-first { - display: flex; - flex-direction: column; - } - - app-card .column-second { - display: flex; - flex-direction: column; - max-width: 40%; - } - - app-card .img-wrapper { - padding-bottom: 0.5em; - margin-bottom: 1.5em; - margin-top: 0.5em; - margin-left: 1em; - overflow-x: auto; - text-align: left; - flex-direction: row; - box-sizing: border-box; - display: flex; - place-content: center flex-start; - align-items: center; - } - - app-card .column-first, app-card .column-second { - width: -webkit-fill-available; - } - - .interest-list { - flex-direction: row; - place-content: center flex-start; - align-items: center; - } - - .follow-button-area { - position: absolute; - right: 50px; - top: 20px; - } -} - -.chart-wrapper { - width: 100%; - min-height: 150px; -} - -::ng-deep .ngx-charts { - text { - fill: var(--color) !important; - } -} - -@media only screen and (max-width: 999px) { - - .is-public app-card { - padding-top: 60px; - } - - .public-profile-page { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - padding-top: 85px; - } - - .public-profile-page app-card { - display: flex; - justify-content: center; - align-items: center; - } - - app-card .img-wrapper { - margin-bottom: 1.5em; - margin-top: 0.5em; - overflow-x: auto; - text-align: center; - flex-direction: column; - box-sizing: border-box; - display: flex; - place-content: center; - align-items: center; - } - - .interest-list { - flex-direction: column; - place-content: flex-start; - } - - .follow-button-area { - position: absolute; - left: 50%; - transform: translate(-50%, 0); - margin-top: -50px; - width: 70%; - text-align: center; - } - - .rate-badge-wrapper label { - font-size: 1.4em; - } - - .rate-badge-wrapper { - left: 0; - width: 100%; - display: block; - } - - .column-first.with-rate { - margin-top: 90px; - } - - .badge-area { - padding-top: 5px; - margin-left: initial; - text-align: center; - } - - - .column-first { - margin-top: 60px; - } - - .rate-wrapper { - width: -webkit-fit-content; - margin-left: auto; - margin-right: auto; - } -} diff --git a/src/app/page/dashboard-layout/public-profile-page/public-profile-page.component.spec.ts b/src/app/page/dashboard-layout/public-profile-page/public-profile-page.component.spec.ts deleted file mode 100644 index 289f756e..00000000 --- a/src/app/page/dashboard-layout/public-profile-page/public-profile-page.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { PublicProfilePageComponent } from './public-profile-page.component'; - -describe( 'PublicProfilePageComponent', () => { - let component: PublicProfilePageComponent; - let fixture: ComponentFixture; - - beforeEach( async () => { - await TestBed.configureTestingModule( { - declarations: [ PublicProfilePageComponent ] - } ) - .compileComponents(); - } ); - - beforeEach( () => { - fixture = TestBed.createComponent( PublicProfilePageComponent ); - component = fixture.componentInstance; - fixture.detectChanges(); - } ); - - it( 'should create', () => { - expect( component ).toBeTruthy(); - } ); -} ); diff --git a/src/app/page/dashboard-layout/public-profile-page/public-profile-page.component.ts b/src/app/page/dashboard-layout/public-profile-page/public-profile-page.component.ts deleted file mode 100644 index 8b8cbc5d..00000000 --- a/src/app/page/dashboard-layout/public-profile-page/public-profile-page.component.ts +++ /dev/null @@ -1,219 +0,0 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { environment } from '../../../../environments/environment'; -import { environmentCommon } from '../../../../environments/environment-common'; -import { Rate } from '../../../component/rate-bar/rate-bar.component'; -import { URLS } from '../../../data/navigation/navigation.data'; -import { PROFILE_IMG } from '../../../data/profile/profile.data'; -import { AuthToken } from '../../../model/auth/auth-token.model'; -import { AuthenticationService } from '../../../service/auth/authentication.service'; -import { BusinessLogicService } from '../../../service/business-logic/business-logic.service'; -import { CategoryService } from '../../../service/category/category.service'; -import { EventService } from '../../../service/event/event.service'; -import { FileStorageService } from '../../../service/file-storage/file-storage.service'; -import { FolloweeService } from '../../../service/followee/followee.service'; -import { FollowerService } from '../../../service/follower/follower.service'; -import { InformationService } from '../../../service/information/information.service'; -import { LoadingService } from '../../../service/loading/loading.service'; -import { UserActivityService } from '../../../service/user-activity/user-activity.service'; - -@Component( { - selector: 'app-public-profile-page', - templateUrl: './public-profile-page.component.html', - styleUrls: [ './public-profile-page.component.scss' ] -} ) -export class PublicProfilePageComponent implements OnInit, OnDestroy { - - currentUser: AuthToken; - currentUserInfo: any; - - environment = environment; - environmentCommon = environmentCommon; - - profileImg = PROFILE_IMG; - pageLoading = false; - userInfo: any = {}; - isFollowing: boolean = null; - username = ''; - userInterests = []; - followerCount: number; - followeeCount: number; - - numberOfEventsMade: number; - numberOfEventsTaken: number; - topContributor: number; - - loading = false; - loadingCount = false; - loadingLessonsTaken = false; - colors: any[] = []; - - isPublic = false; - URLS = URLS; - - eventsInfo: any[] = []; - lessonsInfo: any[] = []; - - showXAxis = true; - showYAxis = true; - gradient = false; - showLegend = false; - showXAxisLabel = true; - showYAxisLabel = false; - - rate = 0; - rateObject: Rate; - formattedRateNumber: string; - numberOfRate: number; - colorScheme = { - domain: [ - '' - ] - }; - - eventsTakenXAxisLabel = '# of events taken'; - - eventsXAxisLabel = '# of events.data.ts'; - - constructor( - private router: Router, - private route: ActivatedRoute, - private authenticationService: AuthenticationService, - private loadingService: LoadingService, - private businessLogicService: BusinessLogicService, - private fileStorageService: FileStorageService, - private informationService: InformationService, - private categoryService: CategoryService, - private followerService: FollowerService, - private followeeService: FolloweeService, - private eventService: EventService, - private userActivityService: UserActivityService - ) { - this.loadingService.sharedLoading.subscribe( loading => this.loading = loading ); - - this.pageLoading = true; - this.loadingCount = true; - - this.route.params.subscribe( params => { - this.profileImg = PROFILE_IMG; - this.username = params.username; - - this.businessLogicService.getUser( this.username ) - .subscribe( visitedUserInfo => { - this.userInfo = visitedUserInfo; - this.categoryService.getCategoriesFromId( this.userInfo?.payload?.interests ).subscribe( result => { - this.userInterests = result; - } ); - - // no user found in so redirect to not-found page - if ( !this.userInfo?.username ) { - this.router.navigate( [ URLS.notFound ] ).then( () => { - return false; - } ); - } - - // check badges - this.userActivityService.getNumberOfEventsTaken( visitedUserInfo.username ).subscribe( result => { - this.numberOfEventsTaken = result[ 0 ].numberOfEventsTaken; - } ); - - this.numberOfEventsMade = undefined; - this.rateObject = undefined; - this.topContributor = undefined; - - if ( visitedUserInfo.payload?.userProfileActivated ) { - this.userActivityService.getNumberOfEventsMade( visitedUserInfo.username ).subscribe( result => { - this.numberOfEventsMade = result.numberOfEventsMade; - } ); - - this.userActivityService.getContributorRate( visitedUserInfo.username ).subscribe( rate => { - this.rateObject = { - userRating: rate.userRating, - numberOfRates: rate.numberOfRates - }; - } ); - - this.userActivityService.getTopContributors().subscribe( topContributors => { - topContributors.forEach( ( value, index ) => { - if ( value.username === visitedUserInfo.username ) { - this.topContributor = index; - } - } ); - } ); - } - this.fillFollowInfo(); - - if ( this.userInfo?.payload?.profileImageId ) { - this.fileStorageService.downloadVisitedProfileImage( this.userInfo.payload.profileImageId ).subscribe( profileImg => { - this.profileImg = 'data:image/png;base64,' + profileImg.file.data; - this.pageLoading = false; - } ); - } else { - this.pageLoading = false; - } - - this.eventService.countUserEvents( visitedUserInfo.username ).subscribe( eventList => { - this.eventsInfo = eventList; - this.loadingCount = false; - } ); - - this.userActivityService.getEventsTaken( visitedUserInfo.username ).subscribe( eventList => { - this.lessonsInfo = eventList; - this.loadingLessonsTaken = false; - } ); - } ); - } ); - } - - ngOnInit(): void { - this.isPublic = this.route.snapshot.data.isPublic; - } - - ngOnDestroy() { - this.informationService.clearInformation(); - } - - goToUrl( url: string ) { - window.open( url, '_blank' ); - } - - follow() { - this.followerService.follow( this.username ).subscribe( response => { - this.informationService.setInformation( `${ this.username } is followed`, 'info' ); - this.isFollowing = true; - this.followeeService.count( this.username ).subscribe( followeeCount => { - this.followeeCount = followeeCount[ 0 ].count; - } ); - } ); - } - - unfollow() { - this.followerService.unfollow( this.username ).subscribe( response => { - this.informationService.setInformation( ` ${ this.username } is unfollowed`, 'info' ); - this.isFollowing = false; - this.followeeService.count( this.username ).subscribe( followeeCount => { - this.followeeCount = followeeCount[ 0 ].count; - } ); - } ); - } - - private fillFollowInfo() { - // check if currentUser follows publicProfile - this.businessLogicService.userInfo.subscribe( currentUserInfo => { - this.currentUserInfo = currentUserInfo; - if ( currentUserInfo && this.username !== currentUserInfo?.username ) - this.followerService.isFollowing( this.username ).subscribe( result => { - this.isFollowing = result[ 0 ].isFollowing; - } ); - } ); - - // get follower and followed count - this.followerService.count( this.username ).subscribe( followerCount => { - this.followerCount = followerCount[ 0 ].count; - } ); - - this.followeeService.count( this.username ).subscribe( followeeCount => { - this.followeeCount = followeeCount[ 0 ].count; - } ); - } -} diff --git a/src/app/page/landing-layout/about-us-page/about-us-page.component.html b/src/app/page/landing-layout/about-us-page/about-us-page.component.html index ff68ef81..b0275ed2 100644 --- a/src/app/page/landing-layout/about-us-page/about-us-page.component.html +++ b/src/app/page/landing-layout/about-us-page/about-us-page.component.html @@ -1,5 +1,5 @@ - +
@@ -8,19 +8,24 @@
- - + +
- - + +
+ + +
+ +
+ - - +
* { margin: 10px 50px; diff --git a/src/app/page/landing-layout/about-us-page/about-us-page.component.ts b/src/app/page/landing-layout/about-us-page/about-us-page.component.ts index 9c1d900b..d340e8e0 100644 --- a/src/app/page/landing-layout/about-us-page/about-us-page.component.ts +++ b/src/app/page/landing-layout/about-us-page/about-us-page.component.ts @@ -16,27 +16,31 @@ export class AboutUsPageComponent { websites = []; employeeAppHeroContents = [ - {text: $localize `:@@aboutUs.employeeAppHero.text:Team Behind the Open Template Hub`, level: 1} - ] + { text: $localize`:@@aboutUs.employeeAppHero.text:Team Behind the Open Template Hub`, level: 1 } + ]; followUsAppHeroContents = [ - {text: $localize `:@@aboutUs.followUsAppHero.followText:Follow us on social media`, level: 2}, - {text: $localize `:@@aboutUs.followUsAppHero.descriptionText:Minimizes your effort while building a new software business with our open source GitHub micro server templates and responsive web UI + mobile UI templates` } - ] + { text: $localize`:@@aboutUs.followUsAppHero.followText:Follow us on social media`, level: 2 }, + { text: $localize`:@@aboutUs.followUsAppHero.descriptionText:Minimizes your effort while building a new software business with our open source GitHub micro server templates and responsive web UI + mobile UI templates` } + ]; historyOfUsAppHeroContents = [ - {text: $localize `:@@aboutUs.historyOfUsAppHero.othText:History of the Open Template Hub`, level: 2}, - {text: $localize `:@@aboutUs.historyOfUsAppHero.othDescription:Minimizes your effort while building a new software business with our open source GitHub micro server templates and responsive web UI + mobile UI templates`} - ] + { text: $localize`:@@aboutUs.historyOfUsAppHero.othText:History of the Open Template Hub`, level: 2 }, + { text: $localize`:@@aboutUs.historyOfUsAppHero.othDescription:Minimizes your effort while building a new software business with our open source GitHub micro server templates and responsive web UI + mobile UI templates` } + ]; + contactInformationAppHeroContents = [ + { + text: $localize`:@@aboutUs.contactInfoAppHero.contactInfoText:Contact Information`, + level: 2, + }, + ]; constructor() { - for ( const website in environmentCommon.oth.social ) { - if ( environmentCommon.oth.social[ website ] && website !== 'npm') { + for ( const website in environmentCommon.company.social ) { + if ( environmentCommon.company.social[ website ] && website !== 'npm' ) { this.websites.push( { - name: website.split( /(?=[A-Z])/ ).join( ' ' ), - handle: environmentCommon.oth.social[ website ], + name: environmentCommon.website[ website ].name, + handle: environmentCommon.company.social[ website ], cssClass: environmentCommon.website[ website ].cssClass, - url: environmentCommon.website[ website ].companyUrl ? - environmentCommon.website[ website ].companyUrl : - environmentCommon.website[ website ].url + url: this.getUrl( website ), } ); } } @@ -45,4 +49,16 @@ export class AboutUsPageComponent { redirect( href: string ) { window.location.href = href; } + + private getUrl( website: string ) { + let url = environmentCommon.website[ website ].url; + + if ( environmentCommon.website[ website ].companyUrl ) { + url = environmentCommon.website[ website ].companyUrl; + } else if ( environmentCommon.website[ website ].channelUrl ) { + url = environmentCommon.website[ website ].channelUrl; + } + + return url; + } } diff --git a/src/app/page/landing-layout/blog-page/blog-content-page/blog-content-page.component.html b/src/app/page/landing-layout/blog-page/blog-content-page/blog-content-page.component.html index 4a67872e..be0aa921 100644 --- a/src/app/page/landing-layout/blog-page/blog-content-page/blog-content-page.component.html +++ b/src/app/page/landing-layout/blog-page/blog-content-page/blog-content-page.component.html @@ -1,16 +1,16 @@
-
- - + + - +
diff --git a/src/app/page/landing-layout/blog-page/blog-content-page/blog-content-page.component.scss b/src/app/page/landing-layout/blog-page/blog-content-page/blog-content-page.component.scss index f3f15665..bb073f91 100644 --- a/src/app/page/landing-layout/blog-page/blog-content-page/blog-content-page.component.scss +++ b/src/app/page/landing-layout/blog-page/blog-content-page/blog-content-page.component.scss @@ -2,7 +2,6 @@ @use '../../../../component/card/employee-card/employee-card.component'; .blog-content-wrapper { - & > * { margin: 50px; } diff --git a/src/app/page/landing-layout/blog-page/blog-content-page/blog-content-page.component.spec.ts b/src/app/page/landing-layout/blog-page/blog-content-page/blog-content-page.component.spec.ts index 213021ee..9e5f97a5 100644 --- a/src/app/page/landing-layout/blog-page/blog-content-page/blog-content-page.component.spec.ts +++ b/src/app/page/landing-layout/blog-page/blog-content-page/blog-content-page.component.spec.ts @@ -2,24 +2,24 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { BlogContentPageComponent } from './blog-content-page.component'; -describe('BlogContentPageComponent', () => { +describe( 'BlogContentPageComponent', () => { let component: BlogContentPageComponent; let fixture: ComponentFixture; - beforeEach(async () => { - await TestBed.configureTestingModule({ + beforeEach( async () => { + await TestBed.configureTestingModule( { declarations: [ BlogContentPageComponent ] - }) + } ) .compileComponents(); - }); + } ); - beforeEach(() => { - fixture = TestBed.createComponent(BlogContentPageComponent); + beforeEach( () => { + fixture = TestBed.createComponent( BlogContentPageComponent ); component = fixture.componentInstance; fixture.detectChanges(); - }); + } ); - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); + it( 'should create', () => { + expect( component ).toBeTruthy(); + } ); +} ); diff --git a/src/app/page/landing-layout/blog-page/blog-page.component.html b/src/app/page/landing-layout/blog-page/blog-page.component.html index f911feb2..2ed2dd67 100644 --- a/src/app/page/landing-layout/blog-page/blog-page.component.html +++ b/src/app/page/landing-layout/blog-page/blog-page.component.html @@ -1,8 +1,9 @@
- +
- +
diff --git a/src/app/page/landing-layout/blog-page/blog-page.component.scss b/src/app/page/landing-layout/blog-page/blog-page.component.scss index 84bea7ce..2332139d 100644 --- a/src/app/page/landing-layout/blog-page/blog-page.component.scss +++ b/src/app/page/landing-layout/blog-page/blog-page.component.scss @@ -1,6 +1,6 @@ @use '../../../../styles/util/util'; @use '../landing-layout.component'; -@use '../../../component/card/card.component'; +@use 'node_modules/@open-template-hub/card/styles/card/card'; @media only screen and (max-width: 999px) { .flexible-cards-wrapper { diff --git a/src/app/page/landing-layout/blog-page/blog-page.component.spec.ts b/src/app/page/landing-layout/blog-page/blog-page.component.spec.ts index 36ececfe..769ffd84 100644 --- a/src/app/page/landing-layout/blog-page/blog-page.component.spec.ts +++ b/src/app/page/landing-layout/blog-page/blog-page.component.spec.ts @@ -2,24 +2,24 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { BlogPageComponent } from './blog-page.component'; -describe('BlogPageComponent', () => { +describe( 'BlogPageComponent', () => { let component: BlogPageComponent; let fixture: ComponentFixture; - beforeEach(async () => { - await TestBed.configureTestingModule({ + beforeEach( async () => { + await TestBed.configureTestingModule( { declarations: [ BlogPageComponent ] - }) + } ) .compileComponents(); - }); + } ); - beforeEach(() => { - fixture = TestBed.createComponent(BlogPageComponent); + beforeEach( () => { + fixture = TestBed.createComponent( BlogPageComponent ); component = fixture.componentInstance; fixture.detectChanges(); - }); + } ); - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); + it( 'should create', () => { + expect( component ).toBeTruthy(); + } ); +} ); diff --git a/src/app/page/landing-layout/blog-page/blog-page.component.ts b/src/app/page/landing-layout/blog-page/blog-page.component.ts index 4717c46f..51365209 100644 --- a/src/app/page/landing-layout/blog-page/blog-page.component.ts +++ b/src/app/page/landing-layout/blog-page/blog-page.component.ts @@ -3,17 +3,18 @@ import { Router } from '@angular/router'; import { NAVIGATIONS } from 'src/app/data/navigation/navigation.data'; import { BLOG } from '../../../data/blog/blog.data'; -@Component({ +@Component( { selector: 'app-blog-page', templateUrl: './blog-page.component.html', - styleUrls: ['./blog-page.component.scss'], -}) + styleUrls: [ './blog-page.component.scss' ], +} ) export class BlogPageComponent { BLOG = BLOG; - constructor(public router: Router) {} + constructor( public router: Router ) { + } - openBlog = (tag: string, key: string) => { - this.router.navigate([NAVIGATIONS.blog.url + '/' + tag + '/' + key]); + openBlog = ( tag: string, key: string ) => { + this.router.navigate( [ NAVIGATIONS.blog.url + '/' + tag + '/' + key ] ); }; } diff --git a/src/app/page/landing-layout/branding-page/branding-page.component.html b/src/app/page/landing-layout/branding-page/branding-page.component.html index 4d7f4e03..2f97df9a 100644 --- a/src/app/page/landing-layout/branding-page/branding-page.component.html +++ b/src/app/page/landing-layout/branding-page/branding-page.component.html @@ -1,23 +1,23 @@
- + -
+

- All of Open Template Hub’s brand features including Open Template Hub, - OTH + {{ 'All of ' + BRAND.name + '’s brand features including ' }}{{ BRAND.name }} and the - Open Template Hub logo are protected by applicable - trademark, copyright and other intellectual property laws. Any use of a Open Template Hub - trademark is subject to the Open Template Hub Trademark Standards for Use. + {{ BRAND.name }} logo are protected by applicable + trademark, copyright and other intellectual property laws. Any use of a + {{ BRAND.name + ' trademark'}} is subject to the + {{ BRAND.name + ' Trademark Standards'}} for Use.

Basic usage guidelines can be found below. If you have any questions or want to request approval to use these assets, please do not hesitate to contact us or email info@opentemplatehub.com + [href]="'mailto:' + environmentCommon.company.email">{{ environmentCommon.company.email }}


@@ -26,85 +26,71 @@

- - Do not rotate the Open Template Hub logo. + - Do not rotate the {{ BRAND.name }} logo.

- - Do not change the color of the Open Template Hub logo. + - Do not change the color of the {{ BRAND.name }} logo.

- - Do not distort the Open Template Hub logo (be sure to scale proportionately). + - Do not distort the {{ BRAND.name }} logo (be sure to scale proportionately).

- - Allow an appropriate amount of white space around the Open Template Hub logo, at least + - Allow an appropriate amount of white space around the {{ BRAND.name }} logo, at least as much as the x-height of the logo (suggested).

- - Preferred minimum size for the Open Template Hub logo is 100px wide. For smaller sizes, + - Preferred minimum size for the {{ BRAND.name }} logo is 100px wide. For smaller sizes, you must seek permission - from the Open Template Hub team. + from the {{ BRAND.name }} team.

- +
- +
- +
- - - - -
- - - - -
- - +
- +
diff --git a/src/app/page/landing-layout/branding-page/branding-page.component.ts b/src/app/page/landing-layout/branding-page/branding-page.component.ts index d70a997e..b5524934 100644 --- a/src/app/page/landing-layout/branding-page/branding-page.component.ts +++ b/src/app/page/landing-layout/branding-page/branding-page.component.ts @@ -1,4 +1,5 @@ import { Component } from '@angular/core'; +import { environmentCommon } from 'src/environments/environment-common'; import { BRAND } from '../../../data/brand/brand.data'; import { ThemeService } from '../../../service/theme/theme.service'; @@ -11,6 +12,8 @@ export class BrandingPageComponent { BRAND = BRAND; + environmentCommon = environmentCommon; + themeColorSetting: string; colorPalette = { @@ -25,9 +28,9 @@ export class BrandingPageComponent { this.themeService.themeColorSetting.subscribe( themeColorSetting => { this.themeColorSetting = themeColorSetting; - this.colorPalette.brandColor = getComputedStyle( document.getElementById( 'oth-component' ) ).getPropertyValue( '--theme-color' ); - this.colorPalette.secondaryColor = getComputedStyle( document.getElementById( 'oth-component' ) ).getPropertyValue( '--theme-color-secondary' ); - this.colorPalette.tertiaryColor = getComputedStyle( document.getElementById( 'oth-component' ) ).getPropertyValue( '--theme-color-tertiary' ); + this.colorPalette.brandColor = getComputedStyle( document.getElementById( 'app-component' ) ).getPropertyValue( '--theme-color' ); + this.colorPalette.secondaryColor = getComputedStyle( document.getElementById( 'app-component' ) ).getPropertyValue( '--theme-color-secondary' ); + this.colorPalette.tertiaryColor = getComputedStyle( document.getElementById( 'app-component' ) ).getPropertyValue( '--theme-color-tertiary' ); } ); } } diff --git a/src/app/page/landing-layout/contact-us-page/contact-us-page.component.html b/src/app/page/landing-layout/contact-us-page/contact-us-page.component.html index 4052dfb9..0ebc045c 100644 --- a/src/app/page/landing-layout/contact-us-page/contact-us-page.component.html +++ b/src/app/page/landing-layout/contact-us-page/contact-us-page.component.html @@ -1,7 +1,7 @@ - +
- +
@@ -62,7 +62,7 @@

Website

- + @@ -86,24 +87,25 @@

Country

>

Your Message

- - + +
- +

{{ features.title }}

- +

{{ feature }}

@@ -113,15 +115,16 @@

{{ feature }}

General Communication

-

For general queries, including partnership opportunities, please email - - {{ environmentCommon.oth.email }} +

For general queries, including partnership opportunities, + please email + + {{ environmentCommon.company.email }}

- +

Technical or account support

We're here to help! If you have technical issues, diff --git a/src/app/page/landing-layout/contact-us-page/contact-us-page.component.scss b/src/app/page/landing-layout/contact-us-page/contact-us-page.component.scss index 58463d87..f16b59a9 100644 --- a/src/app/page/landing-layout/contact-us-page/contact-us-page.component.scss +++ b/src/app/page/landing-layout/contact-us-page/contact-us-page.component.scss @@ -76,7 +76,7 @@ select { width: 45%; margin-top: 70px; - & app-brand-button { + & oth-brand-button { bottom: 2em; width: -webkit-fit-content; diff --git a/src/app/page/landing-layout/contact-us-page/contact-us-page.component.ts b/src/app/page/landing-layout/contact-us-page/contact-us-page.component.ts index b6d88cc9..55a16bd3 100644 --- a/src/app/page/landing-layout/contact-us-page/contact-us-page.component.ts +++ b/src/app/page/landing-layout/contact-us-page/contact-us-page.component.ts @@ -27,8 +27,8 @@ export class ContactUsPageComponent implements OnInit { loading = false; appHeroContent = [ - {text: $localize `:@@contactUs.appHero:Contact Us`, level: 1} - ] + { text: $localize`:@@contactUs.appHero:Contact Us`, level: 1 } + ]; constructor( private formBuilder: FormBuilder, @@ -65,7 +65,7 @@ export class ContactUsPageComponent implements OnInit { this.submitted = true; const errorMessages = { - firstName: $localize `:@@contactUs.error.firstName:Please provide a first name`, + firstName: $localize`:@@contactUs.error.firstName:Please provide a first name`, secondName: ':@@contactUs.error.secondName:Please provide a second name', workEmail: ':@@contactUs.error.workEmail:Please provide a valid email', companySize: ':@@contactUs.error.companySize:Please provide a company size', diff --git a/src/app/page/landing-layout/customers-page/customers-page.component.html b/src/app/page/landing-layout/customers-page/customers-page.component.html index 8db20e00..440be876 100644 --- a/src/app/page/landing-layout/customers-page/customers-page.component.html +++ b/src/app/page/landing-layout/customers-page/customers-page.component.html @@ -1,5 +1,5 @@ - +
{ +describe( 'CustomersPageComponent', () => { let component: CustomersPageComponent; let fixture: ComponentFixture; - beforeEach(async () => { - await TestBed.configureTestingModule({ + beforeEach( async () => { + await TestBed.configureTestingModule( { declarations: [ CustomersPageComponent ] - }) + } ) .compileComponents(); - }); + } ); - beforeEach(() => { - fixture = TestBed.createComponent(CustomersPageComponent); + beforeEach( () => { + fixture = TestBed.createComponent( CustomersPageComponent ); component = fixture.componentInstance; fixture.detectChanges(); - }); + } ); - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); + it( 'should create', () => { + expect( component ).toBeTruthy(); + } ); +} ); diff --git a/src/app/page/landing-layout/docs-page/docs-content-page/docs-content-page.component.html b/src/app/page/landing-layout/docs-page/docs-content-page/docs-content-page.component.html index 2c87a990..2e83c216 100644 --- a/src/app/page/landing-layout/docs-page/docs-content-page/docs-content-page.component.html +++ b/src/app/page/landing-layout/docs-page/docs-content-page/docs-content-page.component.html @@ -1,19 +1,18 @@
-
+ [date]="doc.date" + [src]="'./assets/docs/' + doc.url">
- - + ]" + [icon]="'chevron-left'" + [routerLink]="URLS.docs" + [text]="'Back'"> +
diff --git a/src/app/page/landing-layout/docs-page/docs-content-page/docs-content-page.component.spec.ts b/src/app/page/landing-layout/docs-page/docs-content-page/docs-content-page.component.spec.ts index 72ae7dfe..bb7c34e1 100644 --- a/src/app/page/landing-layout/docs-page/docs-content-page/docs-content-page.component.spec.ts +++ b/src/app/page/landing-layout/docs-page/docs-content-page/docs-content-page.component.spec.ts @@ -2,24 +2,24 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { DocsContentPageComponent } from './docs-content-page.component'; -describe('DocsContentPageComponent', () => { +describe( 'DocsContentPageComponent', () => { let component: DocsContentPageComponent; let fixture: ComponentFixture; - beforeEach(async () => { - await TestBed.configureTestingModule({ + beforeEach( async () => { + await TestBed.configureTestingModule( { declarations: [ DocsContentPageComponent ] - }) + } ) .compileComponents(); - }); + } ); - beforeEach(() => { - fixture = TestBed.createComponent(DocsContentPageComponent); + beforeEach( () => { + fixture = TestBed.createComponent( DocsContentPageComponent ); component = fixture.componentInstance; fixture.detectChanges(); - }); + } ); - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); + it( 'should create', () => { + expect( component ).toBeTruthy(); + } ); +} ); diff --git a/src/app/page/landing-layout/docs-page/docs-content-page/docs-content-page.component.ts b/src/app/page/landing-layout/docs-page/docs-content-page/docs-content-page.component.ts index 5d471f16..1872b850 100644 --- a/src/app/page/landing-layout/docs-page/docs-content-page/docs-content-page.component.ts +++ b/src/app/page/landing-layout/docs-page/docs-content-page/docs-content-page.component.ts @@ -4,11 +4,11 @@ import { DOCS } from 'src/app/data/doc/doc.data'; import { Doc } from 'src/app/model/doc/doc.model'; import { URLS } from '../../../../data/navigation/navigation.data'; -@Component({ +@Component( { selector: 'app-docs-content-page', templateUrl: './docs-content-page.component.html', - styleUrls: ['./docs-content-page.component.scss'], -}) + styleUrls: [ './docs-content-page.component.scss' ], +} ) export class DocsContentPageComponent { URLS = URLS; @@ -19,18 +19,19 @@ export class DocsContentPageComponent { url: '', } as Doc; - constructor(private route: ActivatedRoute, public router: Router) {} + constructor( private route: ActivatedRoute, public router: Router ) { + } ngOnInit(): void { - this.route.params.subscribe((params) => { - if (!params.docKey) { - this.router.navigate([URLS.notFound]); + this.route.params.subscribe( ( params ) => { + if ( !params.docKey ) { + this.router.navigate( [ URLS.notFound ] ); return; } - let found: Doc = DOCS.find((b) => b.key === params.docKey); + let found: Doc = DOCS.find( ( b ) => b.key === params.docKey ); this.doc = found; - console.log(this.doc.url); - }); + console.log( this.doc.url ); + } ); } } diff --git a/src/app/page/landing-layout/docs-page/docs-page.component.html b/src/app/page/landing-layout/docs-page/docs-page.component.html index ac18ce7b..b3b87961 100644 --- a/src/app/page/landing-layout/docs-page/docs-page.component.html +++ b/src/app/page/landing-layout/docs-page/docs-page.component.html @@ -1,11 +1,11 @@
- +
+ (click)="openDoc(doc.tag, doc.key)" + [doc]="doc" + class="doc-holder-card">
diff --git a/src/app/page/landing-layout/docs-page/docs-page.component.scss b/src/app/page/landing-layout/docs-page/docs-page.component.scss index 8defd674..65962de9 100644 --- a/src/app/page/landing-layout/docs-page/docs-page.component.scss +++ b/src/app/page/landing-layout/docs-page/docs-page.component.scss @@ -1,6 +1,6 @@ @use '../../../../styles/util/util'; @use '../landing-layout.component'; -@use '../../../component/card/card.component'; +@use 'node_modules/@open-template-hub/card/styles/card/card'; @media only screen and (max-width: 999px) { .flexible-cards-wrapper { diff --git a/src/app/page/landing-layout/docs-page/docs-page.component.spec.ts b/src/app/page/landing-layout/docs-page/docs-page.component.spec.ts index a8a4e5f4..2768eb32 100644 --- a/src/app/page/landing-layout/docs-page/docs-page.component.spec.ts +++ b/src/app/page/landing-layout/docs-page/docs-page.component.spec.ts @@ -2,24 +2,24 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { DocsPageComponent } from './docs-page.component'; -describe('DocsPageComponent', () => { +describe( 'DocsPageComponent', () => { let component: DocsPageComponent; let fixture: ComponentFixture; - beforeEach(async () => { - await TestBed.configureTestingModule({ + beforeEach( async () => { + await TestBed.configureTestingModule( { declarations: [ DocsPageComponent ] - }) + } ) .compileComponents(); - }); + } ); - beforeEach(() => { - fixture = TestBed.createComponent(DocsPageComponent); + beforeEach( () => { + fixture = TestBed.createComponent( DocsPageComponent ); component = fixture.componentInstance; fixture.detectChanges(); - }); + } ); - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); + it( 'should create', () => { + expect( component ).toBeTruthy(); + } ); +} ); diff --git a/src/app/page/landing-layout/docs-page/docs-page.component.ts b/src/app/page/landing-layout/docs-page/docs-page.component.ts index d0184a7e..a270e0c9 100644 --- a/src/app/page/landing-layout/docs-page/docs-page.component.ts +++ b/src/app/page/landing-layout/docs-page/docs-page.component.ts @@ -3,16 +3,18 @@ import { Router } from '@angular/router'; import { DOCS } from 'src/app/data/doc/doc.data'; import { NAVIGATIONS } from 'src/app/data/navigation/navigation.data'; -@Component({ +@Component( { selector: 'app-docs-page', templateUrl: './docs-page.component.html', - styleUrls: ['./docs-page.component.scss'], -}) + styleUrls: [ './docs-page.component.scss' ], +} ) export class DocsPageComponent { DOCS = DOCS; - constructor(public router: Router) {} - openDoc = (tag: string, key: string) => { - this.router.navigate([NAVIGATIONS.docs.url + '/' + tag + '/' + key]); + constructor( public router: Router ) { + } + + openDoc = ( tag: string, key: string ) => { + this.router.navigate( [ NAVIGATIONS.docs.url + '/' + tag + '/' + key ] ); }; } diff --git a/src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.html b/src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.html index 1620afae..77acbb1e 100644 --- a/src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.html +++ b/src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.html @@ -1,7 +1,6 @@
- - +
@@ -9,12 +8,13 @@
- +
- +
@@ -24,9 +24,10 @@

'Reset email sent!'

'Please check you inbox'



- +
- +

diff --git a/src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.ts b/src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.ts index e662c6d7..e39cf113 100644 --- a/src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.ts +++ b/src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.ts @@ -22,8 +22,6 @@ export class ForgetPasswordPageComponent implements OnInit, OnDestroy { URLS = URLS; - appHeroContents = [{text: $localize `:@@forgetPassword.appHero:Forget password`, level: 1}] - constructor( private formBuilder: FormBuilder, private route: ActivatedRoute, diff --git a/src/app/page/landing-layout/form-pages/login-page/login-page.component.html b/src/app/page/landing-layout/form-pages/login-page/login-page.component.html index 836c178a..9e114cd7 100644 --- a/src/app/page/landing-layout/form-pages/login-page/login-page.component.html +++ b/src/app/page/landing-layout/form-pages/login-page/login-page.component.html @@ -1,27 +1,41 @@
- - +
- diff --git a/src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.ts b/src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.ts index 6779fcfb..ba7ed1d8 100644 --- a/src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.ts +++ b/src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.ts @@ -24,8 +24,6 @@ export class ResetPasswordPageComponent implements OnInit, OnDestroy { URLS = URLS; - appHeroContents = [{text: $localize `:@@resetPassword.appHero:Reset password`, level: 1}] - constructor( private formBuilder: FormBuilder, private route: ActivatedRoute, @@ -68,8 +66,8 @@ export class ResetPasswordPageComponent implements OnInit, OnDestroy { this.submitted = true; const errorMessages = { - password: $localize `:@@resetPassword.error.password:Please provide a valid password (min length 6)`, - confirmPassword: $localize `:@@resetPassword.confirmPassword:Please provide the same value for confirm password` + password: $localize`:@@resetPassword.error.password:Please provide a valid password (min length 6)`, + confirmPassword: $localize`:@@resetPassword.confirmPassword:Please provide the same value for confirm password` }; if ( this.form.invalid ) { diff --git a/src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html b/src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html index a021dfef..5e0ff1b4 100644 --- a/src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html +++ b/src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html @@ -1,43 +1,59 @@
- - +
- - + +
diff --git a/src/app/page/landing-layout/landing-layout.component.scss b/src/app/page/landing-layout/landing-layout.component.scss index b1f60ff0..efef0715 100644 --- a/src/app/page/landing-layout/landing-layout.component.scss +++ b/src/app/page/landing-layout/landing-layout.component.scss @@ -33,6 +33,20 @@ margin: 0 0 10px; } } + + & .auth-social-login-wrapper { + & > * { + flex: 1 0 21%; + margin: 5px; + max-width: 21%; + transition: opacity 800ms, visibility 800ms; + } + } + + & .more { + font-size: 16px; + height: 41px; + } } } @@ -51,12 +65,22 @@ } .raw-content-page-layout, .form-page-layout { - padding-left: 3vw; - padding-right: 3vw; + padding: 3vh 3vw; min-height: 80vh; } + .raw-content-page-layout { + padding-top: 10vh; + padding-bottom: 10vh; + } + .form-page-layout { + + & > * { + margin-top: auto; + margin-bottom: auto; + } + & .body { width: 94vw; } @@ -64,24 +88,27 @@ } @media only screen and (min-width: 1000px) { + .page { + min-height: calc(100vh - 546px); + } .header, .header-filler { display: block; } .raw-content-page-layout, .form-page-layout { - padding-left: 90px; - padding-right: 90px; + padding: 90px; min-height: 50vh; } .raw-content-page-layout { - & app-information-button { + & oth-information-button { margin-top: 30px; } } .form-page-layout { + & .body { width: 400px; } diff --git a/src/app/page/landing-layout/landing-layout.component.ts b/src/app/page/landing-layout/landing-layout.component.ts index 117372dc..353712dd 100644 --- a/src/app/page/landing-layout/landing-layout.component.ts +++ b/src/app/page/landing-layout/landing-layout.component.ts @@ -1,5 +1,8 @@ import { Component } from '@angular/core'; +import { AuthToken } from '../../model/auth/auth-token.model'; +import { AuthenticationService } from '../../service/auth/authentication.service'; import { LoadingService } from '../../service/loading/loading.service'; +import { HomePageComponent } from './home-page/home-page.component'; @Component( { selector: 'app-landing-layout', @@ -8,9 +11,29 @@ import { LoadingService } from '../../service/loading/loading.service'; } ) export class LandingLayoutComponent { + currentUser: AuthToken; loading = false; + bottomSvgActiveComponents = [ HomePageComponent ]; + isBottomSvgActive = false; - constructor( private loadingService: LoadingService ) { + constructor( + private loadingService: LoadingService, + private authenticationService: AuthenticationService + ) { this.loadingService.sharedLoading.subscribe( loading => this.loading = loading ); + + this.authenticationService.currentUser.subscribe( currentUser => { + this.currentUser = currentUser; + } ); + } + + onRouterOutletActivate( event: any ) { + for ( const component of this.bottomSvgActiveComponents ) { + if ( event instanceof component ) { + this.isBottomSvgActive = true; + return; + } + } + this.isBottomSvgActive = false; } } diff --git a/src/app/page/landing-layout/partners-page/partners-page.component.html b/src/app/page/landing-layout/partners-page/partners-page.component.html index 2924771e..b70d9c2f 100644 --- a/src/app/page/landing-layout/partners-page/partners-page.component.html +++ b/src/app/page/landing-layout/partners-page/partners-page.component.html @@ -1,5 +1,5 @@ - +
@@ -7,7 +7,8 @@
- - + +
diff --git a/src/app/page/landing-layout/partners-page/partners-page.component.scss b/src/app/page/landing-layout/partners-page/partners-page.component.scss index c11a56a7..52a8cf6a 100644 --- a/src/app/page/landing-layout/partners-page/partners-page.component.scss +++ b/src/app/page/landing-layout/partners-page/partners-page.component.scss @@ -1,5 +1,5 @@ @use '../../../../styles/util/util'; -@use '../../../component/card/card.component'; +@use 'node_modules/@open-template-hub/card/styles/card/card'; .business-partners-wrapper { @include util.flex-layout-column; diff --git a/src/app/page/landing-layout/partners-page/partners-page.component.spec.ts b/src/app/page/landing-layout/partners-page/partners-page.component.spec.ts index fb7861d7..978af27b 100644 --- a/src/app/page/landing-layout/partners-page/partners-page.component.spec.ts +++ b/src/app/page/landing-layout/partners-page/partners-page.component.spec.ts @@ -2,24 +2,24 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { PartnersPageComponent } from './partners-page.component'; -describe('PartnersPageComponent', () => { +describe( 'PartnersPageComponent', () => { let component: PartnersPageComponent; let fixture: ComponentFixture; - beforeEach(async () => { - await TestBed.configureTestingModule({ + beforeEach( async () => { + await TestBed.configureTestingModule( { declarations: [ PartnersPageComponent ] - }) + } ) .compileComponents(); - }); + } ); - beforeEach(() => { - fixture = TestBed.createComponent(PartnersPageComponent); + beforeEach( () => { + fixture = TestBed.createComponent( PartnersPageComponent ); component = fixture.componentInstance; fixture.detectChanges(); - }); + } ); - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); + it( 'should create', () => { + expect( component ).toBeTruthy(); + } ); +} ); diff --git a/src/app/page/landing-layout/policy-pages/cookie-policy-page/cookie-policy-page.component.html b/src/app/page/landing-layout/policy-pages/cookie-policy-page/cookie-policy-page.component.html index 78984fda..bf4eb15f 100644 --- a/src/app/page/landing-layout/policy-pages/cookie-policy-page/cookie-policy-page.component.html +++ b/src/app/page/landing-layout/policy-pages/cookie-policy-page/cookie-policy-page.component.html @@ -1,12 +1,12 @@
- +
-

This is the Cookie Policy for Open Template Hub, accessible from - opentemplatehub.com

+

This is the Cookie Policy for {{ BRAND.name }}, accessible from + {{ environmentCommon.company.website }}

What Are Cookies

As is common practice with almost all professional websites this site uses cookies, which are tiny files that @@ -19,9 +19,9 @@ from being stored however this may downgrade or 'break' certain elements of the sites functionality.

For more general information on cookies, please read "What + href="https://www.cookieconsent.com/what-are-cookies/">"What Are Cookies". Information regarding cookies from this Cookies Policy are from the Privacy Policy Generator.

+ href="https://www.generateprivacypolicy.com/">the Privacy Policy Generator.

How We Use Cookies

We use cookies for a variety of reasons detailed below. Unfortunately in most cases there are no industry standard @@ -73,7 +73,7 @@ of the features you use on our site.

However if you are still looking for more information then you can contact us through info@opentemplatehub.com

+ [href]="'mailto:' + environmentCommon.company.email">{{ environmentCommon.company.email }}

 diff --git a/src/app/page/landing-layout/policy-pages/cookie-policy-page/cookie-policy-page.component.ts b/src/app/page/landing-layout/policy-pages/cookie-policy-page/cookie-policy-page.component.ts index a04bd70b..2f843608 100644 --- a/src/app/page/landing-layout/policy-pages/cookie-policy-page/cookie-policy-page.component.ts +++ b/src/app/page/landing-layout/policy-pages/cookie-policy-page/cookie-policy-page.component.ts @@ -1,4 +1,6 @@ import { Component } from '@angular/core'; +import { environmentCommon } from '../../../../../environments/environment-common'; +import { BRAND } from '../../../../data/brand/brand.data'; @Component( { selector: 'app-cookie-policy-page', @@ -7,6 +9,10 @@ import { Component } from '@angular/core'; } ) export class CookiePolicyPageComponent { + BRAND = BRAND; + + environmentCommon = environmentCommon; + constructor() { // Intentionally Blank } diff --git a/src/app/page/landing-layout/policy-pages/privacy-policy-page/privacy-policy-page.component.html b/src/app/page/landing-layout/policy-pages/privacy-policy-page/privacy-policy-page.component.html index 03c7602a..a047fc93 100644 --- a/src/app/page/landing-layout/policy-pages/privacy-policy-page/privacy-policy-page.component.html +++ b/src/app/page/landing-layout/policy-pages/privacy-policy-page/privacy-policy-page.component.html @@ -1,23 +1,25 @@
- +
-

At opentemplatehub.com, accessible from https://opentemplatehub.com, one of our main priorities is the +

At {{ environmentCommon.company.website }}, accessible from {{ environmentCommon.company.website }}, one of our main + priorities is the privacy of our visitors. This Privacy Policy document contains types of information that is collected and recorded by - opentemplatehub.com and how we use it.

+ {{ environmentCommon.company.website }} and how we use it.

If you have additional questions or require more information about our Privacy Policy, do not hesitate to contact - us info@opentemplatehub.com + us {{ environmentCommon.company.email }}

This Privacy Policy applies only to our online activities and is valid for visitors to our website with regards - to the information that they shared and/or collect in opentemplatehub.com. This policy is not + to the information that they shared and/or collect in {{ environmentCommon.company.website }}. + This policy is not applicable to any information collected offline or via channels other than this website.

Consent

@@ -46,7 +48,8 @@

- Send you emails

- Find and prevent fraud

Log Files

-

opentemplatehub.com follows a standard procedure of using log files. These files log +

{{ environmentCommon.company.website }} follows a standard procedure of using log files. + These files log visitors when they visit @@ -63,20 +66,23 @@

Please read Cookies Policy

Advertising Partners Privacy Policies

You may consult this list to find the Privacy Policy for each of the advertising partners of - opentemplatehub.com.

+ {{ environmentCommon.company.website }}.

Third-party ad servers or ad networks uses technologies like cookies, JavaScript, or Web Beacons that are used in - their respective advertisements and links that appear on opentemplatehub.com, which are sent directly to + their respective advertisements and links that appear on {{ environmentCommon.company.website }}, which are + sent directly to users' browser. They automatically receive your IP address when this occurs. These technologies are used to measure the effectiveness of their advertising campaigns and/or to personalize the advertising content that you see on websites that you visit.

-

Note that opentemplatehub.com has no access to or control over these cookies that are used by third-party +

Note that {{ environmentCommon.company.website }} has no access to or control over these cookies that are + used by third-party advertisers.

Third Party Privacy Policies

-

opentemplatehub.com's Privacy Policy does not apply to other advertisers or websites. Thus, +

{{ environmentCommon.company.website }}'s Privacy Policy does not apply to other advertisers + or websites. Thus, we are advising you to consult the respective Privacy Policies of these third-party ad servers for more detailed information. It may @@ -92,7 +98,8 @@

Request that a business that sells a consumer's personal data, not sell the consumer's personal data.

If you make a request, we have one month to respond to you. If you would like to exercise any of these rights, - please contact us info@opentemplatehub.com

+ please contact us {{ environmentCommon.company.email }}

GDPR Data Protection Rights

We would like to make sure you are fully aware of all of your data protection rights. Every user is entitled to @@ -121,7 +128,8 @@

Another part of our priority is adding protection for children while using the internet. We encourage parents and guardians to observe, participate in, and/or monitor and guide their online activity.

-

opentemplatehub.com does not knowingly collect any Personal Identifiable Information from +

{{ environmentCommon.company.website }} does not knowingly collect any Personal Identifiable + Information from children under the age of 13. If you think that your child provided this kind of information on our website, we strongly encourage you diff --git a/src/app/page/landing-layout/policy-pages/privacy-policy-page/privacy-policy-page.component.ts b/src/app/page/landing-layout/policy-pages/privacy-policy-page/privacy-policy-page.component.ts index 41f9c2fc..47290a36 100644 --- a/src/app/page/landing-layout/policy-pages/privacy-policy-page/privacy-policy-page.component.ts +++ b/src/app/page/landing-layout/policy-pages/privacy-policy-page/privacy-policy-page.component.ts @@ -1,4 +1,5 @@ import { Component } from '@angular/core'; +import { environmentCommon } from '../../../../../environments/environment-common'; import { URLS } from '../../../../data/navigation/navigation.data'; @Component( { @@ -10,6 +11,8 @@ export class PrivacyPolicyPageComponent { URLS = URLS; + environmentCommon = environmentCommon; + constructor() { // Intentionally Blank } diff --git a/src/app/page/landing-layout/policy-pages/terms-page/terms-page.component.html b/src/app/page/landing-layout/policy-pages/terms-page/terms-page.component.html index 5d506c0e..144b28ee 100644 --- a/src/app/page/landing-layout/policy-pages/terms-page/terms-page.component.html +++ b/src/app/page/landing-layout/policy-pages/terms-page/terms-page.component.html @@ -1,22 +1,19 @@

- +
-

Welcome to opentemplatehub.com!

+

Welcome to {{ environmentCommon.company.website }}!

-

These terms and conditions outline the rules and regulations for the use of Open Template Hub's Website, - located - at - https://opentemplatehub.com.

+

These terms and conditions outline the rules and regulations for the use of {{ BRAND.name }}'s Website, + located at {{ environmentCommon.company.website }}.

-

By accessing this website we assume you accept these terms and conditions. Do not continue to use - opentemplatehub.com - if you do not agree to take all of the terms and conditions stated on this page.

+

By accessing this website we assume you accept these terms and conditions. Do not continue to + use {{ environmentCommon.company.website }} if you do not agree to take all of the terms and conditions stated + on this page.

The following terminology applies to these Terms and Conditions, Privacy Statement and Disclaimer Notice and all @@ -33,35 +30,35 @@

License

-

Unless otherwise stated, Open Template Hub and/or its licensors own the intellectual property rights for all - material - on opentemplatehub.com. All intellectual property rights are reserved. You may access this from opentemplatehub.com for +

Unless otherwise stated, {{ BRAND.name }} and/or its licensors own the intellectual property rights for all + material on {{ environmentCommon.company.website }}. All intellectual property rights are reserved. You may + access this from {{ environmentCommon.company.website }} for your own personal use subjected to restrictions set in these terms and conditions.

You must not:

- Republish material from opentemplatehub.com

+ [href]="environmentCommon.company.website">{{ environmentCommon.company.website }}

- Sell, rent or sub-license material from opentemplatehub.com

+ [href]="environmentCommon.company.website">{{ environmentCommon.company.website }}

- Reproduce, duplicate or copy material from opentemplatehub.com

+ [href]="environmentCommon.company.website">{{ environmentCommon.company.website }}

- Redistribute content from opentemplatehub.com

+ [href]="environmentCommon.company.website">{{ environmentCommon.company.website }}

Parts of this website offer an opportunity for users to post and exchange opinions and information in certain - areas of the website. Open Template Hub does not filter, edit, publish or review Comments prior to their + areas of the website. {{ BRAND.name }} does not filter, edit, publish or review Comments prior to their presence on - the website. Comments do not reflect the views and opinions of Open Template Hub,its agents and/or affiliates. + the website. Comments do not reflect the views and opinions of {{ BRAND.name }},its agents and/or affiliates. Comments reflect the views and opinions of the person who post their views and opinions. To the extent permitted by - applicable laws, Open Template Hub shall not be liable for the Comments or for any liability, damages or + applicable laws, {{ BRAND.name }} shall not be liable for the Comments or for any liability, damages or expenses caused and/or suffered as a result of any use of and/or posting of and/or appearance of the Comments on this website.

-

Open Template Hub reserves the right to monitor all Comments and to remove any Comments which can be +

{{ BRAND.name }} reserves the right to monitor all Comments and to remove any Comments which can be considered inappropriate, offensive or causes breach of these Terms and Conditions.

@@ -83,7 +80,7 @@

-

You hereby grant Open Template Hub a non-exclusive license to use, reproduce, edit and authorize others to +

You hereby grant {{ BRAND.name }} a non-exclusive license to use, reproduce, edit and authorize others to use, reproduce and edit any of your Comments in any and all forms, formats or media.

@@ -137,7 +134,7 @@

If you are one of the organizations listed in paragraph 2 above and are interested in linking to our website, you - must inform us by sending an e-mail to Open Template Hub. Please include your name, your organization name, + must inform us by sending an e-mail to {{ BRAND.name }}. Please include your name, your organization name, contact information as well as the URL of your site, a list of any URLs from which you intend to link to our Website, and @@ -154,7 +151,7 @@

-

No use of Open Template Hub's logo or other artwork will be allowed for linking absent a trademark license +

No use of {{ BRAND.name }}'s logo or other artwork will be allowed for linking absent a trademark license agreement.

iFrames

diff --git a/src/app/page/landing-layout/policy-pages/terms-page/terms-page.component.ts b/src/app/page/landing-layout/policy-pages/terms-page/terms-page.component.ts index 8b4489e6..f66087d0 100644 --- a/src/app/page/landing-layout/policy-pages/terms-page/terms-page.component.ts +++ b/src/app/page/landing-layout/policy-pages/terms-page/terms-page.component.ts @@ -1,4 +1,6 @@ import { Component } from '@angular/core'; +import { environmentCommon } from '../../../../../environments/environment-common'; +import { BRAND } from '../../../../data/brand/brand.data'; import { URLS } from '../../../../data/navigation/navigation.data'; @Component( { @@ -8,8 +10,12 @@ import { URLS } from '../../../../data/navigation/navigation.data'; } ) export class TermsPageComponent { + BRAND = BRAND; + URLS = URLS; + environmentCommon = environmentCommon; + constructor() { // Intentionally Blank } diff --git a/src/app/page/landing-layout/pricing-page/pricing-page.component.html b/src/app/page/landing-layout/pricing-page/pricing-page.component.html index 25a39ca5..cf3a8762 100644 --- a/src/app/page/landing-layout/pricing-page/pricing-page.component.html +++ b/src/app/page/landing-layout/pricing-page/pricing-page.component.html @@ -1,6 +1,6 @@ - +
p.key === params.productLine ); + const productLine: ProductLine = PRODUCT_LINES.find( ( p ) => p.key === params.productLine ); if ( !productLine ) { - productLine = SERVICES.find( ( p ) => p.key === params.productLine ); - - if ( !productLine ) { - this.productService.setSelectedProduct( undefined ); - this.router.navigate( [ URLS.notFound ] ); - return; - } + this.productService.setSelectedProduct( undefined ); + this.router.navigate( [ URLS.notFound ] ); + return; } const product = productLine.products.find( diff --git a/src/app/page/landing-layout/product-page/product-page.component.html b/src/app/page/landing-layout/product-page/product-page.component.html index fc0ddbcf..6e44320d 100644 --- a/src/app/page/landing-layout/product-page/product-page.component.html +++ b/src/app/page/landing-layout/product-page/product-page.component.html @@ -1,12 +1,11 @@
- +

{{ product.name }}

@@ -16,76 +15,81 @@

{{ product.name }}

{{ product.description }}

- - + + - - - - + + + + + + +
- +
- - +
+ [productLineKey]="productLineKey" + [product]="product">
-
+
+ [screenshots]="product.screenshots">
+ [boxContentLoaderClass]="'product-counter'">
+ class="counter-wrapper" + rel="noopener" + target="_blank">

{{ counter.value }}

@@ -97,39 +101,37 @@

- - - +
+ *ngFor="let testimonial of TESTIMONIALS" + [testimonial]="testimonial"> - - + ]" + [routerLink]="URLS.customers" + i18n-text="@@productPage.readMoreStories" + text="Read More Stories"> +
- +
+ [num]="i + 1" + [rotation]="i % 2 === 0 ? 'left' : 'right'" + [step]="step">
@@ -143,10 +145,10 @@

+ *ngIf="product.openSource" + [activities]="commitActivities" + i18n-title="@@productPage.activityHistory.title" + title="Activity history">
@@ -154,32 +156,30 @@

- + - +
+ *ngIf=" productLine.key === 'premium' || + (productLineKey === 'premium' ? productLine.key === 'server' : productLine.key === productLineKey)"> + *ngIf="product.key !== relatedProduct.key" + [class]="relatedProduct.color ? relatedProduct.color : ''" + [footerText]="getPresentationCardFooter(relatedProduct.openSource)" + [href]="URLS.product + '/' + productLine.key + '/' + relatedProduct.key" + [imgHeight]="150" + [maintenance]="relatedProduct.url === URLS.maintenance" + [secondaryText]="relatedProduct.description" + [src]="relatedProduct.logo" + [title]="relatedProduct.name" + class="related-product"> diff --git a/src/app/page/landing-layout/product-page/product-page.component.scss b/src/app/page/landing-layout/product-page/product-page.component.scss index e52a0c6b..57b2bcdb 100644 --- a/src/app/page/landing-layout/product-page/product-page.component.scss +++ b/src/app/page/landing-layout/product-page/product-page.component.scss @@ -1,6 +1,6 @@ @use '../../../../styles/util/util'; @use '../../../component/content-loader/box-content-loader/box-content-loader.component'; -@use '../../../component/card/card.component'; +@use 'node_modules/@open-template-hub/card/styles/card/card'; .product-page-content { @include util.flex-layout-column; diff --git a/src/app/page/landing-layout/product-page/product-page.component.ts b/src/app/page/landing-layout/product-page/product-page.component.ts index 061bfa19..7a98fbad 100644 --- a/src/app/page/landing-layout/product-page/product-page.component.ts +++ b/src/app/page/landing-layout/product-page/product-page.component.ts @@ -4,7 +4,7 @@ import { TESTIMONIALS } from 'src/app/data/testimonial/testimonial.data'; import { GithubProviderService } from 'src/app/service/provider/github-provider.service'; import { environmentCommon } from '../../../../environments/environment-common'; import { URLS } from '../../../data/navigation/navigation.data'; -import { PRODUCT_LINES, SERVICES } from '../../../data/product/product.data'; +import { PRODUCT_LINES } from '../../../data/product/product.data'; import { Activity } from '../../../model/activity/activity.model'; import { Product, ProductLine } from '../../../model/product/product.model'; import { Testimonial } from '../../../model/testimonial/testimonial.model'; @@ -34,13 +34,9 @@ export class ProductPageComponent implements OnInit, OnDestroy { { text: $localize`:@@productPage.testimonialsTitle.2:What our customers are saying...` } ]; - relatedProductAppHero = [ - { text: $localize `:@@productPage.relatedProductAppHero:Related Products`, level: 2 } - ] - npmPackageInstallationAndUsage = [ - { text: $localize `:@@productPage.npmPackageInstallationAndUsage:Package Installation & Usage`, level: 2 } - ] + { text: $localize`:@@productPage.npmPackageInstallationAndUsage:Package Installation & Usage`, level: 2 } + ]; constructor( private route: ActivatedRoute, @@ -48,7 +44,6 @@ export class ProductPageComponent implements OnInit, OnDestroy { private githubService: GithubProviderService, private productService: ProductService, ) { - } ngOnInit(): void { @@ -66,20 +61,14 @@ export class ProductPageComponent implements OnInit, OnDestroy { this.productLineKey = params.productLine; - let productLine: ProductLine = PRODUCT_LINES.find( ( p ) => p.key === params.productLine ); + const productLine: ProductLine = PRODUCT_LINES.find( ( p ) => p.key === params.productLine ); - let isService = false; this.isOpenSource = false; if ( !productLine ) { - productLine = SERVICES.find( ( p ) => p.key === params.productLine ); - isService = true; - - if ( !productLine ) { - this.productService.setSelectedProduct( undefined ); - this.router.navigate( [ URLS.notFound ] ); - return; - } + this.productService.setSelectedProduct( undefined ); + this.router.navigate( [ URLS.notFound ] ); + return; } const product = productLine.products.find( @@ -92,23 +81,21 @@ export class ProductPageComponent implements OnInit, OnDestroy { return; } - if (product.url === URLS.maintenance) { + if ( product.url === URLS.maintenance ) { this.productService.setSelectedProduct( undefined ); this.router.navigate( [ URLS.maintenance ] ); return; } - if ( !isService ) { - this.isOpenSource = true; - this.githubService.getGithubCounters( product.key ) - .then( counters => { - product.counters = counters; - } ) - .catch( error => { - this.isOpenSource = false; - console.error( 'Error while getting Github Counters for product: ', product.key, error ); - } ); - } + this.isOpenSource = true; + this.githubService.getGithubCounters( product.key ) + .then( counters => { + product.counters = counters; + } ) + .catch( error => { + this.isOpenSource = false; + console.error( 'Error while getting Github Counters for product: ', product.key, error ); + } ); this.githubService.getCommitHistory( product.key ) .then( commitActivities => { @@ -133,11 +120,11 @@ export class ProductPageComponent implements OnInit, OnDestroy { getContactUsButtonText( productLineKey ) { return productLineKey === 'services' - ? $localize `:@@productPage.contactUs.button:Contact Us` - : $localize `:@@productPage.requestForDemo.button:Request for Demo` + ? $localize`:@@productPage.contactUs.button:Contact Us` + : $localize`:@@productPage.requestForDemo.button:Request for Demo`; } - getPresentationCardFooter(isOpenSource: boolean): string { - return isOpenSource ? $localize`:@@productTypeTag.openSource:opensource` : $localize`:@@productTypeTag.premium:premium` + getPresentationCardFooter( isOpenSource: boolean ): string { + return isOpenSource ? $localize`:@@productTypeTag.openSource:opensource` : $localize`:@@productTypeTag.premium:premium`; } } diff --git a/src/app/page/landing-layout/raw-content-pages/maintenance-page/maintenance-page.component.html b/src/app/page/landing-layout/raw-content-pages/maintenance-page/maintenance-page.component.html index 7f57b756..0d162175 100644 --- a/src/app/page/landing-layout/raw-content-pages/maintenance-page/maintenance-page.component.html +++ b/src/app/page/landing-layout/raw-content-pages/maintenance-page/maintenance-page.component.html @@ -4,8 +4,8 @@
- - + +

diff --git a/src/app/page/landing-layout/raw-content-pages/maintenance-page/maintenance-page.component.ts b/src/app/page/landing-layout/raw-content-pages/maintenance-page/maintenance-page.component.ts index d5b2ff22..6825c57e 100644 --- a/src/app/page/landing-layout/raw-content-pages/maintenance-page/maintenance-page.component.ts +++ b/src/app/page/landing-layout/raw-content-pages/maintenance-page/maintenance-page.component.ts @@ -16,9 +16,9 @@ export class MaintenancePageComponent { INFORMATION_TYPES = INFORMATION_TYPES; appHeroContents = [ - {text: $localize `:@@maintenance.appHero.1:Under maintenance`, level: 1}, - {text: $localize `:@@maintenance.appHero.2:Please check again later`} - ] + { text: $localize`:@@maintenance.appHero.1:Under maintenance`, level: 1 }, + { text: $localize`:@@maintenance.appHero.2:Please check again later` } + ]; constructor( public router: Router ) { } diff --git a/src/app/page/landing-layout/raw-content-pages/not-found-page/not-found-page.component.html b/src/app/page/landing-layout/raw-content-pages/not-found-page/not-found-page.component.html index 96dc2bf0..d16e2f05 100644 --- a/src/app/page/landing-layout/raw-content-pages/not-found-page/not-found-page.component.html +++ b/src/app/page/landing-layout/raw-content-pages/not-found-page/not-found-page.component.html @@ -4,8 +4,8 @@
- - + +
diff --git a/src/app/page/landing-layout/raw-content-pages/not-found-page/not-found-page.component.ts b/src/app/page/landing-layout/raw-content-pages/not-found-page/not-found-page.component.ts index efd60fc2..a5808f62 100644 --- a/src/app/page/landing-layout/raw-content-pages/not-found-page/not-found-page.component.ts +++ b/src/app/page/landing-layout/raw-content-pages/not-found-page/not-found-page.component.ts @@ -16,9 +16,9 @@ export class NotFoundPageComponent { INFORMATION_TYPES = INFORMATION_TYPES; appHeroContents = [ - {text: $localize `:@@notFound.appHero.1:404 Page not found`, level: 1}, - {text: $localize `:@@notFound.appHero.2:Something went wrong!`} - ] + { text: $localize`:@@notFound.appHero.1:404 Page not found`, level: 1 }, + { text: $localize`:@@notFound.appHero.2:Something went wrong!` } + ]; constructor( public router: Router ) { } diff --git a/src/app/page/landing-layout/raw-content-pages/sign-up-success-page/sign-up-success-page.component.html b/src/app/page/landing-layout/raw-content-pages/sign-up-success-page/sign-up-success-page.component.html index ffa84ed1..9527cd61 100644 --- a/src/app/page/landing-layout/raw-content-pages/sign-up-success-page/sign-up-success-page.component.html +++ b/src/app/page/landing-layout/raw-content-pages/sign-up-success-page/sign-up-success-page.component.html @@ -4,7 +4,7 @@
- + [heroClass]="'no-padding'">
diff --git a/src/app/page/landing-layout/raw-content-pages/sign-up-success-page/sign-up-success-page.component.ts b/src/app/page/landing-layout/raw-content-pages/sign-up-success-page/sign-up-success-page.component.ts index 434d5275..08cb2bf7 100644 --- a/src/app/page/landing-layout/raw-content-pages/sign-up-success-page/sign-up-success-page.component.ts +++ b/src/app/page/landing-layout/raw-content-pages/sign-up-success-page/sign-up-success-page.component.ts @@ -24,9 +24,9 @@ export class SignUpSuccessPageComponent implements OnInit { if ( params.email ) { this.email = params.email; this.appHeroContents = [ - {text: $localize `:@@signUpSuccess.appHero.1:Registration successful 🎉`, level: 2}, - {text: $localize `:@@signUpSuccess.appHero.2:Verification email sent to: ` + this.email} - ] + { text: $localize`:@@signUpSuccess.appHero.1:Registration successful 🎉`, level: 2 }, + { text: $localize`:@@signUpSuccess.appHero.2:Verification email sent to: ` + this.email } + ]; } } ); } diff --git a/src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.html b/src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.html index dbcb70d3..f1c80e3c 100644 --- a/src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.html +++ b/src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.html @@ -1,24 +1,26 @@
-
- + - - + [heroClass]="'no-padding'"> + - - + [heroClass]="'no-padding'"> +
diff --git a/src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.ts b/src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.ts index 7737efbd..b46e9f96 100644 --- a/src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.ts +++ b/src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.ts @@ -25,16 +25,16 @@ export class VerifyAccountPageComponent implements OnInit, OnDestroy { BRAND = BRAND; verifyingAccountAppHeroContents = [ - {text: $localize `:@@verifyAccount.verifyAccountAppHero:Verifying account...`, level: 2} - ] + { text: $localize`:@@verifyAccount.verifyAccountAppHero:Verifying account...`, level: 2 } + ]; accountVerificationFailedAppHeroContents = [ - {text: $localize `:@@verifyAccount.accountVerificationFailedAppHero.1:Account verification failed`, level: 2}, - {text: $localize `:@@verifyAccount.accountVerificationFailedAppHero.2:Something went wrong!`} - ] + { text: $localize`:@@verifyAccount.accountVerificationFailedAppHero.1:Account verification failed`, level: 2 }, + { text: $localize`:@@verifyAccount.accountVerificationFailedAppHero.2:Something went wrong!` } + ]; accountVerifiedAppHeroContents = [ - {text: $localize `:@@verifyAccount.verifiedAppHero.1:Account verified 🎉`, level: 2}, - {text: $localize `:@@verifyAccount.verifiedAppHero.2:Please proceed with login`} - ] + { text: $localize`:@@verifyAccount.verifiedAppHero.1:Account verified 🎉`, level: 2 }, + { text: $localize`:@@verifyAccount.verifiedAppHero.2:Please proceed with login` } + ]; constructor( private route: ActivatedRoute, public router: Router, diff --git a/src/app/page/landing-layout/sitemap-page/sitemap-page.component.html b/src/app/page/landing-layout/sitemap-page/sitemap-page.component.html index 074c4a33..27cc0f00 100644 --- a/src/app/page/landing-layout/sitemap-page/sitemap-page.component.html +++ b/src/app/page/landing-layout/sitemap-page/sitemap-page.component.html @@ -1,74 +1,66 @@
- - +
-
-
-

Products

-
-
-
-

{{ productLine.name }}

-
- - {{ product.name }} - -
-
-
-
-

{{ productLine.name }}

-
- - {{ product.name }} - -

Company

- About - Customers - Enterprise - Partners - Branding - Jobs - Blog + + + {{ companyPage.name }} + + + + {{ companyPage.name }} + + +
-
-

Developers

- Docs - API - Status + + + {{ developersPage.name }} + + + + {{ developersPage.name }} + + +
+
+
+
+

Resources

- Support - Contact - Terms & Conditions - Privacy - Cookies + + + {{ resourcesPage.name }} + + + + {{ resourcesPage.name }} + + +
- +
diff --git a/src/app/page/landing-layout/sitemap-page/sitemap-page.component.scss b/src/app/page/landing-layout/sitemap-page/sitemap-page.component.scss index ad2b7ec0..632fb6d1 100644 --- a/src/app/page/landing-layout/sitemap-page/sitemap-page.component.scss +++ b/src/app/page/landing-layout/sitemap-page/sitemap-page.component.scss @@ -1,5 +1,5 @@ @use '../landing-layout.component'; -@use '../../../component/card/card.component'; +@use 'node_modules/@open-template-hub/card/styles/card/card'; @use '../../../../styles/util/util'; .form-page-layout { @@ -28,6 +28,10 @@ padding-bottom: 1px; } } + + & .link-inner-column { + width: 170px; + } } } } @@ -49,9 +53,11 @@ & p { text-align: center; + display: flex; + flex-direction: column; + justify-content: center; + min-height: 48px; } - - height: 48px; } & .link-group { @@ -59,6 +65,11 @@ & .link-item { height: 48px; + display: flex; + flex-direction: column; + justify-content: center; + align-items: flex-start; + min-height: 48px; } } } @@ -76,8 +87,7 @@ justify-content: space-evenly; & .column { - max-width: 250px; - margin: 0 20px; + width: 40%; & .title, & .link-item { margin: 0 0 20px; diff --git a/src/app/page/landing-layout/sitemap-page/sitemap-page.component.ts b/src/app/page/landing-layout/sitemap-page/sitemap-page.component.ts index 1438b690..bd570aaf 100644 --- a/src/app/page/landing-layout/sitemap-page/sitemap-page.component.ts +++ b/src/app/page/landing-layout/sitemap-page/sitemap-page.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; -import { PRODUCT_LINES, SERVICES } from 'src/app/data/product/product.data'; +import { PRODUCT_LINES } from 'src/app/data/product/product.data'; import { environmentCommon } from 'src/environments/environment-common'; +import { COMPANY_PAGES } from '../../../data/company/company.data'; +import { DEVELOPERS_PAGES } from '../../../data/developers/developers.data'; import { URLS } from '../../../data/navigation/navigation.data'; +import { RESOURCES_PAGES } from '../../../data/resources/resources.data'; import { ProductLine } from '../../../model/product/product.model'; @Component( { @@ -12,7 +15,10 @@ import { ProductLine } from '../../../model/product/product.model'; export class SitemapPageComponent { PRODUCT_LINES: ProductLine[] = PRODUCT_LINES; - SERVICES: ProductLine[] = SERVICES; + COMPANY_PAGES = COMPANY_PAGES; + DEVELOPERS_PAGES = DEVELOPERS_PAGES; + RESOURCES_PAGES = RESOURCES_PAGES; + URLS = URLS; appVersion = '1.0.0'; diff --git a/src/app/page/landing-layout/status-page/status-page.component.html b/src/app/page/landing-layout/status-page/status-page.component.html index 1c18ea1f..ecbf37cb 100644 --- a/src/app/page/landing-layout/status-page/status-page.component.html +++ b/src/app/page/landing-layout/status-page/status-page.component.html @@ -1,5 +1,4 @@
-
diff --git a/src/app/page/landing-layout/status-page/status-page.component.ts b/src/app/page/landing-layout/status-page/status-page.component.ts index 0366cdfc..e1269422 100644 --- a/src/app/page/landing-layout/status-page/status-page.component.ts +++ b/src/app/page/landing-layout/status-page/status-page.component.ts @@ -1,4 +1,3 @@ -import { HttpErrorResponse } from '@angular/common/http'; import { Component } from '@angular/core'; import { DEFAULT_SYSTEM_STATUS } from '../../../data/status/status.data'; import { MonitoringService } from '../../../service/monitoring/monitoring.service'; @@ -12,80 +11,15 @@ export class StatusPageComponent { overallSystemStatus = DEFAULT_SYSTEM_STATUS; - appHeroContent = [ - {text: $localize `:@@status.appHero:System Status`, level: 1} - ] - constructor( private monitoringService: MonitoringService ) { this.monitoringService.alive(); this.monitoringService.systemStatuses.subscribe( systemStatuses => { - if ( !systemStatuses ) { - return; - } else if ( systemStatuses instanceof HttpErrorResponse && systemStatuses.statusText === 'Unknown Error' ) { - this.overallSystemStatus = DEFAULT_SYSTEM_STATUS; - this.overallSystemStatus.checkDate = new Date(); - this.overallSystemStatus.overall = 'WARN'; - - for ( const systemStatus of this.overallSystemStatus.systemStatuses ) { - systemStatus.overall = 'WARN'; - for ( const status of systemStatus.statuses ) { - status.alive = 'WARN'; - } - } - return; - } - - this.overallSystemStatus = { - systemStatuses: [], - overall: '', - checkDate: undefined - }; - - for ( const systemStatusKey in systemStatuses ) { - if ( !systemStatuses[ systemStatusKey ] ) { - continue; - } - - const systemStatus = { - name: systemStatusKey, - overall: '', - statuses: [] - }; - - for ( const status in systemStatuses[ systemStatusKey ] ) { - if ( !systemStatuses[ systemStatusKey ][ status ] ) { - continue; - } + const overallSystemStatus = this.monitoringService.parseSystemStatuses( systemStatuses ); - let name = status[ 0 ].toUpperCase(); - - if ( status.length > 1 ) { - name += status.substring( 1 ).split( /(?=[A-Z])/ ).join( ' ' ); - } - - systemStatus.statuses.push( { - name, - alive: systemStatuses[ systemStatusKey ][ status ].alive - } ); - - if ( systemStatuses[ systemStatusKey ][ status ].alive !== 'UP' ) { - systemStatus.overall = systemStatuses[ systemStatusKey ][ status ].alive; - this.overallSystemStatus.overall = systemStatuses[ systemStatusKey ][ status ].alive; - } - } - if ( !systemStatus.overall ) { - systemStatus.overall = 'UP'; - } - - this.overallSystemStatus.systemStatuses.push( systemStatus ); + if ( overallSystemStatus ) { + this.overallSystemStatus = overallSystemStatus; } - - if ( !this.overallSystemStatus.overall ) { - this.overallSystemStatus.overall = 'UP'; - } - - this.overallSystemStatus.checkDate = new Date(); } ); } } diff --git a/src/app/page/settings-layout/edit-profile-page/edit-profile-page.component.html b/src/app/page/settings-layout/edit-profile-page/edit-profile-page.component.html new file mode 100644 index 00000000..7197e22b --- /dev/null +++ b/src/app/page/settings-layout/edit-profile-page/edit-profile-page.component.html @@ -0,0 +1,87 @@ +
+

Edit Profile

+ + + +
+
+ profile img +
+ + Edit +
+
+ +
+ + + + +
+
+ + + + +
+
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ + +
diff --git a/src/app/page/settings-layout/edit-profile-page/edit-profile-page.component.scss b/src/app/page/settings-layout/edit-profile-page/edit-profile-page.component.scss new file mode 100644 index 00000000..3408cac2 --- /dev/null +++ b/src/app/page/settings-layout/edit-profile-page/edit-profile-page.component.scss @@ -0,0 +1,85 @@ +@use '../../../../styles/util/util'; +@use 'node_modules/@open-template-hub/card/styles/card/card'; + +.edit-profile-page { + & h2 { + text-align: center; + margin-bottom: 80px; + } + + .edit-profile-card { + + & .header { + + & .profile-image-wrapper { + position: relative; + margin-top: -50px; + margin-left: auto; + margin-right: auto; + width: -webkit-fit-content; + + & .edit-photo { + @include util.default-border-radius; + + font-size: 15px; + + color: var(--lighter); + background-color: var(--card); + + position: absolute; + bottom: 6px; + right: 0; + border: 2px solid var(--shadow-lighter); + padding: 5px 8px; + } + } + } + + & .image-cropper-wrapper { + margin-left: auto; + margin-right: auto; + + & image-cropper { + + border: 2px solid var(--shadow-lighter); + + margin-left: auto; + margin-right: auto; + + max-width: 400px; + + padding: 0 + } + } + + & .body { + min-height: 265px; + padding: 10px 20px 20px; + + & .section { + margin-top: 0; + } + } + } +} + +@media only screen and (max-width: 999px) { + .edit-profile-page { + padding-top: 40px; + + & h2 { + margin-top: 20px; + } + + & .edit-profile-card { + & .header { + & .profile-image-wrapper { + & i { + top: 100px; + right: 5px; + } + } + } + } + } +} diff --git a/src/app/page/dashboard-layout/create-event-page/create-event-page.component.spec.ts b/src/app/page/settings-layout/edit-profile-page/edit-profile-page.component.spec.ts similarity index 53% rename from src/app/page/dashboard-layout/create-event-page/create-event-page.component.spec.ts rename to src/app/page/settings-layout/edit-profile-page/edit-profile-page.component.spec.ts index 28ef8d97..dbadd292 100644 --- a/src/app/page/dashboard-layout/create-event-page/create-event-page.component.spec.ts +++ b/src/app/page/settings-layout/edit-profile-page/edit-profile-page.component.spec.ts @@ -1,20 +1,20 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { CreateEventPageComponent } from './create-event-page.component'; +import { EditProfilePageComponent } from './edit-profile-page.component'; -describe( 'CreateEventPageComponent', () => { - let component: CreateEventPageComponent; - let fixture: ComponentFixture; +describe( 'EditProfilePageComponent', () => { + let component: EditProfilePageComponent; + let fixture: ComponentFixture; beforeEach( async () => { await TestBed.configureTestingModule( { - declarations: [ CreateEventPageComponent ] + declarations: [ EditProfilePageComponent ] } ) .compileComponents(); } ); beforeEach( () => { - fixture = TestBed.createComponent( CreateEventPageComponent ); + fixture = TestBed.createComponent( EditProfilePageComponent ); component = fixture.componentInstance; fixture.detectChanges(); } ); diff --git a/src/app/page/settings-layout/edit-profile-page/edit-profile-page.component.ts b/src/app/page/settings-layout/edit-profile-page/edit-profile-page.component.ts new file mode 100644 index 00000000..463f3d0f --- /dev/null +++ b/src/app/page/settings-layout/edit-profile-page/edit-profile-page.component.ts @@ -0,0 +1,212 @@ +import { Component, ElementRef, OnDestroy, OnInit, ViewChild, } from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { ActivatedRoute, Router } from '@angular/router'; +import { ImageCroppedEvent } from 'ngx-image-cropper'; +import { AuthToken } from 'src/app/model/auth/auth-token.model'; +import { URLS } from '../../../data/navigation/navigation.data'; +import { PROFILE_IMG } from '../../../data/profile/profile.data'; +import { AuthenticationService } from '../../../service/auth/authentication.service'; +import { BusinessLogicService } from '../../../service/business-logic/business-logic.service'; +import { FileStorageService } from '../../../service/file-storage/file-storage.service'; +import { InformationService } from '../../../service/information/information.service'; +import { LoadingService } from '../../../service/loading/loading.service'; +import { ToastService } from '../../../service/toast/toast.service'; + +@Component( { + selector: 'app-edit-profile-page', + templateUrl: './edit-profile-page.component.html', + styleUrls: [ './edit-profile-page.component.scss' ], +} ) +export class EditProfilePageComponent implements OnInit, OnDestroy { + currentUser: AuthToken; + userInfoForm: FormGroup; + submitted = false; + loading = false; + userInfo: any = {}; + profileImg = PROFILE_IMG; + candidateProfileImg = undefined; + + imageChangedEvent: any = ''; + + URLS = URLS; + icon: any = undefined; + + @ViewChild( 'searchArea' ) searchArea: ElementRef; + + appHeroContent = [ { text: 'Edit Profile', level: 3 } ]; + + constructor( + private formBuilder: FormBuilder, + private router: Router, + private route: ActivatedRoute, + private authenticationService: AuthenticationService, + public businessLogicService: BusinessLogicService, + private fileStorageService: FileStorageService, + private loadingService: LoadingService, + private informationService: InformationService, + private toastService: ToastService + ) { + this.loadingService.sharedLoading.subscribe( + ( loading ) => ( this.loading = loading ) + ); + this.authenticationService.currentUser.subscribe( + ( currentUser ) => ( this.currentUser = currentUser ) + ); + + this.businessLogicService.userInfo.subscribe( ( userInfo ) => { + this.userInfo = userInfo; + } ); + + this.fileStorageService.sharedProfileImage.subscribe( ( profileImg ) => { + if ( profileImg?.file?.url ) { + this.profileImg = profileImg.file.url; + } else if ( profileImg?.file?.data ) { + this.profileImg = 'data:image/png;base64,' + profileImg.file.data; + } + } ); + } + + get f() { + return this.userInfoForm.controls; + } + + ngOnInit() { + this.userInfoForm = this.formBuilder.group( { + firstName: [ + this.businessLogicService.userInfoValue?.payload?.firstName, + Validators.required, + ], + lastName: [ + this.businessLogicService.userInfoValue?.payload?.lastName, + Validators.required, + ], + bio: [ + this.businessLogicService.userInfoValue?.payload?.bio, + Validators.maxLength( 500 ), + ], + location: [ this.businessLogicService.userInfoValue?.payload?.location ], + phone: [ + this.businessLogicService.userInfoValue?.payload?.phone, + Validators.pattern( '[+]?[0-9]+' ), + ], + website: [ this.businessLogicService.userInfoValue?.payload?.website ], + twitter: [ + this.businessLogicService.userInfoValue?.payload?.social?.twitter, + ], + linkedin: [ + this.businessLogicService.userInfoValue?.payload?.social?.linkedin, + ], + github: [ + this.businessLogicService.userInfoValue?.payload?.social?.github, + ], + } ); + } + + onSubmit() { + if ( this.loading ) { + return; + } + + this.submitted = true; + + // stop here if form is invalid + if ( this.userInfoForm.invalid ) { + if ( + this.f.twitter.invalid || + this.f.linkedin.invalid || + this.f.github.invalid + ) { + this.toastService.error( 'Please provide a valid username.', '' ); + } + if ( this.f.phone.invalid ) { + this.toastService.error( 'Please provide a valid phone number.', '' ); + } + if ( this.f.lastName.invalid ) { + this.toastService.error( 'Please provide a last name.', '' ); + } + if ( this.f.firstName.invalid ) { + this.toastService.error( 'Please provide a first name.', '' ); + } + return; + } + + if ( this.candidateProfileImg ) { + this.fileStorageService + .createFile( + this.candidateProfileImg, + this.userInfo.username + '/profile_img', + 'profile image', + 'image/png' + ) + .subscribe( ( response ) => { + this.fileStorageService.setProfileImageFileData( + this.candidateProfileImg + ); + this.updateMyInfo( response.id ); + } ); + } else { + this.updateMyInfo( + this.businessLogicService.userInfoValue?.payload?.profileImageId + ); + } + } + + ngOnDestroy() { + this.informationService.clearInformation(); + } + + fileChangeEvent( event: any ): void { + this.imageChangedEvent = event; + } + + imageCropped( event: ImageCroppedEvent ) { + this.candidateProfileImg = event.base64; + } + + imageLoaded() { + // show cropper + } + + cropperReady() { + // cropper ready + } + + loadImageFailed() { + // show message + } + + fixUrl( url: string, input: any ): any { + if ( !input ) { + return input; + } + if ( input.startsWith( 'www' ) ) { + input = url.slice( 0, 8 ) + input; + } else if ( !input.includes( url ) ) { + input = url + input; + } + return input; + } + + private updateMyInfo( profileImageId ) { + const payload = { + firstName: this.f.firstName.value, + lastName: this.f.lastName.value, + bio: this.f.bio.value, + location: this.f.location.value, + phone: this.f.phone.value, + website: this.f.website.value, + social: { + twitter: this.f.twitter.value, + linkedin: this.f.linkedin.value, + github: this.f.github.value, + }, + profileImageId, + }; + + this.businessLogicService.updateMyInfo( payload ).subscribe( () => { + this.businessLogicService.me().subscribe( () => { + this.router.navigate( [ URLS.dashboard.root ] ); + } ); + } ); + } +} diff --git a/src/app/page/settings-layout/edit-security/edit-security.component.html b/src/app/page/settings-layout/edit-security/edit-security.component.html new file mode 100644 index 00000000..923746b0 --- /dev/null +++ b/src/app/page/settings-layout/edit-security/edit-security.component.html @@ -0,0 +1,60 @@ +
+ +
+ + + +
+

Two Factor Authentication

+
+ + + + +
+
+
+ + +
+
+ + + + +
+
+

{{ submittedPhoneNumber }}

+ +
+
+ +
+ + + +
+
+ + +
+ +
+ + +
+
+ diff --git a/src/app/page/settings-layout/edit-security/edit-security.component.scss b/src/app/page/settings-layout/edit-security/edit-security.component.scss new file mode 100644 index 00000000..079e34e0 --- /dev/null +++ b/src/app/page/settings-layout/edit-security/edit-security.component.scss @@ -0,0 +1,80 @@ +@use '../../../../styles/util/util'; +@use 'node_modules/@open-template-hub/card/styles/card/card'; + +.edit-security-page { + & .two-factor-auth-wrapper { + @include util.margin-x-auto; + @include util.flex-center-center; + + & .edit-two-factor-auth-card { + + & .header { + @include util.flex-layout-column; + @include util.flex-center-space-evenly; + + text-align: left; + padding: 1em 1em 0; + + & i { + color: var(--theme-color); + } + + & h3 { + color: var(--lighter); + font-weight: 600; + font-size: 19px; + margin-top: 10px; + padding-bottom: 10px; + border-bottom: 2px solid var(--theme-color-lighter-4); + text-align: center; + width: 100%; + } + } + + & .body { + padding: 40px 20px 20px; + + & .section { + margin-top: 0; + + & .verified-phone-number-wrapper { + width: -webkit-fit-content; + margin-left: auto; + margin-right: auto; + } + } + } + } + } + + & .analytics-event-wrapper { + margin-top: 50px; + } +} + +@media only screen and (max-width: 999px) { + .edit-security-page { + padding-top: 40px; + + & .two-factor-auth-wrapper { + @include util.flex-layout-column; + + & > * { + width: 100%; + } + } + } +} + +@media only screen and (min-width: 1000px) { + .edit-security-page { + + & .two-factor-auth-wrapper { + @include util.flex-layout-row; + + & > * { + width: 500px; + } + } + } +} diff --git a/src/app/component/calendar/calendar.component.spec.ts b/src/app/page/settings-layout/edit-security/edit-security.component.spec.ts similarity index 53% rename from src/app/component/calendar/calendar.component.spec.ts rename to src/app/page/settings-layout/edit-security/edit-security.component.spec.ts index 6f544ebd..7658a5b5 100644 --- a/src/app/component/calendar/calendar.component.spec.ts +++ b/src/app/page/settings-layout/edit-security/edit-security.component.spec.ts @@ -1,20 +1,20 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { CalendarComponent } from './calendar.component'; +import { EditSecurityComponent } from './edit-security.component'; -describe( 'CalendarComponent', () => { - let component: CalendarComponent; - let fixture: ComponentFixture; +describe( 'EditSecurityComponent', () => { + let component: EditSecurityComponent; + let fixture: ComponentFixture; beforeEach( async () => { await TestBed.configureTestingModule( { - declarations: [ CalendarComponent ] + declarations: [ EditSecurityComponent ] } ) .compileComponents(); } ); beforeEach( () => { - fixture = TestBed.createComponent( CalendarComponent ); + fixture = TestBed.createComponent( EditSecurityComponent ); component = fixture.componentInstance; fixture.detectChanges(); } ); diff --git a/src/app/page/settings-layout/edit-security/edit-security.component.ts b/src/app/page/settings-layout/edit-security/edit-security.component.ts new file mode 100644 index 00000000..17cca834 --- /dev/null +++ b/src/app/page/settings-layout/edit-security/edit-security.component.ts @@ -0,0 +1,162 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { FormBuilder, FormGroup } from '@angular/forms'; +import { Router } from '@angular/router'; +import { URLS } from 'src/app/data/navigation/navigation.data'; +import { AnalyticsService } from 'src/app/service/analytics/analytics.service'; +import { AuthenticationService } from 'src/app/service/auth/authentication.service'; +import { ToastService } from 'src/app/service/toast/toast.service'; +import { TwoFactorCodeService } from 'src/app/service/two-factor-code/two-factor-code.service'; +import { INFORMATION_TYPES } from '../../../data/information/information.data'; + +@Component( { + selector: 'app-edit-security', + templateUrl: './edit-security.component.html', + styleUrls: [ './edit-security.component.scss' ] +} ) +export class EditSecurityComponent implements OnInit, OnDestroy { + + form: FormGroup; + submitted = false; + loading = false; + + totalTime; + timePassed = 0; + timeLeft; + timerInterval = null; + + expiry; + + twoFactorVerificationState: 'request' | 'verify' | 'verified' | 'expired'; + + INFORMATION_TYPES = INFORMATION_TYPES; + + submittedPhoneNumber: string; + + maskedPhoneNumberOptions = { + beginningLengthThreshold: 3, + lastLengthThreshold: 2 + }; + + events: any[] = []; + + skip = 0; + + constructor( + private fromBuilder: FormBuilder, + private toastService: ToastService, + private twoFactorCodeService: TwoFactorCodeService, + private analyticsService: AnalyticsService, + private authenticationService: AuthenticationService, + private router: Router + ) { + } + + ngOnInit(): void { + this.form = this.fromBuilder.group( { + phoneNumber: [ '' ], + verificationCode: [ '' ] + } ); + + this.authenticationService.getSubmittedPhoneNumber().subscribe( response => { + if ( response.phoneNumber ) { + this.submittedPhoneNumber = response.phoneNumber; + this.twoFactorVerificationState = 'verified'; + } else { + this.twoFactorVerificationState = 'request'; + } + } ); + } + + ngOnDestroy(): void { + clearInterval( this.timerInterval ); + } + + startTimer() { + this.timerInterval = setInterval( () => { + this.timePassed += 1; + this.timeLeft = this.totalTime - this.timePassed; + + if ( this.timeLeft === 0 ) { + clearInterval( this.timerInterval ); + this.toastService.error( 'Time has expired' ); + this.twoFactorVerificationState = 'expired'; + } + }, 1000 ); + } + + onPhoneNumberSubmit() { + if ( this.loading ) { + return; + } + + this.submitted = true; + + const phoneNumberErrorMessage = 'Please provide a valid phone number'; + + if ( this.form.controls.phoneNumber.value === '' ) { // TODO: add regex phone number control + if ( this.form.controls.phoneNumber.invalid ) { + this.toastService.error( phoneNumberErrorMessage ); + } + return; + } + + if ( this.twoFactorVerificationState === 'request' ) { + this.submitPhoneNumber(); + } else if ( this.twoFactorVerificationState === 'verify' ) { + this.verifyPhoneNumber(); + } + } + + submitPhoneNumber() { + this.twoFactorCodeService.submitPhoneNumber( + this.form.controls.phoneNumber.value + ).subscribe( + ( response ) => { + this.totalTime = undefined; + this.timePassed = 0; + this.timeLeft = undefined; + + this.formatAndSetTime( response.expire ); + this.form.controls.phoneNumber.disable(); + this.twoFactorVerificationState = 'verify'; + this.startTimer(); + this.toastService.success( 'Code sent to your phone number' ); + } + ); + } + + retry() { + this.submitPhoneNumber(); + } + + formatAndSetTime( expiry: string ) { + const expireDate = new Date( +expiry ); + const currentDate = new Date(); + + const diff = Math.floor( ( expireDate.getTime() - currentDate.getTime() ) / 1000 ); + this.totalTime = diff; + this.timeLeft = diff; + } + + verifyPhoneNumber() { + this.twoFactorCodeService.verify( + this.form.controls.verificationCode.value, + true + ).subscribe( + () => { + this.analyticsService.logSubmitPhoneNumberEvent().subscribe(); + this.twoFactorVerificationState = 'verified'; + this.toastService.success( 'Phone number verified' ); + this.router.navigate( [ URLS.dashboard.root ] ); + } + ); + } + + deleteSubmittedPhoneNumber() { + this.authenticationService.deleteSubmittedPhoneNumber().subscribe( () => { + this.submittedPhoneNumber = undefined; + this.twoFactorVerificationState = 'request'; + this.toastService.success( 'Submitted phone number removed' ); + } ); + } +} diff --git a/src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html b/src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html index eabe74f4..ce6c8f2c 100644 --- a/src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html +++ b/src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html @@ -1,51 +1,50 @@ -
- +
-

Dark/Light Mode

+

Dark/Light Mode

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

Color

+

Color

- - +
-

Design

+

Design

- - +
-

Default

+

Default

- - +
- +
diff --git a/src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.scss b/src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.scss index f33c019c..d506f67c 100644 --- a/src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.scss +++ b/src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.scss @@ -1,5 +1,5 @@ @use '../settings-layout.component'; -@use '../../../component/card/card.component'; +@use 'node_modules/@open-template-hub/card/styles/card/card'; .settings-form-wrapper { diff --git a/src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.ts b/src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.ts index 1eb49a14..389dd631 100644 --- a/src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.ts +++ b/src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.ts @@ -1,5 +1,10 @@ import { Component } from '@angular/core'; -import { DarkLightSettings, DEFAULT_THEME, ThemeColorSettings, ThemeDesignSettings } from '../../../data/theme/theme.data'; +import { + DarkLightSettings, + DEFAULT_THEME, + ThemeColorSettings, + ThemeDesignSettings +} from '../../../data/theme/theme.data'; import { ThemeService } from '../../../service/theme/theme.service'; @Component( { diff --git a/src/app/page/settings-layout/settings-layout.component.html b/src/app/page/settings-layout/settings-layout.component.html index 03297447..c1055269 100644 --- a/src/app/page/settings-layout/settings-layout.component.html +++ b/src/app/page/settings-layout/settings-layout.component.html @@ -11,5 +11,5 @@
- +
diff --git a/src/app/page/settings-layout/settings-layout.component.scss b/src/app/page/settings-layout/settings-layout.component.scss index d6ebe2f0..2c76d4f9 100644 --- a/src/app/page/settings-layout/settings-layout.component.scss +++ b/src/app/page/settings-layout/settings-layout.component.scss @@ -1,5 +1,9 @@ @use '../../../styles/page/page'; +.page-content { + padding: 0 2rem 2em; +} + @media only screen and (max-width: 999px) { .page { margin-top: 55px; @@ -25,6 +29,8 @@ .page { margin-top: 0; + padding-top: 100px; + min-height: calc(100vh - 480px); & .page-content { padding: 0 2rem 2em; diff --git a/src/app/page/splash-layout/callback-page/callback-page.component.scss b/src/app/page/splash-layout/callback-page/callback-page.component.scss index 31751a94..fc1454e2 100644 --- a/src/app/page/splash-layout/callback-page/callback-page.component.scss +++ b/src/app/page/splash-layout/callback-page/callback-page.component.scss @@ -36,8 +36,6 @@ left: -34px; } -// Social - .twitter.splash-loading-bar { --social: var(--twitter); } @@ -66,7 +64,7 @@ --social: var(--dribbble); } -.reddit-alien.splash-loading-bar { +.reddit.splash-loading-bar { --social: var(--reddit); } @@ -74,10 +72,6 @@ --social: var(--pinterest); } -.yandex.splash-loading-bar { - --social: var(--yandex); -} - .github.splash-loading-bar { --social: var(--github); } diff --git a/src/app/page/splash-layout/callback-page/callback-page.component.ts b/src/app/page/splash-layout/callback-page/callback-page.component.ts index 176dc906..9a63da8d 100644 --- a/src/app/page/splash-layout/callback-page/callback-page.component.ts +++ b/src/app/page/splash-layout/callback-page/callback-page.component.ts @@ -3,17 +3,19 @@ import { ActivatedRoute, Router } from '@angular/router'; import { first } from 'rxjs/operators'; import { BRAND } from '../../../data/brand/brand.data'; import { URLS } from '../../../data/navigation/navigation.data'; +import { AnalyticsService } from '../../../service/analytics/analytics.service'; import { AuthenticationService } from '../../../service/auth/authentication.service'; +import { BusinessLogicService } from '../../../service/business-logic/business-logic.service'; import { InformationService } from '../../../service/information/information.service'; import { PaymentService } from '../../../service/payment/payment.service'; +import { ProductService } from '../../../service/product/product.service'; @Component( { selector: 'app-callback-page', templateUrl: './callback-page.component.html', - styleUrls: [ './callback-page.component.scss' ] + styleUrls: [ './callback-page.component.scss' ], } ) export class CallbackPageComponent implements OnInit { - oauth: any; payment: any; @@ -29,7 +31,10 @@ export class CallbackPageComponent implements OnInit { private router: Router, private authenticationService: AuthenticationService, private informationService: InformationService, - private paymentService: PaymentService + private paymentService: PaymentService, + private productService: ProductService, + private businessLogicService: BusinessLogicService, + private analyticsService: AnalyticsService ) { // Intentionally blank } @@ -41,7 +46,8 @@ export class CallbackPageComponent implements OnInit { if ( this.payment ) { const status = this.route.snapshot.queryParamMap.get( 'status' ); const eventId = this.route.snapshot.queryParamMap.get( 'id' ); - const transactionId = this.route.snapshot.queryParamMap.get( 'transaction_id' ); + const transactionId = + this.route.snapshot.queryParamMap.get( 'transaction_id' ); this.paymentCallback( this.payment, status, eventId, transactionId ); this.website = this.payment; } else { @@ -50,17 +56,41 @@ export class CallbackPageComponent implements OnInit { } } - private paymentCallback( paymentConfig: string, status: string, eventId: string, transactionId: string ) { + private paymentCallback( + paymentConfig: string, + status: string, + eventId: string, + transactionId: string + ) { if ( status === 'success' ) { - this.paymentService.verify( paymentConfig, transactionId, eventId ).subscribe( response => { - this.informationService.setInformation( $localize `:@@callback.information.success:Payment succeeded`, 'success' ); - this.router.navigate( [ URLS.dashboard.event ], { queryParams: { event_id: eventId } } ); - }, error => { - this.router.navigate( [ URLS.dashboard.learn ] ); - } ); + this.paymentService + .verify( paymentConfig, transactionId, eventId ) + .subscribe( + () => { + this.analyticsService.logPaymentEvent( this.payment ).subscribe(); + + this.informationService.setInformation( + $localize`:@@callback.information.success:Payment succeeded`, + 'success' + ); + this.router.navigate( [ URLS.dashboard.root ] ); + + this.productService.checkProduct(); + }, + () => { + this.informationService.setInformation( + $localize`:@@callback.information.canceled:Payment canceled`, + 'error' + ); + this.router.navigate( [ URLS.dashboard.root ] ); + } + ); } else { - this.informationService.setInformation( `:@@callback.information.canceled:Payment canceled`, 'error' ); - this.router.navigate( [ URLS.dashboard.event ], { queryParams: { event_id: eventId } } ); + this.informationService.setInformation( + $localize`:@@callback.information.canceled:Payment canceled`, + 'error' + ); + this.router.navigate( [ URLS.dashboard.root ] ); } } @@ -69,7 +99,7 @@ export class CallbackPageComponent implements OnInit { code: undefined, state: undefined, oauth_token: undefined, - oauth_verifier: undefined + oauth_verifier: undefined, }; if ( this.oauth.callbackParams.includes( 'code' ) ) { @@ -93,7 +123,8 @@ export class CallbackPageComponent implements OnInit { this.error = 'Please try again later'; return; } - callbackParams.oauth_token = this.route.snapshot.queryParamMap.get( 'oauth_token' ); + callbackParams.oauth_token = + this.route.snapshot.queryParamMap.get( 'oauth_token' ); } if ( this.oauth.callbackParams.includes( 'oauth_verifier' ) ) { @@ -101,21 +132,38 @@ export class CallbackPageComponent implements OnInit { this.error = 'Please try again later'; return; } - callbackParams.oauth_verifier = this.route.snapshot.queryParamMap.get( 'oauth_verifier' ); + callbackParams.oauth_verifier = + this.route.snapshot.queryParamMap.get( 'oauth_verifier' ); } - this.authenticationService.socialLogin( this.oauth.tag, callbackParams ) + this.authenticationService + .socialLogin( this.oauth.tag, callbackParams ) .pipe( first() ) .subscribe( - () => { - this.router.navigate( [ URLS.dashboard.root ] ); + ( response ) => { + if ( response.preAuthToken ) { + this.authenticationService.setPreAuthToken( response ); + this.router.navigate( [ URLS.twoFactorVerification ], { + queryParams: { + oauthName: this.oauth.name, + oauthLogo: this.oauth.logo + } + } ); + } else { + this.businessLogicService.me() + .subscribe( () => { + this.analyticsService.logLoginEvent( this.oauth ).subscribe(); + } ); + this.router.navigate( [ URLS.dashboard.root ] ); + } }, - errorResponse => { + ( errorResponse ) => { if ( typeof errorResponse.error === 'string' ) { this.error = errorResponse.error; } else if ( errorResponse.statusText ) { this.error = errorResponse.statusText; } - } ); + } + ); } } diff --git a/src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.html b/src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.html index 09b4f4f8..69f436ec 100644 --- a/src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.html +++ b/src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.html @@ -21,7 +21,7 @@

- - + +
diff --git a/src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.scss b/src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.scss index 37e7ce57..fe36c96b 100644 --- a/src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.scss +++ b/src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.scss @@ -1,8 +1,9 @@ @use '../splash-layout.component'; .external-component-button-wrapper { - & app-brand-button { + & oth-button { margin-right: 10px; + margin-left: 10px; } } diff --git a/src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.ts b/src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.ts index 3267530c..fe0902bc 100644 --- a/src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.ts +++ b/src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.ts @@ -62,8 +62,8 @@ export class ExternalRedirectPageComponent { window.location.href = this.href; } - getRedirectText(error: boolean): string { - return !error ? $localize `:@@externalRedirect.redirected:Will be redirected to: ` - : $localize `:@@externalRedirect.linkBroken:Looks like the link is broken: ` + getRedirectText( error: boolean ): string { + return !error ? $localize`:@@externalRedirect.redirected:Will be redirected to: ` + : $localize`:@@externalRedirect.linkBroken:Looks like the link is broken: `; } } diff --git a/src/app/service/analytics/analytics.service.ts b/src/app/service/analytics/analytics.service.ts index f1668400..d9c8a04c 100644 --- a/src/app/service/analytics/analytics.service.ts +++ b/src/app/service/analytics/analytics.service.ts @@ -1,22 +1,168 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; +import mixpanel from 'mixpanel-browser'; import { environment } from '../../../environments/environment'; -import { LoadingService } from '../loading/loading.service'; +import { BrowserLocaleService } from '../browser-locale/browser-locale.service'; @Injectable( { providedIn: 'root', } ) export class AnalyticsService { + + mixpanelEnabled = false; + + configs = { + sideContentLimit: 12, + editSecurityLimit: 12 + }; + constructor( private http: HttpClient, - private loadingService: LoadingService + private browserLocaleService: BrowserLocaleService ) { + if ( environment.analytics.mixPanel.tag ) { + mixpanel.init( environment.analytics.mixPanel.tag ); + this.mixpanelEnabled = true; + } + } + + logLoginEvent( oauth?: any ) { + if ( oauth ) { + return this.logSocialLoginEvent( oauth.name, oauth.logo ); + } else { + const data = { + payload: { + icon: './assets/common/profile-img.png' + }, + category: 'LOGIN', + source: environment.clientUrl + }; + + this.logEvent( 'Login', data ); + + return this.http.post( `${ environment.serverUrl }/analytics/event`, data ); + } + } + + logLogoutEvent() { + const data = { + payload: { + icon: './assets/common/profile-img.png' + }, + category: 'LOGOUT', + source: environment.clientUrl + }; + + this.logEvent( 'Logout', data ); + + return this.http.post( `${ environment.serverUrl }/analytics/event`, data ); } - logRegisteredUser( userData: any ) { - return this.http.post( `${ environment.serverUrl }/analytics/event`, { - name: 'USER_REGISTERED', - payload: userData, - } ); + logPaymentEvent( payment: any ) { + const data = { + payload: { + provider: payment.name, + icon: payment.logo + }, + category: 'PAYMENT', + source: environment.clientUrl + }; + + this.logEvent( 'Payment', data ); + + return this.http.post( `${ environment.serverUrl }/analytics/event`, data ); + } + + logSubmitPhoneNumberEvent() { + const data = { + category: 'TWO_FACTOR_AUTH', + source: environment.clientUrl + }; + + this.logEvent( 'Submit Phone Number', data ); + + return this.http.post( `${ environment.serverUrl }/analytics/event`, data ); + } + + getEvents( category: string | undefined, start: number | undefined, end: number | undefined, skip: number, limit: number ) { + let queryParams = `skip=${ skip }&limit=${ limit }`; + + if ( category ) { + queryParams += `&category=${ category }`; + } + + if ( start ) { + queryParams += `&start=${ start }`; + } + + if ( end ) { + queryParams += `&end=${ end }`; + } + + return this.http.get( `${ environment.serverUrl }/analytics/event?${ queryParams }` ); + } + + getCategories() { + const language = this.browserLocaleService.getBrowserLocale(); + return this.http.get( `${ environment.serverUrl }/analytics/event/categories?language=${ language }` ); + } + + convertCategoriesToMappedObject( categoriesResponse: any ): any { + const categories: any = {}; + for ( const category of categoriesResponse ) { + if ( category.messages.length > 0 ) { + categories[ category.key ] = category.messages[ 0 ].text; + } + } + return categories; + } + + identifyUser( userInfo: any ) { + if ( this.mixpanelEnabled && userInfo?.username ) { + mixpanel.identify( userInfo?.username ); + mixpanel.people.set( { + $first_name: userInfo?.payload?.firstName, + $last_name: userInfo?.payload?.lastName, + $created: Date.now(), + $email: userInfo?.email + } ); + } + } + + logEvent( event: string, attributes: any ) { + if ( this.mixpanelEnabled ) { + mixpanel.track( event, attributes ); + } else { + console.log( 'Event: ', event, attributes ); + } + } + + logout() { + this.logLogoutEvent(); + if ( this.mixpanelEnabled ) { + mixpanel.reset(); + } + } + + private logSocialLoginEvent( provider: string, icon: string ) { + + const data: any = { + category: 'SOCIAL_LOGIN', + source: environment.clientUrl + }; + + data.payload = {}; + + if ( provider ) { + data.payload.provider = provider; + } + + if ( icon ) { + data.payload.icon = icon; + } + + this.logEvent( 'Social Login', data ); + + return this.http.post( `${ environment.serverUrl }/analytics/event`, data ); } } diff --git a/src/app/service/auth/authentication.service.ts b/src/app/service/auth/authentication.service.ts index 3d0c1617..475a54c1 100644 --- a/src/app/service/auth/authentication.service.ts +++ b/src/app/service/auth/authentication.service.ts @@ -5,96 +5,151 @@ import { map } from 'rxjs/operators'; import { environment } from '../../../environments/environment'; import { DarkLightSettings, DEFAULT_THEME } from '../../data/theme/theme.data'; import { AuthToken } from '../../model/auth/auth-token.model'; -import { BusinessLogicService } from '../business-logic/business-logic.service'; -import { EventService } from '../event/event.service'; -import { FileStorageService } from '../file-storage/file-storage.service'; +import { AnalyticsService } from '../analytics/analytics.service'; +import { BrowserLocaleService } from '../browser-locale/browser-locale.service'; +import { SocketService } from '../socket/socket.service'; import { ThemeService } from '../theme/theme.service'; @Injectable( { - providedIn: 'root' + providedIn: 'root', } ) export class AuthenticationService { - public currentUser: Observable; + public preAuthToken: Observable; private currentUserSubject: BehaviorSubject; + private preAuthTokenSubject: BehaviorSubject; - constructor( private http: HttpClient, + constructor( + private http: HttpClient, private themeService: ThemeService, - private businessLogicService: BusinessLogicService, - private eventService: EventService, - private fileStorageService: FileStorageService + private socketService: SocketService, + private browserLocaleService: BrowserLocaleService, + private analyticsService: AnalyticsService ) { - const currentUserStorageItem = localStorage.getItem( 'currentUser' ) ? localStorage.getItem( 'currentUser' ) : sessionStorage.getItem( 'currentUser' ); - this.currentUserSubject = new BehaviorSubject( JSON.parse( currentUserStorageItem ) ); + const currentUserStorageItem = localStorage.getItem( 'currentUser' ) + ? localStorage.getItem( 'currentUser' ) + : sessionStorage.getItem( 'currentUser' ); + this.currentUserSubject = new BehaviorSubject( + JSON.parse( currentUserStorageItem ) + ); this.currentUser = this.currentUserSubject.asObservable(); + + const currentPreAuthTokenStorageItem = localStorage.getItem( 'preAuthToken' ) + ? localStorage.getItem( 'preAuthToken' ) + : sessionStorage.getItem( 'preAuthToken' ); + this.preAuthTokenSubject = new BehaviorSubject( + JSON.parse( currentPreAuthTokenStorageItem ) + ); + this.preAuthToken = this.preAuthTokenSubject.asObservable(); } public get currentUserValue(): AuthToken { return this.currentUserSubject.value; } + public get preAuthTokenValue(): any { + return this.preAuthTokenSubject.value; + } + signUp( username: string, email: string, password: string ) { - return this.http.post( `${ environment.serverUrl }/auth/signup`, { username, email, password } ); + const languageCode = this.browserLocaleService.getBrowserLocale(); + return this.http.post( `${ environment.serverUrl }/auth/signup`, { + username, + email, + password, + languageCode, + } ); } login( username: string, password: string, rememberMe: boolean ) { - return this.http.post( `${ environment.serverUrl }/auth/login`, { username, password } ) - .pipe( map( currentUser => { - if ( rememberMe ) { - localStorage.setItem( 'currentUser', JSON.stringify( currentUser ) ); - } else { - sessionStorage.setItem( 'currentUser', JSON.stringify( currentUser ) ); - } - this.currentUserSubject.next( currentUser ); + return this.http + .post( `${ environment.serverUrl }/auth/login`, { username, password } ) + .pipe( + map( ( response ) => { + if ( !response.preAuthToken ) { + this.setLoginParams( response, rememberMe ); + } + + return response; + } ) + ); + } - this.themeService.setDarkLightSetting( DarkLightSettings.auto ); - this.themeService.setThemeColorSetting( DEFAULT_THEME ); - this.themeService.setThemeDesignSetting( DEFAULT_THEME ); - this.themeService.initSideNavClosed( false ); + setLoginParams( currentUser: any, rememberMe: boolean = false ) { + if ( rememberMe ) { + localStorage.setItem( 'currentUser', JSON.stringify( currentUser ) ); + } else { + sessionStorage.setItem( 'currentUser', JSON.stringify( currentUser ) ); + } + this.currentUserSubject.next( currentUser ); + + this.themeService.setDarkLightSetting( DarkLightSettings.auto ); + this.themeService.setThemeColorSetting( DEFAULT_THEME ); + this.themeService.setThemeDesignSetting( DEFAULT_THEME ); + this.themeService.initSideNavClosed( false ); + } - return currentUser; - } ) ); + setPreAuthToken( preAuthToken: any ) { + localStorage.setItem( 'preAuthToken', JSON.stringify( preAuthToken ) ); + this.preAuthTokenSubject.next( preAuthToken ); } verify( token: string ) { - return this.http.get( `${ environment.serverUrl }/auth/verify`, { params: { token } } ); + return this.http.get( `${ environment.serverUrl }/auth/verify`, { + params: { token }, + } ); } resetPassword( username: string, token: string, password: string ) { - return this.http.post( `${ environment.serverUrl }/auth/reset-password`, { username, token, password } ); + return this.http.post( `${ environment.serverUrl }/auth/reset-password`, { + username, + token, + password, + } ); } forgetPassword( username: any ) { - return this.http.post( `${ environment.serverUrl }/auth/forget-password`, { username } ); + const languageCode = this.browserLocaleService.getBrowserLocale(); + return this.http.post( + `${ environment.serverUrl }/auth/forget-password`, + { username, languageCode } + ); } refreshToken( token: string ) { - return this.http.post( `${ environment.serverUrl }/auth/token`, { token } ) - .pipe( map( currentUser => { - if ( localStorage.getItem( 'currentUser' ) ) { - localStorage.setItem( 'currentUser', JSON.stringify( currentUser ) ); - } else { - sessionStorage.setItem( 'currentUser', JSON.stringify( currentUser ) ); - } - this.currentUserSubject.next( currentUser ); - - return currentUser; - } ) ); + return this.http + .post( `${ environment.serverUrl }/auth/token`, { token } ) + .pipe( + map( ( currentUser ) => { + if ( localStorage.getItem( 'currentUser' ) ) { + localStorage.setItem( 'currentUser', JSON.stringify( currentUser ) ); + } else { + sessionStorage.setItem( 'currentUser', JSON.stringify( currentUser ) ); + } + this.currentUserSubject.next( currentUser ); + + return currentUser; + } ) + ); } addAuthorizationHeader( request: HttpRequest ) { const currentUser = this.currentUserSubject.value; + if ( currentUser && currentUser.accessToken ) { + + this.socketService.connectToSocket( currentUser.accessToken ); + request = request.clone( { setHeaders: { - Authorization: `Bearer ${ currentUser.accessToken }` - } + Authorization: `Bearer ${ currentUser.accessToken }`, + }, } ); } else { request = request.clone( { setHeaders: { - Authorization: 'Bearer ' - } + Authorization: 'Bearer ', + }, } ); } return request; @@ -108,10 +163,16 @@ export class AuthenticationService { localStorage.setItem( 'loginSessionID', state ); } - return this.http.post( `${ environment.serverUrl }/social/login-url`, { key: oauth.tag, state } ); + return this.http.post( `${ environment.serverUrl }/social/login-url`, { + key: oauth.tag, + state, + } ); } - socialLogin( key: string, params: { code?, state?, oauth_token?, oauth_verifier? } ) { + socialLogin( + key: string, + params: { code?; state?; oauth_token?; oauth_verifier? } + ) { if ( params.state ) { if ( localStorage.getItem( 'loginSessionID' ) !== params.state ) { console.error( 'session id mismatch!' ); @@ -121,30 +182,30 @@ export class AuthenticationService { } } - return this.http.post( `${ environment.serverUrl }/social/login`, - { - key, - code: params.code, - state: params.state, - oauth_token: params.oauth_token, - oauth_verifier: params.oauth_verifier - } - ).pipe( map( currentUser => { - localStorage.setItem( 'currentUser', JSON.stringify( currentUser ) ); - this.currentUserSubject.next( currentUser ); - - this.themeService.setDarkLightSetting( DarkLightSettings.auto ); - this.themeService.setThemeColorSetting( DEFAULT_THEME ); - this.themeService.setThemeDesignSetting( DEFAULT_THEME ); - this.themeService.initSideNavClosed( false ); - - return currentUser; - } ) ); + return this.http + .post( `${ environment.serverUrl }/social/login`, { + key, + code: params.code, + state: params.state, + oauth_token: params.oauth_token, + oauth_verifier: params.oauth_verifier, + } ) + .pipe( + map( ( currentUser ) => { + if ( !currentUser.preAuthToken ) { + this.setLoginParams( currentUser, true ); + } + + return currentUser; + } ) + ); } // https://stackoverflow.com/questions/48853678/what-happens-if-we-does-not-subscribe-to-httpclient-request-which-return-observa logout() { this.themeService.logout(); + this.socketService.logout(); + this.analyticsService.logout(); const refreshToken = this.currentUserValue.refreshToken; @@ -152,19 +213,34 @@ export class AuthenticationService { sessionStorage.clear(); this.currentUserSubject.next( null ); - this.currentUser.subscribe( () => { - this.businessLogicService.logout(); - this.eventService.logout(); - this.businessLogicService.userInfo.subscribe( () => { - this.fileStorageService.logout(); - } ); - } ); - - return this.http.post( `${ environment.serverUrl }/auth/logout`, { token: refreshToken } ).subscribe(); + return this.http + .post( `${ environment.serverUrl }/auth/logout`, { + token: refreshToken, + } ) + .subscribe(); } generateUID( length ) { - return window.btoa( Array.from( window.crypto.getRandomValues( new Uint8Array( length * 2 ) ) ) - .map( ( b ) => String.fromCharCode( b ) ).join( '' ) ).replace( /[+/]/g, '' ).substring( 0, length ); + return window + .btoa( + Array.from( window.crypto.getRandomValues( new Uint8Array( length * 2 ) ) ) + .map( ( b ) => String.fromCharCode( b ) ) + .join( '' ) + ) + .replace( /[+/]/g, '' ) + .substring( 0, length ); + } + + getSubmittedPhoneNumber() { + return this.http.get( + `${ environment.serverUrl }/auth/submitted-phone-number` + ); + } + + deleteSubmittedPhoneNumber() { + return this.http.delete( + `${ environment.serverUrl }/auth/submitted-phone-number` + ); } + } diff --git a/src/app/service/follower/follower.service.spec.ts b/src/app/service/browser-locale/browser-locale.service.spec.ts similarity index 51% rename from src/app/service/follower/follower.service.spec.ts rename to src/app/service/browser-locale/browser-locale.service.spec.ts index 90035ff2..e8cecf78 100644 --- a/src/app/service/follower/follower.service.spec.ts +++ b/src/app/service/browser-locale/browser-locale.service.spec.ts @@ -1,13 +1,13 @@ import { TestBed } from '@angular/core/testing'; -import { FollowerService } from './follower.service'; +import { BrowserLocaleService } from './browser-locale.service'; -describe( 'FollowerService', () => { - let service: FollowerService; +describe( 'BrowserLocaleService', () => { + let service: BrowserLocaleService; beforeEach( () => { TestBed.configureTestingModule( {} ); - service = TestBed.inject( FollowerService ); + service = TestBed.inject( BrowserLocaleService ); } ); it( 'should be created', () => { diff --git a/src/app/service/browser-locale/browser-locale.service.ts b/src/app/service/browser-locale/browser-locale.service.ts new file mode 100644 index 00000000..6a5b839e --- /dev/null +++ b/src/app/service/browser-locale/browser-locale.service.ts @@ -0,0 +1,22 @@ +import { Inject, Injectable, LOCALE_ID } from '@angular/core'; + +@Injectable( { + providedIn: 'root' +} ) +export class BrowserLocaleService { + + constructor( @Inject( LOCALE_ID ) public locale: string ) { + } + + getBrowserLocale(): string { + const browserLocale = this.locale; + + if ( !browserLocale ) { + return undefined; + } + + const trimmedLocale = browserLocale.trim(); + + return trimmedLocale.split( /-|_/ )[ 0 ]; + } +} diff --git a/src/app/service/business-logic/business-logic.service.ts b/src/app/service/business-logic/business-logic.service.ts index 7159f4b2..0d78e182 100644 --- a/src/app/service/business-logic/business-logic.service.ts +++ b/src/app/service/business-logic/business-logic.service.ts @@ -3,6 +3,8 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject, Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { environment } from '../../../environments/environment'; +import { AnalyticsService } from '../analytics/analytics.service'; +import { AuthenticationService } from '../auth/authentication.service'; @Injectable( { providedIn: 'root' @@ -12,12 +14,25 @@ export class BusinessLogicService { public userInfo: Observable; public userInfoSubject: BehaviorSubject; - constructor( private http: HttpClient ) { + constructor( + private http: HttpClient, + private authenticationService: AuthenticationService, + private analyticsService: AnalyticsService ) { const userInfoStorageItem = localStorage.getItem( 'userInfo' ) ? localStorage.getItem( 'userInfo' ) : sessionStorage.getItem( 'userInfo' ); this.userInfoSubject = new BehaviorSubject( JSON.parse( userInfoStorageItem ) ); this.userInfo = this.userInfoSubject.asObservable(); + + if ( this.userInfoSubject.value ) { + this.analyticsService.identifyUser( this.userInfoSubject.value ); + } + + this.authenticationService.currentUser.subscribe( currentUser => { + if ( !currentUser ) { + this.logout(); + } + } ); } public get userInfoValue(): any { @@ -29,6 +44,8 @@ export class BusinessLogicService { .pipe( map( userInfo => { this.userInfoSubject.next( userInfo ); + this.analyticsService.identifyUser( userInfo ); + if ( localStorage.getItem( 'currentUser' ) ) { localStorage.setItem( 'userInfo', JSON.stringify( userInfo ) ); } else { diff --git a/src/app/service/category/category.service.ts b/src/app/service/category/category.service.ts deleted file mode 100644 index 16e5e3ad..00000000 --- a/src/app/service/category/category.service.ts +++ /dev/null @@ -1,120 +0,0 @@ -import { Injectable } from '@angular/core'; -import { of } from 'rxjs'; -import { CATEGORIES, CATEGORIES_MAP } from '../../data/deprecated/category/category.data'; - -@Injectable( { - providedIn: 'root' -} ) -export class CategoryService { - search( q: string ) { - const categoriesSet = new Set(); - - q = '^' + q; - const regExp = new RegExp( q, 'gi' ); - - for ( const category of CATEGORIES ) { - if ( regExp.test( category.name ) ) { - categoriesSet.add( { category } ); - } - - for ( const subCategory of category.payload?.subCategories ) { - if ( subCategory.name.match( regExp ) ) { - categoriesSet.add( { category, subCategory } ); - } - - for ( const leafCategory of subCategory.leafCategories ) { - if ( leafCategory?.name.match( regExp ) ) { - categoriesSet.add( { category, subCategory, leafCategory } ); - } - } - } - } - return of( Array.from( categoriesSet ) ); - } - - getCategoryIdFromCategories( categories ) { - const idList = []; - for ( const category of categories ) { - const payload: any = {}; - - if ( category.category ) { - payload.category = category.category.id; - } - - if ( category.subCategory ) { - payload.subCategory = category.subCategory.id; - } - - if ( category.leafCategory ) { - payload.leafCategory = category.leafCategory.id; - } - - idList.push( payload ); - } - return of( idList ); - } - - getAllCategories() { - const categories = []; - for ( const category of CATEGORIES ) { - if ( !categories.includes( category ) ) { - categories.push( { name: category.name, id: category.id } ); - } - } - return of( categories ); - } - - getSubCategories( categoryId: number ) { - const categories = []; - - CATEGORIES_MAP.get( categoryId ).subCategories.forEach( ( category: any, id: number ) => { - categories.push( { name: category.name, id } ); - } ); - - return of( categories ); - } - - getLeafCategories( categoryId: number, subCategoryId: number ) { - const categories = []; - - CATEGORIES_MAP.get( categoryId ).subCategories.get( subCategoryId ).leafCategories.forEach( ( category: any, id: number ) => { - categories.push( { name: category.name, id } ); - } ); - - return of( categories ); - } - - getCategoriesFromId( categories: any ): any { - const result = []; - if ( categories ) - for ( const category of categories ) { - result.push( this.getCategoryFromId( category.category, category.subCategory, category.leafCategory ) ); - } - return of( result ); - } - - getCategoryFromId( categoryId, subCategoryId, leafCategoryId ): any { - const categories: any = {}; - - categories.category = { - name: CATEGORIES_MAP.get( categoryId )?.name, - id: categoryId - }; - - if ( subCategoryId ) { - categories.subCategory = { - name: CATEGORIES_MAP.get( categoryId ).subCategories.get( subCategoryId )?.name, - id: subCategoryId - }; - } - - if ( leafCategoryId ) { - categories.leafCategory = { - name: CATEGORIES_MAP.get( categoryId ).subCategories.get( subCategoryId ).leafCategories?.get( leafCategoryId ).name, - id: leafCategoryId - }; - } - - return categories; - } -} diff --git a/src/app/service/event/event.service.ts b/src/app/service/event/event.service.ts deleted file mode 100644 index a37f2d22..00000000 --- a/src/app/service/event/event.service.ts +++ /dev/null @@ -1,408 +0,0 @@ -import { formatDate } from '@angular/common'; -import { HttpClient } from '@angular/common/http'; -import { Injectable } from '@angular/core'; -import { BehaviorSubject, Observable, of } from 'rxjs'; -import { catchError, map, tap } from 'rxjs/operators'; -import { environment } from '../../../environments/environment'; -import { attendedEventsData, EventTypes } from '../../data/deprecated/event/events.data'; -import { Event, EventCount } from '../../model/event/event.model'; -import { CategoryService } from '../category/category.service'; - -@Injectable( { - providedIn: 'root' -} ) -export class EventService { - - public recommendedEvents: Observable; - public recommendedEventsByFollowingList: Observable; - public attendedEvents: Observable; - public searchedEvents: Observable; - private recommendedEventsSubject: BehaviorSubject; - private recommendedEventsByFollowingListSubject: BehaviorSubject; - private attendedEventsSubject: BehaviorSubject; - private searchedEventsSubject: BehaviorSubject; - - constructor( - private http: HttpClient, - private categoryService: CategoryService - ) { - this.recommendedEventsSubject = new BehaviorSubject( null ); - this.recommendedEvents = this.recommendedEventsSubject.asObservable(); - - this.recommendedEventsByFollowingListSubject = new BehaviorSubject( null ); - this.recommendedEventsByFollowingList = this.recommendedEventsByFollowingListSubject.asObservable(); - - this.attendedEventsSubject = new BehaviorSubject( null ); - this.attendedEvents = this.attendedEventsSubject.asObservable(); - - this.searchedEventsSubject = new BehaviorSubject( null ); - this.searchedEvents = this.searchedEventsSubject.asObservable(); - } - - create( event: any ) { - return of( [] ); - } - - update( event: any ) { - return of( [] ); - } - - countUserEvents( username: string, isPastOnly: string = 'true' ) { - if ( environment.mockDataEnabled ) { - const countData = [ - { _id: { category: 1, subCategory: 1 }, count: 27 }, - { _id: { category: 1, subCategory: 2, leafCategory: 1 }, count: 10 } - ] as EventCount[]; - - return of( this.countUserEventsProcess( countData ) ); - } else { - return this.http.get( `${ environment.serverUrl }/event/count?username=${ username }&isPastOnly=${ isPastOnly }` ) - .pipe( map( counts => { - return this.countUserEventsProcess( counts ); - } ) ); - } - } - - countUserEventsProcess( countData: any ) { - countData.map( categories => { - const categoryResult = this.categoryService.getCategoryFromId( categories._id.category, - categories._id.subCategory, categories._id.leafCategory ); - - categories._id = categoryResult; - } ); - - const newEventsList = []; - - countData.map( category => { - let categoryName: string; - - if ( category._id.leafCategory ) { - categoryName = category._id.leafCategory.name; - } else if ( category._id.subCategory ) { - categoryName = category._id.subCategory.name; - } else { - categoryName = category._id.category.name; - } - - // if there is duplicated category then do not push to array, just add value to the existing category - let duplicatedNameIndex = -1; - for ( let i = 0; i < newEventsList.length; i++ ) { - if ( newEventsList[ i ].name === categoryName ) { - duplicatedNameIndex = i; - break; - } - } - if ( duplicatedNameIndex === -1 ) { - newEventsList.push( { - name: categoryName, - value: category.count - } ); - } else { - newEventsList[ duplicatedNameIndex ].value += category.count; - newEventsList.sort( ( x, y ) => x.value > y.value ? -1 : 1 ); - } - } ); - - return newEventsList; - } - - me( isNewOnly: string = 'false', isCompleted: string = 'false', startDate?: string, endDate?: string, title?: string ) { - - if ( environment.mockDataEnabled ) { - return of( this.meProcess( [], isNewOnly ) ); - } else { - let queryParams = `isNewOnly=${ isNewOnly }&isCompleted=${ isCompleted }`; - - if ( startDate ) { - queryParams += `&startDate=${ startDate }`; - } - - if ( endDate ) { - queryParams += `&endDate=${ endDate }`; - } - - if ( title ) { - queryParams += `&title=${ title }`; - } - - return this.http.get( `${ environment.serverUrl }/event/me?` + queryParams ).pipe( map( myEvents => { - return this.meProcess( myEvents, isNewOnly ); - } ) ); - } - } - - meProcess( myEvents: any, isNewOnly: string ) { - myEvents.map( event => { - const categoryResult = this.categoryService.getCategoryFromId( event.payload?.category, - event.payload?.subCategory, event.payload?.leafCategory ); - - if ( categoryResult.category ) { - event.payload.category = categoryResult.category; - } - - if ( categoryResult.subCategory ) { - event.payload.subCategory = categoryResult.subCategory; - } - - if ( categoryResult.leafCategory ) { - event.payload.leafCategory = categoryResult.leafCategory; - } - - // check if event is in progress only for upcomings - if ( isNewOnly === 'true' ) { - this.checkInProgress( event ); - } - - event.date = formatDate( new Date( event.date ), 'yyyy/MM/dd HH:mm Z', 'en-US' ); - } ); - - return myEvents; - } - - search( _id, user, date, title, categories: any[], - eventType: EventTypes = EventTypes.Other, fill = false, - excludeCurrentUserEvents = false, limit = 20 ) { - if ( environment.mockDataEnabled ) { - const searchedEvents = []; - return of( this.searchProcess( searchedEvents, eventType ) ); - } else { - return this.http.post( `${ environment.serverUrl }/event/search`, { - _id, - user, - date, - title, - categories, - fill, - limit, - excludeCurrentUserEvents - } ).pipe( map( events => { - return this.searchProcess( events, eventType ); - } ) ); - } - } - - searchProcess( searchedEvents: any, eventType: EventTypes ) { - searchedEvents.map( event => this.fillEvent( event ) ); - - if ( eventType === EventTypes.Recommended ) { - this.recommendedEventsSubject.next( searchedEvents ); - return []; - } else if ( eventType === EventTypes.Searched ) { - this.searchedEventsSubject.next( searchedEvents ); - return []; - } else if ( eventType === EventTypes.Other ) { - return searchedEvents; - } - } - - attend( eventId: string ) { - if ( !environment.mockDataEnabled ) { - return this.http.get( `${ environment.serverUrl }/event/attend?id=${ eventId }` ) - .pipe( map( updatedEvent => { - this.updateEvent( updatedEvent, this.recommendedEventsSubject ); - this.updateEvent( updatedEvent, this.recommendedEventsByFollowingListSubject ); - - if ( this.attendedEventsSubject.getValue() ) { - this.getAttendedEvents().subscribe(); - } else if ( this.searchedEventsSubject.getValue() ) { - this.updateEvent( updatedEvent, this.searchedEventsSubject ); - } - - return updatedEvent; - } ) ); - } - } - - drop( eventId: string ) { - if ( !environment.mockDataEnabled ) { - return this.http.get( `${ environment.serverUrl }/event/drop?id=${ eventId }` ) - .pipe( map( updatedEvent => { - this.updateEvent( updatedEvent, this.recommendedEventsSubject ); - this.updateEvent( updatedEvent, this.recommendedEventsByFollowingListSubject ); - - // if attendedEvents contains the event remove it - const attendedEvents = this.attendedEventsSubject.getValue(); - - if ( attendedEvents ) { - this.attendedEventsSubject.next( - attendedEvents.filter( event => event._id !== updatedEvent[ 0 ]._id ) - ); - } - - if ( this.searchedEventsSubject.getValue() ) { - this.updateEvent( updatedEvent, this.searchedEventsSubject ); - } - - return updatedEvent; - } ) ); - } - } - - resetEvents( eventType: EventTypes ): void { - if ( eventType === EventTypes.Attended ) { - this.attendedEventsSubject.next( null ); - } else if ( eventType === EventTypes.Searched ) { - this.searchedEventsSubject.next( null ); - } - } - - count( eventId: string ) { - if ( !environment.mockDataEnabled ) { - return this.http.get( `${ environment.serverUrl }/event/count?id=${ eventId }` ); - } - } - - initSearchEvents( categories: any[] ) { - this.getRecommendedEventsByFollowingList( '10' ).subscribe(); - - this.search( undefined, undefined, new Date().toISOString(), undefined, - categories, EventTypes.Recommended, categories.length !== 0, true ).subscribe(); - } - - getAttendedEvents( startDate?: string, endDate?: string ) { - if ( environment.mockDataEnabled ) { - const attendedData = []; - attendedEventsData.forEach( ( val, index ) => { - attendedData.push( Object.assign( {}, val ) ); - attendedData[ index ].payload = Object.assign( {}, val.payload ); - } ); - - return of( this.getAttendedEventsProcess( attendedData, startDate, endDate ) ); - } else { - let queryParams = ``; - - if ( startDate && endDate ) { - queryParams += `startDate=${ startDate }&endDate=${ endDate }`; - } - - return this.http.get( `${ environment.serverUrl }/event/attended?` + queryParams ).pipe( map( attendedEvents => { - return this.getAttendedEventsProcess( attendedEvents, startDate, endDate ); - } ) ); - } - } - - fillEvent( event ) { - const categoryResult = this.categoryService.getCategoryFromId( event.payload?.category, - event.payload?.subCategory, event.payload?.leafCategory ); - - if ( categoryResult.category ) { - event.payload.category = categoryResult.category; - } - - if ( categoryResult.subCategory ) { - event.payload.subCategory = categoryResult.subCategory; - } - - if ( categoryResult.leafCategory ) { - event.payload.leafCategory = categoryResult.leafCategory; - } - - this.checkInProgress( event ); - event.date = formatDate( new Date( event.date ), 'yyyy/MM/dd HH:mm Z', 'en-US' ); - } - - getAttendedEventsProcess( attendedData: any, startDate?: string, endDate?: string ) { - attendedData.map( event => this.fillEvent( event ) ); - - if ( startDate && endDate ) { - return attendedData; - } else { - this.attendedEventsSubject.next( attendedData ); - } - return []; - } - - markAsCompleted( eventId: string ) { - if ( !environment.mockDataEnabled ) { - return this.http.get( `${ environment.serverUrl }/event/mark?id=${ eventId }` ); - } - } - - getRecommendedEventsByFollowingList( limit: string ) { - if ( environment.mockDataEnabled ) { - const recommendedEventsData = []; - attendedEventsData.forEach( ( val, index ) => { - recommendedEventsData.push( Object.assign( {}, val ) ); - recommendedEventsData[ index ].payload = Object.assign( {}, val.payload ); - } ); - - this.getRecommendedEventsByFollowingListProcess( recommendedEventsData ); - return of(); - } else { - return this.http.get( `${ environment.serverUrl }/event/by-following?limit=${ limit }` ).pipe( map( events => { - this.getRecommendedEventsByFollowingListProcess( events ); - } ) ); - } - } - - getRecommendedEventsByFollowingListProcess( recommendedEventsData: any ) { - recommendedEventsData.map( event => { - const categoryResult = this.categoryService.getCategoryFromId( event.payload?.category, - event.payload?.subCategory, event.payload?.leafCategory ); - - if ( categoryResult.category ) { - event.payload.category = categoryResult.category; - } - - if ( categoryResult.subCategory ) { - event.payload.subCategory = categoryResult.subCategory; - } - - if ( categoryResult.leafCategory ) { - event.payload.leafCategory = categoryResult.leafCategory; - } - - event.date = formatDate( new Date( event.date ), 'yyyy/MM/dd HH:mm Z', 'en-US' ); - } ); - - this.recommendedEventsByFollowingListSubject.next( recommendedEventsData ); - } - - getEvents(): Observable { - return this.http.get( 'api/eventData' ).pipe( - tap( _ => console.log( 'fetched events' ), - catchError( this.handleError( 'getEvents', [] ) ) ) - ); - } - - logout() { - this.recommendedEventsSubject.next( null ); - this.recommendedEventsByFollowingListSubject.next( null ); - } - - private updateEvent( updatedEvent, targetEvents ): void { - const events = targetEvents.getValue(); - - const foundRecommendIndex = events.findIndex( x => x._id === updatedEvent[ 0 ]._id ); - - if ( foundRecommendIndex !== -1 ) { - events[ foundRecommendIndex ].count = updatedEvent[ 0 ].count; - events[ foundRecommendIndex ].attended = updatedEvent[ 0 ].attended; - targetEvents.next( events ); - } - } - - private checkInProgress( event ) { - const currentDate = new Date(); - const eventDate = new Date( event.date ); - if ( eventDate.getTime() < currentDate.getTime() && - eventDate.getTime() + event.duration * 60000 > currentDate.getTime() ) { - event.inProgress = true; - } - } - - /** - * Handle Http operation that failed. - * Let the app continue. - * @param operation - name of the operation that failed - * @param result - optional value to return as the observable result - */ - private handleError( operation = 'operation', result?: T ) { - return ( error: any ): Observable => { - console.error( error ); // log to console instead - - // Let the app keep running by returning an empty result. - return of( result ); - }; - } -} diff --git a/src/app/service/file-storage/file-storage.service.ts b/src/app/service/file-storage/file-storage.service.ts index b47d9b9d..976d6dcd 100644 --- a/src/app/service/file-storage/file-storage.service.ts +++ b/src/app/service/file-storage/file-storage.service.ts @@ -3,6 +3,7 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject, Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { environment } from '../../../environments/environment'; +import { BusinessLogicService } from '../business-logic/business-logic.service'; @Injectable( { providedIn: 'root' @@ -12,10 +13,16 @@ export class FileStorageService { public sharedProfileImage: Observable; private profileImageSubject: BehaviorSubject; - constructor( private http: HttpClient ) { + constructor( private http: HttpClient, private businessLogicService: BusinessLogicService ) { const profileImageStorageItem = localStorage.getItem( 'profileImage' ) ? localStorage.getItem( 'profileImage' ) : sessionStorage.getItem( 'profileImage' ); this.profileImageSubject = new BehaviorSubject( JSON.parse( profileImageStorageItem ) ); this.sharedProfileImage = this.profileImageSubject.asObservable(); + + this.businessLogicService.userInfo.subscribe( userInfo => { + if ( !userInfo ) { + this.logout(); + } + } ); } public setProfileImageFileData( profileImg: any ) { diff --git a/src/app/service/followee/followee.service.ts b/src/app/service/followee/followee.service.ts deleted file mode 100644 index a19991f3..00000000 --- a/src/app/service/followee/followee.service.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { HttpClient } from '@angular/common/http'; -import { Injectable } from '@angular/core'; -import { of } from 'rxjs'; -import { environment } from '../../../environments/environment'; - -@Injectable( { - providedIn: 'root' -} ) -export class FolloweeService { - - constructor( - private http: HttpClient - ) { - } - - count( username: string ) { - if ( environment.mockDataEnabled ) { - return of( [ { count: 1 } ] ); - } else { - return this.http.get( `${ environment.serverUrl }/followee/count?username=${ username }` ); - } - } -} diff --git a/src/app/service/follower/follower.service.ts b/src/app/service/follower/follower.service.ts deleted file mode 100644 index e3c8e0d1..00000000 --- a/src/app/service/follower/follower.service.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { HttpClient } from '@angular/common/http'; -import { Injectable } from '@angular/core'; -import { of } from 'rxjs'; -import { environment } from '../../../environments/environment'; - -@Injectable( { - providedIn: 'root' -} ) -export class FollowerService { - - constructor( - private http: HttpClient - ) { - } - - follow( username: string ) { - if ( !environment.mockDataEnabled ) { - return this.http.get( `${ environment.serverUrl }/follower/follow?username=${ username }` ); - } - } - - unfollow( username: string ) { - if ( !environment.mockDataEnabled ) { - return this.http.get( `${ environment.serverUrl }/follower/unfollow?username=${ username }` ); - } - } - - count( username: string ) { - if ( environment.mockDataEnabled ) { - return of( [ { count: 2 } ] ); - } else { - return this.http.get( `${ environment.serverUrl }/follower/count?username=${ username }` ); - } - } - - isFollowing( username: string ) { - if ( !environment.mockDataEnabled ) { - return this.http.get( `${ environment.serverUrl }/follower/is-following?username=${ username }` ); - } - } -} diff --git a/src/app/service/infinite-scrolling/infinite-scrolling.service.spec.ts b/src/app/service/infinite-scrolling/infinite-scrolling.service.spec.ts new file mode 100644 index 00000000..da63b863 --- /dev/null +++ b/src/app/service/infinite-scrolling/infinite-scrolling.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { InfiniteScrollingService } from './infinite-scrolling.service'; + +describe( 'InfiniteScrollingService', () => { + let service: InfiniteScrollingService; + + beforeEach( () => { + TestBed.configureTestingModule( {} ); + service = TestBed.inject( InfiniteScrollingService ); + } ); + + it( 'should be created', () => { + expect( service ).toBeTruthy(); + } ); +} ); diff --git a/src/app/service/infinite-scrolling/infinite-scrolling.service.ts b/src/app/service/infinite-scrolling/infinite-scrolling.service.ts new file mode 100644 index 00000000..2366a618 --- /dev/null +++ b/src/app/service/infinite-scrolling/infinite-scrolling.service.ts @@ -0,0 +1,35 @@ +import { Injectable } from '@angular/core'; +import { BehaviorSubject } from 'rxjs'; + +@Injectable( { + providedIn: 'root' +} ) +export class InfiniteScrollingService { + public intersectionOptions = { + root: null, + rootMargin: '0px', + threshold: [ 0, 0.5, 1 ] + }; + private intersectionSubject = new BehaviorSubject( false ); + private observer: any = + new IntersectionObserver( this.intersectionCallback.bind( this ), this.intersectionOptions ); + + constructor() { + // Intentionally blank + } + + getObservable() { + return this.intersectionSubject.asObservable(); + } + + intersectionCallback( entries, observer ) { + entries.forEach( entry => { + entry.intersectionRatio === 1 ? + this.intersectionSubject.next( true ) : this.intersectionSubject.next( false ); + } ); + } + + setObserver() { + return this.observer; + } +} diff --git a/src/app/service/mail/mail.service.ts b/src/app/service/mail/mail.service.ts index 66ccfa7e..90227166 100644 --- a/src/app/service/mail/mail.service.ts +++ b/src/app/service/mail/mail.service.ts @@ -1,19 +1,25 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { environment } from '../../../environments/environment'; +import { BrowserLocaleService } from '../browser-locale/browser-locale.service'; @Injectable( { providedIn: 'root', } ) export class MailService { - constructor( private http: HttpClient ) { + constructor( + private http: HttpClient, + private browserLocale: BrowserLocaleService + ) { + // intentionally blank } - sendContactUsMail( payload: any ) { - const contactUs = { - params: payload, - }; + sendContactUsMail( params: any ) { + const preferredLanguage = this.browserLocale.getBrowserLocale(); - return this.http.post( `${ environment.serverUrl }/mail/contact`, { contactUs } ); + return this.http.post( + `${ environment.serverUrl }/mail/contact`, + { params, preferredLanguage } + ); } } diff --git a/src/app/service/monitoring/monitoring.service.ts b/src/app/service/monitoring/monitoring.service.ts index 5bdb23d9..f95b0968 100644 --- a/src/app/service/monitoring/monitoring.service.ts +++ b/src/app/service/monitoring/monitoring.service.ts @@ -1,7 +1,8 @@ -import { HttpClient } from '@angular/common/http'; +import { HttpClient, HttpErrorResponse } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { BehaviorSubject, Observable } from 'rxjs'; import { environment } from '../../../environments/environment'; +import { DEFAULT_SYSTEM_STATUS } from '../../data/status/status.data'; @Injectable( { providedIn: 'root' @@ -17,12 +18,86 @@ export class MonitoringService { } alive() { - const observer = { next: response => this.systemStatusesSubject.next( response ), - error: error => this.systemStatusesSubject.next( error ) + error: error => { + this.systemStatusesSubject.next( error ); + } }; return this.http.get( `${ environment.serverUrl }/monitor/alive` ).subscribe( observer ); } + + parseSystemStatuses( systemStatuses ) { + let overallSystemStatus = DEFAULT_SYSTEM_STATUS; + + if ( !systemStatuses ) { + return; + } else if ( systemStatuses instanceof HttpErrorResponse ) { + overallSystemStatus = DEFAULT_SYSTEM_STATUS; + overallSystemStatus.checkDate = new Date(); + overallSystemStatus.overall = 'WARN'; + + for ( const systemStatus of overallSystemStatus.systemStatuses ) { + systemStatus.overall = 'WARN'; + for ( const status of systemStatus.statuses ) { + status.alive = 'WARN'; + } + } + return; + } + + overallSystemStatus = { + systemStatuses: [], + overall: '', + checkDate: undefined + }; + + for ( const systemStatusKey in systemStatuses ) { + if ( !systemStatuses[ systemStatusKey ] ) { + continue; + } + + const systemStatus = { + name: systemStatusKey, + overall: '', + statuses: [] + }; + + for ( const status in systemStatuses[ systemStatusKey ] ) { + if ( !systemStatuses[ systemStatusKey ][ status ] ) { + continue; + } + + let name = status[ 0 ].toUpperCase(); + + if ( status.length > 1 ) { + name += status.substring( 1 ).split( /(?=[A-Z])/ ).join( ' ' ); + } + + systemStatus.statuses.push( { + name, + alive: systemStatuses[ systemStatusKey ][ status ].alive + } ); + + if ( systemStatuses[ systemStatusKey ][ status ].alive !== 'UP' ) { + systemStatus.overall = systemStatuses[ systemStatusKey ][ status ].alive; + overallSystemStatus.overall = systemStatuses[ systemStatusKey ][ status ].alive; + } + } + if ( !systemStatus.overall ) { + systemStatus.overall = 'UP'; + } + + overallSystemStatus.systemStatuses.push( systemStatus ); + } + + if ( !overallSystemStatus.overall ) { + overallSystemStatus.overall = 'UP'; + } + + overallSystemStatus.checkDate = new Date(); + + return overallSystemStatus; + } } diff --git a/src/app/service/category/category.service.spec.ts b/src/app/service/notification/notification.service.spec.ts similarity index 51% rename from src/app/service/category/category.service.spec.ts rename to src/app/service/notification/notification.service.spec.ts index cd17789e..e1275216 100644 --- a/src/app/service/category/category.service.spec.ts +++ b/src/app/service/notification/notification.service.spec.ts @@ -1,13 +1,13 @@ import { TestBed } from '@angular/core/testing'; -import { CategoryService } from './category.service'; +import { NotificationService } from './notification.service'; -describe( 'CategoryService', () => { - let service: CategoryService; +describe( 'NotificationService', () => { + let service: NotificationService; beforeEach( () => { TestBed.configureTestingModule( {} ); - service = TestBed.inject( CategoryService ); + service = TestBed.inject( NotificationService ); } ); it( 'should be created', () => { diff --git a/src/app/service/notification/notification.service.ts b/src/app/service/notification/notification.service.ts new file mode 100644 index 00000000..65ec7e9a --- /dev/null +++ b/src/app/service/notification/notification.service.ts @@ -0,0 +1,64 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { BehaviorSubject, Observable } from 'rxjs'; +import { environment } from '../../../environments/environment'; +import { AuthenticationService } from '../auth/authentication.service'; +import { SocketService } from '../socket/socket.service'; + +@Injectable( { + providedIn: 'root' +} ) +export class NotificationService { + + public notifications: Observable; + public notificationsSubject: BehaviorSubject; + + constructor( + private http: HttpClient, + private socketService: SocketService, + private authenticationService: AuthenticationService + ) { + this.notificationsSubject = new BehaviorSubject( [] ); + this.notifications = this.notificationsSubject.asObservable(); + + this.authenticationService.currentUser.subscribe( currentUser => { + if ( !currentUser ) { + this.logout(); + } else { + this.getNotifications(); + } + } ); + + this.socketService.notification.subscribe( notification => { + if ( notification ) { + this.getNotifications(); + } + } ); + } + + readNotification( index: any ) { + const notification = this.notificationsSubject.value[ index ]; + if ( !notification || notification.read ) { + return; + } + + notification.read = true; + this.updateNotification( { id: notification._id, read: true } ).subscribe(); + this.notificationsSubject.next( this.notificationsSubject.value ); + } + + getNotifications() { + + this.http.get( `${ environment.serverUrl }/notification/me` ).subscribe( response => { + this.notificationsSubject.next( response ); + } ); + } + + updateNotification( payload: any ) { + return this.http.put( `${ environment.serverUrl }/notification/me`, payload ); + } + + logout() { + this.notificationsSubject.next( [] ); + } +} diff --git a/src/app/service/payment/payment.service.ts b/src/app/service/payment/payment.service.ts index e6b23d0c..659f32d9 100644 --- a/src/app/service/payment/payment.service.ts +++ b/src/app/service/payment/payment.service.ts @@ -8,10 +8,10 @@ import { LoadingService } from '../loading/loading.service'; providedIn: 'root' } ) export class PaymentService { - constructor( private http: HttpClient, private loadingService: LoadingService ) { + // Intentionally blank } initPayment( paymentConfig: any, productId: string, quantity: number ) { diff --git a/src/app/service/product/product.service.ts b/src/app/service/product/product.service.ts index f8bbd4c9..96fa6f28 100644 --- a/src/app/service/product/product.service.ts +++ b/src/app/service/product/product.service.ts @@ -1,36 +1,90 @@ +import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; +import { Router } from '@angular/router'; import { BehaviorSubject, Observable } from 'rxjs'; -import { Product } from '../../model/product/product.model'; +import { environment } from '../../../environments/environment'; +import { URLS } from '../../data/navigation/navigation.data'; +import { Product, ProductLine } from '../../model/product/product.model'; +import { AuthenticationService } from '../auth/authentication.service'; @Injectable( { providedIn: 'root' } ) export class ProductService { + URLS = URLS; + public product: Observable; + public premiumProducts: Observable; + public premiumProductsSubject: BehaviorSubject; private productSubject: BehaviorSubject; + private productStorageKey = 'product'; + private premiumProductsStorageKey = 'premiumProducts'; - constructor() { - let productStorageItem: Product = JSON.parse( localStorage.getItem( 'product' ) ? - localStorage.getItem( 'product' ) : sessionStorage.getItem( 'product' ) ); + constructor( + private http: HttpClient, + private router: Router, + private authenticationService: AuthenticationService + ) { + let productStorageItem: Product = JSON.parse( localStorage.getItem( this.productStorageKey ) ? + localStorage.getItem( this.productStorageKey ) : sessionStorage.getItem( this.productStorageKey ) ); productStorageItem = productStorageItem ? productStorageItem : undefined; + let premiumProductsStorageItem: any = JSON.parse( localStorage.getItem( this.premiumProductsStorageKey ) ); + premiumProductsStorageItem = premiumProductsStorageItem ? premiumProductsStorageItem : undefined; + this.productSubject = new BehaviorSubject( productStorageItem ); this.product = this.productSubject.asObservable(); + + this.premiumProductsSubject = new BehaviorSubject( premiumProductsStorageItem ); + this.premiumProducts = this.premiumProductsSubject.asObservable(); + + this.authenticationService.currentUser.subscribe( currentUser => { + if ( !currentUser ) { + this.logout(); + } + } ); } setSelectedProduct( product: Product ) { - if (product) { + if ( product ) { if ( localStorage.getItem( 'currentUser' ) ) { - sessionStorage.removeItem( 'product' ); - localStorage.setItem( 'product', JSON.stringify( product ) ); + sessionStorage.removeItem( this.productStorageKey ); + localStorage.setItem( this.productStorageKey, JSON.stringify( product ) ); } else { - sessionStorage.setItem( 'product', JSON.stringify( product ) ); + sessionStorage.setItem( this.productStorageKey, JSON.stringify( product ) ); } this.productSubject.next( product ); } else { - localStorage.removeItem( 'product' ); - sessionStorage.removeItem( 'product' ); + localStorage.removeItem( this.productStorageKey ); + sessionStorage.removeItem( this.productStorageKey ); } } + + checkProduct() { + return this.http.get( `${ environment.serverUrl }/product` ) + .subscribe( ( premiumProducts ) => { + this.setPremiumProduct( premiumProducts ); + } ); + } + + redirectToProductUrl( product: Product, productLine: ProductLine ) { + if ( !product.redirectToUrl ) { + this.router.navigate( [ URLS.product + '/' + productLine.key + '/' + product.key ] ).then( () => { + return true; + } ); + } else { + window.open( product.url, '_blank' ); + } + } + + logout() { + localStorage.removeItem( this.productStorageKey ); + this.premiumProductsSubject.next( undefined ); + } + + private setPremiumProduct( premiumProducts: any ) { + localStorage.setItem( this.premiumProductsStorageKey, JSON.stringify( premiumProducts ) ); + this.premiumProductsSubject.next( premiumProducts ); + } } diff --git a/src/app/service/provider/github-provider.service.ts b/src/app/service/provider/github-provider.service.ts index 9f6f6435..753197cd 100644 --- a/src/app/service/provider/github-provider.service.ts +++ b/src/app/service/provider/github-provider.service.ts @@ -19,8 +19,20 @@ export class GithubProviderService { // Intentionally blank } + getGithubStars = async ( productKey: string ) => { + const uri = `${ environmentCommon.website.github.api.repo }/${ environmentCommon.company.social.github }/${ productKey }`; + + const response = await this.util.corsRequest( uri ); + if ( response != null ) { + const json = JSON.parse( response as string ); + return { productKey, count: json.stargazers_count ? json.stargazers_count : 0 }; + } else { + return { productKey, count: 0 }; + } + }; + getGithubCounters = async ( productKey: string ) => { - const uri = `${ environmentCommon.website.github.api.repo }/${ environmentCommon.oth.social.github }/${ productKey }`; + const uri = `${ environmentCommon.website.github.api.repo }/${ environmentCommon.company.social.github }/${ productKey }`; const counters = []; @@ -55,7 +67,7 @@ export class GithubProviderService { }; getReleaseVersion = async ( productKey: string ) => { - const uri = `${ environmentCommon.website.github.api.repo }/${ environmentCommon.oth.social.github }/${ productKey }/releases`; + const uri = `${ environmentCommon.website.github.api.repo }/${ environmentCommon.company.social.github }/${ productKey }/releases`; const response = await this.util.corsRequest( uri ); if ( response != null ) { const json = JSON.parse( response as string ); @@ -69,12 +81,16 @@ export class GithubProviderService { const today = new Date(); const lastYear = new Date( today.getFullYear() - 1, today.getMonth(), today.getDate() ); - const uri = `${ environmentCommon.website.github.api.repo }/${ environmentCommon.oth.social.github }/${ productKey }/commits?per_page=100&since=${ lastYear.toISOString() }`; + const uri = `${ environmentCommon.website.github.api.repo }/${ environmentCommon.company.social.github }/${ productKey }/commits?per_page=100&since=${ lastYear.toISOString() }`; const response = await this.util.corsRequest( uri ); if ( response != null ) { const json: any[] = JSON.parse( response as string ); return json.map( item => { - const activity: Activity = { type: 'commit', date: new Date( item.commit?.committer?.date ), payload: item.sha }; + const activity: Activity = { + type: 'commit', + date: new Date( item.commit?.committer?.date ), + payload: item.sha + }; return activity; } ); } diff --git a/src/app/service/provider/npm-provider.service.ts b/src/app/service/provider/npm-provider.service.ts deleted file mode 100644 index be008924..00000000 --- a/src/app/service/provider/npm-provider.service.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { Injectable } from '@angular/core'; -import { environmentCommon } from '../../../environments/environment-common'; -import { BRAND } from '../../data/brand/brand.data'; -import { UtilService } from '../util/util.service'; - -@Injectable( { - providedIn: 'root', -} ) -export class NpmProviderService { - - NPM_PACKAGES_LIST = [ - 'server-generator', - 'common', - 'app-generator', - ]; - - constructor( private util: UtilService ) { - // Intentionally blank - } - - getNpmPackagesDownloadCount = async () => { - const today = this.util.formatDate( new Date() ); - let count = 0; - for ( const npmPackage of this.NPM_PACKAGES_LIST ) { - const uri = `${ environmentCommon.website.npm.api.download }/${ BRAND.establishDate }:${ today }/${ environmentCommon.oth.social.npm }/${ npmPackage }`; - - // Using Xml Http Request because http.get cause CORS issue - const response = await this.util.corsRequest( uri ); - if ( response != null ) { - const json = JSON.parse( response as string ); - count += json.downloads; - } - } - return count; - }; -} diff --git a/src/app/service/event/event.service.spec.ts b/src/app/service/socket/socket.service.spec.ts similarity index 56% rename from src/app/service/event/event.service.spec.ts rename to src/app/service/socket/socket.service.spec.ts index e2631524..9bd8b3c0 100644 --- a/src/app/service/event/event.service.spec.ts +++ b/src/app/service/socket/socket.service.spec.ts @@ -1,13 +1,13 @@ import { TestBed } from '@angular/core/testing'; -import { EventService } from './event.service'; +import { SocketService } from './socket.service'; -describe( 'EventService', () => { - let service: EventService; +describe( 'SocketService', () => { + let service: SocketService; beforeEach( () => { TestBed.configureTestingModule( {} ); - service = TestBed.inject( EventService ); + service = TestBed.inject( SocketService ); } ); it( 'should be created', () => { diff --git a/src/app/service/socket/socket.service.ts b/src/app/service/socket/socket.service.ts new file mode 100644 index 00000000..13163e17 --- /dev/null +++ b/src/app/service/socket/socket.service.ts @@ -0,0 +1,41 @@ +import { Injectable } from '@angular/core'; +import { BehaviorSubject, Observable } from 'rxjs'; +import { io } from 'socket.io-client'; +import { environment } from '../../../environments/environment'; + +@Injectable( { + providedIn: 'root' +} ) +export class SocketService { + + public notification: Observable; + public notificationSubject: BehaviorSubject; + private socket = undefined; + + constructor() { + this.notificationSubject = new BehaviorSubject( undefined ); + this.notification = this.notificationSubject.asObservable(); + } + + // To activate socket use the following function + connectToSocket( accessToken ) { + if ( accessToken && !this.socket ) { + this.socket = io( environment.serverUrl, { + auth: { token: accessToken } + } ); + + this.connectToNotifications(); + } + } + + connectToNotifications() { + this.socket?.on( 'notification', ( notification ) => { + this.notificationSubject.next( notification ); + } ); + } + + logout() { + this.socket = undefined; + this.notificationSubject.next( undefined ); + } +} diff --git a/src/app/service/theme/theme.service.ts b/src/app/service/theme/theme.service.ts index 9f1c734b..a00406d1 100644 --- a/src/app/service/theme/theme.service.ts +++ b/src/app/service/theme/theme.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject, Observable } from 'rxjs'; -import { version } from '../../../environments/version'; +import { version } from '../../../version'; import { DarkLightSettings, DEFAULT_THEME } from '../../data/theme/theme.data'; @Injectable( { diff --git a/src/app/service/followee/followee.service.spec.ts b/src/app/service/two-factor-code/two-factor-code.service.spec.ts similarity index 50% rename from src/app/service/followee/followee.service.spec.ts rename to src/app/service/two-factor-code/two-factor-code.service.spec.ts index b0bef3b7..f2ce415e 100644 --- a/src/app/service/followee/followee.service.spec.ts +++ b/src/app/service/two-factor-code/two-factor-code.service.spec.ts @@ -1,13 +1,13 @@ import { TestBed } from '@angular/core/testing'; -import { FolloweeService } from './followee.service'; +import { TwoFactorCodeService } from './two-factor-code.service'; -describe( 'FolloweeService', () => { - let service: FolloweeService; +describe( 'TwoFactorCodeService', () => { + let service: TwoFactorCodeService; beforeEach( () => { TestBed.configureTestingModule( {} ); - service = TestBed.inject( FolloweeService ); + service = TestBed.inject( TwoFactorCodeService ); } ); it( 'should be created', () => { diff --git a/src/app/service/two-factor-code/two-factor-code.service.ts b/src/app/service/two-factor-code/two-factor-code.service.ts new file mode 100644 index 00000000..1648bc60 --- /dev/null +++ b/src/app/service/two-factor-code/two-factor-code.service.ts @@ -0,0 +1,35 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { environment } from 'src/environments/environment'; +import { BrowserLocaleService } from '../browser-locale/browser-locale.service'; + +@Injectable( { + providedIn: 'root', +} ) +export class TwoFactorCodeService { + constructor( + private http: HttpClient, + private browserLocaleService: BrowserLocaleService + ) { + } + + submitPhoneNumber( phoneNumber: string ) { + return this.http.post( `${ environment.serverUrl }/2fa/request`, { + phoneNumber, + } ); + } + + verify( code: string, isInitialVerification: boolean ) { + return this.http.post( `${ environment.serverUrl }/2fa/verify`, { + code, + isInitialVerification, + } ); + } + + loginVerify( code: string, preAuthToken: string ) { + return this.http.post( `${ environment.serverUrl }/2fa/loginVerify`, { + code, + preAuthToken, + } ); + } +} diff --git a/src/app/service/user-activity/user-activity.service.spec.ts b/src/app/service/user-activity/user-activity.service.spec.ts deleted file mode 100644 index fcb7671a..00000000 --- a/src/app/service/user-activity/user-activity.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { UserActivityService } from './user-activity.service'; - -describe( 'UserActivityService', () => { - let service: UserActivityService; - - beforeEach( () => { - TestBed.configureTestingModule( {} ); - service = TestBed.inject( UserActivityService ); - } ); - - it( 'should be created', () => { - expect( service ).toBeTruthy(); - } ); -} ); diff --git a/src/app/service/user-activity/user-activity.service.ts b/src/app/service/user-activity/user-activity.service.ts deleted file mode 100644 index d6275d5c..00000000 --- a/src/app/service/user-activity/user-activity.service.ts +++ /dev/null @@ -1,154 +0,0 @@ -import { HttpClient } from '@angular/common/http'; -import { Injectable } from '@angular/core'; -import { of } from 'rxjs'; -import { map } from 'rxjs/operators'; -import { environment } from '../../../environments/environment'; -import { unratedCompletedEventsData } from '../../data/deprecated/event/events.data'; -import { CategoryService } from '../category/category.service'; - -@Injectable( { - providedIn: 'root' -} ) -export class UserActivityService { - - constructor( - private http: HttpClient, - private categoryService: CategoryService - ) { - } - - getEventsTaken( username: string, limit = 10 ) { - if ( environment.mockDataEnabled ) { - const eventsTaken = [ - { _id: { category: 1, subCategory: 1 }, count: 7 }, - { _id: { category: 1, subCategory: 2, leafCategory: 1 }, count: 5 } - ] as any; - - return of( this.getEventsTakenProcess( eventsTaken ) ); - } else { - return this.http.get( `${ environment.serverUrl }/user-activity/events-taken?username=${ username }&limit=${ limit }` ) - .pipe( map( counts => { - return this.getEventsTakenProcess( counts ); - } ) ); - } - } - - getEventsTakenProcess( eventsTaken: any ) { - eventsTaken.map( categories => { - categories._id = this.categoryService.getCategoryFromId( categories._id.category, - categories._id.subCategory, categories._id.leafCategory ); - } ); - - const newEventsList = []; - eventsTaken.map( category => { - let categoryName: string; - - if ( category._id.leafCategory ) { - categoryName = category._id.leafCategory.name; - } else if ( category._id.subCategory ) { - categoryName = category._id.subCategory.name; - } else { - categoryName = category._id.category.name; - } - - // if there is duplicated category then do not push to array, just add value to the existing category - let duplicatedNameIndex = -1; - for ( let i = 0; i < newEventsList.length; i++ ) { - if ( newEventsList[ i ].name === categoryName ) { - duplicatedNameIndex = i; - break; - } - } - if ( duplicatedNameIndex === -1 ) { - newEventsList.push( { - name: categoryName, - value: category.count - } ); - } else { - newEventsList[ duplicatedNameIndex ].value += category.count; - newEventsList.sort( ( x, y ) => x.value > y.value ? -1 : 1 ); - } - } ); - - return newEventsList; - } - - getContributorRate( username: string ) { - if ( environment.mockDataEnabled ) { - return of( { - userRating: 10, - numberOfRates: 3 - } ); - } else { - return this.http.get( `${ environment.serverUrl }/user-activity/user-rate?username=${ username }` ); - } - } - - getNumberOfEventsMade( username: string ) { - if ( environment.mockDataEnabled ) { - return of( { numberOfEventsMade: 4 } ); - } else { - return this.http.get( `${ environment.serverUrl }/user-activity/number-of-events-made?username=${ username }` ); - } - } - - getUnratedCompletedEvents() { - if ( environment.mockDataEnabled ) { - const getUnratedCompletedEventsData = [ { completedEvents: [] } ]; - unratedCompletedEventsData[ 0 ].completedEvents.forEach( ( val, index ) => { - getUnratedCompletedEventsData[ 0 ].completedEvents.push( Object.assign( {}, val ) ); - getUnratedCompletedEventsData[ 0 ].completedEvents[ index ].payload = Object.assign( {}, val.payload ); - } ); - return of( this.getUnratedCompletedEventsProcess( getUnratedCompletedEventsData ) ); - } else { - return this.http.get( `${ environment.serverUrl }/user-activity/event` ).pipe( map( response => { - this.getUnratedCompletedEventsProcess( response ); - } ) ); - } - } - - getUnratedCompletedEventsProcess( getUnratedCompletedEventsData: any ) { - getUnratedCompletedEventsData[ 0 ].completedEvents.map( event => { - const categoryResult = this.categoryService.getCategoryFromId( event.payload?.category, - event.payload?.subCategory, event.payload?.leafCategory ); - - if ( categoryResult.category ) { - event.payload.category = categoryResult.category; - } - - if ( categoryResult.subCategory ) { - event.payload.subCategory = categoryResult.subCategor; - } - - if ( categoryResult.leafCategory ) { - event.payload.leafCategory = categoryResult.leafCategory; - } - } ); - return getUnratedCompletedEventsData; - } - - rate( id: string, rate: number ) { - if ( !environment.mockDataEnabled ) { - return this.http.put( `${ environment.serverUrl }/user-activity/rate`, { - id, - rate - } ); - } - } - - getTopContributors( limit: number = 3 ) { - if ( environment.mockDataEnabled ) { - return of( [ { username: 'gandalf' }, { username: 'bilbo' }, { username: 'gollum' } ] ); - } else { - return this.http.get( `${ environment.serverUrl }/user-activity/top-users?limit=${ limit }` ); - } - } - - getNumberOfEventsTaken( username: string ) { - if ( environment.mockDataEnabled ) { - return of( [ { numberOfEventsTaken: 3 } ] ); - } else { - return this.http.get( `${ environment.serverUrl }/user-activity/number-of-events-taken?username=${ username }` ); - } - } -} diff --git a/src/app/service/util/util.service.ts b/src/app/service/util/util.service.ts index 2276825e..3df8cf9a 100644 --- a/src/app/service/util/util.service.ts +++ b/src/app/service/util/util.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core'; +import { environment } from '../../../environments/environment'; @Injectable( { providedIn: 'root', @@ -10,8 +11,7 @@ export class UtilService { isTouchDevice() { return ( ( 'ontouchstart' in window ) || - ( navigator.maxTouchPoints > 0 ) || - ( navigator.msMaxTouchPoints > 0 ) ); + ( navigator.maxTouchPoints > 0 ) ); } isSmallScreen() { @@ -54,4 +54,10 @@ export class UtilService { xmlHttpRequest.send(); } ); }; + + log( log: string ) { + if ( environment.identity !== 'production' ) { + console.log( log ); + } + } } diff --git a/src/assets/blog/what-is-open-template-hub.md b/src/assets/blog/what-is-open-template-hub.md index 3326fafb..b1c081c3 100644 --- a/src/assets/blog/what-is-open-template-hub.md +++ b/src/assets/blog/what-is-open-template-hub.md @@ -4,16 +4,15 @@ Open Template Hub is an Open Source First Organization that aims minimizing the effort while building a new software business. -### What does Open Template Hub provides to community? +### What does Open Template Hub provides to community? We, as Open Template Hub contributors, keep developing new functionalities and capabilities every week. You can create your microservices or create your mobile and web applications which are integrated with those microservices, that means you can create your own business ground up through Open Template Hub extremely fast. -Let's assume you have a new software business idea. Once you start implementation, you will need several -common capabilities like authentication, payment, file storage, analytics, business logic and in the end, you will need a web and mobile applications which are integrated with those capabilities, each and every time you have a new idea. Open Template Hub gives you that power to create and make them alive just in a couple of minutes! +Let's assume you have a new software business idea. Once you start implementation, you will need several common capabilities like authentication, payment, file storage, analytics, business logic and in the end, you will need a web and mobile applications which are integrated with those capabilities, each and every time you have a new idea. Open Template Hub gives you that power to create and make them alive just in a couple of minutes! ### You can create your microservices using Server Generator -Server Generator provides you the capability to generate many types of microservices with just one command. +Server Generator provides you the capability to generate many types of microservices with just one command. These are the service types you are able to generate for now: @@ -59,7 +58,7 @@ You can easily generate these servers, and deploy wherever you want; Heroku, GCP Application Generator provides you the capability to generate many types of applications with just one command. -These are the application types you are able to generate for now: +These are the application types you are able to generate for now: company-profile-ui-template @@ -82,7 +81,7 @@ Mobile UI Template is modern, responsive and customisable mobile ui template for You will have lots of components, screens and API calls are covered for authentication, payment, file storage, analytics, basic user profiles and controllers integrated with services endpoints. ### So, what's next? - + We have so many plans to keep enhancing our functionalities, services and increasing external provider support. Implementing stream server for meetings and chat supporting significant providers like Zoom and Google, implementing MQ flow for all our servers, more components for user interfaces with enhancing UX, automated CI flows for builds and tests, automated deployment scripts using Terraform/Terragrunt or using some other proper tech to decrease build time of your business from minutes to second. ### Last Words.. diff --git a/src/assets/common/activity.png b/src/assets/common/activity.png new file mode 100644 index 00000000..74857321 Binary files /dev/null and b/src/assets/common/activity.png differ diff --git a/src/assets/docs/generator/app-generator/README.md b/src/assets/docs/generator/app-generator/README.md deleted file mode 100644 index c54bf1ef..00000000 --- a/src/assets/docs/generator/app-generator/README.md +++ /dev/null @@ -1,85 +0,0 @@ -

- - Logo - -

- -

-Open Template Hub - UI Generator v3 -

- -[![Version](https://img.shields.io/npm/v/@open-template-hub/app-generator?color=CB3837&style=for-the-badge&logo=npm)](https://www.npmjs.com/package/@open-template-hub/app-generator) -[![Downloads](https://img.shields.io/npm/dt/@open-template-hub/app-generator?color=CB3837&logo=npm&style=for-the-badge)](https://www.npmjs.com/package/@open-template-hub/app-generator) -[![License](https://img.shields.io/github/license/open-template-hub/app-generator?color=43b043&style=for-the-badge)](LICENSE) -[![Issues](https://img.shields.io/github/issues/open-template-hub/app-generator?color=43b043&style=for-the-badge)](https://github.com/open-template-hub/app-generator/issues) -[![PRCLosed](https://img.shields.io/github/issues-pr-closed-raw/open-template-hub/app-generator?color=43b043&style=for-the-badge)](https://github.com/open-template-hub/app-generator/pulls?q=is%3Apr+is%3Aclosed) -[![LastCommit](https://img.shields.io/github/last-commit/open-template-hub/app-generator?color=43b043&style=for-the-badge)](https://github.com/open-template-hub/app-generator/commits/master) -[![Release](https://img.shields.io/github/release/open-template-hub/app-generator?include_prereleases&color=43b043&style=for-the-badge)](https://github.com/open-template-hub/app-generator/releases) -[![SonarCloud](https://img.shields.io/sonar/quality_gate/open-template-hub_app-generator?server=https%3A%2F%2Fsonarcloud.io&label=Sonar%20Cloud&style=for-the-badge&logo=sonarcloud)](https://sonarcloud.io/dashboard?id=open-template-hub_app-generator) -[![BTC](https://img.shields.io/badge/Donate-BTC-ORANGE?color=F5922F&style=for-the-badge&logo=bitcoin)](https://commerce.coinbase.com/checkout/8313af5f-de48-498d-b2cb-d98819ca7d5e) - -Command line interface generator of the user interfaces at [Open Template Hub](https://github.com/open-template-hub) - -Available UI types are: - -* [Web UI](https://github.com/open-template-hub/web-ui-template) -* [Mobile Application](https://github.com/open-template-hub/mobile-ui-template) -* [Company Profile UI](https://github.com/open-template-hub/company-profile-ui-template) - -## About the NPM Package - -### Package Installation - -```sh -npm install -g @open-template-hub/app-generator -``` - -### Package Usage - -Go to the directory on terminal where you want to generate the project. - -```sh -$ cd PATH -``` - -and run the generator command: - -```sh -$ open-template-hub-app-generator -``` - -# Sponsors - -No sponsors yet! **Will you be the first?** - -## Contributors - - - - - - - - - -

Furkan Yavuz
💬 📖 👀
Fatih Turker
💬 📖 👀
- - - - - -## Contributing - -Refer to **[CONTRIBUTING.md](https://github.com/open-template-hub/.github/blob/master/docs/CONTRIBUTING.md)** to see how to contribute to Open Template Hub. - -
- -## Code of Conduct - -Refer to **[CODE_OF_CONDUCT.md](https://github.com/open-template-hub/.github/blob/master/docs/CODE_OF_CONDUCT.md)** to see contributor covenant code of conduct. - -
- -## LICENSE - -The source code for this project is released under the [MIT License](LICENSE). diff --git a/src/assets/docs/generator/server-generator/README.md b/src/assets/docs/generator/server-generator/README.md deleted file mode 100644 index b41160e7..00000000 --- a/src/assets/docs/generator/server-generator/README.md +++ /dev/null @@ -1,88 +0,0 @@ -

- - Logo - -

- -

-Open Template Hub - Server Generator v3 -

- -[![Version](https://img.shields.io/npm/v/@open-template-hub/server-generator?color=CB3837&style=for-the-badge&logo=npm)](https://www.npmjs.com/package/@open-template-hub/server-generator) -[![Downloads](https://img.shields.io/npm/dt/@open-template-hub/server-generator?color=CB3837&logo=npm&style=for-the-badge)](https://www.npmjs.com/package/@open-template-hub/server-generator) -[![License](https://img.shields.io/github/license/open-template-hub/server-generator?color=43b043&style=for-the-badge)](LICENSE) -[![Issues](https://img.shields.io/github/issues/open-template-hub/server-generator?color=43b043&style=for-the-badge)](https://github.com/open-template-hub/server-generator/issues) -[![PRCLosed](https://img.shields.io/github/issues-pr-closed-raw/open-template-hub/server-generator?color=43b043&style=for-the-badge)](https://github.com/open-template-hub/server-generator/pulls?q=is%3Apr+is%3Aclosed) -[![LastCommit](https://img.shields.io/github/last-commit/open-template-hub/server-generator?color=43b043&style=for-the-badge)](https://github.com/open-template-hub/server-generator/commits/master) -[![Release](https://img.shields.io/github/release/open-template-hub/server-generator?include_prereleases&color=43b043&style=for-the-badge)](https://github.com/open-template-hub/server-generator/releases) -[![SonarCloud](https://img.shields.io/sonar/quality_gate/open-template-hub_server-generator?server=https%3A%2F%2Fsonarcloud.io&label=Sonar%20Cloud&style=for-the-badge&logo=sonarcloud)](https://sonarcloud.io/dashboard?id=open-template-hub_server-generator) -[![BTC](https://img.shields.io/badge/Donate-BTC-ORANGE?color=F5922F&style=for-the-badge&logo=bitcoin)](https://commerce.coinbase.com/checkout/8313af5f-de48-498d-b2cb-d98819ca7d5e) - -Command line interface generator of the servers at [Open Template Hub](https://github.com/open-template-hub) - -Available server types are: - -* [Payment Server](https://github.com/open-template-hub/payment-server-template) -* [Business Logic Server](https://github.com/open-template-hub/business-logic-server-template) -* [Auth Server](https://github.com/open-template-hub/auth-server-template) -* [File Storage Server](https://github.com/open-template-hub/file-storage-server-template) -* [Analytics Server](https://github.com/open-template-hub/analytics-server-template) -* [Mail Server](https://github.com/open-template-hub/mail-server-template) - -## About the NPM Package - -### Package Installation - -```sh -npm install -g @open-template-hub/server-generator -``` - -### Package Usage - -Go to the directory on terminal where you want to generate the project. - -```sh -$ cd PATH -``` - -and run the generator command: - -```sh -$ open-template-hub-server-generator -``` - -# Sponsors - -No sponsors yet! **Will you be the first?** - -## Contributors - - - - - - - - - -

Furkan Yavuz
💬 📖 👀
Fatih Turker
💬 📖 👀
- - - - - -## Contributing - -Refer to **[CONTRIBUTING.md](https://github.com/open-template-hub/.github/blob/master/docs/CONTRIBUTING.md)** to see how to contribute to Open Template Hub. - -
- -## Code of Conduct - -Refer to **[CODE_OF_CONDUCT.md](https://github.com/open-template-hub/.github/blob/master/docs/CODE_OF_CONDUCT.md)** to see contributor covenant code of conduct. - -
- -## LICENSE - -The source code for this project is released under the [MIT License](LICENSE). diff --git a/src/assets/docs/server/analytics-server-template/README.md b/src/assets/docs/server/analytics-server-template/README.md index 30fa6f5c..39ab41dd 100644 --- a/src/assets/docs/server/analytics-server-template/README.md +++ b/src/assets/docs/server/analytics-server-template/README.md @@ -5,7 +5,7 @@

-Open Template Hub - Analytics Server Template v3 +Open Template Hub - Analytics Server Template v5

[![License](https://img.shields.io/github/license/open-template-hub/analytics-server-template?color=43b043&style=for-the-badge)](LICENSE) diff --git a/src/assets/docs/server/auth-server-template/README.md b/src/assets/docs/server/auth-server-template/README.md index 290d5024..fffb45ba 100644 --- a/src/assets/docs/server/auth-server-template/README.md +++ b/src/assets/docs/server/auth-server-template/README.md @@ -5,7 +5,7 @@

-Open Template Hub - Auth Server Template v3 +Open Template Hub - Auth Server Template v5

[![License](https://img.shields.io/github/license/open-template-hub/auth-server-template?color=43b043&style=for-the-badge)](LICENSE) @@ -63,9 +63,9 @@ PROJECT=OTH MODULE=AuthServer ENVIRONMENT=Local -CLIENT_URL=http://localhost:4200 -CLIENT_RESET_PASSWORD_URL=http://localhost:4200/reset-password -CLIENT_VERIFICATION_SUCCESS_URL=http://localhost:4200/verify-account +CLIENT_URL=http://localhost:4201 +CLIENT_RESET_PASSWORD_URL=http://localhost:4201/reset-password +CLIENT_VERIFICATION_SUCCESS_URL=http://localhost:4201/verify-account DATABASE_URL={Database Connection Url} POSTGRESQL_CONNECTION_LIMIT={Postgresql Connection Limit} diff --git a/src/assets/docs/server/business-logic-server-template/README.md b/src/assets/docs/server/business-logic-server-template/README.md index 5bf1ac6f..347ae86b 100644 --- a/src/assets/docs/server/business-logic-server-template/README.md +++ b/src/assets/docs/server/business-logic-server-template/README.md @@ -5,7 +5,7 @@

-Open Template Hub - Business Logic Server Template v3 +Open Template Hub - Business Logic Server Template v5

[![License](https://img.shields.io/github/license/open-template-hub/business-logic-server-template?color=43b043&style=for-the-badge)](LICENSE) diff --git a/src/assets/docs/server/file-storage-server-template/README.md b/src/assets/docs/server/file-storage-server-template/README.md index eafb94be..1884c997 100644 --- a/src/assets/docs/server/file-storage-server-template/README.md +++ b/src/assets/docs/server/file-storage-server-template/README.md @@ -5,7 +5,7 @@

-Open Template Hub - File Storage Server Template v3 +Open Template Hub - File Storage Server Template v5

[![License](https://img.shields.io/github/license/open-template-hub/file-storage-server-template?color=43b043&style=for-the-badge)](LICENSE) diff --git a/src/assets/docs/server/mail-server-template/README.md b/src/assets/docs/server/mail-server-template/README.md index 6e872390..9169c8b3 100644 --- a/src/assets/docs/server/mail-server-template/README.md +++ b/src/assets/docs/server/mail-server-template/README.md @@ -5,7 +5,7 @@

-Open Template Hub - Mail Server Template v3 +Open Template Hub - Mail Server Template v5

[![License](https://img.shields.io/github/license/open-template-hub/mail-server-template?color=43b043&style=for-the-badge)](LICENSE) diff --git a/src/assets/docs/server/payment-server-template/README.md b/src/assets/docs/server/payment-server-template/README.md index 15ebde78..817ef4af 100644 --- a/src/assets/docs/server/payment-server-template/README.md +++ b/src/assets/docs/server/payment-server-template/README.md @@ -5,7 +5,7 @@

-Open Template Hub - Payment Server Template v3 +Open Template Hub - Payment Server Template v5

[![License](https://img.shields.io/github/license/open-template-hub/payment-server-template?color=43b043&style=for-the-badge)](LICENSE) diff --git a/src/assets/docs/server/sms-server-template/README.md b/src/assets/docs/server/sms-server-template/README.md new file mode 100644 index 00000000..4171a364 --- /dev/null +++ b/src/assets/docs/server/sms-server-template/README.md @@ -0,0 +1,147 @@ +

+ + Logo + +

+ +

+Open Template Hub - SMS Server Template v5 +

+ +[![License](https://img.shields.io/github/license/open-template-hub/sms-server-template?color=43b043&style=for-the-badge)](LICENSE) +[![Issues](https://img.shields.io/github/issues/open-template-hub/sms-server-template?color=43b043&style=for-the-badge)](https://github.com/open-template-hub/sms-server-template/issues) +[![PRCLosed](https://img.shields.io/github/issues-pr-closed-raw/open-template-hub/sms-server-template?color=43b043&style=for-the-badge)](https://github.com/open-template-hub/sms-server-template/pulls?q=is%3Apr+is%3Aclosed) +[![LastCommit](https://img.shields.io/github/last-commit/open-template-hub/sms-server-template?color=43b043&style=for-the-badge)](https://github.com/open-template-hub/sms-server-template/commits/master) +[![Release](https://img.shields.io/github/release/open-template-hub/sms-server-template?include_prereleases&color=43b043&style=for-the-badge)](https://github.com/open-template-hub/sms-server-template/releases) +[![SonarCloud](https://img.shields.io/sonar/quality_gate/open-template-hub_sms-server-template?server=https%3A%2F%2Fsonarcloud.io&label=Sonar%20Cloud&style=for-the-badge&logo=sonarcloud)](https://sonarcloud.io/dashboard?id=open-template-hub_sms-server-template) + +SMS Server Template is a generic open-source sms server that has a simple yet powerful design to connect your business with third-party sms service providers (like Twilio, Amazon SNS). + +## Ways to Begin + +### 1. Express Deploy + +Deploy this template to Heroku + +[![Deploy](https://img.shields.io/badge/Deploy_to-Heroku-7056bf.svg?style=for-the-badge&logo=heroku)](https://heroku.com/deploy?template=https://github.com/open-template-hub/sms-server-template) + +### 2. Start with Server Generator + +Create your server with Server Generator Package + +[![NPM](https://img.shields.io/badge/NPM-server_generator-cb3837.svg?style=for-the-badge&logo=npm)](https://www.npmjs.com/package/@open-template-hub/server-generator) + +### 3. GitHub Template + +Use this repository as a Template + +[![GitHubTemplate](https://img.shields.io/badge/GitHub-Template-24292e.svg?style=for-the-badge&logo=github)](https://github.com/open-template-hub/sms-server-template/generate) + +## Installations + +Install **nodejs** and **npm** via **[nodejs.org](https://nodejs.org)**. + +Check installed versions of **nodejs** and **npm** via running following commands: + +``` +node -v +npm -v +``` + +Check project's current **nodejs** and **npm** version from **[package.json](package.json)**. + +## Environment Variables + +If you don't give **RESPONSE_ENCRYPTION_SECRET**, response encryption mechanism will be disabled automatically. + +``` applescript +PORT=4007 + +PROJECT=OTH +MODULE=SmsServer +ENVIRONMENT=Local + +MONGODB_URI={Database Connection Url} +MONGODB_CONNECTION_LIMIT={MongoDB Connection Limit} + +CLOUDAMQP_APIKEY={MQ Api Key} +CLOUDAMQP_URL={MQ Connection Url} + +SMS_SERVER_QUEUE_CHANNEL=oth_sms_queue +ORCHESTRATION_SERVER_QUEUE_CHANNEL=oth_orchestration_queue + +ACCESS_TOKEN_SECRET={Access Token Secret} +RESPONSE_ENCRYPTION_SECRET={Response Encryption Secret} +``` + +### Example Preconfigured Message: + +```json + { + "key": "2FACodeSend", + "messages": [ + { + "language": "en", + "message": "Hello ${username}, here is your two factor authentication code ${twoFactorCode}" + } + ], + "payload": { + "twilio": { + "from": "{Your Twillio Phone Number}" + } + } + } +``` + +### Service Provider Configurations + +#### Twillio Config: + +```json + { + "key": "TWILIO", + "description": "Twilio SMS Provider", + "payload": { + "accountId": "{Your Twillio Account Id}", + "authToken": "{Your Twillio Account Token}", + "serviceId": "{Your Twillio Service Id}", + "from": "{Your Twillio Phone Number}" + } + } +``` + +## Http Requests + +You can find list of available http request in the [requests](assets/requests) directory. You can run http requests directly via **WebStorm**, for more information check out: [jetbrains.com/help/idea/http-client-in-product-code-editor.html](https://jetbrains.com/help/idea/http-client-in-product-code-editor.html) + +## Contributors + + + + + + + + + + +

Furkan Yavuz
💬 📖 👀
Fatih Turker
💬 📖 👀
Mert Sarac
💬 📖 👀
+ + + + +## Contributing + +Refer to **[CONTRIBUTING.md](https://github.com/open-template-hub/.github/blob/master/docs/CONTRIBUTING.md)** to see how to contribute to Open Template Hub. + +
+ +## Code of Conduct + +Refer to **[CODE_OF_CONDUCT.md](https://github.com/open-template-hub/.github/blob/master/docs/CODE_OF_CONDUCT.md)** to see contributor covenant code of conduct. + +
+ +## LICENSE + +The source code for this project is released under the [MIT License](LICENSE). diff --git a/src/assets/docs/user-interface/company-profile-ui-template/README.md b/src/assets/docs/user-interface/company-profile-ui-template/README.md deleted file mode 100644 index 09ab1909..00000000 --- a/src/assets/docs/user-interface/company-profile-ui-template/README.md +++ /dev/null @@ -1,198 +0,0 @@ -

- - Logo - -

- -

-Open Template Hub - Company Profile UI Template v3 -

- -[![License](https://img.shields.io/github/license/open-template-hub/company-profile-ui-template?color=43b043&style=for-the-badge)](LICENSE) -[![Issues](https://img.shields.io/github/issues/open-template-hub/company-profile-ui-template?color=43b043&style=for-the-badge)](https://github.com/open-template-hub/company-profile-ui-template/issues) -[![PRCLosed](https://img.shields.io/github/issues-pr-closed-raw/open-template-hub/company-profile-ui-template?color=43b043&style=for-the-badge)](https://github.com/open-template-hub/company-profile-ui-template/pulls?q=is%3Apr+is%3Aclosed) -[![LastCommit](https://img.shields.io/github/last-commit/open-template-hub/company-profile-ui-template?color=43b043&style=for-the-badge)](https://github.com/open-template-hub/company-profile-ui-template/commits/master) -[![Release](https://img.shields.io/github/release/open-template-hub/company-profile-ui-template?include_prereleases&color=43b043&style=for-the-badge)](https://github.com/open-template-hub/company-profile-ui-template/releases) -[![Lighthouse](https://img.shields.io/badge/LIGHTHOUSE-report-43b043.svg?style=for-the-badge&logo=lighthouse)](docs/lighthouse-report-desktop.html) -[![SonarCloud](https://img.shields.io/sonar/quality_gate/open-template-hub_company-profile-ui-template?server=https%3A%2F%2Fsonarcloud.io&label=Sonar%20Cloud&style=for-the-badge&logo=sonarcloud)](https://sonarcloud.io/dashboard?id=open-template-hub_company-profile-ui-template) -[![BTC](https://img.shields.io/badge/Donate-BTC-ORANGE?color=F5922F&style=for-the-badge&logo=bitcoin)](https://commerce.coinbase.com/checkout/8313af5f-de48-498d-b2cb-d98819ca7d5e) - -Company Profile UI Template is modern, responsive and customisable company profile ui template for your business. It contains reusable components, theme color and design support along with dark theme support. (generated from [Web UI Template](https://github.com/open-template-hub/web-ui-template)) - -

- For demo click the image below ⬇️ -

- -

- - Screenshot - -

- -## Ways to Begin - -### 1. Express Deploy - -Deploy this template to Heroku - -[![Deploy](https://img.shields.io/badge/Deploy_to-Heroku-7056bf.svg?style=for-the-badge&logo=heroku)](https://heroku.com/deploy?template=https://github.com/open-template-hub/company-profile-ui-template) - -### 2. Start with UI Generator - -Create your UI with UI Generator Package - -[![NPM](https://img.shields.io/badge/NPM-ui_generator-cb3837.svg?style=for-the-badge&logo=npm)](https://www.npmjs.com/package/@open-template-hub/app-generator) - -### 3. GitHub Template - -Use this repository as a Template - -[![GitHubTemplate](https://img.shields.io/badge/GitHub-Template-24292e.svg?style=for-the-badge&logo=github)](https://github.com/open-template-hub/company-profile-ui-template/generate) - -## Installations - -Install **nodejs** and **npm** via **[nodejs.org](https://nodejs.org)**. - -Check installed versions of **nodejs** and **npm** via running following commands: - -``` -node -v -npm -v -``` - -## WebStorm Configurations - -If you imported project into **WebStorm** you will see following run configurations: - -### 1. Install - -**[install.run.xml](.run/install.run.xml)** - -### 2. Build - -**[buildLocal.run.xml](.run/buildLocal.run.xml)** - -**[buildLocalToStagingApi.run.xml](.run/buildLocalToStagingApi.run.xml)** - -**[buildStaging.run.xml](.run/buildStaging.run.xml)** - -**[buildProd.run.xml](.run/buildProd.run.xml)** - -### 3. Start - -**[startLocal.run.xml](.run/startLocal.run.xml)** - -**[startLocalFromIPhone.run.xml](.run/startLocalFromIPhone.run.xml)** - -**[startLocalToStagingApi.run.xml](.run/startLocalToStagingApi.run.xml)** - -**[startLocalFromIPhoneToStagingApi.run.xml](.run/startLocalFromIPhoneToStagingApi.run.xml)** - -**[startStaging.run.xml](.run/startStaging.run.xml)** - -**[start.run.xml](.run/start.run.xml)** - -### 4. Debug - -**[debug.run.xml](.run/debug.run.xml)** - -### 5. Dependency Management - -**[outdated.run.xml](.run/outdated.run.xml)** - -**[update.run.xml](.run/update.run.xml)** - -
- -## Local Deployment and Debug - -In order to deploy and debug locally, run following configurations in order: - -1. **[install.run.xml](.run/install.run.xml)** -2. **[buildLocal.run.xml](.run/buildLocal.run.xml)** -3. **startLocal** - 1. **[startLocal.run.xml](.run/startLocal.run.xml) (uses local api)** - 2. **[startLocalFromIPhone.run.xml](.run/startLocalFromIPhone.run.xml) (uses local api - accessible from iphone)** - 3. **[startLocalToStagingApi.run.xml](.run/startLocalToStagingApi.run.xml) (uses staging api)** - 4. **[startLocalFromIPhoneToStagingApi.run.xml](.run/startLocalFromIPhoneToStagingApi.run.xml) (uses staging api - accessible from iphone)** -4. **[debug.run.xml](.run/debug.run.xml)** - -
- -## Environment Variables - -If you run **WebStorm**'s **[env.run.xml](.run/env.run.xml)** configuration you will see following variables generated in **.env** file. Set them appropriately. - -```applescript -PORT=4200 -``` - -
- -Check project's current **nodejs** and **npm** version from **[package.json](package.json)**. - -## Brand Color Scale Generator - -To be able to generate brand color scales, we are using **[Colllor](http://colllor.com)**. - -
- -## Favicon Generation - -To be able to generate favicon, refer to **[FAVICON_GENERATION.md](docs/FAVICON_GENERATION.md)** file. - -
- -## Cookie Policy Generation - -To be able to generate cookie policy, use **[cookiepolicygenerator](https://www.cookiepolicygenerator.com)** site. - -
- -## Outdated - -Refer to **[OUTDATED.md](docs/OUTDATED.md)** to see outdated npm packages and update them with your own risk. - -
- -## Localization - -To be able to generate or update localization, use [updateMessages.run.xml](.run/updateMessages.run.xml). - -
- -## Contributors - - - - - - - - - - -

Furkan Yavuz
💬 📖 👀
Fatih Turker
💬 📖 👀
Mert Sarac
💬 📖 👀
- - - - - -## Contributing - -Refer to **[CONTRIBUTING.md](https://github.com/open-template-hub/.github/blob/master/docs/CONTRIBUTING.md)** to see how to contribute to Open Template Hub. - -
- -## Code of Conduct - -Refer to **[CODE_OF_CONDUCT.md](https://github.com/open-template-hub/.github/blob/master/docs/CODE_OF_CONDUCT.md)** to see contributor covenant code of conduct. - -
- -## LICENSE - -The source code for this project is released under the [MIT License](LICENSE). - - -
othOpen Template Hub © 2021
diff --git a/src/assets/docs/user-interface/mobile-ui-template/README.md b/src/assets/docs/user-interface/mobile-ui-template/README.md deleted file mode 100644 index 57e38295..00000000 --- a/src/assets/docs/user-interface/mobile-ui-template/README.md +++ /dev/null @@ -1,165 +0,0 @@ -

- - Logo - -

- -

-Open Template Hub - Mobile UI Template v3 -

- -[![License](https://img.shields.io/github/license/open-template-hub/mobile-ui-template?color=43b043&style=for-the-badge)](LICENSE) -[![Issues](https://img.shields.io/github/issues/open-template-hub/mobile-ui-template?color=43b043&style=for-the-badge)](https://github.com/open-template-hub/mobile-ui-template/issues) -[![PRCLosed](https://img.shields.io/github/issues-pr-closed-raw/open-template-hub/mobile-ui-template?color=43b043&style=for-the-badge)](https://github.com/open-template-hub/mobile-ui-template/pulls?q=is%3Apr+is%3Aclosed) -[![LastCommit](https://img.shields.io/github/last-commit/open-template-hub/mobile-ui-template?color=43b043&style=for-the-badge)](https://github.com/open-template-hub/mobile-ui-template/commits/master) -[![Release](https://img.shields.io/github/release/open-template-hub/mobile-ui-template?include_prereleases&color=43b043&style=for-the-badge)](https://github.com/open-template-hub/mobile-ui-template/releases) -[![SonarCloud](https://img.shields.io/sonar/quality_gate/open-template-hub_mobile-ui-template?server=https%3A%2F%2Fsonarcloud.io&label=Sonar%20Cloud&style=for-the-badge&logo=sonarcloud)](https://sonarcloud.io/dashboard?id=open-template-hub_mobile-ui-template) -[![BTC](https://img.shields.io/badge/Donate-BTC-ORANGE?color=F5922F&style=for-the-badge&logo=bitcoin)](https://commerce.coinbase.com/checkout/8313af5f-de48-498d-b2cb-d98819ca7d5e) - -Mobile UI Template is modern, responsive and customisable mobile ui template for your business. It contains reusable components, theme color and design support along with dark theme support. - -

- - Screenshot - -

- -## Ways to Begin - -### 1. Start with UI Generator - -Create your UI with UI Generator Package - -[![NPM](https://img.shields.io/badge/NPM-ui_generator-cb3837.svg?style=for-the-badge&logo=npm)](https://www.npmjs.com/package/@open-template-hub/app-generator) - -### 2. GitHub Template - -Use this repository as a Template - -[![GitHubTemplate](https://img.shields.io/badge/GitHub-Template-24292e.svg?style=for-the-badge&logo=github)](https://github.com/open-template-hub/mobile-ui-template/generate) - -## Installations - -Install **nodejs** and **npm** via **[nodejs.org](https://nodejs.org)**. - -Check installed versions of **nodejs** and **npm** via running following commands: - -``` -node -v -npm -v -``` - -Check project's current **nodejs** and **npm** version from **[package.json](package.json)**. - -## Configuration - -* Open **app/config/app.config.ts** and update values for all config items with your product. - -* Set you App Menu Style preference in **constant/theme.constant.ts**, you can choose Left Menu or Tab Menu. - -## Architecture - -* **component** - Holds app components - -* **config** - Holds app configuration - -* **constant** - Holds app constants - -* **controller** - Holds app controllers, api communications - -* **enum** - Holds app enumarations - -* **i18n** - Holds localizations - -* **interface** - Holds app interfaces - -* **screen** - Holds app screens - -* **util** - Holds app utilizations - -## Configuration For Rebuild (Risky) - -* Update your App name in **app.json** - -* To rebuild android and ios folders, remove them and run command: - For Linux and Mac: - ``` - npm run-script build - ``` - - For Windows: - ``` - npm run-script build-windows - ``` - -* Open build.gradle under android folder and update from: - ``` - classpath("com.android.tools.build:gradle:3.5.3") - ``` - **to**: - ``` - classpath("com.android.tools.build:gradle:3.5.4") - ``` - -* Enable multidex - ``` - android { - - defaultConfig { - ... - - // Enabling multidex support. - multiDexEnabled true - } - ... - } - ``` - -* Make sure set proper memory in gradle.properties: - ``` - org.gradle.jvmargs=-Xmx4096m - ``` - -* Initialize your Facebook & Google Apps and update **app.config.ts** under app/config - -## Contributors - - - - - - - - - -

Furkan Yavuz
💬 📖 👀
Fatih Turker
💬 📖 👀
- - - - - -## Contributing - -Refer to **[CONTRIBUTING.md](https://github.com/open-template-hub/.github/blob/master/docs/CONTRIBUTING.md)** to see how to contribute to Open Template Hub. - -
- -## Code of Conduct - -Refer to **[CODE_OF_CONDUCT.md](https://github.com/open-template-hub/.github/blob/master/docs/CODE_OF_CONDUCT.md)** to see contributor covenant code of conduct. - -
- -## LICENSE - -The source code for this project is released under the [MIT License](LICENSE). - diff --git a/src/assets/docs/user-interface/web-ui-template/README.md b/src/assets/docs/user-interface/web-ui-template/README.md deleted file mode 100644 index ae42e1bc..00000000 --- a/src/assets/docs/user-interface/web-ui-template/README.md +++ /dev/null @@ -1,159 +0,0 @@ -

- - Logo - -

- -

-Open Template Hub - Web UI Template v3 -

- -[![License](https://img.shields.io/github/license/open-template-hub/web-ui-template?color=2F7488&style=for-the-badge)](LICENSE) -[![Issues](https://img.shields.io/github/issues/open-template-hub/web-ui-template?color=2F7488&style=for-the-badge)](https://github.com/open-template-hub/web-ui-template/issues) -[![PRCLosed](https://img.shields.io/github/issues-pr-closed-raw/open-template-hub/web-ui-template?color=2F7488&style=for-the-badge)](https://github.com/open-template-hub/web-ui-template/pulls?q=is%3Apr+is%3Aclosed) -[![LastCommit](https://img.shields.io/github/last-commit/open-template-hub/web-ui-template?color=2F7488&style=for-the-badge)](https://github.com/open-template-hub/web-ui-template/commits/master) -[![Release](https://img.shields.io/github/release/open-template-hub/web-ui-template?include_prereleases&color=2F7488&style=for-the-badge)](https://github.com/open-template-hub/web-ui-template/releases) -[![SonarCloud](https://img.shields.io/sonar/quality_gate/open-template-hub_web-ui-template?server=https%3A%2F%2Fsonarcloud.io&label=Sonar%20Cloud&style=for-the-badge&logo=sonarcloud)](https://sonarcloud.io/dashboard?id=open-template-hub_web-ui-template) -[![BTC](https://img.shields.io/badge/Donate-BTC-ORANGE?color=F5922F&style=for-the-badge&logo=bitcoin)](https://commerce.coinbase.com/checkout/8313af5f-de48-498d-b2cb-d98819ca7d5e) - -Responsive Web UI template with sign-up, login and social login functionality - -

- For demo click the image below ⬇️ -

- -

- - Screenshot - -

- -## Ways to Begin - -### 1. Express Deploy - -Deploy this template to Heroku - -[![Deploy](https://img.shields.io/badge/Deploy_to-Heroku-7056bf.svg?style=for-the-badge&logo=heroku)](https://heroku.com/deploy?template=https://github.com/open-template-hub/web-ui-template) - -### 2. GitHub Template - -Use this repository as a Template - -[![GitHubTemplate](https://img.shields.io/badge/GitHub-Template-24292e.svg?style=for-the-badge&logo=github)](https://github.com/open-template-hub/web-ui-template/generate) - -## Installations - -Install **nodejs** and **npm** via **[nodejs.org](https://nodejs.org)**. - -Check installed versions of **nodejs** and **npm** via running following commands: - -``` -node -v -npm -v -``` - -## WebStorm Configurations - -If you imported project into **WebStorm** you will see following run configurations: - -### 1. Install - -**[install.run.xml](.run/install.run.xml)** - -### 2. Build - -**[buildLocal.run.xml](.run/buildLocal.run.xml)** - -**[buildLocalToStagingApi.run.xml](.run/buildLocalToStagingApi.run.xml)** - -**[buildStaging.run.xml](.run/buildStaging.run.xml)** - -**[buildProd.run.xml](.run/buildProd.run.xml)** - -### 3. Start - -**[startLocal.run.xml](.run/startLocal.run.xml)** - -**[startLocalFromIPhone.run.xml](.run/startLocalFromIPhone.run.xml)** - -**[startLocalToStagingApi.run.xml](.run/startLocalToStagingApi.run.xml)** - -**[startLocalFromIPhoneToStagingApi.run.xml](.run/startLocalFromIPhoneToStagingApi.run.xml)** - -**[startStaging.run.xml](.run/startStaging.run.xml)** - -**[start.run.xml](.run/start.run.xml)** - -### 4. Debug - -**[debug.run.xml](.run/debug.run.xml)** - -### 5. Dependency Management - -**[outdated.run.xml](.run/outdated.run.xml)** - -**[update.run.xml](.run/update.run.xml)** - -
- -## Local Deployment and Debug - -In order to deploy and debug locally, run following configurations in order: - -1. **[install.run.xml](.run/install.run.xml)** -2. **[buildLocal.run.xml](.run/buildLocal.run.xml)** -3. **startLocal** - 1. **[startLocal.run.xml](.run/startLocal.run.xml) (uses local api)** - 2. **[startLocalFromIPhone.run.xml](.run/startLocalFromIPhone.run.xml) (uses local api - accessible from iphone)** - 3. **[startLocalToStagingApi.run.xml](.run/startLocalToStagingApi.run.xml) (uses staging api)** - 4. **[startLocalFromIPhoneToStagingApi.run.xml](.run/startLocalFromIPhoneToStagingApi.run.xml) (uses staging api - accessible from iphone)** -4. **[debug.run.xml](.run/debug.run.xml)** - -
- -## Environment Variables - -If you run **WebStorm**'s **[env.run.xml](.run/env.run.xml)** configuration you will see following variables generated in **.env** file. Set them appropriately. - -```applescript -PORT=4200 -``` - -
- - -Check project's current **nodejs** and **npm** version from **[package.json](package.json)**. - -## Contributors - - - - - - - - - - -

Furkan Yavuz
💬 📖 👀
Fatih Turker
💬 📖 👀
Mert Sarac
💬 📖 👀
- - - - - -## Contributing - -Refer to **[CONTRIBUTING.md](https://github.com/open-template-hub/.github/blob/master/docs/CONTRIBUTING.md)** to see how to contribute to Open Template Hub. - -
- -## Code of Conduct - -Refer to **[CODE_OF_CONDUCT.md](https://github.com/open-template-hub/.github/blob/master/docs/CODE_OF_CONDUCT.md)** to see contributor covenant code of conduct. - -
- -## LICENSE - -The source code for this project is released under the [MIT License](LICENSE). diff --git a/src/dependency-checker.ts b/src/dependency-checker.ts index 3f290c92..acd1d9e9 100644 --- a/src/dependency-checker.ts +++ b/src/dependency-checker.ts @@ -5,6 +5,8 @@ const lines = outdatedCmd.stdout.toString().split( '\n' ); const columnIndexes = [ 0, 0, 0, 0 ]; +let indexOfDependedBy = -1; + console.log( '

\n' + ' \n' + @@ -14,7 +16,7 @@ console.log( '\n' + '\n' + '

\n' + - 'Open Template Hub - Web UI Template v3\n' + + 'Open Template Hub - Web UI Template v5\n' + '
\n' + '(outdated packages)\n' + '

\n' + @@ -34,13 +36,34 @@ for ( const line of lines ) { columnIndexes[ 3 ] = line.indexOf( 'Location' ) + 9; } - let modifiedLine = line; + let modifiedLine = ''; if ( columnIndexes [ 0 ] >= 0 ) { - for ( const columnIndex of columnIndexes ) { - modifiedLine = modifiedLine.substring( 0, columnIndex ) + ' | ' + modifiedLine.substring( columnIndex, modifiedLine.length ); + const stringParts = line.split( /(\s+)/ ); + + modifiedLine += '| '; + + for ( let i = 0; i < stringParts.length; ++i ) { + const part = stringParts[ i ]; + + if ( lines.indexOf( line ) === 0 && i < stringParts.length - 1 && stringParts[ i + 1 ] === 'Depended' ) { + indexOfDependedBy = i; + } + + if ( indexOfDependedBy !== -1 && i >= indexOfDependedBy ) { + continue; + } + + if ( part.match( /\s+/ ) ) { + modifiedLine += ' | '; + } else { + modifiedLine += part; + } } - console.log( '| ' + modifiedLine + ' |' ); + + modifiedLine += ' |'; + + console.log( modifiedLine ); } else { console.log( modifiedLine ); } @@ -52,5 +75,5 @@ for ( const line of lines ) { console.log( '\n' + - '
othOpen Template Hub © 2021
\n' + '
othOpen Template Hub © 2023
\n' ); diff --git a/src/environments/environment-common.ts b/src/environments/environment-common.ts index e4dbbba3..40293081 100644 --- a/src/environments/environment-common.ts +++ b/src/environments/environment-common.ts @@ -1,41 +1,33 @@ +import { EnvironmentCommonModel } from '../app/model/environment-common/environment-common.model'; import { environment } from './environment'; -export const environmentCommon = { - oth: { +export const environmentCommon: EnvironmentCommonModel = { + company: { + website: 'https://opentemplatehub.com', + email: 'info@opentemplatehub.com', social: { twitter: 'opentemplatehub', linkedin: 'open-template-hub', github: 'open-template-hub', productHunt: '@open_template_hub', - npm: '@open-template-hub' - }, - email: 'info@opentemplatehub.com' + npm: '@open-template-hub', + discord: 'wa9hmmR' + } }, website: { // oauth - twitter: { - logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/third-parties/logo/twitter.png', - cssClass: 'twitter', - url: 'https://twitter.com', - shareUrl: 'https://twitter.com/intent/tweet?url=', - callbackParams: [ 'oauth_token', 'oauth_verifier' ], - tag: environment.oauth.twitter.tag, - }, google: { + name: 'Google', logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/third-parties/logo/google.png', cssClass: 'google', + url: 'https://google.com', callbackParams: [ 'code', 'state' ], tag: environment.oauth.google.tag, - }, - facebook: { - logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/third-parties/logo/facebook.png', - cssClass: 'facebook-f', - url: 'https://facebook.com', - callbackParams: [ 'code' ], - tag: environment.oauth.facebook.tag, + websiteType: 'oauth' }, linkedin: { + name: 'LinkedIn', logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/third-parties/logo/linkedin.png', cssClass: 'linkedin-in', url: 'https://www.linkedin.com', @@ -43,14 +35,10 @@ export const environmentCommon = { shareUrl: 'https://www.linkedin.com/sharing/share-offsite/?url=', callbackParams: [ 'code', 'state' ], tag: environment.oauth.linkedin.tag, - }, - twitch: { - logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/third-parties/logo/twitch.png', - cssClass: 'twitch', - callbackParams: [ 'code', 'state' ], - tag: environment.oauth.twitch.tag, + websiteType: 'oauth' }, github: { + name: 'GitHub', logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/third-parties/logo/github.png', cssClass: 'github', url: 'https://github.com', @@ -58,117 +46,215 @@ export const environmentCommon = { tag: environment.oauth.github.tag, api: { repo: 'https://api.github.com/repos' - } + }, + websiteType: 'oauth' + }, + facebook: { + name: 'Facebook', + logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/third-parties/logo/facebook.png', + cssClass: 'facebook-f', + url: 'https://facebook.com', + callbackParams: [ 'code' ], + tag: environment.oauth.facebook.tag, + websiteType: 'oauth' + }, + twitter: { + name: 'Twitter', + logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/third-parties/logo/twitter.png', + cssClass: 'twitter', + url: 'https://twitter.com', + shareUrl: 'https://twitter.com/intent/tweet?url=', + callbackParams: [ 'oauth_token', 'oauth_verifier' ], + tag: environment.oauth.twitter.tag, + websiteType: 'oauth', + }, + twitch: { + name: 'Twitch', + logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/third-parties/logo/twitch.png', + cssClass: 'twitch', + callbackParams: [ 'code', 'state' ], + tag: environment.oauth.twitch.tag, + websiteType: 'oauth' }, dribbble: { + name: 'Dribbble', logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/third-parties/logo/dribbble.png', cssClass: 'dribbble', callbackParams: [ 'code', 'state' ], tag: environment.oauth.dribbble.tag, + websiteType: 'oauth' }, reddit: { + name: 'Reddit', logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/third-parties/logo/reddit.png', - cssClass: 'reddit-alien', + cssClass: 'reddit', callbackParams: [ 'code', 'state' ], tag: environment.oauth.reddit.tag, + websiteType: 'oauth' }, // payment stripe: { + name: 'Stripe', logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/third-parties/logo/stripe.png', cssClass: 'stripe-s', tag: environment.payment.stripe.tag, - publishableKey: environment.payment.stripe.publishableKey + publishableKey: environment.payment.stripe.publishableKey, + websiteType: 'payment' }, coinbase: { + name: 'Coinbase', logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/third-parties/logo/coinbase.png', cssClass: 'coinbase', tag: environment.payment.coinbase.tag, + websiteType: 'payment' }, paypal: { + name: 'PayPal', logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/third-parties/logo/paypal.png', cssClass: 'paypal', version: '5.0.128', tag: environment.payment.paypal.tag, clientId: environment.payment.paypal.clientId, - env: environment.payment.paypal.env + env: environment.payment.paypal.env, + websiteType: 'payment' }, // file storage aws: { + name: 'Aws', logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/third-parties/logo/aws.png', cssClass: 'aws', url: 'https://aws.amazon.com', tag: environment.fileStorage.aws.tag, + websiteType: 'file-storage' }, googleCloud: { + name: 'Google Cloud', logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/third-parties/logo/google-cloud.png', cssClass: 'google-cloud', url: 'https://cloud.google.com/storage', tag: environment.fileStorage.googleCloud.tag, + websiteType: 'file-storage' }, // mail gmail: { + name: 'Gmail', logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/third-parties/logo/gmail.png', cssClass: 'gmail', url: 'https://gmail.com', tag: environment.mail.gmail.tag, + websiteType: 'mail' }, yahoo: { + name: 'Yahoo', logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/third-parties/logo/yahoo.png', cssClass: 'yahoo', url: 'https://yahoo.com', tag: environment.mail.yahoo.tag, + websiteType: 'mail' }, outlook: { + name: 'Outlook', logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/third-parties/logo/outlook.png', cssClass: 'outlook', url: 'https://outlook.com', tag: environment.mail.outlook.tag, + websiteType: 'mail' + }, + + // sms + twillio: { + name: 'Twillio', + logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/third-parties/logo/twillio.png', + cssClass: 'twillio', + url: 'https://www.twilio.com', + tag: environment.sms.twillio.tag, + websiteType: 'sms' + }, + awsSns: { + name: 'Aws Sns', + logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/third-parties/logo/aws-sns.png', + cssClass: 'aws', + url: 'https://aws.amazon.com', + tag: environment.sms.awsSns.tag, + websiteType: 'sms' }, // analytics googleAnalytics: { + name: 'Google Analytics', logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/third-parties/logo/google-analytics.png', cssClass: 'google', url: 'https://analytics.google.com', tag: environment.analytics.googleAnalytics.tag, + websiteType: 'analytics' }, matomo: { + name: 'Matomo', logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/third-parties/logo/matomo.png', cssClass: 'matomo', url: 'https://matomo.org', tag: environment.analytics.matomo.tag, + websiteType: 'analytics' + }, + mixPanel: { + name: 'Mixpanel', + logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/third-parties/logo/mixpanel.png', + cssClass: 'mixpanel', + url: 'https://mixpanel.com', + tag: environment.analytics.mixPanel.tag, + websiteType: 'analytics' }, // other instagram: { + name: 'Instagram', cssClass: 'instagram', - url: 'https://www.instagram.com' + url: 'https://www.instagram.com', + websiteType: 'other' }, youtube: { + name: 'YouTube', cssClass: 'youtube', - url: 'https://youtube.com' + url: 'https://youtube.com', + channelUrl: 'https://youtube.com/channel', + websiteType: 'other' }, productHunt: { + name: 'Product Hunt', cssClass: 'product-hunt', - url: 'https://www.producthunt.com' + url: 'https://www.producthunt.com', + websiteType: 'other' }, appleCalendar: { + name: 'Apple Calendar', logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/third-parties/logo/apple-calendar.png', - cssClass: 'apple-calendar' + cssClass: 'apple-calendar', + websiteType: 'other' }, googleCalendar: { + name: 'Google Calendar', logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/third-parties/logo/google-calendar.png', - cssClass: 'google-calendar' + cssClass: 'google-calendar', + websiteType: 'other' + }, + discord: { + name: 'Discord', + logo: 'https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/third-parties/logo/discord.png', + cssClass: 'discord', + websiteType: 'other', + companyUrl: 'https://discord.gg' }, npm: { + name: 'Npm', cssClass: 'npm', url: 'https://www.npmjs.com', api: { download: 'https://api.npmjs.org/downloads/point' - } + }, + websiteType: 'other' } }, diff --git a/src/environments/environment-init.ts b/src/environments/environment-init.ts new file mode 100644 index 00000000..fb882709 --- /dev/null +++ b/src/environments/environment-init.ts @@ -0,0 +1,46 @@ +export const defaultEnvironmentConfigurations = { + fileStorage: { + aws: { + tag: '' + }, + googleCloud: { + tag: '' + } + }, + + mail: { + gmail: { + tag: '' + }, + yahoo: { + tag: '' + }, + outlook: { + tag: '' + } + }, + + sms: { + twillio: { + tag: '' + }, + awsSns: { + tag: '' + } + }, + + analytics: { + googleAnalytics: { + tag: '', + id: '' + }, + matomo: { + tag: '', + id: '' + }, + mixPanel: { + tag: '', + id: '' + } + } +}; diff --git a/src/environments/environment.local-to-staging-api.ts b/src/environments/environment.local-to-staging-api.ts index 8a0b483f..d32ac013 100644 --- a/src/environments/environment.local-to-staging-api.ts +++ b/src/environments/environment.local-to-staging-api.ts @@ -1,4 +1,5 @@ import { EnvironmentModel } from '../app/model/environment/environment.model'; +import { defaultEnvironmentConfigurations } from './environment-init'; export const environment: EnvironmentModel = { identity: 'local', @@ -7,80 +8,56 @@ export const environment: EnvironmentModel = { serverUrl: 'https://oth-server-orchestra-dev.herokuapp.com', - clientUrl: 'http://localhost:4200', - - mockDataEnabled: true, + clientUrl: 'http://localhost:4201', oauth: { twitter: { - tag: 'TWITTER_LOCAL' + tag: 'TWITTER_WEB_LOCAL' }, google: { - tag: 'GOOGLE_LOCAL' + tag: 'GOOGLE_WEB_LOCAL' }, facebook: { - // Facebook does not allow testing social login at localhost. This configuration will redirect you to development env. - tag: 'FACEBOOK_DEVELOPMENT' + // Facebook does not allow testing social login at localhost. + tag: '' }, linkedin: { - tag: 'LINKEDIN_LOCAL' + tag: 'LINKEDIN_WEB_LOCAL' }, twitch: { - tag: 'TWITCH_LOCAL' + tag: 'TWITCH_WEB_LOCAL' }, github: { - tag: 'GITHUB_LOCAL' + tag: 'GITHUB_WEB_LOCAL' }, dribbble: { - tag: 'DRIBBBLE_LOCAL' + tag: 'DRIBBBLE_WEB_LOCAL' }, reddit: { - tag: 'REDDIT_LOCAL' + tag: 'REDDIT_WEB_LOCAL' } }, payment: { stripe: { - tag: 'STRIPE_LOCAL', + tag: 'STRIPE_WEB_LOCAL', publishableKey: 'pk_test_51I4pFdJslj2vUcp7AkRtYwCPiZJbSvGK7lNFggSbLp9LQopdnUJU44mBKlREonmvszmASnyv4FMxQztzFedllxJO00wg7mHS85', }, coinbase: { - tag: 'COINBASE_LOCAL' + tag: 'COINBASE_WEB_LOCAL' }, paypal: { - tag: 'PAYPAL_LOCAL', + tag: 'PAYPAL_WEB_LOCAL', clientId: 'AZDxjDScFpQtjWTOUtWKbyN_bDt4OgqaF4eYXlewfBP4-8aqX3PiV8e1GWU6liB2CUXlkA59kJXE7M6R', env: 'sandbox' } }, - fileStorage: { - aws: { - tag: 'AWS_LOCAL' - }, - googleCloud: { - tag: 'GOOGLE_CLOUD_LOCAL' - } - }, + fileStorage: defaultEnvironmentConfigurations.fileStorage, - mail: { - gmail: { - tag: 'GMAIL_LOCAL' - }, - yahoo: { - tag: 'YAHOO_LOCAL' - }, - outlook: { - tag: 'OUTLOOK_LOCAL' - } - }, + mail: defaultEnvironmentConfigurations.mail, - analytics: { - googleAnalytics: { - tag: 'GTM-P4FHG76' - }, - matomo: { - tag: '' - } - } + sms: defaultEnvironmentConfigurations.sms, + + analytics: defaultEnvironmentConfigurations.analytics }; diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 4b47ce04..48b55d4d 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,86 +1,76 @@ import { EnvironmentModel } from '../app/model/environment/environment.model'; +import { defaultEnvironmentConfigurations } from './environment-init'; export const environment: EnvironmentModel = { identity: 'production', production: true, - serverUrl: 'https://oth-server-orchestra-live.herokuapp.com', + // serverUrl: 'https://oth-server-orchestra-live.herokuapp.com', + serverUrl: 'https://oth-server-orchestra-dev.herokuapp.com', - clientUrl: 'https://opentemplatehub.com', - - mockDataEnabled: false, + clientUrl: 'https://web.opentemplatehub.com', oauth: { twitter: { - tag: 'TWITTER' + tag: 'TWITTER_WEB' }, google: { - tag: 'GOOGLE' + tag: 'GOOGLE_WEB' }, facebook: { - // Facebook does not allow testing social login at localhost. This configuration will redirect you to development env. - tag: 'FACEBOOK' + tag: 'FACEBOOK_WEB' }, linkedin: { - tag: 'LINKEDIN' + tag: 'LINKEDIN_WEB' }, twitch: { - tag: 'TWITCH' + tag: 'TWITCH_WEB' }, github: { - tag: 'GITHUB' + tag: 'GITHUB_WEB' }, dribbble: { - tag: 'DRIBBBLE' + tag: 'DRIBBBLE_WEB' }, reddit: { - tag: 'REDDIT' + tag: 'REDDIT_WEB' } }, payment: { stripe: { - tag: 'STRIPE', + tag: 'STRIPE_WEB', publishableKey: 'pk_test_51I4pFdJslj2vUcp7AkRtYwCPiZJbSvGK7lNFggSbLp9LQopdnUJU44mBKlREonmvszmASnyv4FMxQztzFedllxJO00wg7mHS85', }, coinbase: { - tag: 'COINBASE' + tag: 'COINBASE_WEB' }, paypal: { - tag: 'PAYPAL', + tag: 'PAYPAL_WEB', clientId: 'AZDxjDScFpQtjWTOUtWKbyN_bDt4OgqaF4eYXlewfBP4-8aqX3PiV8e1GWU6liB2CUXlkA59kJXE7M6R', env: 'live' } }, - fileStorage: { - aws: { - tag: 'AWS' - }, - googleCloud: { - tag: 'GOOGLE_CLOUD' - } - }, + fileStorage: defaultEnvironmentConfigurations.fileStorage, - mail: { - gmail: { - tag: 'GMAIL' - }, - yahoo: { - tag: 'YAHOO' - }, - outlook: { - tag: 'OUTLOOK' - } - }, + mail: defaultEnvironmentConfigurations.mail, + + sms: defaultEnvironmentConfigurations.sms, analytics: { googleAnalytics: { - tag: 'GTM-NNRF845' + tag: 'GTM-NNRF845', + id: '' }, matomo: { - tag: '' + tag: 'https://opentemplatehub.matomo.cloud', + id: '2' + }, + mixPanel: { + tag: '7d4ffb5eb94ac6b29491cc8ddb55dadb', + id: '' } } }; diff --git a/src/environments/environment.staging.ts b/src/environments/environment.staging.ts index 490dac42..8e11f4f2 100644 --- a/src/environments/environment.staging.ts +++ b/src/environments/environment.staging.ts @@ -1,4 +1,5 @@ import { EnvironmentModel } from '../app/model/environment/environment.model'; +import { defaultEnvironmentConfigurations } from './environment-init'; export const environment: EnvironmentModel = { identity: 'staging', @@ -7,80 +8,55 @@ export const environment: EnvironmentModel = { serverUrl: 'https://oth-server-orchestra-dev.herokuapp.com', - clientUrl: 'https://dev.opentemplatehub.com', - - // FIXME: After switching to live, change this to false - mockDataEnabled: true, + clientUrl: 'https://oth-ui-web-dev.herokuapp.com', oauth: { twitter: { - tag: 'TWITTER_DEVELOPMENT' + tag: 'TWITTER_WEB_DEVELOPMENT' }, google: { - tag: 'GOOGLE_DEVELOPMENT' + tag: 'GOOGLE_WEB_DEVELOPMENT' }, facebook: { - tag: 'FACEBOOK_DEVELOPMENT' + tag: 'FACEBOOK_WEB_DEVELOPMENT' }, linkedin: { - tag: 'LINKEDIN_DEVELOPMENT' + tag: 'LINKEDIN_WEB_DEVELOPMENT' }, twitch: { - tag: 'TWITCH_DEVELOPMENT' + tag: 'TWITCH_WEB_DEVELOPMENT' }, github: { - tag: 'GITHUB_DEVELOPMENT' + tag: 'GITHUB_WEB_DEVELOPMENT' }, dribbble: { - tag: 'DRIBBBLE_DEVELOPMENT' + tag: 'DRIBBBLE_WEB_DEVELOPMENT' }, reddit: { - tag: 'REDDIT_DEVELOPMENT' + tag: 'REDDIT_WEB_DEVELOPMENT' } }, payment: { stripe: { - tag: 'STRIPE_DEVELOPMENT', + tag: 'STRIPE_WEB_DEVELOPMENT', publishableKey: 'pk_test_51I4pFdJslj2vUcp7AkRtYwCPiZJbSvGK7lNFggSbLp9LQopdnUJU44mBKlREonmvszmASnyv4FMxQztzFedllxJO00wg7mHS85', }, coinbase: { - tag: 'COINBASE_DEVELOPMENT' + tag: 'COINBASE_WEB_DEVELOPMENT' }, paypal: { - tag: 'PAYPAL_DEVELOPMENT', + tag: 'PAYPAL_WEB_DEVELOPMENT', clientId: 'AZDxjDScFpQtjWTOUtWKbyN_bDt4OgqaF4eYXlewfBP4-8aqX3PiV8e1GWU6liB2CUXlkA59kJXE7M6R', env: 'sandbox' } }, - fileStorage: { - aws: { - tag: 'AWS_DEVELOPMENT' - }, - googleCloud: { - tag: 'GOOGLE_CLOUD_DEVELOPMENT' - } - }, + fileStorage: defaultEnvironmentConfigurations.fileStorage, - mail: { - gmail: { - tag: 'GMAIL_DEVELOPMENT' - }, - yahoo: { - tag: 'YAHOO_DEVELOPMENT' - }, - outlook: { - tag: 'OUTLOOK_DEVELOPMENT' - } - }, + mail: defaultEnvironmentConfigurations.mail, - analytics: { - googleAnalytics: { - tag: 'GTM-P8BM922' - }, - matomo: { - tag: '' - } - } + sms: defaultEnvironmentConfigurations.sms, + + analytics: defaultEnvironmentConfigurations.analytics }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 004619a1..98f26aa1 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -1,4 +1,5 @@ import { EnvironmentModel } from '../app/model/environment/environment.model'; +import { defaultEnvironmentConfigurations } from './environment-init'; export const environment: EnvironmentModel = { identity: 'local', @@ -7,80 +8,56 @@ export const environment: EnvironmentModel = { serverUrl: 'http://localhost:4000', - clientUrl: 'http://localhost:4200', - - mockDataEnabled: true, + clientUrl: 'http://localhost:4201', oauth: { twitter: { - tag: 'TWITTER_LOCAL' + tag: 'TWITTER_WEB_LOCAL' }, google: { - tag: 'GOOGLE_LOCAL' + tag: 'GOOGLE_WEB_LOCAL' }, facebook: { - // Facebook does not allow testing social login at localhost. This configuration will redirect you to development env. - tag: 'FACEBOOK_DEVELOPMENT' + // Facebook does not allow testing social login at localhost. + tag: '' }, linkedin: { - tag: 'LINKEDIN_LOCAL' + tag: 'LINKEDIN_WEB_LOCAL' }, twitch: { - tag: 'TWITCH_LOCAL' + tag: 'TWITCH_WEB_LOCAL' }, github: { - tag: 'GITHUB_LOCAL' + tag: 'GITHUB_WEB_LOCAL' }, dribbble: { - tag: 'DRIBBBLE_LOCAL' + tag: 'DRIBBBLE_WEB_LOCAL' }, reddit: { - tag: 'REDDIT_LOCAL' + tag: 'REDDIT_WEB_LOCAL' } }, payment: { stripe: { - tag: 'STRIPE_LOCAL', + tag: 'STRIPE_WEB_LOCAL', publishableKey: 'pk_test_51I4pFdJslj2vUcp7AkRtYwCPiZJbSvGK7lNFggSbLp9LQopdnUJU44mBKlREonmvszmASnyv4FMxQztzFedllxJO00wg7mHS85', }, coinbase: { - tag: 'COINBASE_LOCAL' + tag: 'COINBASE_WEB_LOCAL' }, paypal: { - tag: 'PAYPAL_LOCAL', + tag: 'PAYPAL_WEB_LOCAL', clientId: 'AZDxjDScFpQtjWTOUtWKbyN_bDt4OgqaF4eYXlewfBP4-8aqX3PiV8e1GWU6liB2CUXlkA59kJXE7M6R', env: 'sandbox' } }, - fileStorage: { - aws: { - tag: 'AWS_LOCAL' - }, - googleCloud: { - tag: 'GOOGLE_CLOUD_LOCAL' - } - }, + fileStorage: defaultEnvironmentConfigurations.fileStorage, - mail: { - gmail: { - tag: 'GMAIL_LOCAL' - }, - yahoo: { - tag: 'YAHOO_LOCAL' - }, - outlook: { - tag: 'OUTLOOK_LOCAL' - } - }, + mail: defaultEnvironmentConfigurations.mail, - analytics: { - googleAnalytics: { - tag: 'GTM-P4FHG76' - }, - matomo: { - tag: '' - } - } + sms: defaultEnvironmentConfigurations.sms, + + analytics: defaultEnvironmentConfigurations.analytics }; diff --git a/src/environments/version.ts b/src/environments/version.ts deleted file mode 100644 index c0a315fc..00000000 --- a/src/environments/version.ts +++ /dev/null @@ -1 +0,0 @@ -export const version = '3.1.0'; diff --git a/src/index.html b/src/index.html index 82543603..04ad7a3e 100644 --- a/src/index.html +++ b/src/index.html @@ -13,11 +13,10 @@ - - - - + + + diff --git a/src/locale/messages.fr.xlf b/src/locale/messages.fr.xlf index f27439fb..868fdf10 100644 --- a/src/locale/messages.fr.xlf +++ b/src/locale/messages.fr.xlf @@ -1674,8 +1674,13 @@ - : Minimizes your effort while building a new software business with our open source GitHub micro server templates and responsive web UI + mobile UI templates - : Minimise vos efforts tout en créant une nouvelle entreprise de logiciels avec nos modèles de micro-serveur GitHub open source et nos modèles d'interface utilisateur Web réactive + d'interface utilisateur mobile + : Minimizes your effort while building a new software business with our open source GitHub micro server + templates and responsive web UI + mobile UI templates + + : Minimise vos efforts tout en créant une nouvelle entreprise de logiciels avec nos modèles de + micro-serveur GitHub open source et nos modèles d'interface utilisateur Web réactive + d'interface utilisateur + mobile + src/app/data/navigation/navigation.data.ts 9 @@ -1964,7 +1969,9 @@ Customers that pay per user can send out as many signature requests as they want per month! - Les clients qui paient par utilisateur peuvent envoyer autant de demandes de signature qu'ils le souhaitent par mois ! + Les clients qui paient par utilisateur peuvent envoyer autant de demandes de signature qu'ils le + souhaitent par mois ! + src/app/data/product/product.data.ts 14 @@ -1972,24 +1979,6 @@ - - - - - - - - - - - - - - - - - - Micro server solutions for your needs Des solutions de micro-serveur pour vos besoins @@ -2000,8 +1989,12 @@ - Payment Server Template is an open source payment server that has simple and generic design to be able to integrated with payment solution providers like Stripe or Coinbase - Le modèle de serveur de paiement est un serveur de paiement open source qui a une conception simple et générique pour pouvoir s'intégrer aux fournisseurs de solutions de paiement comme Stripe ou Coinbase + Payment Server Template is an open source payment server that has simple and generic design to be able + to integrated with payment solution providers like Stripe or Coinbase + + Le modèle de serveur de paiement est un serveur de paiement open source qui a une conception simple et + générique pour pouvoir s'intégrer aux fournisseurs de solutions de paiement comme Stripe ou Coinbase + src/app/data/product/product.data.ts 139 @@ -2009,16 +2002,25 @@ - Mail Server Template supporting both regular public and private mail send processes in Message Queue Architecture - Modèle de serveur de messagerie prenant en charge les processus d'envoi de courrier public et privé standard dans Message Queue Architecture + Mail Server Template supporting both regular public and private mail send processes in Message Queue + Architecture + + Modèle de serveur de messagerie prenant en charge les processus d'envoi de courrier public et privé + standard dans Message Queue Architecture + src/app/data/product/product.data.ts 171 - Analytics Server Template is a generic open source analytics server that has simple yet powerful design to connect your business with third party analytics service providers (like Google Analytics or Matomo). - Le modèle de serveur d'analyse est un serveur d'analyse open source générique qui a une conception simple mais puissante pour connecter votre entreprise à des fournisseurs de services d'analyse tiers (comme Google Analytics ou Matomo). + Analytics Server Template is a generic open source analytics server that has simple yet powerful design + to connect your business with third party analytics service providers (like Google Analytics or Matomo). + + Le modèle de serveur d'analyse est un serveur d'analyse open source générique qui a une conception + simple mais puissante pour connecter votre entreprise à des fournisseurs de services d'analyse tiers (comme + Google Analytics ou Matomo). + src/app/data/product/product.data.ts 186 @@ -2026,18 +2028,6 @@ - - - - - - - - - - - - New 🎉 Nouveau 🎉 @@ -2082,7 +2072,8 @@ Team Behind the Open Template Hub L'équipe derrière l'Open Template Hub - src/app/page/landing-layout/about-us-page/about-us-page.component.ts + src/app/page/landing-layout/about-us-page/about-us-page.component.ts + 19 @@ -2090,15 +2081,22 @@ Follow us on social media Suivez-nous sur les réseaux sociaux - src/app/page/landing-layout/about-us-page/about-us-page.component.ts + src/app/page/landing-layout/about-us-page/about-us-page.component.ts + 22 - Minimizes your effort while building a new software business with our open source GitHub micro server templates and responsive web UI + mobile UI templates - Minimise vos efforts tout en créant une nouvelle entreprise de logiciels avec nos modèles de micro-serveur GitHub open source et nos modèles d'interface utilisateur Web réactive + d'interface utilisateur mobile - - src/app/page/landing-layout/about-us-page/about-us-page.component.ts + Minimizes your effort while building a new software business with our open source GitHub micro server + templates and responsive web UI + mobile UI templates + + Minimise vos efforts tout en créant une nouvelle entreprise de logiciels avec nos modèles de + micro-serveur GitHub open source et nos modèles d'interface utilisateur Web réactive + d'interface utilisateur + mobile + + + src/app/page/landing-layout/about-us-page/about-us-page.component.ts + 23 @@ -2106,23 +2104,149 @@ History of the Open Template Hub Histoire de l'Open Template Hub - src/app/page/landing-layout/about-us-page/about-us-page.component.ts + src/app/page/landing-layout/about-us-page/about-us-page.component.ts + 26 - Minimizes your effort while building a new software business with our open source GitHub micro server templates and responsive web UI + mobile UI templates - Minimise vos efforts tout en créant une nouvelle entreprise de logiciels avec nos modèles de micro-serveur GitHub open source et nos modèles d'interface utilisateur Web réactive + d'interface utilisateur mobile - - src/app/page/landing-layout/about-us-page/about-us-page.component.ts + Minimizes your effort while building a new software business with our open source GitHub micro server + templates and responsive web UI + mobile UI templates + + Minimise vos efforts tout en créant une nouvelle entreprise de logiciels avec nos modèles de + micro-serveur GitHub open source et nos modèles d'interface utilisateur Web réactive + d'interface utilisateur + mobile + + + src/app/page/landing-layout/about-us-page/about-us-page.component.ts + 27 - All of Open Template Hub’s brand features including Open Template Hub, OTH and the Open Template Hub logo are protected by applicable trademark, copyright and other intellectual property laws. Any use of a Open Template Hub trademark is subject to the Open Template Hub Trademark Standards for Use. Basic usage guidelines can be found below. If you have any questions or want to request approval to use these assets, please do not hesitate to contact us or email info@opentemplatehub.com Basic Usage Guidelines: - Do not rotate the Open Template Hub logo. - Do not change the color of the Open Template Hub logo. - Do not distort the Open Template Hub logo (be sure to scale proportionately). - Allow an appropriate amount of white space around the Open Template Hub logo, at least as much as the x-height of the logo (suggested). - Preferred minimum size for the Open Template Hub logo is 100px wide. For smaller sizes, you must seek permission from the Open Template Hub team. - All of Open Template Hub’s brand features including Open Template Hub, OTH and the Open Template Hub logo are protected by applicable trademark, copyright and other intellectual property laws. Any use of a Open Template Hub trademark is subject to the Open Template Hub Trademark Standards for Use. Basic usage guidelines can be found below. If you have any questions or want to request approval to use these assets, please do not hesitate to contact us or email info@opentemplatehub.com Basic Usage Guidelines: - Do not rotate the Open Template Hub logo. - Do not change the color of the Open Template Hub logo. - Do not distort the Open Template Hub logo (be sure to scale proportionately). - Allow an appropriate amount of white space around the Open Template Hub logo, at least as much as the x-height of the logo (suggested). - Preferred minimum size for the Open Template Hub logo is 100px wide. For smaller sizes, you must seek permission from the Open Template Hub team. - - src/app/page/landing-layout/branding-page/branding-page.component.html + + + All of Open Template Hub’s brand features includingOpen Template Hub,OTH + + and theOpen Template Hub + + logo are protected by applicable trademark, copyright and other intellectual property laws. Any use of aOpen Template Hub trademark + + is subject to theOpen Template Hub + Trademark Standards + + for Use. + + + Basic usage guidelines can be found below. If you have any questions or want to request approval to use these + assets, please do not hesitate to contact us or email + info@opentemplatehub.com + + + + + + Basic Usage Guidelines: + + + + - Do not rotate theOpen Template Hub + + logo. + + + - Do not change the color of theOpen + Template Hub + + logo. + + + - Do not distort theOpen Template Hub + + logo (be sure to scale proportionately). + + + - Allow an appropriate amount of white space around theOpen Template Hublogo, at least as much as the x-height + of the logo (suggested). + + + - Preferred minimum size for theOpen + Template Hub + + logo is 100px wide. For smaller sizes, you must seek permission from the Open Template Hub team. + + + + + All of Open Template Hub’s brand features includingOpen Template Hub,OTH + + and theOpen Template Hub + + logo are protected by applicable trademark, copyright and other intellectual property laws. Any use of aOpen Template Hub trademark + + is subject to theOpen Template Hub + Trademark Standards + + for Use. + + + Basic usage guidelines can be found below. If you have any questions or want to request approval to use these + assets, please do not hesitate to contact us or email + info@opentemplatehub.com + + + + + + Basic Usage Guidelines: + + + + - Do not rotate theOpen Template Hub + + logo. + + + - Do not change the color of theOpen + Template Hub + + logo. + + + - Do not distort theOpen Template Hub + + logo (be sure to scale proportionately). + + + - Allow an appropriate amount of white space around theOpen Template Hublogo, at least as much as the x-height + of the logo (suggested). + + + - Preferred minimum size for theOpen + Template Hub + + logo is 100px wide. For smaller sizes, you must seek permission from the Open Template Hub team. + + + + src/app/page/landing-layout/branding-page/branding-page.component.html + 8,46 @@ -2130,7 +2254,9 @@ Thank you for reaching us. Our team will contact with you soon. Merci de nous avoir rejoint. Notre équipe vous contactera bientôt. - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 8 @@ -2138,7 +2264,9 @@ First Name Prénom - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 20 @@ -2146,7 +2274,9 @@ Last Name Nom de famille - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 30 @@ -2154,7 +2284,9 @@ Email Email - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 41 @@ -2162,7 +2294,9 @@ Phone Number Numéro de téléphone - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 51 @@ -2170,7 +2304,9 @@ Website Website - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 61 @@ -2178,7 +2314,9 @@ Select range of employees Sélectionnez la gamme d'employés - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 66,67 @@ -2186,7 +2324,9 @@ Company Size Taille de l'entreprise - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 72 @@ -2194,7 +2334,9 @@ Country Pays - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 83 @@ -2202,7 +2344,9 @@ Tell us more about your project, needs, and timeline.... Parlez-nous de votre projet, de vos besoins et de votre échéancier.... - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 92 @@ -2210,7 +2354,9 @@ Your Message Votre message - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 95 @@ -2218,7 +2364,9 @@ CONTACT US Votre message - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 98 @@ -2226,15 +2374,29 @@ General Communication Communication générale - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 117 - For general queries, including partnership opportunities, please email - Pour les questions générales, y compris les opportunités de partenariat, veuillez envoyer un e-mail à - - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + For general queries, including partnership opportunities, please email + + + + + Pour les questions générales, y compris les opportunités de partenariat, veuillez envoyer un e-mail à + + + + + + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 118,121 @@ -2242,15 +2404,29 @@ Technical or account support Support technique ou de compte - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 128 - We're here to help! If you have technical issues, contact support - Nous sommes là pour vous aider ! Si vous rencontrez des problèmes techniques, contacter l'assistance - - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + We're here to help! If you have technical issues, + + contact support + + + Nous sommes là pour vous aider ! Si vous rencontrez des problèmes techniques, + + contacter l'assistance + + + + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 129,132 @@ -2258,7 +2434,8 @@ Please provide a first name Veuillez indiquer un prénom - src/app/page/landing-layout/contact-us-page/contact-us-page.component.ts + src/app/page/landing-layout/contact-us-page/contact-us-page.component.ts + 64 @@ -2266,7 +2443,9 @@ Username... Nom d'utilisateur... - src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.html + + src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.html + 12 @@ -2274,7 +2453,9 @@ SEND ENVOYER - src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.html + + src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.html + 17 @@ -2282,7 +2463,9 @@ 'Reset email sent!' 'Réinitialiser l'e-mail envoyé !' - src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.html + + src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.html + 23 @@ -2290,7 +2473,9 @@ 'Please check you inbox' 'Veuillez vérifier votre boîte de réception ' - src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.html + + src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.html + 24 @@ -2298,7 +2483,9 @@ LOG IN CONNEXION - src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.html + + src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.html + 27 @@ -2306,7 +2493,9 @@ Forget password Mot de passe oublié - src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.ts + + src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.ts + 25 @@ -2314,7 +2503,9 @@ Please provide a valid username. Veuillez fournir un nom d'utilisateur valide. - src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.ts + + src/app/page/landing-layout/form-pages/forget-password-page/forget-password-page.component.ts + 62 @@ -2322,7 +2513,9 @@ or ou - src/app/page/landing-layout/form-pages/login-page/login-page.component.html + + src/app/page/landing-layout/form-pages/login-page/login-page.component.html + 15 @@ -2330,7 +2523,9 @@ Username or Email... Nom d'utilisateur ou email... - src/app/page/landing-layout/form-pages/login-page/login-page.component.html + + src/app/page/landing-layout/form-pages/login-page/login-page.component.html + 20 @@ -2338,7 +2533,9 @@ Password... Mot de passe... - src/app/page/landing-layout/form-pages/login-page/login-page.component.html + + src/app/page/landing-layout/form-pages/login-page/login-page.component.html + 24 @@ -2346,7 +2543,9 @@ Remember Me Souviens-toi de moi - src/app/page/landing-layout/form-pages/login-page/login-page.component.html + + src/app/page/landing-layout/form-pages/login-page/login-page.component.html + 31 @@ -2354,7 +2553,9 @@ LOG IN CONNEXION - src/app/page/landing-layout/form-pages/login-page/login-page.component.html + + src/app/page/landing-layout/form-pages/login-page/login-page.component.html + 36 @@ -2362,7 +2563,9 @@ Don't have an account? Vous n'avez pas de compte ? - src/app/page/landing-layout/form-pages/login-page/login-page.component.html + + src/app/page/landing-layout/form-pages/login-page/login-page.component.html + 38 @@ -2370,7 +2573,9 @@ Sign Up S'inscrire - src/app/page/landing-layout/form-pages/login-page/login-page.component.html + + src/app/page/landing-layout/form-pages/login-page/login-page.component.html + 40,41 @@ -2378,7 +2583,9 @@ Forget password? Mot de passe oublié? - src/app/page/landing-layout/form-pages/login-page/login-page.component.html + + src/app/page/landing-layout/form-pages/login-page/login-page.component.html + 45,46 @@ -2386,7 +2593,8 @@ Welcome Bienvenu - src/app/page/landing-layout/form-pages/login-page/login-page.component.ts + src/app/page/landing-layout/form-pages/login-page/login-page.component.ts + 35 @@ -2394,7 +2602,8 @@ Please provide a valid username Veuillez fournir un nom d'utilisateur valide - src/app/page/landing-layout/form-pages/login-page/login-page.component.ts + src/app/page/landing-layout/form-pages/login-page/login-page.component.ts + 78 @@ -2402,7 +2611,8 @@ Please provide a valid password Veuillez fournir un mot de passe valide - src/app/page/landing-layout/form-pages/login-page/login-page.component.ts + src/app/page/landing-layout/form-pages/login-page/login-page.component.ts + 79 @@ -2410,7 +2620,9 @@ Password... Mot de passe... - src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.html + + src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.html + 12 @@ -2418,7 +2630,9 @@ Confirm Password... Confirmez le mot de passe... - src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.html + + src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.html + 16 @@ -2426,7 +2640,9 @@ DONE TERMINÉ - src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.html + + src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.html + 21 @@ -2434,7 +2650,9 @@ Please proceed with login Veuillez procéder à la connexion - src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.html + + src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.html + 26 @@ -2442,7 +2660,9 @@ 'LOG IN' 'CONNEXION ' - src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.html + + src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.html + 29 @@ -2450,7 +2670,9 @@ Reset password Réinitialiser le mot de passe - src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.ts + + src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.ts + 27 @@ -2458,7 +2680,9 @@ Please provide a valid password (min length 6) Veuillez fournir un mot de passe valide (longueur min 6) - src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.ts + + src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.ts + 71 @@ -2466,7 +2690,9 @@ Please provide the same value for confirm password Veuillez fournir la même valeur pour confirmer le mot de passe - src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.ts + + src/app/page/landing-layout/form-pages/reset-password-page/reset-password-page.component.ts + 72 @@ -2474,7 +2700,9 @@ or ou - src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + + src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + 15 @@ -2482,7 +2710,9 @@ Username... Nom d'utilisateur... - src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + + src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + 21 @@ -2490,7 +2720,9 @@ Email... Email... - src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + + src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + 25 @@ -2498,7 +2730,9 @@ Password... Mot de passe... - src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + + src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + 29 @@ -2506,7 +2740,9 @@ Confirm Password... Confirmez le mot de passe... - src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + + src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + 33 @@ -2514,23 +2750,59 @@ CONTINUE CONTINUEZ - src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + + src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + 38 - By signing up, you agree Terms of Use, Privacy Policy and Cookie Policy - By signing up, you agree Terms of Use, Privacy Policy and Cookie Policy - - src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + By signing up, you agree + Terms of Use, + Privacy Policy + + and + Cookie Policy + + + By signing up, you agree + Terms of Use, + Privacy Policy + + and + Cookie Policy + + + + + src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + 40,46 - Already have an account? Login - Vous avez déjà un compte? Connexion - - src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + Already have an account? + + Login + + + Vous avez déjà un compte? + + Connexion + + + + + src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.html + 51,54 @@ -2538,7 +2810,9 @@ Register S'inscrire - src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.ts + + src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.ts + 32 @@ -2546,7 +2820,9 @@ Please provide a valid username Veuillez fournir un nom d'utilisateur valide - src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.ts + + src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.ts + 75 @@ -2554,7 +2830,9 @@ Please provide a valid email address Veuillez fournir une adresse email valide - src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.ts + + src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.ts + 76 @@ -2562,7 +2840,9 @@ Please provide a valid password (min length 6) Veuillez fournir un mot de passe valide (longueur min 6) - src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.ts + + src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.ts + 77 @@ -2570,13 +2850,19 @@ Please provide the same value for confirm password Veuillez fournir la même valeur pour confirmer le mot de passe - src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.ts + + src/app/page/landing-layout/form-pages/sign-up-page/sign-up-page.component.ts + 78 - Open Source first organization that helps you to minimize the effort while building a new software business with our server and UI templates - Première organisation Open Source qui vous aide à minimiser les efforts tout en créant une nouvelle entreprise de logiciels avec nos modèles de serveur et d'interface utilisateur + Open Source first organization that helps you to minimize the effort while building a new software + business with our server and UI templates + + Première organisation Open Source qui vous aide à minimiser les efforts tout en créant une nouvelle + entreprise de logiciels avec nos modèles de serveur et d'interface utilisateur + src/app/page/landing-layout/home-page/home-page.component.html 5,8 @@ -2592,16 +2878,12 @@ - - - - - Pricing Plan Plan tarifaire - src/app/page/landing-layout/pricing-page/pricing-page.component.ts + src/app/page/landing-layout/pricing-page/pricing-page.component.ts + 57 @@ -2609,7 +2891,8 @@ No hidden fees. Cancel at any time. Pas de frais cachés. Annulez à tout moment. - src/app/page/landing-layout/pricing-page/pricing-page.component.ts + src/app/page/landing-layout/pricing-page/pricing-page.component.ts + 58 @@ -2617,7 +2900,8 @@ Open Source Open source - src/app/page/landing-layout/product-page/product-page.component.html + src/app/page/landing-layout/product-page/product-page.component.html + 22 @@ -2625,7 +2909,8 @@ Professional Help Aide professionnelle - src/app/page/landing-layout/product-page/product-page.component.html + src/app/page/landing-layout/product-page/product-page.component.html + 26 @@ -2635,7 +2920,8 @@ Activity history Historique des activités - src/app/page/landing-layout/product-page/product-page.component.html + src/app/page/landing-layout/product-page/product-page.component.html + 92 @@ -2643,7 +2929,8 @@ Related Products Produits connexes - src/app/page/landing-layout/product-page/product-page.component.ts + src/app/page/landing-layout/product-page/product-page.component.ts + 34 @@ -2651,7 +2938,8 @@ Contact Us Nous contacter - src/app/page/landing-layout/product-page/product-page.component.ts + src/app/page/landing-layout/product-page/product-page.component.ts + 122 @@ -2659,7 +2947,8 @@ Request for Demo Demande de démo - src/app/page/landing-layout/product-page/product-page.component.ts + src/app/page/landing-layout/product-page/product-page.component.ts + 123 @@ -2667,7 +2956,9 @@ HOME DOMICILE - src/app/page/landing-layout/raw-content-pages/maintenance-page/maintenance-page.component.html + + src/app/page/landing-layout/raw-content-pages/maintenance-page/maintenance-page.component.html + 10 @@ -2675,7 +2966,9 @@ Under maintenance En maintenance - src/app/page/landing-layout/raw-content-pages/maintenance-page/maintenance-page.component.ts + + src/app/page/landing-layout/raw-content-pages/maintenance-page/maintenance-page.component.ts + 18 @@ -2683,7 +2976,9 @@ Please check again later Veuillez vérifier à nouveau plus tard - src/app/page/landing-layout/raw-content-pages/maintenance-page/maintenance-page.component.ts + + src/app/page/landing-layout/raw-content-pages/maintenance-page/maintenance-page.component.ts + 19 @@ -2691,7 +2986,9 @@ HOME DOMICILE - src/app/page/landing-layout/raw-content-pages/not-found-page/not-found-page.component.html + + src/app/page/landing-layout/raw-content-pages/not-found-page/not-found-page.component.html + 10 @@ -2699,7 +2996,9 @@ 404 Page not found 404 Page non trouvée - src/app/page/landing-layout/raw-content-pages/not-found-page/not-found-page.component.ts + + src/app/page/landing-layout/raw-content-pages/not-found-page/not-found-page.component.ts + 18 @@ -2707,7 +3006,9 @@ Something went wrong! - src/app/page/landing-layout/raw-content-pages/not-found-page/not-found-page.component.ts + + src/app/page/landing-layout/raw-content-pages/not-found-page/not-found-page.component.ts + 19 @@ -2715,15 +3016,19 @@ Registration successful 🎉 Inscription réussie 🎉 - src/app/page/landing-layout/raw-content-pages/sign-up-success-page/sign-up-success-page.component.ts + + src/app/page/landing-layout/raw-content-pages/sign-up-success-page/sign-up-success-page.component.ts + 27 - Verification email sent to: - E-mail de vérification envoyé à : + Verification email sent to: + E-mail de vérification envoyé à : - src/app/page/landing-layout/raw-content-pages/sign-up-success-page/sign-up-success-page.component.ts + + src/app/page/landing-layout/raw-content-pages/sign-up-success-page/sign-up-success-page.component.ts + 28 @@ -2731,7 +3036,9 @@ HOME DOMICILE - src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.html + + src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.html + 16 @@ -2739,7 +3046,9 @@ LOG IN CONNEXION - src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.html + + src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.html + 23 @@ -2747,7 +3056,9 @@ Verifying account... Vérification du compte... - src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.ts + + src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.ts + 27 @@ -2755,7 +3066,9 @@ Account verification failed Échec de la vérification du compte - src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.ts + + src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.ts + 30 @@ -2763,7 +3076,9 @@ Something went wrong! Quelque chose s'est mal passé ! - src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.ts + + src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.ts + 31 @@ -2771,7 +3086,9 @@ Account verified 🎉 Compte vérifié 🎉 - src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.ts + + src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.ts + 34 @@ -2779,7 +3096,9 @@ Please proceed with login Veuillez procéder à la connexion - src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.ts + + src/app/page/landing-layout/raw-content-pages/verify-account-page/verify-account-page.component.ts + 35 @@ -2787,7 +3106,8 @@ Products Des produits - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 7 @@ -2795,7 +3115,8 @@ Company Société - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 32 @@ -2803,7 +3124,8 @@ About Sur - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 34,35 @@ -2811,7 +3133,8 @@ Customers Les clients - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 37,38 @@ -2819,7 +3142,8 @@ Enterprise Entreprise - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 40,41 @@ -2827,7 +3151,8 @@ Partners Les partenaires - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 43,44 @@ -2835,7 +3160,8 @@ Branding l'image de marque - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 46,47 @@ -2843,7 +3169,8 @@ Jobs Travaux - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 49,50 @@ -2851,7 +3178,8 @@ Blog Blog - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 52,53 @@ -2859,7 +3187,8 @@ Developers Développeurs - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 58 @@ -2867,7 +3196,8 @@ Docs Documents - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 60,61 @@ -2875,7 +3205,8 @@ API API - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 63,64 @@ -2883,7 +3214,8 @@ Status Statut - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 66,67 @@ -2891,7 +3223,8 @@ Resources Ressources - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 70 @@ -2899,7 +3232,8 @@ Support Soutien - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 72,73 @@ -2907,7 +3241,8 @@ Contact Contact - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 75,76 @@ -2915,7 +3250,8 @@ Terms & Conditions Termes et; Conditions - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 78,79 @@ -2923,7 +3259,8 @@ Privacy Intimité - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 81,82 @@ -2931,7 +3268,8 @@ Cookies Cookies - src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + src/app/page/landing-layout/sitemap-page/sitemap-page.component.html + 84,85 @@ -2947,7 +3285,9 @@ Dark/Light Mode Mode sombre/clair - src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + + src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + 7 @@ -2955,7 +3295,9 @@ Light theme Thème lumineux - src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + + src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + 11 @@ -2963,7 +3305,9 @@ Dark theme Thème sombre - src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + + src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + 13 @@ -2971,7 +3315,9 @@ Auto Auto - src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + + src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + 15 @@ -2979,7 +3325,9 @@ Color Couleur - src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + + src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + 19 @@ -2987,7 +3335,9 @@ Design Concevoir - src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + + src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + 29 @@ -2995,7 +3345,9 @@ Default Défaut - src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + + src/app/page/settings-layout/edit-theme-page/edit-theme-page.component.html + 39 @@ -3003,7 +3355,8 @@ Payment succeeded Paiement réussi - src/app/page/splash-layout/callback-page/callback-page.component.ts + src/app/page/splash-layout/callback-page/callback-page.component.ts + 56 @@ -3011,7 +3364,9 @@ Home Accueil - src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.html + + src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.html + 24 @@ -3019,217 +3374,264 @@ Proceed Procéder - src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.html + + src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.html + 25 - Will be redirected to: - Sera redirigé vers : + Will be redirected to: + Sera redirigé vers : - src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.ts + + src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.ts + 65 - Looks like the link is broken: - On dirait que le lien est rompu : + Looks like the link is broken: + On dirait que le lien est rompu : - src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.ts + + src/app/page/splash-layout/external-redirect-page/external-redirect-page.component.ts + 66 - + Products Des produits - src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.html + + src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.html + 14 - + + Services Prestations de service - src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.html + + src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.html + 22 - + + About Sur - src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.html + + src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.html + 30 - + + Contact Us Nous contacter - src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.html + + src/app/component/nav/landing/landing-layout-top-nav/landing-layout-top-nav.component.html + 37 - + + Products Des produits src/app/component/nav/footer/footer.component.html 4 - + + Company Société src/app/component/nav/footer/footer.component.html 29 - + + About Sur src/app/component/nav/footer/footer.component.html 30 - + + Customers Les clients src/app/component/nav/footer/footer.component.html 31 - + + Partners Les partenaires src/app/component/nav/footer/footer.component.html 33 - + + Branding l'image de marque src/app/component/nav/footer/footer.component.html 34 - + + Jobs Travaux src/app/component/nav/footer/footer.component.html 35 - + + Blog Blog src/app/component/nav/footer/footer.component.html 36 - + + Developers Développeurs src/app/component/nav/footer/footer.component.html 41 - + + Open Source Open Source src/app/component/nav/footer/footer.component.html 44 - + + Docs Docs src/app/component/nav/footer/footer.component.html 46 - + + API API src/app/component/nav/footer/footer.component.html 47 - + + Status Statut src/app/component/nav/footer/footer.component.html 48 - + + Resources Ressources src/app/component/nav/footer/footer.component.html 53 - + + Support Soutien src/app/component/nav/footer/footer.component.html 54 - + + Contact Contact src/app/component/nav/footer/footer.component.html 55 - + + Terms & Conditions Termes & Conditions src/app/component/nav/footer/footer.component.html 56 - + + Privacy Intimité src/app/component/nav/footer/footer.component.html 57 - + + Cookies Cookies src/app/component/nav/footer/footer.component.html 58 - + + Sitemap Plan du site src/app/component/nav/footer/footer.component.html 59 - - By continuing to use this site you agree to our Cookie Policy. - En continuant à utiliser ce site, vous acceptez notre Politique relative aux cookies. + + + By continuing to use this site you agree to our + Cookie Policy. + + En continuant à utiliser ce site, vous acceptez notre + Politique relative aux cookies. + src/app/component/popup/cookie-popup/cookie-popup.component.html 2,4 - + + Done Terminé src/app/component/popup/cookie-popup/cookie-popup.component.html 6 - + + Stars Étoiles src/app/data/constant.ts 47 - + + Forks Forks @@ -3241,10 +3643,13 @@ Some of the preconfigured systems: Certains des systèmes préconfigurés: - src/app/component/product-represantation/product-presentation.component.html + + src/app/component/product-represantation/product-presentation.component.html + 44 - + + View Pricing Voir les prix @@ -3259,886 +3664,1206 @@ src/app/component/price-plan/price-plan.component.html 24 - + + Subscribers Les abonnés src/app/data/constant.ts 49 - + + Release Version Version finale src/app/data/constant.ts 50 - + + Join our team Rejoins notre équipe src/app/data/employees/employees.data.ts 49 - + + Contact Us Nous contacter - src/app/page/landing-layout/contact-us-page/contact-us-page.component.ts + src/app/page/landing-layout/contact-us-page/contact-us-page.component.ts + 30 - + + Full-Stack Developer src/app/data/employees/employees.data.ts 35 - + + Select a country Choisissez un pays - src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + + src/app/page/landing-layout/contact-us-page/contact-us-page.component.html + 76 - + + Available Plans Forfaits disponibles src/app/component/price-plan/price-plan.component.html 3 - + + *configuration still requires some level of developer experience *la configuration nécessite toujours un certain niveau d'expérience de développeur - src/app/component/product-represantation/product-presentation.component.html + + src/app/component/product-represantation/product-presentation.component.html + 27 - + + : Blog : Blog src/app/data/navigation/navigation.data.ts 93 - + + : Docs : Docs src/app/data/navigation/navigation.data.ts 99 - + + : Partners : Les partenaires src/app/data/navigation/navigation.data.ts 105 - + + : Customers : Les clients src/app/data/navigation/navigation.data.ts 111 - + + Professional Help Aide professionnelle src/app/data/product/product.data.ts 13 - + + CI/CD Automation Automatisation CI/CD src/app/data/product/product.data.ts 23 - + + Get a CI/CD integration with automated API tests. Bénéficiez d'une intégration CI/CD avec des tests API automatisés. src/app/data/product/product.data.ts 24 - + + Customised Automations Automatisations personnalisées src/app/data/product/product.data.ts 28 - + + Fully customised automation solutions for your needs. Solutions d'automatisation entièrement personnalisées pour vos besoins. src/app/data/product/product.data.ts 29 - + + Reports Rapports src/app/data/product/product.data.ts 33 - + + Custom Security Compliance Conformité de sécurité personnalisée src/app/data/product/product.data.ts 38 - + + Core Features CARACTERISTIQUES de base src/app/data/product/product.data.ts 44 - + + Free Libérer src/app/data/product/product.data.ts 68 - + + Up to 10 users Jusqu'à 10 utilisateurs src/app/data/product/product.data.ts 83 - + + Unlimited users Jusqu'à 10 utilisateurs src/app/data/product/product.data.ts 90 - - File Storage Server Template is a generic open source file storage server that has simple yet powerful design to connect your business with third party file storage provider companies (like AWS S3). - Le modèle de serveur de stockage de fichiers est un serveur de stockage de fichiers open source générique doté d'une conception simple mais puissante pour connecter votre entreprise à des fournisseurs de stockage de fichiers tiers (comme AWS S3). + + + File Storage Server Template is a generic open source file storage server that has simple yet powerful + design to connect your business with third party file storage provider companies (like AWS S3). + + Le modèle de serveur de stockage de fichiers est un serveur de stockage de fichiers open source + générique doté d'une conception simple mais puissante pour connecter votre entreprise à des fournisseurs de + stockage de fichiers tiers (comme AWS S3). + src/app/data/product/product.data.ts 130 - - Business Logic Server Template is a generic open source server that encodes the real-world business rules that determine how data can be created, stored, and changed. It saves you from rewriting boilerplate code. It works best with other Open Template Hub products. - Le modèle de serveur de logique métier est un serveur open source générique qui code les règles métier du monde réel qui déterminent comment les données peuvent être créées, stockées et modifiées. Cela vous évite de réécrire du code passe-partout. Cela fonctionne mieux avec d'autres produits Open Template Hub. + + + Business Logic Server Template is a generic open source server that encodes the real-world business + rules that determine how data can be created, stored, and changed. It saves you from rewriting boilerplate + code. It works best with other Open Template Hub products. + + Le modèle de serveur de logique métier est un serveur open source générique qui code les règles métier + du monde réel qui déterminent comment les données peuvent être créées, stockées et modifiées. Cela vous évite + de réécrire du code passe-partout. Cela fonctionne mieux avec d'autres produits Open Template Hub. + src/app/data/product/product.data.ts 163 - - Company Profile UI Template is modern, responsive and customisable company profile ui template for your business. It contains reusable components, theme color and design support along with dark theme support. - Le modèle d'interface utilisateur de profil d'entreprise est un modèle d'interface utilisateur de profil d'entreprise moderne, réactif et personnalisable pour votre entreprise. Il contient des composants réutilisables, une prise en charge de la couleur et de la conception du thème ainsi qu'une prise en charge du thème sombre. + + + Company Profile UI Template is modern, responsive and customisable company profile ui template for your + business. It contains reusable components, theme color and design support along with dark theme support. + + Le modèle d'interface utilisateur de profil d'entreprise est un modèle d'interface utilisateur de profil + d'entreprise moderne, réactif et personnalisable pour votre entreprise. Il contient des composants + réutilisables, une prise en charge de la couleur et de la conception du thème ainsi qu'une prise en charge du + thème sombre. + src/app/data/product/product.data.ts 181 - + + Responsive Design Conception réactive src/app/data/product/product.data.ts 189 - + + Dark Mode Support Prise en charge du mode sombre src/app/data/product/product.data.ts 193 - - Web UI Template is modern, responsive and customisable web ui template for your business. It contains reusable components, theme color and design support along with dark theme support. - Le modèle d'interface utilisateur Web est un modèle d'interface utilisateur Web moderne, réactif et personnalisable pour votre entreprise. Il contient des composants réutilisables, une prise en charge de la couleur et de la conception du thème ainsi qu'une prise en charge du thème sombre. + + + Web UI Template is modern, responsive and customisable web ui template for your business. It contains + reusable components, theme color and design support along with dark theme support. + + Le modèle d'interface utilisateur Web est un modèle d'interface utilisateur Web moderne, réactif et + personnalisable pour votre entreprise. Il contient des composants réutilisables, une prise en charge de la + couleur et de la conception du thème ainsi qu'une prise en charge du thème sombre. + src/app/data/product/product.data.ts 233 - - Mobile UI Template is modern, responsive and customisable mobile ui template for your business. It contains reusable components, theme color and design support along with dark theme support. - Le modèle d'interface utilisateur mobile est un modèle d'interface utilisateur mobile moderne, réactif et personnalisable pour votre entreprise. Il contient des composants réutilisables, une prise en charge de la couleur et de la conception du thème ainsi qu'une prise en charge du thème sombre. + + + Mobile UI Template is modern, responsive and customisable mobile ui template for your business. It + contains reusable components, theme color and design support along with dark theme support. + + Le modèle d'interface utilisateur mobile est un modèle d'interface utilisateur mobile moderne, réactif + et personnalisable pour votre entreprise. Il contient des composants réutilisables, une prise en charge de la + couleur et de la conception du thème ainsi qu'une prise en charge du thème sombre. + src/app/data/product/product.data.ts 285 - + + iOS Support Prise en charge iOS src/app/data/product/product.data.ts 293 - + + Dark Mode Support Prise en charge du mode sombre src/app/data/product/product.data.ts 297 - + + Command line interface generator of the servers at Open Template Hub Générateur d'interface de ligne de commande des serveurs d'Open Template Hub src/app/data/product/product.data.ts 344 - + + Command line interface generator of the user interfaces at Open Template Hub Générateur d'interface de ligne de commande des interfaces utilisateur à Open Template Hub src/app/data/product/product.data.ts 389 - - Orchestration Server Template is a middleware server that has simple yet powerful design to connect your business with all Open Template Hub servers (like Auth Server, Payment Server, File Storage Server or Mail Server). It also has generic design to integrate any other servers. - Orchestration Server Template est un serveur middleware doté d'une conception simple mais puissante pour connecter votre entreprise à tous les serveurs Open Template Hub (comme le serveur d'authentification, le serveur de paiement, le serveur de stockage de fichiers ou le serveur de messagerie). Il a également une conception générique pour intégrer d'autres serveurs. + + + Orchestration Server Template is a middleware server that has simple yet powerful design to connect your + business with all Open Template Hub servers (like Auth Server, Payment Server, File Storage Server or Mail + Server). It also has generic design to integrate any other servers. + + Orchestration Server Template est un serveur middleware doté d'une conception simple mais puissante pour + connecter votre entreprise à tous les serveurs Open Template Hub (comme le serveur d'authentification, le + serveur de paiement, le serveur de stockage de fichiers ou le serveur de messagerie). Il a également une + conception générique pour intégrer d'autres serveurs. + src/app/data/product/product.data.ts 441 - + + Core Features CARACTERISTIQUES de base src/app/data/product/product.data.ts 447 - + + Integrated with OTH Servers Intégré aux serveurs OTH src/app/data/product/product.data.ts 450 - + + Works seamlessly with Open Template Hub Servers. Fonctionne de manière transparente avec les serveurs Open Template Hub. src/app/data/product/product.data.ts 451 - + + Basic De base src/app/data/product/product.data.ts 474 - + + For Individuals Pour les particuliers src/app/data/product/product.data.ts 475 - + + Standard Standard src/app/data/product/product.data.ts 484 - + + Up to 10 users Jusqu'à 10 utilisateurs src/app/data/product/product.data.ts 488 - + + Enterprise Entreprise src/app/data/product/product.data.ts 491 - + + Unlimited users Utilisateurs illimités src/app/data/product/product.data.ts 494 - + + Services that we provide Services que nous fournissons src/app/data/product/product.data.ts 507 - - We perform world-class custom software development services from startups to enterprise businesses. Our highly experienced software developers have a deep understanding of how to leverage top programming languages, frameworks, and other software development tools to create the ideal solution for your business. - Nous proposons des services de développement de logiciels personnalisés de classe mondiale, des startups aux entreprises. Nos développeurs de logiciels hautement expérimentés ont une compréhension approfondie de la manière d'exploiter les meilleurs langages de programmation, frameworks et autres outils de développement de logiciels pour créer la solution idéale pour votre entreprise. + + + We perform world-class custom software development services from startups to enterprise businesses. Our + highly experienced software developers have a deep understanding of how to leverage top programming languages, + frameworks, and other software development tools to create the ideal solution for your business. + + Nous proposons des services de développement de logiciels personnalisés de classe mondiale, des startups + aux entreprises. Nos développeurs de logiciels hautement expérimentés ont une compréhension approfondie de la + manière d'exploiter les meilleurs langages de programmation, frameworks et autres outils de développement de + logiciels pour créer la solution idéale pour votre entreprise. + src/app/data/product/product.data.ts 512 - + + Features Caractéristiques src/app/data/product/product.data.ts 516 - + + Custom Application Development Développement d'applications personnalisées src/app/data/product/product.data.ts 519 - + + Application Maintenance Maintenance des applications src/app/data/product/product.data.ts 523 - + + Implementation & Deployment Mise en œuvre & Déploiement src/app/data/product/product.data.ts 527 - - When a company adopts a new technology or business process, they face many challenges between their current applications and systems and the complicated software implementation process. Our industry-specific software engineers handle all of your challenging integration & implementation obstacles, including architectural design, testing, debugging, and execution. - Lorsqu'une entreprise adopte une nouvelle technologie ou un nouveau processus métier, elle est confrontée à de nombreux défis entre ses applications et systèmes actuels et le processus complexe de mise en œuvre du logiciel. Nos ingénieurs logiciels spécifiques à l'industrie gèrent tous vos défis d'intégration & obstacles à la mise en œuvre, y compris la conception architecturale, les tests, le débogage et l'exécution. + + + When a company adopts a new technology or business process, they face many challenges between their + current applications and systems and the complicated software implementation process. Our industry-specific + software engineers handle all of your challenging integration & implementation obstacles, including + architectural design, testing, debugging, and execution. + + Lorsqu'une entreprise adopte une nouvelle technologie ou un nouveau processus métier, elle est + confrontée à de nombreux défis entre ses applications et systèmes actuels et le processus complexe de mise en + œuvre du logiciel. Nos ingénieurs logiciels spécifiques à l'industrie gèrent tous vos défis d'intégration + & obstacles à la mise en œuvre, y compris la conception architecturale, les tests, le débogage et + l'exécution. + src/app/data/product/product.data.ts 538 - + + Features Caractéristiques src/app/data/product/product.data.ts 542 - + + Custom Application Development Développement d'applications personnalisées src/app/data/product/product.data.ts 545 - - We rely on our industry-specific technology experience to deliver highly scalable, flexible, and interoperable web, mobile, desktop, and hybrid applications. - Nous nous appuyons sur notre expérience technologique spécifique à l'industrie pour fournir des applications Web, mobiles, de bureau et hybrides hautement évolutives, flexibles et interopérables. + + + We rely on our industry-specific technology experience to deliver highly scalable, flexible, and + interoperable web, mobile, desktop, and hybrid applications. + + Nous nous appuyons sur notre expérience technologique spécifique à l'industrie pour fournir des + applications Web, mobiles, de bureau et hybrides hautement évolutives, flexibles et interopérables. + src/app/data/product/product.data.ts 546 - + + Application Maintenance Maintenance des applications src/app/data/product/product.data.ts 549 - - Our app maintenance & modernization services are designed to ensure the scalability, performance, and sustainability of your entire software infrastructure. - Notre maintenance d'applications & Les services de modernisation sont conçus pour garantir l'évolutivité, les performances et la durabilité de l'ensemble de votre infrastructure logicielle. + + + Our app maintenance & modernization services are designed to ensure the scalability, performance, + and sustainability of your entire software infrastructure. + + Notre maintenance d'applications & Les services de modernisation sont conçus pour garantir + l'évolutivité, les performances et la durabilité de l'ensemble de votre infrastructure logicielle. + src/app/data/product/product.data.ts 550 - + + Implementation & Deployment Mise en œuvre & Déploiement src/app/data/product/product.data.ts 553 - - We devise an in-depth, comprehensive software implementation & deployment plan, assessing your needs to deliver enhanced technologies to end-users. - Nous concevons une implémentation logicielle approfondie et complète & plan de déploiement, en évaluant vos besoins pour fournir des technologies améliorées aux utilisateurs finaux. + + + We devise an in-depth, comprehensive software implementation & deployment plan, assessing your needs + to deliver enhanced technologies to end-users. + + Nous concevons une implémentation logicielle approfondie et complète & plan de déploiement, en + évaluant vos besoins pour fournir des technologies améliorées aux utilisateurs finaux. + src/app/data/product/product.data.ts 554 - - We deliver full-cycle QA automated software testing for web, mobile, and desktop applications to enable improved test coverage, enhance product quality, optimize testing activities, boost productivity, and decrease overall testing times. - Nous proposons des tests logiciels automatisés d'assurance qualité à cycle complet pour les applications Web, mobiles et de bureau afin d'améliorer la couverture des tests, d'améliorer la qualité des produits, d'optimiser les activités de test, d'augmenter la productivité et de réduire la durée globale des tests. + + + We deliver full-cycle QA automated software testing for web, mobile, and desktop applications to enable + improved test coverage, enhance product quality, optimize testing activities, boost productivity, and decrease + overall testing times. + + Nous proposons des tests logiciels automatisés d'assurance qualité à cycle complet pour les applications + Web, mobiles et de bureau afin d'améliorer la couverture des tests, d'améliorer la qualité des produits, + d'optimiser les activités de test, d'augmenter la productivité et de réduire la durée globale des tests. + src/app/data/product/product.data.ts 564 - + + Features Caractéristiques src/app/data/product/product.data.ts 568 - + + Custom Application Development Développement d'applications personnalisées src/app/data/product/product.data.ts 571 - - We rely on our industry-specific technology experience to deliver highly scalable, flexible, and interoperable web, mobile, desktop, and hybrid applications. - Nous nous appuyons sur notre expérience technologique spécifique à l'industrie pour fournir des applications Web, mobiles, de bureau et hybrides hautement évolutives, flexibles et interopérables. + + + We rely on our industry-specific technology experience to deliver highly scalable, flexible, and + interoperable web, mobile, desktop, and hybrid applications. + + Nous nous appuyons sur notre expérience technologique spécifique à l'industrie pour fournir des + applications Web, mobiles, de bureau et hybrides hautement évolutives, flexibles et interopérables. + src/app/data/product/product.data.ts 572 - + + Application Maintenance Maintenance des applications src/app/data/product/product.data.ts 575 - - Our app maintenance & modernization services are designed to ensure the scalability, performance, and sustainability of your entire software infrastructure. - Our app maintenance & modernization services are designed to ensure the scalability, performance, and sustainability of your entire software infrastructure. + + + Our app maintenance & modernization services are designed to ensure the scalability, performance, + and sustainability of your entire software infrastructure. + + Our app maintenance & modernization services are designed to ensure the scalability, performance, + and sustainability of your entire software infrastructure. + src/app/data/product/product.data.ts 576 - + + Implementation & Deployment Mise en œuvre & Déploiement src/app/data/product/product.data.ts 579 - - We devise an in-depth, comprehensive software implementation & deployment plan, assessing your needs to deliver enhanced technologies to end-users. - Nous concevons une implémentation logicielle approfondie et complète & plan de déploiement, en évaluant vos besoins pour fournir des technologies améliorées aux utilisateurs finaux + + + We devise an in-depth, comprehensive software implementation & deployment plan, assessing your needs + to deliver enhanced technologies to end-users. + + Nous concevons une implémentation logicielle approfondie et complète & plan de déploiement, en + évaluant vos besoins pour fournir des technologies améliorées aux utilisateurs finaux + src/app/data/product/product.data.ts 580 - + + Customer Testimonials Témoignages de clients - src/app/page/landing-layout/customers-page/customers-page.component.ts + src/app/page/landing-layout/customers-page/customers-page.component.ts + 15 - + + What our customers are saying... Ce que disent nos clients... - src/app/page/landing-layout/customers-page/customers-page.component.ts + src/app/page/landing-layout/customers-page/customers-page.component.ts + 16 - src/app/page/landing-layout/product-page/product-page.component.ts + src/app/page/landing-layout/product-page/product-page.component.ts + 34 - + + Product Types Types de produits src/app/page/landing-layout/home-page/home-page.component.html 33 - + + Open Source Ratio Ratio open source src/app/page/landing-layout/home-page/home-page.component.html 40 - + + Customer testimonials Témoignages de clients src/app/page/landing-layout/home-page/home-page.component.ts 46 - + + What our customers are saying... Ce que disent nos clients... src/app/page/landing-layout/home-page/home-page.component.ts 47 - + + From startups to the enterprise companies Des startups aux entreprises src/app/page/landing-layout/home-page/home-page.component.ts 51 - - Thousands of companies in over 50 countries use Open Template Hub to start, run, and scale their businesses. - Des milliers d'entreprises dans plus de 50 pays utilisent Open Template Hub pour démarrer, gérer et développer leurs activités. + + + Thousands of companies in over 50 countries use Open Template Hub to start, run, and scale their + businesses. + + Des milliers d'entreprises dans plus de 50 pays utilisent Open Template Hub pour démarrer, gérer et + développer leurs activités. + src/app/page/landing-layout/home-page/home-page.component.ts 52 - + + Why Open Template Hub? Pourquoi ouvrir Template Hub ? src/app/page/landing-layout/home-page/home-page.component.ts 56 - + + Just focus on your business and leave us all others Concentrez-vous simplement sur votre entreprise et laissez-nous tous les autres src/app/page/landing-layout/home-page/home-page.component.ts 57 - + + Explore our Products Explorez nos produits src/app/page/landing-layout/home-page/home-page.component.ts 61 - + + Explore our open source and premium products to get started today. Découvrez nos produits open source et premium pour commencer dès aujourd'hui. src/app/page/landing-layout/home-page/home-page.component.ts 62 - + + Download Package Télécharger le package - src/app/page/landing-layout/product-page/product-page.component.html + src/app/page/landing-layout/product-page/product-page.component.html + 27 - + + Customer testimonials Témoignages de clients - src/app/page/landing-layout/product-page/product-page.component.ts + src/app/page/landing-layout/product-page/product-page.component.ts + 33 - + + What our customers are saying... Ce que disent nos clients... - src/app/page/landing-layout/product-page/product-page.component.ts + src/app/page/landing-layout/product-page/product-page.component.ts + 34 - + + Business Partners Partenaires d'affaires - src/app/page/landing-layout/partners-page/partners-page.component.ts + src/app/page/landing-layout/partners-page/partners-page.component.ts + 17 - + + Create and run your online business with Open Template Hub and our partners. Créez et gérez votre entreprise en ligne avec Open Template Hub et nos partenaires. - src/app/page/landing-layout/partners-page/partners-page.component.ts + src/app/page/landing-layout/partners-page/partners-page.component.ts + 18 - - Auth Server Template is a generic open source authentication server that has simple yet powerful design to connect your business with all OAuth 2.0 and OAuth supporting third party companies (like Google, Facebook, Twitter or LinkedIn). It also supports basic username password authentication system. - Le modèle de serveur d'authentification est un serveur d'authentification open source générique doté d'une conception simple mais puissante pour connecter votre entreprise à toutes les sociétés tierces prenant en charge OAuth 2.0 et OAuth (comme Google, Facebook, Twitter ou LinkedIn). Il prend également en charge le système d'authentification par mot de passe du nom d'utilisateur de base. + + + Auth Server Template is a generic open source authentication server that has simple yet powerful design + to connect your business with all OAuth 2.0 and OAuth supporting third party companies (like Google, Facebook, + Twitter or LinkedIn). It also supports basic username password authentication system. + + Le modèle de serveur d'authentification est un serveur d'authentification open source générique doté + d'une conception simple mais puissante pour connecter votre entreprise à toutes les sociétés tierces prenant + en charge OAuth 2.0 et OAuth (comme Google, Facebook, Twitter ou LinkedIn). Il prend également en charge le + système d'authentification par mot de passe du nom d'utilisateur de base. + src/app/data/product/product.data.ts 108 - + + User interface solutions for your needs Solutions d'interface utilisateur pour vos besoins src/app/data/product/product.data.ts 176 - + + Reusable components Composants réutilisables src/app/data/product/product.data.ts 197 - + + Command line interface generators Générateurs d'interface de ligne de commande src/app/data/product/product.data.ts 339 - + + For Startups Pour les startups src/app/data/product/product.data.ts 485 - + + For Enterprises Pour les entreprises src/app/data/product/product.data.ts 492 - + + Customised Solutions Solutions personnalisées src/app/data/product/product.data.ts 18 - + + Fully customised functional solutions for your needs. Des solutions fonctionnelles entièrement personnalisées pour vos besoins. src/app/data/product/product.data.ts 19 - + + Get a security report at the end of each month. Obtenez un rapport de sécurité à la fin de chaque mois. src/app/data/product/product.data.ts 34 - + + Fully customised security compliance solutions for your needs. Des solutions de conformité de sécurité entièrement personnalisées pour vos besoins. src/app/data/product/product.data.ts 39 - + + Quality and DX Qualité et DX src/app/data/product/product.data.ts 52 - + + Security Sécurité src/app/data/product/product.data.ts 59 - + + For Individuals Pour les particuliers src/app/data/product/product.data.ts 69 - + + mo. mo. src/app/data/product/product.data.ts 73 - + + Standard Standard src/app/data/product/product.data.ts 79 - + + For Startups Pour les startups src/app/data/product/product.data.ts 80 - + + Enterprise Enterprise src/app/data/product/product.data.ts 87 - + + For Enterprises Pour les entreprises src/app/data/product/product.data.ts 88 - + + Integrate your servers with social login providers in minutes. Intégrez vos serveurs avec des fournisseurs de connexion sociale en quelques minutes. - src/app/component/product-represantation/product-presentation.component.ts + + src/app/component/product-represantation/product-presentation.component.ts + 102 - + + Integrate your servers with payment solution providers in minutes. Intégrez vos serveurs aux fournisseurs de solutions de paiement en quelques minutes. - src/app/component/product-represantation/product-presentation.component.ts + + src/app/component/product-represantation/product-presentation.component.ts + 107 - + + Integrate your servers with file storage solution providers in minutes. - Intégrez vos serveurs avec des fournisseurs de solutions de stockage de fichiers en quelques minutes. + Intégrez vos serveurs avec des fournisseurs de solutions de stockage de fichiers en quelques minutes. + - src/app/component/product-represantation/product-presentation.component.ts + + src/app/component/product-represantation/product-presentation.component.ts + 112 - + + Integrate your servers with email service providers in minutes. Intégrez vos serveurs avec des fournisseurs de services de messagerie en quelques minutes. - src/app/component/product-represantation/product-presentation.component.ts + + src/app/component/product-represantation/product-presentation.component.ts + 117 - + + Lightweight Microservices Microservices légers src/app/data/feature/feature.data.ts 5 - - Do not lost on functional dependencies, you can only focus on your business. All other layers like authentication, payment, mail, storage, analytics are covered by us with extremely lightweight and configurable microservices. Always be safe with encrypted service communications. Order your out-of-transaction requests with message queues. Do not spend your resources on performance enhancements, enjoy fastest service response times. - Ne vous perdez pas sur les dépendances fonctionnelles, vous ne pouvez vous concentrer que sur votre activité. Toutes les autres couches telles que l'authentification, le paiement, la messagerie, le stockage, l'analyse sont couvertes par nous avec des microservices extrêmement légers et configurables. Soyez toujours en sécurité avec les communications de service cryptées. Commandez vos demandes hors transaction avec des files d'attente de messages. Ne dépensez pas vos ressources en améliorations de performances, profitez des temps de réponse de service les plus rapides. + + + Do not lost on functional dependencies, you can only focus on your business. All other layers like + authentication, payment, mail, storage, analytics are covered by us with extremely lightweight and + configurable microservices. Always be safe with encrypted service communications. Order your + out-of-transaction requests with message queues. Do not spend your resources on performance enhancements, + enjoy fastest service response times. + + Ne vous perdez pas sur les dépendances fonctionnelles, vous ne pouvez vous concentrer que sur votre + activité. Toutes les autres couches telles que l'authentification, le paiement, la messagerie, le stockage, + l'analyse sont couvertes par nous avec des microservices extrêmement légers et configurables. Soyez toujours + en sécurité avec les communications de service cryptées. Commandez vos demandes hors transaction avec des + files d'attente de messages. Ne dépensez pas vos ressources en améliorations de performances, profitez des + temps de réponse de service les plus rapides. + src/app/data/feature/feature.data.ts 6 - + + Compact Storage Stockage compact src/app/data/feature/feature.data.ts 10 - - Store your data efficiently and do not waste your time on your data architecture and performance analysis. Open Template Hub provides you efficient storage, orients and keeps your data in NOSQL and RDBMS, handles connection pools and management. - Stockez vos données efficacement et ne perdez pas votre temps sur votre architecture de données et l'analyse des performances. Open Template Hub vous offre un stockage efficace, oriente et conserve vos données dans NOSQL et RDBMS, gère les pools de connexions et la gestion. + + + Store your data efficiently and do not waste your time on your data architecture and performance + analysis. Open Template Hub provides you efficient storage, orients and keeps your data in NOSQL and RDBMS, + handles connection pools and management. + + Stockez vos données efficacement et ne perdez pas votre temps sur votre architecture de données et + l'analyse des performances. Open Template Hub vous offre un stockage efficace, oriente et conserve vos données + dans NOSQL et RDBMS, gère les pools de connexions et la gestion. + src/app/data/feature/feature.data.ts 11 - + + Reliable Design Conception fiable src/app/data/feature/feature.data.ts 15 - - Shout your business out to the world using responsive user interfaces with handy and highly customizable components. - Criez votre entreprise au monde entier à l'aide d'interfaces utilisateur réactives avec des composants pratiques et hautement personnalisables. + + + Shout your business out to the world using responsive user interfaces with handy and highly customizable + components. + + Criez votre entreprise au monde entier à l'aide d'interfaces utilisateur réactives avec des composants + pratiques et hautement personnalisables. + src/app/data/feature/feature.data.ts 16 - + + Get more things done with our premium solutions Faites plus de choses avec nos solutions premium src/app/data/product/product.data.ts 435 - - Furkan is an experienced full-stack developer who has worked on various projects, including online payment solutions and fraud detection areas, in a well-known airline company. He's co-founded a startup to discover talents from the open-source community. After one year, Furkan successfully exited from his startup and then co-founded Open Template Hub. - Furkan est un développeur full-stack expérimenté qui a travaillé sur divers projets, y compris des solutions de paiement en ligne et des domaines de détection de fraude, dans une compagnie aérienne bien connue. Il a co-fondé une startup pour découvrir les talents de la communauté open source. Après un an, Furkan a réussi à sortir de sa startup et a ensuite co-fondé Open Template Hub. + + + Furkan is an experienced full-stack developer who has worked on various projects, including online + payment solutions and fraud detection areas, in a well-known airline company. He's co-founded a startup to + discover talents from the open-source community. After one year, Furkan successfully exited from his startup + and then co-founded Open Template Hub. + + Furkan est un développeur full-stack expérimenté qui a travaillé sur divers projets, y compris des + solutions de paiement en ligne et des domaines de détection de fraude, dans une compagnie aérienne bien + connue. Il a co-fondé une startup pour découvrir les talents de la communauté open source. Après un an, Furkan + a réussi à sortir de sa startup et a ensuite co-fondé Open Template Hub. + src/app/data/employee/employee.data.ts 8 - - Fatih is a young professional with wide-ranging experience in software design and technology. He worked several years on Finance and Telecom business areas. He is now a Founder and CEO at Remoklify. He also co-founded Open Template Hub. - Fatih est un jeune professionnel possédant une vaste expérience dans la conception et la technologie de logiciels. Il a travaillé plusieurs années sur les métiers de la Finance et des Télécoms. Il est maintenant fondateur et PDG de Remoklify. Il a également co-fondé Open Template Hub. + + + Fatih is a young professional with wide-ranging experience in software design and technology. He worked + several years on Finance and Telecom business areas. He is now a Founder and CEO at Remoklify. He also + co-founded Open Template Hub. + + Fatih est un jeune professionnel possédant une vaste expérience dans la conception et la technologie de + logiciels. Il a travaillé plusieurs années sur les métiers de la Finance et des Télécoms. Il est maintenant + fondateur et PDG de Remoklify. Il a également co-fondé Open Template Hub. + src/app/data/employee/employee.data.ts 23 - - Would you like to join our team? Please feel free to reach us from info@opentemplatehub.com or from jobs page. - Vous souhaitez rejoindre notre équipe ? N'hésitez pas à nous contacter depuis info@opentemplatehub.com ou depuis la page des emplois. + + + Would you like to join our team? Please feel free to reach us from info@opentemplatehub.com or from jobs + page. + + Vous souhaitez rejoindre notre équipe ? N'hésitez pas à nous contacter depuis info@opentemplatehub.com + ou depuis la page des emplois. + src/app/data/employee/employee.data.ts 53 - - I can say, without a doubt, that Open Template Hub's products scale quickly and provide the best performance in the market. The best part is that we don't have to worry about any licensing fees at all... I highly recommend this affordable and reliable products! - Je peux dire, sans aucun doute, que les produits d'Open Template Hub évoluent rapidement et offrent les meilleures performances du marché. La meilleure partie est que nous n'avons pas du tout à nous soucier des frais de licence... Je recommande fortement ces produits abordables et fiables ! + + + I can say, without a doubt, that Open Template Hub's products scale quickly and provide the best + performance in the market. The best part is that we don't have to worry about any licensing fees at all... I + highly recommend this affordable and reliable products! + + Je peux dire, sans aucun doute, que les produits d'Open Template Hub évoluent rapidement et offrent les + meilleures performances du marché. La meilleure partie est que nous n'avons pas du tout à nous soucier des + frais de licence... Je recommande fortement ces produits abordables et fiables ! + src/app/data/testimonial/testimonial.data.ts 8 - - Working with the team at Open Template Hub has been a very satisfying experience. The team was communicative and supportive throughout the project, which made for a pleasant working environment. They were able to complete my project in an expert and timely manner. - Travailler avec l'équipe d'Open Template Hub a été une expérience très satisfaisante. L'équipe a été communicative et solidaire tout au long du projet, ce qui a créé un environnement de travail agréable. Ils ont pu mener à bien mon projet de manière experte et dans les délais. + + + Working with the team at Open Template Hub has been a very satisfying experience. The team was + communicative and supportive throughout the project, which made for a pleasant working environment. They were + able to complete my project in an expert and timely manner. + + Travailler avec l'équipe d'Open Template Hub a été une expérience très satisfaisante. L'équipe a été + communicative et solidaire tout au long du projet, ce qui a créé un environnement de travail agréable. Ils ont + pu mener à bien mon projet de manière experte et dans les délais. + src/app/data/testimonial/testimonial.data.ts 21 - - I've been researching for days about microserver templates and didn't really find much. But then I found Open Template Hub... This is an excellent way to save money and time for startups or small companies who don't have the means to pay hefty prices for licenses. Thank you so much. - J'ai fait des recherches pendant des jours sur les modèles de microserveur et je n'ai pas vraiment trouvé grand-chose. Mais ensuite j'ai trouvé Open Template Hub... C'est un excellent moyen d'économiser de l'argent et du temps pour les startups ou les petites entreprises qui n'ont pas les moyens de payer le prix fort pour les licences. Merci beaucoup. + + + I've been researching for days about microserver templates and didn't really find much. But then I found + Open Template Hub... This is an excellent way to save money and time for startups or small companies who don't + have the means to pay hefty prices for licenses. Thank you so much. + + J'ai fait des recherches pendant des jours sur les modèles de microserveur et je n'ai pas vraiment + trouvé grand-chose. Mais ensuite j'ai trouvé Open Template Hub... C'est un excellent moyen d'économiser de + l'argent et du temps pour les startups ou les petites entreprises qui n'ont pas les moyens de payer le prix + fort pour les licences. Merci beaucoup. + src/app/data/testimonial/testimonial.data.ts 34 - - As a startup, time is of the essence for us. That's why Open Template Hub has been so helpful for us. It has saved us hours of time when it comes to creating the perfect website for our company. - As a startup, time is of the essence for us. That's why Open Template Hub has been so helpful for us. It has saved us hours of time when it comes to creating the perfect website for our company. + + + As a startup, time is of the essence for us. That's why Open Template Hub has been so helpful for us. It + has saved us hours of time when it comes to creating the perfect website for our company. + + As a startup, time is of the essence for us. That's why Open Template Hub has been so helpful for us. It + has saved us hours of time when it comes to creating the perfect website for our company. + src/app/data/testimonial/testimonial.data.ts 47 - - Open Template Hub's Orchestration Server was easy to set up and integrate with our existing servers. I liked how the system automatically synced over all of the latest updates, it made managing our company's server so much easier. The customer service is also top-notch! - Le serveur d'orchestration d'Open Template Hub était facile à configurer et à intégrer à nos serveurs existants. J'ai aimé la façon dont le système se synchronisait automatiquement avec toutes les dernières mises à jour, cela facilitait grandement la gestion du serveur de notre entreprise. Le service client est également au top ! + + + Open Template Hub's Orchestration Server was easy to set up and integrate with our existing servers. I + liked how the system automatically synced over all of the latest updates, it made managing our company's + server so much easier. The customer service is also top-notch! + + Le serveur d'orchestration d'Open Template Hub était facile à configurer et à intégrer à nos serveurs + existants. J'ai aimé la façon dont le système se synchronisait automatiquement avec toutes les dernières mises + à jour, cela facilitait grandement la gestion du serveur de notre entreprise. Le service client est également + au top ! + src/app/data/testimonial/testimonial.data.ts 60 - - I'm a big fan of Open Template Hub. The process was really easy, the team is efficient, and the payment service is really accurate. I would recommend this to any business owner. - Je suis un grand fan d'Open Template Hub. Le processus était vraiment simple, l'équipe est efficace et le service de paiement est vraiment précis. Je le recommanderais à tout propriétaire d'entreprise. + + + I'm a big fan of Open Template Hub. The process was really easy, the team is efficient, and the payment + service is really accurate. I would recommend this to any business owner. + + Je suis un grand fan d'Open Template Hub. Le processus était vraiment simple, l'équipe est efficace et + le service de paiement est vraiment précis. Je le recommanderais à tout propriétaire d'entreprise. + src/app/data/testimonial/testimonial.data.ts 73 - - Would you like to tell us how was your Open Template Hub experience or are you planning to use our products but need some professional help? Please feel free to reach us from info@opentemplatehub.com or from contact us page. - Souhaitez-vous nous dire comment s'est passée votre expérience avec Open Template Hub ou envisagez-vous d'utiliser nos produits mais avez-vous besoin d'une aide professionnelle ? N'hésitez pas à nous contacter depuis info@opentemplatehub.com ou depuis la page contactez-nous. + + + Would you like to tell us how was your Open Template Hub experience or are you planning to use our + products but need some professional help? Please feel free to reach us from info@opentemplatehub.com or from + contact us page. + + Souhaitez-vous nous dire comment s'est passée votre expérience avec Open Template Hub ou envisagez-vous + d'utiliser nos produits mais avez-vous besoin d'une aide professionnelle ? N'hésitez pas à nous contacter + depuis info@opentemplatehub.com ou depuis la page contactez-nous. + src/app/data/testimonial/testimonial.data.ts 86 - + + #opensource #opensource - src/app/page/landing-layout/product-page/product-page.component.ts + src/app/page/landing-layout/product-page/product-page.component.ts + 131 - + + #premium #prime - src/app/page/landing-layout/product-page/product-page.component.ts + src/app/page/landing-layout/product-page/product-page.component.ts + 131 - + + CEO @ Your Company CEO @ votre entreprise src/app/data/testimonial/testimonial.data.ts 89 - + + Read More Stories Lire plus d'histoires @@ -4146,24 +4871,31 @@ 51 - src/app/page/landing-layout/product-page/product-page.component.html + src/app/page/landing-layout/product-page/product-page.component.html + 83 - + + Read more Lire la suite - src/app/component/card/blog-holder-card/blog-holder-card.component.html + src/app/component/card/blog-holder-card/blog-holder-card.component.html + 22 - + + Modern, responsive and customisable company profile ui template written with Angular - Modèle d'interface utilisateur de profil d'entreprise moderne, réactif et personnalisable écrit avec Angular + Modèle d'interface utilisateur de profil d'entreprise moderne, réactif et personnalisable écrit avec + Angular + src/app/data/product/product.data.ts 236 - + + Customisable Theme Colors Couleurs de thème personnalisables @@ -4174,7 +4906,8 @@ src/app/data/product/product.data.ts 302 - + + Customisable Theme Design Conception de thème personnalisable @@ -4185,77 +4918,111 @@ src/app/data/product/product.data.ts 306 - + + Modern, responsive and customisable company profile ui template written with Angular - Modèle d'interface utilisateur de profil d'entreprise moderne, réactif et personnalisable écrit avec Angular + Modèle d'interface utilisateur de profil d'entreprise moderne, réactif et personnalisable écrit avec + Angular + src/app/data/product/product.data.ts 285 - + + Modern, responsive and customisable company profile ui template written with React Native - Modèle d'interface utilisateur de profil d'entreprise moderne, réactif et personnalisable écrit avec React Native + Modèle d'interface utilisateur de profil d'entreprise moderne, réactif et personnalisable écrit avec + React Native + src/app/data/product/product.data.ts 332 - - Mert is a new grad software engineer who has been experienced various technologies in his bachelor years. He worked on e-commercial and banking areas. Now, he is a full-stack developer at Open Template Hub and also working on native iOS applications. - Mert est un nouvel ingénieur logiciel diplômé qui a expérimenté diverses technologies au cours de ses années de licence. Il a travaillé sur les domaines du commerce électronique et de la banque. Aujourd'hui, il est développeur full-stack chez Open Template Hub et travaille également sur des applications iOS natives. + + + Mert is a new grad software engineer who has been experienced various technologies in his bachelor + years. He worked on e-commercial and banking areas. Now, he is a full-stack developer at Open Template Hub and + also working on native iOS applications. + + Mert est un nouvel ingénieur logiciel diplômé qui a expérimenté diverses technologies au cours de ses + années de licence. Il a travaillé sur les domaines du commerce électronique et de la banque. Aujourd'hui, il + est développeur full-stack chez Open Template Hub et travaille également sur des applications iOS natives. + src/app/data/employee/employee.data.ts 38 - + + Android Support Prise en charge d'Android src/app/data/product/product.data.ts 345 - - We rely on our industry-specific technology experience to deliver highly scalable, flexible, and interoperable web, mobile, desktop, and hybrid applications. - Nous nous appuyons sur notre expérience technologique spécifique à l'industrie pour fournir des applications Web, mobiles, de bureau et hybrides hautement évolutives, flexibles et interopérables. + + + We rely on our industry-specific technology experience to deliver highly scalable, flexible, and + interoperable web, mobile, desktop, and hybrid applications. + + Nous nous appuyons sur notre expérience technologique spécifique à l'industrie pour fournir des + applications Web, mobiles, de bureau et hybrides hautement évolutives, flexibles et interopérables. + src/app/data/product/product.data.ts 546 - - Our app maintenance & modernization services are designed to ensure the scalability, performance, and sustainability of your entire software infrastructure. - Nos services de maintenance et de modernisation des applications sont conçus pour garantir l'évolutivité, les performances et la durabilité de l'ensemble de votre infrastructure logicielle. + + + Our app maintenance & modernization services are designed to ensure the scalability, performance, + and sustainability of your entire software infrastructure. + + Nos services de maintenance et de modernisation des applications sont conçus pour garantir + l'évolutivité, les performances et la durabilité de l'ensemble de votre infrastructure logicielle. + src/app/data/product/product.data.ts 550 - - We devise an in-depth, comprehensive software implementation & deployment plan, assessing your needs to deliver enhanced technologies to end-users. - Nous concevons un plan de mise en œuvre et de déploiement de logiciels approfondi et complet, évaluant vos besoins pour fournir des technologies améliorées aux utilisateurs finaux. + + + We devise an in-depth, comprehensive software implementation & deployment plan, assessing your needs + to deliver enhanced technologies to end-users. + + Nous concevons un plan de mise en œuvre et de déploiement de logiciels approfondi et complet, évaluant + vos besoins pour fournir des technologies améliorées aux utilisateurs finaux. + src/app/data/product/product.data.ts 554 - + + Package Installation & Usage Installation et utilisation du paquet - src/app/page/landing-layout/product-page/product-page.component.ts + src/app/page/landing-layout/product-page/product-page.component.ts + 42 - + + Coming soon.. Bientôt disponible.. src/app/data/product/product.data.ts 226 - - - Learn more - En savoir plus - - src/app/component/card/presentation-card/presentation-card.component.html - 18 - + + + Learn more + En savoir plus + + src/app/component/card/presentation-card/presentation-card.component.html + + 18 + + diff --git a/src/messages-generator.js b/src/messages-generator.js index fcf36cc7..c7b04fc2 100644 --- a/src/messages-generator.js +++ b/src/messages-generator.js @@ -1,100 +1,100 @@ -const fs = require('fs') +const fs = require( "fs" ); -const jsdom = require("jsdom") -const { JSDOM } = jsdom -global.DOMParser = new JSDOM().window.DOMParser +const jsdom = require( "jsdom" ); +const { JSDOM } = jsdom; +global.DOMParser = new JSDOM().window.DOMParser; -const xmlserializer = require('xmlserializer'); +const xmlserializer = require( "xmlserializer" ); const filePaths = { sourceLocale: { - languageCode: 'en-US', - path: './messages.xlf' + languageCode: "en-US", + path: "./messages.xlf" }, localizedFiles: [ - { - languageCode: 'fr', - path: './src/locale/messages.fr.xlf' - } + { + languageCode: "fr", + path: "./src/locale/messages.fr.xlf" + } ] -} +}; let sourceLocaleFile; -const sourceLocalePath = filePaths.sourceLocale.path +const sourceLocalePath = filePaths.sourceLocale.path; try { - sourceLocaleFile = fs.readFileSync( sourceLocalePath, 'utf8' ) -} catch (err) { - console.log( 'Error while opening source locale: ' + err) - process.exit( 1 ) + sourceLocaleFile = fs.readFileSync( sourceLocalePath, "utf8" ); +} catch ( err ) { + console.log( "Error while opening source locale: " + err ); + process.exit( 1 ); } -const parser = new DOMParser() -const sourceLocaleXml = parser.parseFromString( sourceLocaleFile, 'text/xml' ) +const parser = new DOMParser(); +const sourceLocaleXml = parser.parseFromString( sourceLocaleFile, "text/xml" ); -for( const localized of filePaths.localizedFiles ) { - console.log() - console.log( 'For ' + localized.languageCode ) - console.log( '----------' ) +for ( const localized of filePaths.localizedFiles ) { + console.log(); + console.log( "For " + localized.languageCode ); + console.log( "----------" ); - let localizedFile - const localizedFilePath = localized.path + let localizedFile; + const localizedFilePath = localized.path; try { - localizedFile = fs.readFileSync(localizedFilePath, 'utf8') + localizedFile = fs.readFileSync( localizedFilePath, "utf8" ); } catch ( err ) { - console.error( err ) - process.exit( 1 ) + console.error( err ); + process.exit( 1 ); } - const localizedXml = parser.parseFromString( localizedFile, 'text/xml' ) + const localizedXml = parser.parseFromString( localizedFile, "text/xml" ); - const sourceLocaleTransUnits = sourceLocaleXml.getElementsByTagName('trans-unit') - let localizedTransUnits = localizedXml.getElementsByTagName( 'trans-unit' ) + const sourceLocaleTransUnits = sourceLocaleXml.getElementsByTagName( "trans-unit" ); + let localizedTransUnits = localizedXml.getElementsByTagName( "trans-unit" ); - console.log() - console.log( 'Added Words By IDs' ) - console.log( '----------' ) + console.log(); + console.log( "Added Words By IDs" ); + console.log( "----------" ); - for( const sourceLocaleTransUnit of sourceLocaleTransUnits ) { - const transUnit = sourceLocaleTransUnit.cloneNode( true ) + for ( const sourceLocaleTransUnit of sourceLocaleTransUnits ) { + const transUnit = sourceLocaleTransUnit.cloneNode( true ); if ( !localizedXml.getElementById( transUnit.id ) ) { - console.log( transUnit.id ) - const localizedBodyElement = localizedTransUnits[0].parentNode - localizedBodyElement.appendChild( transUnit ) + console.log( transUnit.id ); + const localizedBodyElement = localizedTransUnits[ 0 ].parentNode; + localizedBodyElement.appendChild( transUnit ); } } - localizedTransUnits = localizedXml.getElementsByTagName( 'trans-unit' ) - let unnecessaryLocalizedMessages = [] - for( const localizedTransUnit of localizedTransUnits ) { - const transUnit = localizedTransUnit + localizedTransUnits = localizedXml.getElementsByTagName( "trans-unit" ); + let unnecessaryLocalizedMessages = []; + for ( const localizedTransUnit of localizedTransUnits ) { + const transUnit = localizedTransUnit; if ( !sourceLocaleXml.getElementById( transUnit.id ) ) { - unnecessaryLocalizedMessages.push( transUnit.id ) + unnecessaryLocalizedMessages.push( transUnit.id ); } } - console.log() - console.log( 'Removed Words By IDs' ) - console.log( '----------' ) - for( const unnecessaryLocalizedMessage of unnecessaryLocalizedMessages ) { - console.log( unnecessaryLocalizedMessage ) - localizedXml.getElementById( unnecessaryLocalizedMessage ).remove() + console.log(); + console.log( "Removed Words By IDs" ); + console.log( "----------" ); + for ( const unnecessaryLocalizedMessage of unnecessaryLocalizedMessages ) { + console.log( unnecessaryLocalizedMessage ); + localizedXml.getElementById( unnecessaryLocalizedMessage ).remove(); } // save updated local file - let newLocalFile = localizedXml.documentElement - newLocalFile = xmlserializer.serializeToString( newLocalFile ) + let newLocalFile = localizedXml.documentElement; + newLocalFile = xmlserializer.serializeToString( newLocalFile ); - fs.writeFileSync( localizedFilePath, newLocalFile, { encoding:'utf8',flag:'w' } ) + fs.writeFileSync( localizedFilePath, newLocalFile, { encoding: "utf8", flag: "w" } ); - localizedTransUnits = localizedXml.getElementsByTagName( 'trans-unit' ) + localizedTransUnits = localizedXml.getElementsByTagName( "trans-unit" ); - console.log() - console.log( 'Untranslated Words' ) - console.log( '----------' ) - for( const localizedTransUnit of localizedTransUnits ) { - if( localizedTransUnit.getElementsByTagName('target').length === 0 ) { - console.log( localizedTransUnit.id ) + console.log(); + console.log( "Untranslated Words" ); + console.log( "----------" ); + for ( const localizedTransUnit of localizedTransUnits ) { + if ( localizedTransUnit.getElementsByTagName( "target" ).length === 0 ) { + console.log( localizedTransUnit.id ); } } } diff --git a/src/messages-generator.ts b/src/messages-generator.ts index c2787a75..bc02cb67 100644 --- a/src/messages-generator.ts +++ b/src/messages-generator.ts @@ -7,11 +7,6 @@ try { for ( const line of data.split( '' ) ) { console.log( line ); } - - /*for( const language of supportedLanguages ) { - const path = 'src/locale/messages.' + language + '.xlf' - fs.appendFileSync(path, data) - }*/ } catch ( err ) { console.error( err ); } diff --git a/src/styles/bottom-nav/bottom-nav.scss b/src/styles/bottom-nav/bottom-nav.scss new file mode 100644 index 00000000..858ddcef --- /dev/null +++ b/src/styles/bottom-nav/bottom-nav.scss @@ -0,0 +1,112 @@ +@use "../util/util"; + +.bottom-nav { + position: fixed; + bottom: 0; + left: 0; + height: 55px; + width: 100vw; + display: flex; + justify-content: flex-start; + overflow-x: auto; + + box-shadow: 0 0 5px var(--shadow); + z-index: 11; + padding-bottom: env(safe-area-inset-bottom); + + background-color: var(--background-color-alpha); + -webkit-backdrop-filter: blur(10px); + backdrop-filter: blur(10px); + + & a { + flex: 1; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + min-width: 20vw; + overflow: hidden; + white-space: nowrap; + font-size: 13px; + transition: background-color 0.1s ease-in-out; + cursor: pointer; + + position: relative; + + & i { + margin: 0.2em; + font-size: 19px; + } + + &.disabled { + cursor: auto; + } + + & .notifications { + @include util.flex-layout-row; + @include util.flex-center-center; + + border-radius: 100%; + width: 18px; + height: 18px; + box-sizing: border-box; + box-shadow: 0 -6px 15px -7px var(--shadow); + border: 1px solid var(--card); + background-color: var(--error); + color: var(--card); + + position: absolute; + left: 10vw; + top: 4px; + + &.smaller-font { + font-size: 11px; + } + } + + & span { + font-size: 85%; + } + } + + & .sign-up { + color: var(--theme-color); + } +} + +@media (hover: hover) { + .bottom-nav { + & a { + &:hover { + background: var(--hover); + } + + &.disabled { + cursor: auto; + + &:hover { + background: none; + } + } + } + + & .sign-up { + &:hover { + color: white; + background: var(--theme-color); + } + } + } +} + +@media only screen and (max-width: 999px) { + .bottom-nav { + visibility: visible; + } +} + +@media only screen and (min-width: 1000px) { + .bottom-nav { + visibility: hidden; + } +} diff --git a/src/styles/information/information.scss b/src/styles/information/information.scss index 01a819c7..2d0d7054 100644 --- a/src/styles/information/information.scss +++ b/src/styles/information/information.scss @@ -114,7 +114,7 @@ $information-colors-dark-mode: ( @mixin define-information-color($type) { .#{$type}-background-color { - --info: var(--#{$type}); + --information-color: var(--#{$type}); } } diff --git a/src/styles/input/input.scss b/src/styles/input/input.scss index 05cb1676..3f1bd6bb 100644 --- a/src/styles/input/input.scss +++ b/src/styles/input/input.scss @@ -264,10 +264,6 @@ select { white-space: nowrap; } -.tooltip { - width: fit-content; -} - @media (hover: hover) { form a:hover { background: none; diff --git a/src/styles/logo/logo.scss b/src/styles/logo/logo.scss index e3a959e7..a4fc0abc 100644 --- a/src/styles/logo/logo.scss +++ b/src/styles/logo/logo.scss @@ -11,6 +11,10 @@ } } +.logo-under-maintenance { + filter: grayscale(100%); +} + @media only screen and (max-width: 999px) { .logo-wrapper > * { margin: 0.2em; diff --git a/src/styles/page/page.scss b/src/styles/page/page.scss index 9a2c07f9..78bb2f6a 100644 --- a/src/styles/page/page.scss +++ b/src/styles/page/page.scss @@ -18,7 +18,7 @@ } } -.top-svg { +.top-svg, .bottom-svg { width: 100%; overflow: hidden; line-height: 0; @@ -28,21 +28,24 @@ position: relative; display: block; width: calc(100% + 1.3px); - height: 100%; - min-height: 250px; - max-height: 450px; } position: absolute; } +.bottom-svg { + & svg { + height: 660px; + } +} + @media only screen and (max-width: 999px) { .page { font-size: 18px; } - .top-svg { - top: 0; + .bottom-svg { + display: none; } } diff --git a/src/styles/profile/profile.scss b/src/styles/profile/profile.scss index 4ad376f4..3a6621c4 100644 --- a/src/styles/profile/profile.scss +++ b/src/styles/profile/profile.scss @@ -1,37 +1,49 @@ @use '../util/util'; -.profile-img-small, .profile-img-full, .profile-img-wrapper { - @include util.prefix(border-radius, 99em, moz webkit); +.profile-img-small, .profile-img-wrapper { + @include util.default-border-radius-image; } -.profile-img-small, .profile-img-full { - display: block; +.profile-img { + @include util.default-border-radius-image; + @include util.margin-x-auto; + + position: relative; + + background-color: var(--card); + border: 2px solid var(--shadow-lighter); + box-shadow: 0 -6px 15px -7px var(--shadow); + + width: 120px; + height: 120px; - @include util.prefix(border-radius, 99em, moz webkit); + padding: 5px; - background: { - size: cover; - repeat: no-repeat; - position: center center; - color: var(--contrast); - }; + & app-image-content-loader { + @include util.margin-x-auto; + } + + &.premium-border { + border: 1px solid var(--theme-color); + } +} + +.profile-img-small { + display: block; border: { width: 1px; style: solid; - color: var(--contrast); + color: var(--shadow-lighter); } -} -.profile-img-small { width: 38px; height: 38px; box-shadow: 0 3px 3px var(--shadow-dark-mode); -} -.profile-img-full { - width: 100px; - height: 100px; + &.premium-border { + border: 1px solid var(--theme-color); + } } .profile-img-wrapper { diff --git a/src/styles/rate/rate.scss b/src/styles/rate/rate.scss index f9ec64c9..43e71acb 100644 --- a/src/styles/rate/rate.scss +++ b/src/styles/rate/rate.scss @@ -48,7 +48,6 @@ .rate-badge-wrapper { unicode-bidi: bidi-override; - //width: 205px; width: -webkit-fit-content; & label { diff --git a/src/styles/ribbon/ribbon.scss b/src/styles/ribbon/ribbon.scss index 8678ac18..9d14bdf4 100644 --- a/src/styles/ribbon/ribbon.scss +++ b/src/styles/ribbon/ribbon.scss @@ -7,7 +7,7 @@ overflow: hidden; top: 0; right: 0; - z-index: 9; + z-index: 11; pointer-events: none; font-size: 12px; text-decoration: none; diff --git a/src/styles/social/social.scss b/src/styles/social/social.scss index 2dedaae6..d3349bad 100644 --- a/src/styles/social/social.scss +++ b/src/styles/social/social.scss @@ -1,7 +1,7 @@ $social-colors: ( "social": #898989, "twitter": #00aced, - "google": #4286f5, + "google": #db4437, "facebook-f": #1877f2, "linkedin-in": #2867b2, "vk": #4a76a8, @@ -9,7 +9,6 @@ $social-colors: ( "dribbble": #ea4c89, "reddit": #ff4500, "pinterest": #e60023, - "yandex": #e61400, "github": #171515, "youtube": #e52d27, "buymeacoffee": #FF813F, @@ -23,7 +22,10 @@ $social-colors: ( "outlook": #0078D4, "stripe": #4553ff, "coinbase": #1652f0, - "paypal": #169BD7 + "paypal": #169BD7, + "discord": #5865F2, + "matomo": #3b5aa4, + "mixpanel": #574de1, ); :root { diff --git a/src/styles/styles.common.scss b/src/styles/styles.common.scss index 7c0c669f..fe3fe586 100644 --- a/src/styles/styles.common.scss +++ b/src/styles/styles.common.scss @@ -58,6 +58,10 @@ p, a, h1, h2, h3, h4, h5, h6, label, ul, li { font-weight: 300; word-break: break-word; text-decoration: none; + + &.theme-color { + color: var(--theme-color); + } } hr { @@ -104,10 +108,8 @@ hr { & td img { @include util.default-border-radius-image; - // Color background-color: var(--card); - // Design border: 2px solid var(--shadow-lighter); box-shadow: 0 -6px 15px -7px var(--shadow); } diff --git a/src/styles/styles.scss b/src/styles/styles.scss index 537ad4b1..af6fc54b 100644 --- a/src/styles/styles.scss +++ b/src/styles/styles.scss @@ -1,5 +1,7 @@ @use 'styles.common'; +@use 'node_modules/@fortawesome/fontawesome-free/css/all'; + @use 'information/information'; @use 'animation/animation'; @use 'logo/logo'; @@ -11,6 +13,6 @@ @use 'ribbon/ribbon'; @use 'social/social'; @use 'toastr/toastr'; -@use '../../node_modules/@fortawesome/fontawesome-free/css/all.css'; +@use 'bottom-nav/bottom-nav'; @use 'theme/theme'; diff --git a/src/styles/theme/color/color.theme.scss b/src/styles/theme/color/color.theme.scss index d7c25f62..c1021508 100644 --- a/src/styles/theme/color/color.theme.scss +++ b/src/styles/theme/color/color.theme.scss @@ -8,18 +8,18 @@ @use 'gray.color.theme'; :root { - // [LIGHT MODE DEFINITIONS BEGIN] - // color scale + /* [LIGHT MODE DEFINITIONS BEGIN] */ + /* color scale */ --lighter-light-mode: #757575; --color-light-mode: #545454; --darker-light-mode: #2b2b2b; - // contra color scale + /* contra color scale */ --darker-contrast-light-mode: #efefef; --contrast-light-mode: #e0e0e0; --lighter-contrast-light-mode: #b4b4b4; - // background + /* background */ --background-color-light-mode: #fefefe; --background-color-alpha-light-mode: rgba(255, 255, 255, 0.93); --card-light-mode: #ffffff; @@ -31,20 +31,20 @@ --cropper-overlay-color-light-mode: var(--card-light-mode); --cropper-outline-color-light-mode: rgba(254, 255, 254, 0.7); - // [LIGHT MODE END] + /* [LIGHT MODE END] */ - // [DARK MODE DEFINITIONS BEGIN] - // color scale + /* [DARK MODE DEFINITIONS BEGIN] */ + /* color scale */ --lighter-dark-mode: #cfcfcf; --color-dark-mode: #e0e0e0; --darker-dark-mode: #f0f0f0; - // contra color scale + /* contra color scale */ --darker-contrast-dark-mode: #2b2b2b; --contrast-dark-mode: #424242; --lighter-contrast-dark-mode: #797979; - // background + /* background */ --background-color-dark-mode: #353535; --background-color-alpha-dark-mode: rgba(53, 53, 53, 0.93); --card-dark-mode: #343434; @@ -55,21 +55,21 @@ --cropper-overlay-color-dark-mode: var(--card-dark-mode); --cropper-outline-color-dark-mode: rgba(53, 55, 53, 0.5); - // [DARK MODE END] + /* [DARK MODE END] */ } :root, :root .light-theme { - // color scale + /* color scale */ --lighter: var(--lighter-light-mode); --color: var(--color-light-mode); --darker: var(--darker-light-mode); - // contra color scale + /* contra color scale */ --darker-contrast: var(--darker-contrast-light-mode); --contrast: var(--contrast-light-mode); --lighter-contrast: var(--lighter-contrast-light-mode); - // background + /* background */ --background-color: var(--background-color-light-mode); --background-color-alpha: var(--background-color-alpha-light-mode); --card: var(--card-light-mode); @@ -86,17 +86,17 @@ } @mixin theme-general-dark-mode { - // color scale + /* color scale */ --lighter: var(--lighter-dark-mode); --color: var(--color-dark-mode); --darker: var(--darker-dark-mode); - // contra color scale + /* contra color scale */ --darker-contrast: var(--darker-contrast-dark-mode); --contrast: var(--contrast-dark-mode); --lighter-contrast: var(--lighter-contrast-dark-mode); - // background + /* background */ --background-color: var(--background-color-dark-mode); --background-color-alpha: var(--background-color-alpha-dark-mode); --card: var(--card-dark-mode); diff --git a/src/styles/theme/design/design.theme.scss b/src/styles/theme/design/design.theme.scss index 71b327dc..578ec021 100644 --- a/src/styles/theme/design/design.theme.scss +++ b/src/styles/theme/design/design.theme.scss @@ -4,5 +4,5 @@ @use 'leaf.design.theme'; :root { - // Intentionally blank + /* Intentionally blank */ } diff --git a/src/styles/theme/design/leaf.design.theme.scss b/src/styles/theme/design/leaf.design.theme.scss index 62e75937..66084cbe 100644 --- a/src/styles/theme/design/leaf.design.theme.scss +++ b/src/styles/theme/design/leaf.design.theme.scss @@ -2,7 +2,7 @@ :root { --border-radius-leaf: 0 3em 0 3em; - --border-radius-image-leaf: 0 3em 0 3em; + --border-radius-image-leaf: 0 50% 0 50%; --border-radius-product-line-leaf: 3em 0em 0em 3em; --height-bottom-line-leaf: 0; --padding-line-leaf: 1.2em 1.2em 2em 1.2em; diff --git a/src/styles/theme/theme.scss b/src/styles/theme/theme.scss index 272428a1..32b44883 100644 --- a/src/styles/theme/theme.scss +++ b/src/styles/theme/theme.scss @@ -1,11 +1,8 @@ @use 'color/color.theme'; @use 'design/design.theme'; -// This is the class to change default theme +/* This is the class to change default theme */ .default-theme { - // color @extend .green-theme; - - // design - @extend .round-theme; + @extend .counter-borders-theme; } diff --git a/src/styles/toastr/toastr.scss b/src/styles/toastr/toastr.scss index 3cf0dc08..143f9e37 100644 --- a/src/styles/toastr/toastr.scss +++ b/src/styles/toastr/toastr.scss @@ -16,9 +16,9 @@ } } -@include define-toast(success, "\f071", "10px"); -@include define-toast(info, "\f00c", "10px"); -@include define-toast(warning, "\f05a", "8px"); +@include define-toast(success, "\f00c", "10px"); +@include define-toast(info, "\f05a", "10px"); +@include define-toast(warning, "\f071", "8px"); @include define-toast(error, "\f057", "15px"); .toast-container { diff --git a/src/styles/util/util.scss b/src/styles/util/util.scss index 394ab172..e89618ac 100644 --- a/src/styles/util/util.scss +++ b/src/styles/util/util.scss @@ -99,6 +99,17 @@ flex-direction: column; } +@mixin flex-layout-column-reverse { + display: flex; + flex-direction: column-reverse; +} + +@mixin flex-layout-row-wrap { + display: flex; + flex-direction: row; + flex-wrap: wrap; +} + @mixin card-width-sm { max-width: 94vw; min-width: 94vw; @@ -139,3 +150,7 @@ .flex-layout-column { @include flex-layout-column; } + +.flex-layout-row-wrap { + @include flex-layout-row-wrap; +} diff --git a/src/version.ts b/src/version.ts new file mode 100644 index 00000000..3a83d504 --- /dev/null +++ b/src/version.ts @@ -0,0 +1 @@ +export const version = '5.0.1'; diff --git a/tslint.json b/tslint.json index a6777539..fcc04f65 100644 --- a/tslint.json +++ b/tslint.json @@ -27,12 +27,6 @@ ], "interface-name": false, "max-classes-per-file": false, -/* - "max-line-length": [ - true, - 140 - ], -*/ "member-access": false, "member-ordering": [ true,