Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit fbbf6ae
Author: Jerome Hardaway <[email protected]>
Date:   Mon Dec 23 01:31:13 2024 -0500

     added mic blog (#671)

    Added new blog about the Military Influencer Conference

commit 9717aeb
Author: Jerome Hardaway <[email protected]>
Date:   Sat Dec 21 18:44:25 2024 -0500

     Add YouTube link to Social and Text widgets (#670)

commit 3bc1347
Author: Jerome Hardaway <[email protected]>
Date:   Sat Dec 21 18:10:31 2024 -0500

    Remove Static Views (#669)

    * Add course data for Core Fundamentals and Command Line Interface; update BlogCard component to remove views display

    * Remove instructor and course data for Core Fundamentals and Command Line Interface

    * Remove views display from BlogArea components across multiple layouts

    * Remove 'views' field from blog data retrieval across multiple components

commit 1bcbc5f
Author: Jerome Hardaway <[email protected]>
Date:   Thu Dec 19 18:46:07 2024 -0500

    Add FAQ and Contact links to ListWidget; update terminology from Modu… (#668)

    * Add FAQ and Contact links to ListWidget; update terminology from Modules to Subjects

    * Add step to install WebKit dependencies in Playwright workflow

    * Update WebKit dependency version in Playwright workflow

    * Enhance Playwright workflow by adding specific WebKit dependencies installation and clearing Playwright cache before installation

    * Update WebKit dependencies installation to use correct ICU version and streamline installation process

    * Refactor WebKit dependencies installation in Playwright workflow to include specific ICU version and streamline installation process

    * Update upload-artifact action to version 4 in Playwright workflow

    * added libvpx7

    * Refactor Playwright workflow to improve caching and streamline WebKit dependencies installation

    * Update WebKit dependencies with correct package versions in Playwright workflow

    * Refactor Playwright workflow to let Playwright handle dependencies installation

    * remove webkit

    * Remove WebKit configuration from Playwright setup

    * add to playwright to depenencies

    * save

    * save

    * update web server command in Playwright config to use 'npm run dev'

    * Update Playwright config to run build before starting server and extend ESLint rules for devDependencies

commit 89b13e9
Author: Jerome Hardaway <[email protected]>
Date:   Sun Dec 15 23:17:37 2024 -0500

     fixed text on button (#666)

commit 4fcbe51
Author: Jerome Hardaway <[email protected]>
Date:   Sun Dec 15 23:07:34 2024 -0500

    Update courses (#665)

    * Rename Courses to Subjects and update related paths; add subjects page and remove courses page

    * Add new subjects: Flask, Web Fundamentals, and Streamlit with detailed descriptions and curriculum

    * Update section title from Modules to Subjects in homepage JSON

commit d44c0c6
Author: Jerome Hardaway <[email protected]>
Date:   Tue Dec 10 16:58:39 2024 -0500

     update GitHub Actions workflows and refine API request handling (#664)

    * update GitHub Actions workflows and refine API request handling

    * updated second cache action
  • Loading branch information
@jonulak
jonulak committed Dec 24, 2024
1 parent bd81d7c commit 33b2421
Show file tree
Hide file tree
Showing 74 changed files with 2,426 additions and 2,300 deletions.
219 changes: 115 additions & 104 deletions .eslintrc.json
View file
Original file line number Diff line number Diff line change
@@ -1,105 +1,116 @@
{
"extends": [
"next/core-web-vitals",
"airbnb",
"airbnb-typescript",
"prettier",
"plugin:@typescript-eslint/recommended"
],
"plugins": ["react", "@typescript-eslint", "prettier"],
"env": {
"browser": true,
"es2023": true,
"node": true
},
"parser": "@typescript-eslint/parser",
"parserOptions": {
"project": "./tsconfig.json",
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": "latest",
"sourceType": "module"
},
"rules": {
"@typescript-eslint/no-misused-promises": [
"error",
{
"checksConditionals": false,
"checksVoidReturn": false
}
],
"no-underscore-dangle": "off",
"react/react-in-jsx-scope": "off",
"react/prop-types": "off",
"react/require-default-props": "off",
"react/default-props-match-prop-types": "off",
"react/jsx-props-no-spreading": "off",
"import/prefer-default-export": "off",
"no-param-reassign": "off",
"import/extensions": [
"error",
"ignorePackages",
{
"ts": "never",
"tsx": "never"
}
],
"import/no-unresolved": "error",
"consistent-return": "off",
"arrow-body-style": "off",
"prefer-arrow-callback": "off",
"react/jsx-filename-extension": ["error", { "extensions": [".tsx", ".jsx"] }],
"react/function-component-definition": [
"error",
{
"namedComponents": "arrow-function",
"unnamedComponents": "arrow-function"
}
],
"prettier/prettier": "warn",
"jsx-a11y/anchor-is-valid": [
"error",
{
"components": ["Link"],
"specialLink": ["hrefLeft", "hrefRight"],
"aspects": ["invalidHref", "preferButton"]
}
],
"jsx-a11y/label-has-associated-control": [
"error",
{
"required": {
"some": ["nesting", "id"]
}
}
],
"jsx-a11y/control-has-associated-label": "off", // Added this line
"@next/next/no-img-element": "off",
"react/no-danger": "off",
"no-void": ["error", { "allowAsStatement": true }]
},
"settings": {
"react": {
"version": "detect"
},
"import/resolver": {
"typescript": {},
"node": {
"extensions": [".js", ".jsx", ".ts", ".tsx"]
}
}
},
"overrides": [
{
"files": ["*.js"],
"rules": {
"@typescript-eslint/no-unsafe-assignment": "off",
"@typescript-eslint/no-var-requires": "off",
"@typescript-eslint/no-unsafe-call": "off",
"@typescript-eslint/no-unsafe-member-access": "off",
"@typescript-eslint/no-unsafe-return": "off"
}
}
]
}
"extends": [
"next/core-web-vitals",
"airbnb",
"airbnb-typescript",
"prettier",
"plugin:@typescript-eslint/recommended"
],
"plugins": ["react", "@typescript-eslint", "prettier"],
"env": {
"browser": true,
"es2023": true,
"node": true
},
"parser": "@typescript-eslint/parser",
"parserOptions": {
"project": "./tsconfig.json",
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": "latest",
"sourceType": "module"
},
"rules": {
"@typescript-eslint/no-misused-promises": [
"error",
{
"checksConditionals": false,
"checksVoidReturn": false
}
],
"no-underscore-dangle": "off",
"react/react-in-jsx-scope": "off",
"react/prop-types": "off",
"react/require-default-props": "off",
"react/default-props-match-prop-types": "off",
"react/jsx-props-no-spreading": "off",
"import/prefer-default-export": "off",
"no-param-reassign": "off",
"import/no-extraneous-dependencies": [
"error",
{
"devDependencies": [
"**/*.test.ts",
"**/*.test.tsx",
"**/playwright.config.ts",
"tests/**/*"
]
}
],
"import/extensions": [
"error",
"ignorePackages",
{
"ts": "never",
"tsx": "never"
}
],
"import/no-unresolved": "error",
"consistent-return": "off",
"arrow-body-style": "off",
"prefer-arrow-callback": "off",
"react/jsx-filename-extension": ["error", { "extensions": [".tsx", ".jsx"] }],
"react/function-component-definition": [
"error",
{
"namedComponents": "arrow-function",
"unnamedComponents": "arrow-function"
}
],
"prettier/prettier": "warn",
"jsx-a11y/anchor-is-valid": [
"error",
{
"components": ["Link"],
"specialLink": ["hrefLeft", "hrefRight"],
"aspects": ["invalidHref", "preferButton"]
}
],
"jsx-a11y/label-has-associated-control": [
"error",
{
"required": {
"some": ["nesting", "id"]
}
}
],
"jsx-a11y/control-has-associated-label": "off",
"@next/next/no-img-element": "off",
"react/no-danger": "off",
"no-void": ["error", { "allowAsStatement": true }]
},
"settings": {
"react": {
"version": "detect"
},
"import/resolver": {
"typescript": {},
"node": {
"extensions": [".js", ".jsx", ".ts", ".tsx"]
}
}
},
"overrides": [
{
"files": ["*.js"],
"rules": {
"@typescript-eslint/no-unsafe-assignment": "off",
"@typescript-eslint/no-var-requires": "off",
"@typescript-eslint/no-unsafe-call": "off",
"@typescript-eslint/no-unsafe-member-access": "off",
"@typescript-eslint/no-unsafe-return": "off"
}
}
]
}
36 changes: 17 additions & 19 deletions .github/workflows/playwright.yml
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,21 @@
name: Playwright Tests

on:
push:
branches: [main, master]
pull_request:
branches: [main, master]

jobs:
test:
timeout-minutes: 60
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- uses: actions/checkout@v4
- name: Cache node modules
uses: actions/cache@v2
uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
# This path is platform dependent; use **/node_modules for Windows
path: |
node_modules
**/node_modules
Expand All @@ -28,32 +24,34 @@ jobs:
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
- uses: actions/setup-node@v3
with:
node-version-file: '.nvmrc'

- name: Install dependencies
run: yarn

- name: Cache Playwright Browsers
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: |
~/.cache/ms-playwright
key: ${{ runner.os }}-playwright-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-playwright-
- name: Install Playwright Browsers
run: yarn playwright install --with-deps

- name: Install Playwright and browsers
run: yarn playwright install --with-deps chromium firefox
- name: Run Playwright tests
run: yarn playwright test

- uses: actions/upload-artifact@v3
run: |
yarn build
yarn playwright test --project=chromium --project=firefox
- uses: actions/upload-artifact@v4
if: always()
with:
name: playwright-report
path: playwright-report/
retention-days: 30
retention-days: 30
2 changes: 1 addition & 1 deletion blog-template.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ tags:
- Tags
- Here
is_featured: Boolean value (true or false)
views: Number of views (if applicable)

---
2 changes: 1 addition & 1 deletion next-env.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information.
// see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.
Loading

0 comments on commit 33b2421

Please sign in to comment.