Compare commits

...

2 Commits

Author SHA1 Message Date
louiscklaw
e4b6c5e92d update profile example, 2025-06-06 14:11:26 +08:00
louiscklaw
03782cde24 update ordering app, 2025-06-06 14:07:30 +08:00
13 changed files with 517 additions and 98 deletions

View File

@@ -1,28 +1,26 @@
import { IonCard, IonCardSubtitle, IonCardTitle, IonCol } from "@ionic/react";
import { ArrowRightSquare } from "react-iconly";
import { IonCard, IonCardSubtitle, IonCardTitle, IonCol } from '@ionic/react';
import { ArrowRightSquare } from 'react-iconly';
import styles from "./CoffeeCard.module.css";
const CoffeeCard = props => {
import styles from './CoffeeCard.module.css';
const CoffeeCard = (props) => {
const { coffee } = props;
return (
<IonCol size="6" className="animate__animated animate__fadeIn">
<IonCard className={ styles.coffeeCard } routerLink={ `/coffee/${ coffee.id }` }>
<img src={ coffee.image } alt="coffee" />
<IonCardTitle>{ coffee.name }</IonCardTitle>
<IonCardSubtitle>{ coffee.summary }</IonCardSubtitle>
<div className={ styles.coffeePrice }>
<h4>${ coffee.price }</h4>
<div className={ styles.coffeeAddButton }>
<IonCard className={styles.coffeeCard} routerLink={`/coffee/${coffee.id}`}>
<img src={coffee.image} alt="coffee" />
<IonCardTitle>{coffee.name}</IonCardTitle>
<IonCardSubtitle>{coffee.summary}</IonCardSubtitle>
<div className={styles.coffeePrice}>
<h4>${coffee.price}</h4>
<div className={styles.coffeeAddButton}>
<ArrowRightSquare set="bold" className="yellow-icon" />
</div>
</div>
</IonCard>
</IonCol>
);
}
};
export default CoffeeCard;

View File

@@ -1,64 +1,63 @@
import { IonButton, IonCard, IonCardSubtitle, IonCardTitle, IonCol, IonRow } from "@ionic/react";
import { IonButton, IonCard, IonCardSubtitle, IonCardTitle, IonCol, IonRow } from '@ionic/react';
import { useRef } from "react";
import { Bag } from "react-iconly";
import { addToCart } from "../store/CartStore";
import '../pages/Home.css';
const ViewCoffeeCard = props => {
import { useRef } from 'react';
import { Bag } from 'react-iconly';
import { addToCart } from '../store/CartStore';
import '../pages/Home.scss';
const ViewCoffeeCard = (props) => {
const { coffee, cartRef } = props;
const coffeeCartRef = useRef();
const addCoffeeToCart = (e, coffeeID) => {
e.preventDefault();
e.stopPropagation();
coffeeCartRef.current.style.display = "";
coffeeCartRef.current.classList.add("animate__fadeOutUp");
coffeeCartRef.current.style.display = '';
coffeeCartRef.current.classList.add('animate__fadeOutUp');
setTimeout(() => {
cartRef.current.classList.add("animate__tada");
cartRef.current.classList.add('animate__tada');
addToCart(coffeeID);
setTimeout(() => {
cartRef.current.classList.remove("animate__tada");
coffeeCartRef.current.style.display = "none";
cartRef.current.classList.remove('animate__tada');
coffeeCartRef.current.style.display = 'none';
}, 500);
}, 500);
}
};
return (
<IonRow key={ coffee.id } className="animate__animated animate__fadeIn">
<IonRow key={coffee.id} className="animate__animated animate__fadeIn">
<IonCol size="6">
<IonCard className="coffee-card">
<img src={ coffee.image } alt="coffee type" />
<IonCardTitle className="custom-margin-left">{ coffee.name }</IonCardTitle>
<IonCardSubtitle className="custom-margin-left">{ coffee.summary }</IonCardSubtitle>
<img src={coffee.image} alt="coffee type" />
<IonCardTitle className="custom-margin-left">{coffee.name}</IonCardTitle>
<IonCardSubtitle className="custom-margin-left">{coffee.summary}</IonCardSubtitle>
</IonCard>
</IonCol>
<IonCol size="6" className="ion-margin-top ion-padding-top ion-padding-end">
<IonCardSubtitle>Description</IonCardSubtitle>
<p>{ coffee.description }</p>
<p>{coffee.description}</p>
<IonRow className="ion-justify-content-between">
<IonCol size="8">
<IonButton routerLink={ `/coffee/${ coffee.id }`} color="main" expand="block">View &rarr;</IonButton>
<IonButton routerLink={`/coffee/${coffee.id}`} color="main" expand="block">
View &rarr;
</IonButton>
</IonCol>
<IonCol size="4">
<IonButton color="main" expand="block" onClick={ e => addCoffeeToCart(e, coffee.id) }>
<IonButton color="main" expand="block" onClick={(e) => addCoffeeToCart(e, coffee.id)}>
<Bag set="bold" />
</IonButton>
<div ref={ coffeeCartRef } style={{ position: "absolute", display: "none", fontSize: "3rem" }} className="animate__animated">
<div
ref={coffeeCartRef}
style={{ position: 'absolute', display: 'none', fontSize: '3rem' }}
className="animate__animated"
>
<Bag set="bold" />
</div>
</IonCol>
@@ -66,6 +65,6 @@ const ViewCoffeeCard = props => {
</IonCol>
</IonRow>
);
}
};
export default ViewCoffeeCard;

View File

@@ -18,7 +18,7 @@ import { useEffect, useRef, useState } from 'react';
import ViewCoffeeCard from '../components/ViewCoffeeCard';
import { CartStore, CoffeeStore, FavouriteStore } from '../store';
import { getCartCoffees, getCoffees, getFavouriteCoffees } from '../store/Selectors';
import './Home.css';
import './Home.scss';
const Favourites = (): React.JSX.Element => {
const cartRef = useRef(null);

View File

@@ -22,7 +22,7 @@ import { CoffeeSizeStore, CoffeeStore, FavouriteStore } from '../store';
import { addToCart } from '../store/CartStore';
import { addToFavourites } from '../store/FavouriteStore';
import { getCoffee, getCoffeeSizes, getFavouriteCoffees } from '../store/Selectors';
import './Home.css';
import './Home.scss';
import styles from './ViewCoffee.module.css';

View File

@@ -20,7 +20,7 @@ import { useParams } from 'react-router';
import ViewCoffeeCard from '../components/ViewCoffeeCard';
import { CartStore, CoffeeStore } from '../store';
import { getCoffees, getCartCoffees } from '../store/Selectors';
import './Home.css';
import './Home.scss';
const ViewCoffees = (props): React.JSX.Element => {
const router = useIonRouter();

View File

@@ -0,0 +1,26 @@
.figure {
padding: 1rem;
}
.figure h6 {
font-size: 1.5rem;
font-weight: 200;
}
.figure p {
color: rgb(255, 255, 255);
font-size: 0.9rem;
font-weight: 200;
}
.figure:nth-child(1) {
background-color: rgb(157, 163, 141);
}
.figure:nth-child(2) {
background-color: rgb(150, 155, 138);
}
.figure:nth-child(3) {
background-color: rgb(135, 143, 120);
}

View File

@@ -0,0 +1,9 @@
import { IonCol } from '@ionic/react';
import styles from './Figure.module.scss';
export const Figure = (props): React.JSX.Element => (
<IonCol size="4" className={styles.figure}>
<h6>{props.count}</h6>
<p>{props.title}</p>
</IonCol>
);

View File

@@ -0,0 +1,55 @@
.post {
border-bottom: 1px solid rgb(219, 219, 219);
padding-top: 1rem;
padding-bottom: 0.2rem;
p {
font-size: 0.9rem;
padding: 0 !important;
margin: 0 !important;
}
.postText {
color: rgb(107, 112, 97);
}
}
.postAvatar {
height: 3.5rem;
width: 3.5rem;
margin-right: 1rem;
border: 3px solid rgba(218, 223, 208, 1);
}
.postInfo {
display: flex;
flex-direction: row;
justify-content: space-between;
padding-right: 1rem;
color: rgb(190, 190, 190);
}
.postReactions {
display: flex;
justify-content: space-between;
padding-right: 1rem;
margin-top: 0.5rem;
color: rgb(107, 112, 97);
.postReaction {
display: flex;
align-items: center;
justify-content: space-between;
font-size: 0.9rem;
ion-icon {
margin-right: 0.5rem;
}
p {
padding: 0;
margin: 0;
font-size: 0.8rem;
}
}
}

View File

@@ -0,0 +1,35 @@
import { IonAvatar, IonIcon, IonItem, IonLabel } from '@ionic/react';
import { chatbubbleOutline, heart, heartOutline, shareSocialOutline } from 'ionicons/icons';
import styles from './Post.module.scss';
export const Post = (props): React.JSX.Element => (
<div className={styles.post}>
<IonItem lines="none">
<IonAvatar className={styles.postAvatar}>
<img src="https://pbs.twimg.com/profile_images/1349059994747076610/8dWvipvu_400x400.jpg" />
</IonAvatar>
<IonLabel className="ion-text-wrap">
<div className={styles.postInfo}>
<p>{props.post.date}</p>
<p>@93alan</p>
</div>
<p className={styles.postText}>{props.post.text}</p>
<div className={styles.postReactions}>
<div className={styles.postReaction}>
<IonIcon icon={chatbubbleOutline} />
<p>{props.post.comments}</p>
</div>
<div className={styles.postReaction}>
<IonIcon icon={props.post.liked ? heart : heartOutline} />
<p>{props.post.likes}</p>
</div>
<div className={styles.postReaction}>
<IonIcon icon={shareSocialOutline} />
</div>
</div>
</IonLabel>
</IonItem>
</div>
);

View File

@@ -1,28 +1,25 @@
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 Tab1 from './AppPages/Tab1';
// import Tab2 from './AppPages/Tab2';
import './style.scss';
import Home from './pages/Home';
function DemoProfileExample() {
function DemoProfileExample(): React.JSX.Element {
return (
<IonTabs>
<IonTabs className="demo-profile-example">
<IonRouterOutlet>
<Route exact path="/demo-profile-example/tab1">
<Tab1 />
</Route>
<Route exact path="/demo-profile-example/tab2">
<Tab2 />
<Route exact path="/demo-profile-example/home">
<Home />
</Route>
<Redirect exact path="/demo-profile-example" to="/demo-profile-example/tab1" />
<Redirect exact path="/demo-profile-example" to="/demo-profile-example/home" />
</IonRouterOutlet>
{/* */}
{/*
<IonTabBar slot="bottom">
<IonTabButton tab="tab1" href="/demo-profile-example/tab1">
<IonIcon icon={cloudOutline} />
@@ -33,6 +30,7 @@ function DemoProfileExample() {
<IonLabel>Search</IonLabel>
</IonTabButton>
</IonTabBar>
*/}
</IonTabs>
);
}

View File

@@ -0,0 +1,90 @@
$main-color: rgb(143, 149, 130);
.page {
ion-toolbar {
--background: rgb(143, 149, 130) !important;
--color: white;
--border-style: none;
margin: 0 !important;
}
}
.top {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
align-content: center;
background-color: rgb(143, 149, 130);
color: white;
padding-bottom: 1rem;
}
.figures {
text-align: center;
background-color: rgb(143, 149, 130);
color: white;
p,
h6 {
padding: 0;
margin: 0;
}
}
.profileHeader {
ion-card-subtitle,
ion-card-title {
--color: white;
}
ion-card-title {
font-size: 1.3rem;
}
ion-card-subtitle {
--color: rgb(202, 211, 189);
}
}
.avatar {
width: 7rem;
height: 7rem;
border: 5px solid rgba(218, 223, 208, 0.4);
}
.avatarUpload {
display: flex;
flex-direction: row;
justify-content: center;
background-color: rgb(255, 255, 255);
border: 3px solid rgba(218, 223, 208, 0.4);
color: rgb(80, 80, 80);
position: absolute;
padding: 0.3rem;
font-size: 1.1rem;
border-radius: 500px;
margin-top: -2.2rem;
margin-left: 5rem;
}
.postActions {
display: flex;
flex-direction: row;
align-content: center;
align-items: center;
justify-content: space-between;
padding: 0.2rem;
padding-left: 1.3rem;
padding-right: 1.3rem;
color: rgb(149, 149, 149);
font-size: 0.9rem;
border-bottom: 1px solid rgba(218, 223, 208, 1);
background-color: rgba(218, 223, 208, 0.4);
ion-icon {
font-size: 1.2rem;
}
}

View File

@@ -0,0 +1,130 @@
import {
IonAvatar,
IonButton,
IonButtons,
IonCardSubtitle,
IonCardTitle,
IonCol,
IonContent,
IonGrid,
IonHeader,
IonIcon,
IonList,
IonPage,
IonRow,
IonToolbar,
useIonRouter,
} from '@ionic/react';
import styles from './Home.module.scss';
import {
arrowBackOutline,
cameraOutline,
chevronBackOutline,
filterOutline,
menuOutline,
} from 'ionicons/icons';
import { Figure } from '../components/Figure';
import { Post } from '../components/Post';
const Home = (): React.JSX.Element => {
const posts = [
{
date: 'Mar 30',
text: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
comments: 13,
likes: 49,
liked: true,
},
{
date: 'Mar 28',
text: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
comments: 1,
likes: 9,
},
{
date: 'Mar 25',
text: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
comments: 119,
likes: 483,
},
{
date: 'Mar 23',
text: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
comments: 27,
likes: 78,
},
];
const router = useIonRouter();
function handleBackClick() {
router.goBack();
}
return (
<IonPage className={styles.page}>
<IonHeader className="ion-no-border">
<IonToolbar>
<IonButtons>
<IonButton color="light" slot="start" onClick={() => handleBackClick()}>
<IonIcon icon={arrowBackOutline} />
</IonButton>
</IonButtons>
<IonButtons slot="end">
<IonButton color="light" slot="end">
<IonIcon icon={menuOutline} />
</IonButton>
</IonButtons>
</IonToolbar>
</IonHeader>
<IonContent className={styles.content}>
<IonGrid className={styles.top}>
<IonRow>
<IonCol size="12">
<IonAvatar className={styles.avatar}>
<img src="https://pbs.twimg.com/profile_images/1349059994747076610/8dWvipvu_400x400.jpg" />
</IonAvatar>
<div className={styles.avatarUpload}>
<IonIcon icon={cameraOutline} />
</div>
</IonCol>
</IonRow>
<IonRow className={styles.profileHeader}>
<IonCol size="12" className="ion-text-center">
<IonCardTitle>Alan Montgomery</IonCardTitle>
<IonCardSubtitle>Mobile Team Lead</IonCardSubtitle>
</IonCol>
</IonRow>
</IonGrid>
<IonGrid className={`${styles.figures} ion-no-padding ion-no-margin`}>
<IonRow>
<Figure count="1,386" title="Posts" />
<Figure count="849" title="Followers" />
<Figure count="473" title="Following" />
</IonRow>
</IonGrid>
<IonGrid className="ion-no-padding">
<IonRow>
<IonCol size="12">
<div className={styles.postActions}>
<p>Posts by @93alan</p>
<IonIcon icon={filterOutline} />
</div>
</IonCol>
</IonRow>
<IonList>
{posts.map((post, index) => {
return <Post key={`post_${index}`} post={post} />;
})}
</IonList>
</IonGrid>
</IonContent>
</IonPage>
);
};
export default Home;

View File

@@ -0,0 +1,79 @@
.demo-profile-example {
/* 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;
}
}