Merge pull request #17 from VladMihalache/main

Chakra Purity UI
creativetimofficial · Aug 23, 2021 · e9735a0 · e9735a0
2 parents f90d9d9 + 57e1c10
commit e9735a0
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 40 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,8 @@
 {
-  "name": "purity-dashboard-pro-react",
+  "name": "purity-dashboard-react",
   "version": "1.0.0",
   "private": true,
+  "homepage": "https://demos.creative-tim.com/purity-ui-dashboard/#/",
   "dependencies": {
     "@chakra-ui/icons": "^1.0.14",
     "@chakra-ui/react": "^1.6.5",

diff --git a/src/components/Footer/Footer.js b/src/components/Footer/Footer.js
@@ -35,7 +35,7 @@ export default function Footer(props) {
         <Link
           // color={linkTeal}
           color="teal.400"
-          href="https://www.creative-tim.com"
+          href="https://www.creative-tim.com?ref=creativetim-pud"
           target="_blank"
         >
           {rtlActive ? " توقيت الإبداعية" : "Creative Tim "}
@@ -44,7 +44,7 @@ export default function Footer(props) {
         <Link
           // color={linkTeal}
           color="teal.400"
-          href="https://www.simmmple.com/"
+          href="https://www.simmmple.com?ref=simmmple-pud"
           target="_blank"
         >
           {rtlActive ? "سيممبل " : " Simmmple"}
@@ -58,7 +58,10 @@ export default function Footer(props) {
             md: "44px",
           }}
         >
-          <Link color="gray.400" href="https://www.creative-tim.com">
+          <Link
+            color="gray.400"
+            href="https://www.creative-tim.com?ref=creativetim-pud"
+          >
             {rtlActive ? "توقيت الإبداعية" : "Creative Tim"}
           </Link>
         </ListItem>
@@ -68,7 +71,10 @@ export default function Footer(props) {
             md: "44px",
           }}
         >
-          <Link color="gray.400" href="https://www.simmmple.com/">
+          <Link
+            color="gray.400"
+            href="https://www.simmmple.com?ref=simmmple-pud"
+          >
             {rtlActive ? "سيممبل" : "Simmmple"}
           </Link>
         </ListItem>
@@ -81,7 +87,7 @@ export default function Footer(props) {
           <Link
             color="gray.400"
             href="#blog"
-            href="https://blog.creative-tim.com/"
+            href="https://creative-tim.com/blog?ref=creativetim-pud"
           >
             {rtlActive ? "مدونة" : "Blog"}
           </Link>
@@ -90,7 +96,7 @@ export default function Footer(props) {
           <Link
             color="gray.400"
             href="#license"
-            href="https://www.creative-tim.com/license"
+            href="https://www.creative-tim.com/license?ref=creativetim-pud"
           >
             {rtlActive ? "رخصة" : "License"}
           </Link>

diff --git a/src/components/Navbars/AdminNavbar.js b/src/components/Navbars/AdminNavbar.js
@@ -46,6 +46,7 @@ export default function AdminNavbar(props) {
       );
     }
   if (secondary) {
+    navbarBackdrop = "none";
     navbarPosition = "absolute";
     mainText = "white";
     secondaryText = "white";

diff --git a/src/components/Navbars/AdminNavbarLinks.js b/src/components/Navbars/AdminNavbarLinks.js
@@ -144,7 +144,6 @@ export default function HeaderLinks(props) {
         ref={settingsRef}
         onClick={onOpen}
         color={navbarIcon}
-        qqa
         w="18px"
         h="18px"
       />
@@ -158,7 +157,7 @@ export default function HeaderLinks(props) {
           <DrawerHeader pt="24px" px="24px">
             <DrawerCloseButton />
             <Text fontSize="xl" fontWeight="bold" mt="16px">
-              Chakra UI Configurator
+              Purity UI Configurator
             </Text>
             <Text fontSize="md" mb="16px">
               See your dashboard options.

diff --git a/src/components/Navbars/AuthNavbar.js b/src/components/Navbars/AuthNavbar.js
@@ -71,7 +71,7 @@ export default function AuthNavbar(props) {
   }
   var brand = (
     <Link
-      href="/admin/dashboard"
+      href={`${process.env.PUBLIC_URL}/#/`}
       target="_blank"
       display="flex"
       lineHeight="100%"

diff --git a/src/components/Sidebar/Sidebar.js b/src/components/Sidebar/Sidebar.js
@@ -209,7 +209,7 @@ function Sidebar(props) {
   var brand = (
     <Box pt={"25px"} mb="12px">
       <Link
-        href="/admin/dashboard"
+        href={`${process.env.PUBLIC_URL}/#/`}
         target="_blank"
         display="flex"
         lineHeight="100%"
@@ -424,7 +424,7 @@ export function SidebarResponsive(props) {
   var brand = (
     <Box pt={"35px"} mb="8px">
       <Link
-        href="/admin/dashboard"
+        href={`${process.env.PUBLIC_URL}/#/`}
         target="_blank"
         display="flex"
         lineHeight="100%"

diff --git a/src/index.js b/src/index.js
@@ -17,18 +17,18 @@
 */
 import React from "react";
 import ReactDOM from "react-dom";
-import { BrowserRouter, Route, Switch, Redirect } from "react-router-dom";
+import { HashRouter, Route, Switch, Redirect } from "react-router-dom";
 
 import AuthLayout from "layouts/Auth.js";
 import AdminLayout from "layouts/Admin.js";
 
 ReactDOM.render(
-  <BrowserRouter>
+  <HashRouter>
     <Switch>
-      <Route path="/auth" component={AuthLayout} />
-      <Route path="/admin" component={AdminLayout} />
-      <Redirect from="/" to="/admin/dashboardchakra" />
+      <Route path={`/auth`} component={AuthLayout} />
+      <Route path={`/admin`} component={AdminLayout} />
+      <Redirect from={`/`} to="/admin/dashboard" />
     </Switch>
-  </BrowserRouter>,
+  </HashRouter>,
   document.getElementById("root")
 );
diff --git a/src/routes.js b/src/routes.js
@@ -1,10 +1,10 @@
 // import
-import DashboardChakra from "views/Dashboard/Dashboard.js";
-import TablesChakra from "views/Dashboard/Tables.js";
-import BillingChakra from "views/Dashboard/Billing.js";
-import ProfileChakra from "views/Dashboard/Profile.js";
-import SignInChakra from "views/Pages/SignIn.js";
-import SignUpChakra from "views/Pages/SignUp.js";
+import Dashboard from "views/Dashboard/Dashboard.js";
+import Tables from "views/Dashboard/Tables.js";
+import Billing from "views/Dashboard/Billing.js";
+import Profile from "views/Dashboard/Profile.js";
+import SignIn from "views/Pages/SignIn.js";
+import SignUp from "views/Pages/SignUp.js";
 
 import {
   HomeIcon,
@@ -21,23 +21,23 @@ var dashRoutes = [
     name: "Dashboard",
     rtlName: "لوحة القيادة",
     icon: <HomeIcon color="inherit" />,
-    component: DashboardChakra,
+    component: Dashboard,
     layout: "/admin",
   },
   {
     path: "/tables",
     name: "Tables",
     rtlName: "لوحة القيادة",
     icon: <StatsIcon color="inherit" />,
-    component: TablesChakra,
+    component: Tables,
     layout: "/admin",
   },
   {
     path: "/billing",
     name: "Billing",
     rtlName: "لوحة القيادة",
     icon: <CreditIcon color="inherit" />,
-    component: BillingChakra,
+    component: Billing,
     layout: "/admin",
   },
   {
@@ -52,15 +52,15 @@ var dashRoutes = [
         rtlName: "لوحة القيادة",
         icon: <PersonIcon color="inherit" />,
         secondaryNavbar: true,
-        component: ProfileChakra,
+        component: Profile,
         layout: "/admin",
       },
       {
         path: "/signin",
         name: "Sign In",
         rtlName: "لوحة القيادة",
         icon: <DocumentIcon color="inherit" />,
-        component: SignInChakra,
+        component: SignIn,
         layout: "/auth",
       },
       {
@@ -69,7 +69,7 @@ var dashRoutes = [
         rtlName: "لوحة القيادة",
         icon: <RocketIcon color="inherit" />,
         secondaryNavbar: true,
-        component: SignUpChakra,
+        component: SignUp,
         layout: "/auth",
       },
     ],

diff --git a/src/variables/general.js b/src/variables/general.js
@@ -32,7 +32,7 @@ import { SiDropbox } from "react-icons/si";
 export const dashboardTableData = [
   {
     logo: AdobexdLogo,
-    name: "Chakra Soft UI Version",
+    name: "Purity UI Version",
     members: [avatar1, avatar2, avatar3, avatar4, avatar5],
     budget: "$14,000",
     progression: 60,
@@ -172,7 +172,7 @@ export const tablesTableData = [
 export const tablesProjectData = [
   {
     logo: AdobexdLogo,
-    name: "Chakra Soft UI Version",
+    name: "Purity UI Version",
     budget: "$14,000",
     status: "Working",
     progression: 60,

diff --git a/src/views/Dashboard/Billing.js b/src/views/Dashboard/Billing.js
@@ -74,7 +74,7 @@ function Billing() {
                 >
                   <Flex justify="space-between" align="center">
                     <Text fontSize="md" fontWeight="bold">
-                      Chakra UI
+                      Purity UI
                     </Text>
                     <Icon
                       as={RiMastercardFill}

diff --git a/src/views/Dashboard/Dashboard.js b/src/views/Dashboard/Dashboard.js
@@ -218,7 +218,7 @@ export default function Dashboard() {
                 fontWeight="bold"
                 pb=".5rem"
               >
-                Chakra UI Soft Dashboard
+                Purity UI Dashboard
               </Text>
               <Text fontSize="sm" color="gray.400" fontWeight="normal">
                 From colors, cards, typography to complex elements, you will
@@ -230,15 +230,15 @@ export default function Dashboard() {
                   p="0px"
                   variant="no-hover"
                   bg="transparent"
-                  my={{ sm: "1.5rem" }}
+                  my={{ sm: "1.5rem", lg: "0px" }}
                 >
                   <Text
                     fontSize="sm"
                     color={textColor}
                     fontWeight="bold"
                     cursor="pointer"
                     transition="all .5s ease"
-                    my={{ sm: "1.5rem" }}
+                    my={{ sm: "1.5rem", lg: "0px" }}
                     _hover={{ mr: "4px" }}
                   >
                     Read more
@@ -281,7 +281,7 @@ export default function Dashboard() {
             bgPosition="center"
             bgRepeat="no-repeat"
             w="100%"
-            h={{ sm: "200px", md: "100%" }}
+            h={{ sm: "200px", lg: "100%" }}
             bgSize="cover"
             position="relative"
             borderRadius="15px"
@@ -298,18 +298,21 @@ export default function Dashboard() {
               <Flex
                 flexDirection="column"
                 color="white"
-                p="1.5rem 1.2rem"
+                p="1.5rem 1.2rem 0.3rem 1.2rem"
                 lineHeight="1.6"
               >
                 <Text fontSize="xl" fontWeight="bold" pb=".3rem">
                   Work with the rockets
                 </Text>
-                <Text fontSize="sm" fontWeight="normal" w={{ lg: "67%" }}>
+                <Text fontSize="sm" fontWeight="normal" w={{ lg: "92%" }}>
                   Wealth creation is a revolutionary recent positive-sum game.
                   It is all about who takes the opportunity first.
                 </Text>
                 <Spacer />
-                <Flex align="center">
+                <Flex
+                  align="center"
+                  mt={{ sm: "20px", lg: "40px", xl: "90px" }}
+                >
                   <Button p="0px" variant="no-hover" bg="transparent" mt="12px">
                     <Text
                       fontSize="sm"