Git Bridge: route PAT validation endpoint to correct router

- generate overleaf.conf dynamically
- support GIT_BRIDGE_HOST and GIT_BRIDGE_PORT
- configure client_max_body_size for /git using GIT_BRIDGE_REPOSTORE_MAX_FILE_SIZE

server-ce/Dockerfile

@@ -40,7 +40,7 @@ ADD server-ce/config/env.sh /etc/overleaf/env.sh
 # Configure nginx
 # ---------------
 ADD server-ce/nginx/nginx.conf.template /etc/nginx/templates/nginx.conf.template
-ADD server-ce/nginx/overleaf.conf /etc/nginx/sites-enabled/overleaf.conf
+ADD server-ce/nginx/overleaf.conf.template /etc/nginx/templates/overleaf.conf.template
 ADD server-ce/nginx/clsi-nginx.conf /etc/nginx/sites-enabled/clsi-nginx.conf
 
 
@@ -112,7 +112,9 @@ ENV GRACEFUL_SHUTDOWN_DELAY_SECONDS=1
 ENV NODE_ENV="production"
 ENV LOG_LEVEL="info"
 
-
+ENV GIT_BRIDGE_HOST=git-bridge
+ENV GIT_BRIDGE_PORT=8000
+ENV GIT_BRIDGE_REPOSTORE_MAX_FILE_SIZE=52428800
 EXPOSE 80
 
 ENTRYPOINT ["/sbin/my_init"]

server-ce/init_scripts/200_nginx_config_template.sh

@@ -16,12 +16,18 @@ fi
 nginx_template_file="${nginx_templates_dir}/nginx.conf.template"
 nginx_config_file="${nginx_dir}/nginx.conf"
 
+overleaf_template_file="${nginx_templates_dir}/overleaf.conf.template"
+overleaf_config_file="${nginx_dir}/sites-enabled/overleaf.conf"
+
 if [ -f "${nginx_template_file}" ]; then
   export NGINX_KEEPALIVE_TIMEOUT="${NGINX_KEEPALIVE_TIMEOUT:-65}"
   export NGINX_WORKER_CONNECTIONS="${NGINX_WORKER_CONNECTIONS:-768}"
   export NGINX_WORKER_PROCESSES="${NGINX_WORKER_PROCESSES:-4}"
   export MAX_UPLOAD_SIZE="${MAX_UPLOAD_SIZE:-50}"
 
+  export GIT_BRIDGE_HOST="${GIT_BRIDGE_HOST:-git-bridge}"
+  export GIT_BRIDGE_PORT="${GIT_BRIDGE_PORT:-8000}"
+  export GIT_BRIDGE_REPOSTORE_MAX_FILE_SIZE="${GIT_BRIDGE_REPOSTORE_MAX_FILE_SIZE:-52428800}"
   echo "Nginx: generating config file from template"
 
   # Note the single-quotes, they are important.
@@ -37,6 +43,15 @@ if [ -f "${nginx_template_file}" ]; then
     < "${nginx_template_file}" \
     > "${nginx_config_file}"
 
+  # Config git-bridge in nginx
+  envsubst '
+    ${GIT_BRIDGE_HOST}
+    ${GIT_BRIDGE_PORT}
+    ${GIT_BRIDGE_REPOSTORE_MAX_FILE_SIZE}
+  ' \
+    < "${overleaf_template_file}" \
+    > "${overleaf_config_file}"
+
   echo "Checking Nginx config"
   nginx -t
 

server-ce/nginx/overleaf.conf.template

@@ -24,8 +24,9 @@ server {
 	location ^~ /git/ {
 		resolver_timeout 2s;
 		resolver 127.0.0.11 valid=10s;
-		set $git_upstream http://git-bridge:8000;
+		set $git_upstream http://${GIT_BRIDGE_HOST}:${GIT_BRIDGE_PORT};
 		rewrite ^/git/(.*)$ /$1 break;
+		client_max_body_size ${GIT_BRIDGE_REPOSTORE_MAX_FILE_SIZE};
 		proxy_pass $git_upstream;
 		proxy_http_version 1.1;
 		proxy_set_header Upgrade $http_upgrade;

services/web/config/settings.defaults.js

@@ -1145,7 +1145,9 @@ module.exports = {
   },
 
   splitTestOverrides: {
- // new-fancy-feature': 'enabled',
+    ...(process.env.OVERLEAF_THEMED_DASHBOARD?.toLowerCase() === 'true' ? {
+      'themed-project-dashboard': 'enabled',
+    } : {}),
     ...(process.env.OVERLEAF_HISTORY_RESTORE?.toLowerCase() === 'true' ? {
       'history-ranges-support': 'enabled',
       'revert-file': 'enabled',

services/web/frontend/stylesheets/components/button.scss

@@ -1,3 +1,108 @@
+@mixin light-buttons {
+  // primary
+  --btn-primary-color: var(--white);
+  --btn-primary-background: var(--bg-accent-01);
+  --btn-primary-hover-background: var(--bg-accent-02);
+  --btn-primary-hover-border: var(--bg-accent-02);
+
+  // secondary
+  --btn-secondary-color: var(--content-primary);
+  --btn-secondary-background: var(--bg-light-primary);
+  --btn-secondary-border: var(--border-primary);
+  --btn-secondary-hover-background: var(--bg-light-tertiary);
+  --btn-secondary-hover-border: var(--border-primary);
+
+  // ghost
+  --btn-ghost-color: var(--content-primary);
+  --btn-ghost-background: var(--bg-light-primary);
+  --btn-ghost-hover-background: var(--bg-light-tertiary);
+
+  // danger
+  --btn-danger-color: var(--white);
+  --btn-danger-background: var(--bg-danger-01);
+  --btn-danger-border: var(--bg-danger-01);
+  --btn-danger-hover-background: var(--bg-danger-02);
+
+  // danger-ghost
+  --btn-danger-ghost-color: var(--content-danger);
+  --btn-danger-ghost-background: var(--bg-light-primary);
+  --btn-danger-ghost-hover-background: var(--bg-danger-03);
+  --btn-danger-ghost-border: var(--bg-light-primary);
+  --btn-danger-ghost-hover-border: var(--bg-light-primary);
+
+  // premium
+  --btn-premium-color: var(--white);
+  --btn-premium-background: var(--blue-70);
+  --btn-premium-hover-background: var(--blue-70);
+
+  // premium-secondary
+  --btn-premium-secondary-color: var(--blue-60);
+  --btn-premium-secondary-background: var(--bg-light-primary);
+  --btn-premium-secondary-border: var(--blue-60);
+  --btn-premium-secondary-hover-background: var(--bg-info-03);
+  --btn-premium-secondary-hover-border: var(--blue-60);
+}
+
+@mixin dark-buttons {
+  // primary
+  --btn-primary-color: var(--white);
+  --btn-primary-background: var(--bg-accent-01);
+  --btn-primary-hover-background: var(--bg-accent-02);
+  --btn-primary-hover-border: var(--bg-accent-02);
+
+  // secondary
+  --btn-secondary-color: var(--white);
+  --btn-secondary-background: var(--bg-dark-primary);
+  --btn-secondary-border: var(--bg-light-primary);
+  --btn-secondary-hover-background: var(--bg-dark-tertiary);
+  --btn-secondary-hover-border: var(--bg-light-primary);
+
+  // ghost
+  --btn-ghost-color: var(--white);
+  --btn-ghost-background: var(--bg-dark-secondary);
+  --btn-ghost-hover-background: var(--bg-dark-tertiary);
+
+  // danger
+  --btn-danger-color: var(--white);
+  --btn-danger-background: var(--bg-danger-01);
+  --btn-danger-border: var(--bg-danger-01);
+  --btn-danger-hover-background: var(--bg-danger-02);
+
+  // danger-ghost
+  --btn-danger-ghost-color: var(--bg-danger-03);
+  --btn-danger-ghost-background: var(--bg-dark-secondary);
+  --btn-danger-ghost-hover-background: var(--bg-dark-tertiary);
+  --btn-danger-ghost-border: var(--bg-danger-01);
+  --btn-danger-ghost-hover-border: var(--bg-danger-01);
+
+  // premium
+  --btn-premium-color: var(--white);
+  --btn-premium-background: var(--blue-70);
+  --btn-premium-hover-background: var(--blue-70);
+
+  // premium-secondary, todo once WIP designs for dm are finished
+  --btn-premium-secondary-color: var(--content-primary);
+  --btn-premium-secondary-background: var(--blue-30);
+  --btn-premium-secondary-border: var(--blue-60);
+  --btn-premium-secondary-hover-background: var(--blue-30);
+  --btn-premium-secondary-hover-border: var(--blue-60);
+}
+
+:root {
+  .btn {
+    @include light-buttons;
+  }
+
+  @include theme('default') {
+    .ide-redesign-main,
+    .project-ds-nav-page {
+      .btn {
+        @include dark-buttons;
+      }
+    }
+  }
+}
+
 .btn {
   // Focus style for all buttons
   --bs-btn-focus-box-shadow: 0 0 0 2px var(--border-active-dark);
@@ -35,70 +140,73 @@
   // Variants
   &.btn-primary {
     @include ol-button-variant(
-      $color: var(--white),
-      $background: var(--bg-accent-01),
-      $hover-background: var(--bg-accent-02),
-      $hover-border: var(--bg-accent-02)
+      $color: var(--btn-primary-color),
+      $background: var(--btn-primary-background),
+      $hover-background: var(--btn-primary-hover-background),
+      $hover-border: var(--btn-primary-hover-border)
     );
   }
 
   &.btn-secondary {
     @include ol-button-variant(
-      $color: var(--content-primary),
-      $background: var(--bg-light-primary),
-      $border: var(--border-primary),
-      $hover-background: var(--bg-light-tertiary),
-      $hover-border: var(--border-primary),
+      $color: var(--btn-secondary-color),
+      $background: var(--btn-secondary-background),
+      $border: var(--btn-secondary-border),
+      $hover-background: var(--btn-secondary-hover-background),
+      $hover-border: var(--btn-secondary-hover-border),
       $borderless: false
     );
   }
 
   &.btn-ghost {
     @include ol-button-variant(
-      $color: var(--content-primary),
-      $background: var(--bg-light-primary),
-      $hover-background: var(--bg-light-tertiary)
+      $color: var(--btn-ghost-color),
+      $background: var(--btn-ghost-background),
+      $hover-background: var(--btn-ghost-hover-background)
     );
   }
 
   &.btn-danger {
     @include ol-button-variant(
-      $color: var(--white),
-      $background: var(--bg-danger-01),
-      $border: var(--bg-danger-01),
-      $hover-background: var(--bg-danger-02)
+      $color: var(--btn-danger-color),
+      $background: var(--btn-danger-background),
+      $border: var(--btn-danger-border),
+      $hover-background: var(--btn-danger-hover-background)
     );
   }
 
   &.btn-danger-ghost {
     @include ol-button-variant(
-      $color: var(--content-danger),
-      $background: var(--bg-light-primary),
-      $hover-background: var(--bg-danger-03)
+      $color: var(--btn-danger-ghost-color),
+      $background: var(--btn-danger-ghost-background),
+      $border: var(--btn-danger-ghost-border),
+      $hover-background: var(--btn-danger-ghost-hover-background),
+      $hover-border: var(--btn-danger-ghost-hover-border),
+      $borderless: false
     );
   }
 
   &.btn-premium {
     @include ol-button-variant(
-      $color: var(--white),
-      $background: var(--blue-70)
+      $color: var(--btn-premium-color),
+      $background: var(--btn-premium-background)
     );
 
     background: var(--premium-gradient);
     transition: none;
 
     &:hover {
-      background: var(--blue-70);
+      background: var(--btn-premium-hover-background);
     }
   }
 
   &.btn-premium-secondary {
     @include ol-button-variant(
-      $color: var(--blue-60),
-      $background: var(--bg-light-primary),
-      $border: var(--blue-60),
-      $hover-background: var(--bg-info-03),
-      $hover-border: var(--blue-60),
+      $color: var(--btn-premium-secondary-color),
+      $background: var(--btn-premium-secondary-background),
+      $border: var(--btn-premium-secondary-border),
+      $hover-background: var(--btn-premium-secondary-hover-background),
+      $hover-border: var(--btn-premium-secondary-hover-border),
       $borderless: false
     );
   }
@@ -261,6 +369,18 @@ a.btn:visited {
   text-decoration: none;
 }
 
+.copy-button.copy-button-ghost {
+  @include ol-button-variant(
+    $color: var(--content-primary),
+    $background: transparent,
+    $hover-background: var(--bg-light-tertiary)
+  );
+
+  .button-content {
+    gap: var(--spacing-02);
+  }
+}
+
 .btn-reset {
   @include reset-button;
 }

services/web/frontend/stylesheets/modules/admin-tools/entries-per-page.scss

@@ -0,0 +1,26 @@
+.entries-per-page-toggle {
+  cursor: pointer;
+  background-color: var(--bg-light-tertiary);
+  padding: 0 var(--spacing-02);
+  border-radius: var(--border-radius-medium);
+  &:hover {
+    background-color: var(--bg-accent-03);
+  }
+  & + .dropdown-menu {
+    min-width: auto;
+    width: auto;
+  }
+}
+
+.entries-per-page-toggle::after {
+  display: none;
+}
+
+@include theme('default') {
+  .entries-per-page-toggle {
+    background-color: var(--bg-dark-tertiary);
+    &:hover {
+      background-color: var(--green-70);
+    }
+  }
+}

services/web/frontend/stylesheets/modules/admin-tools/manage-projects-page.scss

@@ -5,3 +5,12 @@
     }
   }
 }
+
+@include theme('default') {
+  #manage-projects-root {
+    .website-redesign-navbar,
+    .website-redesign .navbar-default {
+      @include navbar-dark;
+    }
+  }
+}

services/web/frontend/stylesheets/modules/admin-tools/manage-users-page.scss

@@ -0,0 +1,25 @@
+@include theme('default') {
+  #manage-users-root {
+    .website-redesign-navbar,
+    .website-redesign .navbar-default {
+      @include navbar-dark;
+    }
+  }
+  .project-list-wrapper {
+   .project-dash-table {
+      .btn-link {
+        &:hover,
+        &:focus {
+          background-color: var(--bg-dark-tertiary) !important;
+        }
+      }
+    }
+  }
+  .user-ds-nav-page {
+    @include dark-dropdown-menu;
+    .table,
+    .table-container {
+      @include dark-table;
+    }
+  }
+}

services/web/frontend/stylesheets/modules/admin-tools/pagination-dark.scss

@@ -0,0 +1,33 @@
+@include theme('default') {
+ .project-ds-nav-page,
+ .user-ds-nav-page {
+    .pagination {
+      > li {
+        > a,
+        > span,
+        > button {
+          color: var(--content-primary-inverse);
+          background-color: var(--bg-secondary);
+          border-color: var(--border-primary);
+
+          &:hover,
+          &:focus {
+            color: var(--content-primary-inverse);
+            background-color: var(--bg-tertiary);
+          }
+        }
+      }
+
+      > .active > a,
+      > .active > span,
+      > .active > button {
+        &,
+        &:hover,
+        &:focus {
+          color: var(--content-primary-inverse);
+          background-color: var(--green-70);
+        }
+      }
+    }
+  }
+}

services/web/frontend/stylesheets/modules/admin-tools/user-list-ds-nav.scss

@@ -1,9 +1,42 @@
+:root {
+  --ds-nav-active-bg: var(--bg-accent-03);
+  --ds-nav-active-color: var(--green-60);
+  --theme-toggle-selected-background: var(--green-20);
+  --ds-nav-content-bg-secondary: var(--bg-light-secondary);
+  --table-icon-bg-hover: 27 34 44;
+  --themed-dashboard-popover-bg: var(--bg-dark-primary);
+  --themed-dashboard-popover-color: var(--content-primary-dark);
+  --themed-dashboard-popover-link-color: var(--link-ui-dark);
+  --themed-dashboard-popover-link-hover-color: var(--link-ui-hover-dark);
+  --themed-dashboard-popover-link-visited-color: var(--link-ui-visited-dark);
+  --ds-nav-color-scheme: light;
+
+  @include theme('default') {
+    --ds-nav-active-bg: var(--green-70);
+    --ds-nav-active-color: var(--green-10);
+    --theme-toggle-selected-background: var(--green-70);
+    --ds-nav-content-bg-secondary: var(--bg-dark-secondary);
+    --table-icon-bg-hover: 255 255 255;
+    --themed-dashboard-popover-bg: var(--bg-light-primary);
+    --themed-dashboard-popover-color: var(--content-primary);
+    --themed-dashboard-popover-link-color: var(--link-ui);
+    --themed-dashboard-popover-link-hover-color: var(--link-ui-hover);
+    --themed-dashboard-popover-link-visited-color: var(--link-ui-visited);
+    --ds-nav-color-scheme: dark;
+  }
+}
+
+body {
+  --ds-nav-bg-color: var(--bg-primary-themed);
+  --ds-nav-hover-bg: var(--bg-secondary-themed);
+  --ds-nav-color: var(--content-secondary-themed);
+}
+
 .user-ds-nav-page {
-  display: flex;
-  flex-direction: column;
-  height: 100vh;
-  height: 100dvh;
-  color: var(--content-secondary);
+  @include full-height-stacked-page;
+
+  color-scheme: var(--ds-nav-color-scheme);
+  color: var(--content-secondary-themed);
 
   // NOTE-AC: This code can be eliminated when we remove sidebar-navigation-ui-update
   --navbar-btn-padding-h: var(--spacing-06);
@@ -15,9 +48,6 @@
   .navbar-default {
     position: relative;
 
-    --navbar-toggler-expanded-bg: none;
-    --navbar-toggler-expanded-color: var(--content-secondary);
-
     .navbar-header .navbar-logo {
       @include media-breakpoint-up(md) {
         position: relative;
@@ -48,7 +78,7 @@
       .nav-item-help::before {
         content: '';
         display: block;
-        border-top: 1px solid var(--border-divider);
+        border-top: 1px solid var(--border-divider-themed);
         margin: var(--spacing-07) var(--spacing-06);
       }
 
@@ -63,8 +93,8 @@
               border-radius: var(--border-radius-medium);
 
               &.show {
-                background-color: var(--bg-accent-03);
-                color: var(--green-60);
+                background-color: var(--ds-nav-active-bg);
+                color: var(--ds-nav-active-color);
               }
             }
           }
@@ -78,6 +108,7 @@
   }
 
   .user-list-wrapper {
+    background-color: var(--ds-nav-bg-color);
     flex-grow: 1;
     display: flex;
     overflow-y: hidden;
@@ -95,6 +126,10 @@
       .create-account-button-wrapper {
         padding: 0 var(--spacing-08) var(--spacing-05) var(--spacing-05);
         border-bottom: solid 1px transparent;
+
+        &.show-shadow {
+          border-bottom-color: var(--border-divider-themed);
+        }
       }
 
       nav {
@@ -117,39 +152,13 @@
         border-top: solid 1px transparent;
 
         &.show-shadow {
-          border-top-color: var(--border-divider);
+          border-top-color: var(--border-divider-themed);
         }
       }
+    }
 
-      .user-list-sidebar-survey-link {
-        color: var(--content-secondary) !important;
-      }
-
-      .survey-notification {
-        background-color: var(--bg-light-secondary);
-        color: var(--content-secondary);
-        box-shadow: none;
-        border-radius: var(--border-radius-large);
-        position: relative;
-
-        .user-notification-close {
-          border: none;
-          padding: 0;
-          background: none;
-          position: absolute;
-          top: var(--spacing-07);
-          right: var(--spacing-07);
-          color: inherit;
-        }
-
-        p {
-          margin-bottom: var(--spacing-03);
-        }
-      }
-
-      .user-list-sidebar-survey-wrapper .user-notifications {
-        margin-bottom: var(--spacing-05);
-      }
+    hr {
+      border-top: 1px solid var(--border-divider-themed);
     }
 
     ul.user-list-filters {
@@ -163,7 +172,7 @@
         > button {
           width: 100%;
           text-align: left;
-          color: var(--content-secondary);
+          color: var(--ds-nav-color);
           background: none;
           border-radius: var(--border-radius-medium);
           border: none;
@@ -171,18 +180,19 @@
         }
 
         &:hover button {
-          background-color: var(--bg-light-secondary);
+          background-color: var(--ds-nav-hover-bg);
         }
 
         &.active button {
-          background-color: var(--bg-accent-03);
-          color: var(--green-60);
+          background-color: var(--ds-nav-active-bg);
+          color: var(--ds-nav-active-color);
           font-weight: bold;
         }
       }
 
       .dropdown-header {
         font-weight: bold;
+        color: var(--ds-nav-color);
       }
 
       > li.tag {
@@ -195,7 +205,7 @@
         button.dropdown-toggle {
           border-radius: var(--border-radius-full);
           border: none;
-          color: var(--content-secondary);
+          color: var(--ds-nav-color);
           height: 20px;
           width: 20px;
           padding: 0;
@@ -224,7 +234,7 @@
 
     .user-dash-table {
       .btn-link {
-        color: var(--content-secondary);
+        color: var(--content-secondary-themed);
         height: var(--spacing-08);
         width: var(--spacing-08);
         border-radius: 100%;
@@ -233,12 +243,12 @@
 
         &:hover,
         &:focus {
-          background-color: #d9d9d9 !important;
+          background-color: rgb(var(--table-icon-bg-hover) / 8%) !important;
         }
       }
 
       .dash-cell-name a {
-        color: var(--content-secondary) !important;
+        color: var(--content-primary-themed) !important;
       }
     }
 
@@ -249,7 +259,7 @@
 
       > * {
         @include media-breakpoint-up(md) {
-          border-left: 1px solid var(--border-divider);
+          border-left: 1px solid var(--border-divider-themed);
         }
       }
 
@@ -257,17 +267,16 @@
         flex-grow: 1;
         overflow-y: auto;
         position: relative;
-        background-color: var(--bg-light-secondary);
+        background-color: var(--ds-nav-content-bg-secondary);
 
         @include media-breakpoint-up(md) {
           border-top-left-radius: var(--border-radius-large);
-          border-top: 1px solid var(--border-divider);
+          border-top: 1px solid var(--border-divider-themed);
         }
       }
 
       .cookie-banner {
         position: static;
-        background-color: var(--bg-light-primary);
 
         // Remove the parts of the shadow that stick out of the sides
         clip-path: inset(-13px 0 0 0);
@@ -276,11 +285,16 @@
         z-index: auto;
       }
     }
+
+    .btn-link {
+      --link-color: var(--link-web-themed);
+      --link-hover-color: var(--link-web-hover-themed);
+    }
   }
 
   .ds-nav-icon-dropdown {
     .dropdown-toggle {
-      color: var(--content-secondary);
+      color: var(--ds-nav-color);
       background: none;
       height: 44px;
       width: 44px;
@@ -288,12 +302,12 @@
       overflow: hidden;
 
       &:hover {
-        background-color: var(--bg-light-secondary);
+        background-color: var(--ds-nav-hover-bg);
       }
 
       &.show {
-        background-color: var(--bg-accent-03);
-        color: var(--green-60);
+        background-color: var(--ds-nav-active-bg);
+        color: var(--ds-nav-active-color);
       }
 
       &::after {
@@ -314,6 +328,7 @@
   }
 
   .ds-nav-ds-name {
+    color: var(--ds-nav-color);
     margin-bottom: var(--spacing-05);
 
     span {
@@ -323,4 +338,59 @@
       @include body-xs;
     }
   }
+
+  .add-affiliation {
+    color: var(--ds-nav-color);
+  }
+}
+
+.theme-toggle {
+  display: flex;
+  justify-content: space-between;
+  cursor: default !important;
+  align-items: center;
+
+  &:hover {
+    background-color: transparent !important;
+    color: var(--content-primary-themed);
+  }
+
+  legend {
+    font-size: var(--font-size-02);
+    line-height: var(--line-height-02);
+    margin-bottom: 0;
+  }
+}
+
+.theme-toggle-radios {
+  display: flex;
+  border-radius: var(--border-radius-full);
+  background-color: var(--bg-secondary-themed);
+  padding: var(--spacing-01);
+  gap: var(--spacing-01);
+}
+
+.theme-toggle-radio {
+  display: flex;
+
+  input {
+    all: unset;
+  }
+
+  label {
+    display: flex;
+    padding: var(--spacing-03);
+    margin-bottom: 0;
+    border-radius: var(--border-radius-full);
+    cursor: pointer;
+    color: var(--content-primary-themed);
+  }
+
+  .material-symbols {
+    font-size: var(--font-size-03);
+  }
+
+  input:checked + label {
+    background-color: var(--theme-toggle-selected-background);
+  }
 }

services/web/frontend/stylesheets/modules/admin-tools/user-list.scss

@@ -17,7 +17,7 @@
   padding: 0 var(--spacing-02);
 }
 
-#user-list-root .user-notifications ul {
+#manage-users-root .user-notifications ul {
   margin-bottom: 0;
 }
 
@@ -50,7 +50,7 @@
   .user-list-title {
     @include heading-sm;
 
-    color: $content-secondary;
+    color: var(--content-secondary-themed);
     font-weight: bold;
     min-width: 0;
   }
@@ -241,7 +241,7 @@ ul.user-list-filters {
 
   @include media-breakpoint-down(md) {
     tr:not(:last-child) {
-      border-bottom: 1px solid $table-border-color;
+      border-bottom: 1px solid var(--border-divider-themed);
     }
 
     td {
@@ -260,7 +260,7 @@ ul.user-list-filters {
   .table-header-sort-btn {
     border: 0;
     text-align: left;
-    color: var(--content-secondary);
+    color: var(--content-secondary-themed);
     background-color: transparent;
     padding: 0;
     font-weight: bold;
@@ -271,7 +271,7 @@ ul.user-list-filters {
 
     &:hover,
     &:focus {
-      color: var(--content-secondary);
+      color: var(--content-secondary-themed);
       text-decoration: none;
     }
 
@@ -283,11 +283,8 @@ ul.user-list-filters {
 
   .dash-row-admin {
     font-weight: bold;
-    td {
-      a {
-        color: darkred !important;
-        --bs-link-color: darkred !important;
-      }
+    a {
+      color: var(--content-danger) !important;
     }
   }
 
@@ -474,7 +471,7 @@ ul.user-list-filters {
     }
 
     .dash-cell-actions {
-      width: 12;
+      width: 12%;
     }
   }
 
@@ -532,57 +529,18 @@ ul.user-list-filters {
   }
 }
 
-.survey-notification {
-  display: flex;
-  flex-wrap: wrap;
-  padding: var(--spacing-06);
-  background-color: var(--bg-dark-tertiary);
-  border-color: transparent;
-  color: var(--neutral-20);
-  box-shadow: 2px 4px 6px rgb(0 0 0 / 25%);
-  border-radius: var(--border-radius-base);
-
-  @include media-breakpoint-up(md) {
-    flex-wrap: nowrap;
-  }
-
-  button.close {
-    @extend .text-white;
-
-    padding: 0;
-  }
-}
-
-.user-list-sidebar-survey-wrapper {
-  .survey-notification {
-    font-size: var(--font-size-02);
-
-    a {
-      text-decoration: none;
-    }
-  }
-
-  @include media-breakpoint-down(md) {
-    .survey-notification {
-      font-size: unset;
-
-      .user-list-sidebar-survey-link {
-        display: block;
-        align-items: center;
-        min-width: 48px;
-        min-height: 48px;
-        padding-top: var(--spacing-07);
-      }
-    }
-  }
-}
-
-.user-list-load-more-button {
-  margin-bottom: var(--spacing-05);
-}
-
 form.user-search {
   .form-group {
     margin-bottom: 0;
   }
 }
+
+@include theme('default') {
+  .dash-cell-email a,
+  .dash-cell-email-date a {
+    color: var(--green-40);
+  }
+  .dash-row-admin a {
+    color: var(--content-danger-dark) !important;
+  }
+}

services/web/frontend/stylesheets/modules/all.scss

@@ -9,6 +9,9 @@
 @import 'symbol-palette';
 @import 'writefull';
 @import 'labs';
+@import 'admin-tools/entries-per-page';
 @import 'admin-tools/user-list';
 @import 'admin-tools/user-list-ds-nav';
 @import 'admin-tools/manage-projects-page';
+@import 'admin-tools/manage-users-page';
+@import 'admin-tools/pagination-dark';

services/web/modules/admin-tools/app/src/ProjectListController.mjs

@@ -4,21 +4,32 @@ import { fileURLToPath } from 'node:url'
 import { expressify } from '@overleaf/promise-utils'
 import logger from '@overleaf/logger'
 import Metrics from '@overleaf/metrics'
+import SessionManager from '../../../../app/src/Features/Authentication/SessionManager.mjs'
+import PrivilegeLevels from '../../../../app/src/Features/Authorization/PrivilegeLevels.mjs'
 import ProjectHelper from '../../../../app/src/Features/Project/ProjectHelper.mjs'
 import ProjectGetter from '../../../../app/src/Features/Project/ProjectGetter.mjs'
-import PrivilegeLevels from '../../../../app/src/Features/Authorization/PrivilegeLevels.mjs'
-import SessionManager from '../../../../app/src/Features/Authentication/SessionManager.mjs'
+import ProjectDeleter from '../../../../app/src/Features/Project/ProjectDeleter.mjs'
+import UserSettingsHelper from '../../../../app/src/Features/Project/UserSettingsHelper.mjs'
 import UserGetter from '../../../../app/src/Features/User/UserGetter.mjs'
-import { OError } from '../../../../app/src/Features/Errors/Errors.js'
 import { User } from '../../../../app/src/models/User.mjs'
 import { Project } from '../../../../app/src/models/Project.mjs'
 import { DeletedProject } from '../../../../app/src/models/DeletedProject.mjs'
-import ProjectDeleter from '../../../../app/src/Features/Project/ProjectDeleter.mjs'
+import { OError } from '../../../../app/src/Features/Errors/Errors.js'
 import HttpErrorHandler from '../../../../app/src/Features/Errors/HttpErrorHandler.mjs'
+import SplitTestHandler from '../../../../app/src/Features/SplitTests/SplitTestHandler.mjs'
 
 const __dirname = Path.dirname(fileURLToPath(import.meta.url))
 
+function cleanupSession(req) {
+  // cleanup redirects at the end of the redirect chain
+  delete req.session.postCheckoutRedirect
+  delete req.session.postLoginRedirect
+  delete req.session.postOnboardingRedirect
+}
+
 async function manageProjectsPage(req, res, next) {
+  cleanupSession(req)
+
   const projectsBlobPending = _getProjects().catch(err => {
     logger.err({ err }, 'projects listing in background failed')
     return undefined
@@ -30,8 +41,24 @@ async function manageProjectsPage(req, res, next) {
     status: prefetchedProjectsBlob ? 'success' : 'error',
   })
 
+  const userId = SessionManager.getLoggedInUserId(req.session)
+  const user = await User.findById(userId, 'ace')
+
+  const userSettings = await UserSettingsHelper.buildUserSettings(
+    req,
+    res,
+    user
+  )
+
+  await SplitTestHandler.promises.getAssignment(
+    req,
+    res,
+    'themed-project-dashboard'
+  )
+
   res.render(Path.resolve(__dirname, '../views/manage-projects-react'), {
     title: 'Manage Projects',
+    userSettings,
     prefetchedProjectsBlob,
   })
 }

services/web/modules/admin-tools/app/src/UserListController.mjs

@@ -16,12 +16,14 @@ import OneTimeTokenHandler from '../../../../app/src/Features/Security/OneTimeTo
 import UserGetter from '../../../../app/src/Features/User/UserGetter.mjs'
 import UserUpdater from '../../../../app/src/Features/User/UserUpdater.mjs'
 import UserDeleter from '../../../../app/src/Features/User/UserDeleter.mjs'
+import UserSettingsHelper from '../../../../app/src/Features/Project/UserSettingsHelper.mjs'
 import ProjectDeleter from '../../../../app/src/Features/Project/ProjectDeleter.mjs'
 import OwnershipTransferHandler from '../../../../app/src/Features/Collaborators/OwnershipTransferHandler.mjs'
 import HttpErrorHandler from '../../../../app/src/Features/Errors/HttpErrorHandler.mjs'
 import ErrorController from '../../../../app/src/Features/Errors/ErrorController.mjs'
 import Errors, { OError } from '../../../../app/src/Features/Errors/Errors.js'
 import { db } from '../../../../app/src/infrastructure/mongodb.mjs'
+import SplitTestHandler from '../../../../app/src/Features/SplitTests/SplitTestHandler.mjs'
 
 const __dirname = Path.dirname(fileURLToPath(import.meta.url))
 
@@ -71,8 +73,6 @@ function cleanupSession(req) {
 async function manageUsersPage(req, res, next) {
   cleanupSession(req)
 
-  const userId = SessionManager.getLoggedInUserId(req.session)
-
   const usersBlobPending = _getUsers().catch(err => {
     logger.err({ err }, 'users listing in background failed')
     return undefined
@@ -84,8 +84,24 @@ async function manageUsersPage(req, res, next) {
     status: prefetchedUsersBlob ? 'success' : 'error',
   })
 
+  await SplitTestHandler.promises.getAssignment(
+    req,
+    res,
+    'themed-project-dashboard'
+  )
+
+  const userId = SessionManager.getLoggedInUserId(req.session)
+  const user = await User.findById(userId, 'ace')
+
+  const userSettings = await UserSettingsHelper.buildUserSettings(
+    req,
+    res,
+    user
+  )
+
   res.render(Path.resolve(__dirname, '../views/manage-users-react'), {
     title: 'Manage Users',
+    userSettings,
     prefetchedUsersBlob,
     availableAuthMethods,
     userDetailsUpdatedOnLogin,

services/web/modules/admin-tools/app/views/manage-projects-react.pug

@@ -15,6 +15,8 @@ block append meta
 		data-type='json'
 		content=prefetchedProjectsBlob
 	)
+	meta(name='ol-userSettings' data-type='json' content=userSettings)
+	meta(name='ol-overallThemes' data-type='json' content=overallThemes)
 	if suggestedLanguageSubdomainConfig
 		meta(
 			name='ol-suggestedLanguage'

services/web/modules/admin-tools/app/views/manage-users-react.pug

@@ -16,6 +16,8 @@ block append meta
 		data-type='json'
 		content=prefetchedUsersBlob
 	)
+	meta(name='ol-userSettings' data-type='json' content=userSettings)
+	meta(name='ol-overallThemes' data-type='json' content=overallThemes)
 	if suggestedLanguageSubdomainConfig
 		meta(
 			name='ol-suggestedLanguage'

services/web/modules/admin-tools/frontend/js/manage-projects-root.tsx

@@ -13,15 +13,15 @@ function ManageProjectsRoot() {
   if (!isReady) return null
 
   return (
-    <SplitTestProvider>
-      <UserSettingsProvider>
-        <UserListProvider>
-          <ProjectListProvider projectsOwnerId={null}>
+    <UserListProvider>
+      <ProjectListProvider projectsOwnerId={null}>
+        <SplitTestProvider>
+          <UserSettingsProvider>
             <ProjectListRoot />
-          </ProjectListProvider>
-        </UserListProvider>
-      </UserSettingsProvider>
-    </SplitTestProvider>
+          </UserSettingsProvider>
+        </SplitTestProvider>
+      </ProjectListProvider>
+    </UserListProvider>
   )
 }
 

services/web/modules/admin-tools/frontend/js/manage-users-root.tsx

@@ -28,15 +28,15 @@ function ManageUsersRoot() {
   if (!isReady) return null
 
   return (
-    <SplitTestProvider>
-      <UserSettingsProvider>
-        <UsersPageProvider>
-          <UserListProvider>
+    <UsersPageProvider>
+      <UserListProvider>
+        <SplitTestProvider>
+          <UserSettingsProvider>
             <UsersPageSelector />
-          </UserListProvider>
-        </UsersPageProvider>
-      </UserSettingsProvider>
-    </SplitTestProvider>
+          </UserSettingsProvider>
+        </SplitTestProvider>
+      </UserListProvider>
+    </UsersPageProvider>
   )
 }
 

services/web/modules/admin-tools/frontend/js/project-list/components/project-list-ds-nav.tsx

@@ -15,11 +15,13 @@ import DefaultNavbar from '@/shared/components/navbar/default-navbar'
 import Footer from '@/shared/components/footer/footer'
 import SidebarDsNav from './sidebar/sidebar-ds-nav'
 import overleafLogo from '@/shared/svgs/overleaf-a-ds-solution-mallard.svg'
+import overleafLogoDark from '@/shared/svgs/overleaf-a-ds-solution-mallard-dark.svg'
 import { getUserName } from '../util/user'
 import { useProjectListContext } from '../context/project-list-context'
 import { useUserIdentityContext } from '../../user-list/context/user-identity-context'
 import Pagination from '@/shared/components/pagination-cep'
 import ProjectListSummary from './project-list-summary'
+import { useActiveOverallTheme } from '@/shared/hooks/use-active-overall-theme'
 
 export function ProjectListDsNav() {
 
@@ -39,6 +41,7 @@ export function ProjectListDsNav() {
     totalPages,
   } = useProjectListContext()
   const { getUserNameById } = useUserIdentityContext()
+  const activeOverallTheme = useActiveOverallTheme('themed-project-dashboard')
 
   const userName = projectsOwnerId ? getUserNameById(projectsOwnerId) : t('all_users')
   const tableTopArea = (
@@ -59,7 +62,9 @@ export function ProjectListDsNav() {
       <div className="manage-projects-page">
         <DefaultNavbar
           {...navbarProps}
-          overleafLogo={overleafLogo}
+          overleafLogo={
+            activeOverallTheme === 'dark' ? overleafLogoDark : overleafLogo
+          }
           showCloseIcon
         />
       </div>

services/web/modules/admin-tools/frontend/js/project-list/components/project-list-summary.tsx

@@ -1,7 +1,14 @@
 import { useTranslation } from 'react-i18next'
-import OLFormSelect from '@/shared/components/ol/ol-form-select'
+import {
+  Dropdown,
+  DropdownMenu,
+  DropdownItem,
+  DropdownToggle,
+} from '@/shared/components/dropdown/dropdown-menu'
 import { useProjectListContext } from '../context/project-list-context'
 
+const OPTIONS = [20, 40, 80]
+
 export default function ProjectListSummary() {
   const {
     visibleProjects,
@@ -14,37 +21,40 @@ export default function ProjectListSummary() {
 
   return (
     <div className="text-center">
-      <p>
         <span aria-live="polite">
           {t('showing_x_out_of_n_projects', {
             x: visibleProjects.length,
             n: visibleProjects.length + hiddenProjectsCount,
           })}
         </span>
+
         <span className="mx-2">·</span>
+
         <span className="d-inline-flex gap-1">
-          <OLFormSelect
-            name="projects_per_page"
-            value={projectsPerPage}
-            onChange={(e) => setProjectsPerPage(Number(e.target.value))}
-            style={{
-              width: 'auto',
-              border: '1px solid #ccc',
-              background: 'var(--green-10)',
-              padding: '0 0.2rem',
-              boxShadow: 'none',
-              cursor: 'pointer',
-            }}
-          >
-            <option value={20}>20</option>
-            <option value={40}>40</option>
-            <option value={80}>80</option>
-          </OLFormSelect>
-          <span>
-            {t('per_page')}
-          </span>
+          <Dropdown>
+
+            <DropdownToggle
+              as="span"
+              className="entries-per-page-toggle"
+            >
+              {projectsPerPage}
+            </DropdownToggle>
+
+            <DropdownMenu>
+              {OPTIONS.map((value) => (
+                <DropdownItem
+                  key={value}
+                  active={value === projectsPerPage}
+                  onClick={() => setProjectsPerPage(value)}
+                >
+                  {value}
+                </DropdownItem>
+              ))}
+            </DropdownMenu>
+
+          </Dropdown>
+          <span>{t('per_page')}</span>
         </span>
-      </p>
     </div>
   )
 }

services/web/modules/admin-tools/frontend/js/project-list/components/sidebar/sidebar-ds-nav.tsx

@@ -27,7 +27,7 @@ function SidebarDsNav() {
   const { sessionUser } = getMeta('ol-navbar')
   const { containerRef, scrolledUp } = useScrolled()
   const themedDsNav = useFeatureFlag('themed-project-dashboard')
-  
+
   const { getUserNameById } = useUserIdentityContext()
   const { projectsOwnerId } = useProjectListContext() 
 

services/web/modules/admin-tools/frontend/js/user-list/components/user-list-ds-nav.tsx

@@ -17,7 +17,9 @@ import DefaultNavbar from '@/shared/components/navbar/default-navbar'
 import Footer from '@/shared/components/footer/footer'
 import SidebarDsNav from './sidebar/sidebar-ds-nav'
 import overleafLogo from '@/shared/svgs/overleaf-a-ds-solution-mallard.svg'
+import overleafLogoDark from '@/shared/svgs/overleaf-a-ds-solution-mallard-dark.svg'
 import CookieBanner from '@/shared/components/cookie-banner'
+import { useActiveOverallTheme } from '@/shared/hooks/use-active-overall-theme'
 import Pagination from '@/shared/components/pagination-cep'
 import UserListSummary from './user-list-summary'
 
@@ -36,6 +38,7 @@ export function UserListDsNav() {
     setCurrentPage,
     totalPages,
   } = useUserListContext()
+  const activeOverallTheme = useActiveOverallTheme('themed-project-dashboard')
 
   const tableTopArea = (
     <div className="pt-2 pb-3 d-md-none d-flex gap-2">
@@ -54,7 +57,9 @@ export function UserListDsNav() {
     <div className="user-ds-nav-page website-redesign">
       <DefaultNavbar
         {...navbarProps}
-        overleafLogo={overleafLogo}
+        overleafLogo={
+          activeOverallTheme === 'dark' ? overleafLogoDark : overleafLogo
+        }
         showCloseIcon
       />
       <div className="user-list-wrapper">

services/web/modules/admin-tools/frontend/js/user-list/components/user-list-summary.tsx

@@ -1,7 +1,14 @@
 import { useTranslation } from 'react-i18next'
-import OLFormSelect from '@/shared/components/ol/ol-form-select'
+import {
+  Dropdown,
+  DropdownMenu,
+  DropdownItem,
+  DropdownToggle,
+} from '@/shared/components/dropdown/dropdown-menu'
 import { useUserListContext } from '../context/user-list-context'
 
+const OPTIONS = [20, 40, 80]
+
 export default function UserListSummary() {
   const {
     visibleUsers,
@@ -9,42 +16,45 @@ export default function UserListSummary() {
     usersPerPage,
     setUsersPerPage,
   } = useUserListContext()
-
   const { t } = useTranslation()
 
   return (
     <div className="text-center">
-      <p>
         <span aria-live="polite">
           {t('showing_x_out_of_n_users', {
             x: visibleUsers.length,
             n: visibleUsers.length + hiddenUsersCount,
           })}
         </span>
+
         <span className="mx-2">·</span>
+
         <span className="d-inline-flex gap-1">
-          <OLFormSelect
-            name="users_per_page"
-            value={usersPerPage}
-            onChange={(e) => setUsersPerPage(Number(e.target.value))}
-            style={{
-              width: 'auto',
-              border: '1px solid #ccc',
-              background: 'var(--green-10)',
-              padding: '0 0.2rem',
-              boxShadow: 'none',
-              cursor: 'pointer',
-            }}
-          >
-            <option value={20}>20</option>
-            <option value={40}>40</option>
-            <option value={80}>80</option>
-          </OLFormSelect>
-          <span>
-            {t('per_page')}
-          </span>
+          <Dropdown>
+
+            <DropdownToggle
+              as="span"
+              className="entries-per-page-toggle"
+            >
+              {usersPerPage}
+            </DropdownToggle>
+
+            <DropdownMenu>
+              {OPTIONS.map((value) => (
+                <DropdownItem
+                  key={value}
+                  active={value === usersPerPage}
+                  onClick={() => setUsersPerPage(value)}
+                >
+                  {value}
+                </DropdownItem>
+              ))}
+            </DropdownMenu>
+
+          </Dropdown>
+
+          <span>{t('per_page')}</span>
         </span>
-      </p>
     </div>
   )
 }

services/web/modules/git-bridge/app/src/GitBridgeRouter.mjs

@@ -13,9 +13,10 @@ const oauthTokenInfoRateLimiter = new RateLimiter('oauth-token-info', {
 })
 
 export default {
-  apply(webRouter, privateApiRouter) {
+  apply(webRouter, privateApiRouter, publicApiRouter) {
     logger.debug({}, 'Init git-bridge router')
 
+// Called by git-bridge served by web-api
     privateApiRouter.get('/api/v0/docs/:project_id',
       ensureTokenProjectAccess('read'),
       GitBridgeController.getDoc
@@ -35,8 +36,8 @@ export default {
       ensureTokenProjectAccess('write'),
       GitBridgeController.postSnapshot
     )
-// Called by git-bridge to validate a PAT
-    webRouter.get('/oauth/token/info',
+// Called by git-bridge to validate a PAT, served by web
+    publicApiRouter.get('/oauth/token/info',
       RateLimiterMiddleware.rateLimit(oauthTokenInfoRateLimiter),
       GitBridgePATController.validatePersonalAccessToken
     )