Skip to content

Commit

Permalink
Merge branch 'brian/vehicleList' of https://github.com/ubclaunchpad/m…
Browse files Browse the repository at this point in the history
…icrovan into brian/vehicleList
  • Loading branch information
bpbrianpark committed Nov 17, 2023
2 parents 6268438 + f76510a commit 3bdaae3
Show file tree
Hide file tree
Showing 50 changed files with 19,301 additions and 4,085 deletions.
31 changes: 31 additions & 0 deletions .github/workflows/frontend-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Build Pipeline for Node and React

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

jobs:
build:
runs-on: ubuntu-latest
defaults:
run:
shell: bash
working-directory: ./frontend

steps:
- uses: actions/checkout@v4

- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: '20.x'

- run: npm install

- run: npm run lint

- run: npm run build --if-present

- run: npm test
5 changes: 3 additions & 2 deletions backend/auction/urls.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
from django.contrib import admin
from django.urls import include, path

from .views import AuctionListApiView
from .views import AuctionDetailApiView, AuctionListApiView

urlpatterns = [
path("", AuctionListApiView.as_view(), name="auction"),
path("", AuctionListApiView.as_view(), name="auction_list"),
path("<uuid:auction_id>/", AuctionDetailApiView.as_view(), name="auction_detail"),
]
26 changes: 25 additions & 1 deletion backend/auction/views.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
from datetime import datetime

from rest_framework import status
from rest_framework.generics import get_object_or_404
from rest_framework.response import Response
from rest_framework.views import APIView

from .models import Auction
from .serializers import AuctionSerializer


# Create your views here.
class AuctionListApiView(APIView):
def get(self, request, *args, **kwargs):
"""
Expand Down Expand Up @@ -62,3 +62,27 @@ def post(self, request, *args, **kwargs):
return Response(serializer.data, status=status.HTTP_201_CREATED)

return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)


class AuctionDetailApiView(APIView):
"""
Retrieve, update or delete an auction instance.
"""

def get(self, request, auction_id, format=None):
auction = get_object_or_404(Auction, id=auction_id)
serializer = AuctionSerializer(auction)
return Response(serializer.data)

def put(self, request, auction_id, format=None):
auction = get_object_or_404(Auction, id=auction_id)
serializer = AuctionSerializer(auction, data=request.data)
if serializer.is_valid():
serializer.save()
return Response(serializer.data)
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

def delete(self, request, auction_id, format=None):
auction = get_object_or_404(Auction, id=auction_id)
auction.delete()
return Response(status=status.HTTP_204_NO_CONTENT)
5 changes: 3 additions & 2 deletions backend/core/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
from django.urls import include, path

urlpatterns = [
path("admin", admin.site.urls),
path("api/v1/auction", include("auction.urls")),
path("admin/", admin.site.urls),
path("api/v1/auction/", include("auction.urls")),
path("api/v1/vehicle/", include("vehicle.urls")),
]
3 changes: 0 additions & 3 deletions backend/vehicle/serializers.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from rest_framework import serializers

from .models import Brand, Type, Equipment, Vehicle, Supplier, Trailer, UnitImage


Expand Down Expand Up @@ -37,5 +36,3 @@ class UnitImageSerializer(serializers.ModelSerializer):
class Meta:
model = UnitImage
fields = ["id", "image_url", "content_type", "object_id", "content_object"]


1 change: 0 additions & 1 deletion backend/vehicle/urls.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from django.contrib import admin
from django.urls import include, path

from .views import VehicleListApiView, VehicleDetailApiView

urlpatterns = [
Expand Down
2 changes: 1 addition & 1 deletion backend/vehicle/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,4 @@ def get(self, request, vehicle_id, *args, **kwargs):
# serialized_data = self.serializer_class(vehicle)
# return Response(serialized_data.data, status=status.HTTP_200_OK)
except vehicle.DoesNotExist:
return Response(status=status.HTTP_404_NOT_FOUND)
return Response(status=status.HTTP_404_NOT_FOUND)
21 changes: 21 additions & 0 deletions frontend/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
module.exports = {
env: {
browser: true,
es6: true,
node: true,
},
parser: "@typescript-eslint/parser",
parserOptions: {
project: "tsconfig.json",
sourceType: "module",
},
plugins: ["@typescript-eslint", "jsdoc", "import"],
extends: [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:import/recommended",
"plugin:import/typescript",
],
overrides: [],
rules: {},
};
10 changes: 0 additions & 10 deletions frontend/.eslintrc.json

This file was deleted.

25 changes: 5 additions & 20 deletions frontend/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,17 @@
# testing
/coverage

# next.js
/.next/
/out/

# production
/build

# misc
.DS_Store
*.pem
.env.local
.env.development.local
.env.test.local
.env.production.local
.env

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.pnpm-debug.log*

# cache
.eslintcache

# local env files
.env*.local

# vercel
.vercel

# typescript
*.tsbuildinfo
next-env.d.ts
6 changes: 4 additions & 2 deletions frontend/.prettierignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
.next
node_modules
node_modules
# Ignore artifacts:
build
Coverage
9 changes: 5 additions & 4 deletions frontend/.prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"semi": true,
"trailingComma": "es5",
"singleQuote": false,
"useTabs": false,
"tabWidth": 2,
"printWidth": 120
"printWidth": 120,
"bracketSpacing": false,
"jsxBracketSameLine": false,
"singleQuote": true,
"trailingComma": "all"
}
22 changes: 0 additions & 22 deletions frontend/.vscode/settings.json

This file was deleted.

56 changes: 33 additions & 23 deletions frontend/README.md
Original file line number Diff line number Diff line change
@@ -1,36 +1,46 @@
This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app).
# Getting Started with Create React App

## Getting Started
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).

First, run the development server:
## Available Scripts

```bash
npm run dev
# or
yarn dev
# or
pnpm dev
# or
bun dev
```
In the project directory, you can run:

Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
### `npm start`

You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.
Runs the app in the development mode.\
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.

This project uses [`next/font`](https://nextjs.org/docs/basic-features/font-optimization) to automatically optimize and load Inter, a custom Google Font.
The page will reload if you make edits.\
You will also see any lint errors in the console.

## Learn More
### `npm test`

Launches the test runner in the interactive watch mode.\
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.

### `npm run build`

Builds the app for production to the `build` folder.\
It correctly bundles React in production mode and optimizes the build for the best performance.

The build is minified and the filenames include the hashes.\
Your app is ready to be deployed!

To learn more about Next.js, take a look at the following resources:
See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.

- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
### `npm run eject`

You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!
**Note: this is a one-way operation. Once you `eject`, you can’t go back!**

## Deploy on Vercel
If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.

Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.

You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.

## Learn More

The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.
You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).

Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details.
To learn React, check out the [React documentation](https://reactjs.org/).
8 changes: 0 additions & 8 deletions frontend/next.config.js

This file was deleted.

Loading

0 comments on commit 3bdaae3

Please sign in to comment.