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

Mobile map page #20

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Mobile map page #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9cbaaf
map page mobile friendly
ywiamnog Feb 24, 2024
20508ee
Merge branch 'master' into mobile-map-page
ywiamnog Mar 23, 2024
979362f
fixed notifications page formatting
ywiamnog Mar 23, 2024
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
3 changes: 2 additions & 1 deletion app/Components/Map.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import React from "react"

export default function Map(){
return (
<div className='bg-white flex flex-col content-center justify-center p-10'>
// <div className='bg-white flex flex-col content-center justify-center p-10'>
<div className="justify-left flex flex-wrap items-center gap-7 p-6">
<iframe
title="Mappedin Map"
name="Mappedin Map"
Expand Down
12 changes: 0 additions & 12 deletions app/Components/MapTitle.tsx
View file
Open in desktop

This file was deleted.

20 changes: 10 additions & 10 deletions app/map/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import React from 'react';
import MapTitle from '../Components/MapTitle';
import Map from '../Components/Map';

export default function Home() {
return (
<div>
{/* exporting components of the Vendor Info Page in sequential order */}
{/* <VendorHeader />
<VendorDescription height = {96} />
<VendorPictures height = {96} />
<Contact /> */}
{/* exporting components of the Map Page in sequential order */}
<MapTitle />
<>
<div className='absolute z-0 bg-mapBackground bg-cover w-full h-128 flex flex-col content-center justify-center p-5'>
</div>
<div className="relative z-20 flex h-128 flex-col justify-center p-5">
<h1 className='font-sans top-20 bg-none text-center text-4xl font-bold tracking-[.15em] text-white md:text-7xl'>MAP</h1>
<h3 className='pt-3 text-center text-lg md:text-xl font-medium tracking-[.15em] text-white'>NAVIGATING THE MARKET? FIND MERCHANTS EASILY WITH OUR INTERACTIVE MAP. </h3>
</div>
<div></div>

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

21 changes: 4 additions & 17 deletions app/sms/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,27 +114,14 @@ export function InfoForm() {
};

return (
<div className="flex items-center justify-center">
<div
style={{
backgroundPosition: "center top",
backgroundImage: 'url("/background.png")',
backgroundSize: "cover",
filter: "brightness(75%)",
height: "65vh",
position: "absolute",
top: 0,
left: 0,
width: "100%",
zIndex: "0",
}}
></div>
<>
<div className='absolute z-0 bg-smsBackground bg-cover w-full h-128 flex flex-col content-center justify-center p-5'></div>
<div className="relative mt-44 flex flex-col items-center justify-center text-center">
<h1 className="font-sans text-center text-4xl font-bold tracking-[.15em] text-white md:text-7xl">
CONNECT
</h1>

<h3 className="font-sans mx-3 mt-4 pt-3 text-center text-lg font-medium tracking-[.15em] text-white md:text-xl">
<h3 className="pt-3 text-center text-lg md:text-xl font-medium tracking-[.15em] text-white">
GET NOTIFIED ABOUT OUR RAFFLE, PROMOTIONS, AND SPECIAL
EVENTS HAPPENING AT THE MARKET!
</h3>
Expand Down Expand Up @@ -202,7 +189,7 @@ export function InfoForm() {
pauseOnHover
theme="light"
/>
</div>
</>
);
}

Expand Down
1 change: 1 addition & 0 deletions tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ module.exports = {
nutcrackerBackground: "url('../public/background.png')",
vendorBackground: "url('../public/vendorBackground.png')",
mapBackground: "url('/assets/MapCover.png')",
smsBackground: "url('/background.png')"
},
colors: {
ballet: "#33323c",
Expand Down