Compare commits

...

2 Commits

Author SHA1 Message Date
louiscklaw
731cb7500e update demo react add to cart, 2025-06-06 14:34:13 +08:00
louiscklaw
d6c87e33f0 update demo pull state, 2025-06-06 14:22:22 +08:00
24 changed files with 649 additions and 34 deletions

View File

@@ -0,0 +1,24 @@
import { IonAvatar, IonButton, IonItem, IonLabel } from '@ionic/react';
import { toggleFollowing } from '../store/PeopleStore';
export const Person = ({ person }): React.JSX.Element => {
return (
<IonItem lines="full">
<IonAvatar>
<img src={person.avatar} alt="avatar" />
</IonAvatar>
<IonLabel className="ion-padding-start">
<h1>{person.name}</h1>
<p>{person.title}</p>
</IonLabel>
<IonButton
color="primary"
fill={person.following ? 'solid' : 'outline'}
onClick={() => toggleFollowing(person.id)}
>
{person.following ? 'Following' : 'Follow'}
</IonButton>
</IonItem>
);
};

View File

@@ -0,0 +1,45 @@
export const people = [
{
id: 1,
name: "Alan Montgomery",
title: "Mobile Team Lead",
avatar: "https://pbs.twimg.com/profile_images/1420489989163524096/GwHdYSky_400x400.jpg",
following: false
},
{
id: 2,
name: "Max Lynch",
title: "CEO | Co Founder",
avatar: "https://pbs.twimg.com/profile_images/1318970727173885953/bln98FNj_400x400.jpg",
following: false
},
{
id: 3,
name: "Mike Hartington",
title: "Senior Dev Rel",
avatar: "https://pbs.twimg.com/profile_images/1084993841898446849/DJ8XtR6L_400x400.jpg",
following: false
},
{
id: 4,
name: "Matt Netkow",
title: "Head of Product Marketing",
avatar: "https://pbs.twimg.com/profile_images/1323383930150621187/GKc0nVzi_400x400.jpg",
following: false
},
{
id: 5,
name: "Ben Sperry",
title: "CDO | Co Founder",
avatar: "https://pbs.twimg.com/profile_images/1407747959345795072/McJb-RvC_400x400.jpg",
following: false
},
{
id: 6,
name: "Liam DeBeasi",
title: "Software Engineer",
avatar: "https://pbs.twimg.com/profile_images/1105953692669366273/ZNK4lRAJ_400x400.jpg",
following: false
}
];

View File

@@ -1,16 +1,18 @@
import { IonIcon, IonLabel, IonRouterOutlet, IonTabBar, IonTabButton, IonTabs } from '@ionic/react';
import { cloudOutline, searchOutline } from 'ionicons/icons';
import { list, people } from 'ionicons/icons';
import { Route, Redirect } from 'react-router';
import Tab1 from './AppPages/Tab1';
import Tab2 from './AppPages/Tab2';
// import Tab1 from './AppPages/Tab1';
// import Tab2 from './AppPages/Tab2';
import './style.scss';
import Tab1 from './pages/Tab1';
import Tab2 from './pages/Tab2';
function DemoPullstateTutorial() {
return (
<IonTabs>
<IonTabs className="demo-pullstate-tutorial">
<IonRouterOutlet>
<Route exact path="/demo-pullstate-tutorial/tab1">
<Tab1 />
@@ -25,12 +27,12 @@ function DemoPullstateTutorial() {
{/* */}
<IonTabBar slot="bottom">
<IonTabButton tab="tab1" href="/demo-pullstate-tutorial/tab1">
<IonIcon icon={cloudOutline} />
<IonLabel>Dashboard</IonLabel>
<IonIcon icon={list} />
<IonLabel>List</IonLabel>
</IonTabButton>
<IonTabButton tab="tab2" href="/demo-pullstate-tutorial/tab2">
<IonIcon icon={searchOutline} />
<IonLabel>Search</IonLabel>
<IonIcon icon={people} />
<IonLabel>Following</IonLabel>
</IonTabButton>
</IonTabBar>
</IonTabs>

View File

@@ -0,0 +1,63 @@
import {
IonButton,
IonButtons,
IonContent,
IonHeader,
IonIcon,
IonPage,
IonTitle,
IonToolbar,
useIonRouter,
} from '@ionic/react';
import { PeopleStore } from '../store';
import { Person } from '../components/Person';
import './Tab1.css';
import { useStoreState } from 'pullstate';
import { getPeople } from '../store/Selectors';
import { chevronBackOutline } from 'ionicons/icons';
const Tab1 = (): React.JSX.Element => {
const people = useStoreState(PeopleStore, getPeople);
console.log(people);
const router = useIonRouter();
function handleBackClick() {
router.goBack();
}
return (
<IonPage>
<IonHeader>
<IonToolbar>
<IonTitle>List of People</IonTitle>
<IonButtons slot="start">
<IonButton onClick={() => handleBackClick()}>
<IonIcon icon={chevronBackOutline} color="primary" />
</IonButton>
</IonButtons>
</IonToolbar>
</IonHeader>
<IonContent fullscreen>
<IonHeader collapse="condense">
<IonToolbar>
<IonTitle size="large">List of People</IonTitle>
<IonButtons slot="start">
<IonButton onClick={() => handleBackClick()}>
<IonIcon icon={chevronBackOutline} color="primary" />
</IonButton>
</IonButtons>
</IonToolbar>
</IonHeader>
{people.map((person, index) => {
return <Person person={person} key={index} />;
})}
</IonContent>
</IonPage>
);
};
export default Tab1;

View File

@@ -0,0 +1,34 @@
import { IonContent, IonHeader, IonPage, IonTitle, IonToolbar } from '@ionic/react';
import { useStoreState } from 'pullstate';
import { Person } from '../components/Person';
import { PeopleStore } from '../store';
import { getFollowing } from '../store/Selectors';
import './Tab2.css';
import React from 'react';
const Tab2 = (): React.JSX.Element => {
const people = useStoreState(PeopleStore, getFollowing);
return (
<IonPage>
<IonHeader>
<IonToolbar>
<IonTitle>Following</IonTitle>
</IonToolbar>
</IonHeader>
<IonContent fullscreen>
<IonHeader collapse="condense">
<IonToolbar>
<IonTitle size="large">Following</IonTitle>
</IonToolbar>
</IonHeader>
{people.map((person, index) => {
return <Person person={person} key={index} />;
})}
</IonContent>
</IonPage>
);
};
export default Tab2;

View File

@@ -0,0 +1,19 @@
import { Store } from "pullstate";
import { people } from "../data";
const PeopleStore = new Store({
people: people
});
export const toggleFollowing = personId => {
PeopleStore.update(s => {
const personIndex = s.people.findIndex(person => person.id === personId);
s.people[personIndex].following = !s.people[personIndex].following;
});
}
export default PeopleStore;

View File

@@ -0,0 +1,7 @@
import { createSelector } from "reselect";
const getState = state => state;
// Gets
export const getPeople = createSelector(getState, state => state.people);
export const getFollowing = createSelector(getState, state => state.people.filter(person => person.following));

View File

@@ -0,0 +1 @@
export { default as PeopleStore } from "./PeopleStore";

View File

@@ -0,0 +1,79 @@
.demo-pullstate-tutorial {
/* Ionic Variables and Theming. For more info, please see:
http://ionicframework.com/docs/theming/ */
/** Ionic CSS Variables **/
:root {
/** primary **/
--ion-color-primary: #3880ff;
--ion-color-primary-rgb: 56, 128, 255;
--ion-color-primary-contrast: #ffffff;
--ion-color-primary-contrast-rgb: 255, 255, 255;
--ion-color-primary-shade: #3171e0;
--ion-color-primary-tint: #4c8dff;
/** secondary **/
--ion-color-secondary: #3dc2ff;
--ion-color-secondary-rgb: 61, 194, 255;
--ion-color-secondary-contrast: #ffffff;
--ion-color-secondary-contrast-rgb: 255, 255, 255;
--ion-color-secondary-shade: #36abe0;
--ion-color-secondary-tint: #50c8ff;
/** tertiary **/
--ion-color-tertiary: #5260ff;
--ion-color-tertiary-rgb: 82, 96, 255;
--ion-color-tertiary-contrast: #ffffff;
--ion-color-tertiary-contrast-rgb: 255, 255, 255;
--ion-color-tertiary-shade: #4854e0;
--ion-color-tertiary-tint: #6370ff;
/** success **/
--ion-color-success: #2dd36f;
--ion-color-success-rgb: 45, 211, 111;
--ion-color-success-contrast: #ffffff;
--ion-color-success-contrast-rgb: 255, 255, 255;
--ion-color-success-shade: #28ba62;
--ion-color-success-tint: #42d77d;
/** warning **/
--ion-color-warning: #ffc409;
--ion-color-warning-rgb: 255, 196, 9;
--ion-color-warning-contrast: #000000;
--ion-color-warning-contrast-rgb: 0, 0, 0;
--ion-color-warning-shade: #e0ac08;
--ion-color-warning-tint: #ffca22;
/** danger **/
--ion-color-danger: #eb445a;
--ion-color-danger-rgb: 235, 68, 90;
--ion-color-danger-contrast: #ffffff;
--ion-color-danger-contrast-rgb: 255, 255, 255;
--ion-color-danger-shade: #cf3c4f;
--ion-color-danger-tint: #ed576b;
/** dark **/
--ion-color-dark: #222428;
--ion-color-dark-rgb: 34, 36, 40;
--ion-color-dark-contrast: #ffffff;
--ion-color-dark-contrast-rgb: 255, 255, 255;
--ion-color-dark-shade: #1e2023;
--ion-color-dark-tint: #383a3e;
/** medium **/
--ion-color-medium: #92949c;
--ion-color-medium-rgb: 146, 148, 156;
--ion-color-medium-contrast: #ffffff;
--ion-color-medium-contrast-rgb: 255, 255, 255;
--ion-color-medium-shade: #808289;
--ion-color-medium-tint: #9d9fa6;
/** light **/
--ion-color-light: #f4f5f8;
--ion-color-light-rgb: 244, 245, 248;
--ion-color-light-contrast: #000000;
--ion-color-light-contrast-rgb: 0, 0, 0;
--ion-color-light-shade: #d7d8da;
--ion-color-light-tint: #f5f6f9;
}
}

View File

@@ -8,7 +8,7 @@ export const WeatherProperty = ({ type, currentWeather }: { type: any; currentWe
const properties = {
wind: {
isIcon: false,
icon: '/assets/WeatherDemo/wind.png',
icon: '/assets/DemoReactAddToCart/WeatherDemo/wind.png',
alt: 'wind',
label: 'Wind',
value: `${currentWeather.current.wind_mph}mph`,

View File

@@ -51,7 +51,12 @@ export const SkeletonDashboard = () => (
<IonCol size="6">
<IonRow className="ion-justify-content-center ion-align-items-center">
<IonCol size="3">
<img alt="wind" src="/assets/WeatherDemo/wind.png" height="32" width="32" />
<img
alt="wind"
src="/assets/DemoReactAddToCart/WeatherDemo/wind.png"
height="32"
width="32"
/>
</IonCol>
<IonCol size="9">

View File

@@ -0,0 +1,14 @@
.buttonContainer {
display: flex;
flex-direction: column;
justify-content: center;
align-content: center;
align-items: center;
}
.button {
--padding-top: 1.75rem;
--padding-bottom: 1.75rem;
--padding-start: 1.75rem;
--padding-end: 1.75rem;
}

View File

@@ -0,0 +1,60 @@
import { CreateAnimation, IonButton, IonIcon } from '@ionic/react';
import React, { useRef, useState } from 'react';
import styles from './AddToCartButton.module.css';
import { cartOutline } from 'ionicons/icons';
const AddToCartButton = ({
icon = true,
color = 'primary',
customOnClick = null,
}): React.JSX.Element => {
const iconRef = useRef(null);
const [hidden, setHidden] = useState(true);
const floatStyle = {
display: hidden ? 'none' : '',
position: 'absolute',
};
const floatGrowAnimation = {
property: 'transform',
fromValue: 'translateY(0) scale(1)',
toValue: 'translateY(-55px) scale(1.2)',
};
const colorAnimation = {
property: 'color',
fromValue: 'white',
toValue: `var(--ion-color-${color}`,
};
const mainAnimation = {
duration: 700,
iterations: '1',
fromTo: [floatGrowAnimation, colorAnimation],
easing: 'cubic-bezier(0.25, 0.7, 0.25, 0.7)',
};
const handleClick = async () => {
setHidden(false);
await iconRef.current.animation.play();
setHidden(true);
customOnClick && customOnClick();
};
return (
<div className={styles.buttonContainer}>
<IonButton color={color} className={styles.button} onClick={handleClick}>
{!icon && 'Add to cart'}
{icon && <IonIcon icon={cartOutline} />}
</IonButton>
<CreateAnimation ref={iconRef} {...mainAnimation}>
<IonIcon icon={cartOutline} size="large" style={floatStyle} />
</CreateAnimation>
</div>
);
};
export default AddToCartButton;

View File

@@ -0,0 +1,19 @@
.priceContainer {
display: flex;
flex-direction: row;
align-content: center;
justify-content: space-between;
align-items: center;
}
.price {
margin-top: 0.7rem;
border: 1px solid var(--ion-color-primary);
color: var(--ion-color-primary);
width: fit-content;
padding: 1rem;
border-radius: 10px;
font-weight: 600;
}

View File

@@ -0,0 +1,61 @@
import {
IonCard,
IonCardContent,
IonCardHeader,
IonCardSubtitle,
IonCardTitle,
IonCol,
IonGrid,
IonRow,
IonText,
} from '@ionic/react';
import AddToCartButton from './AddToCartButton';
import styles from './Product.module.css';
const Product = ({ product }): React.JSX.Element => {
const handleAdd = (product) => {
console.log(`Product added: ${product.name}`);
console.log({ product });
// Do something
// Update Main Cart
// Global State Stuff
// API Call
// etc etc
};
return (
<IonCard>
<IonCardHeader>
<IonCardTitle>{product.name}</IonCardTitle>
<IonCardSubtitle>{product.description}</IonCardSubtitle>
</IonCardHeader>
<IonCardContent>
<IonGrid>
<IonRow className="ion-margin-bottom">
<IonCol size="5">
<img src={product.image} alt="product" />
</IonCol>
<IonCol size="7">
<IonText>
<IonCardSubtitle>Product Features</IonCardSubtitle>
{product.features.map((feature, index) => {
return <p key={index}>{feature}</p>;
})}
</IonText>
</IonCol>
</IonRow>
<IonRow className={styles.priceContainer}>
<div className={styles.price}>{product.price}</div>
<AddToCartButton icon={true} customOnClick={() => handleAdd(product)} />
</IonRow>
</IonGrid>
</IonCardContent>
</IonCard>
);
};
export default Product;

View File

@@ -1,38 +1,29 @@
import { IonIcon, IonLabel, IonRouterOutlet, IonTabBar, IonTabButton, IonTabs } from '@ionic/react';
import { IonRouterOutlet, IonTabs } from '@ionic/react';
import { cloudOutline, searchOutline } from 'ionicons/icons';
import { Route, Redirect } from 'react-router';
import Tab1 from './AppPages/Tab1';
import Tab2 from './AppPages/Tab2';
import './style.scss';
import './theme/variables.scss';
import Home from './pages/Home';
function DemoReactAddToCart() {
return (
<IonTabs>
<IonTabs className="demo-react-add-to-cart">
<IonRouterOutlet>
{/*
<Route exact path="/demo-react-add-to-cart/tab1">
<Tab1 />
</Route>
<Route exact path="/demo-react-add-to-cart/tab2">
<Tab2 />
</Route>
*/}
<Redirect exact path="/demo-react-add-to-cart" to="/demo-react-add-to-cart/tab1" />
<Route exact path="/demo-react-add-to-cart/home">
<Home />
</Route>
<Redirect exact path="/demo-react-add-to-cart" to="/demo-react-add-to-cart/home" />
</IonRouterOutlet>
{/* */}
<IonTabBar slot="bottom">
<IonTabButton tab="tab1" href="/demo-react-add-to-cart/tab1">
<IonIcon icon={cloudOutline} />
<IonLabel>Dashboard</IonLabel>
</IonTabButton>
<IonTabButton tab="tab2" href="/demo-react-add-to-cart/tab2">
<IonIcon icon={searchOutline} />
<IonLabel>Search</IonLabel>
</IonTabButton>
</IonTabBar>
</IonTabs>
);
}

View File

@@ -0,0 +1,4 @@
declare module '*.module.css' {
const classes: { readonly [key: string]: string };
export default classes;
}

View File

@@ -0,0 +1,19 @@
.price-container {
display: flex;
flex-direction: row;
align-content: center;
justify-content: space-between;
align-items: center;
}
.price {
margin-top: 0.7rem;
border: 1px solid var(--ion-color-primary);
color: var(--ion-color-primary);
width: fit-content;
padding: 1rem;
border-radius: 10px;
font-weight: 600;
}

View File

@@ -0,0 +1,45 @@
import {
IonButton,
IonButtons,
IonContent,
IonHeader,
IonIcon,
IonPage,
IonTitle,
IonToolbar,
useIonRouter,
} from '@ionic/react';
import './Home.css';
import Product from '../components/Product';
import { products } from './products';
import React from 'react';
import { chevronBackOutline } from 'ionicons/icons';
const Home = (): React.JSX.Element => {
const router = useIonRouter();
function handleBackClick() {
router.goBack();
}
return (
<IonPage>
<IonHeader>
<IonToolbar>
<IonTitle>Add To Cart Animation</IonTitle>
<IonButtons slot="start">
<IonButton onClick={() => handleBackClick()}>
<IonIcon icon={chevronBackOutline} color="primary" />
</IonButton>
</IonButtons>
</IonToolbar>
</IonHeader>
<IonContent fullscreen>
{products.map((product) => {
return <Product key={product.id} product={product} />;
})}
</IonContent>
</IonPage>
);
};
export default Home;

View File

@@ -0,0 +1,44 @@
export const products = [
{
id: 1,
name: 'Macbook Pro',
description: "13.3' (2020) - M1, 256 GB SSD, Space Grey",
price: '£1,199',
image: '/assets/DemoReactAddToCart/macbook.jpeg',
features: [
'macOS 11.0 Big Sur',
'Apple M1 chip',
'RAM: 8 GB / Storage: 256 GB SSD',
'Retina display',
'Battery life: Up to 20 hours',
],
},
{
id: 2,
name: 'SONY A7',
description: 'SONY a7 III Mirrorless Camera - Black',
price: '£1,699',
image: '/assets/DemoReactAddToCart/camera.jpeg',
features: [
'24.2 megapixels',
'Full-frame 35 mm / 35.6 x 23.8 mm CMOS sensor',
'Built-in WiFi / Bluetooth / NFC',
"3' tiltable LCD touchscreen",
'10 fps in continuous shooting mode',
],
},
{
id: 3,
name: 'HISENSE 55',
description: "55' Smart 4K Ultra HD HDR LED TV",
price: '£429',
image: '/assets/DemoReactAddToCart/tv.jpeg',
features: [
'Picture quality: 1600 PCI',
'HDR: HDR10 / Hybrid Log-Gamma (HLG)',
'Catch-up TV & 4K streaming',
'Freeview HD with Freeview Play',
'HDMI 2.0 x 3',
],
},
];

View File

@@ -41,19 +41,19 @@
}
.about-header .madison {
background-image: url('/assets/WeatherDemo/img/about/madison.jpg');
background-image: url('/assets/DemoReactAddToCart/WeatherDemo/img/about/madison.jpg');
}
.about-header .austin {
background-image: url('/assets/WeatherDemo/img/about/austin.jpg');
background-image: url('/assets/DemoReactAddToCart/WeatherDemo/img/about/austin.jpg');
}
.about-header .chicago {
background-image: url('/assets/WeatherDemo/img/about/chicago.jpg');
background-image: url('/assets/DemoReactAddToCart/WeatherDemo/img/about/chicago.jpg');
}
.about-header .seattle {
background-image: url('/assets/WeatherDemo/img/about/seattle.jpg');
background-image: url('/assets/DemoReactAddToCart/WeatherDemo/img/about/seattle.jpg');
}
.about-info {

View File

@@ -0,0 +1,79 @@
.demo-react-add-to-cart {
/* Ionic Variables and Theming. For more info, please see:
http://ionicframework.com/docs/theming/ */
/** Ionic CSS Variables **/
:root {
/** primary **/
--ion-color-primary: #3880ff;
--ion-color-primary-rgb: 56, 128, 255;
--ion-color-primary-contrast: #ffffff;
--ion-color-primary-contrast-rgb: 255, 255, 255;
--ion-color-primary-shade: #3171e0;
--ion-color-primary-tint: #4c8dff;
/** secondary **/
--ion-color-secondary: #3dc2ff;
--ion-color-secondary-rgb: 61, 194, 255;
--ion-color-secondary-contrast: #ffffff;
--ion-color-secondary-contrast-rgb: 255, 255, 255;
--ion-color-secondary-shade: #36abe0;
--ion-color-secondary-tint: #50c8ff;
/** tertiary **/
--ion-color-tertiary: #5260ff;
--ion-color-tertiary-rgb: 82, 96, 255;
--ion-color-tertiary-contrast: #ffffff;
--ion-color-tertiary-contrast-rgb: 255, 255, 255;
--ion-color-tertiary-shade: #4854e0;
--ion-color-tertiary-tint: #6370ff;
/** success **/
--ion-color-success: #2dd36f;
--ion-color-success-rgb: 45, 211, 111;
--ion-color-success-contrast: #ffffff;
--ion-color-success-contrast-rgb: 255, 255, 255;
--ion-color-success-shade: #28ba62;
--ion-color-success-tint: #42d77d;
/** warning **/
--ion-color-warning: #ffc409;
--ion-color-warning-rgb: 255, 196, 9;
--ion-color-warning-contrast: #000000;
--ion-color-warning-contrast-rgb: 0, 0, 0;
--ion-color-warning-shade: #e0ac08;
--ion-color-warning-tint: #ffca22;
/** danger **/
--ion-color-danger: #eb445a;
--ion-color-danger-rgb: 235, 68, 90;
--ion-color-danger-contrast: #ffffff;
--ion-color-danger-contrast-rgb: 255, 255, 255;
--ion-color-danger-shade: #cf3c4f;
--ion-color-danger-tint: #ed576b;
/** dark **/
--ion-color-dark: #222428;
--ion-color-dark-rgb: 34, 36, 40;
--ion-color-dark-contrast: #ffffff;
--ion-color-dark-contrast-rgb: 255, 255, 255;
--ion-color-dark-shade: #1e2023;
--ion-color-dark-tint: #383a3e;
/** medium **/
--ion-color-medium: #92949c;
--ion-color-medium-rgb: 146, 148, 156;
--ion-color-medium-contrast: #ffffff;
--ion-color-medium-contrast-rgb: 255, 255, 255;
--ion-color-medium-shade: #808289;
--ion-color-medium-tint: #9d9fa6;
/** light **/
--ion-color-light: #f4f5f8;
--ion-color-light-rgb: 244, 245, 248;
--ion-color-light-contrast: #000000;
--ion-color-light-contrast-rgb: 0, 0, 0;
--ion-color-light-shade: #d7d8da;
--ion-color-light-tint: #f5f6f9;
}
}