Skip to content
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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Generated App doesn't work in Safari/Firefox #1506

Merged
merged 7 commits into from
Sep 19, 2022
Merged

Generated App doesn't work in Safari/Firefox #1506

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7f8ac74
this seems to work
klenotiw Sep 13, 2022
97cbf31
Merge branch 'main' into klenoitw/generated-app-works-in-all-browsers
klenotiw Sep 14, 2022
19a1169
some refactoring
klenotiw Sep 14, 2022
74c1182
remove other erb file
klenotiw Sep 14, 2022
7cdd793
change bridge to displayProducts
klenotiw Sep 19, 2022
4bcea73
address nits
klenotiw Sep 19, 2022
4096730
Merge branch 'main' into klenoitw/generated-app-works-in-all-browsers
klenotiw Sep 19, 2022
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
6 changes: 5 additions & 1 deletion lib/generators/shopify_app/home_controller/home_controller_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ def create_products_controller
end

def create_home_index_view
template("index.html.erb", "app/views/home/index.html.erb")
if Rails.version.split(".").first.to_i >= 7
template("importmap_index.html.erb", "app/views/home/index.html.erb")
else
template("index.html.erb", "app/views/home/index.html.erb")
end
nelsonwittwer marked this conversation as resolved.
Show resolved Hide resolved
end

def add_home_index_route
Expand Down
71 changes: 71 additions & 0 deletions lib/generators/shopify_app/home_controller/templates/importmap_index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<!DOCTYPE html>
<html lang="<%= I18n.locale %>">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link
rel="stylesheet"
href="https://unpkg.com/@shopify/polaris@4.25.0/styles.min.css"
/>
<% if embedded_app? %> <script type="module">
import "lib/shopify_app"

var SessionToken = window["app-bridge"].actions.SessionToken
var app = window.app;

app.dispatch(
SessionToken.request(),
);

// Save a session token for future requests
window.sessionToken = await new Promise((resolve) => {
app.subscribe(SessionToken.Action.RESPOND, (data) => {
resolve(data.sessionToken || "");
});
});

var fetchProducts = function() {
var headers = new Headers({ "Authorization": "Bearer " + window.sessionToken });
return fetch("/products", { headers })
.then(response => response.json())
.then(data => {
var products = data.products;

if (products === undefined || products.length == 0) {
document.getElementById("products").innerHTML = "<br>No products to display.";
} else {
var list = "";
products.forEach((product) => {
var link = `<a target="_top" href="https://<%%= @shop_origin %>/admin/products/${product.id}">`
list += "<li>" + link + product.title + "</a></li>";
});
document.getElementById("products").innerHTML = "<ul>" + list + "</ul>";
}
});
}();
</script>
<% end %> </head>
<body>
<h2>Products</h2>
<% if embedded_app? %> <div id="products"><br>Loading...</div><% else %>
<ul>
<%% @products.each do |product| %>
<li><%%= link_to product.title, "https://#{@current_shopify_session.shop}/admin/products/#{product.id}", target: "_top" %></li>
<%% end %>
</ul>

<hr>
<% end %>
<h2>Webhooks</h2>

<%% if @webhooks.present? %>
<ul>
<%% @webhooks.each do |webhook| %>
<li><%%= webhook.topic %> : <%%= webhook.address %></li>
<%% end %>
</ul>
<%% else %>
<p>This app has not created any webhooks for this Shop. Add webhooks to your ShopifyApp initializer if you need webhooks</p>
<%% end %>
</body>
</html>