Skip to content

prueba 11 #171

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 7 commits into
base: main
Choose a base branch
from
Open
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
27 changes: 23 additions & 4 deletions server/database/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,37 @@ app.get('/fetchReviews/dealer/:id', async (req, res) => {

// Express route to fetch all dealerships
app.get('/fetchDealers', async (req, res) => {
//Write your code here
try {
const dealers = await Dealerships.find(); // Obtiene todos los concesionarios
res.json(dealers);
} catch (error) {
res.status(500).json({ error: 'Error al obtener concesionarios' });
}
});


// Express route to fetch Dealers by a particular state
app.get('/fetchDealers/:state', async (req, res) => {
//Write your code here
try {
const dealers = await Dealerships.find({ state: req.params.state }); // Filtra por estado
res.json(dealers);
} catch (error) {
res.status(500).json({ error: 'Error al obtener concesionarios por estado' });
}
});

// Express route to fetch dealer by a particular id
app.get('/fetchDealer/:id', async (req, res) => {
//Write your code here
});
try {
const dealer = await Dealerships.findOne({ id: parseInt(req.params.id) }); // Busca por ID
if (!dealer) {
return res.status(404).json({ error: 'Concesionario no encontrado' });
}
res.json(dealer);
} catch (error) {
res.status(500).json({ error: 'Error al obtener el concesionario' });
}
});

//Express route to insert review
app.post('/insert_review', express.raw({ type: '*/*' }), async (req, res) => {
Expand Down
5 changes: 3 additions & 2 deletions server/djangoapp/.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
backend_url =your backend url
sentiment_analyzer_url=your code engine deployment url
backend_url =https://profemalaule-3030.theiadockernext-1-labs-prod-theiak8s-4-tor01.proxy.cognitiveclass.ai
sentiment_analyzer_url=https://sentianalyzer.1tuubcxqldu0.us-south.codeengine.appdomain.cloud/analyze/Fantastic%20services/

34 changes: 33 additions & 1 deletion server/djangoapp/restapis.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,43 @@
default="http://localhost:5050/")

# def get_request(endpoint, **kwargs):
# Add code for get requests to back end
def get_request(endpoint, **kwargs):
params = ""
if(kwargs):
for key,value in kwargs.items():
params=params+key+"="+value+"&"

request_url = backend_url+endpoint+"?"+params

print("GET from {} ".format(request_url))
try:
# Call get method of requests library with URL and parameters
response = requests.get(request_url)
return response.json()
except:
# If any error occurs
print("Network exception occurred")

# def analyze_review_sentiments(text):
# request_url = sentiment_analyzer_url+"analyze/"+text
# Add code for retrieving sentiments
def analyze_review_sentiments(text):
request_url = sentiment_analyzer_url+"analyze/"+text
try:
# Call get method of requests library with URL and parameters
response = requests.get(request_url)
return response.json()
except Exception as err:
print(f"Unexpected {err=}, {type(err)=}")
print("Network exception occurred")

# def post_review(data_dict):
# Add code for posting review
def post_review(data_dict):
request_url = backend_url+"/insert_review"
try:
response = requests.post(request_url,json=data_dict)
print(response.json())
return response.json()
except:
print("Network exception occurred")
15 changes: 11 additions & 4 deletions server/djangoapp/urls.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
# Uncomment the imports before you add the code
# from django.urls import path
from django.urls import path
from django.conf.urls.static import static
from django.conf import settings
# from . import views
from . import views

app_name = 'djangoapp'
urlpatterns = [
# # path for registration

# path for login
# path(route='login', view=views.login_user, name='login'),
path(route='login', view=views.login_user, name='login'),
path(route='logout', view=views.logout_request, name='logout'),
path(route='registration', view=views.registration, name='registration'),

# path for dealer reviews view

# path for dealer reviews view
path('dealers/', views.get_dealerships, name='dealers_list'),
path(route='get_dealers/<str:state>', view=views.get_dealerships, name='get_dealers_by_state'),
path(route='dealer/<int:dealer_id>', view=views.get_dealer_details, name='dealer_details'),
# path for add a review view
path(route='reviews/dealer/<int:dealer_id>', view=views.get_dealer_reviews, name='dealer_details'),
path(route='add_review', view=views.add_review, name='add_review'),

] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
97 changes: 82 additions & 15 deletions server/djangoapp/views.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
# Uncomment the required imports before adding the code

# from django.shortcuts import render
# from django.http import HttpResponseRedirect, HttpResponse
# from django.contrib.auth.models import User
# from django.shortcuts import get_object_or_404, render, redirect
# from django.contrib.auth import logout
# from django.contrib import messages
# from datetime import datetime
from django.shortcuts import render
from django.http import HttpResponseRedirect, HttpResponse
from django.contrib.auth.models import User
from django.shortcuts import get_object_or_404, render, redirect
from django.contrib.auth import logout
from django.contrib import messages
from datetime import datetime

from django.http import JsonResponse
from django.contrib.auth import login, authenticate
import logging
import json
from django.views.decorators.csrf import csrf_exempt
# from .populate import initiate
from .populate import initiate
from .restapis import get_request, analyze_review_sentiments, post_review


# Get an instance of a logger
Expand All @@ -39,27 +40,93 @@ def login_user(request):
return JsonResponse(data)

# Create a `logout_request` view to handle sign out request
# def logout_request(request):
# ...
def logout_request(request):
logout(request)
data = {'message': 'Cierre de sesión exitoso'}
return JsonResponse(data)

# Create a `registration` view to handle sign up request
# @csrf_exempt
# def registration(request):
# ...
@csrf_exempt
def registration(request):
context = {}

data = json.loads(request.body)
username = data['userName']
password = data['password']
first_name = data['firstName']
last_name = data['lastName']
email = data['email']
username_exist = False
email_exist = False
try:
# Check if user already exists
User.objects.get(username=username)
username_exist = True
except:
# If not, simply log this is a new user
logger.debug("{} is new user".format(username))

# If it is a new user
if not username_exist:
# Create user in auth_user table
user = User.objects.create_user(username=username, first_name=first_name, last_name=last_name,password=password, email=email)
# Login the user and redirect to list page
login(request, user)
data = {"userName":username,"status":"Authenticated"}
return JsonResponse(data)
else :
data = {"userName":username,"error":"Already Registered"}
return JsonResponse(data)

# # Update the `get_dealerships` view to render the index page with
# a list of dealerships
# def get_dealerships(request):
# ...
def get_dealerships(request, state="All"):
if(state == "All"):
endpoint = "/fetchDealers"
else:
endpoint = "/fetchDealers/"+state
dealerships = get_request(endpoint)
return JsonResponse({"status":200,"dealers":dealerships})

# Create a `get_dealer_reviews` view to render the reviews of a dealer
# def get_dealer_reviews(request,dealer_id):
# ...

# Create a `get_dealer_details` view to render the dealer details
# def get_dealer_details(request, dealer_id):
# ...
def get_dealer_details(request, dealer_id):
if(dealer_id):
endpoint = "/fetchDealer/"+str(dealer_id)
dealership = get_request(endpoint)
return JsonResponse({"status":200,"dealer":dealership})
else:
return JsonResponse({"status":400,"message":"Bad Request"})

# Create a `add_review` view to submit a review
# def add_review(request):
# ...
def get_dealer_reviews(request, dealer_id):
# if dealer id has been provided
if(dealer_id):
endpoint = "/fetchReviews/dealer/"+str(dealer_id)
reviews = get_request(endpoint)
for review_detail in reviews:
response = analyze_review_sentiments(review_detail['review'])
print(response)
review_detail['sentiment'] = response['sentiment']
return JsonResponse({"status":200,"reviews":reviews})
else:
return JsonResponse({"status":400,"message":"Bad Request"})


def add_review(request):
if(request.user.is_anonymous == False):
data = json.loads(request.body)
try:
response = post_review(data)
return JsonResponse({"status":200})
except:
return JsonResponse({"status":401,"message":"Error in posting review"})
else:
return JsonResponse({"status":403,"message":"Unauthorized"})
17 changes: 12 additions & 5 deletions server/djangoproj/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True

ALLOWED_HOSTS = []
CSRF_TRUSTED_ORIGINS = []
ALLOWED_HOSTS=['localhost','https://profemalaule-8000.theianext-0-labs-prod-misc-tools-us-east-0.proxy.cognitiveclass.ai']
CSRF_TRUSTED_ORIGINS=['https://profemalaule-8000.theianext-0-labs-prod-misc-tools-us-east-0.proxy.cognitiveclass.ai']

REST_FRAMEWORK = {
'DEFAULT_AUTHENTICATION_CLASSES': [],
Expand Down Expand Up @@ -61,7 +61,11 @@
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [],
'DIRS': [
os.path.join(BASE_DIR, 'frontend/static'),
os.path.join(BASE_DIR, 'frontend/build'),
os.path.join(BASE_DIR, 'frontend/build/static'),
],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
Expand Down Expand Up @@ -134,5 +138,8 @@

DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'

STATICFILES_DIRS = []

STATICFILES_DIRS = [
os.path.join(BASE_DIR, 'frontend/static'),
os.path.join(BASE_DIR, 'frontend/build'),
os.path.join(BASE_DIR, 'frontend/build/static'),
]
8 changes: 7 additions & 1 deletion server/djangoproj/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,14 @@
from django.conf.urls.static import static
from django.conf import settings


urlpatterns = [
path('admin/', admin.site.urls),
path('djangoapp/', include('djangoapp.urls')),
path('', include('djangoapp.urls')),
path('', TemplateView.as_view(template_name="Home.html")),
path('about/', TemplateView.as_view(template_name="About.html")),
path('contact/', TemplateView.as_view(template_name="Contact.html")),
path('login/', TemplateView.as_view(template_name="index.html")),
path('register/', TemplateView.as_view(template_name="index.html")),

] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
30 changes: 27 additions & 3 deletions server/frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions server/frontend/src/App.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import LoginPanel from "./components/Login/Login"
import { Routes, Route } from "react-router-dom";
import Register from "./components/Register/Register";

function App() {
return (
<Routes>
<Route path="/login" element={<LoginPanel />} />
<Route path="/logout" element={<LoginPanel />} />
<Route path="/register" element={<Register />} />
</Routes>
);
}
Expand Down
Loading