From 56a16be5fb51d8f6a8b04e9e7094aa7c57fb8547 Mon Sep 17 00:00:00 2001 From: hellekin Date: Tue, 6 Oct 2020 04:26:25 +0200 Subject: First pass at something visible This is a first version of the application, to go beyond simple authentication. --- app/views/application/_user_info.html.erb | 17 +++++++++++++++++ app/views/layouts/application.html.erb | 19 +++++++++++++++++-- app/views/resources/delete.html.erb | 2 ++ app/views/resources/edit.html.erb | 2 ++ app/views/resources/index.html.erb | 2 ++ app/views/resources/new.html.erb | 2 ++ app/views/users/index.html.erb | 4 ++++ app/views/users/show.html.erb | 4 ++++ app/views/welcome/index.html.erb | 6 ------ 9 files changed, 50 insertions(+), 8 deletions(-) create mode 100644 app/views/application/_user_info.html.erb create mode 100644 app/views/resources/delete.html.erb create mode 100644 app/views/resources/edit.html.erb create mode 100644 app/views/resources/index.html.erb create mode 100644 app/views/resources/new.html.erb create mode 100644 app/views/users/index.html.erb create mode 100644 app/views/users/show.html.erb (limited to 'app/views') diff --git a/app/views/application/_user_info.html.erb b/app/views/application/_user_info.html.erb new file mode 100644 index 0000000..4549684 --- /dev/null +++ b/app/views/application/_user_info.html.erb @@ -0,0 +1,17 @@ +

+ <% if current_user.present? %> + <%= image_tag current_user.avatar_url, alt: current_user.username %> +

+ <%= tag.li(link_to(new_agent_switch_url, method: :get, remote: true, title: "Changer d'Agent") do + "Agent: %s" % current_agent + end, id: 'current_agent_name') %> + <%= tag.li link_to("Ajouter un point", new_resource_url) %> + <%= tag.li link_to("Mon compte", user_url(current_user.id)) %> + <%= tag.li link_to("Terminer la session", logout_url) %> + + <% else %> + <%= link_to image_tag('login.png', alt: 'Se connecter'), '/authenticate' %> + <% end %> +

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index cfee6e2..4aae3ea 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,7 +1,7 @@ - IncommonMap + Carte IN COMMON <%= csrf_meta_tags %> <%= csp_meta_tag %> @@ -10,6 +10,21 @@ - <%= yield %> +

<%= link_to image_tag("https://talk.incommon.cc/uploads/disc_6_incommon/original/1X/92f926e8210ea7a5412d6e2bdabfa825233e808b.png", alt: "IN COMMON", size: "x4em"), '/' %>

+ <%= render 'application/user_info' %> + <%= yield :header %> +

+ <%= yield %> +

+ + diff --git a/app/views/resources/delete.html.erb b/app/views/resources/delete.html.erb new file mode 100644 index 0000000..837c275 --- /dev/null +++ b/app/views/resources/delete.html.erb @@ -0,0 +1,2 @@ +

Resources#delete

Find me in app/views/resources/delete.html.erb

diff --git a/app/views/resources/edit.html.erb b/app/views/resources/edit.html.erb new file mode 100644 index 0000000..61b0939 --- /dev/null +++ b/app/views/resources/edit.html.erb @@ -0,0 +1,2 @@ +

Resources#edit

Find me in app/views/resources/edit.html.erb

diff --git a/app/views/resources/index.html.erb b/app/views/resources/index.html.erb new file mode 100644 index 0000000..320849a --- /dev/null +++ b/app/views/resources/index.html.erb @@ -0,0 +1,2 @@ +

Resources#index

Find me in app/views/resources/index.html.erb

diff --git a/app/views/resources/new.html.erb b/app/views/resources/new.html.erb new file mode 100644 index 0000000..c29e88a --- /dev/null +++ b/app/views/resources/new.html.erb @@ -0,0 +1,2 @@ +

Resources#new

Find me in app/views/resources/new.html.erb

diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb new file mode 100644 index 0000000..0d53728 --- /dev/null +++ b/app/views/users/index.html.erb @@ -0,0 +1,4 @@ +

Users#index

Find me in app/views/users/index.html.erb

+ +

Show a table with Agent <%= current_agent %> members (<%= pluralize(@users.count, "user") %>), their roles, and ways to change them.

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb new file mode 100644 index 0000000..95ca059 --- /dev/null +++ b/app/views/users/show.html.erb @@ -0,0 +1,4 @@ +

Users#show

Find me in app/views/users/show.html.erb

+ +

Show self information and ways to change stuff.

diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index a1fa276..d1f15c7 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -1,8 +1,2 @@

Bienvenue à l'atelier carto d'IN COMMON

-<% if current_user.present? %> -

Hi <%= h current_user.name %>, please <%= link_to 'proceed to your dashboard', url_for(action: 'dashboard') %>.

You may <%= link_to 'sign off', logout_url %>.

-<% else %> -

<%= link_to "S'identifier avec Talk.incommon.cc", '/authenticate' %>

-<% end %> -- cgit v1.2.3