Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/backend-deploy-coverage-report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-latest
defaults:
run:
working-directory: insighthub-backend
working-directory: nextstep-backend
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -35,7 +35,7 @@ jobs:
envkey_TOKEN_EXPIRATION: 30s
envkey_REFRESH_TOKEN_SECRET: 2a955a8b802eab6c693ba116f5e1bc8d2d2cf5e5e83e579cecb3fc363fb077229a801e7392f348d3c370e2383169cab80f556421d3ec2186def5d36ed5a317b6
envkey_REFRESH_TOKEN_EXPIRATION: 1d
file_name: insighthub-backend/.env
file_name: nextstep-backend/.env
fail_on_empty: true
sort_keys: false
- name: Start MongoDB
Expand All @@ -56,7 +56,7 @@ jobs:
if: always()
uses: actions/upload-pages-artifact@v3
with:
path: 'insighthub-backend/coverage/lcov-report'
path: 'nextstep-backend/coverage/lcov-report'
name: 'github-pages'
- name: Deploy to GitHub Pages
if: always()
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/backend-run-all-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
defaults:
run:
working-directory: insighthub-backend
working-directory: nextstep-backend
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -25,7 +25,7 @@ jobs:
envkey_REFRESH_TOKEN_SECRET: 2a955a8b802eab6c693ba116f5e1bc8d2d2cf5e5e83e579cecb3fc363fb077229a801e7392f348d3c370e2383169cab80f556421d3ec2186def5d36ed5a317b6
envkey_REFRESH_TOKEN_EXPIRATION: 1d
envkey_CHAT_AI_TURNED_ON: false
file_name: insighthub-backend/.env
file_name: nextstep-backend/.env
fail_on_empty: true
sort_keys: false
- name: Start MongoDB
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/frontend-run-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
defaults:
run:
working-directory: insighthub-frontend
working-directory: nextstep-frontend
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -20,7 +20,7 @@ jobs:
with:
envkey_VITE_PORT: 5000
envkey_VITE_BACKEND_URL: http://localhost:3000
file_name: insighthub-frontend/.env
file_name: nextstep-frontend/.env
fail_on_empty: true
sort_keys: false
- uses: actions/setup-node@v4
Expand Down
6 changes: 3 additions & 3 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@
"name": "Backend: Run Script: dev",
"request": "launch",
"command": "npm run dev",
"cwd": "${workspaceFolder}\\insighthub-backend"
"cwd": "${workspaceFolder}\\nextstep-backend"
},
{
"type": "node-terminal",
"name": "Backend: Run Script: test",
"request": "launch",
"command": "npm run test",
"cwd": "${workspaceFolder}\\insighthub-backend"
"cwd": "${workspaceFolder}\\nextstep-backend"
},
{
"type": "node-terminal",
"name": "Frontend: Run Script: dev",
"request": "launch",
"command": "npm run dev",
"cwd": "${workspaceFolder}\\insighthub-frontend"
"cwd": "${workspaceFolder}\\nextstep-frontend"
}
]
}
File renamed without changes.
File renamed without changes.
20 changes: 10 additions & 10 deletions insighthub-backend/README.md → nextstep-backend/README.md
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
# InsightHub Backend
# NextStep Backend

## Git Subtree

This `insighthub-backend` directory was initialized by cloning [`colman-advanced-web-apps`](https://github.com/taljacob2/colman-advanced-web-apps) repository as a [git subtree](https://www.atlassian.com/git/tutorials/git-subtree), by running the following command:
This `nextstep-backend` directory was initialized by cloning [`colman-advanced-web-apps`](https://github.com/taljacob2/colman-advanced-web-apps) repository as a [git subtree](https://www.atlassian.com/git/tutorials/git-subtree), by running the following command:

```
cd ..
git subtree add -P insighthub-backend https://github.com/taljacob2/colman-advanced-web-apps master --squash
git subtree add -P nextstep-backend https://github.com/taljacob2/colman-advanced-web-apps master --squash
```

### Check For Updates From [`colman-advanced-web-apps`](https://github.com/taljacob2/colman-advanced-web-apps) Repository

To upgrade the existing backend with the most recent version available in the [`colman-advanced-web-apps`](https://github.com/taljacob2/colman-advanced-web-apps) repository, merge it into this `insighthub-backend` directory:
To upgrade the existing backend with the most recent version available in the [`colman-advanced-web-apps`](https://github.com/taljacob2/colman-advanced-web-apps) repository, merge it into this `nextstep-backend` directory:

```
cd ..
git subtree pull -P insighthub-backend https://github.com/taljacob2/colman-advanced-web-apps master --squash
git subtree pull -P nextstep-backend https://github.com/taljacob2/colman-advanced-web-apps master --squash
```

## Prerequisites

### Configure Environment

1. As a **requirement** for running the application, create an `.env` file in the `insighthub-backend` working directory. Copy the content of the [.env.template](/insighthub-backend/.env.template) file to your newly created `.env` file. Define the environment variables there.
1. As a **requirement** for running the application, create an `.env` file in the `nextstep-backend` working directory. Copy the content of the [.env.template](/nextstep-backend/.env.template) file to your newly created `.env` file. Define the environment variables there.

1. Edit the values of the properties to match your environment.

> In case you want to run a docker environment, see our guide for [how to setup a docker environment](/insighthub-backend/docs/mongodb/mongodb-via-docker.md).
> In case you want to run a docker environment, see our guide for [how to setup a docker environment](/nextstep-backend/docs/mongodb/mongodb-via-docker.md).

## `.env`

Expand Down Expand Up @@ -78,7 +78,7 @@ You can set the NUMBER and the TIME_UNIT to your liking.

Determines the expiration time for the authentication refresh token.

You should define it in the same way as [`TOKEN_EXPIRATION`](https://github.com/Lina0Elman/InsightHub?tab=readme-ov-file#token_expiration).
You should define it in the same way as [`TOKEN_EXPIRATION`](https://github.com/NextStepFinalProject/NextStep?tab=readme-ov-file#token_expiration).

## Usage

Expand Down Expand Up @@ -108,10 +108,10 @@ Run tests:
npm run test
```

See our `main` test coverage at https://Lina0Elman.github.io/InsightHub
See our `main` test coverage at https://NextStepFinalProject.github.io/NextStep

## Documentation

See the Swagger documentation in the `/api-docs` route.

See more docs [here](/insighthub-backend/docs).
See more docs [here](/nextstep-backend/docs).
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ Also, within a network, you can refer one container to another, to depend on eac

To use the `docker-compose` command you require a `docker-compose.yaml` file, for it to read the network configuration you want it to establish.

We have pre-made a [`docker-compose.yaml`](/insighthub-backend/docker-compose.yaml) file for you to use,
We have pre-made a [`docker-compose.yaml`](/nextstep-backend/docker-compose.yaml) file for you to use,
that spins up local [mongodb](https://hub.docker.com/_/mongo) (DB) and [mongo-express](https://hub.docker.com/_/mongo-express) (UI) containers via docker.

## Usage

### Update Your [`.env`](/insighthub-backend/.env) File For [`docker-compose.yaml`](/insighthub-backend/docker-compose.yaml)
### Update Your [`.env`](/nextstep-backend/.env) File For [`docker-compose.yaml`](/nextstep-backend/docker-compose.yaml)

Before using [`docker-compose.yaml`](/insighthub-backend/docker-compose.yaml), you need to navigate to your [`.env`](/insighthub-backend/.env) file,
Before using [`docker-compose.yaml`](/nextstep-backend/docker-compose.yaml), you need to navigate to your [`.env`](/nextstep-backend/.env) file,
and update it by adding the following properties:

```
Expand Down Expand Up @@ -64,7 +64,7 @@ DB_UI_LOCAL_PORT=8061
```
### OPTIONAL: Run Raw Queries From `mongosh`
You may run raw queries for mongodb, via the `mongosh` of the `mongodb` container.
Once you `docker-compose up -d` this [`docker-compose.yaml`](/insighthub-backend/docker-compose.yaml) file,
Once you `docker-compose up -d` this [`docker-compose.yaml`](/nextstep-backend/docker-compose.yaml) file,
and the `mongodb` container is running, then execute the following commands:
View all the running containers:
```
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ex",
"version": "1.0.0",
"description": "InsightHub Backend",
"description": "NextStep Backend",
"main": "src/server.ts",
"scripts": {
"start": "tsc && node ./dist/server.js",
Expand All @@ -11,14 +11,14 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/Lina0Elman/InsightHub.git"
"url": "git+https://github.com/NextStepFinalProject/NextStep.git"
},
"author": "Mevorah Berrebi & Tal Jacob & Lina Elman & Liav Tibi",
"license": "ISC",
"bugs": {
"url": "https://github.com/Lina0Elman/InsightHub/issues"
"url": "https://github.com/NextStepFinalProject/NextStep/issues"
},
"homepage": "https://github.com/Lina0Elman/InsightHub#readme",
"homepage": "https://github.com/NextStepFinalProject/NextStep#readme",
"dependencies": {
"bcrypt": "^5.1.1",
"body-parser": "^1.20.3",
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// insighthub-backend/src/middleware/validateUser.ts
// nextstep-backend/src/middleware/validateUser.ts
import { Response, NextFunction } from 'express';
import {CustomRequest} from "types/customRequest";
import {unless} from "express-unless";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
openapi: 3.0.1
info:
title: InsightHub API
title: NextStep API
description: API for managing all the abilities.
version: 1.0.0

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# InsightHub Frontend
# NextStep Frontend

## Usage

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Insight Hub</title>
<title>Next Step</title>
</head>
<body>
<div id="root"></div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "insighthub-frontend",
"name": "nextstep-frontend",
"private": true,
"version": "0.0.0",
"type": "module",
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import './Footer.css';
const Footer: React.FC = () => {
return (
<div className="footer">
© 2025 Insight Hub. All rights reserved.
© 2025 Next Step. All rights reserved.
</div>
);
};
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ const Login: React.FC = () => {
<Container component="main" maxWidth="xs">
<Box sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', mt: 8 }}>
<Typography component="h1" variant="h3" gutterBottom>
Insight Hub
Next Step
</Typography>
<Paper elevation={3} sx={{ padding: 4, width: '100%' }}>
<Typography component="h1" variant="h5" align="center">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const Register: React.FC = () => {
<Container component="main" maxWidth="xs">
<Box sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', mt: 8 }}>
<Typography component="h1" variant="h3" gutterBottom>
Insight Hub
Next Step
</Typography>
<Paper elevation={3} sx={{ padding: 4, width: '100%' }}>
<Typography component="h1" variant="h5" align="center">
Expand Down
File renamed without changes.
File renamed without changes.
Loading