这是indexloc提供的服务，不要输入任何密码
Skip to content

Issue/400 move dark mode #420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 31, 2024
Merged

Issue/400 move dark mode #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0db1896
Removing dark mode from header
DennisAlund Jul 31, 2024
5e2a175
Adding dark mode to settings
DennisAlund Jul 31, 2024
36d72f5
Merge branch 'milestone/6-user-settings' into issue/400-move-dark-mode
DennisAlund Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions hosting/src/app/(protected)/settings/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"use client";
import PageHeader from "@/components/common/PageHeader";
import DarkModeSwitcher from "@/components/Header/DarkModeSwitcher";
import {useAuthentication} from "@/hooks/useAuthentication";
import {useTanamUser} from "@/hooks/useTanamUser";
import Image from "next/image";
Expand Down Expand Up @@ -67,6 +68,7 @@ export default function Settings() {
</div>
</div>
</div>

<div className="col-span-5 xl:col-span-2">
<div className="rounded-sm border border-stroke bg-white shadow-default dark:border-strokedark dark:bg-boxdark">
<div className="border-b border-stroke px-7 py-4 dark:border-strokedark">
Expand Down Expand Up @@ -124,6 +126,24 @@ export default function Settings() {
</div>
</div>
</div>

<div className="col-span-5 xl:col-span-2">
<div className="rounded-sm border border-stroke bg-white shadow-default dark:border-strokedark dark:bg-boxdark">
<div className="border-b border-stroke px-7 py-4 dark:border-strokedark">
<h3 className="font-medium text-black dark:text-white">System</h3>
</div>
<div className="p-7">
<div className="mb-4 flex items-center gap-3">
<label className="mb-3 block text-sm font-medium text-black dark:text-white" htmlFor="emailAddress">
Dark mode
</label>
<div className="relative">
<DarkModeSwitcher />
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</>
Expand Down
4 changes: 0 additions & 4 deletions hosting/src/components/Header/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import DarkModeSwitcher from "@/components/Header/DarkModeSwitcher";
import DropdownUser from "@/components/Header/DropdownUser";
import Image from "next/image";
import Link from "next/link";
Expand Down Expand Up @@ -71,9 +70,6 @@ const Header = (props: {sidebarOpen: string | boolean | undefined; setSidebarOpe
</div>

<div className="flex items-center gap-2 2xsm:gap-4">
<ul className="flex items-center gap-2 2xsm:gap-4">
<DarkModeSwitcher />
</ul>
<DropdownUser />
</div>
</div>
Expand Down