Using Github API on ABout Page & Some Twicks

client/src/apps/_common/components/SettingsComp.js

@@ -72,7 +72,7 @@ const SettingsComp = (props) => {
 						<div className="SettingsComp-Setting-Div-01 SettingsComp-Setting-Div-Flexible-01 Theme-Slide-Background-onHover-99">
 							<div className="Flex-Class-Row-Start">
 								<GoVersions />
-								<p>Version - 2.0.0</p>
+								<p>Version - 2.0.0-beta.1</p>
 							</div>
 							<FaArrowRight />
 						</div>

client/src/apps/extra/components/CreadentialsForm.js

@@ -56,6 +56,11 @@ const CreadentialsForm = ({ pathName }, context) => {
 					{errorMsg && (
 						<p style={{ width: '100%', margin: '0px', color: 'var(--danger-red-color)' }}>{errorMsg}</p>
 					)}
+					{errorMsg === 'Incorrect email or password' && (
+						<p style={{ margin: '10px 0px 0px 0px', width: '100%' }}>
+							Forgot password? - <Link to="/forgot-password">Reset It</Link>
+						</p>
+					)}
 					<form
 						onSubmit={async (e) => {
 							e.preventDefault();

client/src/apps/extra/pages/About.js

@@ -1,8 +1,21 @@
-import React from 'react';
+import React, { useState, useEffect } from 'react';
 import { Link } from 'react-router-dom';
 import { GoMarkGithub, GoStar, GoRepoForked } from 'react-icons/go';
+import axios from 'axios';
 
 const AboutPage = () => {
+	const [ forks, setForks ] = useState(0);
+	const [ starts, setStars ] = useState(0);
+
+	useEffect(() => {
+		axios.get('https://api.github.com/repos/ritwik310/scheduler/forks').then(({ data }) => {
+			setForks(data.length);
+		});
+		axios.get('https://api.github.com/repos/ritwik310/scheduler/stargazers').then(({ data }) => {
+			setStars(data.length);
+		});
+	}, []);
+
 	return (
 		<div className="About-p-00">
 			<h1>Schedule your work in Style</h1>
@@ -31,7 +44,7 @@ const AboutPage = () => {
 			</div>
 
 			<p>
-				<strong>Version 2.0</strong> - Report any bugs {' '}
+				<strong>Version 2.0.0-beta.1</strong> - Report any bugs {' '}
 				<a href="/contact" target="_black">
 					here
 				</a>
@@ -47,7 +60,7 @@ const AboutPage = () => {
 						style={{ margin: '5px 0px', padding: '10px' }}
 						className="Theme-Btn-Black-99 Theme-Btn-Shadow-99"
 					>
-						27
+						{forks}
 					</button>
 				</a>
 				<div>
@@ -60,7 +73,7 @@ const AboutPage = () => {
 							style={{ margin: '5px 0px', padding: '10px' }}
 							className="Theme-Btn-Black-99 Theme-Btn-Shadow-99"
 						>
-							105
+							{starts}
 						</button>
 					</a>
 				</div>

client/src/apps/extra/pages/PrivacyPolicyPage.js

@@ -6,18 +6,18 @@ const PrivacyPolicyPage = () => {
 			<h1>Privacy Policy</h1>
 			<div className="PrivacyPolicy-Content-Div-01">
 				<p>
-					&ensp;<b>At Schedular</b>, accessible from{' '}
-					<a target="_blank" href="https://schedular.ritwiksaha.com">
-						https://schedular.ritwiksaha.com
+					&ensp;<b>At Scheduler</b>, accessible from{' '}
+					<a target="_blank" href="https://scheduler.ritwiksaha.com">
+						https://scheduler.ritwiksaha.com
 					</a>, one of our main priorities is the privacy of our visitors. This Privacy Policy document
-					contains types of information that is collected and recorded by Schedular and how we use it. If you
+					contains types of information that is collected and recorded by Scheduler and how we use it. If you
 					have additional questions or require more information about our Privacy Policy, do not hesitate to
 					contact us through email at{' '}
 					<a href="mailto: [email protected]">[email protected]</a>
 				</p>
 				<h3>Log Files</h3>
 				<p>
-					&ensp; Log Files Schedular follows a standard procedure of using log files. These files log visitors
+					&ensp; Log Files Scheduler follows a standard procedure of using log files. These files log visitors
 					when they visit websites. All hosting companies do this and a part of hosting services' analytics.
 					The information collected by log files include internet protocol (IP) addresses, browser type,
 					Internet Service Provider (ISP), date and time stamp, referring/exit pages, and possibly the number
@@ -28,7 +28,7 @@ const PrivacyPolicyPage = () => {
 
 				<h3>Cookies and Web Beacons</h3>
 				<p>
-					&ensp; Like any other website, Schedular uses 'cookies'. These cookies are used to store information
+					&ensp; Like any other website, Scheduler uses 'cookies'. These cookies are used to store information
 					including visitors' preferences, and the pages on the website that the visitor accessed or visited.
 					The information is used to optimize the users' experience by customizing our web page content based
 					on visitors' browser type and/or other information.
@@ -37,24 +37,24 @@ const PrivacyPolicyPage = () => {
 				<h3>Privacy Policies</h3>
 				<p>
 					&ensp; You may consult this list to find the Privacy Policy for each of the advertising partners of
-					Schedular. Our Privacy Policy was created with the help of the GDPR Privacy Policy Generator and the
+					Scheduler. Our Privacy Policy was created with the help of the GDPR Privacy Policy Generator and the
 					Terms and Conditions Template.
 				</p>
 				<p>
 					&ensp; Third-party ad servers or ad networks uses technologies like cookies, JavaScript, or Web
-					Beacons that are used in their respective advertisements and links that appear on Schedular, which
+					Beacons that are used in their respective advertisements and links that appear on Scheduler, which
 					are sent directly to users' browser. They automatically receive your IP address when this occurs.
 					These technologies are used to measure the effectiveness of their advertising campaigns and/or to
 					personalize the advertising content that you see on websites that you visit.
 				</p>
 				<p>
-					&ensp; Note that Schedular has no access to or control over these cookies that are used by
+					&ensp; Note that Scheduler has no access to or control over these cookies that are used by
 					third-party advertisers.
 				</p>
 
 				<h3>Third Pary Privacy Policies</h3>
 				<p>
-					&ensp; Schedular's Privacy Policy does not apply to other advertisers or websites. Thus, we are
+					&ensp; Scheduler's Privacy Policy does not apply to other advertisers or websites. Thus, we are
 					advising you to consult the respective Privacy Policies of these third-party ad servers for more
 					detailed information. It may include their practices and instructions about how to opt-out of
 					certain options. You may find a complete list of these Privacy Policies and their links here:
@@ -73,7 +73,7 @@ const PrivacyPolicyPage = () => {
 					activity.
 				</p>
 				<p>
-					&ensp; Schedular does not knowingly collect any Personal Identifiable Information from children
+					&ensp; Scheduler does not knowingly collect any Personal Identifiable Information from children
 					under the age of 13. If you think that your child provided this kind of information on our website,
 					we strongly encourage you to contact us immediately and we will do our best efforts to promptly
 					remove such information from our records.
@@ -82,7 +82,7 @@ const PrivacyPolicyPage = () => {
 				<h3>Online Privacy Policy Only</h3>
 				<p>
 					&ensp; This Privacy Policy applies only to our online activities and is valid for visitors to our
-					website with regards to the information that they shared and/or collect in Schedular. This policy is
+					website with regards to the information that they shared and/or collect in Scheduler. This policy is
 					not applicable to any information collected offline or via channels other than this website.
 				</p>
 

client/src/apps/extra/pages/ResetPass.js

@@ -16,7 +16,7 @@ const ResetPassPage = () => {
 
 		try {
 			await axios.post('/auth/password_reset', { token: urlParams.get('token'), password: password1 });
-			window.location.replace('/calendar');
+			window.location.replace('/login');
 		} catch (error) {
 			setProgressBar(false);
 			if (error.response.status === 422) setErrorMsg('Unable to change password');

server/src/services/nodemailer.js

@@ -26,8 +26,8 @@ module.exports = (req, res, next) => {
 	let mailOptions = {
 		from: keys.mail_sender_address,
 		to: recieverEmail,
-		subject: 'Reset Password - My Calendar',
-		// text: 'My Calendar',
+		subject: 'Scheduler - Reset Password',
+		text: 'Scheduler',
 		html: outputTemp,
 		auth: {
 			user: keys.mail_sender_address,

server/src/templates/mailer_v1.js

@@ -1,5 +1,8 @@
 module.exports = (link) => {
 	return `
+  <body style="font-size:16px">
+    <p>From scheduler app..</p>
     <p>Reset your password <a href="${link}">here</a></p>
+  </body>
   `;
 };