interdiff of round #2 and #1 · pull #622 · tangled.org/core

ERROR

appview/config/config.go

Failed to calculate interdiff for this file.

REVERTED

appview/pages/templates/user/login.html

···

       36
       36
        
                                   placeholder="akshay.tngl.sh"

     

       37
       37
        
                               />

     

       38
       38
        
                               <span class="text-sm text-gray-500 mt-1">

     

       39
       39
       +
                                   Use your <a href="https://atproto.com">ATProto</a>

     

       39
       39
       -
                                   Use your <a href="https://atproto.com">AT Protocol</a>

     

       40
       40
        
                                   handle to log in. If you're unsure, this is likely

     

       41
       41
        
                                   your Tangled (<code>.tngl.sh</code>) or <a href="https://bsky.app">Bluesky</a> (<code>.bsky.social</code>) account.

     

       42
       42
        
                               </span>

ERROR

appview/db/email.go

Failed to calculate interdiff for this file.

ERROR

appview/pages/templates/repo/fork.html

Failed to calculate interdiff for this file.

ERROR

appview/repo/repo.go

Failed to calculate interdiff for this file.

ERROR

appview/db/db.go

Failed to calculate interdiff for this file.

ERROR

appview/issues/issues.go

Failed to calculate interdiff for this file.

ERROR

appview/pages/templates/repo/fragments/labelPanel.html

Failed to calculate interdiff for this file.

ERROR

appview/pages/templates/repo/fragments/participants.html

Failed to calculate interdiff for this file.

ERROR

appview/pages/templates/repo/issues/issue.html

Failed to calculate interdiff for this file.

ERROR

appview/pages/templates/repo/pulls/pull.html

Failed to calculate interdiff for this file.

ERROR

appview/pages/templates/repo/pulls/pulls.html

Failed to calculate interdiff for this file.

ERROR

appview/pulls/pulls.go

Failed to calculate interdiff for this file.

ERROR

appview/notify/db/db.go

Failed to calculate interdiff for this file.

ERROR

appview/models/notifications.go

Failed to calculate interdiff for this file.

ERROR

appview/pages/pages.go

Failed to calculate interdiff for this file.

ERROR

appview/pagination/page.go

Failed to calculate interdiff for this file.

ERROR

nix/pkgs/knot-unwrapped.nix

Failed to calculate interdiff for this file.

ERROR

appview/pages/templates/repo/fragments/cloneDropdown.html

Failed to calculate interdiff for this file.

ERROR

docs/spindle/pipeline.md

Failed to calculate interdiff for this file.

ERROR

knotserver/config/config.go

Failed to calculate interdiff for this file.

ERROR

appview/pages/templates/layouts/fragments/topbar.html

Failed to calculate interdiff for this file.

NEW

appview/pages/templates/user/completeSignup.html

···

       20
       20
        
                       content="complete your signup for tangled"

     

       21
       21
        
                   />

     

       22
       22
        
                   <script src="/static/htmx.min.js"></script>

     

       23
       23
       +
                   <link rel="manifest" href="/pwa-manifest.json" />

     

       23
       24
        
                   <link

     

       24
       25
        
                       rel="stylesheet"

     

       25
       26
        
                       href="/static/tw.css?{{ cssContentHash }}"

NEW

appview/pages/templates/user/signup.html

···

       8
       8
        
                   <meta property="og:url" content="https://tangled.org/signup" />

     

       9
       9
        
                   <meta property="og:description" content="sign up for tangled" />

     

       10
       10
        
                   <script src="/static/htmx.min.js"></script>

     

       11
       11
       +
                   <link rel="manifest" href="/pwa-manifest.json" />

     

       11
       12
        
                   <link rel="stylesheet" href="/static/tw.css?{{ cssContentHash }}" type="text/css" />

     

       12
       13
        
                   <title>sign up &middot; tangled</title>

     

       13
       14

NEW

appview/state/router.go

···

       37
       37
        
       	router.Use(middleware.TryRefreshSession())

     

       38
       38
        
       	router.Get("/favicon.svg", s.Favicon)

     

       39
       39
        
       	router.Get("/favicon.ico", s.Favicon)

     

       40
       40
       +
       	router.Get("/pwa-manifest.json", s.PWAManifest)

     

       40
       41
        
       

     

       41
       42
        
       	userRouter := s.UserRouter(&middleware)

     

       42
       43
        
       	standardRouter := s.StandardRouter(&middleware)

NEW

appview/state/state.go

···

       198
       198
        
       	s.pages.Favicon(w)

     

       199
       199
        
       }

     

       200
       200
        
       

     

       201
       201
       +
       // https://developer.mozilla.org/en-US/docs/Web/Progressive_web_apps/Manifest

     

       202
       202
       +
       const manifestJson = `{

     

       203
       203
       +
         "name": "tangled",

     

       204
       204
       +
         "description": "tightly-knit social coding.",

     

       205
       205
       +
         "icons": [

     

       206
       206
       +
           {

     

       207
       207
       +
             "src": "/favicon.svg",

     

       208
       208
       +
             "sizes": "144x144"

     

       209
       209
       +
           }

     

       210
       210
       +
         ],

     

       211
       211
       +
         "start_url": "/",

     

       212
       212
       +
         "id": "org.tangled",

     

       213
       213
       +
       

     

       214
       214
       +
         "display": "standalone",

     

       215
       215
       +
         "background_color": "#111827",

     

       216
       216
       +
         "theme_color": "#111827"

     

       217
       217
       +
       }`

     

       218
       218
       +
       

     

       219
       219
       +
       func (p *State) PWAManifest(w http.ResponseWriter, r *http.Request) {

     

       220
       220
       +
       	w.Header().Set("Content-Type", "application/json")

     

       221
       221
       +
       	w.Write([]byte(manifestJson))

     

       222
       222
       +
       }

     

       223
       223
       +
       

     

       201
       224
        
       func (s *State) TermsOfService(w http.ResponseWriter, r *http.Request) {

     

       202
       225
        
       	user := s.oauth.GetUser(r)

     

       203
       226
        
       	s.pages.TermsOfService(w, pages.TermsOfServiceParams{

NEW

appview/pages/templates/layouts/base.html

···

       24
       24
        
                   <title>{{ block "title" . }}{{ end }} · tangled</title>

     

       25
       25
        
                   {{ block "extrameta" . }}{{ end }}

     

       26
       26
        
               </head>

     

       27
       27
       -
               <body class="min-h-screen grid grid-cols-1 grid-rows-[min-content_auto_min-content] gap-4 bg-slate-100 dark:bg-gray-900 dark:text-white transition-colors duration-200"

     

       28
       28
       -
                 style="grid-template-columns: minmax(1rem, 1fr) minmax(auto, 1024px) minmax(1rem, 1fr);">

     

       27
       27
       +
               <body class="min-h-screen flex flex-col gap-4 bg-slate-100 dark:bg-gray-900 dark:text-white transition-colors duration-200">

     

       29
       28
        
                 {{ block "topbarLayout" . }}

     

       30
       30
       -
                   <header class="px-1 col-span-full md:col-span-1 md:col-start-2" style="z-index: 20;">

     

       29
       29
       +
                   <header class="w-full bg-white dark:bg-gray-800 col-span-full md:col-span-1 md:col-start-2" style="z-index: 20;">

     

       31
       30
        
       

     

       32
       31
        
                      {{ if .LoggedInUser }}

     

       33
       32
        
                       <div id="upgrade-banner"

     
···

       41
       40
        
                 {{ end }}

     

       42
       41
        
       

     

       43
       42
        
                 {{ block "mainLayout" . }}

     

       44
       44
       -
                   <div class="px-1 col-span-full  md:col-span-1 md:col-start-2 flex flex-col gap-4">

     

       45
       45
       -
                     {{ block "contentLayout" . }}

     

       43
       43
       +
                   <div class="flex-grow">

     

       44
       44
       +
                     <div class="max-w-screen-lg px-4 mx-auto my-6 flex flex-col gap-4">

     

       45
       45
       +
                       {{ block "contentLayout" . }}

     

       46
       46
        
                       <main>

     

       47
       47
        
                         {{ block "content" . }}{{ end }}

     

       48
       48
        
                       </main>

     

       49
       49
       -
                     {{ end }}

     

       50
       50
       -
         

     

       51
       51
       -
                     {{ block "contentAfterLayout" . }}

     

       49
       49
       +
                       {{ end }}

     

       50
       50
       +
                       

     

       51
       51
       +
                       {{ block "contentAfterLayout" . }}

     

       52
       52
        
                       <main>

     

       53
       53
        
                         {{ block "contentAfter" . }}{{ end }}

     

       54
       54
        
                       </main>

     

       55
       55
       -
                     {{ end }}

     

       55
       55
       +
                       {{ end }}

     

       56
       56
       +
                     </div>

     

       56
       57
        
                   </div>

     

       57
       58
        
                 {{ end }}

     

       58
       59
        
       

     

       59
       60
        
                 {{ block "footerLayout" . }}

     

       60
       60
       -
                   <footer class="px-1 col-span-full md:col-span-1 md:col-start-2 mt-12">

     

       61
       61
       +
                   <footer class="bg-white dark:bg-gray-800 mt-12">

     

       61
       62
        
                     {{ template "layouts/fragments/footer" . }}

     

       62
       63
        
                   </footer>

     

       63
       64
        
                 {{ end }}