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.

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

Updates #219

Merged
merged 3 commits into from
Jul 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
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
3 changes: 2 additions & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
elixir 1.14.1 1.14.1-otp-25
elixir 1.15
erlang 25.0
2 changes: 1 addition & 1 deletion config/config.exs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# is restricted to this project.

# General application configuration
import Mix.Config
import Config

config :school_house,
lesson_dir: "content/lessons",
Expand Down
2 changes: 1 addition & 1 deletion config/dev.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Mix.Config
import Config

# For development, we disable any cache and enable
# debugging and code reloading.
Expand Down
2 changes: 1 addition & 1 deletion config/lessons.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Mix.Config
import Config

config :school_house,
future_lessons: [
Expand Down
2 changes: 1 addition & 1 deletion config/prod.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Mix.Config
import Config
# For production, don't forget to configure the url host
# to something meaningful, Phoenix uses this information
# when generating URLs.
Expand Down
2 changes: 1 addition & 1 deletion config/redirects.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Mix.Config
import Config

config :school_house,
redirects: %{
Expand Down
2 changes: 1 addition & 1 deletion config/test.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Mix.Config
import Config

# We don't run a server during test. If one is required,
# you can enable the server option below.
Expand Down
2 changes: 1 addition & 1 deletion lib/school_house_web.ex
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ defmodule SchoolHouseWeb do
def live_view do
quote do
use Phoenix.LiveView,
layout: {SchoolHouseWeb.LayoutView, "live.html"}
layout: {SchoolHouseWeb.LayoutView, :live}

unquote(view_helpers())
end
Expand Down
3 changes: 2 additions & 1 deletion lib/school_house_web/controllers/post_controller.ex
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
defmodule SchoolHouseWeb.PostController do
use SchoolHouseWeb, :controller

alias SchoolHouse.Content.Post
alias SchoolHouse.Posts
alias SchoolHouseWeb.FallbackController

Expand Down Expand Up @@ -42,7 +43,7 @@ defmodule SchoolHouseWeb.PostController do
{page, _remainder} -> page
end
end

defp format_page_title(%Post{title: title}), do: title <> " | " <> @page_title
defp format_page_title(_), do: @page_title
end
1 change: 0 additions & 1 deletion lib/school_house_web/endpoint.ex
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
defmodule SchoolHouseWeb.Endpoint do
use Phoenix.Endpoint, otp_app: :school_house
use Appsignal.Phoenix

# The session will be stored in the cookie and signed,
# this means its contents can be read but not tampered with.
Expand Down
2 changes: 1 addition & 1 deletion lib/school_house_web/live/conferences_live.html.heex
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<div class="bg-body dark:bg-body-dark">
<div class="md:w-11/12 lg:w-8/12 mx-auto">
<.form let={f} for={:filters} id="filter-form" class="flex-row flex items-center mb-6 px-2 text-primary dark:text-primary-dark" phx-change="filter">
<.form :let={f} for={:filters} id="filter-form" class="flex-row flex items-center mb-6 px-2 text-primary dark:text-primary-dark" phx-change="filter">
<p class="text-light dark:text-light-dark mr-5"><%= gettext("Filter")%></p>
<div class="mx-2 flex flex-row items-center gap-x-2">
<%= checkbox f, :online, id: "online-only", checked: filter_is_online?(@filters) %>
Expand Down
9 changes: 5 additions & 4 deletions mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ defmodule SchoolHouse.MixProject do
# Type `mix help deps` for examples and options.
defp deps do
[
{:appsignal, "~> 2.2"},
{:appsignal_phoenix, "~> 2.0.12"},
{:appsignal, "~> 2.7"},
{:appsignal_phoenix, "~> 2.3"},
{:gettext, "~> 0.11"},
{:jason, "~> 1.0"},
{:libcluster, "~> 3.3"},
Expand All @@ -59,13 +59,14 @@ defmodule SchoolHouse.MixProject do
{:phoenix_html, "~> 3.2"},
{:phoenix_live_view, "~> 0.17"},
{:plug_cowboy, "~> 2.0"},
{:esbuild, "~> 0.2", runtime: Mix.env() == :dev},
{:ssl_verify_fun, "~> 1.1.7", manager: :rebar3, override: true},
{:telemetry_metrics, "~> 0.6"},
{:telemetry_poller, "~> 0.5"},

# Dev & Test dependencies
{:credo, "1.6.4", only: [:dev, :test]},
{:credo, "~> 1.6", only: [:dev, :test]},
{:dialyxir, "~> 1.0", only: [:dev, :test], runtime: false},
{:esbuild, "~> 0.2", runtime: Mix.env() == :dev},
{:floki, ">= 0.0.0", only: :test},
{:phoenix_live_reload, "~> 1.2", only: :dev}
]
Expand Down
39 changes: 20 additions & 19 deletions mix.lock

Large diffs are not rendered by default.

Loading