Skip to content
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

Me #2

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Me #2

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
Empty file added backend/__init__.py
Empty file.
Empty file added backend/app/__init__.py
Empty file.
54 changes: 54 additions & 0 deletions backend/app/admin.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
from django.contrib import admin
from django.contrib.auth.models import Group
from .models import Resume, ExperienceYear, Service, Skill, Portfolio, PortfolioTechnology, Contact


@admin.register(ExperienceYear)
class ExperienceYearAdmin(admin.ModelAdmin):
list_display = ('year',)
search_fields = ('year',)


@admin.register(Resume)
class ResumeAdmin(admin.ModelAdmin):
list_display = ('name', 'position', 'company', 'year')
search_fields = ('name', 'position', 'company', 'year')


@admin.register(Service)
class ServiceAdmin(admin.ModelAdmin):
list_display = ('name', 'description', 'icon_class')
search_fields = ('name', 'description', 'icon_class')


@admin.register(Skill)
class SkillAdmin(admin.ModelAdmin):
list_display = ('name', 'progress')
search_fields = ('name', 'progress')


@admin.register(Portfolio)
class PortfolioAdmin(admin.ModelAdmin):
list_display = ('name',)
search_fields = ('name',)


@admin.register(PortfolioTechnology)
class PortfolioTechnologyAdmin(admin.ModelAdmin):
list_display = ('name',)
search_fields = ('name',)


@admin.register(Contact)
class ContactAdmin(admin.ModelAdmin):
list_display = ('name', 'email', 'phone', 'message')
search_fields = ('name', 'email', 'phone', 'message')

def has_change_permission(self, request, obj=None):
return False

def has_add_permission(self, request):
return False


admin.site.unregister(Group)
6 changes: 6 additions & 0 deletions backend/app/apps.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.apps import AppConfig


class AppConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'app'
81 changes: 81 additions & 0 deletions backend/app/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
# Generated by Django 4.2.7 on 2023-12-05 10:04

import django.core.validators
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

initial = True

dependencies = [
]

operations = [
migrations.CreateModel(
name='Contact',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=100)),
('email', models.EmailField(max_length=254)),
('phone', models.CharField(blank=True, max_length=15, null=True, validators=[django.core.validators.RegexValidator(message="Phone number must be entered in the format: '+998999999999'. Up to 15 digits allowed.", regex='^\\+?1?\\d{9,15}$')])),
('subject', models.CharField(max_length=100)),
('budget', models.CharField(max_length=100)),
('message', models.TextField()),
('file', models.FileField(blank=True, null=True, upload_to='contact/')),
('sent_at', models.DateTimeField(auto_now_add=True)),
],
),
migrations.CreateModel(
name='ExperienceYear',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('year', models.CharField(max_length=100)),
],
),
migrations.CreateModel(
name='Portfolio',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('image', models.ImageField(upload_to='portfolio/')),
('name', models.CharField(max_length=100)),
],
),
migrations.CreateModel(
name='Service',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=100)),
('description', models.TextField()),
('icon_class', models.CharField(max_length=100)),
],
),
migrations.CreateModel(
name='Skill',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('image', models.ImageField(upload_to='skills/')),
('name', models.CharField(max_length=100)),
('progress', models.IntegerField()),
],
),
migrations.CreateModel(
name='Resume',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=100)),
('position', models.CharField(max_length=100)),
('company', models.CharField(max_length=100)),
('year', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='app.experienceyear')),
],
),
migrations.CreateModel(
name='PortfolioTechnology',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=100)),
('portfolio', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='app.portfolio')),
],
),
]
Empty file.
71 changes: 71 additions & 0 deletions backend/app/models.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
from django.db import models
from django.core.validators import RegexValidator


class Resume(models.Model):
year = models.ForeignKey('ExperienceYear', on_delete=models.CASCADE)
name = models.CharField(max_length=100)
position = models.CharField(max_length=100)
company = models.CharField(max_length=100)

def __str__(self):
return self.name


class ExperienceYear(models.Model):
year = models.CharField(max_length=100)

def __str__(self):
return self.year


class Service(models.Model):
name = models.CharField(max_length=100)
description = models.TextField()
icon_class = models.CharField(max_length=100)

def __str__(self):
return self.name


class Skill(models.Model):
image = models.ImageField(upload_to='skills/')
name = models.CharField(max_length=100)
progress = models.IntegerField()

def __str__(self):
return self.name


class Portfolio(models.Model):
image = models.ImageField(upload_to='portfolio/')
name = models.CharField(max_length=100)

def __str__(self):
return self.name


class PortfolioTechnology(models.Model):
portfolio = models.ForeignKey(Portfolio, on_delete=models.CASCADE)
name = models.CharField(max_length=100)

def __str__(self):
return self.name


class Contact(models.Model):

phone_regex = RegexValidator(regex=r'^\+?1?\d{9,15}$', message="Phone number must be entered in the format: '+998999999999'. Up to 15 digits allowed.")

name = models.CharField(max_length=100)
email = models.EmailField()
phone = models.CharField(max_length=15, validators=[phone_regex], blank=True, null=True)
subject = models.CharField(max_length=100)
budget = models.CharField(max_length=100)
message = models.TextField()
file = models.FileField(upload_to='contact/', blank=True, null=True)
sent_at = models.DateTimeField(auto_now_add=True)

def __str__(self):
return f"{self.name} - {self.subject} - {self.sent_at}"

56 changes: 56 additions & 0 deletions backend/app/serializers.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
from rest_framework import serializers
from .models import ExperienceYear, Resume, Service, Skill, Portfolio, PortfolioTechnology, Contact


class ExperienceYearSerializer(serializers.ModelSerializer):
resumes = serializers.SerializerMethodField('get_resumes')

class Meta:
model = ExperienceYear
fields = '__all__'

@staticmethod
def get_resumes(obj):
return ResumeSerializer(obj.resume_set.all(), many=True).data


class ResumeSerializer(serializers.ModelSerializer):
class Meta:
model = Resume
fields = '__all__'


class ServiceSerializer(serializers.ModelSerializer):
class Meta:
model = Service
fields = '__all__'


class SkillSerializer(serializers.ModelSerializer):
class Meta:
model = Skill
fields = '__all__'


class PortfolioTechnologySerializer(serializers.ModelSerializer):
class Meta:
model = PortfolioTechnology
fields = '__all__'


class PortfolioSerializer(serializers.ModelSerializer):
technologies = serializers.SerializerMethodField('get_technologies')

class Meta:
model = Portfolio
fields = '__all__'

@staticmethod
def get_technologies(obj):
return PortfolioTechnologySerializer(obj.portfoliotechnology_set.all(), many=True).data


class ContactSerializer(serializers.ModelSerializer):
class Meta:
model = Contact
fields = '__all__'
3 changes: 3 additions & 0 deletions backend/app/tests.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.test import TestCase

# Create your tests here.
11 changes: 11 additions & 0 deletions backend/app/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
from django.urls import path

from .views import ExperienceYearListAPIView, ServiceListAPIView, SkillListAPIView, PortfolioListAPIView, ContactCreateAPIView

urlpatterns = [
path('experience-years/', ExperienceYearListAPIView.as_view()),
path('services/', ServiceListAPIView.as_view()),
path('skills/', SkillListAPIView.as_view()),
path('portfolios/', PortfolioListAPIView.as_view()),
path('contacts/', ContactCreateAPIView.as_view()),
]
34 changes: 34 additions & 0 deletions backend/app/views.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
from django.shortcuts import redirect
from rest_framework.generics import ListAPIView, CreateAPIView

from .models import ExperienceYear, Service, Skill, Portfolio, Contact
from .serializers import ExperienceYearSerializer, ServiceSerializer, SkillSerializer, PortfolioSerializer, ContactSerializer


class ExperienceYearListAPIView(ListAPIView):
queryset = ExperienceYear.objects.prefetch_related('resume_set').all()
serializer_class = ExperienceYearSerializer


class ServiceListAPIView(ListAPIView):
queryset = Service.objects.all()
serializer_class = ServiceSerializer


class SkillListAPIView(ListAPIView):
queryset = Skill.objects.all()
serializer_class = SkillSerializer


class PortfolioListAPIView(ListAPIView):
queryset = Portfolio.objects.prefetch_related('portfoliotechnology_set').all()
serializer_class = PortfolioSerializer


class ContactCreateAPIView(CreateAPIView):
queryset = Contact.objects.all()
serializer_class = ContactSerializer


def home_to_admin(request):
return redirect('admin/')
17 changes: 4 additions & 13 deletions backend/config/settings.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
"""
Django settings for config project.

Generated by 'django-admin startproject' using Django 4.2.7.

For more information on this file, see
https://docs.djangoproject.com/en/4.2/topics/settings/

For the full list of settings and their values, see
https://docs.djangoproject.com/en/4.2/ref/settings/
"""

from pathlib import Path

# Build paths inside the project like this: BASE_DIR / 'subdir'.
BASE_DIR = Path(__file__).resolve().parent.parent


Expand All @@ -37,6 +24,10 @@
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',

'app.apps.AppConfig',

'rest_framework',
]

MIDDLEWARE = [
Expand Down
22 changes: 5 additions & 17 deletions backend/config/urls.py
Original file line number Diff line number Diff line change
@@ -1,22 +1,10 @@
"""
URL configuration for config project.

The `urlpatterns` list routes URLs to views. For more information please see:
https://docs.djangoproject.com/en/4.2/topics/http/urls/
Examples:
Function views
1. Add an import: from my_app import views
2. Add a URL to urlpatterns: path('', views.home, name='home')
Class-based views
1. Add an import: from other_app.views import Home
2. Add a URL to urlpatterns: path('', Home.as_view(), name='home')
Including another URLconf
1. Import the include() function: from django.urls import include, path
2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
"""
from django.contrib import admin
from django.urls import path
from django.urls import path, include

from app.views import home_to_admin

urlpatterns = [
path('admin/', admin.site.urls),
path('api/', include('app.urls')),
path('', home_to_admin),
]
1 change: 1 addition & 0 deletions frontend/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BASE_URL=http://127.0.0.1:8000/api/
8 changes: 8 additions & 0 deletions frontend/src/components/resume/index.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
import {useEffect} from "react";
import axios from "axios";
import {env} from "../../../.eslintrc.cjs";

function Resume() {
useEffect(() => {
const response = axios.get(env.BASE_URL + "experience-years/");
console.log(response);
}, []);

return (
<section className="resume-area page-section scroll-to-page" id="resume">
<div className="custom-container">
Expand Down
Loading