Skip to content

Commit 35649c3

Browse files
committed
Housing keeping
1 parent 7b21c41 commit 35649c3

File tree

5 files changed

+39
-28
lines changed

5 files changed

+39
-28
lines changed

.env

Lines changed: 0 additions & 3 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ We use github to host code, to track issues and feature requests, as well as acc
1616

1717
Pull requests are the best way to propose changes to the codebase. We actively welcome your pull requests:
1818

19-
1. Fork the repo and create your branch from `main`.
19+
1. Fork the repo and create your branch from `dev`.
2020
2. If you've added code that should be tested, add tests.
2121
3. Ensure the test suite passes.
2222
4. Make sure your code lints.

README.md

Lines changed: 37 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@
8686
</br>
8787
</br>
8888
<br/>
89-
<br/>
90-
<br/>
9189
9290
# Accessing Grafana
9391
@@ -156,8 +154,6 @@
156154
157155
</br>
158156
<br/>
159-
<br/>
160-
<br/>
161157
162158
# Accessing Prometheus <br/></br>
163159
@@ -193,7 +189,37 @@
193189
194190
</br>
195191
<br/>
196-
<br/>
192+
193+
194+
# Running Zeus
195+
196+
1. Fork and clone the `dev` branch onto your local branch.
197+
``` bash
198+
https://github.com/oslabs-beta/Zeus.git
199+
```
200+
201+
2. Install all the dependencies
202+
``` bash
203+
npm install
204+
```
205+
3. Create ```process.env``` file at the root directory
206+
``` bash
207+
root
208+
├─ process.env
209+
├─ electron
210+
└─ src
211+
```
212+
4. Connect to NoSQL database in .env
213+
214+
``` js
215+
mongoURI = "Your NoSQL URI string"
216+
```
217+
5. Ensure your cluster is running and then you can start the application with:
218+
``` bash
219+
npm run electron
220+
```
221+
222+
</br>
197223
<br/>
198224

199225
# Made with
@@ -226,9 +252,9 @@
226252
![Prometheus](https://img.shields.io/badge/Prometheus-E6522C?style=for-the-badge&logo=Prometheus&logoColor=white)
227253

228254
</br>
255+
229256
<br/>
230-
<br/>
231-
<br/>
257+
232258

233259
# Contributions
234260

@@ -249,10 +275,10 @@ guidelines from this repo.
249275
``` bash
250276
npm install
251277
```
252-
4. Create ```.env``` file at the root directory
278+
4. Create ```process.env``` file at the root directory
253279
``` bash
254280
root
255-
├─ .env
281+
├─ process.env
256282
├─ electron
257283
└─ src
258284
```
@@ -269,13 +295,10 @@ guidelines from this repo.
269295

270296
</br>
271297
<br/>
272-
<br/>
273-
<br/>
274298

275299
# Founders
276300

277-
- Ed Cho [LinkedIn](https://www.linkedin.com/in/edcho720/)| [GitHub](https://github.com/edcho720)
301+
- Ed Cho [LinkedIn](https://www.linkedin.com/in/edcho720/) | [GitHub](https://github.com/edcho720)
278302
- John Wroge [LinkedIn](https://www.linkedin.com/in/john-wroge/) | [GitHub](https://github.com/johnwroge)
279303
- Harvey Li [LinkedIn](https://www.linkedin.com/in/harvey-li/) | [GitHub](https://github.com/harvli)
280-
- Amy (Aimée) Nguyen [LinkedIn](https://www.linkedin.com/in/aqn/) |
281-
[GitHub](https://github.com/DoctorCodeine)
304+
- Amy (Aimée) Nguyen [LinkedIn](https://www.linkedin.com/in/aqn/) | [GitHub](https://github.com/DoctorCodeine)

src/server/database/db.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ mongoose
2121
.connect(URI, {
2222
useNewUrlParser: true,
2323
useUnifiedTopology: true,
24-
dbName: 'zeus',
24+
// dbName: 'zeus',
2525
})
2626
.then(() => console.log('🦆🦆🦆🦆🦆🦆🦆🦆 Mongoose is connected'))
2727
.catch((err: ErrorRequestHandler) => {
@@ -38,5 +38,3 @@ const userSchema = new mongoose.Schema({
3838
const Users = mongoose.model('Users', userSchema);
3939
// Export db
4040
module.exports = Users;
41-
42-
export {};

tsconfig.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,5 @@
2323
],
2424
},
2525
"include": ["src/**/*", "__test__/"],
26-
27-
// "paths": {
28-
// "*": [
29-
// "node_modules/*"
30-
// ]
31-
// },
32-
// "exclude": ["node_modules"],
3326
}
3427
//"ESNext" in module

0 commit comments

Comments
 (0)