Merge branch 'hiding-hamburger' of https://github.com/mrswastik-robot…

…/reduced.to into hiding-hamburger
origranot · Oct 13, 2023 · 7655fce · 7655fce
2 parents 6432377 + e91219b
commit 7655fce
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 18 deletions.
diff --git a/apps/docs/docusaurus.config.js b/apps/docs/docusaurus.config.js
@@ -46,7 +46,7 @@ const config = {
           alt: 'Reduced.to Logo',
           src: `images/logo.svg`,
           //srcDark: `img/logo.svg`,
-          href: '/',
+          href: 'https://reduced.to',
           target: '_self',
         },
         items: [

diff --git a/apps/frontend/src/components/use-cookies-alert/use-cookies-alert.tsx b/apps/frontend/src/components/use-cookies-alert/use-cookies-alert.tsx
@@ -27,7 +27,7 @@ export const UseCookiesAlert = component$((props: UseCookiesAlertProps) => {
                 onClick$={acceptCookies}
                 class="btn btn-primary relative flex items-center gap-3 transition ease-in-out border px-4 py-2 rounded-md"
               >
-                Okay
+                Accept
               </button>
             </div>
           </div>

diff --git a/apps/frontend/src/global.css b/apps/frontend/src/global.css
@@ -16,6 +16,11 @@ body {
   overflow: auto;
 }
 
+input::-ms-reveal,
+input::-ms-clear {
+  display: none;
+}
+
 /* Custom variables for themes */
 [data-theme='dracula'] {
   --outline-border-color: 233, 5%, 33%;

diff --git a/apps/frontend/src/routes/dashboard/layout.tsx b/apps/frontend/src/routes/dashboard/layout.tsx
@@ -1,4 +1,4 @@
-import { component$, Slot } from '@builder.io/qwik';
+import { component$, Slot, useSignal, $ } from '@builder.io/qwik';
 import { Link, RequestHandler, useLocation } from '@builder.io/qwik-city';
 import { validateAccessToken } from '../../shared/auth.service';
 import { Role, useGetCurrentUser } from '../layout';
@@ -15,17 +15,20 @@ export default component$(() => {
   const currentPath = location.url.pathname.slice(0, -1);
   const user = useGetCurrentUser();
 
+  const isDrawerOpen = useSignal(false);
+  const toggleDrawer = $(() => (isDrawerOpen.value = !isDrawerOpen.value));
+
   return (
     <div class="drawer drawer-mobile h-[calc(100vh-64px)]">
-      <input id="drawer" type="checkbox" class="drawer-toggle" />
+      <input id="drawer" type="checkbox" class="drawer-toggle" checked={isDrawerOpen.value} onChange$={toggleDrawer} />
       <div class="drawer-content w-100vh m-5" style={{ zIndex: -5 }}>
         <Slot />
       </div>
       <div class="drawer-side">
         <label for="drawer" class="drawer-overlay"></label>
         <ul class="menu p-4 w-64 text-base-content border-r bg-base-100 dark:border-gray-700 block">
           <li class="py-2 mt-2">
-            <Link href="/dashboard" class={`${currentPath === '/dashboard' ? 'active' : ''}`}>
+            <Link href="/dashboard" class={`${currentPath === '/dashboard' ? 'active' : ''}`} onClick$={toggleDrawer}>
               <svg class="w-5 h-5" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
                 <path
                   d="M19 11H5M19 11C20.1046 11 21 11.8954 21 13V19C21 20.1046 20.1046 21 19 21H5C3.89543 21 3 20.1046 3 19V13C3 11.8954 3.89543 11 5 11M19 11V9C19 7.89543 18.1046 7 17 7M5 11V9C5 7.89543 5.89543 7 7 7M7 7V5C7 3.89543 7.89543 3 9 3H15C16.1046 3 17 3.89543 17 5V7M7 7H17"
@@ -64,7 +67,7 @@ export default component$(() => {
             <>
               <div class="divider"></div>
               <li class="py-2 mt-2">
-                <Link href="/dashboard/admin" class={`${currentPath === '/dashboard/admin' ? 'active' : ''}`}>
+                <Link href="/dashboard/admin" class={`${currentPath === '/dashboard/admin' ? 'active' : ''}`} onClick$={toggleDrawer}>
                   <svg
                     xmlns="http://www.w3.org/2000/svg"
                     fill="none"

diff --git a/apps/frontend/src/routes/register/index.tsx b/apps/frontend/src/routes/register/index.tsx
@@ -140,10 +140,9 @@ export default component$(() => {
                   <input
                     name="password"
                     type={store.passwordVisible ? 'text' : 'password'}
-                    class="input input-bordered w-full max-w-xs focus:outline-0 dark:bg-base-300"
+                    class="input input-bordered w-full max-w-xs pr-10 focus:outline-0 dark:bg-base-300"
                     autoComplete="on"
                   />
-
                   <span
                     class="absolute right-2.5 cursor-pointer flex items-center"
                     onClick$={() => {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
     "node-fetch": "~3.3.0",
     "nx": "16.8.1",
     "nx-cloud": "16.4.0",
-    "postcss": "^8.4.29",
+    "postcss": "^8.4.31",
     "prettier": "^2.6.2",
     "prisma": "5.2.0",
     "qwik-nx": "^1.0.8",
@@ -96,6 +96,6 @@
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.8.0",
     "tslib": "^2.3.0",
-    "zod": "^3.22.2"
+    "zod": "^3.22.3"
   }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                     onClick$={acceptCookies}
                     class="btn btn-primary relative flex items-center gap-3 transition ease-in-out border px-4 py-2 rounded-md"
                   >
-                    Okay
+                    Accept
                   </button>
                 </div>
               </div>
@@ Expand Down @@