Skip to content
GitLab
Commit c8867f30 authored by Patrick Ade's avatar Patrick Ade
Browse files

Merge branch 'backup_ade'

parents a9d58172 e6e9197f
Expand all Hide whitespace changes
Inline Side-by-side
backend/.env.docker
View file @ c8867f30
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
INFLUXDB_URL=http://influxdb2:8086 INFLUXDB_URL=http://influxdb2:8086
INFLUXDB_ORG=docs INFLUXDB_ORG=docs
INFLUXDB_BUCKET=co2-test INFLUXDB_BUCKET=co2-test
INFLUXDB_TOKEN=1xa5lLACRZDYsvinhABndZ8GGzBY7-gTQsAf309c0aTnPPtBxixPEEOPuXLmkTxUKy8golKae6fsrh1wD4SL0A== INFLUXDB_TOKEN=xHpy7Vdt2_3hNb9DOpc1DHO6UkH19R58_okbCORz5vhDvYaiYJN2e0tl2H4rQlym6w5dCbRweeMWL00DU2ymNw==
# MQTT config # MQTT config
MQTT_BROKER_URL=mosquitto-broker MQTT_BROKER_URL=mosquitto-broker
MQTT_TOPIC="co2/#" MQTT_TOPIC="co2/#"
\ No newline at end of file
backend/app/views.py
View file @ c8867f30
...@@ -33,7 +33,7 @@ def login_view(request): ...@@ -33,7 +33,7 @@ def login_view(request):
return JsonResponse( return JsonResponse(
{"success": False, "message": "Invalid JSON"}, status=400 {"success": False, "message": "Invalid JSON"}, status=400
) )
user = authenticate(request, username=email, password=password) user = authenticate(request, username=email, password=password)
if user: if user:
...@@ -71,6 +71,7 @@ def register(request): ...@@ -71,6 +71,7 @@ def register(request):
errors = form.errors.as_json() errors = form.errors.as_json()
return JsonResponse({"error": errors}, status=400) return JsonResponse({"error": errors}, status=400)
@require_http_methods(["GET"]) @require_http_methods(["GET"])
def room_data_range(request): def room_data_range(request):
try: try:
...@@ -79,8 +80,10 @@ def room_data_range(request): ...@@ -79,8 +80,10 @@ def room_data_range(request):
stop = request.GET.get("stop", "now()") stop = request.GET.get("stop", "now()")
if not room: if not room:
return JsonResponse({"error": "Missing 'room' parameter"}, status=400) return JsonResponse(
{"error": "Missing 'room' parameter"}, status=400
)
load_dotenv() load_dotenv()
client = InfluxDBHelper( client = InfluxDBHelper(
url=os.getenv("INFLUXDB_URL"), url=os.getenv("INFLUXDB_URL"),
...@@ -93,26 +96,28 @@ def room_data_range(request): ...@@ -93,26 +96,28 @@ def room_data_range(request):
results = [] results = []
for table in tables: for table in tables:
for record in table.records: for record in table.records:
results.append({ results.append(
"time": str(record.get_time()), {
"field": record.get_field(), "time": str(record.get_time()),
"value": record.get_value(), "field": record.get_field(),
}) "value": record.get_value(),
}
return JsonResponse({"room": room, "data": results}, status = 200) )
return JsonResponse({"room": room, "data": results}, status=200)
except json.JSONDecodeError: except json.JSONDecodeError:
return JsonResponse( return JsonResponse(
{"success": False, "message": "Invalid JSON"}, status=400 {"success": False, "message": "Invalid JSON"}, status=400
) )
@require_http_methods(["GET"]) @require_http_methods(["GET"])
def get_rooms(request): def get_rooms(request):
client = InfluxDBHelper( client = InfluxDBHelper(
url=os.getenv("INFLUXDB_URL"), url=os.getenv("INFLUXDB_URL"),
token=os.getenv("INFLUXDB_TOKEN"), token=os.getenv("INFLUXDB_TOKEN"),
org=os.getenv("INFLUXDB_ORG"), org=os.getenv("INFLUXDB_ORG"),
bucket=os.getenv("INFLUXDB_BUCKET"), bucket=os.getenv("INFLUXDB_BUCKET"),
) )
tables = client.list_rooms() tables = client.list_rooms()
...@@ -123,6 +128,7 @@ def get_rooms(request): ...@@ -123,6 +128,7 @@ def get_rooms(request):
return JsonResponse({"rooms": sorted(rooms)}) return JsonResponse({"rooms": sorted(rooms)})
@require_http_methods(["GET"]) @require_http_methods(["GET"])
def room_data_csv_view(request): def room_data_csv_view(request):
room = request.GET.get("room") room = request.GET.get("room")
...@@ -131,12 +137,12 @@ def room_data_csv_view(request): ...@@ -131,12 +137,12 @@ def room_data_csv_view(request):
if not room: if not room:
return JsonResponse({"error": "Missing 'room' parameter"}, status=400) return JsonResponse({"error": "Missing 'room' parameter"}, status=400)
client = InfluxDBHelper( client = InfluxDBHelper(
url=os.getenv("INFLUXDB_URL"), url=os.getenv("INFLUXDB_URL"),
token=os.getenv("INFLUXDB_TOKEN"), token=os.getenv("INFLUXDB_TOKEN"),
org=os.getenv("INFLUXDB_ORG"), org=os.getenv("INFLUXDB_ORG"),
bucket=os.getenv("INFLUXDB_BUCKET"), bucket=os.getenv("INFLUXDB_BUCKET"),
) )
csv_stream = client.get_room_data_csv(room_id=room, start=start, stop=stop) csv_stream = client.get_room_data_csv(room_id=room, start=start, stop=stop)
...@@ -148,33 +154,35 @@ def room_data_csv_view(request): ...@@ -148,33 +154,35 @@ def room_data_csv_view(request):
for row in reader: for row in reader:
# optional: nur Datenzeilen filtern # optional: nur Datenzeilen filtern
if row.get("_field") and row.get("_value"): if row.get("_field") and row.get("_value"):
results.append({ results.append(
"time": row["_time"], {
"field": row["_field"], "time": row["_time"],
"value": row["_value"], "field": row["_field"],
}) "value": row["_value"],
}
)
return JsonResponse({"room": room, "data": results}) return JsonResponse({"room": room, "data": results})
@require_http_methods(["GET"]) @require_http_methods(["GET"])
def room_data_csv_download(request): def room_data_csv_download(request):
room = request.GET.get("room") room = request.GET.get("room")
start = request.GET.get("start", "-30d") start = request.GET.get("start", "-30d")
stop = request.GET.get("stop", "now()") stop = request.GET.get("stop", "now()")
if not room: if not room:
return JsonResponse({"error": "Missing 'room' parameter"}, status=400) return JsonResponse({"error": "Missing 'room' parameter"}, status=400)
client = InfluxDBHelper( client = InfluxDBHelper(
url=os.getenv("INFLUXDB_URL"), url=os.getenv("INFLUXDB_URL"),
token=os.getenv("INFLUXDB_TOKEN"), token=os.getenv("INFLUXDB_TOKEN"),
org=os.getenv("INFLUXDB_ORG"), org=os.getenv("INFLUXDB_ORG"),
bucket=os.getenv("INFLUXDB_BUCKET"), bucket=os.getenv("INFLUXDB_BUCKET"),
) )
csv_data = client.get_room_data_csv(room, start, stop) csv_data = client.get_room_data_csv(room, start, stop)
response = HttpResponse(csv_data, content_type="text/csv") response = HttpResponse(csv_data, content_type="text/csv")
response["Content-Disposition"] = f'attachment; filename="{room}_data.csv"' response["Content-Disposition"] = f'attachment; filename="{room}_data.csv"'
return response return response
backend/core/settings.py
View file @ c8867f30
...@@ -43,9 +43,22 @@ INSTALLED_APPS = [ ...@@ -43,9 +43,22 @@ INSTALLED_APPS = [
"corsheaders", "corsheaders",
] ]
CORS_ALLOW_CREDENTIALS = True CORS_ALLOW_CREDENTIALS = True
CORS_ALLOWED_ORIGINS = ["http://localhost:5173"] # TODO frontend URL here
CSRF_TRUSTED_ORIGINS = ["http://localhost:5173"] # TODO frontend URL here CORS_ALLOWED_ORIGINS = [
"http://localhost:5173",
"http://127.0.0.1:5173",
] # TODO frontend URL here
CSRF_TRUSTED_ORIGINS = [
"http://localhost:5173",
"http://127.0.0.1:5173",
]
CSRF_COOKIE_HTTPONLY = False # allow JS to read the cookie
CSRF_COOKIE_SAMESITE = "Lax" # or 'None' if using https in development
CSRF_COOKIE_SECURE = False # True in production with HTTPS
MIDDLEWARE = [ MIDDLEWARE = [
"corsheaders.middleware.CorsMiddleware", "corsheaders.middleware.CorsMiddleware",
......
backend/uv.lock
View file @ c8867f30
This diff is collapsed.
frontend/.dockerignore deleted 100644 → 0
View file @ a9d58172
node_modules
npm-debug.log
\ No newline at end of file
frontend/.editorconfig 0 → 100644
View file @ c8867f30
[*.{js,jsx,mjs,cjs,ts,tsx,mts,cts,vue,css,scss,sass,less,styl}]
charset = utf-8
indent_size = 2
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true
end_of_line = lf
max_line_length = 100
frontend/.prettierrc.json 0 → 100644
View file @ c8867f30
{
"$schema": "https://json.schemastore.org/prettierrc",
"semi": false,
"singleQuote": true,
"printWidth": 100
}
frontend/Dockerfile deleted 100644 → 0
View file @ a9d58172
# frontend/Dockerfile
FROM node:latest
WORKDIR /app
# Nur package.json + lockfile kopieren
COPY package*.json ./
# Installiere ALLE Abhängigkeiten – inkl. vue-chartjs & chart.js
RUN npm install
# Jetzt den Rest des Projekts kopieren
COPY . .
EXPOSE 5173
CMD ["npm", "run", "dev"]
frontend/README.md
View file @ c8867f30
# Vue 3 + Vite # frontend
This template should help get you started developing with Vue 3 in Vite. The template uses Vue 3 `<script setup>` SFCs, check out the [script setup docs](https://v3.vuejs.org/api/sfc-script-setup.html#sfc-script-setup) to learn more. This template should help get you started developing with Vue 3 in Vite.
Learn more about IDE Support for Vue in the [Vue Docs Scaling up Guide](https://vuejs.org/guide/scaling-up/tooling.html#ide-support). ## Recommended IDE Setup
[VSCode](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar) (and disable Vetur).
## Type Support for `.vue` Imports in TS
TypeScript cannot handle type information for `.vue` imports by default, so we replace the `tsc` CLI with `vue-tsc` for type checking. In editors, we need [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar) to make the TypeScript language service aware of `.vue` types.
## Customize configuration
See [Vite Configuration Reference](https://vite.dev/config/).
## Project Setup
```sh
npm install
```
### Compile and Hot-Reload for Development
```sh
npm run dev
```
### Type-Check, Compile and Minify for Production
```sh
npm run build
```
### Lint with [ESLint](https://eslint.org/)
```sh
npm run lint
```
frontend/env.d.ts 0 → 100644
View file @ c8867f30
/// <reference types="vite/client" />
frontend/eslint.config.ts 0 → 100644
View file @ c8867f30
import { globalIgnores } from 'eslint/config'
import { defineConfigWithVueTs, vueTsConfigs } from '@vue/eslint-config-typescript'
import pluginVue from 'eslint-plugin-vue'
import skipFormatting from '@vue/eslint-config-prettier/skip-formatting'
// To allow more languages other than `ts` in `.vue` files, uncomment the following lines:
// import { configureVueProject } from '@vue/eslint-config-typescript'
// configureVueProject({ scriptLangs: ['ts', 'tsx'] })
// More info at https://github.com/vuejs/eslint-config-typescript/#advanced-setup
export default defineConfigWithVueTs(
{
name: 'app/files-to-lint',
files: ['**/*.{ts,mts,tsx,vue}'],
},
globalIgnores(['**/dist/**', '**/dist-ssr/**', '**/coverage/**']),
pluginVue.configs['flat/essential'],
vueTsConfigs.recommended,
skipFormatting,
)
frontend/index.html
View file @ c8867f30
<!doctype html> <!DOCTYPE html>
<html lang="en"> <html lang="">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8">
<link rel="icon" type="image/svg+xml" href="/vite.svg" /> <link rel="icon" href="/favicon.ico">
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Vite + Vue</title> <title>Vite App</title>
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>
<script type="module" src="/src/main.js"></script> <script type="module" src="/src/main.ts"></script>
</body> </body>
</html> </html>
frontend/package-lock.json
View file @ c8867f30
This diff is collapsed.
frontend/package.json
View file @ c8867f30
{ {
"name": "frontend", "name": "frontend",
"private": true, "version": "0.0.0",
"version": "0.0.0", "private": true,
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
"build": "vite build", "build": "run-p type-check \"build-only {@}\" --",
"preview": "vite preview" "preview": "vite preview",
}, "build-only": "vite build",
"dependencies": { "type-check": "vue-tsc --build",
"chart.js": "^4.4.0", "lint": "eslint . --fix",
"vue": "^3.5.13", "format": "prettier --write src/"
"vue-chartjs": "^5.3.0" },
}, "dependencies": {
"devDependencies": { "pinia": "^3.0.1",
"@vitejs/plugin-vue": "^5.2.1", "vue": "^3.5.13",
"vite": "^6.3.2" "vue-router": "^4.5.0"
} },
"devDependencies": {
"@tsconfig/node22": "^22.0.1",
"@types/node": "^22.14.0",
"@vitejs/plugin-vue": "^5.2.3",
"@vue/eslint-config-prettier": "^10.2.0",
"@vue/eslint-config-typescript": "^14.5.0",
"@vue/tsconfig": "^0.7.0",
"eslint": "^9.22.0",
"eslint-plugin-vue": "~10.0.0",
"jiti": "^2.4.2",
"npm-run-all2": "^7.0.2",
"prettier": "3.5.3",
"typescript": "~5.8.0",
"vite": "^6.2.4",
"vite-plugin-vue-devtools": "^7.7.2",
"vue-tsc": "^2.2.8"
},
"prettier": {
"trailingComma": "es5",
"tabWidth": 4,
"semi": false,
"singleQuote": true
}
} }
frontend/public/vite.svg deleted 100644 → 0
View file @ a9d58172
<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>
\ No newline at end of file
frontend/src/App.vue
View file @ c8867f30
<script setup> <script setup lang="ts">
import { onMounted } from 'vue' import { RouterLink, RouterView } from 'vue-router'
import HelloWorld from './components/HelloWorld.vue' import HelloWorld from './components/HelloWorld.vue'
import Chart from './components/LiveChart.vue'
onMounted(() => {
fetch('/api/set_csrf_token/', {
credentials: 'include'
})
.then(res => res.json())
.then(data => console.log('CSRF token gesetzt:', data))
.catch(err => console.error('CSRF Token holen fehlgeschlagen:', err))
})
</script> </script>
<template> <template>
<div> <header>
<a href="https://vite.dev" target="_blank"> <img alt="Vue logo" class="logo" src="@/assets/logo.svg" width="125" height="125" />
<img src="/vite.svg" class="logo" alt="Vite logo" />
</a> <div class="wrapper">
<a href="https://vuejs.org/" target="_blank"> <!-- <HelloWorld msg="You did it!" /> -->
<img src="./assets/vue.svg" class="logo vue" alt="Vue logo" />
</a> <nav>
</div> <RouterLink to="/">Home</RouterLink>
<Chart></Chart> <RouterLink to="/login">Login</RouterLink>
<HelloWorld msg="Vite + Vue" /> <RouterLink to="/about">About</RouterLink>
<RouterLink to="/register">register</RouterLink>
</nav>
</div>
</header>
<RouterView />
</template> </template>
<style scoped> <style scoped>
header {
line-height: 1.5;
max-height: 100vh;
}
.logo { .logo {
height: 6em; display: block;
padding: 1.5em; margin: 0 auto 2rem;
will-change: filter;
transition: filter 300ms;
} }
.logo:hover {
filter: drop-shadow(0 0 2em #646cffaa); nav {
width: 100%;
font-size: 12px;
text-align: center;
margin-top: 2rem;
}
nav a.router-link-exact-active {
color: var(--color-text);
}
nav a.router-link-exact-active:hover {
background-color: transparent;
} }
.logo.vue:hover {
filter: drop-shadow(0 0 2em #42b883aa); nav a {
display: inline-block;
padding: 0 1rem;
border-left: 1px solid var(--color-border);
}
nav a:first-of-type {
border: 0;
}
@media (min-width: 1024px) {
header {
display: flex;
place-items: center;
padding-right: calc(var(--section-gap) / 2);
}
.logo {
margin: 0 2rem 0 0;
}
header .wrapper {
display: flex;
place-items: flex-start;
flex-wrap: wrap;
}
nav {
text-align: left;
margin-left: -1rem;
font-size: 1rem;
padding: 1rem 0;
margin-top: 1rem;
}
} }
</style> </style>
frontend/src/assets/base.css 0 → 100644
View file @ c8867f30
/* color palette from <https://github.com/vuejs/theme> */
:root {
--vt-c-white: #ffffff;
--vt-c-white-soft: #f8f8f8;
--vt-c-white-mute: #f2f2f2;
--vt-c-black: #181818;
--vt-c-black-soft: #222222;
--vt-c-black-mute: #282828;
--vt-c-indigo: #2c3e50;
--vt-c-divider-light-1: rgba(60, 60, 60, 0.29);
--vt-c-divider-light-2: rgba(60, 60, 60, 0.12);
--vt-c-divider-dark-1: rgba(84, 84, 84, 0.65);
--vt-c-divider-dark-2: rgba(84, 84, 84, 0.48);
--vt-c-text-light-1: var(--vt-c-indigo);
--vt-c-text-light-2: rgba(60, 60, 60, 0.66);
--vt-c-text-dark-1: var(--vt-c-white);
--vt-c-text-dark-2: rgba(235, 235, 235, 0.64);
}
/* semantic color variables for this project */
:root {
--color-background: var(--vt-c-white);
--color-background-soft: var(--vt-c-white-soft);
--color-background-mute: var(--vt-c-white-mute);
--color-border: var(--vt-c-divider-light-2);
--color-border-hover: var(--vt-c-divider-light-1);
--color-heading: var(--vt-c-text-light-1);
--color-text: var(--vt-c-text-light-1);
--section-gap: 160px;
}
@media (prefers-color-scheme: dark) {
:root {
--color-background: var(--vt-c-black);
--color-background-soft: var(--vt-c-black-soft);
--color-background-mute: var(--vt-c-black-mute);
--color-border: var(--vt-c-divider-dark-2);
--color-border-hover: var(--vt-c-divider-dark-1);
--color-heading: var(--vt-c-text-dark-1);
--color-text: var(--vt-c-text-dark-2);
}
}
*,
*::before,
*::after {
box-sizing: border-box;
margin: 0;
font-weight: normal;
}
body {
min-height: 100vh;
color: var(--color-text);
background: var(--color-background);
transition:
color 0.5s,
background-color 0.5s;
line-height: 1.6;
font-family:
Inter,
-apple-system,
BlinkMacSystemFont,
'Segoe UI',
Roboto,
Oxygen,
Ubuntu,
Cantarell,
'Fira Sans',
'Droid Sans',
'Helvetica Neue',
sans-serif;
font-size: 15px;
text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
frontend/src/assets/logo.svg 0 → 100644
View file @ c8867f30
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 261.76 226.69"><path d="M161.096.001l-30.225 52.351L100.647.001H-.005l130.877 226.688L261.749.001z" fill="#41b883"/><path d="M161.096.001l-30.225 52.351L100.647.001H52.346l78.526 136.01L209.398.001z" fill="#34495e"/></svg>
frontend/src/assets/main.css 0 → 100644
View file @ c8867f30
@import './base.css';
#app {
max-width: 1280px;
margin: 0 auto;
padding: 2rem;
font-weight: normal;
}
a,
.green {
text-decoration: none;
color: hsla(160, 100%, 37%, 1);
transition: 0.4s;
padding: 3px;
}
@media (hover: hover) {
a:hover {
background-color: hsla(160, 100%, 37%, 0.2);
}
}
@media (min-width: 1024px) {
body {
display: flex;
place-items: center;
}
#app {
display: grid;
grid-template-columns: 1fr 1fr;
padding: 0 2rem;
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal