move files to server directory (#14)

* move files to server directory * Fix ci * oops * Cleanup * Another fix
acmucsd · Dec 16, 2024 · 7748bb8 · 7748bb8
1 parent 4b5deb0
commit 7748bb8
Show file tree

Hide file tree

Showing 26 changed files with 19 additions and 11 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-*	@echang594 @jennymar
+*	@echang594 @jennymar @alexzhang1618
diff --git a/.github/workflows/ci.yml → .github/workflows/backend-lint-test.yml b/.github/workflows/ci.yml → .github/workflows/backend-lint-test.yml
@@ -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
diff --git a/README.md b/README.md
@@ -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
diff --git a/.env.example → server/.env.example b/.env.example → server/.env.example
diff --git a/.eslintrc.yml → server/.eslintrc.yml b/.eslintrc.yml → server/.eslintrc.yml
diff --git a/.gitignore → server/.gitignore b/.gitignore → server/.gitignore
diff --git a/.nvmrc → server/.nvmrc b/.nvmrc → server/.nvmrc
diff --git a/DataSource.ts → server/DataSource.ts b/DataSource.ts → server/DataSource.ts
diff --git a/Dockerfile → server/Dockerfile b/Dockerfile → server/Dockerfile
diff --git a/server/README.md b/server/README.md
@@ -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
+```
diff --git a/docker-compose.yml → server/docker-compose.yml b/docker-compose.yml → server/docker-compose.yml
diff --git a/firebaseConfig.ts → server/firebaseConfig.ts b/firebaseConfig.ts → server/firebaseConfig.ts
diff --git a/index.ts → server/index.ts b/index.ts → server/index.ts
diff --git a/jest.config.json → server/jest.config.json b/jest.config.json → server/jest.config.json
diff --git a/models/UserModel.ts → server/models/UserModel.ts b/models/UserModel.ts → server/models/UserModel.ts
diff --git a/models/index.ts → server/models/index.ts b/models/index.ts → server/models/index.ts
diff --git a/package.json → server/package.json b/package.json → server/package.json
diff --git a/repositories/UserRepository.ts → server/repositories/UserRepository.ts b/repositories/UserRepository.ts → server/repositories/UserRepository.ts
diff --git a/repositories/index.ts → server/repositories/index.ts b/repositories/index.ts → server/repositories/index.ts
diff --git a/services/FirebaseService.ts → server/services/FirebaseService.ts b/services/FirebaseService.ts → server/services/FirebaseService.ts
diff --git a/services/UserService.ts → server/services/UserService.ts b/services/UserService.ts → server/services/UserService.ts
diff --git a/tests/sample.test.ts → server/tests/sample.test.ts b/tests/sample.test.ts → server/tests/sample.test.ts
diff --git a/tsconfig.json → server/tsconfig.json b/tsconfig.json → server/tsconfig.json
diff --git a/types/Enums.ts → server/types/Enums.ts b/types/Enums.ts → server/types/Enums.ts
diff --git a/types/Internal.ts → server/types/Internal.ts b/types/Internal.ts → server/types/Internal.ts
diff --git a/yarn.lock → server/yarn.lock b/yarn.lock → server/yarn.lock
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		* @echang594 @jennymar
		* @echang594 @jennymar @alexzhang1618