acmucsd
diff --git a/‎.github/CODEOWNERS
+1-1 b/‎.github/CODEOWNERS
+1-1
diff --git a/‎.github/workflows/ci.yml renamed to ‎.github/workflows/backend-lint-test.yml
+7-2 b/‎.github/workflows/ci.yml renamed to ‎.github/workflows/backend-lint-test.yml
+7-2
diff --git a/‎README.md
+4-8 b/‎README.md
+4-8
diff --git a/‎.env.example renamed to ‎server/.env.example b/‎.env.example renamed to ‎server/.env.example
diff --git a/‎.eslintrc.yml renamed to ‎server/.eslintrc.yml b/‎.eslintrc.yml renamed to ‎server/.eslintrc.yml
diff --git a/‎.gitignore renamed to ‎server/.gitignore b/‎.gitignore renamed to ‎server/.gitignore
diff --git a/‎.nvmrc renamed to ‎server/.nvmrc b/‎.nvmrc renamed to ‎server/.nvmrc
diff --git a/‎DataSource.ts renamed to ‎server/DataSource.ts b/‎DataSource.ts renamed to ‎server/DataSource.ts
diff --git a/‎Dockerfile renamed to ‎server/Dockerfile b/‎Dockerfile renamed to ‎server/Dockerfile
diff --git a/‎server/README.md
+7 b/‎server/README.md
+7
diff --git a/‎docker-compose.yml renamed to ‎server/docker-compose.yml b/‎docker-compose.yml renamed to ‎server/docker-compose.yml
diff --git a/‎firebaseConfig.ts renamed to ‎server/firebaseConfig.ts b/‎firebaseConfig.ts renamed to ‎server/firebaseConfig.ts
diff --git a/‎index.ts renamed to ‎server/index.ts b/‎index.ts renamed to ‎server/index.ts
diff --git a/‎jest.config.json renamed to ‎server/jest.config.json b/‎jest.config.json renamed to ‎server/jest.config.json
diff --git a/‎models/UserModel.ts renamed to ‎server/models/UserModel.ts b/‎models/UserModel.ts renamed to ‎server/models/UserModel.ts
diff --git a/‎models/index.ts renamed to ‎server/models/index.ts b/‎models/index.ts renamed to ‎server/models/index.ts
diff --git a/‎package.json renamed to ‎server/package.json b/‎package.json renamed to ‎server/package.json
diff --git a/‎repositories/UserRepository.ts renamed to ‎server/repositories/UserRepository.ts b/‎repositories/UserRepository.ts renamed to ‎server/repositories/UserRepository.ts
diff --git a/‎repositories/index.ts renamed to ‎server/repositories/index.ts b/‎repositories/index.ts renamed to ‎server/repositories/index.ts
diff --git a/‎services/FirebaseService.ts renamed to ‎server/services/FirebaseService.ts b/‎services/FirebaseService.ts renamed to ‎server/services/FirebaseService.ts
diff --git a/‎services/UserService.ts renamed to ‎server/services/UserService.ts b/‎services/UserService.ts renamed to ‎server/services/UserService.ts
diff --git a/‎tests/sample.test.ts renamed to ‎server/tests/sample.test.ts b/‎tests/sample.test.ts renamed to ‎server/tests/sample.test.ts
diff --git a/‎tsconfig.json renamed to ‎server/tsconfig.json b/‎tsconfig.json renamed to ‎server/tsconfig.json
diff --git a/‎types/Enums.ts renamed to ‎server/types/Enums.ts b/‎types/Enums.ts renamed to ‎server/types/Enums.ts
diff --git a/‎types/Internal.ts renamed to ‎server/types/Internal.ts b/‎types/Internal.ts renamed to ‎server/types/Internal.ts
diff --git a/‎yarn.lock renamed to ‎server/yarn.lock b/‎yarn.lock renamed to ‎server/yarn.lock
@@ -1 +1 @@
-*	@echang594 @jennymar
+*	@echang594 @jennymar @alexzhang1618
@@ -1,4 +1,4 @@
-name: Linting and Testing
+name: Backend - Linting and Testing
 on:
   pull_request:
     branches:
@@ -16,10 +16,13 @@ jobs:
           node-version: '20'
 
       - name: Install dependencies
+        working-directory: ./server
         run: yarn install --frozen-lockfile
 
       - name: Run ESLint
+        working-directory: ./server
         run: yarn lint
+
   test:
     runs-on: ubuntu-latest
     needs: lint
@@ -33,7 +36,9 @@ jobs:
           node-version: '20'
 
       - name: Install dependencies
-        run: yarn install
+        working-directory: ./server
+        run: yarn install --frozen-lockfile
 
       - name: Run tests
+        working-directory: ./server
         run: yarn test
@@ -1,9 +1,5 @@
-# hackathon-portal
+## Hackathon Portal
 
-## Setup
-1. Copy `.env.example` to `.env` and fill in the values
-1. Start up Docker Desktop
-2. Spin up Postgres:
-```bash
-docker-compose up
-```
+# Repo Structure
+- `server`: backend
+- `client`: frontend
@@ -0,0 +1,7 @@
+## Setup
+1. Copy `.env.example` to `.env` and fill in the values
+1. Start up Docker Desktop
+2. Spin up Postgres:
+```bash
+docker-compose up
+```
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-* @echang594 @jennymar`
	`1`	`+* @echang594 @jennymar @alexzhang1618`