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

Merging develop into production #760

Open
wants to merge 134 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
134 commits
Select commit Hold shift + click to select a range
3537ef1
drag and drop deletion feature
saidarsht Oct 2, 2023
34549a2
removed redundant condition
saidarsht Oct 2, 2023
a269f1b
Update dependencies
ishaanthenerd Oct 6, 2023
27de94b
resolves Planner.tsx merge conflict
saidarsht Oct 8, 2023
8b347cc
Merge branch 'develop' of https://github.com/UTDNebula/planner into d…
saidarsht Oct 8, 2023
8cd04ea
resolves Sidebar.tsx merge conflict
saidarsht Oct 8, 2023
50b558a
resolves Planner.tsx merge conflict
saidarsht Oct 8, 2023
7265d26
new delete component
saidarsht Oct 11, 2023
4b17c26
improved readability
saidarsht Oct 12, 2023
218ff9e
add missing sidebar content
saidarsht Oct 12, 2023
812bc3c
lmao
swayam528 Oct 12, 2023
99903bb
Dynamically determine the starting year for degree validation
cubetastic33 Oct 14, 2023
af5f215
transfer courses marked as completed
enkyuan Oct 17, 2023
13fa97a
transfer courses marked as completed
enkyuan Oct 17, 2023
90365b0
transfer courses marked as completed
enkyuan Oct 17, 2023
aad25c8
transfer courses marked as completed
enkyuan Oct 17, 2023
e5f5f74
refactor, fix: validate trpc & unsorted semesters bug
kamui-fin Oct 17, 2023
9ba0e8f
chore: fix eslint let to const
kamui-fin Oct 17, 2023
faadf15
Merge pull request #715 from UTDNebula/NP-49
cubetastic33 Oct 17, 2023
7904cac
Merge pull request #695 from UTDNebula/drag-drop-deletion
cubetastic33 Oct 17, 2023
31d0bdb
Merge pull request #714 from UTDNebula/major-names
cubetastic33 Oct 17, 2023
ef79a20
feat: prioritize order courses with warning
kamui-fin Oct 17, 2023
fa5831d
chore(deps): bump urllib3 from 1.26.13 to 1.26.18 in /validator
dependabot[bot] Oct 17, 2023
35e715f
chore(deps): bump @babel/traverse from 7.20.13 to 7.23.2
dependabot[bot] Oct 18, 2023
c7261cd
chore: run prettier
kamui-fin Oct 18, 2023
550bebd
Update add_ids script to work with new structure
cubetastic33 Oct 20, 2023
9d0400e
Run add_ids.py
cubetastic33 Oct 20, 2023
bf040b8
Add 2023 version of Computer Engineering(BS)
cubetastic33 Oct 20, 2023
87bebfc
Merge pull request #717 from UTDNebula/move-warning-top
kamui-fin Oct 20, 2023
48b1046
fix: remove catalog year and find distinct
kamui-fin Oct 23, 2023
dc9a111
new design and indicator
saidarsht Oct 23, 2023
15f234c
Merge pull request #721 from UTDNebula/drag-drop-deletion
cubetastic33 Oct 23, 2023
82ff041
Merge branch 'develop' of https://github.com/UTDNebula/planner into g…
swayam528 Oct 24, 2023
7073c4b
Merge pull request #716 from UTDNebula/refactor-validatets
kamui-fin Oct 24, 2023
19f19c1
Enable console logs on production
cubetastic33 Oct 24, 2023
f4466f7
Merge pull request #722 from UTDNebula/enable-logs
cubetastic33 Oct 24, 2023
bdc7d89
chore(deps): bump next from 13.1.6 to 13.5.0
dependabot[bot] Oct 25, 2023
de479b6
Merge pull request #720 from UTDNebula/major-diffs
kamui-fin Oct 25, 2023
67e7308
chore(deps): bump crypto-js from 4.1.1 to 4.2.0
dependabot[bot] Oct 25, 2023
326ebac
Add 2023 plan for global business
swayam528 Oct 30, 2023
bbe9cf3
Add 2023 plan for Supply Chain Management
swayam528 Oct 30, 2023
e30edde
Add 2023 plan for Supply Chain Management
swayam528 Oct 30, 2023
d2bbe32
Update year in Supply Chain Management
swayam528 Oct 31, 2023
674d459
Undo changes in planner.tsx
swayam528 Oct 31, 2023
8f6469e
Merge branch 'develop' of https://github.com/UTDNebula/planner into g…
swayam528 Oct 31, 2023
6e12ab9
Merge pull request #725 from UTDNebula/dependabot/npm_and_yarn/crypto…
kamui-fin Nov 2, 2023
863e64e
Merge pull request #718 from UTDNebula/dependabot/pip/validator/urlli…
kamui-fin Nov 2, 2023
d08fe94
Merge pull request #723 from UTDNebula/dependabot/npm_and_yarn/next-1…
kamui-fin Nov 2, 2023
1b13bfc
chore(deps): bump werkzeug from 2.2.3 to 3.0.1 in /validator
dependabot[bot] Nov 2, 2023
596c904
Merge pull request #724 from UTDNebula/dependabot/pip/validator/werkz…
kamui-fin Nov 2, 2023
c8b96a8
build(deps-dev): bump postcss from 8.4.19 to 8.4.31
dependabot[bot] Nov 2, 2023
a4e9203
Merge pull request #719 from UTDNebula/dependabot/npm_and_yarn/babel/…
kamui-fin Nov 2, 2023
e0fa578
build(deps): bump zod from 3.19.1 to 3.22.3
dependabot[bot] Nov 2, 2023
8b94026
Merge pull request #701 from UTDNebula/dependabot/npm_and_yarn/zod-3.…
kamui-fin Nov 2, 2023
64bca23
Merge pull request #702 from UTDNebula/dependabot/npm_and_yarn/postcs…
kamui-fin Nov 2, 2023
8fe078c
Initial
TyHil Nov 5, 2023
80afea2
head open graph prefix
TyHil Nov 5, 2023
4e6983c
prettier
TyHil Nov 5, 2023
06030cf
import Head in pages
TyHil Nov 5, 2023
7879c57
Add 2023 plan for Business Administration Energy Management Concentra…
swayam528 Nov 5, 2023
4751266
Added 2023 degree plan for Marketing.
swayam528 Nov 5, 2023
7f90e2f
Added 2023 degree plan for ITS
swayam528 Nov 5, 2023
613a9fa
Added 2023 degree for Electrical Engineering
swayam528 Nov 5, 2023
a673ebb
Updated the year
swayam528 Nov 7, 2023
8db5e59
build(deps): bump @sentry/nextjs from 7.58.1 to 7.77.0
dependabot[bot] Nov 9, 2023
c3502a0
Revert "Merge pull request #716 from UTDNebula/refactor-validatets"
cubetastic33 Nov 10, 2023
7c8e606
Merge pull request #733 from UTDNebula/fix-develop
cubetastic33 Nov 10, 2023
e034578
chore: integrate storybook and add example story
kamui-fin Oct 31, 2023
727ad28
merge
kamui-fin Nov 10, 2023
a921218
hotfix: migrate to dynamic import
kamui-fin Nov 10, 2023
b827966
chore: bump next
jasonappah Nov 13, 2023
bc76e8d
Merge branch 'develop' into dependabot/npm_and_yarn/sentry/nextjs-7.77.0
jasonappah Nov 13, 2023
8359919
style: format
jasonappah Nov 13, 2023
90605a3
Merge pull request #732 from UTDNebula/dependabot/npm_and_yarn/sentry…
jasonappah Nov 13, 2023
889f265
build(deps): bump axios from 1.3.4 to 1.6.0
dependabot[bot] Nov 13, 2023
b2e9383
Merge pull request #735 from UTDNebula/dependabot/npm_and_yarn/axios-…
jasonappah Nov 13, 2023
ce7297e
chore: next dep fixes
jasonappah Nov 13, 2023
f939370
Merge branch 'develop' of github.com:UTDNebula/planner into storybook…
cubetastic33 Nov 13, 2023
dfdfc4c
adds transcript indicator
saidarsht Nov 14, 2023
eb5796c
Merge pull request #734 from UTDNebula/storybook-husky-dev
cubetastic33 Nov 14, 2023
031685f
Merge branch 'develop' of github.com:UTDNebula/planner into git_example
cubetastic33 Nov 14, 2023
d864166
Merge branch 'develop' of github.com:UTDNebula/planner into standardi…
cubetastic33 Nov 14, 2023
ddab44d
Add missing import for Head
cubetastic33 Nov 14, 2023
0a8a8cf
Merge pull request #736 from UTDNebula/transcript-indicator
cubetastic33 Nov 14, 2023
3f89f1d
Merge pull request #731 from UTDNebula/standardize-favicon
cubetastic33 Nov 14, 2023
95684e7
build(deps): bump next-auth from 4.20.1 to 4.24.5
dependabot[bot] Nov 20, 2023
5311049
Made the collapsing and expanding transitions
ishaanthenerd Nov 27, 2023
8e968fc
Show number of transfer credits taken in pill
cubetastic33 Nov 27, 2023
a887f54
"Fixed the error on line 392"
swayam528 Nov 28, 2023
f39733c
Merge pull request #727 from UTDNebula/git_example
cubetastic33 Nov 28, 2023
8739771
build(deps): bump follow-redirects from 1.15.2 to 1.15.4
dependabot[bot] Jan 10, 2024
58074d1
build(deps): bump jinja2 from 3.1.2 to 3.1.3 in /validator
dependabot[bot] Jan 11, 2024
f557573
Made the collapsing and expanding transitions
ishaanthenerd Nov 27, 2023
f3ca20a
Remove venv folder
Jake3231 Feb 6, 2024
5c5faff
build(deps): bump crypto-js from 4.1.1 to 4.2.0
dependabot[bot] Feb 6, 2024
5fa2a33
Ran eslint --fix and prettier --write
ishaanthenerd Feb 7, 2024
23ffd20
Deleted changes in CustomPlan.tsx
ishaanthenerd Feb 9, 2024
19bbba9
Deleted CustomPlan.tsx changes
ishaanthenerd Feb 9, 2024
629f79f
Try to fix deploy workflow
jasonappah Feb 13, 2024
775a0a9
Add missing paren
jasonappah Feb 13, 2024
ca7e39b
Bump Prisma
jasonappah Feb 13, 2024
e8ce016
Merge pull request #742 from UTDNebula/dependabot/npm_and_yarn/crypto…
jasonappah Feb 13, 2024
7aab366
build(deps): bump nodemailer from 6.8.0 to 6.9.9
dependabot[bot] Feb 13, 2024
1947d92
Merge pull request #737 from UTDNebula/dependabot/npm_and_yarn/next-a…
jasonappah Feb 13, 2024
5d9dad3
Merge pull request #740 from UTDNebula/dependabot/npm_and_yarn/follow…
jasonappah Feb 13, 2024
a016244
Merge pull request #741 from UTDNebula/dependabot/pip/validator/jinja…
jasonappah Feb 13, 2024
8fa65b6
Merge
jasonappah Feb 13, 2024
6c993e6
Format
jasonappah Feb 13, 2024
b0b504b
Bump Neon workflow version
jasonappah Feb 13, 2024
f7516fd
Add missing next dependencies
jasonappah Feb 13, 2024
d4904d2
Merge pull request #743 from UTDNebula/dependabot/npm_and_yarn/nodema…
jasonappah Feb 13, 2024
cb9c1ca
Remove venv
jasonappah Feb 13, 2024
6cb8291
Merge branch 'main' into feature/smoother-collapsing-tiles
jasonappah Feb 13, 2024
5450b78
Merge branch 'develop' into feature/smoother-collapsing-tiles
jasonappah Feb 13, 2024
bd07e12
Fix lint errors
jasonappah Feb 13, 2024
b744ca8
Bump workflow versions
jasonappah Feb 13, 2024
7fc7fb7
Try to fix secret access
jasonappah Feb 13, 2024
3bfba13
Revert "Try to fix secret access"
jasonappah Feb 13, 2024
9bc5490
Remove unneeded change
jasonappah Feb 13, 2024
7e10c75
Move animation to shared hook
jasonappah Feb 13, 2024
1cd1344
Fix missing key on RecursiveRequirement
jasonappah Feb 13, 2024
828c489
Merge pull request #739 from ishaanthenerd/feature/smoother-collapsin…
jasonappah Feb 13, 2024
b3fa28a
Merge branch 'develop' into transfer-num-credits
jasonappah Feb 13, 2024
107aed6
Merge pull request #738 from UTDNebula/transfer-num-credits
jasonappah Feb 13, 2024
61199ec
temporarily hardcore catalog year
nl32 Aug 20, 2024
948d0b3
comment to retrigger ci
nl32 Aug 21, 2024
edc459e
Merge pull request #759 from UTDNebula/fix-course-information
KennethImphean Aug 21, 2024
3c39dd8
Drop analytics
TyHil Oct 30, 2024
29161c2
format
TyHil Oct 30, 2024
f73de83
readd google analytics
TyHil Oct 30, 2024
f4e90cd
other mentions
TyHil Oct 30, 2024
79cab6c
Merge branch 'develop' into change-google-analytics-develop
TyHil Oct 30, 2024
e73d479
Remove AnalyticsWrapper again
TyHil Oct 30, 2024
70850fd
Merge pull request #762 from UTDNebula/change-google-analytics-develop
TyHil Oct 30, 2024
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
7 changes: 0 additions & 7 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,6 @@ NEXT_PUBLIC_VALIDATOR=
NODE_ENV=


########## Umami ##########
## Umami: self-hosted analytics service
## Required only in production.
NEXT_PUBLIC_UMAMI_URL=
NEXT_PUBLIC_UMAMI_WEBSITE_ID=


########## Sentry ##########
## Sentry: error tracking service
## Not required in any environments.
Expand Down
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ module.exports = {
'plugin:import/typescript',
'prettier',
'next/core-web-vitals',
'plugin:storybook/recommended',
],
rules: {
// Place to specify ESLint rules. Can be used to overwrite rules specified from the extended configs
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18

Expand Down Expand Up @@ -80,7 +80,3 @@ jobs:

NODE_ENV: production
VERCEL_ENV: preview

# UMAMI
NEXT_PUBLIC_UMAMI_URL: hi
NEXT_PUBLIC_UMAMI_WEBSITE_ID: bye
4 changes: 2 additions & 2 deletions .github/workflows/delete-neon-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
id: get_branch_id
# list all branches and filter by name
run: |
branch_id=$(curl --silent \
branch_id=$(curl --silent --fail-with-body \
"https://console.neon.tech/api/v2/projects/${{ secrets.NEON_PROJECT_ID }}/branches" \
--header "Accept: application/json" \
--header "Content-Type: application/json" \
Expand All @@ -32,7 +32,7 @@ jobs:
echo "branch_id=${branch_id}" >> $GITHUB_OUTPUT

- name: Delete Neon Branch
uses: neondatabase/delete-branch-action@v2
uses: neondatabase/delete-branch-action@v3
with:
project_id: ${{ secrets.NEON_PROJECT_ID }}
branch_id: ${{ steps.get_branch_id.outputs.branch_id }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Neon Database Create Branch Action
uses: neondatabase/create-branch-action@v3
uses: neondatabase/create-branch-action@v4
id: create_branch
with:
project_id: ${{ secrets.NEON_PROJECT_ID }}
Expand All @@ -39,7 +39,7 @@ jobs:
preview_url=$(vercel deploy \
--env DATABASE_URL="${{ steps.create_branch.outputs.db_url_with_pooler}}/neondb?pgbouncer=true&connect_timeout=15&pool_timeout=15" \
--build-env DIRECT_DATABASE_URL="${{ steps.create_branch.outputs.db_url}}/neondb?connect_timeout=10" \
--public --yes --token=${{ secrets.VERCEL_TOKEN }})
--public --yes --token="${{ secrets.VERCEL_TOKEN }}")
echo preview_url=$preview_url >> $GITHUB_OUTPUT

- name: Comment on Pull Request
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:

steps:
- name: Check out Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18

Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,9 @@ jobs:

NODE_ENV: test

# UMAMI
NEXT_PUBLIC_UMAMI_URL: hi
NEXT_PUBLIC_UMAMI_WEBSITE_ID: bye

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Python3.11
uses: actions/setup-python@v4
Expand All @@ -91,7 +87,7 @@ jobs:
mongodb-port: 27017

- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18

Expand All @@ -111,10 +107,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/validator_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
working-directory: validator
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/setup-python@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/versioning.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/setup-python@v4
with:
Expand Down
19 changes: 19 additions & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import type { StorybookConfig } from '@storybook/nextjs';

const config: StorybookConfig = {
stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
addons: [
'@storybook/addon-links',
'@storybook/addon-essentials',
'@storybook/addon-onboarding',
'@storybook/addon-interactions',
],
framework: {
name: '@storybook/nextjs',
options: {},
},
docs: {
autodocs: 'tag',
},
};
export default config;
15 changes: 15 additions & 0 deletions .storybook/preview.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import type { Preview } from '@storybook/react';

const preview: Preview = {
parameters: {
actions: { argTypesRegex: '^on[A-Z].*' },
controls: {
matchers: {
color: /(background|color)$/i,
date: /Date$/i,
},
},
},
};

export default preview;
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,13 @@ npm install
NEXT_PUBLIC_VALIDATOR=http://127.0.0.1:5000
```

9. Generate `Prisma` client and run web server:
9. Setup pre-commit hooks:

```bash
npm run prepare
```

10. Generate `Prisma` client and run web server:

```bash
npm run prisma:generate
Expand Down
2 changes: 0 additions & 2 deletions docs/WORKFLOWS_AND_DEPLOYMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ All deployment/external service:
- Web server: Vercel
- TRPC Routes: Vercel Edge Functions
- Planner Postgres: Neon
- Umami (User analytics): Railway
- Umami Postgres: Railway
- Sentry (Crash analytics)
- Auth Providers: Discord, Google, Facebook
- Mailtrap (Email "magic link" auth)
5 changes: 1 addition & 4 deletions next.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/no-var-requires */
const { withSentryConfig } = require('@sentry/nextjs');
const fetch = require('node-fetch');
const fetch = (...args) => import('node-fetch').then(({ default: fetch }) => fetch(...args));

/* eslint-disable @typescript-eslint/no-var-requires */

Expand Down Expand Up @@ -40,9 +40,6 @@ module.exports = async (phase) => {
transform: '@mui/icons-material/{{member}}',
},
},
compiler: {
removeConsole: process.env.NODE_ENV === 'production',
},
rewrites: async () => {
return [
{
Expand Down
Loading
Loading