diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png index 0894aab..2901bad 100644 Binary files a/public/android-chrome-192x192.png and b/public/android-chrome-192x192.png differ diff --git a/public/android-chrome-512x512.png b/public/android-chrome-512x512.png index 2388afa..9f1bd6c 100644 Binary files a/public/android-chrome-512x512.png and b/public/android-chrome-512x512.png differ diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png index 9d40d20..7629f35 100644 Binary files a/public/apple-touch-icon.png and b/public/apple-touch-icon.png differ diff --git a/public/browserconfig.xml b/public/browserconfig.xml new file mode 100644 index 0000000..b3930d0 --- /dev/null +++ b/public/browserconfig.xml @@ -0,0 +1,9 @@ + + + + + + #da532c + + + diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png index 4816ee2..429fa87 100644 Binary files a/public/favicon-16x16.png and b/public/favicon-16x16.png differ diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png index 7e59bbb..b74995f 100644 Binary files a/public/favicon-32x32.png and b/public/favicon-32x32.png differ diff --git a/public/favicon.ico b/public/favicon.ico index 213a4d6..2e62975 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/index.html b/public/index.html index 33bb0e0..af638ce 100644 --- a/public/index.html +++ b/public/index.html @@ -17,8 +17,8 @@ href="%PUBLIC_URL%/favicon-16x16.png" /> - - + + diff --git a/public/locales/de/translation.json b/public/locales/de/translation.json index 0de921e..3f81dfc 100644 --- a/public/locales/de/translation.json +++ b/public/locales/de/translation.json @@ -181,7 +181,8 @@ } }, "signUp": { - "button": "Kostenpflichtig bestellen", + "button": "Registrieren", + "alreadyHaveAccount": "Sie haben bereits ein Konto?", "pendingEmailVerification": { "title": "E-Mail-Verifizierung ausstehend", "description": "Bitte überprüfen Sie Ihr E-Mail-Postfach und klicken Sie auf den Link in der E-Mail, um Ihre E-Mail-Adresse zu verifizieren." diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json index 587e181..657c62c 100644 --- a/public/locales/en/translation.json +++ b/public/locales/en/translation.json @@ -150,7 +150,7 @@ "rememberMe": "Remember me", "privacyPolicy": "I have read and accept the {{dataPrivacy}}", "privacyPolicyLink": "Privacy Policy", - "loginLink": "Login", + "loginLink": "Login now", "signUpLink": "Sign up now", "login": { "button": "Login", @@ -181,7 +181,8 @@ } }, "signUp": { - "button": "Order with obligation to pay", + "button": "Sign up", + "alreadyHaveAccount": "Already have an account?", "pendingEmailVerification": { "title": "Email verification pending", "description": "Please check your email inbox and click on the link in the e-mail to verify your e-mail address." diff --git a/public/mstile-144x144.png b/public/mstile-144x144.png index 749f51a..c7d56a3 100644 Binary files a/public/mstile-144x144.png and b/public/mstile-144x144.png differ diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png index 9bb6617..014b31c 100644 Binary files a/public/mstile-150x150.png and b/public/mstile-150x150.png differ diff --git a/public/mstile-310x150.png b/public/mstile-310x150.png index e0bcadd..0c16126 100644 Binary files a/public/mstile-310x150.png and b/public/mstile-310x150.png differ diff --git a/public/mstile-310x310.png b/public/mstile-310x310.png index 09ddeaa..e06fc5f 100644 Binary files a/public/mstile-310x310.png and b/public/mstile-310x310.png differ diff --git a/public/mstile-70x70.png b/public/mstile-70x70.png index a9adf5d..8b2eb07 100644 Binary files a/public/mstile-70x70.png and b/public/mstile-70x70.png differ diff --git a/public/safari-pinned-tab.svg b/public/safari-pinned-tab.svg index 7bbd1d2..3d2482e 100644 --- a/public/safari-pinned-tab.svg +++ b/public/safari-pinned-tab.svg @@ -9,10 +9,20 @@ Created by potrace 1.14, written by Peter Selinger 2001-2017 - + + + + diff --git a/src/App.js b/src/App.js index d1638e6..77be02f 100644 --- a/src/App.js +++ b/src/App.js @@ -121,7 +121,7 @@ export function App() { isDevelopmentEnv() ? "Dev" : "Stable" } %c \n`, "background-color: #555;color: #fff;padding: 3px 2px 3px 3px;border-radius: 3px 0 0 3px;font-family: DejaVu Sans,Verdana,Geneva,sans-serif;text-shadow: 0 1px 0 rgba(1, 1, 1, 0.3)", - "background-color: #bc81e0;background-image: linear-gradient(90deg, #6878d6, #4d61d6);color: #fff;padding: 3px 3px 3px 2px;border-radius: 0 3px 3px 0;font-family: DejaVu Sans,Verdana,Geneva,sans-serif;text-shadow: 0 1px 0 rgba(1, 1, 1, 0.3)", + "background-color: #bc81e0;background-image: linear-gradient(90deg, #0f88e5, #4bb1ff);color: #fff;padding: 3px 3px 3px 2px;border-radius: 0 3px 3px 0;font-family: DejaVu Sans,Verdana,Geneva,sans-serif;text-shadow: 0 1px 0 rgba(1, 1, 1, 0.3)", "background-color: transparent" ); diff --git a/src/Components/AppRoutes/index.js b/src/Components/AppRoutes/index.js index 5467c6b..fdbc18c 100644 --- a/src/Components/AppRoutes/index.js +++ b/src/Components/AppRoutes/index.js @@ -27,19 +27,8 @@ const StoreCalendarAuth = lazy(() => import("../../Pages/Store/Calendar/Auth")); //const Feedback = lazy(() => import("../../Pages/Feedback")); const UserProfile = lazy(() => import("../../Pages/UserProfile")); -export function AuthenticationRoutes() { - return ( - - - - - } - /> - - @@ -56,6 +45,28 @@ export function AuthenticationRoutes() { } /> +*/ + +export function AuthenticationRoutes() { + return ( + + + + + } + /> + + + + + } + /> {isDevelopmentEnv() && ( -

DEV

+

+ DEV +

)} @@ -235,7 +242,7 @@ export function SideMenuContent({ {showPaymentPlanInfoBanner && ( @@ -290,7 +297,7 @@ export function SideMenuContent({ {sideBarContext.accountPlanExpiry !== undefined && accountPlanExpiry > 0 && ( diff --git a/src/Pages/Authentication/CheckoutCanceled.js b/src/Pages/Authentication/CheckoutCanceled.js index 64393a0..f3a4cdd 100644 --- a/src/Pages/Authentication/CheckoutCanceled.js +++ b/src/Pages/Authentication/CheckoutCanceled.js @@ -1,4 +1,4 @@ -import { Button, Modal, Result } from "antd"; +/*import { Button, Modal, Result } from "antd"; import { useParams } from "react-router-dom"; import { useEffect, useState } from "react"; import MyCenteredSpin from "../../Components/MyCenteredSpin"; @@ -66,3 +66,4 @@ export default function CheckoutCanceled() { ); } +*/ diff --git a/src/Pages/Authentication/CheckoutSuccess.js b/src/Pages/Authentication/CheckoutSuccess.js index 360be6d..f430e26 100644 --- a/src/Pages/Authentication/CheckoutSuccess.js +++ b/src/Pages/Authentication/CheckoutSuccess.js @@ -1,4 +1,4 @@ -import { useParams } from "react-router-dom"; +/*import { useParams } from "react-router-dom"; import { useEffect } from "react"; import { myFetch, showUnkownErrorNotification } from "../../utils"; import MyCenteredSpin from "../../Components/MyCenteredSpin"; @@ -35,3 +35,4 @@ export default function CheckoutSuccess() { return ; } +*/ diff --git a/src/Pages/Authentication/Login.js b/src/Pages/Authentication/Login.js index 5baea26..f06a481 100644 --- a/src/Pages/Authentication/Login.js +++ b/src/Pages/Authentication/Login.js @@ -289,7 +289,9 @@ export function Login({ notificationApi }) { diff --git a/src/Pages/Authentication/SignUp.js b/src/Pages/Authentication/SignUp.js index 9a1aecc..176b993 100644 --- a/src/Pages/Authentication/SignUp.js +++ b/src/Pages/Authentication/SignUp.js @@ -35,12 +35,129 @@ import MyAppLogo from "../../Components/MyAppLogo"; import { CheckOutlined } from "@ant-design/icons"; import { RequestState } from "../../Components/MyRequestStateItem"; import { useAppContext } from "../../Contexts/AppContext"; -/* + const SignUpStep = { SIGN_UP: 1, PENDING_EMAIL_VERIFICATION: 2, }; -*/ + +export default function SignUp({ notificationApi }) { + const { t, i18n } = useTranslation(); + const navigate = useNavigate(); + + const [step, setStep] = useState(SignUpStep.SIGN_UP); + const [isRequesting, setIsRequesting] = useState(false); + const recaptchaRef = useRef(null); + const recaptchaValueRef = useRef(null); + + const [form] = Form.useForm(); + + if (step === SignUpStep.PENDING_EMAIL_VERIFICATION) { + return ; + } + + return ( +
+ + + + + + + + + + + + + + + + + + + {t("authentication.signUp.alreadyHaveAccount")}{" "} + + + + + ); +} + +function PendingEmailVerification() { + const { t } = useTranslation(); + + return ( + + + {t("authentication.signUp.pendingEmailVerification.title")} + + + {t("authentication.signUp.pendingEmailVerification.description")} + + + ); +} + +/* + +/* export default function SignUp({ paymentPlan }) { const [notificationApi, notificationContextHolder] = notification.useNotification(); @@ -54,7 +171,7 @@ export default function SignUp({ paymentPlan }) { if (step === SignUpStep.PENDING_EMAIL_VERIFICATION) { return ; } */ - +/* return ( <> {notificationContextHolder} @@ -374,3 +491,4 @@ function CostSummary({ notificationApi, paymentPlan, form }) { ); } +*/ diff --git a/src/Pages/Authentication/index.js b/src/Pages/Authentication/index.js index 3579604..6301949 100644 --- a/src/Pages/Authentication/index.js +++ b/src/Pages/Authentication/index.js @@ -4,10 +4,12 @@ import { Trans, useTranslation } from "react-i18next"; import MyAppLogo from "../../Components/MyAppLogo"; import ReCAPTCHA from "react-google-recaptcha"; import { ForgotPassword, Login } from "./Login"; +import SignUp from "./SignUp"; export const AuthenticationMethod = { LOGIN: 1, - FORGOT_PASSWORD: 2, + SIGN_UP: 2, + FORGOT_PASSWORD: 3, }; export default function Authentication({ method }) { @@ -37,6 +39,8 @@ export default function Authentication({ method }) { {method === AuthenticationMethod.LOGIN ? ( + ) : method === AuthenticationMethod.SIGN_UP ? ( + ) : ( )} @@ -117,7 +121,8 @@ export function PendingEmailVerification() { /> ); } - +/* export function BackToZeitAdlerPricingOverview() { window.location.href = process.env.REACT_APP_ZEITADLER_HOMEPAGE_PRICING; } +*/ diff --git a/src/Pages/Dashboard/index.js b/src/Pages/Dashboard/index.js index fc33428..3251eb6 100644 --- a/src/Pages/Dashboard/index.js +++ b/src/Pages/Dashboard/index.js @@ -2,15 +2,24 @@ import { Card, Flex, Spin } from "antd"; import { useState } from "react"; import MyCenteredContainer from "../../Components/MyContainer"; import { useTranslation } from "react-i18next"; +import { MyEmpty } from "../../Components/MyEmpty"; +import PageInDevelopment from "../PageInDevelopment"; export default function Dashboard() { const { t } = useTranslation(); - const [isLoading, setIsLoading] = useState(true); + // const [isLoading, setIsLoading] = useState(true); return ( - {isLoading && ( + + + ); +} + +/* + + {isLoading && ( @@ -30,6 +39,5 @@ export default function Dashboard() { }} />
- - ); -} + +*/ diff --git a/src/Pages/PaymentPlan/index.js b/src/Pages/PaymentPlan/index.js index 825fddf..108cae1 100644 --- a/src/Pages/PaymentPlan/index.js +++ b/src/Pages/PaymentPlan/index.js @@ -4,7 +4,7 @@ import { myFetch, showUnkownErrorNotification } from "../../utils"; import { useTranslation } from "react-i18next"; import { CreditCardOutlined } from "@ant-design/icons"; import { useState } from "react"; -import { ChoosenProduct } from "../Authentication/SignUp"; +// import { ChoosenProduct } from "../Authentication/SignUp"; export default function PaymentPlan() { const { t } = useTranslation(); @@ -16,11 +16,11 @@ export default function PaymentPlan() { const [isRequestingBillingDetails, setIsRequestingBillingDetails] = useState(false); - return ( - <> - {notificationContextHolder} + return <>{notificationContextHolder}; +} - - ); -} +*/ diff --git a/src/Pages/Store/Services/index.js b/src/Pages/Store/Services/index.js index a200a13..e320f06 100644 --- a/src/Pages/Store/Services/index.js +++ b/src/Pages/Store/Services/index.js @@ -17,6 +17,7 @@ import { import { useTranslation } from "react-i18next"; import { useEffect, useState } from "react"; import { + AppStyle, Constants, myFetch, showInputsInvalidNotification, @@ -342,7 +343,10 @@ function Service({ > {user.username.charAt(0)} diff --git a/src/ZeitAdler.svg b/src/ZeitAdler.svg index ecf1f24..07f9c27 100644 --- a/src/ZeitAdler.svg +++ b/src/ZeitAdler.svg @@ -1,4 +1,4 @@ - - - + + + diff --git a/src/index.js b/src/index.js index f659f40..6f02e7d 100644 --- a/src/index.js +++ b/src/index.js @@ -15,13 +15,13 @@ root.render( theme={{ token: { fontFamily: "Roboto, sans-serif", - colorPrimary: "#6878d6", - colorInfo: "#6878d6", + colorPrimary: "#1395f8", + colorInfo: "#1395f8", }, components: { Segmented: { // used in sign up - itemSelectedBg: "#6878d6", + itemSelectedBg: "#1395f8", itemSelectedColor: "#fff", }, }, diff --git a/src/utils.js b/src/utils.js index 5e4657d..6a0dd1c 100644 --- a/src/utils.js +++ b/src/utils.js @@ -46,7 +46,7 @@ export const Constants = { ROUTE_PATHS: { AUTHENTICATION: { LOGIN: "/login", - SIGN_UP: "/buy", + SIGN_UP: "/signup", FORGOT_PASSWORD: "/forgot-password", CHECKOUT_SUCCESS: "/checkout/success", CHECKOUT_CANCELED: "/checkout/canceled", @@ -121,7 +121,7 @@ export const AppStyle = { margin: 12, }, colors: { - primary: "#6878d6", + primary: "#1395f8", }, };