Skip to content

Commit

Permalink
Revert "chore: convert root template to .heex (#2233)" (#2239)
Browse files Browse the repository at this point in the history
  • Loading branch information
joshlarson authored Nov 27, 2024
1 parent e1e3dc1 commit 8266c56
Show file tree
Hide file tree
Showing 16 changed files with 241 additions and 446 deletions.
12 changes: 11 additions & 1 deletion lib/dotcom/body_tag.ex
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,17 @@ defmodule Dotcom.BodyTag do
UI elements.
"""

def class_name(conn) do
alias PhoenixHTMLHelpers.Tag

@spec render(Plug.Conn.t()) :: Phoenix.HTML.Safe.t()
def render(conn) do
Tag.tag(
:body,
class: class_name(conn)
)
end

defp class_name(conn) do
[
javascript_class(),
mticket_class(conn),
Expand Down
1 change: 0 additions & 1 deletion lib/dotcom_web.ex
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ defmodule DotcomWeb do
project_path: 3,
project_update_path: 3,
project_update_path: 4,
static_integrity: 2,
static_url: 2
]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,7 @@
<script defer src={"#{Application.get_env(:dotcom, :webpack_path)}/tnm.js"}>
</script>
<% else %>
<script
defer
src={static_url(@conn, "/js/tnm.js")}
integrity={static_integrity(@conn, "/js/tnm.js")}
crossorigin="anonymous"
>
<script defer src={static_url(@conn, "/js/tnm.js")}>
</script>
<% end %>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,7 @@
<script defer src={"#{Application.get_env(:dotcom, :webpack_path)}/tnm.js"}>
</script>
<% else %>
<script
defer
src={static_url(@conn, "/js/tnm.js")}
integrity={static_integrity(@conn, "/js/tnm.js")}
crossorigin="anonymous"
>
<script defer src={static_url(@conn, "/js/tnm.js")}>
</script>
<% end %>
</div>
Expand Down
111 changes: 111 additions & 0 deletions lib/dotcom_web/templates/layout/root.html.eex
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
<!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">
<%= csrf_meta_tag() %>
<% meta_description = assigns[:meta_description] || "Official website of the MBTA -- schedules, maps, and fare information for Greater Boston's public transportation system, including subway, commuter rail, bus routes, and boat lines." %>
<meta name="description" content="<%= Phoenix.HTML.raw(meta_description) %>">
<meta name="author" content="Massachusetts Bay Transportation Authority">
<meta name="theme-color" content="#165c96">

<%= # hide any page in /org directory from search engines
if @conn.request_path == "/org" || String.slice(@conn.request_path, 0..4) == "/org/" do %>
<meta name="robots" content="noindex, nofollow">
<% end %>
<%= # hide any page in /charlie directory from search engines
if @conn.request_path == "/charlie" || String.slice(@conn.request_path, 0..8) == "/charlie/" do %>
<meta name="robots" content="noindex, nofollow">
<% end %>
<%= # hide any page in /policies/terms-use-charlie directory from search engines
if @conn.request_path == "/policies/terms-use-charlie" || String.slice(@conn.request_path, 0..26) == "/policies/terms-use-charlie" do %>
<meta name="robots" content="noindex, nofollow">
<% end %>
<% title = if Phoenix.Controller.view_template(@conn) == "404.html", do: "Page Not Found | MBTA - Massachusetts Bay Transportation Authority", else: title_breadcrumbs(@conn) %>
<title><%= title %></title>
<link rel="apple-touch-icon" href="<%= static_url(@conn, "/apple-touch-icon.png") %>" type="image/png">
<link rel="icon" href="<%= static_url(@conn, "/images/mbta-logo-t-favicon.png") %>" sizes="32x32" type="image/png">
<link rel="icon" href="<%= static_url(@conn, "/favicon.ico") %>" sizes="16x16" type="image/vnd.microsoft.icon">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css">

<%= if google_tag_manager_id() do %>
<link rel="preconnect" href="//www.google-analytics.com">
<% end %>

<link rel="alternate" type="application/rss+xml" title="MBTA.com Latest News" href="/news/rss.xml" />

<%= if Application.get_env(:sentry, :js_dsn) do %>
<script>
window.sentry = {
dsn: "<%= Application.get_env(:sentry, :js_dsn) %>",
environment: "<%= Application.get_env(:sentry, :environment_name) %>"
}
</script>
<% end %>

<%= if Application.get_env(:dotcom, :dev_server?) do %>
<link rel="stylesheet" href="<%= "#{Application.get_env(:dotcom, :webpack_path)}/css/core.css" %>">
<link rel="stylesheet" href="<%= "#{Application.get_env(:dotcom, :webpack_path)}/css/app.css" %>">
<script defer src="<%= "#{Application.get_env(:dotcom, :webpack_path)}/core.js" %>"></script>
<script defer src="<%= "#{Application.get_env(:dotcom, :webpack_path)}/app.js" %>"></script>
<% else %>
<link rel="stylesheet" href="<%= static_url(@conn, "/css/core.css") %>">
<link rel="stylesheet" href="<%= static_url(@conn, "/css/app.css") %>">
<script defer src="<%= static_url(@conn, "/js/vendors.js") %>"></script>
<script defer src="<%= static_url(@conn, "/js/app.js") %>"></script>
<% end %>
</head>
<%= Dotcom.BodyTag.render(@conn) %>
<div class="body-wrapper" id="body-wrapper">
<a href="#main" class="sr-only sr-only-focusable">Skip to main content</a>
<%= DotcomWeb.PartialView.render "_hidden_icons.html", conn: @conn %>
<%= render "_new_header.html", @conn |> Plug.Conn.assign(:page, get_page_classes(Phoenix.Controller.view_module(@conn), Phoenix.Controller.view_template(@conn))) |> forward_assigns %>
<%= if assigns[:banner_template] do %>
<div class="announcement-container <%= assigns[:banner_class] %>">
<div class="container">
<%= render __MODULE__, @banner_template, assigns %>
</div>
</div>
<% end %>
<%= if assigns[:breadcrumbs] do %>
<div class="breadcrumb-container">
<div class="container">
<%= breadcrumb_trail(@conn) %>
</div>
</div>
<% end %>
<%= if assigns[:search_header?] do %>
<%= render "_searchbar.html", assigns %>
<% end %>
<div class="page-container <%= get_page_classes(Phoenix.Controller.view_module(@conn), Phoenix.Controller.view_template(@conn)) %>">
<%= content_tag :main, @inner_content, id: "main", tabindex: -1 %>
</div> <%# /container %>
<%= render __MODULE__, "_footer.html", conn: @conn %>

<%# Show a warning when browser is Internet Explorer %>
<%= if Application.get_env(:dotcom, :dev_server?) do %>
<script defer src="<%= "#{Application.get_env(:dotcom, :webpack_path)}/iewarning.js" %>"></script>
<% else %>
<script defer src="<%= static_url(@conn, "/js/react.js") %>"></script>
<script defer src="<%= static_url(@conn, "/js/iewarning.js") %>"></script>
<% end %>
<div id="ie-warning" class="c-ie-warning"></div>
</div>

<%= if google_tag_manager_id() do %>
<!-- Google Tag Manager (noscript) -->
<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=<%= google_tag_manager_id()%>&gtm_auth=<%= google_tag_manager_auth() %>&gtm_preview=<%= google_tag_manager_preview() %>&gtm_cookies_win=x"
height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
<!-- End Google Tag Manager (noscript) -->
<!-- Google Tag Manager -->
<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
'https://www.googletagmanager.com/gtm.js?id='+i+dl+ '&gtm_auth=<%= google_tag_manager_auth() %>&gtm_preview=<%= google_tag_manager_preview() %>&gtm_cookies_win=x';f.parentNode.insertBefore(j,f);
})(window,document,'script','dataLayer','<%= google_tag_manager_id() %>');
</script>
<!-- End Google Tag Manager -->
<% end %>
</body>
</html>
177 changes: 0 additions & 177 deletions lib/dotcom_web/templates/layout/root.html.heex

This file was deleted.

31 changes: 31 additions & 0 deletions lib/dotcom_web/templates/project/index.html.eex
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<%= if Application.get_env(:dotcom, :dev_server?) do %>
<script defer src="<%= "#{Application.get_env(:dotcom, :webpack_path)}/projects.js" %>"></script>
<% else %>
<script defer src="<%= static_url(@conn, "/js/react.js") %>"></script>
<script defer src="<%= static_url(@conn, "/js/projects.js") %>"></script>
<% end %>

<div class="container">
<div class="row">
<div class="col-lg-8">
<div class="page-section">
<%= PartialView.paragraph("paragraphs/custom-html/projects-index", @conn) %>
</div>
</div>
</div>
</div>

<div class="container">
<%= content_tag(:div, [
DotcomWeb.PartialView.render("_search_input.html",
Map.merge(assigns, %{
placeholder: "Enter keyword(s)",
aria_label: "Enter keywords",
prefix: "projects"
}))
], id: "projects-search", class: "hidden-no-js c-search-bar c-search-bar--embedded-large") %>
</div>

<% [banner | featured] = if Enum.empty?(@featured_project_teasers) do [nil] else @featured_project_teasers end %>

<%= render "_all_projects.html", banner: banner, projects: @project_teasers, featured_projects: featured, project_updates: @project_update_teasers, placeholder_image_url: @placeholder_image_url %>
Loading

0 comments on commit 8266c56

Please sign in to comment.