From f1a727c4191bf6f686f52a7ccc1623ca3c7337a7 Mon Sep 17 00:00:00 2001 From: AswaniBolisetti Date: Sun, 27 Oct 2024 08:52:27 +0530 Subject: [PATCH 1/3] fixed all issues --- app.js | 12 +-- views/partials/footer.ejs | 2 +- views/privacy-policy.ejs | 174 +++++++++++++++++++--------------- views/terms-page.ejs | 120 ++++++++++++++++++++++++ views/terms.ejs | 190 -------------------------------------- 5 files changed, 226 insertions(+), 272 deletions(-) create mode 100644 views/terms-page.ejs delete mode 100644 views/terms.ejs diff --git a/app.js b/app.js index 0c80193..11ec9f8 100644 --- a/app.js +++ b/app.js @@ -352,12 +352,6 @@ app.get('/contributors', (req, res) => { res.render('contributors', { activeLink: 'contributors' }); }); -// Terms route -app.get('/terms', (req, res) => { - res.render('terms', { - activeLink: 'terms', // You can customize this based on your layout - }); -}); app.get('/faq', (req, res) => { res.render('faq', { @@ -365,6 +359,12 @@ app.get('/faq', (req, res) => { }); }); +app.get('/terms-page', (req, res) => { + res.render('terms-page', { + activeLink: 'terms-page', // You can customize this based on your layout + }); +}); + app.get('/privacy-policy', (req, res) => { res.render('privacy-policy', { activeLink: 'privacy-policy', // You can customize this based on your layout diff --git a/views/partials/footer.ejs b/views/partials/footer.ejs index 2cd0df5..44aa45e 100644 --- a/views/partials/footer.ejs +++ b/views/partials/footer.ejs @@ -18,7 +18,7 @@
  • About Us
  • Our Team
  • Privacy Policy
    • -
  • Terms of Service
    • +
  • Terms of Service
  • Our Contributors
    • diff --git a/views/privacy-policy.ejs b/views/privacy-policy.ejs index 23b05c2..6621c60 100644 --- a/views/privacy-policy.ejs +++ b/views/privacy-policy.ejs @@ -1,81 +1,100 @@ - + - - - - Privacy Policy - - + <%- include('partials/head') %> + + + + + -
    +
    + <%- include('partials/navbar') %> + +

    Privacy Policy

    Welcome to Scruter's Privacy Policy. This policy outlines how we handle your personal data and protect your privacy when you use our website and services.

    @@ -124,8 +143,13 @@
  • Address:
    • - Back to Home +
    - + + + <%- include('partials/footer') %> + <%- include('partials/bottom_nav') %> + + \ No newline at end of file diff --git a/views/terms-page.ejs b/views/terms-page.ejs new file mode 100644 index 0000000..524cc0a --- /dev/null +++ b/views/terms-page.ejs @@ -0,0 +1,120 @@ + + + + <%- include('partials/head') %> + + + + + + + +
    + <%- include('partials/navbar') %> + +
    + +
    +

    Terms and Conditions

    +

    Please read these terms and conditions carefully before using our service. These terms outline your rights and responsibilities when using our platform.

    + +

    1. Acceptance of Terms

    +

    By accessing or using the service, you agree to be bound by these terms. This acceptance applies to all visitors, users, and others who access or use the service. If you are using the service on behalf of a company or organization, you represent that you have the authority to bind that entity to these terms, in which case the terms "you" and "your" will refer to that entity.

    + +

    2. Modifications to Terms

    +

    We reserve the right to modify these terms at any time. Changes will be effective immediately upon posting the revised terms on our website. Your continued use of the service after any such changes constitutes your acceptance of the new terms. It is your responsibility to review these terms periodically for any updates.

    + +

    3. User Responsibilities

    +

    You agree to use the service in compliance with all applicable laws and regulations. You are responsible for your conduct and any content you provide while using the service. You must not use the service for any illegal or unauthorized purpose, and you agree to comply with all applicable local, state, national, and international laws.

    + +

    4. Limitation of Liability

    +

    Our liability is limited to the maximum extent permitted by law. In no event shall we be liable for any indirect, incidental, special, consequential, or punitive damages, including but not limited to loss of profits, data, use, goodwill, or other intangible losses, arising out of or related to your access to or use of (or inability to access or use) the service.

    + +

    5. Privacy Policy

    +

    We are committed to protecting your privacy. Our privacy policy explains how we collect, use, and disclose your information. By using our service, you consent to the collection and use of information in accordance with our privacy policy. We encourage you to review the privacy policy to understand our practices regarding your personal data.

    + +

    6. Payment Terms

    +

    All payments must be made in full prior to service delivery. Payment methods accepted include credit cards and PayPal. You agree to provide accurate and complete payment information and to promptly update any information to keep your account current.

    + +

    7. Cancellation Policy

    +

    Users may cancel their subscription at any time. Refunds will be processed according to our refund policy, which outlines the conditions under which refunds will be issued. To cancel your subscription, please follow the cancellation instructions provided in your account settings.

    + +

    8. Contact Us

    +

    If you have any questions about these terms, please contact us. Our customer support team is available to assist you.

    +
    +
    + + <%- include('partials/footer') %> + <%- include('partials/bottom_nav') %> + + \ No newline at end of file diff --git a/views/terms.ejs b/views/terms.ejs deleted file mode 100644 index 92822b4..0000000 --- a/views/terms.ejs +++ /dev/null @@ -1,190 +0,0 @@ - - - - - - - <%= title %> - - - - - -
    -

    <%= heading %>

    -

    <%= intro %>

    - -
    -

    Acceptance of Terms

    -

    <%= termsContent %>

    -
    - -
    -

    Changes to the Terms

    -

    <%= changesContent %>

    -
    - -
    -

    Use of Website

    -

    <%= useOfWebsite %>

    -
    - -
    -

    Prohibited Use

    -

    You are prohibited from using the site or its content:

    -
      - <% prohibitedUses.forEach(function(use) { %> -
    • <%= use %>
      • - <% }) %> -
    -
    - -
    -

    Limitation of Liability

    -

    <%= liabilityContent %>

    -
    - -
    -

    Governing Law

    -

    <%= governingLaw %>

    -
    - -
    -

    Contact Us

    -

    If you have any questions about these terms and conditions, you can contact us at:

    -
      -
    • Email: <%= email %>
      • -
    • Phone: <%= phone %>
      • -
    • Address: <%= address %>
      • -
    -
    - - Back to Home -
    - - - From 50bd8bb393c892d447c40a2a9fc592278a06d994 Mon Sep 17 00:00:00 2001 From: AswaniBolisetti Date: Mon, 28 Oct 2024 14:16:06 +0530 Subject: [PATCH 2/3] fixed all issues --- views/privacy-policy.ejs | 176 +++++++++++++++++++-------------------- views/terms-page.ejs | 80 ++++++------------ 2 files changed, 113 insertions(+), 143 deletions(-) diff --git a/views/privacy-policy.ejs b/views/privacy-policy.ejs index 6621c60..f596d50 100644 --- a/views/privacy-policy.ejs +++ b/views/privacy-policy.ejs @@ -5,96 +5,97 @@ - - +
    <%- include('partials/navbar') %> -
    +

    Privacy Policy

    Welcome to Scruter's Privacy Policy. This policy outlines how we handle your personal data and protect your privacy when you use our website and services.

    @@ -138,18 +139,13 @@ a.button:hover {

    Contact Us

    If you have any questions or concerns about this Privacy Policy, please contact us at:

    - -
    - - <%- include('partials/footer') %> <%- include('partials/bottom_nav') %> - \ No newline at end of file diff --git a/views/terms-page.ejs b/views/terms-page.ejs index 1a79532..540ce61 100644 --- a/views/terms-page.ejs +++ b/views/terms-page.ejs @@ -6,15 +6,12 @@