react cards and stored proc in backend

12 months ago · 4f6855e6aa
22 changed files with 4248 additions and 8 deletions
--- a/backend_fastapi/auth.py
+++ b/backend_fastapi/auth.py
@ -1,6 +1,6 @@
 from fastapi import APIRouter
 import backend_fastapi.schemas as schemas
-from backend_fastapi.repositories import add_role, add_user, get_role_all, update_role, delete_role
+from backend_fastapi.repositories import get_stored_roles, add_role, add_user, get_role_all, update_role, delete_role, update_user,delete_user,get_users
 from typing import List
 router = APIRouter()

@ -8,9 +8,13 @@ router = APIRouter()
 async def create_role(role: schemas.RoleCreate) -> schemas.Role:
    return await add_role(role)

+@router.get("/stored_role")
+async def get_stored_role() -> List[schemas.Role]:
+    return await get_stored_roles()
+
@router.get("/role")
-async def get_role() -> List[schemas.Role]:
-    return await get_role_all()
+async def get_role(limit:int=10, page:int=0) -> List[schemas.Role]:
+    return await get_role_all(limit, page)

@router.patch("/role")
 async def change_role(role: schemas.Role, id: int) -> None:
@ -24,4 +28,20 @@ async def remove_role(id: int) -> schemas.Role:
 async def create_user(user: schemas.UserCreate) -> schemas.User:
    import hashlib
    user.hashed_password = hashlib.sha256(user.hashed_password.encode('utf-8')).hexdigest()
-    return await add_user(user)
+    return await add_user(user)
+
+
+@router.get('/user')
+async def show_users(limit:int=10, page:int=0):
+    return await get_users(limit, page)
+
+@router.patch('/user')
+async def change_users(user: schemas.User, id: int):
+    import hashlib
+    if user.hashed_password:
+        user.hashed_password = hashlib.sha256(user.hashed_password.encode('utf-8')).hexdigest()
+    return await update_user(user, id)
+
+@router.delete('/user')
+async def remove_users(id: int):
+    return await delete_user(id)
--- a/backend_fastapi/repositories.py
+++ b/backend_fastapi/repositories.py
@ -1,8 +1,11 @@
+from sqlalchemy import select, update, delete
+from fastapi.exceptions import HTTPException
+from backend_fastapi.stored import exec_procedure
 import backend_fastapi.models as models
 from .database import async_session
 import backend_fastapi.schemas as schemas
-from sqlalchemy import select, update, delete
-from fastapi.exceptions import HTTPException
+
+
 async def add_role(role: schemas.RoleCreate):
    async with async_session() as session:
        model = models.Role(name = role.name)
@ -11,9 +14,9 @@ async def add_role(role: schemas.RoleCreate):
        await session.commit()
        return model
    
-async def get_role_all():
+async def get_role_all(limit:int=10,page:int=0):
    async with async_session() as session:
-        result = await session.scalars(select(models.Role))
+        result = await session.scalars(select(models.Role).order_by(models.Role.id).limit(limit).offset(page*limit))
        return result.all()
        
 async def delete_role(id: int):
@ -29,6 +32,11 @@ async def delete_role(id: int):
    
 async def update_role(role: schemas.Role, id: int):
    async with async_session() as session:
+        data = await session.scalars(select(models.Role).filter(models.Role.id == id))
+        result = data.one_or_none()
+        if not result:
+            raise HTTPException(status_code=404, detail="Item not found")
+        
        query = update(models.Role).filter(models.Role.id == id).values(name = role.name)
        await session.execute(query)
        await session.commit()
@ -45,4 +53,42 @@ async def add_user(user: schemas.UserCreate):
        return model
    

+async def get_users(limit:int=10,page:int=0):
+    async with async_session() as session:
+        result = await session.scalars(select(models.User).order_by(models.User.id).limit(limit).offset(page*limit))
+        return result.all()
+        
+async def delete_user(id: int):
+    async with async_session() as session:
+        data = await session.scalars(select(models.User).filter(models.User.id == id))
+        result = data.one_or_none()
+        if not result:
+            raise HTTPException(status_code=404, detail="Item not found")
+        await session.execute(delete(models.User).filter(models.User.id == id))
+        await session.commit()
+        return result
+
+
+
+async def update_user(user: schemas.User, id: int):
+    async with async_session() as session:
+        data = await session.scalars(select(models.User).filter(models.User.id == id))
+        result = data.one_or_none()
+        if not result:
+            raise HTTPException(status_code=404, detail="Item not found")
+        query = update(models.User).filter(models.User.id == id)\
+            .values(
+                firstname = user.firstname,
+                lastname = user.lastname,
+                email = user.email,
+                hashed_password= user.hashed_password,
+                is_active = user.is_active,
+                role_id  = user.role_id,
+            )
+        await session.execute(query)
+        await session.commit()
+        return {f"{id=} был обновлен"}
+    

+async def get_stored_roles():
+    return await exec_procedure('get_roles')
--- a/backend_fastapi/stored.py
+++ b/backend_fastapi/stored.py
@ -0,0 +1,23 @@
+from sqlalchemy import text
+from .database import async_session
+
+async def exec_procedure(proc_name, params:dict = None, database: str = None):
+    async with async_session() as session:
+        sql_params = ""
+        if params:
+            sql_params = ",".join([f"@{key} = :{key}"
+                            for key, value in params.items()])
+        dbstr = ""
+        if database:
+            dbstr = f"[{database}]."
+        sql_string = text(f'''
+            DECLARE @return_value int;
+            EXEC    @return_value = {dbstr}[dbo].[{proc_name}] {sql_params};
+            SELECT 'Return Value' = @return_value;
+        ''')
+        datas = await session.execute(
+            sql_string, params)
+        await session.commit()
+        return [dict(data._mapping) for data in datas.fetchall()]
+    
+
--- a/frontend_reactjs/.eslintrc.cjs
+++ b/frontend_reactjs/.eslintrc.cjs
@ -0,0 +1,18 @@
+module.exports = {
+  root: true,
+  env: { browser: true, es2020: true },
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:react-hooks/recommended',
+  ],
+  ignorePatterns: ['dist', '.eslintrc.cjs'],
+  parser: '@typescript-eslint/parser',
+  plugins: ['react-refresh'],
+  rules: {
+    'react-refresh/only-export-components': [
+      'warn',
+      { allowConstantExport: true },
+    ],
+  },
+}
--- a/frontend_reactjs/.gitignore
+++ b/frontend_reactjs/.gitignore
@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
--- a/frontend_reactjs/README.md
+++ b/frontend_reactjs/README.md
@ -0,0 +1,30 @@
+# React + TypeScript + Vite
+
+This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
+
+Currently, two official plugins are available:
+
+- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
+- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
+
+## Expanding the ESLint configuration
+
+If you are developing a production application, we recommend updating the configuration to enable type aware lint rules:
+
+- Configure the top-level `parserOptions` property like this:
+
+```js
+export default {
+  // other rules...
+  parserOptions: {
+    ecmaVersion: 'latest',
+    sourceType: 'module',
+    project: ['./tsconfig.json', './tsconfig.node.json'],
+    tsconfigRootDir: __dirname,
+  },
+}
+```
+
+- Replace `plugin:@typescript-eslint/recommended` to `plugin:@typescript-eslint/recommended-type-checked` or `plugin:@typescript-eslint/strict-type-checked`
+- Optionally add `plugin:@typescript-eslint/stylistic-type-checked`
+- Install [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) and add `plugin:react/recommended` & `plugin:react/jsx-runtime` to the `extends` list
--- a/frontend_reactjs/index.html
+++ b/frontend_reactjs/index.html
@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite + React + TS</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/main.tsx"></script>
+  </body>
+</html>
--- a/frontend_reactjs/package-lock.json
+++ b/frontend_reactjs/package-lock.json
--- a/frontend_reactjs/package.json
+++ b/frontend_reactjs/package.json
@ -0,0 +1,32 @@
+{
+  "name": "frontend_reactjs",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "tsc && vite build",
+    "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
+    "preview": "vite preview"
+  },
+  "dependencies": {
+    "autoprefixer": "^10.4.19",
+    "axios": "^1.7.2",
+    "postcss": "^8.4.38",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+  },
+  "devDependencies": {
+    "@types/react": "^18.2.66",
+    "@types/react-dom": "^18.2.22",
+    "@typescript-eslint/eslint-plugin": "^7.2.0",
+    "@typescript-eslint/parser": "^7.2.0",
+    "@vitejs/plugin-react-swc": "^3.5.0",
+    "eslint": "^8.57.0",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-react-refresh": "^0.4.6",
+    "tailwindcss": "^3.4.4",
+    "typescript": "^5.2.2",
+    "vite": "^5.2.0"
+  }
+}
--- a/frontend_reactjs/postcss.config.js
+++ b/frontend_reactjs/postcss.config.js
@ -0,0 +1,6 @@
+export default {
+  plugins: {
+    tailwindcss: {},
+    autoprefixer: {},
+  },
+}
--- a/frontend_reactjs/public/vite.svg
+++ b/frontend_reactjs/public/vite.svg
@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
--- a/frontend_reactjs/src/App.tsx
+++ b/frontend_reactjs/src/App.tsx
@ -0,0 +1,26 @@
+import { useState,useEffect } from 'react'
+import Card from './components/Card'
+import axios from 'axios'
+interface ICard{
+  firstname: string
+  lastname: string
+  email: string
+}
+
+function App() {
+  // const data = [
+  //   {firstname:"Иван",lastname:"Петров", email:"email@test.ru"},
+  //   {firstname:"Алексей",lastname:"Петров", email:"email2@test.ru"},
+  //   {firstname:"Василиса",lastname:"Петрова", email:"email3@test.ru"}
+  // ]
+  const [cards, setCards] = useState<ICard[]>([]);
+  useEffect(()=>{axios.get("http://localhost:8000/auth/user/").then((res) =>{setCards(res.data as ICard[]);})},[])
+  console.log(cards)
+  return (
+    <>
+      {cards.map((card, index) => <Card key={index} {...card}/>)}
+    </>
+  )
+}
+
+export default App
--- a/frontend_reactjs/src/assets/react.svg
+++ b/frontend_reactjs/src/assets/react.svg
@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
--- a/frontend_reactjs/src/components/Card.tsx
+++ b/frontend_reactjs/src/components/Card.tsx
@ -0,0 +1,21 @@
+import { useState, useEffect } from 'react'
+
+interface ICard{
+  firstname: string
+  lastname: string
+  email: string
+}
+
+function Card(props:ICard) {
+  const [curr_card, setCard] = useState<ICard>({firstname:"Иван",lastname:"Петров", email:"email@test.ru"});
+  useEffect(()=>{setCard(props);},[curr_card])
+  return (
+      <div className='block p-6 max-w-sm bg-gray-300
+            rounded-lg border border-gray-500 align-items: center;'>
+        <div className='text-4xl text-center'>{curr_card.lastname} {curr_card.firstname}</div>
+        <div className='text-sm text-center'>{curr_card.email}</div>
+      </div>
+  )
+}
+
+export default Card
--- a/frontend_reactjs/src/index.css
+++ b/frontend_reactjs/src/index.css
@ -0,0 +1,3 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
--- a/frontend_reactjs/src/main.tsx
+++ b/frontend_reactjs/src/main.tsx
@ -0,0 +1,10 @@
+import React from 'react'
+import ReactDOM from 'react-dom/client'
+import App from './App.tsx'
+import './index.css'
+
+ReactDOM.createRoot(document.getElementById('root')!).render(
+  <React.StrictMode>
+    <App />
+  </React.StrictMode>,
+)
--- a/frontend_reactjs/src/vite-env.d.ts
+++ b/frontend_reactjs/src/vite-env.d.ts
@ -0,0 +1 @@
+/// <reference types="vite/client" />
--- a/frontend_reactjs/tailwind.config.js
+++ b/frontend_reactjs/tailwind.config.js
@ -0,0 +1,10 @@
+/** @type {import('tailwindcss').Config} */
+export default {
+  content: ["index.html",
+    "./src/**/*.{html,js,tsx,jsx,ts}"],
+  theme: {
+    extend: {},
+  },
+  plugins: [],
+}
+
--- a/frontend_reactjs/tsconfig.json
+++ b/frontend_reactjs/tsconfig.json
@ -0,0 +1,25 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "useDefineForClassFields": true,
+    "lib": ["ES2020", "DOM", "DOM.Iterable"],
+    "module": "ESNext",
+    "skipLibCheck": true,
+
+    /* Bundler mode */
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "jsx": "react-jsx",
+
+    /* Linting */
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "include": ["src"],
+  "references": [{ "path": "./tsconfig.node.json" }]
+}
--- a/frontend_reactjs/tsconfig.node.json
+++ b/frontend_reactjs/tsconfig.node.json
@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "composite": true,
+    "skipLibCheck": true,
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "allowSyntheticDefaultImports": true,
+    "strict": true
+  },
+  "include": ["vite.config.ts"]
+}
--- a/frontend_reactjs/vite.config.ts
+++ b/frontend_reactjs/vite.config.ts
@ -0,0 +1,7 @@
+import { defineConfig } from 'vite'
+import react from '@vitejs/plugin-react-swc'
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  plugins: [react()],
+})
--- a/main.py
+++ b/main.py
@ -17,6 +17,7 @@ origins = [
    "http://localhost",
    "http://localhost:8000",
    "http://localhost:3000",
+    "http://localhost:5173"
 ]

 app.add_middleware(