ourworld_web/www_ourverse_new
23
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ourworld_web:development
Branches Tags
ourworld_web:development ourworld_web:master ourworld_web:development_backup ourworld_web:main
..
compare: ourworld_web:5d09de9b4f7a90980ec0aa56bf7e0d42763da1dc
Branches Tags
ourworld_web:master ourworld_web:development ourworld_web:development_backup ourworld_web:main

16 Commits
developmen ... 5d09de9b4f

Author SHA1 Message Date
sasha-astiadi
5d09de9b4f Merge branch 'development'e 2024-10-31 11:44:37 +01:00
sasha-astiadi
fbb574b7f8 Merge branch 'development' 2024-10-29 23:07:51 +01:00
sasha-astiadi
6d40ccb0d2 Merge remote-tracking branch 'origin/development' 2024-10-25 15:33:43 +02:00
sashaastiadi
394b163f4b Merge pull request 'rm community sect' (!15) from development into master 
Reviewed-on: ourworld_web/ourverse_new#15
 2024-10-25 13:25:03 +00:00
sashaastiadi
ce7dcbda0a Merge pull request 'edit' (!14) from development into master 
Reviewed-on: ourworld_web/ourverse_new#14
 2024-10-25 13:15:44 +00:00
sashaastiadi
8f4576d330 Merge pull request 'edit' (!13) from development into master 
Reviewed-on: ourworld_web/ourverse_new#13
 2024-10-21 15:33:47 +00:00
sashaastiadi
513a308796 Merge pull request 'update blog' (!12) from development into master 
Reviewed-on: ourworld_web/ourverse_new#12
 2024-10-21 15:31:58 +00:00
sashaastiadi
7237129442 Merge pull request 'development' (!11) from development into master 
Reviewed-on: ourworld_web/ourverse_new#11
 2024-10-21 15:19:39 +00:00
sashaastiadi
5d88f84c0e Merge pull request 'edit image n footer' (!10) from development into master 
Reviewed-on: ourworld_web/ourverse_new#10
 2024-10-16 14:04:47 +00:00
sashaastiadi
4d461ac067 Merge pull request 'development' (!9) from development into master 
Reviewed-on: ourworld_web/ourverse_new#9
 2024-10-15 14:13:28 +00:00
sasha-astiadi
393977a5df Merge branch 'development' 2024-10-14 16:52:40 +02:00
ehab-hassan
9f53ef647d merge to master 2024-10-12 20:58:50 +03:00
ehab-hassan
cebbb34355 fix conflict 2024-10-09 23:21:49 +03:00
ehab-hassan
0a5a0d0bcc fix conflict 2024-10-09 17:10:40 +03:00
ehab-hassan
6ebf81f138 test building 2024-10-02 10:45:12 +03:00
PeterNashaat
cd840b0aee fix building issue 2024-09-17 06:55:13 +00:00
5 changed files with 4 additions and 4 deletions
Expand all files Collapse all files

BIN
public/videos/herohome.mp4 Normal file
View File

Binary file not shown.

BIN
public/videos/heroverse.mp4 Normal file
View File

Binary file not shown.

BIN
public/videos/ourverse5.mp4 Normal file
View File

Binary file not shown.

4
src/components/Footer.jsx
View File

@@ -8,11 +8,11 @@ export function Footer() {
<Logo className="h-12 w-auto text-slate-900" /> <Logo className="h-12 w-auto text-slate-900" />
<p className="mt-6 text-base text-slate-500 md:mt-0"> <p className="mt-6 text-base text-slate-500 md:mt-0">
&copy; {new Date().getFullYear()} OurWorld Holdings, All rights reserved.{' '} &copy; {new Date().getFullYear()} OurWorld Holdings, All rights reserved.{' '}
<a href="https://docs.threefold.info/docs/legal/terms_and_conditions" target="_blank" className="text-purple-500 hover:underline"> <a href="https://library.threefold.me/info/legal/#/legal__terms_conditions_websites" className="text-purple-500 hover:underline">
Terms & Conditions Terms & Conditions
</a>{' '} </a>{' '}
|{' '} |{' '}
<a href="https://docs.threefold.info/docs/legal/privacy_policy" target="_blank" className="text-purple-500 hover:underline"> <a href="https://library.threefold.me/info/legal/#/legal__privacypolicy" className="text-purple-500 hover:underline">
Privacy Policy Privacy Policy
</a> </a>
</p> </p>

4
src/components/Footer2.jsx
View File

@@ -170,9 +170,9 @@ export default function Footer2() {
</div> </div>
<div className="mt-16 border-t border-purple-900/10 pt-8 sm:mt-20 lg:mt-24"> <div className="mt-16 border-t border-purple-900/10 pt-8 sm:mt-20 lg:mt-24">
<p className="mt-6 text-sm text-slate-500 md:mt-0">&copy; {new Date().getFullYear()} OurWorld Holdings, All rights reserved.{' '} <p className="mt-6 text-sm text-slate-500 md:mt-0">&copy; {new Date().getFullYear()} OurWorld Holdings, All rights reserved.{' '}
<a href="https://docs.threefold.io/docs/legal/terms_and_conditions/" target="_blank" className="text-purple-500 hover:underline"> <a href="https://library.threefold.me/info/legal/#/legal__terms_conditions_websites" className="text-purple-500 hover:underline">
Terms & Conditions </a>{' '}|{' '} Terms & Conditions </a>{' '}|{' '}
<a href="https://docs.threefold.io/docs/legal/privacy_policy/" target="_blank" className="text-purple-500 hover:underline"> <a href="https://library.threefold.me/info/legal/#/legal__privacypolicy" className="text-purple-500 hover:underline">
Privacy Policy Privacy Policy
</a> </a>
</p> </p>