interdiff of round #6 and #5 · pull #393 · tangled.org/core

ERROR

appview/pages/markup/markdown.go

Failed to calculate interdiff for this file.

ERROR

appview/pages/markup/markdown_at_extension.go

Failed to calculate interdiff for this file.

ERROR

appview/issues/issues.go

Failed to calculate interdiff for this file.

ERROR

appview/email/email.go

Failed to calculate interdiff for this file.

ERROR

appview/signup/signup.go

Failed to calculate interdiff for this file.

REBASED

appview/state/state.go

This patch was likely rebased, as context lines do not match.

ERROR

appview/db/db.go

Failed to calculate interdiff for this file.

ERROR

appview/db/email.go

Failed to calculate interdiff for this file.

REBASED

appview/db/profile.go

This patch was likely rebased, as context lines do not match.

ERROR

appview/pages/pages.go

Failed to calculate interdiff for this file.

REVERTED

appview/pages/templates/settings.html

···

       93
       93
        
       {{ define "emails" }}

     

       94
       94
        
       <h2 class="text-sm font-bold py-2 px-6 uppercase dark:text-gray-300">email addresses</h2>

     

       95
       95
        
       <section class="rounded bg-white dark:bg-gray-800 drop-shadow-sm px-6 py-4 mb-6 w-full lg:w-fit">

     

       96
       96
       -
       <form

     

       97
       97
       -
         hx-post="/settings/email/preference"

     

       98
       98
       -
         hx-swap="none"

     

       99
       99
       -
         hx-indicator="#email-preference-spinner"

     

       100
       100
       -
       >

     

       101
       101
       -
         <select

     

       102
       102
       -
           name="preference"

     

       103
       103
       -
           class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600"

     

       104
       104
       -
         >

     

       105
       105
       -
           <option value="enable" {{ if .EmailNotifPreference.IsEnabled }}selected{{ end }}>Enable Email Notifications</option>

     

       106
       106
       -
           <option value="mention" {{ if .EmailNotifPreference.IsMention }}selected{{ end }}>Only on Mentions</option>

     

       107
       107
       -
           <option value="disable" {{ if .EmailNotifPreference.IsDisabled }}selected{{ end }}>Disable Email Notifications</option>

     

       108
       108
       -
         </select>

     

       109
       109
       -
         <button type="submit" class="btn text-base">

     

       110
       110
       -
           <span>Save Preference</span>

     

       111
       111
       -
           <span id="email-preference-spinner" class="group">

     

       112
       112
       -
             {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}

     

       113
       113
       -
           </span>

     

       114
       114
       -
         </button>

     

       115
       115
       -
       </form>

     

       116
       96
        
       <p class="mb-8 dark:text-gray-300">Commits authored using emails listed here will be associated with your Tangled profile.</p>

     

       117
       97
        
         <div id="email-list" class="flex flex-col gap-6 mb-8">

     

       118
       98
        
           {{ range $index, $email := .Emails }}

ERROR

appview/email/notifier.go

Failed to calculate interdiff for this file.

REBASED

appview/pulls/pulls.go

This patch was likely rebased, as context lines do not match.

NEW

appview/pages/templates/user/settings/emails.html

···

       11
       11
        
             </div>

     

       12
       12
        
             <div class="col-span-1 md:col-span-3 flex flex-col gap-6">

     

       13
       13
        
               {{ template "emailSettings" . }}

     

       14
       14
       +
               {{ template "emailList" . }}

     

       14
       15
        
             </div>

     

       15
       16
        
           </section>

     

       16
       17
        
         </div>

     

       17
       18
        
       {{ end }}

     

       18
       19
        
       

     

       19
       20
        
       {{ define "emailSettings" }}

     

       21
       21
       +
         <form

     

       22
       22
       +
           hx-post="/settings/email/preference"

     

       23
       23
       +
           hx-swap="none"

     

       24
       24
       +
           hx-indicator="#email-preference-spinner"

     

       25
       25
       +
           class="grid grid-cols-1 md:grid-cols-3 gap-4"

     

       26
       26
       +
         >

     

       27
       27
       +
           <div class="col-span-1 md:col-span-2">

     

       28
       28
       +
             <h2 class="text-sm pb-2 uppercase font-bold">Email Notifications</h2>

     

       29
       29
       +
           </div>

     

       30
       30
       +
           <select

     

       31
       31
       +
             name="preference"

     

       32
       32
       +
             class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600"

     

       33
       33
       +
           >

     

       34
       34
       +
             <option value="enable" {{ if .NotifPreference.IsEnabled }}selected{{ end }}>Enable</option>

     

       35
       35
       +
             <option value="mention" {{ if .NotifPreference.IsMention }}selected{{ end }}>Only on Mentions</option>

     

       36
       36
       +
             <option value="disable" {{ if .NotifPreference.IsDisabled }}selected{{ end }}>Disable</option>

     

       37
       37
       +
           </select>

     

       38
       38
       +
           <div class="md:col-start-2 col-span-2 flex justify-end">

     

       39
       39
       +
             <button type="submit" class="btn text-base">

     

       40
       40
       +
               <span>Save Preference</span>

     

       41
       41
       +
               <span id="email-preference-spinner" class="group">

     

       42
       42
       +
                 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}

     

       43
       43
       +
               </span>

     

       44
       44
       +
             </button>

     

       45
       45
       +
           </div>

     

       46
       46
       +
         </form>

     

       47
       47
       +
       {{ end }}

     

       48
       48
       +
       

     

       49
       49
       +
       {{ define "emailList" }}

     

       20
       50
        
         <div class="grid grid-cols-1 md:grid-cols-3 gap-4 items-center">

     

       21
       51
        
           <div class="col-span-1 md:col-span-2">

     

       22
       52
        
             <h2 class="text-sm pb-2 uppercase font-bold">Email Addresses</h2>

     
···

       91
       121
        
         <div id="settings-emails-error" class="text-red-500 dark:text-red-400"></div>

     

       92
       122
        
         <div id="settings-emails-success" class="text-green-500 dark:text-green-400"></div>

     

       93
       123
        
       </form>

     

       94
       94
       -
       {{ end }}
     

       124
       124
       +
       {{ end }}