Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat:language support pushed #282

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Feat:language support pushed #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions app/locales/en/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"discoverPassion": "Discover Your Passion",
"findInterestingTopics": "Find out what topics you find interesting, learn a new skill & connect with people that are passionate about similar topics.",
"login": "Login",
"loginWithGoogle": "Login with Google",
"continueAsGuest": "Continue as a Guest"
}
7 changes: 7 additions & 0 deletions app/locales/tr/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"discoverPassion": "Tutkunuzu Keşfedin",
"findInterestingTopics": "İlginç konuları bulun, yeni bir beceri öğrenin ve benzer konulara ilgi duyan insanlarla bağlantı kurun.",
"login": "Giriş Yap",
"loginWithGoogle": "Google ile Giriş Yap",
"continueAsGuest": "Misafir Olarak Devam Et"
}
216 changes: 78 additions & 138 deletions components/GetStarted.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,170 +1,110 @@
'use client'
import React,{useState, useEffect} from 'react'
import Image from 'next/image'
// Import statements using ESM syntax
import React, { useState, useEffect } from 'react';
import Image from 'next/image';
import Login from './Login';
import Link from 'next/link';
import { doc,auth, firestore, setDoc } from '@/utils/firebase';
import { auth } from '@/utils/firebase';
import { useAuthState } from 'react-firebase-hooks/auth';
import { getUserCountry } from '@/app/pages/api/ip/route';
import signIn from '@/app/pages/api/auth/signin'
import signIn from '@/app/pages/api/auth/signin';
import { setIsAnonymous } from '@/redux/actions';
import { useDispatch } from 'react-redux';
import useTranslation from 'next-translate';

// Component definition
const GetStarted = ({ routers }) => {
console.log(auth.currentUser)
const [user, setUser] = useAuthState(auth);
useEffect(() => { },[user])
const dispatch = useDispatch()
const { t } = useTranslation();
const [user] = useAuthState(auth);
useEffect(() => {}, [user]);
const dispatch = useDispatch();

const [showLogin, setShowLogin] = useState(false);
// const googleAuth = new GoogleAuthProvider();


const handleLoginClick = () => {
setShowLogin(true);
};

const handleContinueAsGuestClick = async () => {

const { result, error } = await signIn('anonymous');

if (error) {
return console.log(error)
}
dispatch(setIsAnonymous(true))
if (error) {
return console.log(error);
}
dispatch(setIsAnonymous(true));

// else successful
console.log(result)
return routers.push('/pages/home')
console.log(result);
return routers.push('/pages/home');
};

const handleGoogleLoginClick = async () => {
// isAnonymous = false;
const { result, error } = await signIn('google');

if (error) {
return console.log(error)
}
dispatch(setIsAnonymous(false))
// else successful
console.log(result)
return routers.push('/pages/home')

if (error) {
return console.log(error);
}
dispatch(setIsAnonymous(false));

console.log(result);
return routers.push('/pages/home');
};
// const result = await signInWithPopup(auth, googleAuth)
// saveGoogleUserInfoToFirestore();
// const { uid } = auth.currentUser;
// localStorage.setItem('uid', uid);
// routers.push('/pages/home')


// };
// const saveGoogleUserInfoToFirestore = async () => {
// const { uid, displayName, email, photoURL } = auth.currentUser;
// const res = await getUserCountry();
// try {
// await setDoc(doc(firestore,'users',uid),{

// name: displayName,
// email: email,
// profilePicture: photoURL,
// country: res,

// }, { merge: true });
// // console.log(uid,displayName,email,photoURL,country)
// } catch (error) {
// console.error('Firestore Update Error:', error);
// }
// };
if (showLogin) {
return <Login routers={routers} />;
}

return (

<div>



<div className='flex justify-start'>
<div className="flex flex-row w-full items-center h-full justify-start ">
<div>
<Image src="/assets/icons/logos.png"
alt="icon image"
width={70}
height={70}
/>
</div>

<div>
<p className='text-primary font-bold'> Course Worm </p>
</div>
</div>
<div className='text-gray-800 font-bold py-1 text-3xl '>
<p>{t('discoverPassion')}</p>
</div>

<div className=' text-gray-600 py-5 '>
<p>{t('findInterestingTopics')}</p>
</div>

<div className=" font-bold flex flex-col w-full py-5 ">
<div className='w-full'>
<button className="out_btn m-2 w-full py-1" onClick={handleLoginClick}>
{t('login')}
</button>
</div>
<div className='w-full' >
<button className="out_btn m-2 w-full py-1" onClick={handleGoogleLoginClick}>
<svg
xmlns="http://www.w3.org/2000/svg"
width="24"
height="24"
viewBox="0 0 186.69 190.5"
className='mr-2'
>
<g transform="translate(1184.583 765.171)">
<path
fill="#4285f4"
d="M-1089.333-687.239v36.888h51.262c-2.251 11.863-9.006 21.908-19.137 28.662l30.913 23.986c18.011-16.625 28.402-41.044 28.402-70.052 0-6.754-.606-13.249-1.732-19.483z"
/>
<path
fill="#34a853"
d="M-1142.714-651.791l-6.972 5.337-24.679 19.223h0c15.673 31.086 47.796 52.561 85.03 52.561 25.717 0 47.278-8.486 63.038-23.033l-30.913-23.986c-8.486 5.715-19.31 9.179-32.125 9.179-24.765 0-45.806-16.712-53.34-39.226z"
/>
<path
fill="#fbbc05"
d="M-1174.365-712.61c-6.494 12.815-10.217 27.276-10.217 42.689s3.723 29.874 10.217 42.689c0 .086 31.693-24.592 31.693-24.592-1.905-5.715-3.031-11.776-3.031-18.098s1.126-12.383 3.031-18.098z"
/>
<path
fill="#ea4335"
d="M-1089.333-727.244c14.028 0 26.497 4.849 36.455 14.201l27.276-27.276c-16.539-15.413-38.013-24.852-63.731-24.852-37.234 0-69.359 21.388-85.032 52.561l31.692 24.592c7.533-22.514 28.575-39.226 53.34-39.226z"
/>
</g>
</svg>
{t('loginWithGoogle')}
</button>
</div>


<div className='w-full'>

<div className='text-gray-800 font-bold py-1 text-3xl '>
<p> Discover passion </p>
</div>

<div className=' text-gray-600 py-5 '>
<p> find out what topics you find interesting, <br /> learn a new skill & connect with people that <br /> are passionate about similer topics. </p>
</div>


<div className=" font-bold flex flex-col w-full py-5 ">
<div className='w-full'>
<button className="out_btn m-2 w-full py-1" onClick={handleLoginClick}> Login / Sign up</button>
</div>
<div className='w-full' >
<button className="out_btn m-2 w-full py-1" onClick={handleGoogleLoginClick}>

<svg
xmlns="http://www.w3.org/2000/svg"
width="24"
height="24"
viewBox="0 0 186.69 190.5"
className='mr-2'
>
<g transform="translate(1184.583 765.171)">
<path
fill="#4285f4"
d="M-1089.333-687.239v36.888h51.262c-2.251 11.863-9.006 21.908-19.137 28.662l30.913 23.986c18.011-16.625 28.402-41.044 28.402-70.052 0-6.754-.606-13.249-1.732-19.483z"
/>
<path
fill="#34a853"
d="M-1142.714-651.791l-6.972 5.337-24.679 19.223h0c15.673 31.086 47.796 52.561 85.03 52.561 25.717 0 47.278-8.486 63.038-23.033l-30.913-23.986c-8.486 5.715-19.31 9.179-32.125 9.179-24.765 0-45.806-16.712-53.34-39.226z"
/>
<path
fill="#fbbc05"
d="M-1174.365-712.61c-6.494 12.815-10.217 27.276-10.217 42.689s3.723 29.874 10.217 42.689c0 .086 31.693-24.592 31.693-24.592-1.905-5.715-3.031-11.776-3.031-18.098s1.126-12.383 3.031-18.098z"
/>
<path
fill="#ea4335"
d="M-1089.333-727.244c14.028 0 26.497 4.849 36.455 14.201l27.276-27.276c-16.539-15.413-38.013-24.852-63.731-24.852-37.234 0-69.359 21.388-85.032 52.561l31.692 24.592c7.533-22.514 28.575-39.226 53.34-39.226z"
/>
</g>
</svg>
Login with google
<Link href='/pages/home'>
<button className=" blue_btn w-full m-2 py-1" onClick={handleContinueAsGuestClick}>
{t('continueAsGuest')}
</button>

</div>
<div className='w-full'>
<Link href = '/pages/home'>
<button className=" blue_btn w-full m-2 py-1" onClick={handleContinueAsGuestClick} > Continue as a guest </button>
</Link>

</div>

</div>
</Link>
</div>




</div>
</div>
)
}
);
};

export default GetStarted
// Export the component using ESM syntax
export default GetStarted;
8 changes: 7 additions & 1 deletion next.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,10 @@ module.exports = {
images: {
domains: ['openlearning-cdn.s3.amazonaws.com', 'lh3.googleusercontent.com', 'firebasestorage.googleapis.com'],
},
};
i18n: {
locales: ['en', 'tr'], // Add more locales as needed
defaultLocale: 'en',
},
};


19 changes: 19 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"next": "13.4.7",
"next-auth": "^4.22.3",
"next-navigation": "^1.0.6",
"next-translate": "^2.5.3",
"postcss": "8.4.24",
"react": "18.2.0",
"react-dom": "18.2.0",
Expand Down