diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml new file mode 100644 index 000000000..89aa71c75 --- /dev/null +++ b/.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 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 402eeb701..d2390c8b5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -9,7 +9,7 @@ on: - 'v*' env: - DOCKER_REPO_NAME: kaw393939/mywebclass + DOCKER_REPO_NAME: sp49/mywebclass jobs: build: diff --git a/docker-compose.yml b/docker-compose.yml index 80050ddea..2bc85b6b8 100644 --- a/docker-compose.yml +++ b/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 diff --git a/package-lock.json b/package-lock.json index ff94ff7f0..937205d84 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@popperjs/core": "^2.11.6" }, "devDependencies": { - "@playwright/test": "^1.31.1", + "@playwright/test": "^1.32.1", "autoprefixer": "^10.4.13", "babel-loader": "^9.1.2", "bootstrap": "^5.2.3", @@ -693,13 +693,13 @@ } }, "node_modules/@playwright/test": { - "version": "1.31.1", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.31.1.tgz", - "integrity": "sha512-IsytVZ+0QLDh1Hj83XatGp/GsI1CDJWbyDaBGbainsh0p2zC7F4toUocqowmjS6sQff2NGT3D9WbDj/3K2CJiA==", + "version": "1.32.1", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.32.1.tgz", + "integrity": "sha512-FTwjCuhlm1qHUGf4hWjfr64UMJD/z0hXYbk+O387Ioe6WdyZQ+0TBDAc6P+pHjx2xCv1VYNgrKbYrNixFWy4Dg==", "dev": true, "dependencies": { "@types/node": "*", - "playwright-core": "1.31.1" + "playwright-core": "1.32.1" }, "bin": { "playwright": "cli.js" @@ -10477,9 +10477,9 @@ } }, "node_modules/playwright-core": { - "version": "1.31.1", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.31.1.tgz", - "integrity": "sha512-JTyX4kV3/LXsvpHkLzL2I36aCdml4zeE35x+G5aPc4bkLsiRiQshU5lWeVpHFAuC8xAcbI6FDcw/8z3q2xtJSQ==", + "version": "1.32.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.32.1.tgz", + "integrity": "sha512-KZYUQC10mXD2Am1rGlidaalNGYk3LU1vZqqNk0gT4XPty1jOqgup8KDP8l2CUlqoNKhXM5IfGjWgW37xvGllBA==", "dev": true, "bin": { "playwright": "cli.js" diff --git a/package.json b/package.json index 9a0bbb78d..8da60e7c8 100644 --- a/package.json +++ b/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", diff --git a/productivity_log.md b/productivity_log.md new file mode 100644 index 000000000..1aee2adaf --- /dev/null +++ b/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 | diff --git a/src/assets/images/NJIT_logo.png b/src/assets/images/NJIT_logo.png new file mode 100644 index 000000000..73909f8df Binary files /dev/null and b/src/assets/images/NJIT_logo.png differ diff --git a/src/content.html b/src/content.html index 3aa92ef13..608f61098 100644 --- a/src/content.html +++ b/src/content.html @@ -2,6 +2,15 @@ + + + MyWebClass.org | Privacy Policy @@ -330,4 +339,4 @@

Subscribe to our newsletter

- \ No newline at end of file + diff --git a/src/index.html b/src/index.html index ad76fc58c..01a733f64 100644 --- a/src/index.html +++ b/src/index.html @@ -2,6 +2,15 @@ + + + MyWebClass.org @@ -11,7 +20,7 @@ - + @@ -23,7 +32,13 @@ +
+ + Logo of NJIT College +

Originated from NJIT - IS 218

+
Contributors: Sarang Patel, Eric Huang, Kapila Mane
+
-
-
-
-

Revolutionize your teaching

-

Empower your students with cutting-edge software engineering skills. Join - MyWebClass and discover advanced technologies that will transform your teaching and their - learning journey.

-
- -
-
-
- a teacher with students -
-
-
+
+
+

Welcome to Our Website!!

+ +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!
- \ No newline at end of file + diff --git a/src/story.html b/src/story.html index 6d093a4ad..284f5cb0f 100644 --- a/src/story.html +++ b/src/story.html @@ -2,6 +2,15 @@ + + + MyWebClass.org | Our Story @@ -76,37 +85,40 @@

Our Story

Mission

-

Our mission is to create a community of people committed to helping students of all ages - and backgrounds succeed in the modern software industry by providing educational - opportunities and a practical, hands-on learning experience.

+

"Our mission is to establish a group of individuals dedicated to assisting students from diverse backgrounds + and age groups in achieving success in the contemporary software industry through the provision of practical, + experiential learning opportunities."

Values

-

Each of these values supports our mission by creating a welcoming and supportive - environment for students and teachers to learn and grow. Our focus on people ensures - that everyone feels included and valued, and our commitment to learning provides - educational opportunities that help students and teachers succeed in the modern software - industry. Our emphasis on efficiency and dependability allows us to provide a practical, - reliable platform that makes the most of everyone's time.

+

These values create a thriving community that nurtures the growth and development of every individual, + be it a student or teacher. We are driven by a passion for people, which enables us to foster a welcoming + and supportive environment where everyone is celebrated and encouraged to reach their full potential. + By providing dynamic educational opportunities, we equip our members with the knowledge and skills to + thrive in the rapidly-changing software industry. Our unwavering emphasis on efficiency and dependability + further ensures that we deliver a practical and reliable platform that maximizes everyone's time, ultimately + empowering them to achieve their dreams and aspirations.

Origin

Mywebclass.org was founded in 2023 by Keith Williams, a University Lecturer at New Jersey @@ -171,4 +183,4 @@

Subscribe to our newsletter

- \ No newline at end of file +