Skip to content

Linting #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 25 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
f6c5f82
completing 1 -> static pages
markmacw Oct 10, 2024
0e5ed0c
Merge pull request #1 from markmacw/1-static-pages
markmacw Oct 10, 2024
032739f
Build the client-side and configure it
markmacw Oct 11, 2024
7e6f7d7
build client side
markmacw Oct 11, 2024
3a3c2cc
Merge pull request #2 from markmacw/2build-client-side
markmacw Oct 11, 2024
c97aeff
tested - login screen visible when clicking link now
markmacw Oct 11, 2024
030c390
Merge pull request #3 from markmacw/2b-add-login-view
markmacw Oct 11, 2024
b2d3919
added the logout functionality
markmacw Oct 11, 2024
dd042ea
Merge pull request #4 from markmacw/2c-logout
markmacw Oct 11, 2024
2d2c874
added registration, test complete
markmacw Oct 11, 2024
d4361ae
Merge pull request #5 from markmacw/2d-add-registration
markmacw Oct 11, 2024
19343c4
NPM, Docker and gitignore:
markmacw Oct 15, 2024
89c2f66
car_make and car_models created and tested
markmacw Oct 16, 2024
259f103
Merge pull request #6 from markmacw/3-backend-A-express-mongo
markmacw Oct 16, 2024
c78a1ae
=Create Django Proxy Services Of Backend APIs
markmacw Oct 21, 2024
849dfd4
Merge pull request #7 from markmacw/django-proxy
markmacw Oct 21, 2024
7924e7e
oct partwaychagese
markmacw Oct 22, 2024
f5d1bea
Merge pull request #8 from markmacw/oct
markmacw Oct 22, 2024
2d18fe6
added reviews
markmacw Oct 22, 2024
0ff1e2e
Merge pull request #9 from markmacw/addReviews
markmacw Oct 22, 2024
7b40187
Create main.yml
markmacw Oct 23, 2024
7319101
made changes to fix linting errors
markmacw Oct 23, 2024
579b924
linting run 2
markmacw Oct 23, 2024
c57a6f4
linting go 3
markmacw Oct 23, 2024
8a7c914
linting 4
markmacw Oct 23, 2024
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
59 changes: 59 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: 'Lint Code'

on:
push:
branches: [master, main]
pull_request:
branches: [master, main]

jobs:
lint_python:
name: Lint Python Files
runs-on: ubuntu-latest

steps:

- name: Checkout Repository
uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.12

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install flake8

- name: Print working directory
run: pwd

- name: Run Linter
run: |
pwd
# This command finds all Python files recursively and runs flake8 on them
find . -name "*.py" -exec flake8 {} +
echo "Linted all the python files successfully"

lint_js:
name: Lint JavaScript Files
runs-on: ubuntu-latest

steps:
- name: Checkout Repository
uses: actions/checkout@v3

- name: Install Node.js
uses: actions/setup-node@v3
with:
node-version: 14

- name: Install JSHint
run: npm install jshint --global

- name: Run Linter
run: |
# This command finds all JavaScript files recursively and runs JSHint on them
find ./server/database -name "*.js" -exec jshint {} +
echo "Linted all the js files successfully"
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Node Modules
node_modules/

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
Expand Down
14 changes: 14 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Django Shell",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/manage.py",
"args": ["shell"],
"django": true,
"console": "integratedTerminal"
}
]
}
114 changes: 65 additions & 49 deletions server/database/app.js
Original file line number Diff line number Diff line change
@@ -1,100 +1,116 @@
const express = require('express');
const mongoose = require('mongoose');
const fs = require('fs');
const cors = require('cors')
const app = express()
const port = 3030;

app.use(cors())
app.use(require('body-parser').urlencoded({ extended: false }));
/*jshint esversion: 8 */

const reviews_data = JSON.parse(fs.readFileSync("reviews.json", 'utf8'));
const dealerships_data = JSON.parse(fs.readFileSync("dealerships.json", 'utf8'));
const express = require("express");
const mongoose = require("mongoose");
const fs = require("fs");
const cors = require("cors");
const app = express();
const port = 3030;

mongoose.connect("mongodb://mongo_db:27017/",{'dbName':'dealershipsDB'});
app.use(cors());
app.use(require("body-parser").urlencoded({ extended: false }));

const reviews_data = JSON.parse(fs.readFileSync("reviews.json", "utf8"));
const dealerships_data = JSON.parse(
fs.readFileSync("dealerships.json", "utf8")
);

const Reviews = require('./review');
mongoose.connect("mongodb://mongo_db:27017/", { dbName: "dealershipsDB" });

const Dealerships = require('./dealership');
const Reviews = require("./review");
const Dealerships = require("./dealership");

try {
Reviews.deleteMany({}).then(()=>{
Reviews.insertMany(reviews_data['reviews']);
Reviews.deleteMany({}).then(() => {
Reviews.insertMany(reviews_data.reviews);
});
Dealerships.deleteMany({}).then(()=>{
Dealerships.insertMany(dealerships_data['dealerships']);
Dealerships.deleteMany({}).then(() => {
Dealerships.insertMany(dealerships_data.dealerships);
});

} catch (error) {
res.status(500).json({ error: 'Error fetching documents' });
res.status(500).json({ error: "Error fetching documents" });
}


// Express route to home
app.get('/', async (req, res) => {
res.send("Welcome to the Mongoose API")
app.get("/", async (req, res) => {
res.send("Welcome to the Mongoose API");
});

// Express route to fetch all reviews
app.get('/fetchReviews', async (req, res) => {
app.get("/fetchReviews", async (req, res) => {
try {
const documents = await Reviews.find();
res.json(documents);
} catch (error) {
res.status(500).json({ error: 'Error fetching documents' });
res.status(500).json({ error: "Error fetching documents" });
}
});

// Express route to fetch reviews by a particular dealer
app.get('/fetchReviews/dealer/:id', async (req, res) => {
app.get("/fetchReviews/dealer/:id", async (req, res) => {
try {
const documents = await Reviews.find({dealership: req.params.id});
const documents = await Reviews.find({ dealership: req.params.id });
res.json(documents);
} catch (error) {
res.status(500).json({ error: 'Error fetching documents' });
res.status(500).json({ error: "Error fetching documents" });
}
});

// Express route to fetch all dealerships
app.get('/fetchDealers', async (req, res) => {
//Write your code here
app.get("/fetchDealers", async (req, res) => {
try {
const documents = await Dealerships.find();
res.json(documents);
} catch (error) {
res.status(500).json({ error: "Error fetching documents" });
}
});

// Express route to fetch Dealers by a particular state
app.get('/fetchDealers/:state', async (req, res) => {
//Write your code here
app.get("/fetchDealers/:state", async (req, res) => {
//Write your code here
try {
const documents = await Dealerships.find({ state: req.params.state });
res.json(documents);
} catch (error) {
res.statu(500).json({ error: "Error fetching documents" });
}
});

// Express route to fetch dealer by a particular id
app.get('/fetchDealer/:id', async (req, res) => {
//Write your code here
app.get("/fetchDealer/:id", async (req, res) => {
try {
const documents = await Dealerships.find({ id: req.params.id });
res.json(documents);
} catch (error) {
res.status(500).json({ error: "Error fetching documents" });
}
});

//Express route to insert review
app.post('/insert_review', express.raw({ type: '*/*' }), async (req, res) => {
app.post("/insert_review", express.raw({ type: "*/*" }), async (req, res) => {
data = JSON.parse(req.body);
const documents = await Reviews.find().sort( { id: -1 } )
let new_id = documents[0]['id']+1
const documents = await Reviews.find().sort({ id: -1 });
let new_id = documents[0].id + 1;

const review = new Reviews({
"id": new_id,
"name": data['name'],
"dealership": data['dealership'],
"review": data['review'],
"purchase": data['purchase'],
"purchase_date": data['purchase_date'],
"car_make": data['car_make'],
"car_model": data['car_model'],
"car_year": data['car_year'],
});
id: new_id,
name: data.name,
dealership: data.dealership,
review: data.review,
purchase: data.purchase,
purchase_date: data.purchase_date,
car_make: data.care_make,
car_model: data.car_model,
car_year: data.car_year,
});

try {
const savedReview = await review.save();
res.json(savedReview);
} catch (error) {
console.log(error);
res.status(500).json({ error: 'Error inserting review' });
console.log(error);
res.status(500).json({ error: "Error inserting review" });
}
});

Expand Down
27 changes: 14 additions & 13 deletions server/database/dealership.js
Original file line number Diff line number Diff line change
@@ -1,43 +1,44 @@
const mongoose = require('mongoose');
/*jshint esversion: 8 */
const mongoose = require("mongoose");

const Schema = mongoose.Schema;

const dealerships = new Schema({
id: {
id: {
type: Number,
required: true,
},
city: {
},
city: {
type: String,
required: true
required: true,
},
state: {
type: String,
required: true
required: true,
},
address: {
type: String,
required: true
required: true,
},
zip: {
type: String,
required: true
required: true,
},
lat: {
type: String,
required: true
required: true,
},
long: {
type: String,
required: true
required: true,
},
short_name: {
type: String,
},
full_name: {
type: String,
required: true
}
required: true,
},
});

module.exports = mongoose.model('dealerships', dealerships);
module.exports = mongoose.model("dealerships", dealerships);
36 changes: 19 additions & 17 deletions server/database/inventory.js
Original file line number Diff line number Diff line change
@@ -1,33 +1,35 @@
const { Int32 } = require('mongodb');
const mongoose = require('mongoose');
/*jshint esversion: 8 */

const { Int32 } = require("mongodb");
const mongoose = require("mongoose");

const Schema = mongoose.Schema;

const cars = new Schema({
dealer_id: {
dealer_id: {
type: Number,
required: true
},
make: {
required: true,
},
make: {
type: String,
required: true
required: true,
},
model: {
model: {
type: String,
required: true
required: true,
},
bodyType: {
bodyType: {
type: String,
required: true
required: true,
},
year: {
year: {
type: Number,
required: true
required: true,
},
mileage: {
mileage: {
type: Number,
required: true
}
required: true,
},
});

module.exports = mongoose.model('cars', cars);
module.exports = mongoose.model("cars", cars);
Loading