From 87aff671927d6a480134b2c2c6da08ae830ba33b Mon Sep 17 00:00:00 2001 From: Bhargav Date: Thu, 15 Jun 2023 14:55:13 +0530 Subject: [PATCH 1/4] changed the height of buttons and background of dialog --- src/components/DownloadSection.astro | 6 +++--- src/components/Hero.astro | 3 ++- src/components/InstallationSteps.jsx | 4 ++-- yarn.lock | 15 --------------- 4 files changed, 7 insertions(+), 21 deletions(-) diff --git a/src/components/DownloadSection.astro b/src/components/DownloadSection.astro index 00f2ed3..b07b60a 100644 --- a/src/components/DownloadSection.astro +++ b/src/components/DownloadSection.astro @@ -19,15 +19,15 @@ class="btns flex flex-row flex-wrap items-center gap-4 md:gap-5 text-white mt-4" > Download - + Checksum diff --git a/src/components/Hero.astro b/src/components/Hero.astro index 52b9770..451ea4b 100644 --- a/src/components/Hero.astro +++ b/src/components/Hero.astro @@ -64,7 +64,8 @@ import Layout from "../layouts/Layout.astro"; - + +

Requirements

diff --git a/src/components/InstallationSteps.jsx b/src/components/InstallationSteps.jsx index 3c2cb68..eb22221 100644 --- a/src/components/InstallationSteps.jsx +++ b/src/components/InstallationSteps.jsx @@ -9,7 +9,7 @@ import installationImage from "../assets/image 15.png"; import finishImage from "../assets/image 16.png"; function InstallationSteps() { const [imageFirst, setImageFirst] = useState(welcomeImage); - const [imageSecond, setImageSecond] = useState(welcomeImage); + const [imageSecond, setImageSecond] = useState(userImage); const installationStepsFirstSet = [ { id: 1, @@ -123,7 +123,7 @@ function InstallationSteps() { TCET Linux Installation Steps

-
setImageSecond(welcomeImage)}> +
setImageSecond(userImage)}> {installationStepsSecondSet.map((step) => (
>>>>>> a287bf4dda6cc76ac9115196297280e103479aa7 integrity sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q== optionalDependencies: "@esbuild/android-arm" "0.15.18" @@ -3102,11 +3091,7 @@ shebang-regex@^3.0.0: shiki@^0.14.1: version "0.14.2" -<<<<<<< HEAD - resolved "https://registry.npmjs.org/shiki/-/shiki-0.14.2.tgz" -======= resolved "https://registry.yarnpkg.com/shiki/-/shiki-0.14.2.tgz#d51440800b701392b31ce2336036058e338247a1" ->>>>>>> a287bf4dda6cc76ac9115196297280e103479aa7 integrity sha512-ltSZlSLOuSY0M0Y75KA+ieRaZ0Trf5Wl3gutE7jzLuIcWxLp5i/uEnLoQWNvgKXQ5OMpGkJnVMRLAuzjc0LJ2A== dependencies: ansi-sequence-parser "^1.1.0" From 6ef003cf0d7646cb9a86c4b5dda63c5b41624ddb Mon Sep 17 00:00:00 2001 From: Horror26 <1032210438@tcetmumbai.in> Date: Thu, 15 Jun 2023 16:32:06 +0530 Subject: [PATCH 2/4] UI edited --- public/images/requirements-icon.svg | 4 +-- public/images/tick-icon.svg | 3 +++ src/components/CopyToClipboard.tsx | 40 ++++++++++++++++------------ src/components/DownloadSection.astro | 8 +++--- src/components/Hero.astro | 8 +++--- src/components/InstallationSteps.jsx | 6 ++--- src/components/VerifyDownloads.astro | 36 ++++++++++++------------- src/pages/index.astro | 2 +- yarn.lock | 15 ----------- 9 files changed, 57 insertions(+), 65 deletions(-) create mode 100644 public/images/tick-icon.svg diff --git a/public/images/requirements-icon.svg b/public/images/requirements-icon.svg index a4eb0db..12b63d1 100644 --- a/public/images/requirements-icon.svg +++ b/public/images/requirements-icon.svg @@ -1,3 +1,3 @@ - - + + diff --git a/public/images/tick-icon.svg b/public/images/tick-icon.svg new file mode 100644 index 0000000..e90c673 --- /dev/null +++ b/public/images/tick-icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/CopyToClipboard.tsx b/src/components/CopyToClipboard.tsx index ba385c5..e3d8ef7 100644 --- a/src/components/CopyToClipboard.tsx +++ b/src/components/CopyToClipboard.tsx @@ -1,29 +1,32 @@ -import React, { useRef, useEffect } from "react"; +import React, { useRef, useEffect, useState } from "react"; import useOnClickOutside from "../hooks/useOnClickOutside"; const CopyToClipboard: React.FC<{ text: string; }> = ({ text }) => { + const [showContent, setShowContent] = useState(false); const copyToClipboard = () => { navigator.clipboard.writeText(text); - dialog.current?.show(); - dialog.current.style.display = "flex"; + // dialog.current?.show(); + // dialog.current.style.display = "flex"; + setShowContent(true); + + setTimeout(() => { + setShowContent(false); - const timer = setTimeout(() => { - dialog.current.style.display = "none"; - dialog.current?.close(); }, 2000); + // clearTimeout(timer) }; - const dialog = useRef(null); + // const dialog = useRef(null); - useOnClickOutside(dialog, () => { - console.log("clickng outside"); - dialog.current.style.display = "none"; - dialog.current?.close(); - }); + // useOnClickOutside(dialog, () => { + // console.log("clickng outside"); + // dialog.current.style.display = "none"; + // dialog.current?.close(); + // }); return ( - ) + } + {/*

Copied to clipboard

- - + */} + ); }; diff --git a/src/components/DownloadSection.astro b/src/components/DownloadSection.astro index 00f2ed3..274a732 100644 --- a/src/components/DownloadSection.astro +++ b/src/components/DownloadSection.astro @@ -3,11 +3,11 @@
-
-
+
+
Downloads
@@ -58,7 +58,7 @@ class="image-content hidden md:flex items-center align-middle justify-center z-10" > diff --git a/src/components/Hero.astro b/src/components/Hero.astro index 52b9770..6855a38 100644 --- a/src/components/Hero.astro +++ b/src/components/Hero.astro @@ -5,9 +5,9 @@ import Layout from "../layouts/Layout.astro";
-
+
-
+
- +
diff --git a/src/components/InstallationSteps.jsx b/src/components/InstallationSteps.jsx index 3c2cb68..cc33fc0 100644 --- a/src/components/InstallationSteps.jsx +++ b/src/components/InstallationSteps.jsx @@ -71,9 +71,9 @@ function InstallationSteps() { }, ]; return ( -
+
-
+

INSTALLATION GUIDE

@@ -110,7 +110,7 @@ function InstallationSteps() {

-
+
diff --git a/src/components/VerifyDownloads.astro b/src/components/VerifyDownloads.astro index b107956..540ae28 100644 --- a/src/components/VerifyDownloads.astro +++ b/src/components/VerifyDownloads.astro @@ -28,7 +28,7 @@ const stepOne = [ ]; --- -
+

@@ -36,21 +36,19 @@ const stepOne = [

-

Steps 1:

+

Steps 1:

{ stepOne.map((step) => ( -
+

{step.nameOfOS}

{step.description}

-
+

@@ -83,21 +81,19 @@ const stepOne = [ { /* bg-gradient-to-r from-teal-100 via-indigo-500 to-pink-300 opacity-100 rounded-b-xl */ } -

+
- +

cb9257aea691441a0a7c628b8cc199d7746220651daf035d261c6670ac1a2f49

- +
@@ -107,10 +103,12 @@ const stepOne = [

- IMAGE is iso-name.iso in step 1. It is the file that you have downloaded. Verification - is done to check the authenticity of the file you have downloaded. Large files may get corrupted in the - download process. TCET Linux team provides a new checksum for every new release of the operating system. + IMAGE is iso-name.iso in step 1. It is the file that + you have downloaded. Verification is done to check the authenticity of + the file you have downloaded. Large files may get corrupted in the + download process. TCET Linux team provides a new checksum for every new + release of the operating system.

-
\ No newline at end of file +
diff --git a/src/pages/index.astro b/src/pages/index.astro index 61ba131..8b02919 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -7,7 +7,7 @@ import Hero from "../components/Hero.astro"; --- -
+
diff --git a/yarn.lock b/yarn.lock index edad5d6..a9b63ac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -121,13 +121,6 @@ dependencies: undici "^5.22.0" -"@astrojs/webapi@^2.1.1": - version "2.1.1" - resolved "https://registry.yarnpkg.com/@astrojs/webapi/-/webapi-2.1.1.tgz#965bcc35a72ca40e60e1ed4c2e4350f215bee179" - integrity sha512-mHZ7VgPNMeV3TYIw3SGHTKaJosBxA8bTzZ3QhNw509qvCJca4Lkjes8JywimuwTn+TMjEiv7ksNfwRluad3jqA== - dependencies: - undici "^5.22.0" - "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.21.4": version "7.21.4" resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz" @@ -1371,11 +1364,7 @@ esbuild-windows-arm64@0.15.18: esbuild@^0.15.18: version "0.15.18" -<<<<<<< HEAD - resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.15.18.tgz" -======= resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.15.18.tgz#ea894adaf3fbc036d32320a00d4d6e4978a2f36d" ->>>>>>> a287bf4dda6cc76ac9115196297280e103479aa7 integrity sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q== optionalDependencies: "@esbuild/android-arm" "0.15.18" @@ -3102,11 +3091,7 @@ shebang-regex@^3.0.0: shiki@^0.14.1: version "0.14.2" -<<<<<<< HEAD - resolved "https://registry.npmjs.org/shiki/-/shiki-0.14.2.tgz" -======= resolved "https://registry.yarnpkg.com/shiki/-/shiki-0.14.2.tgz#d51440800b701392b31ce2336036058e338247a1" ->>>>>>> a287bf4dda6cc76ac9115196297280e103479aa7 integrity sha512-ltSZlSLOuSY0M0Y75KA+ieRaZ0Trf5Wl3gutE7jzLuIcWxLp5i/uEnLoQWNvgKXQ5OMpGkJnVMRLAuzjc0LJ2A== dependencies: ansi-sequence-parser "^1.1.0" From 33aed55bf24302c5b6e9467b128dad7a86cb4851 Mon Sep 17 00:00:00 2001 From: Bhargav Date: Thu, 15 Jun 2023 16:37:09 +0530 Subject: [PATCH 3/4] changed minor issues --- src/assets/Frame 1388.svg | 5 +++ src/assets/Icon.svg | 3 ++ src/components/CopyToClipboard.tsx | 65 ++++++++++++++++++++-------- src/components/DownloadSection.astro | 29 ++++++++----- src/components/InstallationSteps.jsx | 4 +- src/components/VerifyDownloads.astro | 2 +- src/pages/index.astro | 2 +- 7 files changed, 77 insertions(+), 33 deletions(-) create mode 100644 src/assets/Frame 1388.svg create mode 100644 src/assets/Icon.svg diff --git a/src/assets/Frame 1388.svg b/src/assets/Frame 1388.svg new file mode 100644 index 0000000..e4ae667 --- /dev/null +++ b/src/assets/Frame 1388.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/Icon.svg b/src/assets/Icon.svg new file mode 100644 index 0000000..3bf635b --- /dev/null +++ b/src/assets/Icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/CopyToClipboard.tsx b/src/components/CopyToClipboard.tsx index ba385c5..646c6bc 100644 --- a/src/components/CopyToClipboard.tsx +++ b/src/components/CopyToClipboard.tsx @@ -1,4 +1,4 @@ -import React, { useRef, useEffect } from "react"; +import React, { useRef, useEffect, useState } from "react"; import useOnClickOutside from "../hooks/useOnClickOutside"; const CopyToClipboard: React.FC<{ @@ -25,34 +25,63 @@ const CopyToClipboard: React.FC<{ dialog.current?.close(); }); + const [showContent, setShowContent] = useState(false); + + const handleClick = () => { + setShowContent(true); + + setTimeout(() => { + setShowContent(false); + }, 2000); + }; + + return ( ); }; diff --git a/src/components/DownloadSection.astro b/src/components/DownloadSection.astro index b07b60a..e3ecf0f 100644 --- a/src/components/DownloadSection.astro +++ b/src/components/DownloadSection.astro @@ -1,10 +1,7 @@ --- --- -
+
@@ -23,11 +20,15 @@ href="https://github.com/tcet-opensource/tcet-linux/releases/download/v0.5-beta/tcetlinux-2023.05.05-x86_64.iso" > Download - + Checksum @@ -46,11 +47,17 @@
-
- Create Bootable USB - - Windows ↗ - Mac / Linux ↗ +
+ Create Bootable USB + + Windows ↗ + Mac / Linux ↗
diff --git a/src/components/InstallationSteps.jsx b/src/components/InstallationSteps.jsx index eb22221..02c0ecb 100644 --- a/src/components/InstallationSteps.jsx +++ b/src/components/InstallationSteps.jsx @@ -71,9 +71,9 @@ function InstallationSteps() { }, ]; return ( -
+
-
+

INSTALLATION GUIDE

diff --git a/src/components/VerifyDownloads.astro b/src/components/VerifyDownloads.astro index b107956..b570314 100644 --- a/src/components/VerifyDownloads.astro +++ b/src/components/VerifyDownloads.astro @@ -28,7 +28,7 @@ const stepOne = [ ]; --- -

+

diff --git a/src/pages/index.astro b/src/pages/index.astro index 61ba131..8498a82 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -7,7 +7,7 @@ import Hero from "../components/Hero.astro"; --- -

+
From 761a6df765ac78b24cd1f6f164f212d9a6a26c9b Mon Sep 17 00:00:00 2001 From: JayeshVP24 Date: Thu, 15 Jun 2023 20:49:44 +0530 Subject: [PATCH 4/4] [REFACOTR] added padding on hero --- src/components/Hero.astro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Hero.astro b/src/components/Hero.astro index 2bde68a..6e57bbf 100644 --- a/src/components/Hero.astro +++ b/src/components/Hero.astro @@ -5,7 +5,7 @@ import Layout from "../layouts/Layout.astro";
-
+