Build and include static files in agent

sylvanld · Nov 25, 2021 · 0dbc1ca · 0dbc1ca
1 parent 03fff58
commit 0dbc1ca
Show file tree

Hide file tree

Showing 14 changed files with 51 additions and 2 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1,2 @@
+include README.md
+recursive-include pytest_agent *
diff --git a/pytest_agent/api.py b/pytest_agent/api.py
@@ -1,9 +1,12 @@
 """
 Defines API endpoints and policy.
 """
+import pkg_resources
 from typing import List
 
 from fastapi import FastAPI
+from fastapi.responses import RedirectResponse
+from fastapi.staticfiles import StaticFiles
 from fastapi.middleware.cors import CORSMiddleware
 from starlette.responses import PlainTextResponse
 
@@ -15,9 +18,14 @@
     title="Pytest Agent API",
     description="Expose testing features and metrics via a REST API.",
     version="v1",
-    docs_url="/",
+    docs_url="/docs",
+    redoc_url=None
 )
 
+static_path = pkg_resources.resource_filename(__name__, "static")
+
+api.mount("/static", StaticFiles(directory=static_path, html=True), name="static")
+
 api.add_middleware(
     CORSMiddleware,
     allow_origins=["*"],
@@ -26,6 +34,10 @@
     allow_headers=["*"],
 )
 
+@api.get("/")
+def home():
+    return RedirectResponse("/static")
+
 
 @api.post("/tests/collect", response_model=List[TestStatusReadDTO])
 def collect_and_update_tests():

diff --git a/pytest_agent/static/css/app.1289019b.css b/pytest_agent/static/css/app.1289019b.css
@@ -0,0 +1 @@
+.statusbar-icon[data-v-bf2fb7a4]{margin-right:1em}.v-icon[data-v-323527bf]{margin-left:1em}
diff --git a/pytest_agent/static/css/chunk-vendors.8d33546b.css b/pytest_agent/static/css/chunk-vendors.8d33546b.css
diff --git a/pytest_agent/static/favicon.ico b/pytest_agent/static/favicon.ico
diff --git a/pytest_agent/static/img/logo.c0a818de.png b/pytest_agent/static/img/logo.c0a818de.png
diff --git a/pytest_agent/static/index.html b/pytest_agent/static/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/static/favicon.ico"><title>pytest_dashboard</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"><link href="/static/css/app.1289019b.css" rel="preload" as="style"><link href="/static/css/chunk-vendors.8d33546b.css" rel="preload" as="style"><link href="/static/js/app.98e423ea.js" rel="preload" as="script"><link href="/static/js/chunk-vendors.70c07ae3.js" rel="preload" as="script"><link href="/static/css/chunk-vendors.8d33546b.css" rel="stylesheet"><link href="/static/css/app.1289019b.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but pytest_dashboard doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/static/js/chunk-vendors.70c07ae3.js"></script><script src="/static/js/app.98e423ea.js"></script></body></html>
diff --git a/pytest_agent/static/js/app.98e423ea.js b/pytest_agent/static/js/app.98e423ea.js
diff --git a/pytest_agent/static/js/app.98e423ea.js.map b/pytest_agent/static/js/app.98e423ea.js.map
diff --git a/pytest_agent/static/js/chunk-vendors.70c07ae3.js b/pytest_agent/static/js/chunk-vendors.70c07ae3.js
diff --git a/pytest_agent/static/js/chunk-vendors.70c07ae3.js.map b/pytest_agent/static/js/chunk-vendors.70c07ae3.js.map
diff --git a/pytest_dashboard/package.json b/pytest_dashboard/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
+    "build": "vue-cli-service build --dest ../pytest_agent/static",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {

diff --git a/pytest_dashboard/vue.config.js b/pytest_dashboard/vue.config.js
@@ -1,3 +1,7 @@
 module.exports = {
   transpileDependencies: ["vuetify"],
+  publicPath:
+    process.env.NODE_ENV === "production"
+      ? "/static" // prod
+      : "/", // dev
 };
diff --git a/setup.py b/setup.py
@@ -13,4 +13,5 @@ def load_long_description():
     entry_points={"console_scripts": ["pytest-agent=pytest_agent.__main__:cli"]},
     long_description=load_long_description(),
     long_description_content_type='text/markdown',
+    include_package_data=True
 )