FeenixMakers/merged
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adding rugged, starting changes controller

Browse Source
This commit is contained in:
Torsten
2022-12-03 19:26:53 +02:00
parent ecaf0eb587
commit d7f55540b3
9 changed files with 43 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/views/layouts/merged/application.html.erb
View File

@ -1,15 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<title>Merged</title>
<%= csrf_meta_tags %>
<%= csp_meta_tag %>
<%= stylesheet_link_tag "merged/application", media: "all" %>
</head>
<body>
<%= yield %>
</body>
</html>

4
app/views/layouts/merged_layout.haml
View File

@ -2,7 +2,7 @@
%html
%head
%meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
%title Gateway
%title Merged CMS
%meta{:content => "width=device-width,initial-scale=1", :name => "viewport"}/
= csrf_meta_tags
= csp_meta_tag
@ -32,7 +32,7 @@
%a.text-gray-500.transition{:class => "hover:text-gray-500/75", :href => styles_index_path}
Styles
%li
%a.text-gray-500.transition{:class => "hover:text-gray-500/75", :href => "/changes"}
%a.text-gray-500.transition{:class => "hover:text-gray-500/75", :href => changes_index_path}
Changes
.flex.items-center.gap-4
.sm:flex.sm:gap-4

13
app/views/merged/changes/index.haml Normal file
View File

@ -0,0 +1,13 @@
%p= @git.workdir
%p Lines Changed
-@git.diff_workdir("HEAD").each_line do |line|
%p= line.content
%h3 Patches
%h3 Patches
%h3 Patches
-@git.diff_workdir("HEAD").each_patch do |patch|
%p= patch.additions
-patch.each_hunk do |hunk|
%p=hunk.header
-hunk.each_line do |line|
%p= line.content

2
app/views/merged/sections/show.html.haml
View File

@ -49,7 +49,7 @@
%h3.mt-4.text-lg.font-bold #{@section.cards.length} Cards
-@section.cards.each do |card|
.mt-4.text-md.font-bold= card.header
.text-sm "#{card.text[0..70]} ....."
.text-sm #{card.text[0..70]} .....
%p.p-3
= yellow_button( "View and Edit Cards" , section_cards_url(@section.id))
= green_button( "New Card" , new_section_card_url(@section.id) )