Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
08c9cddc78 | |||
e6285c282b | |||
61829fc042 | |||
e2f8fd3ee5 |
20
.drone.yml
20
.drone.yml
@ -27,19 +27,35 @@ steps:
|
|||||||
- npm install --prefix assets
|
- npm install --prefix assets
|
||||||
- mix test
|
- mix test
|
||||||
|
|
||||||
- name: build and publish
|
- name: build and publish stable
|
||||||
image: plugins/docker
|
image: plugins/docker
|
||||||
settings:
|
settings:
|
||||||
repo: shibaobun/cannery
|
repo: shibaobun/cannery
|
||||||
tags: latest
|
|
||||||
username:
|
username:
|
||||||
from_secret: docker_username
|
from_secret: docker_username
|
||||||
password:
|
password:
|
||||||
from_secret: docker_password
|
from_secret: docker_password
|
||||||
|
tags:
|
||||||
|
- latest
|
||||||
|
- ${DRONE_TAG}
|
||||||
when:
|
when:
|
||||||
branch:
|
branch:
|
||||||
- stable
|
- stable
|
||||||
|
|
||||||
|
- name: build and publish tagged version
|
||||||
|
image: plugins/docker
|
||||||
|
settings:
|
||||||
|
repo: shibaobun/cannery
|
||||||
|
username:
|
||||||
|
from_secret: docker_username
|
||||||
|
password:
|
||||||
|
from_secret: docker_password
|
||||||
|
tags:
|
||||||
|
- ${DRONE_TAG}
|
||||||
|
when:
|
||||||
|
event:
|
||||||
|
- tag
|
||||||
|
|
||||||
- name: rebuild-cache
|
- name: rebuild-cache
|
||||||
image: drillster/drone-volume-cache
|
image: drillster/drone-volume-cache
|
||||||
volumes:
|
volumes:
|
||||||
|
10
CHANGELOG.md
10
CHANGELOG.md
@ -1,7 +1,9 @@
|
|||||||
# 0.3.0
|
# v0.2.1
|
||||||
-
|
- Fix checkbox spacing for mobile view
|
||||||
|
- Fix spacing with form elements in mobile view
|
||||||
|
- Fix user card spacing
|
||||||
|
|
||||||
# 0.2.0
|
# v0.2.0
|
||||||
- Add or remove tags from containers list and details page
|
- Add or remove tags from containers list and details page
|
||||||
- Show tags on containers
|
- Show tags on containers
|
||||||
- Add "Cannery" to page titles
|
- Add "Cannery" to page titles
|
||||||
@ -11,5 +13,5 @@
|
|||||||
- Show shot history for an ammo group
|
- Show shot history for an ammo group
|
||||||
- Show ammo round totals and total shot for ammo types
|
- Show ammo round totals and total shot for ammo types
|
||||||
|
|
||||||
# 0.1.0
|
# v0.1.0
|
||||||
- Initial release!
|
- Initial release!
|
||||||
|
@ -17,8 +17,7 @@
|
|||||||
-o-transform: scale(1.5);
|
-o-transform: scale(1.5);
|
||||||
transform: scale(1.5);
|
transform: scale(1.5);
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
margin-left: auto;
|
margin: 1em auto;
|
||||||
margin-right: auto;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.title {
|
.title {
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
let={f}
|
let={f}
|
||||||
for={@changeset}
|
for={@changeset}
|
||||||
id="shot-group-form"
|
id="shot-group-form"
|
||||||
class="flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
||||||
phx-target={@myself}
|
phx-target={@myself}
|
||||||
phx-change="validate"
|
phx-change="validate"
|
||||||
phx-submit="save"
|
phx-submit="save"
|
||||||
|
@ -9,7 +9,7 @@ defmodule CanneryWeb.Components.UserCard do
|
|||||||
~H"""
|
~H"""
|
||||||
<div
|
<div
|
||||||
id={"user-#{@user.id}"}
|
id={"user-#{@user.id}"}
|
||||||
class="mx-4 my-2 px-8 py-4 flex flex-col justify-center items-center
|
class="mx-4 my-2 px-8 py-4 flex flex-col justify-center items-center text-center
|
||||||
border border-gray-400 rounded-lg shadow-lg hover:shadow-md
|
border border-gray-400 rounded-lg shadow-lg hover:shadow-md
|
||||||
transition-all duration-300 ease-in-out"
|
transition-all duration-300 ease-in-out"
|
||||||
>
|
>
|
||||||
@ -21,7 +21,8 @@ defmodule CanneryWeb.Components.UserCard do
|
|||||||
<%= if @user.confirmed_at |> is_nil() do %>
|
<%= if @user.confirmed_at |> is_nil() do %>
|
||||||
Email unconfirmed
|
Email unconfirmed
|
||||||
<% else %>
|
<% else %>
|
||||||
User was confirmed at<%= @user.confirmed_at |> display_datetime() %>
|
<p>User was confirmed at</p>
|
||||||
|
<%= @user.confirmed_at |> display_datetime() %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</h3>
|
</h3>
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
phx-target={@myself}
|
phx-target={@myself}
|
||||||
phx-change="validate"
|
phx-change="validate"
|
||||||
phx-submit="save"
|
phx-submit="save"
|
||||||
class="flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
||||||
>
|
>
|
||||||
<%= if @changeset.action && not @changeset.valid? do %>
|
<%= if @changeset.action && not @changeset.valid? do %>
|
||||||
<div class="invalid-feedback col-span-3 text-center">
|
<div class="invalid-feedback col-span-3 text-center">
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
phx-target={@myself}
|
phx-target={@myself}
|
||||||
phx-change="validate"
|
phx-change="validate"
|
||||||
phx-submit="save"
|
phx-submit="save"
|
||||||
class="flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
||||||
>
|
>
|
||||||
<%= if @changeset.action && not @changeset.valid? do %>
|
<%= if @changeset.action && not @changeset.valid? do %>
|
||||||
<div class="invalid-feedback col-span-3 text-center">
|
<div class="invalid-feedback col-span-3 text-center">
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
let={f}
|
let={f}
|
||||||
for={:tag}
|
for={:tag}
|
||||||
id="add-tag-to-container-form"
|
id="add-tag-to-container-form"
|
||||||
class="flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
||||||
phx-target={@myself}
|
phx-target={@myself}
|
||||||
phx-submit="save"
|
phx-submit="save"
|
||||||
>
|
>
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
let={f}
|
let={f}
|
||||||
for={@changeset}
|
for={@changeset}
|
||||||
id="container-form"
|
id="container-form"
|
||||||
class="flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
||||||
phx-target={@myself}
|
phx-target={@myself}
|
||||||
phx-change="validate"
|
phx-change="validate"
|
||||||
phx-submit="save"
|
phx-submit="save"
|
||||||
|
@ -130,7 +130,7 @@ defmodule CanneryWeb.HomeLive do
|
|||||||
<li class="flex flex-row justify-center space-x-2">
|
<li class="flex flex-row justify-center space-x-2">
|
||||||
<b>Version:</b>
|
<b>Version:</b>
|
||||||
<p>
|
<p>
|
||||||
0.2.0
|
0.2.1
|
||||||
</p>
|
</p>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
let={f}
|
let={f}
|
||||||
for={@changeset}
|
for={@changeset}
|
||||||
id="invite-form"
|
id="invite-form"
|
||||||
class="flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
||||||
phx-target={@myself}
|
phx-target={@myself}
|
||||||
phx-change="validate"
|
phx-change="validate"
|
||||||
phx-submit="save"
|
phx-submit="save"
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
let={f}
|
let={f}
|
||||||
for={@changeset}
|
for={@changeset}
|
||||||
id="shot-group-form"
|
id="shot-group-form"
|
||||||
class="flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
||||||
phx-target={@myself}
|
phx-target={@myself}
|
||||||
phx-change="validate"
|
phx-change="validate"
|
||||||
phx-submit="save"
|
phx-submit="save"
|
||||||
|
@ -36,7 +36,7 @@ defmodule CanneryWeb.TagLive.FormComponent do
|
|||||||
let={f}
|
let={f}
|
||||||
for={@changeset}
|
for={@changeset}
|
||||||
id="tag-form"
|
id="tag-form"
|
||||||
class="flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
||||||
phx-target={@myself}
|
phx-target={@myself}
|
||||||
phx-change="validate"
|
phx-change="validate"
|
||||||
phx-submit="save"
|
phx-submit="save"
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
Routes.user_confirmation_path(@conn, :create),
|
Routes.user_confirmation_path(@conn, :create),
|
||||||
[
|
[
|
||||||
class:
|
class:
|
||||||
"flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
"flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
||||||
],
|
],
|
||||||
fn f -> %>
|
fn f -> %>
|
||||||
<%= label(f, :email, class: "title text-lg text-primary-600") %>
|
<%= label(f, :email, class: "title text-lg text-primary-600") %>
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
Routes.user_registration_path(@conn, :create),
|
Routes.user_registration_path(@conn, :create),
|
||||||
[
|
[
|
||||||
class:
|
class:
|
||||||
"flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
"flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
||||||
],
|
],
|
||||||
fn f -> %>
|
fn f -> %>
|
||||||
<%= if @changeset.action && not @changeset.valid? do %>
|
<%= if @changeset.action && not @changeset.valid? do %>
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
Routes.user_reset_password_path(@conn, :update, @token),
|
Routes.user_reset_password_path(@conn, :update, @token),
|
||||||
[
|
[
|
||||||
class:
|
class:
|
||||||
"flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
"flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
||||||
],
|
],
|
||||||
fn f -> %>
|
fn f -> %>
|
||||||
<%= if @changeset.action && not @changeset.valid? do %>
|
<%= if @changeset.action && not @changeset.valid? do %>
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
Routes.user_reset_password_path(@conn, :create),
|
Routes.user_reset_password_path(@conn, :create),
|
||||||
[
|
[
|
||||||
class:
|
class:
|
||||||
"flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
"flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
||||||
],
|
],
|
||||||
fn f -> %>
|
fn f -> %>
|
||||||
<%= label(f, :email, class: "title text-lg text-primary-600") %>
|
<%= label(f, :email, class: "title text-lg text-primary-600") %>
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
[
|
[
|
||||||
as: :user,
|
as: :user,
|
||||||
class:
|
class:
|
||||||
"flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
"flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
||||||
],
|
],
|
||||||
fn f -> %>
|
fn f -> %>
|
||||||
<%= if @error_message do %>
|
<%= if @error_message do %>
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
Routes.user_settings_path(@conn, :update),
|
Routes.user_settings_path(@conn, :update),
|
||||||
[
|
[
|
||||||
class:
|
class:
|
||||||
"pb-4 text-center flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
"flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
||||||
],
|
],
|
||||||
fn f -> %>
|
fn f -> %>
|
||||||
<h3 class="title text-primary-600 text-lg col-span-3">
|
<h3 class="title text-primary-600 text-lg col-span-3">
|
||||||
@ -53,7 +53,7 @@
|
|||||||
Routes.user_settings_path(@conn, :update),
|
Routes.user_settings_path(@conn, :update),
|
||||||
[
|
[
|
||||||
class:
|
class:
|
||||||
"pb-4 text-center flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
"flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
||||||
],
|
],
|
||||||
fn f -> %>
|
fn f -> %>
|
||||||
<h3 class="title text-primary-600 text-lg col-span-3">
|
<h3 class="title text-primary-600 text-lg col-span-3">
|
||||||
|
2
mix.exs
2
mix.exs
@ -4,7 +4,7 @@ defmodule Cannery.MixProject do
|
|||||||
def project do
|
def project do
|
||||||
[
|
[
|
||||||
app: :cannery,
|
app: :cannery,
|
||||||
version: "0.2.0",
|
version: "0.2.1",
|
||||||
elixir: "~> 1.12",
|
elixir: "~> 1.12",
|
||||||
elixirc_paths: elixirc_paths(Mix.env()),
|
elixirc_paths: elixirc_paths(Mix.env()),
|
||||||
compilers: [:gettext] ++ Mix.compilers(),
|
compilers: [:gettext] ++ Mix.compilers(),
|
||||||
|
Reference in New Issue
Block a user