Added content to page

.github/workflows/jekyll-gh-pages.yml

@@ -0,0 +1,51 @@
+# Sample workflow for building and deploying a Jekyll site to GitHub Pages
+name: Deploy Jekyll with GitHub Pages dependencies preinstalled
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["master"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  # Build job
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Pages
+        uses: actions/configure-pages@v3
+      - name: Build with Jekyll
+        uses: actions/jekyll-build-pages@v1
+        with:
+          source: ./
+          destination: ./_site
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v1
+
+  # Deployment job
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v1

.github/workflows/publish.yml

@@ -9,7 +9,7 @@ on:
       - 'v*'
 
 env:
-  DOCKER_REPO_NAME: kaw393939/mywebclass
+  DOCKER_REPO_NAME: sp49/mywebclass
 
 jobs:
   build:

docker-compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 services:
     master_branch:
     development_branch:
-      image: kaw393939/mywebclass:development
+      image: sp49/mywebclass:development
       container_name: development_branch
       pull_policy: always
       restart: always

package.json

@@ -34,7 +34,7 @@
   },
   "homepage": "https://github.com/NJIT-WIS/mywebclass#readme",
   "devDependencies": {
-    "@playwright/test": "^1.31.1",
+    "@playwright/test": "^1.32.1",
     "autoprefixer": "^10.4.13",
     "babel-loader": "^9.1.2",
     "bootstrap": "^5.2.3",

productivity_log.md

@@ -0,0 +1,11 @@
+| Issue title | Story points | Issue link | Status | Assigned to | Assigned on | Completed on | Category | Status notes |
+| --- | --- | --- | --- | --- | --- | --- | --- | --- | 
+| Adding Docker information | TBD | [4](https://github.com/SarangAP/mywebclass-simulation/issues/4) | Completed | SarangAP | 3/27/2023 | 3/27/2023 | Documentation | Docker integration successful |
+| Home hyperlink not working | TBD | [9](https://github.com/SarangAP/mywebclass-simulation/issues/9) | In progress | SarangAP | 3/27/2023 | TBD | Bug | Worked locally but not via GitHub pages|
+| Accessibility | TBD | [19](https://github.com/SarangAP/mywebclass-simulation/issues/19) | In progress | SarangAP | 3/27/2023 | TBD | Feature | Added alt text to image so far, awaiting further progress before additional modifications|
+| GDPR + Google | TBD | [30](https://github.com/SarangAP/mywebclass-simulation/pull/30) | Completed | SarangAP | 3/27/2023 | 3/27/2023 | Feature | Added Google Analytics code|
+| Added content to HTML | TBD | [28](https://github.com/SarangAP/mywebclass-simulation/issues/28) | Completed | eyh3 | 3/27/2023 | 3/27/2023 | Feature | Added original content to the main page|
+| Github Pages | TBD | [3](https://github.com/SarangAP/mywebclass-simulation/pull/3) | Completed | eyh3 | 3/27/2023 | 3/27/2023 | Feature | Set up GitHub Pages|
+| Bootstrap fix | TBD | [27](https://github.com/SarangAP/mywebclass-simulation/pull/27) | In Progress | eyh3 | 3/27/2023 | TBD | Feature | Fix bootstrap code|
+| Privacy policy edits | TBD | [15](https://github.com/SarangAP/mywebclass-simulation/issues/15) | Completed | km776 | 3/27/2023 | 3/27/2023 | Documentation | Added a notice about Google Analytics cookie usage |
+| Story, mission, and value edits | TBD | [31](https://github.com/SarangAP/mywebclass-simulation/pull/31) | Completed | km776 | 3/27/2023 | 3/27/2023 | Documentation | Added depth to mission + core values |

src/content.html

@@ -2,6 +2,15 @@
 <html lang="EN">
 
 <head>
+<!-- Google tag (gtag.js) -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=G-0FZME7JR97"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'G-0FZME7JR97');
+</script>
     <!--characterset UTF-8 Watch this: https://youtu.be/MijmeoH9LT4 -->
 
     <title>MyWebClass.org | Privacy Policy</title>
@@ -330,4 +339,4 @@ <h1>Subscribe to our newsletter</h1>
         </div>
 </body>
 
-</html>
+</html>

src/index.html

@@ -2,6 +2,15 @@
 <html lang="EN">
 
 <head>
+<!-- Google tag (gtag.js) -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=G-0FZME7JR97"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'G-0FZME7JR97');
+</script>
     <!--characterset UTF-8 Watch this: https://youtu.be/MijmeoH9LT4 -->
 
     <title>MyWebClass.org</title>
@@ -11,7 +20,7 @@
 
     <!--Basic meta info -->
     <meta name="keywords" content="My Webclass Homepage">
-    <meta name="author" content="Keith Williams"/>
+    <meta name="author" content="Eric Huang, Kapila Mane, Sarang Patel"/>
     <meta name="description" content="A project to help educators integrate new technoliges into their teaching">
 
     <!--OpenGraph meta -->
@@ -23,7 +32,13 @@
 </head>
 
 <body class="pt-5">
+<body style="background-color: lightblue;">
 <div class="container-fluid">
+
+    <img src="assets/images/NJIT_logo.png" alt = "Logo of NJIT College" width = "150" height = "100">
+    <h4>Originated from NJIT - IS 218</h4>
+    <h6>Contributors: Sarang Patel, Eric Huang, Kapila Mane</h6>
+
     <header role="banner" class="fixed-top">
         <nav role="navigation" aria-label="Main navigation" class="navbar navbar-expand-lg navbar-dark bg-dark">
             <div class="container">
@@ -45,25 +60,17 @@
         </nav>
     </header>
     <main>
-        <div class="container my-5">
-            <div class="row p-4 pb-0 pe-lg-0 pt-lg-0 align-items-center rounded-3 border shadow-lg ">
-                <div class="col-lg-7 p-3 p-lg-3 pt-lg-1">
-                    <h1 class="display-6 fw-bold lh-1">Revolutionize your teaching</h1>
-                    <p class="lead">Empower your students with cutting-edge software engineering skills. Join
-                        MyWebClass and discover advanced technologies that will transform your teaching and their
-                        learning journey.</p>
-                    <div class="d-grid gap-2 d-md-flex justify-content-md-start mb-4 mb-lg-3">
-                        <button type="button" class="btn btn-success btn-lg px-4 me-md-2 fw-bold">Start
-                            Here
-                        </button>
-                    </div>
-                </div>
-                <div class="col-lg-4 offset-lg-1 p-0 overflow-hidden shadow-lg">
-                    <img class="rounded-lg-3 img-fluid" src="assets/images/teacher.gif"
-                         alt="a teacher with students" width="720">
-                </div>
-            </div>
-        </div>
+        <br>
+        <br>
+        <h1><center>Welcome to Our Website!!</center></h1>
+
+Welcome to our website dedicated to teaching people new things! We believe that learning is a lifelong pursuit, and we're here to help you expand your knowledge and skills in a variety of areas. Whether you're looking to improve your career prospects, enhance your personal development, or simply satisfy your curiosity, our site offers a wealth of information and resources to help you achieve your goals.
+
+Our team of experienced educators and subject matter experts have carefully curated a range of courses, tutorials, and articles covering a diverse range of topics. From business and finance to health and wellness, technology to the arts, our content is designed to be accessible, engaging, and informative for learners of all levels.
+
+Whether you're a complete beginner or an experienced practitioner, our content is tailored to meet your needs. We offer a variety of learning formats, including text-based articles, video tutorials, and interactive quizzes and exercises, so you can choose the approach that works best for you.
+
+So why wait? Start exploring our site today and discover all the exciting new things you can learn!
     </main>
     <footer class="py-5 container">
         <div class="row">
@@ -112,4 +119,4 @@ <h5>Subscribe to our newsletter</h5>
 </div>
 </body>
 
-</html>
+</html>

src/js/main.js

@@ -73,7 +73,7 @@ function initializePrivacyModal () {
 
 function loadGoogleAnalytics () {
   // Replace "GA_MEASUREMENT_ID" with your Google Analytics Measurement ID
-  const gaMeasurementId = 'J2FCEQRZJ1'
+  const gaMeasurementId = 'G-0FZME7JR97'
 
   // Load the Google Analytics tracking code
   const script = document.createElement('script')

src/privacy.html

@@ -2,6 +2,15 @@
 <html lang="EN">
 
 <head>
+<!-- Google tag (gtag.js) -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=G-0FZME7JR97"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'G-0FZME7JR97');
+</script>
     <!--characterset UTF-8 Watch this: https://youtu.be/MijmeoH9LT4 -->
 
     <title>MyWebClass.org | Our Story</title>
@@ -11,7 +20,7 @@
 
     <!--Basic meta info -->
     <meta content="My Webclass Homepage | Our Story" name="keywords">
-    <meta content="Keith Williams" name="author"/>
+    <meta content="Sarang Patel" name="author"/>
     <meta content="The story and mission of MyWebClass.org" name="description">
 
     <!--OpenGraph meta -->
@@ -80,43 +89,17 @@ <h1>Privacy Policy</h1>
                     <p>We at mywebclass.org are committed to protecting your privacy. This Privacy Policy explains what
                         information we collect from you when you visit our website, how we use it, and how we protect
                         it. By using our website, you agree to the terms of this Privacy Policy.</p>
-                    <h2>Information we collect</h2>
-                    <p>We may collect the following information from you when you visit our website:</p>
-                    <ul>
-                        <li>Personal information such as your name and email address, if you choose to provide it to
-                            us.
-                        </li>
-                        <li>Information about your use of the website, such as pages visited, time spent on the site,
-                            and links clicked.
-                        </li>
-                        <li>Information about your device, such as your IP address, browser type, and operating
-                            system.
-                        </li>
-                    </ul>
-                    <h2>How we use your information</h2>
-                    <p>We use the information we collect from you for the following purposes:</p>
-                    <ul>
-                        <li>To improve our website and the user experience.</li>
-                        <li>To analyze user behavior and measure the effectiveness of our content and marketing
-                            efforts.
-                        </li>
-                        <li>To communicate with you about our products and services, if you have provided us with your
-                            contact information.
-                        </li>
-                        <li>To comply with legal obligations.</li>
-                    </ul>
+
+                    <h2>Information we collect and how we use it</h2>
+                    <p>We collect personal information like your name, email, and phone number, should you provide it to us,
+                        to advertise our products or services, respond to your inquiries, and keep you informed about updates or promotions. </p>
+
                     <h2>Google Analytics</h2>
-                    <p>We use Google Analytics to collect information about your use of our website. Google Analytics
-                        collects information such as how often users visit the site, what pages they visit when they do
-                        so, and what other sites they used prior to coming to our website. We use the information we get
-                        from Google Analytics to improve our website and the user experience. Google Analytics collects
-                        only the IP address assigned to you on the date you visit our website, rather than your name or
-                        other identifying information. We do not combine the information collected through the use of
-                        Google Analytics with personally identifiable information. Google Analytics plants a permanent
-                        cookie on your web browser to identify you as a unique user the next time you visit our website.
-                        This cookie cannot be used by anyone other than Google. Google’s ability to use and share
-                        information collected by Google Analytics about your visits to our website is restricted by the
-                        Google Analytics Terms of Use and the Google Privacy Policy.</p>
+                    <p>Our website uses Google Analytics, a web analytics service provided by Google, Inc. (“Google”). Google Analytics uses cookies to help us analyze how users interact with our website. 
+                        The information generated by the cookie about your use of the website (including your IP address) will be transmitted to and stored by Google on servers in the United States. 
+                        Google will use this information for the purpose of evaluating your use of the website, compiling reports on website activity for website operators and providing other services relating to website activity and internet usage.
+                        Google may also transfer this information to third parties where required to do so by law, or where such third parties process the information on Google’s behalf. 
+                        By using this website, you consent to the processing of data about you by Google in the manner and for the purposes set out above.</p>
                     <h2>Data retention and security</h2>
                     <p>We retain the information we collect for as long as necessary to fulfill the purposes for which
                         it was collected, unless a longer retention period is required by law. We take reasonable
@@ -127,6 +110,10 @@ <h2>Data retention and security</h2>
                         it was collected, unless a longer retention period is required by law. We take reasonable
                         measures to protect the information we collect from loss, theft, misuse, and unauthorized
                         access, disclosure, alteration, and destruction.</p>
+                    <h2>Cookies</h2>
+                    <p>Moreover, Google Analytics may also use cookies to track your website activity. These cookies are 
+                        used to provide us with information about how visitors interact with our website. You
+                        can opt-out of Google Analytics by using the Google Analytics Opt-Out Browser Add-On.</p>
                     <h2>Your rights</h2>
                     <p>You have the right to access, correct, and delete your personal information. You also have the
                         right to object to the processing of your personal information and to withdraw your consent to
@@ -137,7 +124,7 @@ <h2>Changes to this Privacy Policy</h2>
                         the new Privacy Policy on this page. We recommend that you review this Privacy Policy
                         periodically for any changes.</p>
                     <h2>Contact us</h2>
-                    <p>If you have any questions about this Privacy Policy, please contact us at [contact email
+                    <p>If you have any questions about this Privacy Policy or our practices, please contact us at [contact email
                         address].</p>
 
                 </section>
@@ -191,4 +178,4 @@ <h1>Subscribe to our newsletter</h1>
     </div>
 </body>
 
-</html>
+</html>