Merge pull request #64 from biegl/task/fix-easyadmin-base-url

Change easyadmin base url
biegl · Sep 2, 2020 · 36a7197 · 36a7197
2 parents fddd086 + 9fdb411
commit 36a7197
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 5 deletions.
diff --git a/public/admin/dist/index.html b/public/admin/dist/index.html
@@ -1 +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=/favicon.ico><title>easyadmin</title><link rel=stylesheet href=//stackpath.bootstrapcdn.com/bootstrap/4.5.1/css/bootstrap.min.css integrity=sha384-VCmXjywReHh4PwowAiWNagnWcLhlEJLA5buUprzK8rxFgeH0kww/aWY76TfkUoSX crossorigin=anonymous><link href=https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css rel=stylesheet><link href=/css/news.de42416d.css rel=prefetch><link href=/js/news.23cbf630.js rel=prefetch><link href=/css/app.a2294ab0.css rel=preload as=style><link href=/js/app.f2dba575.js rel=preload as=script><link href=/js/chunk-vendors.b4d98954.js rel=preload as=script><link href=/css/app.a2294ab0.css rel=stylesheet></head><body><noscript><strong>We're sorry but easyadmin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.b4d98954.js></script><script src=/js/app.f2dba575.js></script></body></html>
+<!DOCTYPE html><html lang=de><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=/favicon.ico><base href=//test.abfaltersbach.at id=base><title>easyadmin</title><link rel=stylesheet href=//stackpath.bootstrapcdn.com/bootstrap/4.5.1/css/bootstrap.min.css integrity=sha384-VCmXjywReHh4PwowAiWNagnWcLhlEJLA5buUprzK8rxFgeH0kww/aWY76TfkUoSX crossorigin=anonymous><link href=https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css rel=stylesheet><link href=/css/news.de42416d.css rel=prefetch><link href=/js/news.23cbf630.js rel=prefetch><link href=/css/app.a2294ab0.css rel=preload as=style><link href=/js/app.402c3c30.js rel=preload as=script><link href=/js/chunk-vendors.b4d98954.js rel=preload as=script><link href=/css/app.a2294ab0.css rel=stylesheet></head><body><noscript><strong>Für easyadmin ist JavaScript notwendig. Bitte aktivieren Sie es um fortzufahren.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.b4d98954.js></script><script src=/js/app.402c3c30.js></script></body></html>
diff --git a/public/admin/dist/js/app.402c3c30.js b/public/admin/dist/js/app.402c3c30.js
diff --git a/public/admin/dist/js/app.402c3c30.js.map b/public/admin/dist/js/app.402c3c30.js.map
diff --git a/public/admin/dist/js/app.473ef67b.js b/public/admin/dist/js/app.473ef67b.js
diff --git a/public/admin/dist/js/app.473ef67b.js.map b/public/admin/dist/js/app.473ef67b.js.map
diff --git a/public/admin/dist/js/app.698b90ef.js b/public/admin/dist/js/app.698b90ef.js
diff --git a/public/admin/dist/js/app.698b90ef.js.map b/public/admin/dist/js/app.698b90ef.js.map
diff --git a/public/admin/index.html b/public/admin/index.html
@@ -1 +1,23 @@
-<!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=/favicon.ico><title>easyadmin</title><link rel=stylesheet href=//stackpath.bootstrapcdn.com/bootstrap/4.5.1/css/bootstrap.min.css integrity=sha384-VCmXjywReHh4PwowAiWNagnWcLhlEJLA5buUprzK8rxFgeH0kww/aWY76TfkUoSX crossorigin=anonymous><link href=https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css rel=stylesheet><link href=/css/news.de42416d.css rel=prefetch><link href=/js/news.23cbf630.js rel=prefetch><link href=/css/app.0ac29d14.css rel=preload as=style><link href=/js/app.d7efdf4c.js rel=preload as=script><link href=/js/chunk-vendors.b4d98954.js rel=preload as=script><link href=/css/app.0ac29d14.css rel=stylesheet></head><body><noscript><strong>We're sorry but easyadmin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.b4d98954.js></script><script src=/js/app.d7efdf4c.js></script></body></html>
+<!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=/favicon.ico> <title>easyadmin</title>
+    <link rel=stylesheet href=//stackpath.bootstrapcdn.com/bootstrap/4.5.1/css/bootstrap.min.css
+        integrity=sha384-VCmXjywReHh4PwowAiWNagnWcLhlEJLA5buUprzK8rxFgeH0kww/aWY76TfkUoSX crossorigin=anonymous>
+    <link href=https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css rel=stylesheet>
+    <link href=/css/news.de42416d.css rel=prefetch>
+    <link href=/js/news.23cbf630.js rel=prefetch>
+    <link href=/css/app.0ac29d14.css rel=preload as=style>
+    <link href=/js/app.d7efdf4c.js rel=preload as=script>
+    <link href=/js/chunk-vendors.b4d98954.js rel=preload as=script>
+    <link href=/css/app.0ac29d14.css rel=stylesheet>
+</head>
+
+<body><noscript><strong>We're sorry but easyadmin doesn't work properly without JavaScript enabled. Please enable it to
+            continue.</strong></noscript>
+    <div id=app></div>
+    <script src=/js/chunk-vendors.b4d98954.js> </script> <script src=/js/app.d7efdf4c.js> </script> </body> </html>
diff --git a/resources/easyadmin/public/index.html b/resources/easyadmin/public/index.html
@@ -1,17 +1,18 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="de">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <base href="//test.abfaltersbach.at" id="base" />
     <title><%= htmlWebpackPlugin.options.title %></title>
     <link rel="stylesheet" href="//stackpath.bootstrapcdn.com/bootstrap/4.5.1/css/bootstrap.min.css" integrity="sha384-VCmXjywReHh4PwowAiWNagnWcLhlEJLA5buUprzK8rxFgeH0kww/aWY76TfkUoSX" crossorigin="anonymous">
     <link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
   </head>
   <body>
     <noscript>
-      <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+      <strong>Für <%= htmlWebpackPlugin.options.title %> ist JavaScript notwendig. Bitte aktivieren Sie es um fortzufahren.</strong>
     </noscript>
     <div id="app"></div>
     <!-- built files will be auto injected -->

diff --git a/resources/easyadmin/src/config.ts b/resources/easyadmin/src/config.ts
@@ -1,3 +1,3 @@
 export default class Config {
-    static host = "http://localhost:8000";
+    static host = document.getElementById('base').getAttribute('href');
 }