diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dd35f955a..67045a751 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,9 +14,9 @@ jobs: node-version: 16 - uses: bahmutov/npm-install@v1 - run: yarn lint - run-api-v2-tests: + run-api-tests: runs-on: ubuntu-latest - name: API V2 Tests + name: API Tests steps: - name: Checkout code uses: actions/checkout@v3 @@ -26,7 +26,7 @@ jobs: node-version: "16" - run: yarn install --immutable - name: Run Jest Tests - run: yarn packages/api-v2 test + run: yarn packages/api test build-frontend-image: runs-on: ubuntu-latest steps: diff --git a/README.md b/README.md index d03cbc744..ea37e1e09 100644 --- a/README.md +++ b/README.md @@ -6,17 +6,17 @@ GraduateNU aims to empower Northeastern students to customize their plan of stud 1. Make sure you run the dev postgres database using `yarn dev:db:up`. Run `yarn dev:db:down` when you're done. -2. Make a copy of the packages/api-v2/.env.development and name it .env.development.local. Fill in placeholder secrets. +2. Make a copy of the packages/api/.env.development and name it .env.development.local. Fill in placeholder secrets. -3. Make a copy of the packages/api-v2/.env.testing and name it .env.testing.local. for running BE tests +3. Make a copy of the packages/api/.env.testing and name it .env.testing.local. for running BE tests -4. If you haven't run migrations in a while or this is a fresh repo, then run the migrations for the the api using `yarn packages/api-v2 dev:migration:run`. See packages/API-V2/README for more info. +4. If you haven't run migrations in a while or this is a fresh repo, then run the migrations for the the api using `yarn packages/api dev:migration:run`. See packages/API/README for more info. -5. Then run the new version of the application by running `yarn dev:v2` at the root of the project. This starts up a NestJS server + a NextJS frontend + a Proxy. The proxy listens on port [3002](http://localhost:3002/), forwards /api requests to the NestJS server running on port 3001, and all other requests to the frontend running on port 3000. +5. Then run the new version of the application by running `yarn dev` at the root of the project. This starts up a NestJS server + a NextJS frontend + a Proxy. The proxy listens on port [3002](http://localhost:3002/), forwards /api requests to the NestJS server running on port 3001, and all other requests to the frontend running on port 3000. 6. Visit [http://localhost:3002](http://localhost:3002/) to view the app. -To run the two separately, visit the frontend and api-v2 packages(sub directories of the monorepo). +To run the two separately, visit the frontend and api packages(sub directories of the monorepo). ## Running the prod builds in prod docker configurations locally @@ -43,9 +43,9 @@ Example: `yarn packages/frontend lint` The workspaces within this monorepo are: -1. **frontend-v2**: A Next.js web UI. It is what users see when they visit our application. +1. **frontend**: A Next.js web UI. It is what users see when they visit our application. -2. **api-v2**: A Nest.js API reponsible for storing and managing Graduate's data. Our frontend leans on our api for data related services. +2. **api**: A Nest.js API reponsible for storing and managing Graduate's data. Our frontend leans on our api for data related services. 3. **api-client:** A typescript client responsible for providing a streamlined and typed interface to interact with our API. The frontend uses this client to send request to our API. diff --git a/infrastructure/develop/docker-compose.api.yml b/infrastructure/develop/docker-compose.api.yml index e8e9a4ff4..67d88355c 100644 --- a/infrastructure/develop/docker-compose.api.yml +++ b/infrastructure/develop/docker-compose.api.yml @@ -25,7 +25,7 @@ services: ports: - 4001:3001 env_file: - - "../../packages/api-v2/.env.development" + - "../../packages/api/.env.development" # env vars here override the env vars in the env_file above environment: # we are no longer connecting to the db on localhost, the host is the name of the container diff --git a/infrastructure/prod/Dockerfile.app b/infrastructure/prod/Dockerfile.app index 82e2c6a08..a062fab5b 100644 --- a/infrastructure/prod/Dockerfile.app +++ b/infrastructure/prod/Dockerfile.app @@ -10,7 +10,7 @@ WORKDIR /app # package.json of root and of needed packages COPY package.json yarn.lock babel.config.js .yarnrc.yml ./ COPY .yarn .yarn -COPY packages/frontend-v2/package.json packages/frontend-v2/package.json +COPY packages/frontend/package.json packages/frontend/package.json COPY packages/api-client/package.json packages/api-client/package.json COPY packages/common/package.json packages/common/package.json @@ -18,7 +18,7 @@ COPY packages/common/package.json packages/common/package.json RUN yarn install > /dev/null # Get src files -COPY packages/frontend-v2 packages/frontend-v2 +COPY packages/frontend packages/frontend COPY packages/api-client packages/api-client COPY packages/common packages/common @@ -32,7 +32,7 @@ ENV NEXT_PUBLIC_BUILD_TIMESTAMP $BUILD_TIMESTAMP RUN yarn packages/api-client build RUN yarn packages/common build -RUN yarn packages/frontend-v2 build +RUN yarn packages/frontend build # Production image FROM node:16-alpine AS runner @@ -44,9 +44,9 @@ RUN addgroup --system --gid 1001 nodejs RUN adduser --system --uid 1001 nextjs COPY --from=builder --chown=nextjs:nodejs /app/node_modules ./node_modules -COPY --from=builder --chown=nextjs:nodejs /app/packages/frontend-v2/public ./public -COPY --from=builder --chown=nextjs:nodejs /app/packages/frontend-v2/.next/standalone ./ -COPY --from=builder --chown=nextjs:nodejs /app/packages/frontend-v2/.next/static ./.next/static +COPY --from=builder --chown=nextjs:nodejs /app/packages/frontend/public ./public +COPY --from=builder --chown=nextjs:nodejs /app/packages/frontend/.next/standalone ./ +COPY --from=builder --chown=nextjs:nodejs /app/packages/frontend/.next/static ./.next/static USER nextjs diff --git a/infrastructure/prod/Dockerfile.server b/infrastructure/prod/Dockerfile.server index 2e77d6c50..7ae62147d 100644 --- a/infrastructure/prod/Dockerfile.server +++ b/infrastructure/prod/Dockerfile.server @@ -5,19 +5,19 @@ WORKDIR /server # package.json of root and of needed packages COPY package.json yarn.lock babel.config.js .yarnrc.yml ./ COPY .yarn .yarn -COPY packages/api-v2/package.json packages/api-v2/package.json +COPY packages/api/package.json packages/api/package.json COPY packages/common/package.json packages/common/package.json # Install at root level RUN yarn install > /dev/null # Get src files -COPY packages/api-v2 packages/api-v2 +COPY packages/api packages/api COPY packages/common packages/common # Build server and common dependency RUN yarn packages/common build -RUN yarn packages/api-v2 build +RUN yarn packages/api build FROM node:16-alpine AS runner WORKDIR /server diff --git a/infrastructure/prod/entrypoint.server.sh b/infrastructure/prod/entrypoint.server.sh index 0b36af281..afd35b35c 100644 --- a/infrastructure/prod/entrypoint.server.sh +++ b/infrastructure/prod/entrypoint.server.sh @@ -1,6 +1,6 @@ #!/bin/sh -cd packages/api-v2 +cd packages/api echo "Running on commit: $COMMIT_HASH" yarn typeorm migration:run exec "$@" diff --git a/package.json b/package.json index f65242b5d..cbcf165d8 100644 --- a/package.json +++ b/package.json @@ -11,8 +11,8 @@ ] }, "scripts": { - "dev:v2": "concurrently \"yarn foreach '@graduate/(common|api-v2|frontend-v2|api-client)' run dev\" \"yarn dev:proxy\"", - "prod:v2": "concurrently \"yarn foreach '@graduate/(common|api-v2|frontend-v2|api-client)' run prod\" \"yarn dev:proxy\"", + "dev": "concurrently \"yarn foreach '@graduate/(common|api|frontend|api-client)' run dev\" \"yarn dev:proxy\"", + "prod": "concurrently \"yarn foreach '@graduate/(common|api|frontend|api-client)' run prod\" \"yarn dev:proxy\"", "foreach": "yarn workspaces foreach --parallel --verbose --interlaced --include", "dev:proxy": "node infrastructure/develop/dev-proxy.js", "dev:db:up": "docker compose -f infrastructure/develop/docker-compose.db.yml up -d", diff --git a/packages/api-v2/migrations/1678404621776-EmailConfirmation.ts b/packages/api-v2/migrations/1678404621776-EmailConfirmation.ts deleted file mode 100644 index 9e00c4a57..000000000 --- a/packages/api-v2/migrations/1678404621776-EmailConfirmation.ts +++ /dev/null @@ -1,14 +0,0 @@ -import {MigrationInterface, QueryRunner} from "typeorm"; - -export class EmailConfirmation1678404621776 implements MigrationInterface { - name = 'EmailConfirmation1678404621776' - - public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(`ALTER TABLE "student" ADD "isEmailConfirmed" boolean NOT NULL DEFAULT false`); - } - - public async down(queryRunner: QueryRunner): Promise { - await queryRunner.query(`ALTER TABLE "student" DROP COLUMN "isEmailConfirmed"`); - } - -} diff --git a/packages/api-v2/migrations/1680386712510-OptionalMajorInPlan.ts b/packages/api-v2/migrations/1680386712510-OptionalMajorInPlan.ts deleted file mode 100644 index bfd6a6a11..000000000 --- a/packages/api-v2/migrations/1680386712510-OptionalMajorInPlan.ts +++ /dev/null @@ -1,16 +0,0 @@ -import {MigrationInterface, QueryRunner} from "typeorm"; - -export class OptionalMajorInPlan1680386712510 implements MigrationInterface { - name = 'OptionalMajorInPlan1680386712510' - - public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(`ALTER TABLE "plan" ALTER COLUMN "major" DROP NOT NULL`); - await queryRunner.query(`ALTER TABLE "plan" ALTER COLUMN "catalogYear" DROP NOT NULL`); - } - - public async down(queryRunner: QueryRunner): Promise { - await queryRunner.query(`ALTER TABLE "plan" ALTER COLUMN "catalogYear" SET NOT NULL`); - await queryRunner.query(`ALTER TABLE "plan" ALTER COLUMN "major" SET NOT NULL`); - } - -} diff --git a/packages/api-v2/.env.development b/packages/api/.env.development similarity index 100% rename from packages/api-v2/.env.development rename to packages/api/.env.development diff --git a/packages/api-v2/.env.testing b/packages/api/.env.testing similarity index 100% rename from packages/api-v2/.env.testing rename to packages/api/.env.testing diff --git a/packages/api-v2/.eslintrc.js b/packages/api/.eslintrc.js similarity index 100% rename from packages/api-v2/.eslintrc.js rename to packages/api/.eslintrc.js diff --git a/packages/api-v2/README.md b/packages/api/README.md similarity index 95% rename from packages/api-v2/README.md rename to packages/api/README.md index 117626124..7fcab0b61 100644 --- a/packages/api-v2/README.md +++ b/packages/api/README.md @@ -1,10 +1,10 @@ -# GraduateNU API V2 +# GraduateNU API ## Running the API 1. Run `yarn dev:db:up` from the project root to run the database in docker. You can run `yarn dev:db:down` from the project root to take down the database when you're done. -2. Run `yarn dev` from within the api-v2 directory to run the server in watch mode. +2. Run `yarn dev` from within the api directory to run the server in watch mode. ## Testing diff --git a/packages/api-v2/migrations/1675976227120-InitialMigration.ts b/packages/api/migrations/1675976227120-InitialMigration.ts similarity index 100% rename from packages/api-v2/migrations/1675976227120-InitialMigration.ts rename to packages/api/migrations/1675976227120-InitialMigration.ts diff --git a/packages/api/migrations/1678404621776-EmailConfirmation.ts b/packages/api/migrations/1678404621776-EmailConfirmation.ts new file mode 100644 index 000000000..bc2653566 --- /dev/null +++ b/packages/api/migrations/1678404621776-EmailConfirmation.ts @@ -0,0 +1,17 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class EmailConfirmation1678404621776 implements MigrationInterface { + name = "EmailConfirmation1678404621776"; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "student" ADD "isEmailConfirmed" boolean NOT NULL DEFAULT false` + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "student" DROP COLUMN "isEmailConfirmed"` + ); + } +} diff --git a/packages/api/migrations/1680386712510-OptionalMajorInPlan.ts b/packages/api/migrations/1680386712510-OptionalMajorInPlan.ts new file mode 100644 index 000000000..d2839c8f0 --- /dev/null +++ b/packages/api/migrations/1680386712510-OptionalMajorInPlan.ts @@ -0,0 +1,23 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class OptionalMajorInPlan1680386712510 implements MigrationInterface { + name = "OptionalMajorInPlan1680386712510"; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "plan" ALTER COLUMN "major" DROP NOT NULL` + ); + await queryRunner.query( + `ALTER TABLE "plan" ALTER COLUMN "catalogYear" DROP NOT NULL` + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "plan" ALTER COLUMN "catalogYear" SET NOT NULL` + ); + await queryRunner.query( + `ALTER TABLE "plan" ALTER COLUMN "major" SET NOT NULL` + ); + } +} diff --git a/packages/api-v2/nest-cli.json b/packages/api/nest-cli.json similarity index 100% rename from packages/api-v2/nest-cli.json rename to packages/api/nest-cli.json diff --git a/packages/api-v2/ormconfig.ts b/packages/api/ormconfig.ts similarity index 100% rename from packages/api-v2/ormconfig.ts rename to packages/api/ormconfig.ts diff --git a/packages/api-v2/package.json b/packages/api/package.json similarity index 99% rename from packages/api-v2/package.json rename to packages/api/package.json index 66f22a62d..60c4e593b 100644 --- a/packages/api-v2/package.json +++ b/packages/api/package.json @@ -1,5 +1,5 @@ { - "name": "@graduate/api-v2", + "name": "@graduate/api", "version": "0.0.1", "description": "", "author": "", diff --git a/packages/api-v2/src/app.module.ts b/packages/api/src/app.module.ts similarity index 100% rename from packages/api-v2/src/app.module.ts rename to packages/api/src/app.module.ts diff --git a/packages/api-v2/src/auth/auth.controller.ts b/packages/api/src/auth/auth.controller.ts similarity index 95% rename from packages/api-v2/src/auth/auth.controller.ts rename to packages/api/src/auth/auth.controller.ts index 56720b7ca..cdfdaabcc 100644 --- a/packages/api-v2/src/auth/auth.controller.ts +++ b/packages/api/src/auth/auth.controller.ts @@ -22,16 +22,16 @@ import { weakPasswordError, } from "@graduate/common"; import { Response } from "express"; -import EmailConfirmationService from "../../src/emailConfirmation/emailConfirmation.service"; +import EmailConfirmationService from "../emailConfirmation/emailConfirmation.service"; import { EmailAlreadyExists, EmailNotConfirmed, NoSuchEmail, WeakPassword, -} from "../../src/student/student.errors"; +} from "../student/student.errors"; import { BadToken, InvalidPayload, TokenExpiredError } from "./auth.errors"; import { Throttle } from "@nestjs/throttler"; -import { COOKIE_DOMAIN } from "../../src/constants"; +import { COOKIE_DOMAIN } from "../constants"; @Controller("auth") export class AuthController { diff --git a/packages/api-v2/src/auth/auth.errors.ts b/packages/api/src/auth/auth.errors.ts similarity index 100% rename from packages/api-v2/src/auth/auth.errors.ts rename to packages/api/src/auth/auth.errors.ts diff --git a/packages/api-v2/src/auth/auth.module.ts b/packages/api/src/auth/auth.module.ts similarity index 93% rename from packages/api-v2/src/auth/auth.module.ts rename to packages/api/src/auth/auth.module.ts index 069b98758..9182f114a 100644 --- a/packages/api-v2/src/auth/auth.module.ts +++ b/packages/api/src/auth/auth.module.ts @@ -5,7 +5,7 @@ import { StudentModule } from "../student/student.module"; import { AuthController } from "./auth.controller"; import { AuthService } from "./auth.service"; import { JwtStrategy } from "./jwt.strategy"; -import { EmailModule } from "../../src/email/email.module"; +import { EmailModule } from "../email/email.module"; @Module({ imports: [ diff --git a/packages/api-v2/src/auth/auth.service.ts b/packages/api/src/auth/auth.service.ts similarity index 93% rename from packages/api-v2/src/auth/auth.service.ts rename to packages/api/src/auth/auth.service.ts index 73d58dd6e..d4d148030 100644 --- a/packages/api-v2/src/auth/auth.service.ts +++ b/packages/api/src/auth/auth.service.ts @@ -1,7 +1,7 @@ import { Injectable, Logger } from "@nestjs/common"; import { JwtService } from "@nestjs/jwt"; -import { Student } from "../../src/student/entities/student.entity"; -import { StudentService } from "../../src/student/student.service"; +import { Student } from "../student/entities/student.entity"; +import { StudentService } from "../student/student.service"; import { LoginStudentDto, ResetPasswordDto, @@ -9,16 +9,16 @@ import { } from "@graduate/common"; import { JwtPayload } from "./interfaces/jwt-payload"; import * as bcrypt from "bcrypt"; -import { formatServiceCtx } from "../../src/utils"; +import { formatServiceCtx } from "../utils"; import { EmailAlreadyExists, EmailNotConfirmed, NoSuchEmail, WeakPassword, -} from "../../src/student/student.errors"; +} from "../student/student.errors"; import { ConfigService } from "@nestjs/config"; -import { EnvironmentVariables } from "../../src/environment-variables"; -import EmailService from "../../src/email/email.service"; +import { EnvironmentVariables } from "../environment-variables"; +import EmailService from "../email/email.service"; import { BadToken, InvalidPayload, TokenExpiredError } from "./auth.errors"; @Injectable() diff --git a/packages/api-v2/src/auth/interfaces/authenticated-request.ts b/packages/api/src/auth/interfaces/authenticated-request.ts similarity index 66% rename from packages/api-v2/src/auth/interfaces/authenticated-request.ts rename to packages/api/src/auth/interfaces/authenticated-request.ts index 8c95bffde..55eebb56c 100644 --- a/packages/api-v2/src/auth/interfaces/authenticated-request.ts +++ b/packages/api/src/auth/interfaces/authenticated-request.ts @@ -1,4 +1,4 @@ -import { Student } from "../../../src/student/entities/student.entity"; +import { Student } from "../../student/entities/student.entity"; /** Represents an authenticated request using the JwtAuthGuard. */ export interface AuthenticatedRequest extends Request { diff --git a/packages/api-v2/src/auth/interfaces/jwt-payload.ts b/packages/api/src/auth/interfaces/jwt-payload.ts similarity index 100% rename from packages/api-v2/src/auth/interfaces/jwt-payload.ts rename to packages/api/src/auth/interfaces/jwt-payload.ts diff --git a/packages/api-v2/src/auth/jwt.strategy.ts b/packages/api/src/auth/jwt.strategy.ts similarity index 91% rename from packages/api-v2/src/auth/jwt.strategy.ts rename to packages/api/src/auth/jwt.strategy.ts index a9b148980..764eed471 100644 --- a/packages/api-v2/src/auth/jwt.strategy.ts +++ b/packages/api/src/auth/jwt.strategy.ts @@ -3,9 +3,9 @@ import { ConfigService } from "@nestjs/config"; import { PassportStrategy } from "@nestjs/passport"; import { Request } from "express"; import { Strategy } from "passport-jwt"; -import { EnvironmentVariables } from "../../src/environment-variables"; -import { Student } from "../../src/student/entities/student.entity"; -import { formatServiceCtx } from "../../src/utils"; +import { EnvironmentVariables } from "../environment-variables"; +import { Student } from "../student/entities/student.entity"; +import { formatServiceCtx } from "../utils"; import { AuthService } from "./auth.service"; import { JwtPayload } from "./interfaces/jwt-payload"; diff --git a/packages/api-v2/src/auth/test/auth.controller.spec.ts b/packages/api/src/auth/test/auth.controller.spec.ts similarity index 100% rename from packages/api-v2/src/auth/test/auth.controller.spec.ts rename to packages/api/src/auth/test/auth.controller.spec.ts diff --git a/packages/api-v2/src/auth/test/auth.service.spec.ts b/packages/api/src/auth/test/auth.service.spec.ts similarity index 100% rename from packages/api-v2/src/auth/test/auth.service.spec.ts rename to packages/api/src/auth/test/auth.service.spec.ts diff --git a/packages/api-v2/src/constants.ts b/packages/api/src/constants.ts similarity index 100% rename from packages/api-v2/src/constants.ts rename to packages/api/src/constants.ts diff --git a/packages/api-v2/src/email/email.module.ts b/packages/api/src/email/email.module.ts similarity index 79% rename from packages/api-v2/src/email/email.module.ts rename to packages/api/src/email/email.module.ts index 20d0fc188..2dba0e478 100644 --- a/packages/api-v2/src/email/email.module.ts +++ b/packages/api/src/email/email.module.ts @@ -3,8 +3,8 @@ import { ConfigModule } from "@nestjs/config"; import EmailService from "./email.service"; import { JwtModule } from "@nestjs/jwt"; import EmailConfirmationService from "../emailConfirmation/emailConfirmation.service"; -import { StudentModule } from "../../src/student/student.module"; -import { EmailConfirmationController } from "../../src/emailConfirmation/emailConfirmation.controller"; +import { StudentModule } from "../student/student.module"; +import { EmailConfirmationController } from "../emailConfirmation/emailConfirmation.controller"; @Module({ imports: [ diff --git a/packages/api-v2/src/email/email.service.ts b/packages/api/src/email/email.service.ts similarity index 91% rename from packages/api-v2/src/email/email.service.ts rename to packages/api/src/email/email.service.ts index fd98e8fc3..0b8b35b1e 100644 --- a/packages/api-v2/src/email/email.service.ts +++ b/packages/api/src/email/email.service.ts @@ -2,7 +2,7 @@ import { Injectable } from "@nestjs/common"; import { ConfigService } from "@nestjs/config"; import { createTransport } from "nodemailer"; import Mail from "nodemailer/lib/mailer"; -import { EnvironmentVariables } from "../../src/environment-variables"; +import { EnvironmentVariables } from "../environment-variables"; @Injectable() export default class EmailService { diff --git a/packages/api-v2/src/emailConfirmation/emailConfirmation.controller.ts b/packages/api/src/emailConfirmation/emailConfirmation.controller.ts similarity index 91% rename from packages/api-v2/src/emailConfirmation/emailConfirmation.controller.ts rename to packages/api/src/emailConfirmation/emailConfirmation.controller.ts index 612e04de3..47a6c99f9 100644 --- a/packages/api-v2/src/emailConfirmation/emailConfirmation.controller.ts +++ b/packages/api/src/emailConfirmation/emailConfirmation.controller.ts @@ -12,8 +12,8 @@ import { emailAlreadyConfirmed, unableToSendEmail, } from "@graduate/common"; -import { AuthenticatedRequest } from "../../src/auth/interfaces/authenticated-request"; -import { JwtAuthGuard } from "../../src/guards/jwt-auth.guard"; +import { AuthenticatedRequest } from "../auth/interfaces/authenticated-request"; +import { JwtAuthGuard } from "../guards/jwt-auth.guard"; import EmailConfirmationService from "./emailConfirmation.service"; import { EmailAlreadyConfirmed, diff --git a/packages/api-v2/src/emailConfirmation/emailConfirmation.service.ts b/packages/api/src/emailConfirmation/emailConfirmation.service.ts similarity index 95% rename from packages/api-v2/src/emailConfirmation/emailConfirmation.service.ts rename to packages/api/src/emailConfirmation/emailConfirmation.service.ts index ddc978f9d..f302050da 100644 --- a/packages/api-v2/src/emailConfirmation/emailConfirmation.service.ts +++ b/packages/api/src/emailConfirmation/emailConfirmation.service.ts @@ -1,8 +1,8 @@ import { Injectable, Logger } from "@nestjs/common"; import { ConfigService } from "@nestjs/config"; import { JwtService } from "@nestjs/jwt"; -import { EnvironmentVariables } from "../../src/environment-variables"; -import { StudentService } from "../../src/student/student.service"; +import { EnvironmentVariables } from "../environment-variables"; +import { StudentService } from "../student/student.service"; import { UpdateResult } from "typeorm"; import EmailService from "../email/email.service"; import { diff --git a/packages/api-v2/src/emailConfirmation/emailConfirmationErrors.ts b/packages/api/src/emailConfirmation/emailConfirmationErrors.ts similarity index 100% rename from packages/api-v2/src/emailConfirmation/emailConfirmationErrors.ts rename to packages/api/src/emailConfirmation/emailConfirmationErrors.ts diff --git a/packages/api-v2/src/environment-variables.ts b/packages/api/src/environment-variables.ts similarity index 100% rename from packages/api-v2/src/environment-variables.ts rename to packages/api/src/environment-variables.ts diff --git a/packages/api-v2/src/graduate-logger.ts b/packages/api/src/graduate-logger.ts similarity index 88% rename from packages/api-v2/src/graduate-logger.ts rename to packages/api/src/graduate-logger.ts index cc61cb089..1c8aa2560 100644 --- a/packages/api-v2/src/graduate-logger.ts +++ b/packages/api/src/graduate-logger.ts @@ -1,5 +1,5 @@ import { ConsoleLogger, LogLevel } from "@nestjs/common"; -import { deepFilter } from "../src/utils"; +import { deepFilter } from "./utils"; const DENYLIST = ["password", "passwordConfirm"]; diff --git a/packages/api-v2/src/guards/dev-route.guard.ts b/packages/api/src/guards/dev-route.guard.ts similarity index 100% rename from packages/api-v2/src/guards/dev-route.guard.ts rename to packages/api/src/guards/dev-route.guard.ts diff --git a/packages/api-v2/src/guards/emailConfirmation.guard.ts b/packages/api/src/guards/emailConfirmation.guard.ts similarity index 83% rename from packages/api-v2/src/guards/emailConfirmation.guard.ts rename to packages/api/src/guards/emailConfirmation.guard.ts index 7d59aba06..2555e778c 100644 --- a/packages/api-v2/src/guards/emailConfirmation.guard.ts +++ b/packages/api/src/guards/emailConfirmation.guard.ts @@ -6,8 +6,8 @@ import { UnauthorizedException, Logger, } from "@nestjs/common"; -import { AuthenticatedRequest } from "../../src/auth/interfaces/authenticated-request"; -import { formatServiceCtx } from "../../src/utils"; +import { AuthenticatedRequest } from "../auth/interfaces/authenticated-request"; +import { formatServiceCtx } from "../utils"; @Injectable() export class EmailConfirmationGuard implements CanActivate { diff --git a/packages/api-v2/src/guards/jwt-auth.guard.ts b/packages/api/src/guards/jwt-auth.guard.ts similarity index 100% rename from packages/api-v2/src/guards/jwt-auth.guard.ts rename to packages/api/src/guards/jwt-auth.guard.ts diff --git a/packages/api-v2/src/guards/own-plan.guard.ts b/packages/api/src/guards/own-plan.guard.ts similarity index 97% rename from packages/api-v2/src/guards/own-plan.guard.ts rename to packages/api/src/guards/own-plan.guard.ts index bb4268e95..f490ab93f 100644 --- a/packages/api-v2/src/guards/own-plan.guard.ts +++ b/packages/api/src/guards/own-plan.guard.ts @@ -7,7 +7,7 @@ import { } from "@nestjs/common"; import { PlanService } from "../plan/plan.service"; import { Student } from "../student/entities/student.entity"; -import { formatServiceCtx } from "../../src/utils"; +import { formatServiceCtx } from "../utils"; /** * Used to protect GET/PUT/PATCH :id Plan controller methods from being accessed diff --git a/packages/api-v2/src/interceptors/logging.interceptor.ts b/packages/api/src/interceptors/logging.interceptor.ts similarity index 100% rename from packages/api-v2/src/interceptors/logging.interceptor.ts rename to packages/api/src/interceptors/logging.interceptor.ts diff --git a/packages/api-v2/src/main.ts b/packages/api/src/main.ts similarity index 97% rename from packages/api-v2/src/main.ts rename to packages/api/src/main.ts index d250908c3..a794a58d4 100644 --- a/packages/api-v2/src/main.ts +++ b/packages/api/src/main.ts @@ -6,7 +6,7 @@ import { } from "@nestjs/common"; import { ConfigService } from "@nestjs/config"; import { NestFactory, Reflector } from "@nestjs/core"; -import { GraduateLogger } from "../src/graduate-logger"; +import { GraduateLogger } from "./graduate-logger"; import { AppModule } from "./app.module"; import { EnvironmentVariables } from "./environment-variables"; import * as cookieParser from "cookie-parser"; diff --git a/packages/api-v2/src/major/major.controller.ts b/packages/api/src/major/major.controller.ts similarity index 100% rename from packages/api-v2/src/major/major.controller.ts rename to packages/api/src/major/major.controller.ts diff --git a/packages/api-v2/src/major/major.module.ts b/packages/api/src/major/major.module.ts similarity index 100% rename from packages/api-v2/src/major/major.module.ts rename to packages/api/src/major/major.module.ts diff --git a/packages/api-v2/src/major/major.service.ts b/packages/api/src/major/major.service.ts similarity index 98% rename from packages/api-v2/src/major/major.service.ts rename to packages/api/src/major/major.service.ts index eba5acd77..e75222814 100644 --- a/packages/api-v2/src/major/major.service.ts +++ b/packages/api/src/major/major.service.ts @@ -145,11 +145,10 @@ export class MajorService { majorName: string, catalogYear: number, concentrationName: string - ):boolean{ - + ): boolean { const majorsByCatalogue = this.findByMajorAndYear(majorName, catalogYear); - if(!majorsByCatalogue){ + if (!majorsByCatalogue) { this.logger.debug( { message: "Invalid catalogue year for major", @@ -158,7 +157,7 @@ export class MajorService { concentrationName, }, MajorService.formatMajorServiceCtx("isValidCatalogueYear") - ) + ); return false; } return true; diff --git a/packages/api-v2/src/major/majors/Computer_Science_BACS/Computer_Science_BACS-2021.json b/packages/api/src/major/majors/Computer_Science_BACS/Computer_Science_BACS-2021.json similarity index 99% rename from packages/api-v2/src/major/majors/Computer_Science_BACS/Computer_Science_BACS-2021.json rename to packages/api/src/major/majors/Computer_Science_BACS/Computer_Science_BACS-2021.json index 521cbb779..731593dba 100644 --- a/packages/api-v2/src/major/majors/Computer_Science_BACS/Computer_Science_BACS-2021.json +++ b/packages/api/src/major/majors/Computer_Science_BACS/Computer_Science_BACS-2021.json @@ -886,4 +886,4 @@ } ] } -} \ No newline at end of file +} diff --git a/packages/api-v2/src/major/majors/Computer_Science_BACS/Computer_Science_BACS-2022.json b/packages/api/src/major/majors/Computer_Science_BACS/Computer_Science_BACS-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_BACS/Computer_Science_BACS-2022.json rename to packages/api/src/major/majors/Computer_Science_BACS/Computer_Science_BACS-2022.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_BSCS/Computer_Science_BSCS-2021.json b/packages/api/src/major/majors/Computer_Science_BSCS/Computer_Science_BSCS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_BSCS/Computer_Science_BSCS-2021.json rename to packages/api/src/major/majors/Computer_Science_BSCS/Computer_Science_BSCS-2021.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_BSCS/Computer_Science_BSCS-2022.json b/packages/api/src/major/majors/Computer_Science_BSCS/Computer_Science_BSCS-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_BSCS/Computer_Science_BSCS-2022.json rename to packages/api/src/major/majors/Computer_Science_BSCS/Computer_Science_BSCS-2022.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Behavioral_Neuroscience_BS/Computer_Science_and_Behavioral_Neuroscience_BS-2021.json b/packages/api/src/major/majors/Computer_Science_and_Behavioral_Neuroscience_BS/Computer_Science_and_Behavioral_Neuroscience_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_and_Behavioral_Neuroscience_BS/Computer_Science_and_Behavioral_Neuroscience_BS-2021.json rename to packages/api/src/major/majors/Computer_Science_and_Behavioral_Neuroscience_BS/Computer_Science_and_Behavioral_Neuroscience_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Behavioral_Neuroscience_BS/Computer_Science_and_Behavioral_Neuroscience_BS-2022.json b/packages/api/src/major/majors/Computer_Science_and_Behavioral_Neuroscience_BS/Computer_Science_and_Behavioral_Neuroscience_BS-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_and_Behavioral_Neuroscience_BS/Computer_Science_and_Behavioral_Neuroscience_BS-2022.json rename to packages/api/src/major/majors/Computer_Science_and_Behavioral_Neuroscience_BS/Computer_Science_and_Behavioral_Neuroscience_BS-2022.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Biology_BS/Computer_Science_and_Biology_BS-2021.json b/packages/api/src/major/majors/Computer_Science_and_Biology_BS/Computer_Science_and_Biology_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_and_Biology_BS/Computer_Science_and_Biology_BS-2021.json rename to packages/api/src/major/majors/Computer_Science_and_Biology_BS/Computer_Science_and_Biology_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Biology_BS/Computer_Science_and_Biology_BS-2022.json b/packages/api/src/major/majors/Computer_Science_and_Biology_BS/Computer_Science_and_Biology_BS-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_and_Biology_BS/Computer_Science_and_Biology_BS-2022.json rename to packages/api/src/major/majors/Computer_Science_and_Biology_BS/Computer_Science_and_Biology_BS-2022.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Business_Administration_BS/Computer_Science_and_Business_Administration_BS-2021.json b/packages/api/src/major/majors/Computer_Science_and_Business_Administration_BS/Computer_Science_and_Business_Administration_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_and_Business_Administration_BS/Computer_Science_and_Business_Administration_BS-2021.json rename to packages/api/src/major/majors/Computer_Science_and_Business_Administration_BS/Computer_Science_and_Business_Administration_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Business_Administration_BS/Computer_Science_and_Business_Administration_BS-2022.json b/packages/api/src/major/majors/Computer_Science_and_Business_Administration_BS/Computer_Science_and_Business_Administration_BS-2022.json similarity index 99% rename from packages/api-v2/src/major/majors/Computer_Science_and_Business_Administration_BS/Computer_Science_and_Business_Administration_BS-2022.json rename to packages/api/src/major/majors/Computer_Science_and_Business_Administration_BS/Computer_Science_and_Business_Administration_BS-2022.json index e4a115227..139beae03 100644 --- a/packages/api-v2/src/major/majors/Computer_Science_and_Business_Administration_BS/Computer_Science_and_Business_Administration_BS-2022.json +++ b/packages/api/src/major/majors/Computer_Science_and_Business_Administration_BS/Computer_Science_and_Business_Administration_BS-2022.json @@ -1802,4 +1802,4 @@ } ] } -} \ No newline at end of file +} diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Cognitive_Psychology_BS/Computer_Science_and_Cognitive_Psychology_BS-2021.json b/packages/api/src/major/majors/Computer_Science_and_Cognitive_Psychology_BS/Computer_Science_and_Cognitive_Psychology_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_and_Cognitive_Psychology_BS/Computer_Science_and_Cognitive_Psychology_BS-2021.json rename to packages/api/src/major/majors/Computer_Science_and_Cognitive_Psychology_BS/Computer_Science_and_Cognitive_Psychology_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Cognitive_Psychology_BS/Computer_Science_and_Cognitive_Psychology_BS-2022.json b/packages/api/src/major/majors/Computer_Science_and_Cognitive_Psychology_BS/Computer_Science_and_Cognitive_Psychology_BS-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_and_Cognitive_Psychology_BS/Computer_Science_and_Cognitive_Psychology_BS-2022.json rename to packages/api/src/major/majors/Computer_Science_and_Cognitive_Psychology_BS/Computer_Science_and_Cognitive_Psychology_BS-2022.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Communication_Studies_BS/Computer_Science_and_Communication_Studies_BS-2021.json b/packages/api/src/major/majors/Computer_Science_and_Communication_Studies_BS/Computer_Science_and_Communication_Studies_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_and_Communication_Studies_BS/Computer_Science_and_Communication_Studies_BS-2021.json rename to packages/api/src/major/majors/Computer_Science_and_Communication_Studies_BS/Computer_Science_and_Communication_Studies_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Communication_Studies_BS/Computer_Science_and_Communication_Studies_BS-2022.json b/packages/api/src/major/majors/Computer_Science_and_Communication_Studies_BS/Computer_Science_and_Communication_Studies_BS-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_and_Communication_Studies_BS/Computer_Science_and_Communication_Studies_BS-2022.json rename to packages/api/src/major/majors/Computer_Science_and_Communication_Studies_BS/Computer_Science_and_Communication_Studies_BS-2022.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Criminal_Justice_BS/Computer_Science_and_Criminal_Justice_BS-2021.json b/packages/api/src/major/majors/Computer_Science_and_Criminal_Justice_BS/Computer_Science_and_Criminal_Justice_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_and_Criminal_Justice_BS/Computer_Science_and_Criminal_Justice_BS-2021.json rename to packages/api/src/major/majors/Computer_Science_and_Criminal_Justice_BS/Computer_Science_and_Criminal_Justice_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Criminal_Justice_BS/Computer_Science_and_Criminal_Justice_BS-2022.json b/packages/api/src/major/majors/Computer_Science_and_Criminal_Justice_BS/Computer_Science_and_Criminal_Justice_BS-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_and_Criminal_Justice_BS/Computer_Science_and_Criminal_Justice_BS-2022.json rename to packages/api/src/major/majors/Computer_Science_and_Criminal_Justice_BS/Computer_Science_and_Criminal_Justice_BS-2022.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Design_BS/Computer_Science_and_Design_BS-2021.json b/packages/api/src/major/majors/Computer_Science_and_Design_BS/Computer_Science_and_Design_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_and_Design_BS/Computer_Science_and_Design_BS-2021.json rename to packages/api/src/major/majors/Computer_Science_and_Design_BS/Computer_Science_and_Design_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Design_BS/Computer_Science_and_Design_BS-2022.json b/packages/api/src/major/majors/Computer_Science_and_Design_BS/Computer_Science_and_Design_BS-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_and_Design_BS/Computer_Science_and_Design_BS-2022.json rename to packages/api/src/major/majors/Computer_Science_and_Design_BS/Computer_Science_and_Design_BS-2022.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Economics_BS/Computer_Science_and_Economics_BS-2021.json b/packages/api/src/major/majors/Computer_Science_and_Economics_BS/Computer_Science_and_Economics_BS-2021.json similarity index 98% rename from packages/api-v2/src/major/majors/Computer_Science_and_Economics_BS/Computer_Science_and_Economics_BS-2021.json rename to packages/api/src/major/majors/Computer_Science_and_Economics_BS/Computer_Science_and_Economics_BS-2021.json index 7eb2f625a..9eebc7375 100644 --- a/packages/api-v2/src/major/majors/Computer_Science_and_Economics_BS/Computer_Science_and_Economics_BS-2021.json +++ b/packages/api/src/major/majors/Computer_Science_and_Economics_BS/Computer_Science_and_Economics_BS-2021.json @@ -264,7 +264,9 @@ { "type": "SECTION", "title": "Economics Electives", - "warnings": ["No more than 2 of the four required courses can be in the ECON 1200-1999 range"], + "warnings": [ + "No more than 2 of the four required courses can be in the ECON 1200-1999 range" + ], "requirements": [ { "type": "RANGE", @@ -482,6 +484,6 @@ ], "concentrations": { "minOptions": 0, - "concentrationOptions": [] + "concentrationOptions": [] } } diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Economics_BS/Computer_Science_and_Economics_BS-2022.json b/packages/api/src/major/majors/Computer_Science_and_Economics_BS/Computer_Science_and_Economics_BS-2022.json similarity index 98% rename from packages/api-v2/src/major/majors/Computer_Science_and_Economics_BS/Computer_Science_and_Economics_BS-2022.json rename to packages/api/src/major/majors/Computer_Science_and_Economics_BS/Computer_Science_and_Economics_BS-2022.json index e0148ceba..8435cbb54 100644 --- a/packages/api-v2/src/major/majors/Computer_Science_and_Economics_BS/Computer_Science_and_Economics_BS-2022.json +++ b/packages/api/src/major/majors/Computer_Science_and_Economics_BS/Computer_Science_and_Economics_BS-2022.json @@ -262,7 +262,9 @@ { "type": "SECTION", "title": "Economics Electives", - "warnings": ["No more than 2 of the four required courses can be in the ECON 1200-1999 range"], + "warnings": [ + "No more than 2 of the four required courses can be in the ECON 1200-1999 range" + ], "requirements": [ { "type": "RANGE", @@ -480,6 +482,6 @@ ], "concentrations": { "minOptions": 0, - "concentrationOptions": [] + "concentrationOptions": [] } } diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_English_BS/Computer_Science_and_English_BS-2021.json b/packages/api/src/major/majors/Computer_Science_and_English_BS/Computer_Science_and_English_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_and_English_BS/Computer_Science_and_English_BS-2021.json rename to packages/api/src/major/majors/Computer_Science_and_English_BS/Computer_Science_and_English_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_English_BS/Computer_Science_and_English_BS-2022.json b/packages/api/src/major/majors/Computer_Science_and_English_BS/Computer_Science_and_English_BS-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_and_English_BS/Computer_Science_and_English_BS-2022.json rename to packages/api/src/major/majors/Computer_Science_and_English_BS/Computer_Science_and_English_BS-2022.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Game_Development_BS/Computer_Science_and_Game_Development_BS-2021.json b/packages/api/src/major/majors/Computer_Science_and_Game_Development_BS/Computer_Science_and_Game_Development_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_and_Game_Development_BS/Computer_Science_and_Game_Development_BS-2021.json rename to packages/api/src/major/majors/Computer_Science_and_Game_Development_BS/Computer_Science_and_Game_Development_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Game_Development_BS/Computer_Science_and_Game_Development_BS-2022.json b/packages/api/src/major/majors/Computer_Science_and_Game_Development_BS/Computer_Science_and_Game_Development_BS-2022.json similarity index 89% rename from packages/api-v2/src/major/majors/Computer_Science_and_Game_Development_BS/Computer_Science_and_Game_Development_BS-2022.json rename to packages/api/src/major/majors/Computer_Science_and_Game_Development_BS/Computer_Science_and_Game_Development_BS-2022.json index 84b898b11..3a6467e10 100644 --- a/packages/api-v2/src/major/majors/Computer_Science_and_Game_Development_BS/Computer_Science_and_Game_Development_BS-2022.json +++ b/packages/api/src/major/majors/Computer_Science_and_Game_Development_BS/Computer_Science_and_Game_Development_BS-2022.json @@ -271,48 +271,48 @@ "type": "XOM", "numCreditsMin": 12, "courses": [ - { - "type": "RANGE", - "subject": "ARTD", - "idRangeStart": 0, - "idRangeEnd": 9999, - "exceptions": [] - }, - { - "type": "RANGE", - "subject": "ARTE", - "idRangeStart": 0, - "idRangeEnd": 9999, - "exceptions": [] - }, - { - "type": "RANGE", - "subject": "ARTF", - "idRangeStart": 0, - "idRangeEnd": 9999, - "exceptions": [] - }, - { - "type": "RANGE", - "subject": "ARTG", - "idRangeStart": 0, - "idRangeEnd": 9999, - "exceptions": [] - }, - { - "type": "RANGE", - "subject": "ARTH", - "idRangeStart": 0, - "idRangeEnd": 9999, - "exceptions": [] - }, - { - "type": "RANGE", - "subject": "GAME", - "idRangeStart": 0, - "idRangeEnd": 9999, - "exceptions": [] - }, + { + "type": "RANGE", + "subject": "ARTD", + "idRangeStart": 0, + "idRangeEnd": 9999, + "exceptions": [] + }, + { + "type": "RANGE", + "subject": "ARTE", + "idRangeStart": 0, + "idRangeEnd": 9999, + "exceptions": [] + }, + { + "type": "RANGE", + "subject": "ARTF", + "idRangeStart": 0, + "idRangeEnd": 9999, + "exceptions": [] + }, + { + "type": "RANGE", + "subject": "ARTG", + "idRangeStart": 0, + "idRangeEnd": 9999, + "exceptions": [] + }, + { + "type": "RANGE", + "subject": "ARTH", + "idRangeStart": 0, + "idRangeEnd": 9999, + "exceptions": [] + }, + { + "type": "RANGE", + "subject": "GAME", + "idRangeStart": 0, + "idRangeEnd": 9999, + "exceptions": [] + }, { "type": "RANGE", "subject": "CS", @@ -481,4 +481,4 @@ "minOptions": 0, "concentrationOptions": [] } -} \ No newline at end of file +} diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_History_BS/Computer_Science_and_History_BS-2021.json b/packages/api/src/major/majors/Computer_Science_and_History_BS/Computer_Science_and_History_BS-2021.json similarity index 98% rename from packages/api-v2/src/major/majors/Computer_Science_and_History_BS/Computer_Science_and_History_BS-2021.json rename to packages/api/src/major/majors/Computer_Science_and_History_BS/Computer_Science_and_History_BS-2021.json index 746763239..3531e70a9 100644 --- a/packages/api-v2/src/major/majors/Computer_Science_and_History_BS/Computer_Science_and_History_BS-2021.json +++ b/packages/api/src/major/majors/Computer_Science_and_History_BS/Computer_Science_and_History_BS-2021.json @@ -315,7 +315,9 @@ { "type": "SECTION", "title": "History Capstone Seminar or Senior Project", - "warnings": ["Only Public History concentrators may also select the second course."], + "warnings": [ + "Only Public History concentrators may also select the second course." + ], "requirements": [ { "type": "COURSE", @@ -474,4 +476,4 @@ "minOptions": 0, "concentrationOptions": [] } -} \ No newline at end of file +} diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_History_BS/Computer_Science_and_History_BS-2022.json b/packages/api/src/major/majors/Computer_Science_and_History_BS/Computer_Science_and_History_BS-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_and_History_BS/Computer_Science_and_History_BS-2022.json rename to packages/api/src/major/majors/Computer_Science_and_History_BS/Computer_Science_and_History_BS-2022.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Journalism_BS/Computer_Science_and_Journalism_BS-2021.json b/packages/api/src/major/majors/Computer_Science_and_Journalism_BS/Computer_Science_and_Journalism_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_and_Journalism_BS/Computer_Science_and_Journalism_BS-2021.json rename to packages/api/src/major/majors/Computer_Science_and_Journalism_BS/Computer_Science_and_Journalism_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Journalism_BS/Computer_Science_and_Journalism_BS-2022.json b/packages/api/src/major/majors/Computer_Science_and_Journalism_BS/Computer_Science_and_Journalism_BS-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_and_Journalism_BS/Computer_Science_and_Journalism_BS-2022.json rename to packages/api/src/major/majors/Computer_Science_and_Journalism_BS/Computer_Science_and_Journalism_BS-2022.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Linguistics_BS/Computer_Science_and_Linguistics_BS-2021.json b/packages/api/src/major/majors/Computer_Science_and_Linguistics_BS/Computer_Science_and_Linguistics_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_and_Linguistics_BS/Computer_Science_and_Linguistics_BS-2021.json rename to packages/api/src/major/majors/Computer_Science_and_Linguistics_BS/Computer_Science_and_Linguistics_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Linguistics_BS/Computer_Science_and_Linguistics_BS-2022.json b/packages/api/src/major/majors/Computer_Science_and_Linguistics_BS/Computer_Science_and_Linguistics_BS-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_and_Linguistics_BS/Computer_Science_and_Linguistics_BS-2022.json rename to packages/api/src/major/majors/Computer_Science_and_Linguistics_BS/Computer_Science_and_Linguistics_BS-2022.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Mathematics_BS/Computer_Science_and_Mathematics_BS-2021.json b/packages/api/src/major/majors/Computer_Science_and_Mathematics_BS/Computer_Science_and_Mathematics_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_and_Mathematics_BS/Computer_Science_and_Mathematics_BS-2021.json rename to packages/api/src/major/majors/Computer_Science_and_Mathematics_BS/Computer_Science_and_Mathematics_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Mathematics_BS/Computer_Science_and_Mathematics_BS-2022.json b/packages/api/src/major/majors/Computer_Science_and_Mathematics_BS/Computer_Science_and_Mathematics_BS-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_and_Mathematics_BS/Computer_Science_and_Mathematics_BS-2022.json rename to packages/api/src/major/majors/Computer_Science_and_Mathematics_BS/Computer_Science_and_Mathematics_BS-2022.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Media_Arts_BS/Computer_Science_and_Media_Arts_BS-2021.json b/packages/api/src/major/majors/Computer_Science_and_Media_Arts_BS/Computer_Science_and_Media_Arts_BS-2021.json similarity index 98% rename from packages/api-v2/src/major/majors/Computer_Science_and_Media_Arts_BS/Computer_Science_and_Media_Arts_BS-2021.json rename to packages/api/src/major/majors/Computer_Science_and_Media_Arts_BS/Computer_Science_and_Media_Arts_BS-2021.json index f6cb9ae87..e780bea39 100644 --- a/packages/api-v2/src/major/majors/Computer_Science_and_Media_Arts_BS/Computer_Science_and_Media_Arts_BS-2021.json +++ b/packages/api/src/major/majors/Computer_Science_and_Media_Arts_BS/Computer_Science_and_Media_Arts_BS-2021.json @@ -308,7 +308,9 @@ { "type": "SECTION", "title": "Media Arts Electives", - "warnings": ["At least two of the following courses must be a 3000-level course."], + "warnings": [ + "At least two of the following courses must be a 3000-level course." + ], "requirements": [ { "type": "AND", @@ -435,7 +437,7 @@ "requirements": [ { "type": "OR", - "courses":[ + "courses": [ { "type": "COURSE", "classId": 2600, @@ -528,4 +530,4 @@ "minOptions": 0, "concentrationOptions": [] } -} \ No newline at end of file +} diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Media_Arts_BS/Computer_Science_and_Media_Arts_BS-2022.json b/packages/api/src/major/majors/Computer_Science_and_Media_Arts_BS/Computer_Science_and_Media_Arts_BS-2022.json similarity index 99% rename from packages/api-v2/src/major/majors/Computer_Science_and_Media_Arts_BS/Computer_Science_and_Media_Arts_BS-2022.json rename to packages/api/src/major/majors/Computer_Science_and_Media_Arts_BS/Computer_Science_and_Media_Arts_BS-2022.json index 683d57434..6247598f8 100644 --- a/packages/api-v2/src/major/majors/Computer_Science_and_Media_Arts_BS/Computer_Science_and_Media_Arts_BS-2022.json +++ b/packages/api/src/major/majors/Computer_Science_and_Media_Arts_BS/Computer_Science_and_Media_Arts_BS-2022.json @@ -333,7 +333,9 @@ { "type": "SECTION", "title": "Media Arts Electives", - "warnings": ["At least two of the following must be a 3000-level course."], + "warnings": [ + "At least two of the following must be a 3000-level course." + ], "requirements": [ { "type": "AND", @@ -460,7 +462,7 @@ "requirements": [ { "type": "OR", - "courses":[ + "courses": [ { "type": "COURSE", "classId": 2600, @@ -553,4 +555,4 @@ "minOptions": 0, "concentrationOptions": [] } -} \ No newline at end of file +} diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Music_with_Concentration_in_Music_Technology_BS/Computer_Science_and_Music_with_Concentration_in_Music_Technology_BS-2021.json b/packages/api/src/major/majors/Computer_Science_and_Music_with_Concentration_in_Music_Technology_BS/Computer_Science_and_Music_with_Concentration_in_Music_Technology_BS-2021.json similarity index 99% rename from packages/api-v2/src/major/majors/Computer_Science_and_Music_with_Concentration_in_Music_Technology_BS/Computer_Science_and_Music_with_Concentration_in_Music_Technology_BS-2021.json rename to packages/api/src/major/majors/Computer_Science_and_Music_with_Concentration_in_Music_Technology_BS/Computer_Science_and_Music_with_Concentration_in_Music_Technology_BS-2021.json index 2e38ea73e..61d1b6f9d 100644 --- a/packages/api-v2/src/major/majors/Computer_Science_and_Music_with_Concentration_in_Music_Technology_BS/Computer_Science_and_Music_with_Concentration_in_Music_Technology_BS-2021.json +++ b/packages/api/src/major/majors/Computer_Science_and_Music_with_Concentration_in_Music_Technology_BS/Computer_Science_and_Music_with_Concentration_in_Music_Technology_BS-2021.json @@ -546,4 +546,4 @@ "minOptions": 0, "concentrationOptions": [] } -} \ No newline at end of file +} diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Music_with_Concentration_in_Music_Technology_BS/Computer_Science_and_Music_with_Concentration_in_Music_Technology_BS-2022.json b/packages/api/src/major/majors/Computer_Science_and_Music_with_Concentration_in_Music_Technology_BS/Computer_Science_and_Music_with_Concentration_in_Music_Technology_BS-2022.json similarity index 99% rename from packages/api-v2/src/major/majors/Computer_Science_and_Music_with_Concentration_in_Music_Technology_BS/Computer_Science_and_Music_with_Concentration_in_Music_Technology_BS-2022.json rename to packages/api/src/major/majors/Computer_Science_and_Music_with_Concentration_in_Music_Technology_BS/Computer_Science_and_Music_with_Concentration_in_Music_Technology_BS-2022.json index b7ce23244..78d9d8b40 100644 --- a/packages/api-v2/src/major/majors/Computer_Science_and_Music_with_Concentration_in_Music_Technology_BS/Computer_Science_and_Music_with_Concentration_in_Music_Technology_BS-2022.json +++ b/packages/api/src/major/majors/Computer_Science_and_Music_with_Concentration_in_Music_Technology_BS/Computer_Science_and_Music_with_Concentration_in_Music_Technology_BS-2022.json @@ -588,4 +588,4 @@ "minOptions": 0, "concentrationOptions": [] } -} \ No newline at end of file +} diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Philosophy_BS/Computer_Science_and_Philosophy_BS-2021.json b/packages/api/src/major/majors/Computer_Science_and_Philosophy_BS/Computer_Science_and_Philosophy_BS-2021.json similarity index 98% rename from packages/api-v2/src/major/majors/Computer_Science_and_Philosophy_BS/Computer_Science_and_Philosophy_BS-2021.json rename to packages/api/src/major/majors/Computer_Science_and_Philosophy_BS/Computer_Science_and_Philosophy_BS-2021.json index f2c723d3d..1e8945c40 100644 --- a/packages/api-v2/src/major/majors/Computer_Science_and_Philosophy_BS/Computer_Science_and_Philosophy_BS-2021.json +++ b/packages/api/src/major/majors/Computer_Science_and_Philosophy_BS/Computer_Science_and_Philosophy_BS-2021.json @@ -290,7 +290,9 @@ { "type": "SECTION", "title": "Integrative Course Requirement", - "warnings": ["These courses will double count in other areas of your major."], + "warnings": [ + "These courses will double count in other areas of your major." + ], "requirements": [ { "type": "COURSE", @@ -360,4 +362,4 @@ "minOptions": 0, "concentrationOptions": [] } -} \ No newline at end of file +} diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Philosophy_BS/Computer_Science_and_Philosophy_BS-2022.json b/packages/api/src/major/majors/Computer_Science_and_Philosophy_BS/Computer_Science_and_Philosophy_BS-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_and_Philosophy_BS/Computer_Science_and_Philosophy_BS-2022.json rename to packages/api/src/major/majors/Computer_Science_and_Philosophy_BS/Computer_Science_and_Philosophy_BS-2022.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Physics_BS/Computer_Science_and_Physics_BS-2021.json b/packages/api/src/major/majors/Computer_Science_and_Physics_BS/Computer_Science_and_Physics_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_and_Physics_BS/Computer_Science_and_Physics_BS-2021.json rename to packages/api/src/major/majors/Computer_Science_and_Physics_BS/Computer_Science_and_Physics_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Physics_BS/Computer_Science_and_Physics_BS-2022.json b/packages/api/src/major/majors/Computer_Science_and_Physics_BS/Computer_Science_and_Physics_BS-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Computer_Science_and_Physics_BS/Computer_Science_and_Physics_BS-2022.json rename to packages/api/src/major/majors/Computer_Science_and_Physics_BS/Computer_Science_and_Physics_BS-2022.json diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Sociology_BS/Computer_Science_and_Sociology_BS-2021.json b/packages/api/src/major/majors/Computer_Science_and_Sociology_BS/Computer_Science_and_Sociology_BS-2021.json similarity index 93% rename from packages/api-v2/src/major/majors/Computer_Science_and_Sociology_BS/Computer_Science_and_Sociology_BS-2021.json rename to packages/api/src/major/majors/Computer_Science_and_Sociology_BS/Computer_Science_and_Sociology_BS-2021.json index d842eece1..ae8156d3f 100644 --- a/packages/api-v2/src/major/majors/Computer_Science_and_Sociology_BS/Computer_Science_and_Sociology_BS-2021.json +++ b/packages/api/src/major/majors/Computer_Science_and_Sociology_BS/Computer_Science_and_Sociology_BS-2021.json @@ -260,27 +260,27 @@ "type": "SECTION", "title": "Sociology Electives", "requirements": [ - { - "type": "RANGE", - "subject": "SOCL", - "idRangeStart": 1000, - "idRangeEnd": 1999, - "exceptions": [] - }, - { - "type": "RANGE", - "subject": "SOCL", - "idRangeStart": 2000, - "idRangeEnd": 3999, - "exceptions": [] - }, - { - "type": "RANGE", - "subject": "SOCL", - "idRangeStart": 4000, - "idRangeEnd": 4999, - "exceptions": [] - } + { + "type": "RANGE", + "subject": "SOCL", + "idRangeStart": 1000, + "idRangeEnd": 1999, + "exceptions": [] + }, + { + "type": "RANGE", + "subject": "SOCL", + "idRangeStart": 2000, + "idRangeEnd": 3999, + "exceptions": [] + }, + { + "type": "RANGE", + "subject": "SOCL", + "idRangeStart": 4000, + "idRangeEnd": 4999, + "exceptions": [] + } ], "minRequirementCount": 3 }, @@ -377,4 +377,4 @@ "minOptions": 0, "concentrationOptions": [] } -} \ No newline at end of file +} diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Sociology_BS/Computer_Science_and_Sociology_BS-2022.json b/packages/api/src/major/majors/Computer_Science_and_Sociology_BS/Computer_Science_and_Sociology_BS-2022.json similarity index 93% rename from packages/api-v2/src/major/majors/Computer_Science_and_Sociology_BS/Computer_Science_and_Sociology_BS-2022.json rename to packages/api/src/major/majors/Computer_Science_and_Sociology_BS/Computer_Science_and_Sociology_BS-2022.json index 4ea37a58b..3a7e1be7b 100644 --- a/packages/api-v2/src/major/majors/Computer_Science_and_Sociology_BS/Computer_Science_and_Sociology_BS-2022.json +++ b/packages/api/src/major/majors/Computer_Science_and_Sociology_BS/Computer_Science_and_Sociology_BS-2022.json @@ -260,27 +260,27 @@ "type": "SECTION", "title": "Sociology Electives", "requirements": [ - { - "type": "RANGE", - "subject": "SOCL", - "idRangeStart": 1000, - "idRangeEnd": 1999, - "exceptions": [] - }, - { - "type": "RANGE", - "subject": "SOCL", - "idRangeStart": 2000, - "idRangeEnd": 3999, - "exceptions": [] - }, - { - "type": "RANGE", - "subject": "SOCL", - "idRangeStart": 4000, - "idRangeEnd": 4999, - "exceptions": [] - } + { + "type": "RANGE", + "subject": "SOCL", + "idRangeStart": 1000, + "idRangeEnd": 1999, + "exceptions": [] + }, + { + "type": "RANGE", + "subject": "SOCL", + "idRangeStart": 2000, + "idRangeEnd": 3999, + "exceptions": [] + }, + { + "type": "RANGE", + "subject": "SOCL", + "idRangeStart": 4000, + "idRangeEnd": 4999, + "exceptions": [] + } ], "minRequirementCount": 3 }, @@ -377,4 +377,4 @@ "minOptions": 0, "concentrationOptions": [] } -} \ No newline at end of file +} diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Theatre_BS/Computer_Science_and_Theatre_BS-2021.json b/packages/api/src/major/majors/Computer_Science_and_Theatre_BS/Computer_Science_and_Theatre_BS-2021.json similarity index 99% rename from packages/api-v2/src/major/majors/Computer_Science_and_Theatre_BS/Computer_Science_and_Theatre_BS-2021.json rename to packages/api/src/major/majors/Computer_Science_and_Theatre_BS/Computer_Science_and_Theatre_BS-2021.json index fc7b59fd0..59ebcbff8 100644 --- a/packages/api-v2/src/major/majors/Computer_Science_and_Theatre_BS/Computer_Science_and_Theatre_BS-2021.json +++ b/packages/api/src/major/majors/Computer_Science_and_Theatre_BS/Computer_Science_and_Theatre_BS-2021.json @@ -527,4 +527,4 @@ "minOptions": 0, "concentrationOptions": [] } -} \ No newline at end of file +} diff --git a/packages/api-v2/src/major/majors/Computer_Science_and_Theatre_BS/Computer_Science_and_Theatre_BS-2022.json b/packages/api/src/major/majors/Computer_Science_and_Theatre_BS/Computer_Science_and_Theatre_BS-2022.json similarity index 99% rename from packages/api-v2/src/major/majors/Computer_Science_and_Theatre_BS/Computer_Science_and_Theatre_BS-2022.json rename to packages/api/src/major/majors/Computer_Science_and_Theatre_BS/Computer_Science_and_Theatre_BS-2022.json index 733043eff..7a2279a09 100644 --- a/packages/api-v2/src/major/majors/Computer_Science_and_Theatre_BS/Computer_Science_and_Theatre_BS-2022.json +++ b/packages/api/src/major/majors/Computer_Science_and_Theatre_BS/Computer_Science_and_Theatre_BS-2022.json @@ -552,4 +552,4 @@ "minOptions": 0, "concentrationOptions": [] } -} \ No newline at end of file +} diff --git a/packages/api-v2/src/major/majors/Cybersecurity_BS/Cybersecurity_BS-2021.json b/packages/api/src/major/majors/Cybersecurity_BS/Cybersecurity_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Cybersecurity_BS/Cybersecurity_BS-2021.json rename to packages/api/src/major/majors/Cybersecurity_BS/Cybersecurity_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Cybersecurity_BS/Cybersecurity_BS-2022.json b/packages/api/src/major/majors/Cybersecurity_BS/Cybersecurity_BS-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Cybersecurity_BS/Cybersecurity_BS-2022.json rename to packages/api/src/major/majors/Cybersecurity_BS/Cybersecurity_BS-2022.json diff --git a/packages/api-v2/src/major/majors/Cybersecurity_and_Business_Administration_BS/Cybersecurity_and_Business_Administration_BS-2021.json b/packages/api/src/major/majors/Cybersecurity_and_Business_Administration_BS/Cybersecurity_and_Business_Administration_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Cybersecurity_and_Business_Administration_BS/Cybersecurity_and_Business_Administration_BS-2021.json rename to packages/api/src/major/majors/Cybersecurity_and_Business_Administration_BS/Cybersecurity_and_Business_Administration_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Cybersecurity_and_Business_Administration_BS/Cybersecurity_and_Business_Administration_BS-2022.json b/packages/api/src/major/majors/Cybersecurity_and_Business_Administration_BS/Cybersecurity_and_Business_Administration_BS-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Cybersecurity_and_Business_Administration_BS/Cybersecurity_and_Business_Administration_BS-2022.json rename to packages/api/src/major/majors/Cybersecurity_and_Business_Administration_BS/Cybersecurity_and_Business_Administration_BS-2022.json diff --git a/packages/api-v2/src/major/majors/Cybersecurity_and_Criminal_Justice_BS/Cybersecurity_and_Criminal_Justice_BS-2021.json b/packages/api/src/major/majors/Cybersecurity_and_Criminal_Justice_BS/Cybersecurity_and_Criminal_Justice_BS-2021.json similarity index 99% rename from packages/api-v2/src/major/majors/Cybersecurity_and_Criminal_Justice_BS/Cybersecurity_and_Criminal_Justice_BS-2021.json rename to packages/api/src/major/majors/Cybersecurity_and_Criminal_Justice_BS/Cybersecurity_and_Criminal_Justice_BS-2021.json index b97ce286b..c2d0e5ba2 100644 --- a/packages/api-v2/src/major/majors/Cybersecurity_and_Criminal_Justice_BS/Cybersecurity_and_Criminal_Justice_BS-2021.json +++ b/packages/api/src/major/majors/Cybersecurity_and_Criminal_Justice_BS/Cybersecurity_and_Criminal_Justice_BS-2021.json @@ -575,7 +575,7 @@ "classId": 3000, "subject": "CRIM" }, - { + { "type": "COURSE", "classId": 4000, "subject": "CRIM" @@ -647,4 +647,4 @@ "minOptions": 0, "concentrationOptions": [] } -} \ No newline at end of file +} diff --git a/packages/api-v2/src/major/majors/Cybersecurity_and_Criminal_Justice_BS/Cybersecurity_and_Criminal_Justice_BS-2022.json b/packages/api/src/major/majors/Cybersecurity_and_Criminal_Justice_BS/Cybersecurity_and_Criminal_Justice_BS-2022.json similarity index 99% rename from packages/api-v2/src/major/majors/Cybersecurity_and_Criminal_Justice_BS/Cybersecurity_and_Criminal_Justice_BS-2022.json rename to packages/api/src/major/majors/Cybersecurity_and_Criminal_Justice_BS/Cybersecurity_and_Criminal_Justice_BS-2022.json index 52a7ef437..a32e39b42 100644 --- a/packages/api-v2/src/major/majors/Cybersecurity_and_Criminal_Justice_BS/Cybersecurity_and_Criminal_Justice_BS-2022.json +++ b/packages/api/src/major/majors/Cybersecurity_and_Criminal_Justice_BS/Cybersecurity_and_Criminal_Justice_BS-2022.json @@ -657,4 +657,4 @@ "minOptions": 0, "concentrationOptions": [] } -} \ No newline at end of file +} diff --git a/packages/api-v2/src/major/majors/Cybersecurity_and_Economics_BS/Cybersecurity_and_Economics_BS-2021.json b/packages/api/src/major/majors/Cybersecurity_and_Economics_BS/Cybersecurity_and_Economics_BS-2021.json similarity index 99% rename from packages/api-v2/src/major/majors/Cybersecurity_and_Economics_BS/Cybersecurity_and_Economics_BS-2021.json rename to packages/api/src/major/majors/Cybersecurity_and_Economics_BS/Cybersecurity_and_Economics_BS-2021.json index ea6b67e56..3e2fe3890 100644 --- a/packages/api-v2/src/major/majors/Cybersecurity_and_Economics_BS/Cybersecurity_and_Economics_BS-2021.json +++ b/packages/api/src/major/majors/Cybersecurity_and_Economics_BS/Cybersecurity_and_Economics_BS-2021.json @@ -481,7 +481,9 @@ { "type": "SECTION", "title": "Electives", - "warnings": ["At least two of the following must be numbered ECON 3000 or above."], + "warnings": [ + "At least two of the following must be numbered ECON 3000 or above." + ], "requirements": [ { "type": "XOM", diff --git a/packages/api-v2/src/major/majors/Cybersecurity_and_Economics_BS/Cybersecurity_and_Economics_BS-2022.json b/packages/api/src/major/majors/Cybersecurity_and_Economics_BS/Cybersecurity_and_Economics_BS-2022.json similarity index 99% rename from packages/api-v2/src/major/majors/Cybersecurity_and_Economics_BS/Cybersecurity_and_Economics_BS-2022.json rename to packages/api/src/major/majors/Cybersecurity_and_Economics_BS/Cybersecurity_and_Economics_BS-2022.json index c106f3fb9..7951564e1 100644 --- a/packages/api-v2/src/major/majors/Cybersecurity_and_Economics_BS/Cybersecurity_and_Economics_BS-2022.json +++ b/packages/api/src/major/majors/Cybersecurity_and_Economics_BS/Cybersecurity_and_Economics_BS-2022.json @@ -491,9 +491,7 @@ { "type": "SECTION", "title": "Electives", - "warnings": [ - "At most two of the following may be at the 1000 level." - ], + "warnings": ["At most two of the following may be at the 1000 level."], "requirements": [ { "type": "XOM", diff --git a/packages/api-v2/src/major/majors/Data_Science_BS/Data_Science_BS-2021.json b/packages/api/src/major/majors/Data_Science_BS/Data_Science_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Data_Science_BS/Data_Science_BS-2021.json rename to packages/api/src/major/majors/Data_Science_BS/Data_Science_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Data_Science_BS/Data_Science_BS-2022.json b/packages/api/src/major/majors/Data_Science_BS/Data_Science_BS-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Data_Science_BS/Data_Science_BS-2022.json rename to packages/api/src/major/majors/Data_Science_BS/Data_Science_BS-2022.json diff --git a/packages/api-v2/src/major/majors/Data_Science_and_Behavioral_Neuroscience_BS/Data_Science_and_Behavioral_Neuroscience_BS-2021.json b/packages/api/src/major/majors/Data_Science_and_Behavioral_Neuroscience_BS/Data_Science_and_Behavioral_Neuroscience_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Data_Science_and_Behavioral_Neuroscience_BS/Data_Science_and_Behavioral_Neuroscience_BS-2021.json rename to packages/api/src/major/majors/Data_Science_and_Behavioral_Neuroscience_BS/Data_Science_and_Behavioral_Neuroscience_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Data_Science_and_Behavioral_Neuroscience_BS/Data_Science_and_Behavioral_Neuroscience_BS-2022.json b/packages/api/src/major/majors/Data_Science_and_Behavioral_Neuroscience_BS/Data_Science_and_Behavioral_Neuroscience_BS-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Data_Science_and_Behavioral_Neuroscience_BS/Data_Science_and_Behavioral_Neuroscience_BS-2022.json rename to packages/api/src/major/majors/Data_Science_and_Behavioral_Neuroscience_BS/Data_Science_and_Behavioral_Neuroscience_BS-2022.json diff --git a/packages/api-v2/src/major/majors/Data_Science_and_Biology_BS/Data_Science_and_Biology_BS-2021.json b/packages/api/src/major/majors/Data_Science_and_Biology_BS/Data_Science_and_Biology_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Data_Science_and_Biology_BS/Data_Science_and_Biology_BS-2021.json rename to packages/api/src/major/majors/Data_Science_and_Biology_BS/Data_Science_and_Biology_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Data_Science_and_Biology_BS/Data_Science_and_Biology_BS-2022.json b/packages/api/src/major/majors/Data_Science_and_Biology_BS/Data_Science_and_Biology_BS-2022.json similarity index 99% rename from packages/api-v2/src/major/majors/Data_Science_and_Biology_BS/Data_Science_and_Biology_BS-2022.json rename to packages/api/src/major/majors/Data_Science_and_Biology_BS/Data_Science_and_Biology_BS-2022.json index aadd99a52..98849991c 100644 --- a/packages/api-v2/src/major/majors/Data_Science_and_Biology_BS/Data_Science_and_Biology_BS-2022.json +++ b/packages/api/src/major/majors/Data_Science_and_Biology_BS/Data_Science_and_Biology_BS-2022.json @@ -749,4 +749,4 @@ "minOptions": 0, "concentrationOptions": [] } -} \ No newline at end of file +} diff --git a/packages/api-v2/src/major/majors/Data_Science_and_Business_Administration_BS/Data_Science_and_Business_Administration_BS-2021.json b/packages/api/src/major/majors/Data_Science_and_Business_Administration_BS/Data_Science_and_Business_Administration_BS-2021.json similarity index 99% rename from packages/api-v2/src/major/majors/Data_Science_and_Business_Administration_BS/Data_Science_and_Business_Administration_BS-2021.json rename to packages/api/src/major/majors/Data_Science_and_Business_Administration_BS/Data_Science_and_Business_Administration_BS-2021.json index d1a4e9031..db53a82a3 100644 --- a/packages/api-v2/src/major/majors/Data_Science_and_Business_Administration_BS/Data_Science_and_Business_Administration_BS-2021.json +++ b/packages/api/src/major/majors/Data_Science_and_Business_Administration_BS/Data_Science_and_Business_Administration_BS-2021.json @@ -1709,4 +1709,4 @@ } ] } -} \ No newline at end of file +} diff --git a/packages/api-v2/src/major/majors/Data_Science_and_Business_Administration_BS/Data_Science_and_Business_Administration_BS-2022.json b/packages/api/src/major/majors/Data_Science_and_Business_Administration_BS/Data_Science_and_Business_Administration_BS-2022.json similarity index 99% rename from packages/api-v2/src/major/majors/Data_Science_and_Business_Administration_BS/Data_Science_and_Business_Administration_BS-2022.json rename to packages/api/src/major/majors/Data_Science_and_Business_Administration_BS/Data_Science_and_Business_Administration_BS-2022.json index 8c1f3398a..9ae745dcf 100644 --- a/packages/api-v2/src/major/majors/Data_Science_and_Business_Administration_BS/Data_Science_and_Business_Administration_BS-2022.json +++ b/packages/api/src/major/majors/Data_Science_and_Business_Administration_BS/Data_Science_and_Business_Administration_BS-2022.json @@ -1791,4 +1791,4 @@ } ] } -} \ No newline at end of file +} diff --git a/packages/api-v2/src/major/majors/Data_Science_and_Chemistry_BS/Data_Science_and_Chemistry_BS-2021.json b/packages/api/src/major/majors/Data_Science_and_Chemistry_BS/Data_Science_and_Chemistry_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Data_Science_and_Chemistry_BS/Data_Science_and_Chemistry_BS-2021.json rename to packages/api/src/major/majors/Data_Science_and_Chemistry_BS/Data_Science_and_Chemistry_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Data_Science_and_Chemistry_BS/Data_Science_and_Chemistry_BS-2022.json b/packages/api/src/major/majors/Data_Science_and_Chemistry_BS/Data_Science_and_Chemistry_BS-2022.json similarity index 99% rename from packages/api-v2/src/major/majors/Data_Science_and_Chemistry_BS/Data_Science_and_Chemistry_BS-2022.json rename to packages/api/src/major/majors/Data_Science_and_Chemistry_BS/Data_Science_and_Chemistry_BS-2022.json index 3f70bc768..9c3714fba 100644 --- a/packages/api-v2/src/major/majors/Data_Science_and_Chemistry_BS/Data_Science_and_Chemistry_BS-2022.json +++ b/packages/api/src/major/majors/Data_Science_and_Chemistry_BS/Data_Science_and_Chemistry_BS-2022.json @@ -602,4 +602,4 @@ "minOptions": 0, "concentrationOptions": [] } -} \ No newline at end of file +} diff --git a/packages/api-v2/src/major/majors/Data_Science_and_Ecology_and_Evolutionary_Biology_BS/Data_Science_and_Ecology_and_Evolutionary_Biology_BS-2021.json b/packages/api/src/major/majors/Data_Science_and_Ecology_and_Evolutionary_Biology_BS/Data_Science_and_Ecology_and_Evolutionary_Biology_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Data_Science_and_Ecology_and_Evolutionary_Biology_BS/Data_Science_and_Ecology_and_Evolutionary_Biology_BS-2021.json rename to packages/api/src/major/majors/Data_Science_and_Ecology_and_Evolutionary_Biology_BS/Data_Science_and_Ecology_and_Evolutionary_Biology_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Data_Science_and_Ecology_and_Evolutionary_Biology_BS/Data_Science_and_Ecology_and_Evolutionary_Biology_BS-2022.json b/packages/api/src/major/majors/Data_Science_and_Ecology_and_Evolutionary_Biology_BS/Data_Science_and_Ecology_and_Evolutionary_Biology_BS-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Data_Science_and_Ecology_and_Evolutionary_Biology_BS/Data_Science_and_Ecology_and_Evolutionary_Biology_BS-2022.json rename to packages/api/src/major/majors/Data_Science_and_Ecology_and_Evolutionary_Biology_BS/Data_Science_and_Ecology_and_Evolutionary_Biology_BS-2022.json diff --git a/packages/api-v2/src/major/majors/Data_Science_and_Economics_BS/Data_Science_and_Economics_BS-2021.json b/packages/api/src/major/majors/Data_Science_and_Economics_BS/Data_Science_and_Economics_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Data_Science_and_Economics_BS/Data_Science_and_Economics_BS-2021.json rename to packages/api/src/major/majors/Data_Science_and_Economics_BS/Data_Science_and_Economics_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Data_Science_and_Economics_BS/Data_Science_and_Economics_BS-2022.json b/packages/api/src/major/majors/Data_Science_and_Economics_BS/Data_Science_and_Economics_BS-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Data_Science_and_Economics_BS/Data_Science_and_Economics_BS-2022.json rename to packages/api/src/major/majors/Data_Science_and_Economics_BS/Data_Science_and_Economics_BS-2022.json diff --git a/packages/api-v2/src/major/majors/Data_Science_and_Health_Science_BS/Data_Science_and_Health_Science_BS-2021.json b/packages/api/src/major/majors/Data_Science_and_Health_Science_BS/Data_Science_and_Health_Science_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Data_Science_and_Health_Science_BS/Data_Science_and_Health_Science_BS-2021.json rename to packages/api/src/major/majors/Data_Science_and_Health_Science_BS/Data_Science_and_Health_Science_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Data_Science_and_Health_Science_BS/Data_Science_and_Health_Science_BS-2022.json b/packages/api/src/major/majors/Data_Science_and_Health_Science_BS/Data_Science_and_Health_Science_BS-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Data_Science_and_Health_Science_BS/Data_Science_and_Health_Science_BS-2022.json rename to packages/api/src/major/majors/Data_Science_and_Health_Science_BS/Data_Science_and_Health_Science_BS-2022.json diff --git a/packages/api-v2/src/major/majors/Data_Science_and_Journalism_BS/Data_Science_and_Journalism_BS-2021.json b/packages/api/src/major/majors/Data_Science_and_Journalism_BS/Data_Science_and_Journalism_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Data_Science_and_Journalism_BS/Data_Science_and_Journalism_BS-2021.json rename to packages/api/src/major/majors/Data_Science_and_Journalism_BS/Data_Science_and_Journalism_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Data_Science_and_Journalism_BS/Data_Science_and_Journalism_BS-2022.json b/packages/api/src/major/majors/Data_Science_and_Journalism_BS/Data_Science_and_Journalism_BS-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Data_Science_and_Journalism_BS/Data_Science_and_Journalism_BS-2022.json rename to packages/api/src/major/majors/Data_Science_and_Journalism_BS/Data_Science_and_Journalism_BS-2022.json diff --git a/packages/api-v2/src/major/majors/Data_Science_and_Linguistics_BS/Data_Science_and_Linguistics_BS-2021.json b/packages/api/src/major/majors/Data_Science_and_Linguistics_BS/Data_Science_and_Linguistics_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Data_Science_and_Linguistics_BS/Data_Science_and_Linguistics_BS-2021.json rename to packages/api/src/major/majors/Data_Science_and_Linguistics_BS/Data_Science_and_Linguistics_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Data_Science_and_Linguistics_BS/Data_Science_and_Linguistics_BS-2022.json b/packages/api/src/major/majors/Data_Science_and_Linguistics_BS/Data_Science_and_Linguistics_BS-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Data_Science_and_Linguistics_BS/Data_Science_and_Linguistics_BS-2022.json rename to packages/api/src/major/majors/Data_Science_and_Linguistics_BS/Data_Science_and_Linguistics_BS-2022.json diff --git a/packages/api-v2/src/major/majors/Data_Science_and_Mathematics_BS/Data_Science_and_Mathematics_BS-2021.json b/packages/api/src/major/majors/Data_Science_and_Mathematics_BS/Data_Science_and_Mathematics_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Data_Science_and_Mathematics_BS/Data_Science_and_Mathematics_BS-2021.json rename to packages/api/src/major/majors/Data_Science_and_Mathematics_BS/Data_Science_and_Mathematics_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Data_Science_and_Mathematics_BS/Data_Science_and_Mathematics_BS-2022.json b/packages/api/src/major/majors/Data_Science_and_Mathematics_BS/Data_Science_and_Mathematics_BS-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Data_Science_and_Mathematics_BS/Data_Science_and_Mathematics_BS-2022.json rename to packages/api/src/major/majors/Data_Science_and_Mathematics_BS/Data_Science_and_Mathematics_BS-2022.json diff --git a/packages/api-v2/src/major/majors/Data_Science_and_Physics_BS/Data_Science_and_Physics_BS-2021.json b/packages/api/src/major/majors/Data_Science_and_Physics_BS/Data_Science_and_Physics_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Data_Science_and_Physics_BS/Data_Science_and_Physics_BS-2021.json rename to packages/api/src/major/majors/Data_Science_and_Physics_BS/Data_Science_and_Physics_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Data_Science_and_Physics_BS/Data_Science_and_Physics_BS-2022.json b/packages/api/src/major/majors/Data_Science_and_Physics_BS/Data_Science_and_Physics_BS-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Data_Science_and_Physics_BS/Data_Science_and_Physics_BS-2022.json rename to packages/api/src/major/majors/Data_Science_and_Physics_BS/Data_Science_and_Physics_BS-2022.json diff --git a/packages/api-v2/src/major/majors/Data_Science_and_Psychology_BS/Data_Science_and_Psychology_BS-2021.json b/packages/api/src/major/majors/Data_Science_and_Psychology_BS/Data_Science_and_Psychology_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Data_Science_and_Psychology_BS/Data_Science_and_Psychology_BS-2021.json rename to packages/api/src/major/majors/Data_Science_and_Psychology_BS/Data_Science_and_Psychology_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Data_Science_and_Psychology_BS/Data_Science_and_Psychology_BS-2022.json b/packages/api/src/major/majors/Data_Science_and_Psychology_BS/Data_Science_and_Psychology_BS-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Data_Science_and_Psychology_BS/Data_Science_and_Psychology_BS-2022.json rename to packages/api/src/major/majors/Data_Science_and_Psychology_BS/Data_Science_and_Psychology_BS-2022.json diff --git a/packages/api-v2/src/major/majors/Game_Art_and_Animation_BFA/Game_Art_and_Animation_BFA-2021.json b/packages/api/src/major/majors/Game_Art_and_Animation_BFA/Game_Art_and_Animation_BFA-2021.json similarity index 99% rename from packages/api-v2/src/major/majors/Game_Art_and_Animation_BFA/Game_Art_and_Animation_BFA-2021.json rename to packages/api/src/major/majors/Game_Art_and_Animation_BFA/Game_Art_and_Animation_BFA-2021.json index de0e5c760..db387f761 100644 --- a/packages/api-v2/src/major/majors/Game_Art_and_Animation_BFA/Game_Art_and_Animation_BFA-2021.json +++ b/packages/api/src/major/majors/Game_Art_and_Animation_BFA/Game_Art_and_Animation_BFA-2021.json @@ -439,4 +439,4 @@ "minOptions": 0, "concentrationOptions": [] } -} \ No newline at end of file +} diff --git a/packages/api-v2/src/major/majors/Game_Art_and_Animation_BFA/Game_Art_and_Animation_BFA-2022.json b/packages/api/src/major/majors/Game_Art_and_Animation_BFA/Game_Art_and_Animation_BFA-2022.json similarity index 99% rename from packages/api-v2/src/major/majors/Game_Art_and_Animation_BFA/Game_Art_and_Animation_BFA-2022.json rename to packages/api/src/major/majors/Game_Art_and_Animation_BFA/Game_Art_and_Animation_BFA-2022.json index abc95f74b..9b8514fda 100644 --- a/packages/api-v2/src/major/majors/Game_Art_and_Animation_BFA/Game_Art_and_Animation_BFA-2022.json +++ b/packages/api/src/major/majors/Game_Art_and_Animation_BFA/Game_Art_and_Animation_BFA-2022.json @@ -509,4 +509,4 @@ "minOptions": 0, "concentrationOptions": [] } -} \ No newline at end of file +} diff --git a/packages/api-v2/src/major/majors/Game_Design_BFA/Game_Design_BFA-2021.json b/packages/api/src/major/majors/Game_Design_BFA/Game_Design_BFA-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Game_Design_BFA/Game_Design_BFA-2021.json rename to packages/api/src/major/majors/Game_Design_BFA/Game_Design_BFA-2021.json diff --git a/packages/api-v2/src/major/majors/Game_Design_BFA/Game_Design_BFA-2022.json b/packages/api/src/major/majors/Game_Design_BFA/Game_Design_BFA-2022.json similarity index 100% rename from packages/api-v2/src/major/majors/Game_Design_BFA/Game_Design_BFA-2022.json rename to packages/api/src/major/majors/Game_Design_BFA/Game_Design_BFA-2022.json diff --git a/packages/api-v2/src/major/majors/Game_Design_and_Music_with_concentration_in_Music_Technology_BS/Game_Design_and_Music_with_concentration_in_Music_Technology_BS-2021.json b/packages/api/src/major/majors/Game_Design_and_Music_with_concentration_in_Music_Technology_BS/Game_Design_and_Music_with_concentration_in_Music_Technology_BS-2021.json similarity index 100% rename from packages/api-v2/src/major/majors/Game_Design_and_Music_with_concentration_in_Music_Technology_BS/Game_Design_and_Music_with_concentration_in_Music_Technology_BS-2021.json rename to packages/api/src/major/majors/Game_Design_and_Music_with_concentration_in_Music_Technology_BS/Game_Design_and_Music_with_concentration_in_Music_Technology_BS-2021.json diff --git a/packages/api-v2/src/major/majors/Game_Design_and_Music_with_concentration_in_Music_Technology_BS/Game_Design_and_Music_with_concentration_in_Music_Technology_BS-2022.json b/packages/api/src/major/majors/Game_Design_and_Music_with_concentration_in_Music_Technology_BS/Game_Design_and_Music_with_concentration_in_Music_Technology_BS-2022.json similarity index 99% rename from packages/api-v2/src/major/majors/Game_Design_and_Music_with_concentration_in_Music_Technology_BS/Game_Design_and_Music_with_concentration_in_Music_Technology_BS-2022.json rename to packages/api/src/major/majors/Game_Design_and_Music_with_concentration_in_Music_Technology_BS/Game_Design_and_Music_with_concentration_in_Music_Technology_BS-2022.json index 6b6ca35aa..043de9c79 100644 --- a/packages/api-v2/src/major/majors/Game_Design_and_Music_with_concentration_in_Music_Technology_BS/Game_Design_and_Music_with_concentration_in_Music_Technology_BS-2022.json +++ b/packages/api/src/major/majors/Game_Design_and_Music_with_concentration_in_Music_Technology_BS/Game_Design_and_Music_with_concentration_in_Music_Technology_BS-2022.json @@ -346,4 +346,4 @@ "minOptions": 0, "concentrationOptions": [] } -} \ No newline at end of file +} diff --git a/packages/api-v2/src/major/majors/index.ts b/packages/api/src/major/majors/index.ts similarity index 100% rename from packages/api-v2/src/major/majors/index.ts rename to packages/api/src/major/majors/index.ts diff --git a/packages/api-v2/src/major/test/major.controller.spec.ts b/packages/api/src/major/test/major.controller.spec.ts similarity index 100% rename from packages/api-v2/src/major/test/major.controller.spec.ts rename to packages/api/src/major/test/major.controller.spec.ts diff --git a/packages/api-v2/src/major/test/major.service.spec.ts b/packages/api/src/major/test/major.service.spec.ts similarity index 100% rename from packages/api-v2/src/major/test/major.service.spec.ts rename to packages/api/src/major/test/major.service.spec.ts diff --git a/packages/api-v2/src/meta/meta.controller.ts b/packages/api/src/meta/meta.controller.ts similarity index 100% rename from packages/api-v2/src/meta/meta.controller.ts rename to packages/api/src/meta/meta.controller.ts diff --git a/packages/api-v2/src/meta/meta.module.ts b/packages/api/src/meta/meta.module.ts similarity index 100% rename from packages/api-v2/src/meta/meta.module.ts rename to packages/api/src/meta/meta.module.ts diff --git a/packages/api-v2/src/meta/meta.service.ts b/packages/api/src/meta/meta.service.ts similarity index 100% rename from packages/api-v2/src/meta/meta.service.ts rename to packages/api/src/meta/meta.service.ts diff --git a/packages/api-v2/src/plan/entities/plan.entity.ts b/packages/api/src/plan/entities/plan.entity.ts similarity index 100% rename from packages/api-v2/src/plan/entities/plan.entity.ts rename to packages/api/src/plan/entities/plan.entity.ts diff --git a/packages/api-v2/src/plan/plan.controller.ts b/packages/api/src/plan/plan.controller.ts similarity index 100% rename from packages/api-v2/src/plan/plan.controller.ts rename to packages/api/src/plan/plan.controller.ts diff --git a/packages/api-v2/src/plan/plan.errors.ts b/packages/api/src/plan/plan.errors.ts similarity index 62% rename from packages/api-v2/src/plan/plan.errors.ts rename to packages/api/src/plan/plan.errors.ts index 626c4c3f9..f03d1d67f 100644 --- a/packages/api-v2/src/plan/plan.errors.ts +++ b/packages/api/src/plan/plan.errors.ts @@ -3,19 +3,19 @@ // InvalidConcentration export class InvalidMajor extends Error { - constructor() { - super(); - } + constructor() { + super(); + } } export class InvalidCatalogYear extends Error { - constructor() { - super(); - } + constructor() { + super(); + } } export class InvalidConcentration extends Error { - constructor() { - super(); - } + constructor() { + super(); + } } diff --git a/packages/api-v2/src/plan/plan.module.ts b/packages/api/src/plan/plan.module.ts similarity index 100% rename from packages/api-v2/src/plan/plan.module.ts rename to packages/api/src/plan/plan.module.ts diff --git a/packages/api-v2/src/plan/plan.service.ts b/packages/api/src/plan/plan.service.ts similarity index 94% rename from packages/api-v2/src/plan/plan.service.ts rename to packages/api/src/plan/plan.service.ts index 027a2039d..f8a902b20 100644 --- a/packages/api-v2/src/plan/plan.service.ts +++ b/packages/api/src/plan/plan.service.ts @@ -5,9 +5,13 @@ import { StudentService } from "../student/student.service"; import { DeleteResult, Repository, UpdateResult } from "typeorm"; import { CreatePlanDto, UpdatePlanDto } from "@graduate/common"; import { Plan } from "./entities/plan.entity"; -import { formatServiceCtx } from "../../src/utils"; +import { formatServiceCtx } from "../utils"; import { MajorService } from "../major/major.service"; -import { InvalidCatalogYear, InvalidConcentration, InvalidMajor } from "./plan.errors"; +import { + InvalidCatalogYear, + InvalidConcentration, + InvalidMajor, +} from "./plan.errors"; @Injectable() export class PlanService { @@ -141,8 +145,9 @@ export class PlanService { * TODO: Fix the DTO issue that populates undefined values for fields not * present. https://github.com/sandboxnu/graduatenu/issues/533 */ - // It is necessary for this to be OR because we need to run an update if any of these are true. - const isMajorInfoUpdate = newMajorName || newCatalogYear || newConcentrationName; + // It is necessary for this to be OR because we need to run an update if any of these are true. + const isMajorInfoUpdate = + newMajorName || newCatalogYear || newConcentrationName; /** Wipe Major => Remove existing major from the plan. */ const isWipeMajorUpdate = @@ -182,14 +187,13 @@ export class PlanService { throw new InvalidMajor(); } - const isValidMajorCatalogueYear = this.majorService.isValidCatalogueYear( - newMajorName, - newCatalogYear, + newMajorName, + newCatalogYear, newConcentrationName ); - if(!isValidMajorCatalogueYear){ + if (!isValidMajorCatalogueYear) { this.logger.debug( { message: "Attempting to add plan with an invalid catalogue year", @@ -204,11 +208,11 @@ export class PlanService { } const isValidConcentrationForMajor = - this.majorService.isValidConcentrationForMajor( - newMajorName, - newCatalogYear, - newConcentrationName - ); + this.majorService.isValidConcentrationForMajor( + newMajorName, + newCatalogYear, + newConcentrationName + ); if (!isValidConcentrationForMajor) { this.logger.debug( diff --git a/packages/api-v2/src/plan/test/plan.controller.spec.ts b/packages/api/src/plan/test/plan.controller.spec.ts similarity index 100% rename from packages/api-v2/src/plan/test/plan.controller.spec.ts rename to packages/api/src/plan/test/plan.controller.spec.ts diff --git a/packages/api-v2/src/plan/test/plan.service.spec.ts b/packages/api/src/plan/test/plan.service.spec.ts similarity index 100% rename from packages/api-v2/src/plan/test/plan.service.spec.ts rename to packages/api/src/plan/test/plan.service.spec.ts diff --git a/packages/api-v2/src/student/entities/student.entity.ts b/packages/api/src/student/entities/student.entity.ts similarity index 100% rename from packages/api-v2/src/student/entities/student.entity.ts rename to packages/api/src/student/entities/student.entity.ts diff --git a/packages/api-v2/src/student/student.controller.ts b/packages/api/src/student/student.controller.ts similarity index 100% rename from packages/api-v2/src/student/student.controller.ts rename to packages/api/src/student/student.controller.ts diff --git a/packages/api-v2/src/student/student.errors.ts b/packages/api/src/student/student.errors.ts similarity index 100% rename from packages/api-v2/src/student/student.errors.ts rename to packages/api/src/student/student.errors.ts diff --git a/packages/api-v2/src/student/student.module.ts b/packages/api/src/student/student.module.ts similarity index 100% rename from packages/api-v2/src/student/student.module.ts rename to packages/api/src/student/student.module.ts diff --git a/packages/api-v2/src/student/student.service.ts b/packages/api/src/student/student.service.ts similarity index 99% rename from packages/api-v2/src/student/student.service.ts rename to packages/api/src/student/student.service.ts index 69c9589aa..a264221ca 100644 --- a/packages/api-v2/src/student/student.service.ts +++ b/packages/api/src/student/student.service.ts @@ -1,6 +1,6 @@ import { Injectable, Logger } from "@nestjs/common"; import { InjectRepository } from "@nestjs/typeorm"; -import { formatServiceCtx } from "../../src/utils"; +import { formatServiceCtx } from "../utils"; import { DeleteResult, FindOneOptions, diff --git a/packages/api-v2/src/student/test/student.controller.spec.ts b/packages/api/src/student/test/student.controller.spec.ts similarity index 100% rename from packages/api-v2/src/student/test/student.controller.spec.ts rename to packages/api/src/student/test/student.controller.spec.ts diff --git a/packages/api-v2/src/student/test/student.service.spec.ts b/packages/api/src/student/test/student.service.spec.ts similarity index 100% rename from packages/api-v2/src/student/test/student.service.spec.ts rename to packages/api/src/student/test/student.service.spec.ts diff --git a/packages/api-v2/src/utils/deepFilter.utils.ts b/packages/api/src/utils/deepFilter.utils.ts similarity index 100% rename from packages/api-v2/src/utils/deepFilter.utils.ts rename to packages/api/src/utils/deepFilter.utils.ts diff --git a/packages/api-v2/src/utils/formatServiceCtx.utils.ts b/packages/api/src/utils/formatServiceCtx.utils.ts similarity index 100% rename from packages/api-v2/src/utils/formatServiceCtx.utils.ts rename to packages/api/src/utils/formatServiceCtx.utils.ts diff --git a/packages/api-v2/src/utils/index.ts b/packages/api/src/utils/index.ts similarity index 100% rename from packages/api-v2/src/utils/index.ts rename to packages/api/src/utils/index.ts diff --git a/packages/api-v2/src/utils/test/deepFilter.utils.spec.ts b/packages/api/src/utils/test/deepFilter.utils.spec.ts similarity index 100% rename from packages/api-v2/src/utils/test/deepFilter.utils.spec.ts rename to packages/api/src/utils/test/deepFilter.utils.spec.ts diff --git a/packages/api-v2/test/auth/auth.e2e-spec.ts b/packages/api/test/auth/auth.e2e-spec.ts similarity index 94% rename from packages/api-v2/test/auth/auth.e2e-spec.ts rename to packages/api/test/auth/auth.e2e-spec.ts index 1d6b055bb..fef0d38b2 100644 --- a/packages/api-v2/test/auth/auth.e2e-spec.ts +++ b/packages/api/test/auth/auth.e2e-spec.ts @@ -2,8 +2,8 @@ import { INestApplication } from "@nestjs/common"; import { Student } from "../../src/student/entities/student.entity"; import * as request from "supertest"; import { Connection } from "typeorm"; -import { dropStudentTable, initializeApp } from "../../test/utils"; -import { testUser1 } from "../../test/testingData"; +import { dropStudentTable, initializeApp } from "../utils"; +import { testUser1 } from "../testingData"; describe("AuthController (e2e)", () => { let app: INestApplication; diff --git a/packages/api-v2/test/jest-e2e.json b/packages/api/test/jest-e2e.json similarity index 100% rename from packages/api-v2/test/jest-e2e.json rename to packages/api/test/jest-e2e.json diff --git a/packages/api-v2/test/major/major.e2e-spec.ts b/packages/api/test/major/major.e2e-spec.ts similarity index 95% rename from packages/api-v2/test/major/major.e2e-spec.ts rename to packages/api/test/major/major.e2e-spec.ts index 3efc89b7c..126528d8b 100644 --- a/packages/api-v2/test/major/major.e2e-spec.ts +++ b/packages/api/test/major/major.e2e-spec.ts @@ -1,6 +1,6 @@ import { INestApplication } from "@nestjs/common"; import * as request from "supertest"; -import { initializeApp } from "../../test/utils"; +import { initializeApp } from "../utils"; describe("MajorController (e2e)", () => { let app: INestApplication; diff --git a/packages/api-v2/test/plan/plan.e2e-spec.ts b/packages/api/test/plan/plan.e2e-spec.ts similarity index 95% rename from packages/api-v2/test/plan/plan.e2e-spec.ts rename to packages/api/test/plan/plan.e2e-spec.ts index 06fe9c545..0995f9f0d 100644 --- a/packages/api-v2/test/plan/plan.e2e-spec.ts +++ b/packages/api/test/plan/plan.e2e-spec.ts @@ -2,13 +2,8 @@ import { INestApplication } from "@nestjs/common"; import { Plan } from "../../src/plan/entities/plan.entity"; import * as request from "supertest"; import { Connection } from "typeorm"; -import { dropStudentTable, initializeApp } from "../../test/utils"; -import { - testPlan, - testUser1, - testUser2, - testUser3, -} from "../../test/testingData"; +import { dropStudentTable, initializeApp } from "../utils"; +import { testPlan, testUser1, testUser2, testUser3 } from "../testingData"; describe("PlanController (e2e)", () => { let app: INestApplication; diff --git a/packages/api-v2/test/student/student.e2e-spec.ts b/packages/api/test/student/student.e2e-spec.ts similarity index 94% rename from packages/api-v2/test/student/student.e2e-spec.ts rename to packages/api/test/student/student.e2e-spec.ts index 21c31ebe5..10fd74a26 100644 --- a/packages/api-v2/test/student/student.e2e-spec.ts +++ b/packages/api/test/student/student.e2e-spec.ts @@ -2,8 +2,8 @@ import { INestApplication } from "@nestjs/common"; import { Plan } from "../../src/plan/entities/plan.entity"; import * as request from "supertest"; import { Connection } from "typeorm"; -import { dropStudentTable, initializeApp } from "../../test/utils"; -import { onboardedUser, testPlan, testUser1 } from "../../test/testingData"; +import { dropStudentTable, initializeApp } from "../utils"; +import { onboardedUser, testPlan, testUser1 } from "../testingData"; describe("StudentController (e2e)", () => { let app: INestApplication; diff --git a/packages/api-v2/test/testingData.ts b/packages/api/test/testingData.ts similarity index 100% rename from packages/api-v2/test/testingData.ts rename to packages/api/test/testingData.ts diff --git a/packages/api-v2/test/utils.ts b/packages/api/test/utils.ts similarity index 100% rename from packages/api-v2/test/utils.ts rename to packages/api/test/utils.ts diff --git a/packages/api-v2/tsconfig.build.json b/packages/api/tsconfig.build.json similarity index 100% rename from packages/api-v2/tsconfig.build.json rename to packages/api/tsconfig.build.json diff --git a/packages/api-v2/tsconfig.json b/packages/api/tsconfig.json similarity index 100% rename from packages/api-v2/tsconfig.json rename to packages/api/tsconfig.json diff --git a/packages/common/src/types.ts b/packages/common/src/types.ts index 983f5aa3d..2e3ddfb78 100644 --- a/packages/common/src/types.ts +++ b/packages/common/src/types.ts @@ -255,7 +255,7 @@ export interface Concentrations2 { } /** - * A clean version of a student's schedule as used in V2 of the App with no + * A clean version of a student's schedule as used in of the App with no * redundunt year information. * * @param years A list of the years of this object @@ -290,9 +290,9 @@ export interface ScheduleYear2 { } /** - * A clean version of the ScheduleTerm used by V2 of the App. A generic id field - * is used for book keeping purposes by the drag and drop library, in cases - * where we don't care about this id, T can null. + * A clean version of the ScheduleTerm used by of the App. A generic id field is + * used for book keeping purposes by the drag and drop library, in cases where + * we don't care about this id, T can null. * * @param year The year of this term * @param season The season of this term @@ -308,9 +308,9 @@ export interface ScheduleTerm2 { } /** - * A course within a schedule used by V2 of the App. A generic id field is used - * for book keeping purposes by the drag and drop library, in cases where we - * don't care about this id, T can null. + * A course within a schedule used by of the App. A generic id field is used for + * book keeping purposes by the drag and drop library, in cases where we don't + * care about this id, T can null. * * @param name The name of the course * @param classId The classId of this course (1210, 1800, etc) diff --git a/packages/frontend-v2/validation-worker/worker-messages.ts b/packages/frontend-v2/validation-worker/worker-messages.ts deleted file mode 100644 index b0cde7e10..000000000 --- a/packages/frontend-v2/validation-worker/worker-messages.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { Major2, MajorValidationResult, ScheduleCourse2 } from "@graduate/common" - -export type WorkerMessage = Loaded | ValidationResult - -export enum WorkerMessageType { - Loaded = "Loaded", - ValidationResult = "ValidationResult" -} - -export type ValidationResult = { - type: WorkerMessageType.ValidationResult, - result: MajorValidationResult, - requestNumber: number -} -export type Loaded = {type: WorkerMessageType.Loaded} - -export interface WorkerPostInfo { - major: Major2, - taken: ScheduleCourse2[], - concentration?: string, - requestNumber: number -} \ No newline at end of file diff --git a/packages/frontend-v2/validation-worker/worker.ts b/packages/frontend-v2/validation-worker/worker.ts deleted file mode 100644 index d377069cc..000000000 --- a/packages/frontend-v2/validation-worker/worker.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { validateMajor2 } from "@graduate/common"; -import { Loaded, ValidationResult, WorkerMessageType, WorkerPostInfo } from "./worker-messages"; - -// Let the host page know the worker is ready. -const loadMessage: Loaded = {type: WorkerMessageType.Loaded} -postMessage(loadMessage) - -addEventListener("message", ({data}: MessageEvent) => { - const validationResult: ValidationResult = { - type: WorkerMessageType.ValidationResult, - result: validateMajor2(data.major, data.taken, data.concentration), - requestNumber: data.requestNumber - } - - postMessage(validationResult) -}) \ No newline at end of file diff --git a/packages/frontend-v2/.eslintrc.js b/packages/frontend/.eslintrc.js similarity index 70% rename from packages/frontend-v2/.eslintrc.js rename to packages/frontend/.eslintrc.js index 601fa0ffa..d48bd31aa 100644 --- a/packages/frontend-v2/.eslintrc.js +++ b/packages/frontend/.eslintrc.js @@ -2,7 +2,7 @@ module.exports = { extends: "next/core-web-vitals", settings: { next: { - rootDir: "packages/frontend-v2/", + rootDir: "packages/frontend/", }, }, }; diff --git a/packages/frontend-v2/.gitignore b/packages/frontend/.gitignore similarity index 100% rename from packages/frontend-v2/.gitignore rename to packages/frontend/.gitignore diff --git a/packages/frontend-v2/README.md b/packages/frontend/README.md similarity index 84% rename from packages/frontend-v2/README.md rename to packages/frontend/README.md index c9b3b4fef..644205e94 100644 --- a/packages/frontend-v2/README.md +++ b/packages/frontend/README.md @@ -1,12 +1,12 @@ -# GraduateNU Frontend V2 +# GraduateNU Frontend This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app). ## Getting Started -Run the full stack application with `yarn dev:v2` from the root of the monorepo. +Run the full stack application with `yarn dev` from the root of the monorepo. -To run only the frontend, use `yarn dev` from the root of this workspace(`packages/frontend-v2`). +To run only the frontend, use `yarn dev` from the root of this workspace(`packages/frontend`). You can start editing the pages by modifying files in `pages/`. The pages auto-update as you edit the file. diff --git a/packages/frontend-v2/components/AddCourseModal/AddCourseButton.tsx b/packages/frontend/components/AddCourseModal/AddCourseButton.tsx similarity index 100% rename from packages/frontend-v2/components/AddCourseModal/AddCourseButton.tsx rename to packages/frontend/components/AddCourseModal/AddCourseButton.tsx diff --git a/packages/frontend-v2/components/AddCourseModal/AddCourseModal.tsx b/packages/frontend/components/AddCourseModal/AddCourseModal.tsx similarity index 100% rename from packages/frontend-v2/components/AddCourseModal/AddCourseModal.tsx rename to packages/frontend/components/AddCourseModal/AddCourseModal.tsx diff --git a/packages/frontend-v2/components/AddCourseModal/SearchCoursesInput.tsx b/packages/frontend/components/AddCourseModal/SearchCoursesInput.tsx similarity index 100% rename from packages/frontend-v2/components/AddCourseModal/SearchCoursesInput.tsx rename to packages/frontend/components/AddCourseModal/SearchCoursesInput.tsx diff --git a/packages/frontend-v2/components/AddCourseModal/SearchResult.tsx b/packages/frontend/components/AddCourseModal/SearchResult.tsx similarity index 97% rename from packages/frontend-v2/components/AddCourseModal/SearchResult.tsx rename to packages/frontend/components/AddCourseModal/SearchResult.tsx index 476e0d3c7..f903ae224 100644 --- a/packages/frontend-v2/components/AddCourseModal/SearchResult.tsx +++ b/packages/frontend/components/AddCourseModal/SearchResult.tsx @@ -1,7 +1,7 @@ import { SmallAddIcon } from "@chakra-ui/icons"; import { Flex, Box, Heading, IconButton, Text } from "@chakra-ui/react"; import { ScheduleCourse2 } from "@graduate/common"; -import { getCourseDisplayString } from "../../utils/"; +import { getCourseDisplayString } from "../../utils"; import { GraduateToolTip } from "../GraduateTooltip"; interface SearchResultProps { diff --git a/packages/frontend-v2/components/AddCourseModal/SelectedCourse.tsx b/packages/frontend/components/AddCourseModal/SelectedCourse.tsx similarity index 93% rename from packages/frontend-v2/components/AddCourseModal/SelectedCourse.tsx rename to packages/frontend/components/AddCourseModal/SelectedCourse.tsx index dae03ab5f..1465558a3 100644 --- a/packages/frontend-v2/components/AddCourseModal/SelectedCourse.tsx +++ b/packages/frontend/components/AddCourseModal/SelectedCourse.tsx @@ -1,6 +1,6 @@ import { Flex, Text } from "@chakra-ui/react"; import { ScheduleCourse2 } from "@graduate/common"; -import { getCourseDisplayString } from "../../utils/"; +import { getCourseDisplayString } from "../../utils"; import { CourseTrashButton } from "../ScheduleCourse/CourseTrashButton"; interface SelectedCourseProps { diff --git a/packages/frontend-v2/components/AddCourseModal/index.ts b/packages/frontend/components/AddCourseModal/index.ts similarity index 100% rename from packages/frontend-v2/components/AddCourseModal/index.ts rename to packages/frontend/components/AddCourseModal/index.ts diff --git a/packages/frontend-v2/components/Authentication/AuthForm.tsx b/packages/frontend/components/Authentication/AuthForm.tsx similarity index 100% rename from packages/frontend-v2/components/Authentication/AuthForm.tsx rename to packages/frontend/components/Authentication/AuthForm.tsx diff --git a/packages/frontend-v2/components/Authentication/AuthPageLayout.tsx b/packages/frontend/components/Authentication/AuthPageLayout.tsx similarity index 100% rename from packages/frontend-v2/components/Authentication/AuthPageLayout.tsx rename to packages/frontend/components/Authentication/AuthPageLayout.tsx diff --git a/packages/frontend-v2/components/Authentication/ForgotPasswordForm.tsx b/packages/frontend/components/Authentication/ForgotPasswordForm.tsx similarity index 100% rename from packages/frontend-v2/components/Authentication/ForgotPasswordForm.tsx rename to packages/frontend/components/Authentication/ForgotPasswordForm.tsx diff --git a/packages/frontend-v2/components/Authentication/ResendEmailVerificationLink.tsx b/packages/frontend/components/Authentication/ResendEmailVerificationLink.tsx similarity index 100% rename from packages/frontend-v2/components/Authentication/ResendEmailVerificationLink.tsx rename to packages/frontend/components/Authentication/ResendEmailVerificationLink.tsx diff --git a/packages/frontend-v2/components/Authentication/index.ts b/packages/frontend/components/Authentication/index.ts similarity index 100% rename from packages/frontend-v2/components/Authentication/index.ts rename to packages/frontend/components/Authentication/index.ts diff --git a/packages/frontend-v2/components/Button/BlueButton.tsx b/packages/frontend/components/Button/BlueButton.tsx similarity index 100% rename from packages/frontend-v2/components/Button/BlueButton.tsx rename to packages/frontend/components/Button/BlueButton.tsx diff --git a/packages/frontend-v2/components/Button/SecondaryBlueButton.tsx b/packages/frontend/components/Button/SecondaryBlueButton.tsx similarity index 100% rename from packages/frontend-v2/components/Button/SecondaryBlueButton.tsx rename to packages/frontend/components/Button/SecondaryBlueButton.tsx diff --git a/packages/frontend-v2/components/Button/index.ts b/packages/frontend/components/Button/index.ts similarity index 100% rename from packages/frontend-v2/components/Button/index.ts rename to packages/frontend/components/Button/index.ts diff --git a/packages/frontend-v2/components/Error/ClientSideError.tsx b/packages/frontend/components/Error/ClientSideError.tsx similarity index 100% rename from packages/frontend-v2/components/Error/ClientSideError.tsx rename to packages/frontend/components/Error/ClientSideError.tsx diff --git a/packages/frontend-v2/components/Error/ConfirmEmailWarningModal.tsx b/packages/frontend/components/Error/ConfirmEmailWarningModal.tsx similarity index 100% rename from packages/frontend-v2/components/Error/ConfirmEmailWarningModal.tsx rename to packages/frontend/components/Error/ConfirmEmailWarningModal.tsx diff --git a/packages/frontend-v2/components/Error/ErrorBoundary.tsx b/packages/frontend/components/Error/ErrorBoundary.tsx similarity index 100% rename from packages/frontend-v2/components/Error/ErrorBoundary.tsx rename to packages/frontend/components/Error/ErrorBoundary.tsx diff --git a/packages/frontend-v2/components/Error/index.ts b/packages/frontend/components/Error/index.ts similarity index 100% rename from packages/frontend-v2/components/Error/index.ts rename to packages/frontend/components/Error/index.ts diff --git a/packages/frontend-v2/components/Form/Input.tsx b/packages/frontend/components/Form/Input.tsx similarity index 100% rename from packages/frontend-v2/components/Form/Input.tsx rename to packages/frontend/components/Form/Input.tsx diff --git a/packages/frontend-v2/components/Form/InputGroup.tsx b/packages/frontend/components/Form/InputGroup.tsx similarity index 100% rename from packages/frontend-v2/components/Form/InputGroup.tsx rename to packages/frontend/components/Form/InputGroup.tsx diff --git a/packages/frontend-v2/components/Form/Select.tsx b/packages/frontend/components/Form/Select.tsx similarity index 100% rename from packages/frontend-v2/components/Form/Select.tsx rename to packages/frontend/components/Form/Select.tsx diff --git a/packages/frontend-v2/components/Form/index.ts b/packages/frontend/components/Form/index.ts similarity index 100% rename from packages/frontend-v2/components/Form/index.ts rename to packages/frontend/components/Form/index.ts diff --git a/packages/frontend-v2/components/GraduateTooltip.tsx b/packages/frontend/components/GraduateTooltip.tsx similarity index 100% rename from packages/frontend-v2/components/GraduateTooltip.tsx rename to packages/frontend/components/GraduateTooltip.tsx diff --git a/packages/frontend-v2/components/Header/AccountOverview.tsx b/packages/frontend/components/Header/AccountOverview.tsx similarity index 100% rename from packages/frontend-v2/components/Header/AccountOverview.tsx rename to packages/frontend/components/Header/AccountOverview.tsx diff --git a/packages/frontend-v2/components/Header/ChangePassword.tsx b/packages/frontend/components/Header/ChangePassword.tsx similarity index 100% rename from packages/frontend-v2/components/Header/ChangePassword.tsx rename to packages/frontend/components/Header/ChangePassword.tsx diff --git a/packages/frontend-v2/components/Header/GraduateHeaders.tsx b/packages/frontend/components/Header/GraduateHeaders.tsx similarity index 100% rename from packages/frontend-v2/components/Header/GraduateHeaders.tsx rename to packages/frontend/components/Header/GraduateHeaders.tsx diff --git a/packages/frontend-v2/components/Header/HeaderContainer.tsx b/packages/frontend/components/Header/HeaderContainer.tsx similarity index 100% rename from packages/frontend-v2/components/Header/HeaderContainer.tsx rename to packages/frontend/components/Header/HeaderContainer.tsx diff --git a/packages/frontend-v2/components/Header/Logo.tsx b/packages/frontend/components/Header/Logo.tsx similarity index 100% rename from packages/frontend-v2/components/Header/Logo.tsx rename to packages/frontend/components/Header/Logo.tsx diff --git a/packages/frontend-v2/components/Header/UserDropdown.tsx b/packages/frontend/components/Header/UserDropdown.tsx similarity index 100% rename from packages/frontend-v2/components/Header/UserDropdown.tsx rename to packages/frontend/components/Header/UserDropdown.tsx diff --git a/packages/frontend-v2/components/Header/index.ts b/packages/frontend/components/Header/index.ts similarity index 100% rename from packages/frontend-v2/components/Header/index.ts rename to packages/frontend/components/Header/index.ts diff --git a/packages/frontend-v2/components/Help/HelperTooltip.tsx b/packages/frontend/components/Help/HelperTooltip.tsx similarity index 100% rename from packages/frontend-v2/components/Help/HelperTooltip.tsx rename to packages/frontend/components/Help/HelperTooltip.tsx diff --git a/packages/frontend-v2/components/Help/index.ts b/packages/frontend/components/Help/index.ts similarity index 100% rename from packages/frontend-v2/components/Help/index.ts rename to packages/frontend/components/Help/index.ts diff --git a/packages/frontend-v2/components/Link/GraduateButtonLink.tsx b/packages/frontend/components/Link/GraduateButtonLink.tsx similarity index 100% rename from packages/frontend-v2/components/Link/GraduateButtonLink.tsx rename to packages/frontend/components/Link/GraduateButtonLink.tsx diff --git a/packages/frontend-v2/components/Link/GraduateLink.tsx b/packages/frontend/components/Link/GraduateLink.tsx similarity index 100% rename from packages/frontend-v2/components/Link/GraduateLink.tsx rename to packages/frontend/components/Link/GraduateLink.tsx diff --git a/packages/frontend-v2/components/Link/index.ts b/packages/frontend/components/Link/index.ts similarity index 100% rename from packages/frontend-v2/components/Link/index.ts rename to packages/frontend/components/Link/index.ts diff --git a/packages/frontend-v2/components/MetaInfo/MetaInfo.tsx b/packages/frontend/components/MetaInfo/MetaInfo.tsx similarity index 100% rename from packages/frontend-v2/components/MetaInfo/MetaInfo.tsx rename to packages/frontend/components/MetaInfo/MetaInfo.tsx diff --git a/packages/frontend-v2/components/Plan/AddPlanModal.tsx b/packages/frontend/components/Plan/AddPlanModal.tsx similarity index 100% rename from packages/frontend-v2/components/Plan/AddPlanModal.tsx rename to packages/frontend/components/Plan/AddPlanModal.tsx diff --git a/packages/frontend-v2/components/Plan/AddYearButton.tsx b/packages/frontend/components/Plan/AddYearButton.tsx similarity index 100% rename from packages/frontend-v2/components/Plan/AddYearButton.tsx rename to packages/frontend/components/Plan/AddYearButton.tsx diff --git a/packages/frontend-v2/components/Plan/DeletePlanModal.tsx b/packages/frontend/components/Plan/DeletePlanModal.tsx similarity index 100% rename from packages/frontend-v2/components/Plan/DeletePlanModal.tsx rename to packages/frontend/components/Plan/DeletePlanModal.tsx diff --git a/packages/frontend-v2/components/Plan/EditPlanModal.tsx b/packages/frontend/components/Plan/EditPlanModal.tsx similarity index 100% rename from packages/frontend-v2/components/Plan/EditPlanModal.tsx rename to packages/frontend/components/Plan/EditPlanModal.tsx diff --git a/packages/frontend-v2/components/Plan/Plan.tsx b/packages/frontend/components/Plan/Plan.tsx similarity index 98% rename from packages/frontend-v2/components/Plan/Plan.tsx rename to packages/frontend/components/Plan/Plan.tsx index e0b255eaa..46d5d892d 100644 --- a/packages/frontend-v2/components/Plan/Plan.tsx +++ b/packages/frontend/components/Plan/Plan.tsx @@ -9,7 +9,7 @@ import { } from "@graduate/common"; import { useState } from "react"; import { addClassesToTerm, removeYearFromPlan } from "../../utils"; -import { removeCourseFromTerm } from "../../utils/"; +import { removeCourseFromTerm } from "../../utils"; import { ScheduleYear } from "./ScheduleYear"; import { useDroppable } from "@dnd-kit/core"; import { AddYearButton } from "./AddYearButton"; diff --git a/packages/frontend-v2/components/Plan/PlanConcentrationsSelect.tsx b/packages/frontend/components/Plan/PlanConcentrationsSelect.tsx similarity index 100% rename from packages/frontend-v2/components/Plan/PlanConcentrationsSelect.tsx rename to packages/frontend/components/Plan/PlanConcentrationsSelect.tsx diff --git a/packages/frontend-v2/components/Plan/PlanDropdown.tsx b/packages/frontend/components/Plan/PlanDropdown.tsx similarity index 100% rename from packages/frontend-v2/components/Plan/PlanDropdown.tsx rename to packages/frontend/components/Plan/PlanDropdown.tsx diff --git a/packages/frontend-v2/components/Plan/ReqErrorModal.tsx b/packages/frontend/components/Plan/ReqErrorModal.tsx similarity index 100% rename from packages/frontend-v2/components/Plan/ReqErrorModal.tsx rename to packages/frontend/components/Plan/ReqErrorModal.tsx diff --git a/packages/frontend-v2/components/Plan/ScheduleTerm.tsx b/packages/frontend/components/Plan/ScheduleTerm.tsx similarity index 100% rename from packages/frontend-v2/components/Plan/ScheduleTerm.tsx rename to packages/frontend/components/Plan/ScheduleTerm.tsx diff --git a/packages/frontend-v2/components/Plan/ScheduleYear.tsx b/packages/frontend/components/Plan/ScheduleYear.tsx similarity index 100% rename from packages/frontend-v2/components/Plan/ScheduleYear.tsx rename to packages/frontend/components/Plan/ScheduleYear.tsx diff --git a/packages/frontend-v2/components/Plan/TransferCourses.tsx b/packages/frontend/components/Plan/TransferCourses.tsx similarity index 100% rename from packages/frontend-v2/components/Plan/TransferCourses.tsx rename to packages/frontend/components/Plan/TransferCourses.tsx diff --git a/packages/frontend-v2/components/Plan/index.ts b/packages/frontend/components/Plan/index.ts similarity index 100% rename from packages/frontend-v2/components/Plan/index.ts rename to packages/frontend/components/Plan/index.ts diff --git a/packages/frontend-v2/components/ScheduleCourse/CourseDragIcon.tsx b/packages/frontend/components/ScheduleCourse/CourseDragIcon.tsx similarity index 100% rename from packages/frontend-v2/components/ScheduleCourse/CourseDragIcon.tsx rename to packages/frontend/components/ScheduleCourse/CourseDragIcon.tsx diff --git a/packages/frontend-v2/components/ScheduleCourse/CourseTrashButton.tsx b/packages/frontend/components/ScheduleCourse/CourseTrashButton.tsx similarity index 100% rename from packages/frontend-v2/components/ScheduleCourse/CourseTrashButton.tsx rename to packages/frontend/components/ScheduleCourse/CourseTrashButton.tsx diff --git a/packages/frontend-v2/components/ScheduleCourse/ScheduleCourse.tsx b/packages/frontend/components/ScheduleCourse/ScheduleCourse.tsx similarity index 100% rename from packages/frontend-v2/components/ScheduleCourse/ScheduleCourse.tsx rename to packages/frontend/components/ScheduleCourse/ScheduleCourse.tsx diff --git a/packages/frontend-v2/components/ScheduleCourse/index.ts b/packages/frontend/components/ScheduleCourse/index.ts similarity index 100% rename from packages/frontend-v2/components/ScheduleCourse/index.ts rename to packages/frontend/components/ScheduleCourse/index.ts diff --git a/packages/frontend-v2/components/Sidebar/SectionRequirement.tsx b/packages/frontend/components/Sidebar/SectionRequirement.tsx similarity index 100% rename from packages/frontend-v2/components/Sidebar/SectionRequirement.tsx rename to packages/frontend/components/Sidebar/SectionRequirement.tsx diff --git a/packages/frontend-v2/components/Sidebar/Sidebar.tsx b/packages/frontend/components/Sidebar/Sidebar.tsx similarity index 100% rename from packages/frontend-v2/components/Sidebar/Sidebar.tsx rename to packages/frontend/components/Sidebar/Sidebar.tsx diff --git a/packages/frontend-v2/components/Sidebar/SidebarSection.tsx b/packages/frontend/components/Sidebar/SidebarSection.tsx similarity index 100% rename from packages/frontend-v2/components/Sidebar/SidebarSection.tsx rename to packages/frontend/components/Sidebar/SidebarSection.tsx diff --git a/packages/frontend-v2/components/Sidebar/index.ts b/packages/frontend/components/Sidebar/index.ts similarity index 100% rename from packages/frontend-v2/components/Sidebar/index.ts rename to packages/frontend/components/Sidebar/index.ts diff --git a/packages/frontend-v2/components/Spinner/LoadingPage.tsx b/packages/frontend/components/Spinner/LoadingPage.tsx similarity index 100% rename from packages/frontend-v2/components/Spinner/LoadingPage.tsx rename to packages/frontend/components/Spinner/LoadingPage.tsx diff --git a/packages/frontend-v2/components/Spinner/PageSpinner.tsx b/packages/frontend/components/Spinner/PageSpinner.tsx similarity index 100% rename from packages/frontend-v2/components/Spinner/PageSpinner.tsx rename to packages/frontend/components/Spinner/PageSpinner.tsx diff --git a/packages/frontend-v2/components/Spinner/index.ts b/packages/frontend/components/Spinner/index.ts similarity index 100% rename from packages/frontend-v2/components/Spinner/index.ts rename to packages/frontend/components/Spinner/index.ts diff --git a/packages/frontend-v2/components/index.ts b/packages/frontend/components/index.ts similarity index 100% rename from packages/frontend-v2/components/index.ts rename to packages/frontend/components/index.ts diff --git a/packages/frontend-v2/hooks/index.ts b/packages/frontend/hooks/index.ts similarity index 100% rename from packages/frontend-v2/hooks/index.ts rename to packages/frontend/hooks/index.ts diff --git a/packages/frontend-v2/hooks/useFetchCourse.ts b/packages/frontend/hooks/useFetchCourse.ts similarity index 100% rename from packages/frontend-v2/hooks/useFetchCourse.ts rename to packages/frontend/hooks/useFetchCourse.ts diff --git a/packages/frontend-v2/hooks/useFetchCourses.ts b/packages/frontend/hooks/useFetchCourses.ts similarity index 100% rename from packages/frontend-v2/hooks/useFetchCourses.ts rename to packages/frontend/hooks/useFetchCourses.ts diff --git a/packages/frontend-v2/hooks/useLocalStorage.ts b/packages/frontend/hooks/useLocalStorage.ts similarity index 100% rename from packages/frontend-v2/hooks/useLocalStorage.ts rename to packages/frontend/hooks/useLocalStorage.ts diff --git a/packages/frontend-v2/hooks/useMajor.ts b/packages/frontend/hooks/useMajor.ts similarity index 100% rename from packages/frontend-v2/hooks/useMajor.ts rename to packages/frontend/hooks/useMajor.ts diff --git a/packages/frontend-v2/hooks/usePlan.ts b/packages/frontend/hooks/usePlan.ts similarity index 100% rename from packages/frontend-v2/hooks/usePlan.ts rename to packages/frontend/hooks/usePlan.ts diff --git a/packages/frontend-v2/hooks/useRedirectIfLoggedIn.ts b/packages/frontend/hooks/useRedirectIfLoggedIn.ts similarity index 100% rename from packages/frontend-v2/hooks/useRedirectIfLoggedIn.ts rename to packages/frontend/hooks/useRedirectIfLoggedIn.ts diff --git a/packages/frontend-v2/hooks/useRedirectIfUnauthorized.ts b/packages/frontend/hooks/useRedirectIfUnauthorized.ts similarity index 100% rename from packages/frontend-v2/hooks/useRedirectIfUnauthorized.ts rename to packages/frontend/hooks/useRedirectIfUnauthorized.ts diff --git a/packages/frontend-v2/hooks/useSearchCourses.ts b/packages/frontend/hooks/useSearchCourses.ts similarity index 100% rename from packages/frontend-v2/hooks/useSearchCourses.ts rename to packages/frontend/hooks/useSearchCourses.ts diff --git a/packages/frontend-v2/hooks/useStudentWithPlans.ts b/packages/frontend/hooks/useStudentWithPlans.ts similarity index 100% rename from packages/frontend-v2/hooks/useStudentWithPlans.ts rename to packages/frontend/hooks/useStudentWithPlans.ts diff --git a/packages/frontend-v2/hooks/useSupportedMajors.ts b/packages/frontend/hooks/useSupportedMajors.ts similarity index 100% rename from packages/frontend-v2/hooks/useSupportedMajors.ts rename to packages/frontend/hooks/useSupportedMajors.ts diff --git a/packages/frontend-v2/hooks/useWindowSize.ts b/packages/frontend/hooks/useWindowSize.ts similarity index 100% rename from packages/frontend-v2/hooks/useWindowSize.ts rename to packages/frontend/hooks/useWindowSize.ts diff --git a/packages/frontend-v2/next-env.d.ts b/packages/frontend/next-env.d.ts similarity index 100% rename from packages/frontend-v2/next-env.d.ts rename to packages/frontend/next-env.d.ts diff --git a/packages/frontend-v2/next.config.js b/packages/frontend/next.config.js similarity index 100% rename from packages/frontend-v2/next.config.js rename to packages/frontend/next.config.js diff --git a/packages/frontend-v2/package.json b/packages/frontend/package.json similarity index 96% rename from packages/frontend-v2/package.json rename to packages/frontend/package.json index d30d0d3c5..90ee85695 100644 --- a/packages/frontend-v2/package.json +++ b/packages/frontend/package.json @@ -1,5 +1,5 @@ { - "name": "@graduate/frontend-v2", + "name": "@graduate/frontend", "version": "0.1.0", "private": true, "scripts": { diff --git a/packages/frontend-v2/pages/404.tsx b/packages/frontend/pages/404.tsx similarity index 100% rename from packages/frontend-v2/pages/404.tsx rename to packages/frontend/pages/404.tsx diff --git a/packages/frontend-v2/pages/_app.tsx b/packages/frontend/pages/_app.tsx similarity index 100% rename from packages/frontend-v2/pages/_app.tsx rename to packages/frontend/pages/_app.tsx diff --git a/packages/frontend-v2/pages/confirmEmail.tsx b/packages/frontend/pages/confirmEmail.tsx similarity index 100% rename from packages/frontend-v2/pages/confirmEmail.tsx rename to packages/frontend/pages/confirmEmail.tsx diff --git a/packages/frontend-v2/pages/emailConfirmation.tsx b/packages/frontend/pages/emailConfirmation.tsx similarity index 100% rename from packages/frontend-v2/pages/emailConfirmation.tsx rename to packages/frontend/pages/emailConfirmation.tsx diff --git a/packages/frontend-v2/pages/forgotPassword.tsx b/packages/frontend/pages/forgotPassword.tsx similarity index 100% rename from packages/frontend-v2/pages/forgotPassword.tsx rename to packages/frontend/pages/forgotPassword.tsx diff --git a/packages/frontend-v2/pages/home.tsx b/packages/frontend/pages/home.tsx similarity index 100% rename from packages/frontend-v2/pages/home.tsx rename to packages/frontend/pages/home.tsx diff --git a/packages/frontend-v2/pages/index.tsx b/packages/frontend/pages/index.tsx similarity index 100% rename from packages/frontend-v2/pages/index.tsx rename to packages/frontend/pages/index.tsx diff --git a/packages/frontend-v2/pages/login.tsx b/packages/frontend/pages/login.tsx similarity index 100% rename from packages/frontend-v2/pages/login.tsx rename to packages/frontend/pages/login.tsx diff --git a/packages/frontend-v2/pages/resetPassword.tsx b/packages/frontend/pages/resetPassword.tsx similarity index 100% rename from packages/frontend-v2/pages/resetPassword.tsx rename to packages/frontend/pages/resetPassword.tsx diff --git a/packages/frontend-v2/pages/signup.tsx b/packages/frontend/pages/signup.tsx similarity index 100% rename from packages/frontend-v2/pages/signup.tsx rename to packages/frontend/pages/signup.tsx diff --git a/packages/frontend-v2/public/app_snippet.png b/packages/frontend/public/app_snippet.png similarity index 100% rename from packages/frontend-v2/public/app_snippet.png rename to packages/frontend/public/app_snippet.png diff --git a/packages/frontend-v2/public/email_confirmation.svg b/packages/frontend/public/email_confirmation.svg similarity index 100% rename from packages/frontend-v2/public/email_confirmation.svg rename to packages/frontend/public/email_confirmation.svg diff --git a/packages/frontend-v2/public/favicon.ico b/packages/frontend/public/favicon.ico similarity index 100% rename from packages/frontend-v2/public/favicon.ico rename to packages/frontend/public/favicon.ico diff --git a/packages/frontend-v2/public/favicon.svg b/packages/frontend/public/favicon.svg similarity index 100% rename from packages/frontend-v2/public/favicon.svg rename to packages/frontend/public/favicon.svg diff --git a/packages/frontend-v2/public/home_simplified.svg b/packages/frontend/public/home_simplified.svg similarity index 100% rename from packages/frontend-v2/public/home_simplified.svg rename to packages/frontend/public/home_simplified.svg diff --git a/packages/frontend-v2/public/husky.svg b/packages/frontend/public/husky.svg similarity index 100% rename from packages/frontend-v2/public/husky.svg rename to packages/frontend/public/husky.svg diff --git a/packages/frontend-v2/public/landing_graduate.svg b/packages/frontend/public/landing_graduate.svg similarity index 100% rename from packages/frontend-v2/public/landing_graduate.svg rename to packages/frontend/public/landing_graduate.svg diff --git a/packages/frontend-v2/public/landing_personalize.svg b/packages/frontend/public/landing_personalize.svg similarity index 100% rename from packages/frontend-v2/public/landing_personalize.svg rename to packages/frontend/public/landing_personalize.svg diff --git a/packages/frontend-v2/public/landing_start.png b/packages/frontend/public/landing_start.png similarity index 100% rename from packages/frontend-v2/public/landing_start.png rename to packages/frontend/public/landing_start.png diff --git a/packages/frontend-v2/public/landing_start.svg b/packages/frontend/public/landing_start.svg similarity index 100% rename from packages/frontend-v2/public/landing_start.svg rename to packages/frontend/public/landing_start.svg diff --git a/packages/frontend-v2/public/logo.svg b/packages/frontend/public/logo.svg similarity index 100% rename from packages/frontend-v2/public/logo.svg rename to packages/frontend/public/logo.svg diff --git a/packages/frontend-v2/public/sad_face.svg b/packages/frontend/public/sad_face.svg similarity index 100% rename from packages/frontend-v2/public/sad_face.svg rename to packages/frontend/public/sad_face.svg diff --git a/packages/frontend-v2/tsconfig.json b/packages/frontend/tsconfig.json similarity index 100% rename from packages/frontend-v2/tsconfig.json rename to packages/frontend/tsconfig.json diff --git a/packages/frontend-v2/utils/constants.ts b/packages/frontend/utils/constants.ts similarity index 100% rename from packages/frontend-v2/utils/constants.ts rename to packages/frontend/utils/constants.ts diff --git a/packages/frontend-v2/utils/course/getCourseCoreqs.ts b/packages/frontend/utils/course/getCourseCoreqs.ts similarity index 100% rename from packages/frontend-v2/utils/course/getCourseCoreqs.ts rename to packages/frontend/utils/course/getCourseCoreqs.ts diff --git a/packages/frontend-v2/utils/course/getCourseDisplayString.ts b/packages/frontend/utils/course/getCourseDisplayString.ts similarity index 100% rename from packages/frontend-v2/utils/course/getCourseDisplayString.ts rename to packages/frontend/utils/course/getCourseDisplayString.ts diff --git a/packages/frontend-v2/utils/course/index.ts b/packages/frontend/utils/course/index.ts similarity index 100% rename from packages/frontend-v2/utils/course/index.ts rename to packages/frontend/utils/course/index.ts diff --git a/packages/frontend-v2/utils/course/isCourseFromSidebar.ts b/packages/frontend/utils/course/isCourseFromSidebar.ts similarity index 100% rename from packages/frontend-v2/utils/course/isCourseFromSidebar.ts rename to packages/frontend/utils/course/isCourseFromSidebar.ts diff --git a/packages/frontend-v2/utils/course/isEqualCourses.ts b/packages/frontend/utils/course/isEqualCourses.ts similarity index 100% rename from packages/frontend-v2/utils/course/isEqualCourses.ts rename to packages/frontend/utils/course/isEqualCourses.ts diff --git a/packages/frontend-v2/utils/error/handleApiClientError.ts b/packages/frontend/utils/error/handleApiClientError.ts similarity index 100% rename from packages/frontend-v2/utils/error/handleApiClientError.ts rename to packages/frontend/utils/error/handleApiClientError.ts diff --git a/packages/frontend-v2/utils/error/handleWeakPasswordError.ts b/packages/frontend/utils/error/handleWeakPasswordError.ts similarity index 100% rename from packages/frontend-v2/utils/error/handleWeakPasswordError.ts rename to packages/frontend/utils/error/handleWeakPasswordError.ts diff --git a/packages/frontend-v2/utils/error/index.ts b/packages/frontend/utils/error/index.ts similarity index 100% rename from packages/frontend-v2/utils/error/index.ts rename to packages/frontend/utils/error/index.ts diff --git a/packages/frontend-v2/utils/index.ts b/packages/frontend/utils/index.ts similarity index 100% rename from packages/frontend-v2/utils/index.ts rename to packages/frontend/utils/index.ts diff --git a/packages/frontend-v2/utils/logger.ts b/packages/frontend/utils/logger.ts similarity index 85% rename from packages/frontend-v2/utils/logger.ts rename to packages/frontend/utils/logger.ts index 2850e5a21..aaf870038 100644 --- a/packages/frontend-v2/utils/logger.ts +++ b/packages/frontend/utils/logger.ts @@ -1,8 +1,8 @@ type LogType = "info" | "debug" | "warn" | "error"; /** - * A logger utilty that encapsulates all logging logic. This will eventually have logic that - * handles production logging using tools like sentry. + * A logger utilty that encapsulates all logging logic. This will eventually + * have logic that handles production logging using tools like sentry. */ const log = (type: LogType, ...messages: unknown[]) => { console[type](...messages); diff --git a/packages/frontend-v2/utils/logout.ts b/packages/frontend/utils/logout.ts similarity index 100% rename from packages/frontend-v2/utils/logout.ts rename to packages/frontend/utils/logout.ts diff --git a/packages/frontend-v2/utils/plan/addClassesToTerm.ts b/packages/frontend/utils/plan/addClassesToTerm.ts similarity index 100% rename from packages/frontend-v2/utils/plan/addClassesToTerm.ts rename to packages/frontend/utils/plan/addClassesToTerm.ts diff --git a/packages/frontend-v2/utils/plan/addEmptyDndYearToPlan.ts b/packages/frontend/utils/plan/addEmptyDndYearToPlan.ts similarity index 100% rename from packages/frontend-v2/utils/plan/addEmptyDndYearToPlan.ts rename to packages/frontend/utils/plan/addEmptyDndYearToPlan.ts diff --git a/packages/frontend-v2/utils/plan/cleanDndIdsFromPlan.ts b/packages/frontend/utils/plan/cleanDndIdsFromPlan.ts similarity index 100% rename from packages/frontend-v2/utils/plan/cleanDndIdsFromPlan.ts rename to packages/frontend/utils/plan/cleanDndIdsFromPlan.ts diff --git a/packages/frontend-v2/utils/plan/createEmptySchedule.ts b/packages/frontend/utils/plan/createEmptySchedule.ts similarity index 100% rename from packages/frontend-v2/utils/plan/createEmptySchedule.ts rename to packages/frontend/utils/plan/createEmptySchedule.ts diff --git a/packages/frontend-v2/utils/plan/findCourseByDndId.ts b/packages/frontend/utils/plan/findCourseByDndId.ts similarity index 100% rename from packages/frontend-v2/utils/plan/findCourseByDndId.ts rename to packages/frontend/utils/plan/findCourseByDndId.ts diff --git a/packages/frontend-v2/utils/plan/findTerm.ts b/packages/frontend/utils/plan/findTerm.ts similarity index 100% rename from packages/frontend-v2/utils/plan/findTerm.ts rename to packages/frontend/utils/plan/findTerm.ts diff --git a/packages/frontend-v2/utils/plan/getAllCoursesFromPlan.ts b/packages/frontend/utils/plan/getAllCoursesFromPlan.ts similarity index 100% rename from packages/frontend-v2/utils/plan/getAllCoursesFromPlan.ts rename to packages/frontend/utils/plan/getAllCoursesFromPlan.ts diff --git a/packages/frontend-v2/utils/plan/getAllCoursesInMajor.ts b/packages/frontend/utils/plan/getAllCoursesInMajor.ts similarity index 100% rename from packages/frontend-v2/utils/plan/getAllCoursesInMajor.ts rename to packages/frontend/utils/plan/getAllCoursesInMajor.ts diff --git a/packages/frontend-v2/utils/plan/getSeasonDisplayWord.ts b/packages/frontend/utils/plan/getSeasonDisplayWord.ts similarity index 100% rename from packages/frontend-v2/utils/plan/getSeasonDisplayWord.ts rename to packages/frontend/utils/plan/getSeasonDisplayWord.ts diff --git a/packages/frontend-v2/utils/plan/getSectionError.ts b/packages/frontend/utils/plan/getSectionError.ts similarity index 95% rename from packages/frontend-v2/utils/plan/getSectionError.ts rename to packages/frontend/utils/plan/getSectionError.ts index 3d7d4671b..8da5c3967 100644 --- a/packages/frontend-v2/utils/plan/getSectionError.ts +++ b/packages/frontend/utils/plan/getSectionError.ts @@ -46,7 +46,9 @@ export const getSectionError = ( minRequiredChildCount: 0, maxPossibleChildCount: 0, }; - } else if (andReq.type == MajorValidationErrorType.And.UnsatChildAndNoSolution) { + } else if ( + andReq.type == MajorValidationErrorType.And.UnsatChildAndNoSolution + ) { if (andReq.noSolution.discoveredAtChild === index) { return { type: "SECTION", diff --git a/packages/frontend-v2/utils/plan/index.ts b/packages/frontend/utils/plan/index.ts similarity index 100% rename from packages/frontend-v2/utils/plan/index.ts rename to packages/frontend/utils/plan/index.ts diff --git a/packages/frontend-v2/utils/plan/isCourseInTerm.ts b/packages/frontend/utils/plan/isCourseInTerm.ts similarity index 100% rename from packages/frontend-v2/utils/plan/isCourseInTerm.ts rename to packages/frontend/utils/plan/isCourseInTerm.ts diff --git a/packages/frontend-v2/utils/plan/preAndCoReqCheck.ts b/packages/frontend/utils/plan/preAndCoReqCheck.ts similarity index 100% rename from packages/frontend-v2/utils/plan/preAndCoReqCheck.ts rename to packages/frontend/utils/plan/preAndCoReqCheck.ts diff --git a/packages/frontend-v2/utils/plan/preparePlanForDnd.ts b/packages/frontend/utils/plan/preparePlanForDnd.ts similarity index 100% rename from packages/frontend-v2/utils/plan/preparePlanForDnd.ts rename to packages/frontend/utils/plan/preparePlanForDnd.ts diff --git a/packages/frontend-v2/utils/plan/removeCourseFromTerm.ts b/packages/frontend/utils/plan/removeCourseFromTerm.ts similarity index 100% rename from packages/frontend-v2/utils/plan/removeCourseFromTerm.ts rename to packages/frontend/utils/plan/removeCourseFromTerm.ts diff --git a/packages/frontend-v2/utils/plan/removeYearFromPlan.ts b/packages/frontend/utils/plan/removeYearFromPlan.ts similarity index 100% rename from packages/frontend-v2/utils/plan/removeYearFromPlan.ts rename to packages/frontend/utils/plan/removeYearFromPlan.ts diff --git a/packages/frontend-v2/utils/plan/supportedMajors.ts b/packages/frontend/utils/plan/supportedMajors.ts similarity index 100% rename from packages/frontend-v2/utils/plan/supportedMajors.ts rename to packages/frontend/utils/plan/supportedMajors.ts diff --git a/packages/frontend-v2/utils/plan/totalCredits.ts b/packages/frontend/utils/plan/totalCredits.ts similarity index 100% rename from packages/frontend-v2/utils/plan/totalCredits.ts rename to packages/frontend/utils/plan/totalCredits.ts diff --git a/packages/frontend-v2/utils/plan/updatePlanForStudent.ts b/packages/frontend/utils/plan/updatePlanForStudent.ts similarity index 100% rename from packages/frontend-v2/utils/plan/updatePlanForStudent.ts rename to packages/frontend/utils/plan/updatePlanForStudent.ts diff --git a/packages/frontend-v2/utils/plan/updatePlanOnDragEnd.ts b/packages/frontend/utils/plan/updatePlanOnDragEnd.ts similarity index 100% rename from packages/frontend-v2/utils/plan/updatePlanOnDragEnd.ts rename to packages/frontend/utils/plan/updatePlanOnDragEnd.ts diff --git a/packages/frontend-v2/utils/student/cleanDndIdsFromStudent.ts b/packages/frontend/utils/student/cleanDndIdsFromStudent.ts similarity index 100% rename from packages/frontend-v2/utils/student/cleanDndIdsFromStudent.ts rename to packages/frontend/utils/student/cleanDndIdsFromStudent.ts diff --git a/packages/frontend-v2/utils/student/index.ts b/packages/frontend/utils/student/index.ts similarity index 100% rename from packages/frontend-v2/utils/student/index.ts rename to packages/frontend/utils/student/index.ts diff --git a/packages/frontend-v2/utils/theme/components/buttons.ts b/packages/frontend/utils/theme/components/buttons.ts similarity index 100% rename from packages/frontend-v2/utils/theme/components/buttons.ts rename to packages/frontend/utils/theme/components/buttons.ts diff --git a/packages/frontend-v2/utils/theme/components/spinners.ts b/packages/frontend/utils/theme/components/spinners.ts similarity index 100% rename from packages/frontend-v2/utils/theme/components/spinners.ts rename to packages/frontend/utils/theme/components/spinners.ts diff --git a/packages/frontend-v2/utils/theme/index.ts b/packages/frontend/utils/theme/index.ts similarity index 100% rename from packages/frontend-v2/utils/theme/index.ts rename to packages/frontend/utils/theme/index.ts diff --git a/packages/frontend-v2/utils/toast.ts b/packages/frontend/utils/toast.ts similarity index 100% rename from packages/frontend-v2/utils/toast.ts rename to packages/frontend/utils/toast.ts diff --git a/packages/frontend-v2/utils/validation/index.ts b/packages/frontend/utils/validation/index.ts similarity index 100% rename from packages/frontend-v2/utils/validation/index.ts rename to packages/frontend/utils/validation/index.ts diff --git a/packages/frontend-v2/utils/validation/noLeadOrTrailWhitespacePattern.ts b/packages/frontend/utils/validation/noLeadOrTrailWhitespacePattern.ts similarity index 100% rename from packages/frontend-v2/utils/validation/noLeadOrTrailWhitespacePattern.ts rename to packages/frontend/utils/validation/noLeadOrTrailWhitespacePattern.ts diff --git a/packages/frontend/validation-worker/worker-messages.ts b/packages/frontend/validation-worker/worker-messages.ts new file mode 100644 index 000000000..72bb8adc5 --- /dev/null +++ b/packages/frontend/validation-worker/worker-messages.ts @@ -0,0 +1,26 @@ +import { + Major2, + MajorValidationResult, + ScheduleCourse2, +} from "@graduate/common"; + +export type WorkerMessage = Loaded | ValidationResult; + +export enum WorkerMessageType { + Loaded = "Loaded", + ValidationResult = "ValidationResult", +} + +export type ValidationResult = { + type: WorkerMessageType.ValidationResult; + result: MajorValidationResult; + requestNumber: number; +}; +export type Loaded = { type: WorkerMessageType.Loaded }; + +export interface WorkerPostInfo { + major: Major2; + taken: ScheduleCourse2[]; + concentration?: string; + requestNumber: number; +} diff --git a/packages/frontend/validation-worker/worker.ts b/packages/frontend/validation-worker/worker.ts new file mode 100644 index 000000000..8ba319655 --- /dev/null +++ b/packages/frontend/validation-worker/worker.ts @@ -0,0 +1,21 @@ +import { validateMajor2 } from "@graduate/common"; +import { + Loaded, + ValidationResult, + WorkerMessageType, + WorkerPostInfo, +} from "./worker-messages"; + +// Let the host page know the worker is ready. +const loadMessage: Loaded = { type: WorkerMessageType.Loaded }; +postMessage(loadMessage); + +addEventListener("message", ({ data }: MessageEvent) => { + const validationResult: ValidationResult = { + type: WorkerMessageType.ValidationResult, + result: validateMajor2(data.major, data.taken, data.concentration), + requestNumber: data.requestNumber, + }; + + postMessage(validationResult); +}); diff --git a/yarn.lock b/yarn.lock index e739a47b0..8c70bad03 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3086,9 +3086,9 @@ __metadata: languageName: unknown linkType: soft -"@graduate/api-v2@workspace:packages/api-v2": +"@graduate/api@workspace:packages/api": version: 0.0.0-use.local - resolution: "@graduate/api-v2@workspace:packages/api-v2" + resolution: "@graduate/api@workspace:packages/api" dependencies: "@golevelup/ts-jest": ^0.3.2 "@graduate/common": "workspace:*" @@ -3147,9 +3147,9 @@ __metadata: languageName: unknown linkType: soft -"@graduate/frontend-v2@workspace:packages/frontend-v2": +"@graduate/frontend@workspace:packages/frontend": version: 0.0.0-use.local - resolution: "@graduate/frontend-v2@workspace:packages/frontend-v2" + resolution: "@graduate/frontend@workspace:packages/frontend" dependencies: "@chakra-ui/icons": ^2.0.0 "@chakra-ui/react": ^2.0.0