Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Dan fix head#1233

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
chillenberger merged 6 commits intomasterfromdan-fix-head
Dec 11, 2023
Merged
Show file tree
Hide file tree
Changes from1 commit
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
PrevPrevious commit
NextNext commit
make work for error request status code errors
  • Loading branch information
@chillenberger
chillenberger committedDec 10, 2023
commitfe63690725e887ade70dfbef4f90b180a276ceef
14 changes: 0 additions & 14 deletionspgml-dashboard/src/components/layouts/extend_head/mod.rs
View file
Open in desktop

This file was deleted.

View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletionspgml-dashboard/src/components/layouts/head/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ pub struct Head {
pub description: Option<String>,
pub image: Option<String>,
pub preloads: Vec<String>,
pub context: String,
pub context:Option<String>,
}

impl Head {
Expand DownExpand Up@@ -40,7 +40,7 @@ impl Head {
Head::new().title("404 - Not Found")
}

pub fn context(mut self, context: &str) -> Head {
pub fn context(mut self, context: &Option<String>) -> Head {
self.context = context.to_owned();
self
}
Expand Down
41 changes: 26 additions & 15 deletionspgml-dashboard/src/components/layouts/head/template.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
<% use crate::utils::config; %>

<head>
<meta charset="utf-8">
Expand DownExpand Up@@ -35,39 +36,51 @@
<meta name="twitter:creator" content="@postgresml">
<meta name="twitter:title" content="<%= title %> – PostgresML">

<%- context %>
<% if context.is_some() { %>
<%- context.unwrap() %>
<% } else { %>

<script type="importmap" data-turbo-track="reload">
{
"imports": {
"@hotwired/stimulus": "/dashboard/static/js/libs/stimulus-3.2.1.min.js",
"@lodash/core": "/dashboard/static/js/libs/lodash-4.17.15-core.js",
"@postgresml/main": "<%= config::js_url("main.js") %>"
}
}
</script>

<link rel="stylesheet" data-turbo-track="reload" href="<%- config::css_url("style.css") %>">
<script async src="https://data.cloud.hyperparam.ai/script.js" data-website-id="499122fd-f307-4e8d-af4b-88b9f5e9903b"></script>
<script defer src="https://cdn.plot.ly/plotly-2.11.1.min.js"></script>
<script type="module" defer async src="/dashboard/static/js/libs/sortable-1.12.0.min.js"></script>
<script data-turbo-trace="reload" type="module" src="<%= config::js_url("bundle.js") %>" async defer></script>

<!-- version: <%= config::git_sha() %> -->
<% } %>

<link rel="icon" href="/dashboard/static/images/owl.ico">

<% for link in preloads { %>
<link rel="preload" fetchpriority="high" as="image" href=<%= link %> type="image/webp">
<% }; %>

<script defer src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js"></script>
<script defer src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js" integrity="sha384-w76AqPfDkMBDXo30jS1Sgez6pr3x5MlQ1ZAGC+nuZB+EYdgRZgiwxhTBTkF7CXvN" crossorigin="anonymous"></script>

<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined&display=swap">
<script defer src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js"></script>
<script defer src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js" integrity="sha384-w76AqPfDkMBDXo30jS1Sgez6pr3x5MlQ1ZAGC+nuZB+EYdgRZgiwxhTBTkF7CXvN" crossorigin="anonymous"></script>

<script async type="nomodule" src="https://unpkg.com/es-module-shims@1.6.3/dist/es-module-shims.js"></script>
<script defer type="module" src="/dashboard/static/js/libs/turbo-7.3.0.min.js"></script>


<!-- Code Mirror -->
<script defer type="module" src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/6.65.7/codemirror.min.js"></script>
<script defer type="module" src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/6.65.7/addon/hint/sql-hint.min.js" integrity="sha512-O7YCIZwiyJYc9d/iPOSgEzhhlonTMGcmM1HmgYFffj5cGwVu2PLSzTaLvD9HSk8rSSf9rIpdhJPk8Yhu6wJBtA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script defer type="module" src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/6.65.7/mode/sql/sql.min.js" integrity="sha512-JOURLWZEM9blfKvYn1pKWvUZJeFwrkn77cQLJOS6M/7MVIRdPacZGNm2ij5xtDV/fpuhorOswIiJF3x/woe5fw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script defer type="module" src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/6.65.7/addon/hint/show-hint.min.js" integrity="sha512-yhmeAerubMLaGAsyS7sE8Oqub6GeTkBDQpkXo2JKHgg7JOCudQvcbDQc5rPxdl7MqcDusTJzSy+ODlyzAwETfQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script defer type="module" src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/6.65.7/addon/comment/comment.min.js" integrity="sha512-UaJ8Lcadz5cc5mkWmdU8cJr0wMn7d8AZX5A24IqVGUd1MZzPJTq9dLLW6I102iljTcdB39YvVcCgBhM0raGAZQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>

<link rel="stylesheet" href="/dashboard/static/css/codemirror.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/6.65.7/addon/hint/show-hint.min.css" integrity="sha512-OmcLQEy8iGiD7PSm85s06dnR7G7C9C0VqahIPAj/KHk5RpOCmnC6R2ob1oK4/uwYhWa9BF1GC6tzxsC8TIx7Jg==" crossorigin="anonymous" referrerpolicy="no-referrer" />

<script type="module" defer async src="/dashboard/static/js/libs/sortable-1.12.0.min.js"></script>


<% ifcrate::utils::config::dev_mode() { %>
<% if config::dev_mode() { %>
<!-- dev only - save page position after reload -->
<script>
document.addEventListener("DOMContentLoaded", function(event) {
Expand All@@ -80,6 +93,4 @@
};
</script>
<% } %>


</head>
4 changes: 0 additions & 4 deletionspgml-dashboard/src/components/layouts/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
// This file is automatically generated.
// You shouldn't modify it manually.

// src/components/layouts/extend_head
pub mod extend_head;
pub use extend_head::ExtendHead;

// src/components/layouts/head
pub mod head;
pub use head::Head;
3 changes: 1 addition & 2 deletionspgml-dashboard/src/guards.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
use crate::components::layouts::extend_head::ExtendHead;
use crate::components::sections::footers::marketing_footer::MarketingFooter;
use crate::templates::components::{StaticNav, StaticNavLink};
use once_cell::sync::OnceCell;
Expand DownExpand Up@@ -133,7 +132,7 @@ impl Cluster {
},
lower_left_nav: StaticNav::default(),
marketing_footer: MarketingFooter::new().render_once().unwrap(),
head_items:ExtendHead::new().render_once().unwrap(),
head_items:None,
},
notifications: None,
}
Expand Down
2 changes: 1 addition & 1 deletionpgml-dashboard/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ pub struct Context {
pub upper_left_nav: StaticNav,
pub lower_left_nav: StaticNav,
pub marketing_footer: String,
pub head_items: String,
pub head_items:Option<String>,
}

#[derive(Debug, Clone, Default)]
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp