From c08bc3e50844fd7703a7da933d342927eb19fce2 Mon Sep 17 00:00:00 2001 From: jan-jaap Date: Thu, 6 Jun 2024 21:38:39 +0200 Subject: [PATCH] content --- lang/en/en.json | 19 ++-- .../js/components/layout/ApiContentPage.vue | 34 ------- .../components/layout/home/SectionsPage.vue | 8 ++ .../layout/sections/DebugSection.vue | 20 ++++ .../layout/sections/HeroSection.vue | 42 +++++---- .../layout/sections}/InfoSection.vue | 6 +- .../layout/sections/TabbedSection.vue | 3 +- .../layout/sections}/TextSection.vue | 2 +- .../layout/sections/TitleSection.vue | 27 ++++++ resources/js/components/nav/NavBar.vue | 51 +++++----- resources/js/routes/PublicRoutes.js | 93 +++++++++---------- resources/js/views/Public/About/About.vue | 27 +++--- resources/js/views/Public/Home/Home.vue | 71 +++++++------- .../Public/Home/Sections/HeroSection.vue | 33 ------- .../js/views/Public/HowItWorks/HowItWorks.vue | 38 -------- resources/js/views/Public/Pages/Default.vue | 52 +++++++++++ resources/pages/en/about.json | 21 ++++- resources/pages/en/how-it-works.json | 4 +- 18 files changed, 286 insertions(+), 265 deletions(-) delete mode 100644 resources/js/components/layout/ApiContentPage.vue create mode 100644 resources/js/components/layout/home/SectionsPage.vue create mode 100644 resources/js/components/layout/sections/DebugSection.vue rename resources/js/{views/Public/Home/Sections => components/layout/sections}/InfoSection.vue (91%) rename resources/js/{views/Public/Home/Sections => components/layout/sections}/TextSection.vue (90%) create mode 100644 resources/js/components/layout/sections/TitleSection.vue delete mode 100644 resources/js/views/Public/Home/Sections/HeroSection.vue delete mode 100644 resources/js/views/Public/HowItWorks/HowItWorks.vue create mode 100644 resources/js/views/Public/Pages/Default.vue diff --git a/lang/en/en.json b/lang/en/en.json index 5138b63..25e9363 100644 --- a/lang/en/en.json +++ b/lang/en/en.json @@ -1,7 +1,7 @@ { "auth": { - "logout": "Logout", - "login": "Login", + "logout": "Sign out", + "login": "Sign in", "register": "Sign up", "reset-password": "Reset password", "forgot-password": "Forgot password", @@ -17,8 +17,8 @@ "didnt-receive": " If you did not receive the email, click the button below to send it again.", "success": "Your email has been verified. You can now continue your journey." }, - "already-registered": "Already have an account? Login now.", - "remember-password": "Remember your password? Login now." + "already-registered": "Already have an account? Sign in now.", + "remember-password": "Remember your password? Sign in now." }, "buttons": { "login": "Sign in", @@ -98,16 +98,17 @@ }, "nav": { "about": "About", + "children": "Children", + "cities": "Cities", "contact": "Contact", "dashboard": "Dashboard", "home": "Home", + "how-it-works": "How it works", "login": "Sign in", - "schools": "Schools", - "cities": "Cities", - "parents": "Parents", - "children": "Children", "logout": "Sign out", + "parents": "Parents", + "portal": "Portal", "register": "Sign up", - "portal": "Portal" + "schools": "Schools" } } diff --git a/resources/js/components/layout/ApiContentPage.vue b/resources/js/components/layout/ApiContentPage.vue deleted file mode 100644 index 177ff98..0000000 --- a/resources/js/components/layout/ApiContentPage.vue +++ /dev/null @@ -1,34 +0,0 @@ - - diff --git a/resources/js/components/layout/home/SectionsPage.vue b/resources/js/components/layout/home/SectionsPage.vue new file mode 100644 index 0000000..009b080 --- /dev/null +++ b/resources/js/components/layout/home/SectionsPage.vue @@ -0,0 +1,8 @@ + + diff --git a/resources/js/components/layout/sections/DebugSection.vue b/resources/js/components/layout/sections/DebugSection.vue new file mode 100644 index 0000000..1c10c92 --- /dev/null +++ b/resources/js/components/layout/sections/DebugSection.vue @@ -0,0 +1,20 @@ + + + diff --git a/resources/js/components/layout/sections/HeroSection.vue b/resources/js/components/layout/sections/HeroSection.vue index 4291af5..86d2b65 100644 --- a/resources/js/components/layout/sections/HeroSection.vue +++ b/resources/js/components/layout/sections/HeroSection.vue @@ -1,27 +1,33 @@ diff --git a/resources/js/views/Public/Home/Sections/InfoSection.vue b/resources/js/components/layout/sections/InfoSection.vue similarity index 91% rename from resources/js/views/Public/Home/Sections/InfoSection.vue rename to resources/js/components/layout/sections/InfoSection.vue index 7500618..9ca0267 100644 --- a/resources/js/views/Public/Home/Sections/InfoSection.vue +++ b/resources/js/components/layout/sections/InfoSection.vue @@ -4,7 +4,9 @@ @@ -21,7 +23,7 @@ diff --git a/resources/js/components/nav/NavBar.vue b/resources/js/components/nav/NavBar.vue index 3a09c3e..0ad3d06 100644 --- a/resources/js/components/nav/NavBar.vue +++ b/resources/js/components/nav/NavBar.vue @@ -1,27 +1,33 @@ diff --git a/resources/js/routes/PublicRoutes.js b/resources/js/routes/PublicRoutes.js index 4dc8540..8c8ec09 100644 --- a/resources/js/routes/PublicRoutes.js +++ b/resources/js/routes/PublicRoutes.js @@ -1,51 +1,44 @@ -const ApiContentPage = () => import('@/components/layout/ApiContentPage.vue'); - +const ApiContentPage = () => import("@/components/layout/ApiContentPage.vue"); +const DefaultPage = () => import("@/views/Public/Pages/Default.vue"); export default [ - { - path: '', - name: 'home', - component: () => - import("@/views/Public/Home/Home.vue"), - }, - { - path: 'about', - name: 'about', - component: ApiContentPage, - }, - { - path: 'how-it-works', - name: 'how-it-works', - component: () => - import("@/views/Public/HowItWorks/HowItWorks.vue"), - }, - { - path: 'login', - name: 'login', - component: () => - import("@/views/Auth/Login.vue"), - }, - { - path: 'register', - name: 'register', - component: () => - import("@/views/Auth/Register.vue"), - }, - { - path: 'forgot-password', - name: 'forgot-password', - component: () => - import("@/views/Auth/ForgotPassword.vue"), - }, - { - path: 'reset-password', - name: 'reset-password', - component: () => - import("@/views/Auth/ResetPassword.vue"), - }, - { - path: 'verify-email', - name: 'verify-email', - component: () => - import("@/views/Auth/VerifyEmail.vue"), - } -] + { + path: "", + name: "home", + component: () => import("@/views/Public/Home/Home.vue"), + }, + { + path: "about", + name: "about", + component: DefaultPage, + }, + { + path: "how-it-works", + name: "how-it-works", + component: DefaultPage, + }, + { + path: "login", + name: "login", + component: () => import("@/views/Auth/Login.vue"), + }, + { + path: "register", + name: "register", + component: () => import("@/views/Auth/Register.vue"), + }, + { + path: "forgot-password", + name: "forgot-password", + component: () => import("@/views/Auth/ForgotPassword.vue"), + }, + { + path: "reset-password", + name: "reset-password", + component: () => import("@/views/Auth/ResetPassword.vue"), + }, + { + path: "verify-email", + name: "verify-email", + component: () => import("@/views/Auth/VerifyEmail.vue"), + }, +]; diff --git a/resources/js/views/Public/About/About.vue b/resources/js/views/Public/About/About.vue index 7488ee9..79cdc1d 100644 --- a/resources/js/views/Public/About/About.vue +++ b/resources/js/views/Public/About/About.vue @@ -1,27 +1,26 @@ diff --git a/resources/js/views/Public/Home/Home.vue b/resources/js/views/Public/Home/Home.vue index 78409a1..e4c314b 100644 --- a/resources/js/views/Public/Home/Home.vue +++ b/resources/js/views/Public/Home/Home.vue @@ -1,61 +1,64 @@ diff --git a/resources/js/views/Public/Home/Sections/HeroSection.vue b/resources/js/views/Public/Home/Sections/HeroSection.vue deleted file mode 100644 index 86d2b65..0000000 --- a/resources/js/views/Public/Home/Sections/HeroSection.vue +++ /dev/null @@ -1,33 +0,0 @@ - - diff --git a/resources/js/views/Public/HowItWorks/HowItWorks.vue b/resources/js/views/Public/HowItWorks/HowItWorks.vue deleted file mode 100644 index dca7c4e..0000000 --- a/resources/js/views/Public/HowItWorks/HowItWorks.vue +++ /dev/null @@ -1,38 +0,0 @@ - - diff --git a/resources/js/views/Public/Pages/Default.vue b/resources/js/views/Public/Pages/Default.vue new file mode 100644 index 0000000..4135b15 --- /dev/null +++ b/resources/js/views/Public/Pages/Default.vue @@ -0,0 +1,52 @@ + + diff --git a/resources/pages/en/about.json b/resources/pages/en/about.json index 393897a..316cc1d 100644 --- a/resources/pages/en/about.json +++ b/resources/pages/en/about.json @@ -1,5 +1,16 @@ -[ - "Some text about Parently\"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\"", - "\"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\"", - "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." -] +{ + "sections": [ + { + "type": "title-section", + "title": "About Parently" + }, + { + "type": "text-section", + "content": [ + "Some text about Parently\"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\"", + "\"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\"", + "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." + ] + } + ] +} diff --git a/resources/pages/en/how-it-works.json b/resources/pages/en/how-it-works.json index e271cb2..e7b1cc5 100644 --- a/resources/pages/en/how-it-works.json +++ b/resources/pages/en/how-it-works.json @@ -1,11 +1,11 @@ { "sections": [ { - "type": "HeroSection", + "type": "title-section", "title": "How It Works" }, { - "type": "TabbedSection", + "type": "tabbed-section", "tabs": [ { "title": "How It Works",