Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
5af3974
ADDED: docker repo
Sumanmhalsank02 Mar 25, 2023
1b105fb
Create nextjs.yml
Sumanmhalsank02 Mar 25, 2023
d784612
Create jekyll-docker.yml
Sumanmhalsank02 Mar 25, 2023
b6de845
ADDED: Url to package.json
Sumanmhalsank02 Mar 25, 2023
7282b86
UPDATED: index.html
Sumanmhalsank02 Mar 26, 2023
ed28a74
UPDATED: index.html
Sumanmhalsank02 Mar 26, 2023
1c411ba
UPDATED: index.html
Sumanmhalsank02 Mar 26, 2023
131e12c
Merge pull request #6 from Sumanmhalsank02/development closes #1
Sumanmhalsank02 Mar 26, 2023
90b96a7
UPDATED: index.html
Sumanmhalsank02 Mar 26, 2023
b59c2d3
Merge remote-tracking branch 'origin/master'
Sumanmhalsank02 Mar 26, 2023
9bacdaa
UPDATED: index.html
Sumanmhalsank02 Mar 26, 2023
def1ec7
ADDED: repo to docker compose file
Sumanmhalsank02 Mar 26, 2023
cef6031
UPDATED: docker repo name
Sumanmhalsank02 Mar 26, 2023
999010f
Update docker-compose.yml
Sumanmhalsank02 Mar 26, 2023
d04f484
ADDED: repo to docker compose file
Sumanmhalsank02 Mar 26, 2023
5719f5d
ADDED: repo to docker compose file
Sumanmhalsank02 Mar 26, 2023
8d2c430
CHANGED: The image source
Sumanmhalsank02 Mar 26, 2023
73fc5cb
npm audit fix: added override to package.json
Sumanmhalsank02 Mar 26, 2023
708dfd4
npm audit fix: added override to package.json
Sumanmhalsank02 Mar 26, 2023
b47af99
ADDED: Internationalization to the website
Sumanmhalsank02 Mar 26, 2023
3ba7d7c
ADDED: Internationalization to the website
Sumanmhalsank02 Mar 26, 2023
a8bf757
Merge pull request #8 from Sumanmhalsank02/4-internationalization clo…
Sumanmhalsank02 Mar 26, 2023
97c6d57
FIX: npm audit fix 2
Sumanmhalsank02 Mar 26, 2023
4dd5e0e
Merge remote-tracking branch 'origin/master'
Sumanmhalsank02 Mar 26, 2023
b32e6d5
UPDATED: Homepage contents
Sumanmhalsank02 Mar 26, 2023
77ac5f9
UPDATED: homepage content
Sumanmhalsank02 Mar 26, 2023
fd8df59
UPDATED: homepage content
Sumanmhalsank02 Mar 26, 2023
f50bd7b
UPDATED: homepage content
Sumanmhalsank02 Mar 26, 2023
7e85298
ADDED: Google Analytics to the webpage
Sumanmhalsank02 Mar 27, 2023
ed32739
FIXED : BUG
Sumanmhalsank02 Mar 27, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .github/workflows/jekyll-docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Jekyll site CI

on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Build the site in the jekyll/builder container
run: |
docker run \
-v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site \
jekyll/builder:latest /bin/bash -c "chmod -R 777 /srv/jekyll && jekyll build --future"
95 changes: 95 additions & 0 deletions .github/workflows/nextjs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
# Sample workflow for building and deploying a Next.js site to GitHub Pages
#
# To get started with Next.js see: https://nextjs.org/docs/getting-started
#
name: Deploy Next.js site to Pages

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: Detect package manager
id: detect-package-manager
run: |
if [ -f "${{ github.workspace }}/yarn.lock" ]; then
echo "manager=yarn" >> $GITHUB_OUTPUT
echo "command=install" >> $GITHUB_OUTPUT
echo "runner=yarn" >> $GITHUB_OUTPUT
exit 0
elif [ -f "${{ github.workspace }}/package.json" ]; then
echo "manager=npm" >> $GITHUB_OUTPUT
echo "command=ci" >> $GITHUB_OUTPUT
echo "runner=npx --no-install" >> $GITHUB_OUTPUT
exit 0
else
echo "Unable to determine packager manager"
exit 1
fi
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: "16"
cache: ${{ steps.detect-package-manager.outputs.manager }}
- name: Setup Pages
uses: actions/configure-pages@v3
with:
# Automatically inject basePath in your Next.js configuration file and disable
# server side image optimization (https://nextjs.org/docs/api-reference/next/image#unoptimized).
#
# You may remove this line if you want to manage the configuration yourself.
static_site_generator: next
- name: Restore cache
uses: actions/cache@v3
with:
path: |
.next/cache
# Generate a new cache whenever packages or source files change.
key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
# If source files changed but packages didn't, rebuild from a prior cache.
restore-keys: |
${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}-
- name: Install dependencies
run: ${{ steps.detect-package-manager.outputs.manager }} ${{ steps.detect-package-manager.outputs.command }}
- name: Build with Next.js
run: ${{ steps.detect-package-manager.outputs.runner }} next build
- name: Static HTML export with Next.js
run: ${{ steps.detect-package-manager.outputs.runner }} next export
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
with:
path: ./out

# 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
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- 'v*'

env:
DOCKER_REPO_NAME: kaw393939/mywebclass
DOCKER_REPO_NAME: sumansmhalsank11/mywebclass_simulation

jobs:
build:
Expand Down
44 changes: 27 additions & 17 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,32 @@
version: "3.8"

services:
master_branch:
development_branch:
image: kaw393939/mywebclass:development
container_name: development_branch
pull_policy: always
restart: always
ports:
- "8000:80"
labels:
- 'com.centurylinklabs.watchtower.enable=true'
watchtower:
image: containrrr/watchtower
container_name: watchtower
restart: always
command: '--interval 30 --label-enable --cleanup'
volumes:
master_branch:
image: sumansmhalsank11/mywebclass_simulation:master
container_name: master_branch
pull_policy: always
restart: always
ports:
- "8001:80"
labels:
- 'com.centurylinklabs.watchtower.enable=true'

development_branch:
image: sumansmhalsank11/mywebclass_simulation:development
container_name: development_branch
pull_policy: always
restart: always
ports:
- "8000:80"
labels:
- 'com.centurylinklabs.watchtower.enable=true'

watchtower:
image: containrrr/watchtower
container_name: watchtower
restart: always
command: '--interval 30 --label-enable --cleanup'
volumes:
- /var/run/docker.sock:/var/run/docker.sock
labels:
labels:
- 'com.centurylinklabs.watchtower.enable: true'
26 changes: 26 additions & 0 deletions mywebclass_internationalization.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import { test, expect } from '@playwright/test'

test.describe('MyWebClass.org internationalization', () => {
let page

test.beforeEach(async ({ browser }) => {
page = await browser.newPage()
await page.goto('http://localhost:3000')
})

test.afterEach(async () => {
await page.close()
})

test('should display the site in "en" when the "Accept-Language" header is set to "en"', async () => {
// Set the Accept-Language header and navigate to the website
await page.setExtraHTTPHeaders({ 'Accept-Language': 'en' })
await page.goto('http://localhost:3000')

// Check if the lang attribute of the HTML tag is set to "en"
const langAttribute = await page.getAttribute('html', 'lang')
expect(langAttribute).toBe('en', 'The lang attribute of the HTML tag is not set to "en".')

// Perform any additional checks for the "en" language version of the website here, e.g., checking specific text or elements
})
})
15 changes: 10 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/NJIT-WIS/mywebclass.git"
"url": "git+https://github.com/Sumanmhalsank02/mywebclass-simulation.git"
},
"author": "Keith Williams @ NJIT.EDU",
"author": "Suman S Mhalsank @ NJIT.EDU",
"license": "MIT",
"bugs": {
"url": "https://github.com/NJIT-WIS/mywebclass/issues"
"url": "https://github.com/Sumanmhalsank02/mywebclass-simulation/issues"
},
"homepage": "https://github.com/NJIT-WIS/mywebclass#readme",
"homepage": "https://github.com/Sumanmhalsank02/mywebclass-simulation#readme",
"devDependencies": {
"@playwright/test": "^1.31.1",
"autoprefixer": "^10.4.13",
Expand Down Expand Up @@ -61,5 +61,10 @@
},
"dependencies": {
"@popperjs/core": "^2.11.6"
},

"overrides": {
"graceful-fs": "^4.2.10"
}

}
}
8 changes: 8 additions & 0 deletions productivity_log.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

## Team Productivity Log
This log is to track issue title,story points, issue link, status, assigned to, assigned on, completed on, category, status notes.

| Issue Title | Story Points | Issue Link | Status | Assigned to | Assigned on | Completed on | Category | Status notes |
|:---------------------|:------------:|-------------:|------------:|------------:|------------:|------------:|------------:|------------:|
| Homepage Development | 1 | | Completed | Srinivas Bojja | 18 March '23 | 19 March '23 | Website Feature | Made Changes to the weclass simulation |
| Internationalization | 2 | | In Progress |
40 changes: 32 additions & 8 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
<html lang="EN">

<head>
<script async src="https://www.googletagmanager.com/gtag/js?id=G-ZM3JHV2M6P"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());

gtag('config', 'G-ZM3JHV2M6P');
</script>
<!--characterset UTF-8 Watch this: https://youtu.be/MijmeoH9LT4 -->

<title>MyWebClass.org</title>
Expand All @@ -21,7 +29,6 @@
<meta property="og:url" content=""/>

</head>

<body class="pt-5">
<div class="container-fluid">
<header role="banner" class="fixed-top">
Expand All @@ -34,6 +41,24 @@
<span class="navbar-toggler-icon" aria-hidden="true"></span>
<span class="visually-hidden">Toggle navigation</span>
</button>
<ul class="navbar-nav ms-auto mb-2 mb-lg-0">
<li class="nav-item">
<a class="nav-link" >Courses</a>
</li>
<li class="nav-item">
<a class="nav-link" >Practice</a>
</li>
<li class="nav-item">
<a class="nav-link" >Explore</a>
</li>
</ul>
<div class="search-container">
<form action="/action_page.php">
<input type="text" placeholder="Search.." name="search">
<button type="submit"><i class="fa fa-search"></i></button>
</form>
</div>

<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav ms-auto mb-2 mb-lg-0">
<li class="nav-item">
Expand All @@ -48,19 +73,18 @@
<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>
<h1 class="display-6 fw-bold lh-1">Techify Modern Learning</h1>
<p class="lead">MyWebClass offers advanced technologies that can revolutionize and techify your teaching and your students' learning journey.
Enroll now and gain access to cutting-edge software engineering skills to empower your students.</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">
<img class="rounded-lg-3 img-fluid" src="https://web-vdv.ru/files/pages/9873280a5dd01fdc38c012a06abe4db3.jpg"
alt="girl using a laptop" width="720">
</div>
</div>
</div>
Expand Down Expand Up @@ -112,4 +136,4 @@ <h5>Subscribe to our newsletter</h5>
</div>
</body>

</html>
</html>