albert/albert.lol
1
0
Fork 0
mirror of https://github.com/skidoodle/albert.lol.git synced 2025-02-15 06:09:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:skidoodle/portfolio-v2

Browse source
This commit is contained in:
skidoodle 2022-04-02 23:51:36 +02:00
commit 3afba647eb
3 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/Time.tsx
View file

@ -14,7 +14,14 @@ const Timer = () => {
return( return(
<div className={styles.time}> <div className={styles.time}>
<<<<<<< HEAD
<p><FaClock /> {date.toLocaleDateString('en-GB', { dateStyle: 'short' }) + ' • ' + date.toLocaleTimeString('en-GB', { timeStyle: 'medium', hour12: true, timeZone: 'Europe/Budapest'}).toUpperCase()}</p> <p><FaClock /> {date.toLocaleDateString('en-GB', { dateStyle: 'short' }) + ' • ' + date.toLocaleTimeString('en-GB', { timeStyle: 'medium', hour12: true, timeZone: 'Europe/Budapest'}).toUpperCase()}</p>
=======
<p><FontAwesomeIcon icon={['fas', 'clock']} /> {date.toLocaleString('en-GB', {
timeZone: 'Europe/Budapest',
hour12: true
}).toUpperCase()}</p>
>>>>>>> ce3c841bfc958c99053e0a03c56b5cbc56dff70f
</div> </div>
) )
} }

12
components/Weather.tsx
View file

@ -7,6 +7,7 @@ const Weather = ({data}: {data: any}) => {
const { icon: weatherIcon, description: weatherDescription} = data.weather[0] const { icon: weatherIcon, description: weatherDescription} = data.weather[0]
const icons: any = { const icons: any = {
<<<<<<< HEAD
_01d: <FaSun />, _01n: <FaMoon />, _01d: <FaSun />, _01n: <FaMoon />,
_02d: <FaCloudSun />, _02n: <FaCloudMoon />, _02d: <FaCloudSun />, _02n: <FaCloudMoon />,
_03d: <FaCloud />, _03n: <FaCloud />, _03d: <FaCloud />, _03n: <FaCloud />,
@ -16,6 +17,17 @@ const Weather = ({data}: {data: any}) => {
_11d: <BsCloudLightningFill />, _11n: <BsCloudLightningFill />, _11d: <BsCloudLightningFill />, _11n: <BsCloudLightningFill />,
_13d: <BsCloudSnowFill />, _13n: <BsCloudSnowFill />, _13d: <BsCloudSnowFill />, _13n: <BsCloudSnowFill />,
_50d: <BsCloudFogFill />, _50n: <BsCloudFogFill /> _50d: <BsCloudFogFill />, _50n: <BsCloudFogFill />
=======
_01d: ['fas', 'sun'], _01n: ['fas', 'moon'],
_02d: ['fas', 'cloud-sun'], _02n: ['fas', 'cloud-moon'],
_03d: ['fas', 'cloud'], _03n: ['fas', 'cloud'],
_04d: ['fas', 'clouds'], _04n: ['fas', 'clouds'],
_09d: ['fas', 'cloud-showers-heavy'], _09n: ['fas', 'cloud-showers-heavy'],
_10d: ['fas', 'cloud-showers-heavy'], _10n: ['fas', 'cloud-showers-heavy'],
_11d: ['fas', 'cloud-bolt-sun'], _11n: ['fas', 'cloud-bolt-moon'],
_13d: ['fas', 'snow-flake'], _13n: ['fas', 'snow-flake'],
_50d: ['fas', 'cloud-fog'], _50n: ['fas', 'cloud-fog']
>>>>>>> ce3c841bfc958c99053e0a03c56b5cbc56dff70f
} }
return ( return (

1
z Normal file
View file

@ -0,0 +1 @@
@suvikgotrekt