Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

next.js migration #2802

Open
wants to merge 52 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
5823a00
next.js migration
ChelseaKR Aug 21, 2024
f505e96
Update .gitignore
scwambach Aug 21, 2024
b28d081
Update .gitignore
scwambach Aug 21, 2024
81c5b9e
converted from GIF labeled as a PNG to a true PNG
ChelseaKR Aug 23, 2024
451d183
latest
ChelseaKR Aug 23, 2024
2404067
added a proxy to redirect API calls
ChelseaKR Sep 30, 2024
a092c62
layout cleanup
scwambach Nov 4, 2024
afd5c18
Update page.tsx
scwambach Nov 4, 2024
04c963f
data
scwambach Nov 4, 2024
d8b89f4
Update homePage.ts
scwambach Nov 4, 2024
49d9015
types organization
scwambach Nov 4, 2024
cc79ffa
test fixes
scwambach Nov 4, 2024
14a6198
various updates
scwambach Nov 4, 2024
3e2b9bb
Update _fancyBanner.scss
scwambach Nov 4, 2024
3e86eb7
Update _fancyBanner.scss
scwambach Nov 4, 2024
1c371f8
content and typography
scwambach Nov 4, 2024
144a84a
Update Footer.tsx
scwambach Nov 6, 2024
c649c4f
industry selector
scwambach Nov 6, 2024
6ae1b49
cp landing page
scwambach Nov 6, 2024
aafb96e
tooltip fix
scwambach Nov 6, 2024
be5715b
layout changes
scwambach Nov 7, 2024
08cf7bf
manufacturing select
scwambach Nov 7, 2024
b074139
Update ManufacturingSelect.tsx
scwambach Nov 7, 2024
dd1f94b
Update _manufacturingSelect.scss
scwambach Nov 7, 2024
9e9614f
occupationGroups
scwambach Nov 7, 2024
98a7d57
Update OccupationGroups.tsx
scwambach Nov 7, 2024
b102bd5
Update ManufacturingSelect.tsx
scwambach Nov 7, 2024
f75a2e9
career pathways
scwambach Nov 12, 2024
b8a08ce
backend update
scwambach Nov 12, 2024
884a176
occupation details
scwambach Nov 12, 2024
559d775
training fix
scwambach Nov 13, 2024
1c0a2fe
Update CardSlider.tsx
scwambach Nov 13, 2024
a6e0eb4
Update CardSlider.tsx
scwambach Nov 13, 2024
e86a74e
Update CardSlider.tsx
scwambach Nov 13, 2024
f1c756b
Update IntroBlocks.tsx
scwambach Nov 13, 2024
4b6415c
button on training page
scwambach Nov 18, 2024
ed6a2e8
sass and backend update
scwambach Nov 19, 2024
987fa35
pageProp fixes
scwambach Nov 19, 2024
4c1c875
Merge pull request #3022 from newjersey/production-design-updates
ChelseaKR Nov 19, 2024
722f096
search fix
scwambach Dec 4, 2024
55f5a69
program banner
scwambach Dec 5, 2024
8065c9d
content start
scwambach Dec 5, 2024
d5e8e27
styles
scwambach Dec 6, 2024
9ef2249
Update Content.tsx
scwambach Dec 6, 2024
e409452
code cleanup
scwambach Dec 6, 2024
8818d1e
Update DrawerButton.tsx
scwambach Dec 6, 2024
1127de2
Update _drawer.scss
scwambach Dec 6, 2024
aa651dd
Update _infoBlocks.scss
scwambach Dec 6, 2024
48751be
Update _buttons.scss
scwambach Dec 6, 2024
fb0b832
notes
scwambach Dec 11, 2024
35db192
quick fixes
scwambach Dec 11, 2024
a66c408
Merge pull request #3093 from newjersey/ce-styles
ChelseaKR Jan 3, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
115 changes: 57 additions & 58 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,58 +1,57 @@
version: 2.1
jobs:
build-and-test:
circleci_ip_ranges: true
docker:
- image: cimg/node:20.11.0-browsers
- image: circleci/postgres:12
environment:
POSTGRES_USER: postgres
POSTGRES_PASSWORD:
resource_class: xlarge
steps:
- checkout
- run:
name: Install PostgreSQL client and setup database
command: |
sudo apt-get update
sudo apt-get install postgresql-client
createdb -h localhost d4adlocal -U postgres
- run:
name: Install required dependencies for Cypress
command: sudo apt-get install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb
- restore_cache:
keys:
- node-deps-v2-{{ .Branch }}-{{ checksum "package.json" }}
- node-deps-v2-{{ .Branch }}
- node-deps-v2
- run:
name: Install Node.js dependencies
command: npm install
- save_cache:
key: node-deps-v2-{{ .Branch }}-{{ checksum "package.json" }}
paths:
- ~/.npm
- ~/.cache
- run:
name: Run Node.js tests
command: npm test
- run:
name: Execute feature tests script
command: DB_ENV=$DB_ENV scripts/feature-tests.sh > feature-test-output.txt
no_output_timeout: 30m
- store_artifacts:
path: feature-test-output.txt
- store_artifacts:
path: wiremock.log
- store_artifacts:
path: /home/circleci/.npm/_logs/*.log
- store_artifacts:
path: ~/project/frontend/cypress/videos
- persist_to_workspace:
root: ~/project
paths:
- .
workflows:
build-test-deploy:
jobs:
- build-and-test
# version: 2.1
# jobs:
# build-and-test:
# circleci_ip_ranges: true
# docker:
# - image: cimg/node:20.11.0-browsers
# - image: circleci/postgres:12
# environment:
# POSTGRES_USER: postgres
# POSTGRES_PASSWORD:
# steps:
# - checkout
# - run:
# name: Install PostgreSQL client and setup database
# command: |
# sudo apt-get update
# sudo apt-get install postgresql-client
# createdb -h localhost d4adlocal -U postgres
# - run:
# name: Install required dependencies for Cypress
# command: sudo apt-get install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb
# - restore_cache:
# keys:
# - node-deps-v2-{{ .Branch }}-{{ checksum "package.json" }}
# - node-deps-v2-{{ .Branch }}
# - node-deps-v2
# - run:
# name: Install Node.js dependencies
# command: npm install
# - save_cache:
# key: node-deps-v2-{{ .Branch }}-{{ checksum "package.json" }}
# paths:
# - ~/.npm
# - ~/.cache
# - run:
# name: Run Node.js tests
# command: npm test
# - run:
# name: Execute feature tests script
# command: DB_ENV=$DB_ENV scripts/feature-tests.sh > feature-test-output.txt
# no_output_timeout: 30m
# - store_artifacts:
# path: feature-test-output.txt
# - store_artifacts:
# path: wiremock.log
# - store_artifacts:
# path: /home/circleci/.npm/_logs/*.log
# - store_artifacts:
# path: ~/project/frontend/cypress/videos
# - persist_to_workspace:
# root: ~/project
# paths:
# - .
# workflows:
# build-test-deploy:
# jobs:
# - build-and-test
6 changes: 6 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"extends": ["next/core-web-vitals", "plugin:storybook/recommended"],
"rules": {
"react-hooks/exhaustive-deps": "off"
}
}
65 changes: 51 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,54 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js
.yarn/install-state.gz

# testing
/coverage

# next.js
/.next/
/out/

# production
/build

# misc
.DS_Store
*.pem

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# local env files
.env*
.env*.local

# vercel
.vercel

# typescript
*.tsbuildinfo
next-env.d.ts

# Storybook
*storybook.log
storybook-static
build-storybook.log

# Cypress
cypress/videos/
cypress/screenshots/

# JetBrains IDEs
.idea/
.DS_store

# Python Environments
# Environments
.env
.venv
env/
Expand All @@ -20,9 +64,7 @@ backend/data/providers_*.csv
# Old ETPL File when running through etpl table seed guide
backend/data/standardized_etpl_old.csv

# ################################################################################ #
# EDITORS #
# ################################################################################ #
# Visual Studio Code
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
Expand All @@ -36,12 +78,9 @@ backend/data/standardized_etpl_old.csv
# Built Visual Studio Code Extensions
*.vsix

# ################################################################################ #
# OS #
# ################################################################################ #

#MacOS
# OS

# MacOS
# General
.DS_Store
.AppleDouble
Expand All @@ -50,7 +89,6 @@ backend/data/standardized_etpl_old.csv
# Icon must end with two \r
Icon


# Thumbnails
._*

Expand Down Expand Up @@ -96,8 +134,7 @@ $RECYCLE.BIN/
# Windows shortcuts
*.lnk

.vscode
# Miscellaneous
OverlayTool.tsx
overlayImages

/node_modules
frontend
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v20.11.0
20.11.0
5 changes: 5 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Ignore artifacts:
build
coverage
backend/data
backend/migrations
1 change: 1 addition & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
15 changes: 15 additions & 0 deletions .storybook/DocumentationTemplate.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import {
Meta,
Title,
Subtitle,
Description,
Primary,
Controls,
Stories,
} from "@storybook/blocks";

<Meta isTemplate />

<Title />

<Stories />
10 changes: 10 additions & 0 deletions .storybook/Theme.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { create } from "@storybook/theming/create";

export default create({
base: "light",
brandTitle: "My Career NJ",
brandUrl: "https://mycareer.nj.gov/",
brandImage:
"https://mycareer.nj.gov/static/media/njlogo.3a0393e6672e87a75fce884b1437162f.svg",
brandTarget: "_self",
});
18 changes: 18 additions & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import type { StorybookConfig } from "@storybook/nextjs";

const config: StorybookConfig = {
stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"],
addons: [
"@storybook/addon-onboarding",
"@storybook/addon-links",
"@storybook/addon-essentials",
"@chromatic-com/storybook",
"@storybook/addon-interactions",
],
framework: {
name: "@storybook/nextjs",
options: {},
},
staticDirs: ["../public"],
};
export default config;
6 changes: 6 additions & 0 deletions .storybook/manager.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { addons } from "@storybook/manager-api";
import customTheme from "./Theme";

addons.setConfig({
theme: customTheme,
});
28 changes: 28 additions & 0 deletions .storybook/preview.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import type { Preview } from "@storybook/react";
import React from "react";
import "./storybook.css";
import "../src/styles/main.scss";
import DocumentationTemplate from "./DocumentationTemplate.mdx";

const preview: Preview = {
parameters: {
controls: {
matchers: {
color: /(background|color)$/i,
date: /Date$/i,
},
},
docs: {
page: DocumentationTemplate,
},
},
decorators: [
(Story) => (
<main>
<Story />
</main>
),
],
};

export default preview;
16 changes: 16 additions & 0 deletions .storybook/storybook.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#storybook-docs > div > div {
max-width: 1500px;
}

#storybook-docs h1,
#storybook-docs h2,
#storybook-docs h3,
#storybook-docs h4,
#storybook-docs h5,
#storybook-docs h6,
#storybook-docs p,
#storybook-docs li,
#storybook-docs ul,
#storybook-docs ol {
max-width: none;
}
21 changes: 21 additions & 0 deletions .vscode/css.code-snippets
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"Scale-up": {
"prefix": "scale-up",
"body": ["@media screen and (min-width: (s.$$1)) {", " $2", "}"],
"description": "Media Query going from narrow to wide."
},
"Scale-down": {
"prefix": "scale-down",
"body": ["@media screen and (max-width: (s.$$1 - 1)) {", " $2", "}"],
"description": "Media Query going from wide to narrow."
},
"Scale-between": {
"prefix": "scale-between",
"body": [
"@media (max-width: (s.$$1 - 1)) and (min-width: (s.$$2)px){",
" $3",
"}"
],
"description": "Media Query going between wide to narrow."
}
}
Loading