Compare commits
25 Commits
7cc6d939f5
...
develop/mo
Author | SHA1 | Date | |
---|---|---|---|
![]() |
546fb72732 | ||
![]() |
4303704753 | ||
![]() |
4bb213ef0c | ||
![]() |
657c652657 | ||
![]() |
5be77aae23 | ||
![]() |
ffbe63e421 | ||
![]() |
ba1e718039 | ||
![]() |
8b32d153db | ||
![]() |
d3e554b218 | ||
![]() |
5b10977a64 | ||
![]() |
a40b0fa4b1 | ||
![]() |
a4692a7d1f | ||
![]() |
c3f680aa22 | ||
![]() |
5b680f2219 | ||
![]() |
d3d95469ea | ||
![]() |
04eaf91d60 | ||
![]() |
be571ba4db | ||
![]() |
a6d549b2e8 | ||
![]() |
beb1e0ae68 | ||
![]() |
b2adcff61b | ||
![]() |
8200e0d902 | ||
![]() |
731cb7500e | ||
![]() |
d6c87e33f0 | ||
![]() |
e4b6c5e92d | ||
![]() |
03782cde24 |
@@ -14,9 +14,9 @@ import {
|
||||
|
||||
import { Geolocation } from '@capacitor/geolocation';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { SkeletonDashboard } from '../components/SkeletonDashboard';
|
||||
import { SkeletonDashboard } from '../TestComponents/SkeletonDashboard';
|
||||
import { chevronBackOutline, refreshOutline } from 'ionicons/icons';
|
||||
import { CurrentWeather } from '../components/CurrentWeather';
|
||||
import { CurrentWeather } from '../TestComponents/CurrentWeather';
|
||||
|
||||
function Tab1() {
|
||||
const router = useIonRouter();
|
||||
|
@@ -10,7 +10,7 @@ import {
|
||||
IonToolbar,
|
||||
} from '@ionic/react';
|
||||
import { useState } from 'react';
|
||||
import { CurrentWeather } from '../components/CurrentWeather';
|
||||
import { CurrentWeather } from '../TestComponents/CurrentWeather';
|
||||
|
||||
function Tab2() {
|
||||
const [search, setSearch] = useState('');
|
||||
|
@@ -0,0 +1,5 @@
|
||||
.keypad {
|
||||
bottom: 0;
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
}
|
118
03_source/mobile/src/pages/Demo2FaExample/components/Keypad.tsx
Normal file
118
03_source/mobile/src/pages/Demo2FaExample/components/Keypad.tsx
Normal file
@@ -0,0 +1,118 @@
|
||||
import { IonRow } from "@ionic/react";
|
||||
import styles from "./Keypad.module.scss";
|
||||
import KeypadButton from "./KeypadButton";
|
||||
|
||||
const Keypad = (props: any): JSX.Element => {
|
||||
const { activeIndex, handleClick, handleRemove, amount, correct } = props;
|
||||
|
||||
const keypadButtons = [
|
||||
[
|
||||
{
|
||||
value: "1",
|
||||
handleClick: () => handleClick(activeIndex, 1),
|
||||
small: false,
|
||||
remove: false,
|
||||
},
|
||||
{
|
||||
value: "2",
|
||||
handleClick: () => handleClick(activeIndex, 2),
|
||||
small: false,
|
||||
remove: false,
|
||||
},
|
||||
{
|
||||
value: "3",
|
||||
handleClick: () => handleClick(activeIndex, 3),
|
||||
small: false,
|
||||
remove: false,
|
||||
},
|
||||
],
|
||||
[
|
||||
{
|
||||
value: "4",
|
||||
handleClick: () => handleClick(activeIndex, 4),
|
||||
small: false,
|
||||
remove: false,
|
||||
},
|
||||
{
|
||||
value: "5",
|
||||
handleClick: () => handleClick(activeIndex, 5),
|
||||
small: false,
|
||||
remove: false,
|
||||
},
|
||||
{
|
||||
value: "6",
|
||||
handleClick: () => handleClick(activeIndex, 6),
|
||||
small: false,
|
||||
remove: false,
|
||||
},
|
||||
],
|
||||
[
|
||||
{
|
||||
value: "7",
|
||||
handleClick: () => handleClick(activeIndex, 7),
|
||||
small: false,
|
||||
remove: false,
|
||||
},
|
||||
{
|
||||
value: "8",
|
||||
handleClick: () => handleClick(activeIndex, 8),
|
||||
small: false,
|
||||
remove: false,
|
||||
},
|
||||
{
|
||||
value: "9",
|
||||
handleClick: () => handleClick(activeIndex, 9),
|
||||
small: false,
|
||||
remove: false,
|
||||
},
|
||||
],
|
||||
[
|
||||
{
|
||||
value: "Resend",
|
||||
handleClick: () => handleClick(activeIndex, 1),
|
||||
small: true,
|
||||
remove: false,
|
||||
},
|
||||
{
|
||||
value: "0",
|
||||
handleClick: () => handleClick(activeIndex, 2),
|
||||
small: false,
|
||||
remove: false,
|
||||
},
|
||||
{
|
||||
value: "",
|
||||
handleClick: () => handleRemove(),
|
||||
small: true,
|
||||
remove: true,
|
||||
},
|
||||
],
|
||||
];
|
||||
|
||||
return (
|
||||
<div className={`${styles.keypad}`}>
|
||||
{keypadButtons.map((keypadRow, index) => {
|
||||
const isDisabled = parseInt(activeIndex) === parseInt(amount);
|
||||
|
||||
return (
|
||||
<IonRow key={`keypadRow_${index}`}>
|
||||
{keypadRow.map((button, index2) => {
|
||||
return (
|
||||
<KeypadButton
|
||||
correct={correct}
|
||||
isDisabled={isDisabled}
|
||||
key={`keypadButton_${index2}`}
|
||||
value={button.value}
|
||||
handleClick={button.handleClick}
|
||||
small={button.small}
|
||||
remove={button.remove}
|
||||
/>
|
||||
);
|
||||
})}
|
||||
</IonRow>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default Keypad;
|
@@ -0,0 +1,30 @@
|
||||
.logo {
|
||||
height: 4rem;
|
||||
width: auto;
|
||||
}
|
||||
|
||||
.keypadButton {
|
||||
--background: none;
|
||||
--color: black;
|
||||
font-size: 2rem;
|
||||
font-weight: 700;
|
||||
--outline: none;
|
||||
--border: none;
|
||||
--box-shadow: none;
|
||||
padding: none;
|
||||
margin: none;
|
||||
--background-hover: rgb(245, 245, 245) !important;
|
||||
--background-focused: rgb(245, 245, 245) !important;
|
||||
--background-activated: rgb(245, 245, 245) !important;
|
||||
}
|
||||
|
||||
.smallKeypadButton {
|
||||
font-size: 1.4rem;
|
||||
margin-top: 1rem;
|
||||
}
|
||||
|
||||
.keypad {
|
||||
bottom: 0;
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
}
|
@@ -0,0 +1,31 @@
|
||||
import { IonButton, IonCol, IonIcon } from "@ionic/react";
|
||||
import { backspaceOutline } from "ionicons/icons";
|
||||
import styles from "./KeypadButton.module.scss";
|
||||
|
||||
const KeypadButton = (props: any): JSX.Element => {
|
||||
const {
|
||||
small,
|
||||
value,
|
||||
remove,
|
||||
handleClick,
|
||||
isDisabled = false,
|
||||
correct,
|
||||
} = props;
|
||||
|
||||
return (
|
||||
<IonCol size="4" className={styles.keypadButton}>
|
||||
<IonButton
|
||||
disabled={(!small || correct) && isDisabled}
|
||||
className={`${styles.keypadButton} ${
|
||||
small && styles.smallKeypadButton
|
||||
}`}
|
||||
onClick={handleClick}
|
||||
>
|
||||
{!remove && value}
|
||||
{remove && <IonIcon icon={backspaceOutline} />}
|
||||
</IonButton>
|
||||
</IonCol>
|
||||
);
|
||||
};
|
||||
|
||||
export default KeypadButton;
|
@@ -0,0 +1,38 @@
|
||||
.keypadInput {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: center;
|
||||
align-content: center;
|
||||
align-items: center;
|
||||
font-size: 2.5rem;
|
||||
width: 100%;
|
||||
min-height: 2.5rem;
|
||||
background-color: rgb(245, 245, 245);
|
||||
border-radius: 4px;
|
||||
color: rgb(207, 207, 207);
|
||||
transition: 0.2s linear;
|
||||
}
|
||||
|
||||
.active {
|
||||
background-color: rgba(26, 150, 251, 0.2);
|
||||
border: 0 !important;
|
||||
color: white !important;
|
||||
transition: 0.2s linear;
|
||||
}
|
||||
|
||||
.filled {
|
||||
color: rgb(151, 151, 151);
|
||||
transition: 0.2s linear;
|
||||
}
|
||||
|
||||
.incorrect {
|
||||
background-color: rgba(251, 26, 26, 0.2);
|
||||
color: rgb(218, 67, 67);
|
||||
transition: 0.2s linear;
|
||||
}
|
||||
|
||||
.correct {
|
||||
background-color: rgba(26, 251, 120, 0.2);
|
||||
color: rgb(67, 218, 112);
|
||||
transition: 0.2s linear;
|
||||
}
|
@@ -0,0 +1,28 @@
|
||||
import { IonCol } from "@ionic/react";
|
||||
import styles from "./KeypadInput.module.scss";
|
||||
|
||||
const KeypadInput = (props: any): JSX.Element => {
|
||||
const {
|
||||
value,
|
||||
isActive = false,
|
||||
isFilled = false,
|
||||
incorrect,
|
||||
correct,
|
||||
} = props;
|
||||
|
||||
return (
|
||||
<IonCol size="2">
|
||||
<div
|
||||
className={`${styles.keypadInput} ${isActive && styles.active} ${
|
||||
isFilled && styles.filled
|
||||
} ${incorrect && styles.incorrect} ${correct && styles.correct}`}
|
||||
onClick={props.handleChange}
|
||||
>
|
||||
{value}
|
||||
{!isFilled && "0"}
|
||||
</div>
|
||||
</IonCol>
|
||||
);
|
||||
};
|
||||
|
||||
export default KeypadInput;
|
@@ -0,0 +1,50 @@
|
||||
import { IonRow } from "@ionic/react";
|
||||
import { useEffect, useRef } from "react";
|
||||
import KeypadInput from "./KeypadInput";
|
||||
|
||||
const KeypadInputs = (props: any): JSX.Element => {
|
||||
const { values, activeIndex, incorrect, correct } = props;
|
||||
const keypadRef = useRef<HTMLIonRowElement>(null);
|
||||
|
||||
useEffect(() => {
|
||||
if (incorrect && keypadRef.current) {
|
||||
keypadRef.current.classList.add("incorrect");
|
||||
|
||||
setTimeout(() => {
|
||||
if (keypadRef.current) {
|
||||
keypadRef.current.classList.remove("incorrect");
|
||||
}
|
||||
}, 1000);
|
||||
}
|
||||
}, [incorrect]);
|
||||
|
||||
useEffect(() => {
|
||||
if (correct) {
|
||||
if (keypadRef.current) {
|
||||
keypadRef.current.classList.add("correct");
|
||||
}
|
||||
}
|
||||
}, [correct]);
|
||||
|
||||
return (
|
||||
<IonRow ref={keypadRef} className="ion-justify-content-center">
|
||||
{values.map((value: string, index: number) => {
|
||||
const isActive = parseInt(index.toString()) === parseInt(activeIndex);
|
||||
const isFilled = value !== "" ? true : false;
|
||||
|
||||
return (
|
||||
<KeypadInput
|
||||
correct={correct}
|
||||
incorrect={incorrect}
|
||||
isFilled={isFilled}
|
||||
isActive={isActive}
|
||||
value={value}
|
||||
placeholder="0"
|
||||
/>
|
||||
);
|
||||
})}
|
||||
</IonRow>
|
||||
);
|
||||
};
|
||||
|
||||
export default KeypadInputs;
|
@@ -1,38 +1,19 @@
|
||||
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 Home from './pages/Home';
|
||||
|
||||
function Demo2FaExample() {
|
||||
return (
|
||||
<IonTabs>
|
||||
<IonTabs className="demo-2fa-example">
|
||||
<IonRouterOutlet>
|
||||
<Route exact path="/demo-weather-app/tab1">
|
||||
<Tab1 />
|
||||
</Route>
|
||||
<Route exact path="/demo-weather-app/tab2">
|
||||
<Tab2 />
|
||||
<Route exact path="/demo-2fa-example/home">
|
||||
<Home />
|
||||
</Route>
|
||||
|
||||
<Redirect exact path="/demo-weather-app" to="/demo-weather-app/tab1" />
|
||||
<Redirect exact path="/demo-2fa-example" to="/demo-2fa-example/home" />
|
||||
</IonRouterOutlet>
|
||||
|
||||
{/* */}
|
||||
<IonTabBar slot="bottom">
|
||||
<IonTabButton tab="tab1" href="/demo-weather-app/tab1">
|
||||
<IonIcon icon={cloudOutline} />
|
||||
<IonLabel>Dashboard</IonLabel>
|
||||
</IonTabButton>
|
||||
<IonTabButton tab="tab2" href="/demo-weather-app/tab2">
|
||||
<IonIcon icon={searchOutline} />
|
||||
<IonLabel>Search</IonLabel>
|
||||
</IonTabButton>
|
||||
</IonTabBar>
|
||||
</IonTabs>
|
||||
);
|
||||
}
|
||||
|
@@ -0,0 +1,30 @@
|
||||
.logo {
|
||||
height: 4rem;
|
||||
width: auto;
|
||||
}
|
||||
|
||||
.incorrect {
|
||||
color: rgb(218, 67, 67);
|
||||
}
|
||||
|
||||
.successContainer {
|
||||
}
|
||||
|
||||
.successText {
|
||||
background-color: rgba(26, 251, 120, 0.2);
|
||||
color: rgb(67, 218, 112);
|
||||
padding: 1rem;
|
||||
}
|
||||
|
||||
.successContinue {
|
||||
font-weight: 700;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: center;
|
||||
align-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.successContinue ion-icon {
|
||||
margin-top: 0.2rem;
|
||||
}
|
135
03_source/mobile/src/pages/Demo2FaExample/pages/Home.tsx
Normal file
135
03_source/mobile/src/pages/Demo2FaExample/pages/Home.tsx
Normal file
@@ -0,0 +1,135 @@
|
||||
import {
|
||||
IonButton,
|
||||
IonButtons,
|
||||
IonCol,
|
||||
IonContent,
|
||||
IonGrid,
|
||||
IonHeader,
|
||||
IonIcon,
|
||||
IonImg,
|
||||
IonPage,
|
||||
IonRow,
|
||||
IonToolbar,
|
||||
useIonRouter,
|
||||
} from '@ionic/react';
|
||||
import { arrowForwardOutline, chevronBackOutline } from 'ionicons/icons';
|
||||
import styles from './Home.module.scss';
|
||||
import KeypadInputs from '../components/KeypadInputs';
|
||||
import Keypad from '../components/Keypad';
|
||||
import { JSX, useEffect, useRef, useState } from 'react';
|
||||
|
||||
const Home = (): JSX.Element => {
|
||||
const correctCode = [5, 9, 2, 5];
|
||||
const [keypadValues, setKeypadValues] = useState(['', '', '', '']);
|
||||
const [activeIndex, setActiveIndex] = useState(0);
|
||||
const successRef = useRef<HTMLIonRowElement>(null);
|
||||
|
||||
const [incorrect, setIncorrect] = useState(false);
|
||||
const [correct, setCorrect] = useState(false);
|
||||
|
||||
const tempValues: { [key: string]: any } = {};
|
||||
|
||||
const handleClick = (index: number, value: any) => {
|
||||
const stringKey = index.toString();
|
||||
tempValues[stringKey] = value;
|
||||
|
||||
setKeypadValues(value);
|
||||
setActiveIndex((activeIndex) => activeIndex + 1);
|
||||
};
|
||||
|
||||
const handleRemove = () => {
|
||||
const tempValues = [...keypadValues];
|
||||
tempValues[activeIndex - 1] = '';
|
||||
|
||||
setKeypadValues(tempValues);
|
||||
activeIndex > 0 && setActiveIndex((activeIndex) => activeIndex - 1);
|
||||
setIncorrect(false);
|
||||
setCorrect(false);
|
||||
};
|
||||
|
||||
const router = useIonRouter();
|
||||
function handleBackClick() {
|
||||
router.goBack();
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
if (parseInt(activeIndex.toString()) === parseInt(keypadValues.length.toString())) {
|
||||
var error = false;
|
||||
|
||||
keypadValues.forEach((value, index) => {
|
||||
if (parseInt(value) !== parseInt(correctCode[index].toString())) {
|
||||
error = true;
|
||||
return false;
|
||||
}
|
||||
});
|
||||
|
||||
if (error) {
|
||||
setIncorrect(true);
|
||||
} else {
|
||||
setCorrect(true);
|
||||
|
||||
setTimeout(() => {
|
||||
if (successRef.current) {
|
||||
successRef.current.classList.remove('hidden');
|
||||
successRef.current.classList.add('success');
|
||||
}
|
||||
}, 900);
|
||||
}
|
||||
}
|
||||
}, [activeIndex]);
|
||||
|
||||
return (
|
||||
<IonPage>
|
||||
<IonToolbar>
|
||||
<IonHeader></IonHeader>
|
||||
|
||||
<IonButtons slot="start">
|
||||
<IonButton shape={'round'} onClick={() => handleBackClick()}>
|
||||
<IonIcon icon={chevronBackOutline} color="primary" />
|
||||
</IonButton>
|
||||
</IonButtons>
|
||||
</IonToolbar>
|
||||
<IonContent fullscreen>
|
||||
<IonGrid className="ion-text-center ion-padding-top">
|
||||
<IonRow>
|
||||
<IonCol size="12">
|
||||
<IonImg src="/assets/icon/favicon.png" className={styles.logo} />
|
||||
<h1>Verification required</h1>
|
||||
<p>Enter your 4 digit verification code</p>
|
||||
</IonCol>
|
||||
</IonRow>
|
||||
|
||||
<IonRow ref={successRef} className="ion-justify-content-center hidden">
|
||||
<IonCol size="12" className={styles.successContainer}>
|
||||
<p className={styles.successText}>
|
||||
Awesome! You may continue.
|
||||
<br />
|
||||
<span className={styles.successContinue}>
|
||||
Continue
|
||||
<IonIcon icon={arrowForwardOutline} />
|
||||
</span>
|
||||
</p>
|
||||
</IonCol>
|
||||
</IonRow>
|
||||
|
||||
<KeypadInputs
|
||||
incorrect={incorrect}
|
||||
correct={correct}
|
||||
values={keypadValues}
|
||||
activeIndex={activeIndex}
|
||||
/>
|
||||
{incorrect && <p className={styles.incorrect}>Wrong code entered</p>}
|
||||
<Keypad
|
||||
handleRemove={handleRemove}
|
||||
handleClick={handleClick}
|
||||
activeIndex={activeIndex}
|
||||
amount={keypadValues.length}
|
||||
correct={correct}
|
||||
/>
|
||||
</IonGrid>
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default Home;
|
@@ -1,103 +0,0 @@
|
||||
#about-page {
|
||||
ion-toolbar {
|
||||
position: absolute;
|
||||
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
|
||||
--background: transparent;
|
||||
--color: white;
|
||||
}
|
||||
|
||||
ion-toolbar ion-back-button,
|
||||
ion-toolbar ion-button,
|
||||
ion-toolbar ion-menu-button {
|
||||
--color: white;
|
||||
}
|
||||
|
||||
.about-header {
|
||||
position: relative;
|
||||
|
||||
width: 100%;
|
||||
height: 30%;
|
||||
}
|
||||
|
||||
.about-header .about-image {
|
||||
position: absolute;
|
||||
|
||||
top: 0;
|
||||
left: 0;
|
||||
bottom: 0;
|
||||
right: 0;
|
||||
|
||||
background-position: center;
|
||||
background-size: cover;
|
||||
background-repeat: no-repeat;
|
||||
|
||||
opacity: 0;
|
||||
|
||||
transition: opacity 500ms ease-in-out;
|
||||
}
|
||||
|
||||
.about-header .madison {
|
||||
background-image: url('/assets/WeatherDemo/img/about/madison.jpg');
|
||||
}
|
||||
|
||||
.about-header .austin {
|
||||
background-image: url('/assets/WeatherDemo/img/about/austin.jpg');
|
||||
}
|
||||
|
||||
.about-header .chicago {
|
||||
background-image: url('/assets/WeatherDemo/img/about/chicago.jpg');
|
||||
}
|
||||
|
||||
.about-header .seattle {
|
||||
background-image: url('/assets/WeatherDemo/img/about/seattle.jpg');
|
||||
}
|
||||
|
||||
.about-info {
|
||||
position: relative;
|
||||
margin-top: -10px;
|
||||
border-radius: 10px;
|
||||
background: var(--ion-background-color, #fff);
|
||||
z-index: 2; // display rounded border above header image
|
||||
}
|
||||
|
||||
.about-info h3 {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
.about-info ion-list {
|
||||
padding-top: 0;
|
||||
}
|
||||
|
||||
.about-info p {
|
||||
line-height: 130%;
|
||||
|
||||
color: var(--ion-color-dark);
|
||||
}
|
||||
|
||||
.about-info ion-icon {
|
||||
margin-inline-end: 32px;
|
||||
}
|
||||
|
||||
/*
|
||||
* iOS Only
|
||||
*/
|
||||
|
||||
.ios .about-info {
|
||||
--ion-padding: 19px;
|
||||
}
|
||||
|
||||
.ios .about-info h3 {
|
||||
font-weight: 700;
|
||||
}
|
||||
}
|
||||
|
||||
#date-input-popover {
|
||||
--offset-y: -var(--ion-safe-area-bottom);
|
||||
|
||||
--max-width: 90%;
|
||||
--width: 336px;
|
||||
}
|
249
03_source/mobile/src/pages/Demo2FaExample/theme/variables.scss
Normal file
249
03_source/mobile/src/pages/Demo2FaExample/theme/variables.scss
Normal file
@@ -0,0 +1,249 @@
|
||||
.demo-2fa-example {
|
||||
/* Ionic Variables and Theming. For more info, please see:
|
||||
http://ionicframework.com/docs/theming/ */
|
||||
|
||||
* {
|
||||
font-family: 'Lato', sans-serif;
|
||||
}
|
||||
|
||||
.hidden {
|
||||
display: none;
|
||||
transition: 0.2s linear;
|
||||
}
|
||||
|
||||
/** 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;
|
||||
}
|
||||
|
||||
.incorrect {
|
||||
-webkit-animation: incorrect-animation 0.9s both;
|
||||
animation: incorrect-animation 0.9s both;
|
||||
}
|
||||
|
||||
@-webkit-keyframes incorrect-animation {
|
||||
0% {
|
||||
-webkit-transform: scale3d(1, 1, 1);
|
||||
transform: scale3d(1, 1, 1);
|
||||
}
|
||||
|
||||
30% {
|
||||
-webkit-transform: scale3d(1.25, 0.75, 1);
|
||||
transform: scale3d(1.25, 0.75, 1);
|
||||
}
|
||||
|
||||
40% {
|
||||
-webkit-transform: scale3d(0.75, 1.25, 1);
|
||||
transform: scale3d(0.75, 1.25, 1);
|
||||
}
|
||||
|
||||
50% {
|
||||
-webkit-transform: scale3d(1.15, 0.85, 1);
|
||||
transform: scale3d(1.15, 0.85, 1);
|
||||
}
|
||||
|
||||
65% {
|
||||
-webkit-transform: scale3d(0.95, 1.05, 1);
|
||||
transform: scale3d(0.95, 1.05, 1);
|
||||
}
|
||||
|
||||
75% {
|
||||
-webkit-transform: scale3d(1.05, 0.95, 1);
|
||||
transform: scale3d(1.05, 0.95, 1);
|
||||
}
|
||||
|
||||
100% {
|
||||
-webkit-transform: scale3d(1, 1, 1);
|
||||
transform: scale3d(1, 1, 1);
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes incorrect-animation {
|
||||
0% {
|
||||
-webkit-transform: scale3d(1, 1, 1);
|
||||
transform: scale3d(1, 1, 1);
|
||||
}
|
||||
|
||||
30% {
|
||||
-webkit-transform: scale3d(1.25, 0.75, 1);
|
||||
transform: scale3d(1.25, 0.75, 1);
|
||||
}
|
||||
|
||||
40% {
|
||||
-webkit-transform: scale3d(0.75, 1.25, 1);
|
||||
transform: scale3d(0.75, 1.25, 1);
|
||||
}
|
||||
|
||||
50% {
|
||||
-webkit-transform: scale3d(1.15, 0.85, 1);
|
||||
transform: scale3d(1.15, 0.85, 1);
|
||||
}
|
||||
|
||||
65% {
|
||||
-webkit-transform: scale3d(0.95, 1.05, 1);
|
||||
transform: scale3d(0.95, 1.05, 1);
|
||||
}
|
||||
|
||||
75% {
|
||||
-webkit-transform: scale3d(1.05, 0.95, 1);
|
||||
transform: scale3d(1.05, 0.95, 1);
|
||||
}
|
||||
|
||||
100% {
|
||||
-webkit-transform: scale3d(1, 1, 1);
|
||||
transform: scale3d(1, 1, 1);
|
||||
}
|
||||
}
|
||||
|
||||
.correct {
|
||||
-webkit-animation: correct-animation 1s ease-in both;
|
||||
animation: correct-animation 1s ease-in both;
|
||||
}
|
||||
|
||||
@-webkit-keyframes correct-animation {
|
||||
0% {
|
||||
-webkit-transform: translateY(0) rotateX(0) scale(1);
|
||||
transform: translateY(0) rotateX(0) scale(1);
|
||||
-webkit-transform-origin: 50% 1400px;
|
||||
transform-origin: 50% 1400px;
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
100% {
|
||||
-webkit-transform: translateY(-600px) rotateX(-30deg) scale(0);
|
||||
transform: translateY(-600px) rotateX(-30deg) scale(0);
|
||||
-webkit-transform-origin: 50% 100%;
|
||||
transform-origin: 50% 100%;
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes correct-animation {
|
||||
0% {
|
||||
-webkit-transform: translateY(0) rotateX(0) scale(1);
|
||||
transform: translateY(0) rotateX(0) scale(1);
|
||||
-webkit-transform-origin: 50% 1400px;
|
||||
transform-origin: 50% 1400px;
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
100% {
|
||||
-webkit-transform: translateY(-600px) rotateX(-30deg) scale(0);
|
||||
transform: translateY(-600px) rotateX(-30deg) scale(0);
|
||||
-webkit-transform-origin: 50% 100%;
|
||||
transform-origin: 50% 100%;
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
.success {
|
||||
-webkit-animation: success-animation 0.7s cubic-bezier(0.25, 0.46, 0.45, 0.94) both;
|
||||
animation: success-animation 0.7s cubic-bezier(0.25, 0.46, 0.45, 0.94) both;
|
||||
}
|
||||
|
||||
@-webkit-keyframes success-animation {
|
||||
0% {
|
||||
-webkit-transform: translateY(-600px) rotateX(-30deg) scale(0);
|
||||
transform: translateY(-600px) rotateX(-30deg) scale(0);
|
||||
-webkit-transform-origin: 50% 100%;
|
||||
transform-origin: 50% 100%;
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
100% {
|
||||
-webkit-transform: translateY(0) rotateX(0) scale(1);
|
||||
transform: translateY(0) rotateX(0) scale(1);
|
||||
-webkit-transform-origin: 50% 1400px;
|
||||
transform-origin: 50% 1400px;
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes success-animation {
|
||||
0% {
|
||||
-webkit-transform: translateY(-600px) rotateX(-30deg) scale(0);
|
||||
transform: translateY(-600px) rotateX(-30deg) scale(0);
|
||||
-webkit-transform-origin: 50% 100%;
|
||||
transform-origin: 50% 100%;
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
100% {
|
||||
-webkit-transform: translateY(0) rotateX(0) scale(1);
|
||||
transform: translateY(0) rotateX(0) scale(1);
|
||||
-webkit-transform-origin: 50% 1400px;
|
||||
transform-origin: 50% 1400px;
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
}
|
@@ -13,8 +13,9 @@ import {
|
||||
IonThumbnail,
|
||||
} from '@ionic/react';
|
||||
import { pulseOutline, sunnyOutline, thermometerOutline } from 'ionicons/icons';
|
||||
import React from 'react';
|
||||
|
||||
export const SkeletonDashboard = () => (
|
||||
export const SkeletonDashboard = (): React.JSX.Element => (
|
||||
<IonGrid>
|
||||
<IonCard>
|
||||
<IonCardContent className="ion-text-center">
|
||||
|
@@ -1,19 +1,19 @@
|
||||
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 Home from './pages/Home.jsx';
|
||||
import Home from './pages/Home';
|
||||
import Account from './pages/Account';
|
||||
import AddCard from './pages/AddCard';
|
||||
import AddTransaction from './pages/AddTransaction';
|
||||
|
||||
import './style.scss';
|
||||
import React from 'react';
|
||||
|
||||
function DemoBankingUi() {
|
||||
function DemoBankingUi(): React.JSX.Element {
|
||||
return (
|
||||
<IonTabs className="demo-banking-ui">
|
||||
<IonRouterOutlet>
|
||||
|
@@ -1,5 +1,17 @@
|
||||
import { useRef, useState } from 'react';
|
||||
import { IonButton, IonButtons, IonContent, IonGrid, IonHeader, IonIcon, IonPage, IonTitle, IonToolbar, useIonRouter, useIonViewDidEnter } from '@ionic/react';
|
||||
import {
|
||||
IonButton,
|
||||
IonButtons,
|
||||
IonContent,
|
||||
IonGrid,
|
||||
IonHeader,
|
||||
IonIcon,
|
||||
IonPage,
|
||||
IonTitle,
|
||||
IonToolbar,
|
||||
useIonRouter,
|
||||
useIonViewDidEnter,
|
||||
} from '@ionic/react';
|
||||
import styles from './Home.module.css';
|
||||
import { AccountStore } from '../data/AccountStore';
|
||||
import CardSlide from '../components/CardSlide';
|
||||
@@ -22,7 +34,7 @@ const Home = () => {
|
||||
const [mainColor, setMainColor] = useState(cards[0].color);
|
||||
const [slideSpace, setSlideSpace] = useState(10);
|
||||
|
||||
const slidesRef = useRef();
|
||||
const slidesRef = useRef(null);
|
||||
|
||||
useIonViewDidEnter(() => {
|
||||
setSlideSpace(0);
|
||||
@@ -38,7 +50,9 @@ const Home = () => {
|
||||
document.getElementById(`slide_${swiperIndex}_balance`).classList.add('animate__headShake');
|
||||
|
||||
setTimeout(() => {
|
||||
document.getElementById(`slide_${swiperIndex}_balance`).classList.remove('animate__headShake');
|
||||
document
|
||||
.getElementById(`slide_${swiperIndex}_balance`)
|
||||
.classList.remove('animate__headShake');
|
||||
}, 1000);
|
||||
};
|
||||
|
||||
@@ -47,9 +61,13 @@ const Home = () => {
|
||||
const swiperIndex = swiper.activeIndex;
|
||||
|
||||
if (touched) {
|
||||
document.getElementById(`slide_${swiperIndex}_transactions`).classList.add('animate__fadeOut');
|
||||
document
|
||||
.getElementById(`slide_${swiperIndex}_transactions`)
|
||||
.classList.add('animate__fadeOut');
|
||||
} else {
|
||||
document.getElementById(`slide_${swiperIndex}_transactions`).classList.remove('animate__fadeOut');
|
||||
document
|
||||
.getElementById(`slide_${swiperIndex}_transactions`)
|
||||
.classList.remove('animate__fadeOut');
|
||||
document.getElementById(`slide_${swiperIndex}_transactions`).classList.add('animate__fadeIn');
|
||||
}
|
||||
};
|
||||
@@ -70,7 +88,11 @@ const Home = () => {
|
||||
routerLink="/demo-banking-ui/account"
|
||||
className={stylesS.toolbarAvatar}
|
||||
>
|
||||
<img alt="toolbar avatar" className={stylesS.toolbarAvatarImage} src={profile.avatar} />
|
||||
<img
|
||||
alt="toolbar avatar"
|
||||
className={stylesS.toolbarAvatarImage}
|
||||
src={profile.avatar}
|
||||
/>
|
||||
</IonButton>
|
||||
</IonButtons>
|
||||
|
||||
@@ -82,7 +104,11 @@ const Home = () => {
|
||||
</IonButton>
|
||||
{/* */}
|
||||
<IonButton>
|
||||
<IonIcon color="light" icon={searchOutline} style={{ backgroundColor: mainColor, borderRadius: '500px', padding: '0.2rem' }} />
|
||||
<IonIcon
|
||||
color="light"
|
||||
icon={searchOutline}
|
||||
style={{ backgroundColor: mainColor, borderRadius: '500px', padding: '0.2rem' }}
|
||||
/>
|
||||
</IonButton>
|
||||
</IonButtons>
|
||||
</IonToolbar>
|
||||
@@ -101,7 +127,11 @@ const Home = () => {
|
||||
>
|
||||
{cards.map((card, index) => {
|
||||
return (
|
||||
<SwiperSlide key={`slide_${index}`} id={`slide_${index}`} className={stylesS.customSlide}>
|
||||
<SwiperSlide
|
||||
key={`slide_${index}`}
|
||||
id={`slide_${index}`}
|
||||
className={stylesS.customSlide}
|
||||
>
|
||||
<CardSlide key={index} card={card} profile={profile} index={index} />
|
||||
</SwiperSlide>
|
||||
);
|
||||
|
@@ -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";
|
||||
import styles from './CoffeeCard.module.css';
|
||||
|
||||
const CoffeeCard = props => {
|
||||
const CoffeeCard = (props) => {
|
||||
const { coffee } = 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}>
|
||||
<ArrowRightSquare set="bold" className="yellow-icon" />
|
||||
</div>
|
||||
</div>
|
||||
</IonCard>
|
||||
</IonCol>
|
||||
);
|
||||
};
|
||||
|
||||
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 }>
|
||||
<ArrowRightSquare set="bold" className="yellow-icon" />
|
||||
</div>
|
||||
</div>
|
||||
</IonCard>
|
||||
</IonCol>
|
||||
);
|
||||
}
|
||||
|
||||
export default CoffeeCard;
|
||||
export default CoffeeCard;
|
||||
|
@@ -1,71 +1,70 @@
|
||||
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';
|
||||
import { useRef } from 'react';
|
||||
import { Bag } from 'react-iconly';
|
||||
import { addToCart } from '../store/CartStore';
|
||||
import '../pages/Home.scss';
|
||||
|
||||
const ViewCoffeeCard = props => {
|
||||
const ViewCoffeeCard = (props) => {
|
||||
const { coffee, cartRef } = props;
|
||||
const coffeeCartRef = useRef();
|
||||
|
||||
const { coffee, cartRef } = props;
|
||||
const coffeeCartRef = useRef();
|
||||
const addCoffeeToCart = (e, coffeeID) => {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
|
||||
const addCoffeeToCart = (e, coffeeID) => {
|
||||
coffeeCartRef.current.style.display = '';
|
||||
coffeeCartRef.current.classList.add('animate__fadeOutUp');
|
||||
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
setTimeout(() => {
|
||||
cartRef.current.classList.add('animate__tada');
|
||||
addToCart(coffeeID);
|
||||
|
||||
coffeeCartRef.current.style.display = "";
|
||||
coffeeCartRef.current.classList.add("animate__fadeOutUp");
|
||||
setTimeout(() => {
|
||||
cartRef.current.classList.remove('animate__tada');
|
||||
coffeeCartRef.current.style.display = 'none';
|
||||
}, 500);
|
||||
}, 500);
|
||||
};
|
||||
|
||||
setTimeout(() => {
|
||||
return (
|
||||
<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>
|
||||
</IonCard>
|
||||
</IonCol>
|
||||
|
||||
cartRef.current.classList.add("animate__tada");
|
||||
addToCart(coffeeID);
|
||||
<IonCol size="6" className="ion-margin-top ion-padding-top ion-padding-end">
|
||||
<IonCardSubtitle>Description</IonCardSubtitle>
|
||||
<p>{coffee.description}</p>
|
||||
|
||||
setTimeout(() => {
|
||||
|
||||
cartRef.current.classList.remove("animate__tada");
|
||||
coffeeCartRef.current.style.display = "none";
|
||||
}, 500);
|
||||
}, 500);
|
||||
}
|
||||
<IonRow className="ion-justify-content-between">
|
||||
<IonCol size="8">
|
||||
<IonButton routerLink={`/coffee/${coffee.id}`} color="main" expand="block">
|
||||
View →
|
||||
</IonButton>
|
||||
</IonCol>
|
||||
|
||||
return (
|
||||
<IonCol size="4">
|
||||
<IonButton color="main" expand="block" onClick={(e) => addCoffeeToCart(e, coffee.id)}>
|
||||
<Bag set="bold" />
|
||||
</IonButton>
|
||||
|
||||
<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>
|
||||
</IonCard>
|
||||
</IonCol>
|
||||
|
||||
<IonCol size="6" className="ion-margin-top ion-padding-top ion-padding-end">
|
||||
<IonCardSubtitle>Description</IonCardSubtitle>
|
||||
<p>{ coffee.description }</p>
|
||||
|
||||
<IonRow className="ion-justify-content-between">
|
||||
<IonCol size="8">
|
||||
<IonButton routerLink={ `/coffee/${ coffee.id }`} color="main" expand="block">View →</IonButton>
|
||||
</IonCol>
|
||||
|
||||
<IonCol size="4">
|
||||
<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">
|
||||
<Bag set="bold" />
|
||||
</div>
|
||||
</IonCol>
|
||||
</IonRow>
|
||||
</IonCol>
|
||||
<div
|
||||
ref={coffeeCartRef}
|
||||
style={{ position: 'absolute', display: 'none', fontSize: '3rem' }}
|
||||
className="animate__animated"
|
||||
>
|
||||
<Bag set="bold" />
|
||||
</div>
|
||||
</IonCol>
|
||||
</IonRow>
|
||||
);
|
||||
}
|
||||
</IonCol>
|
||||
</IonRow>
|
||||
);
|
||||
};
|
||||
|
||||
export default ViewCoffeeCard;
|
||||
export default ViewCoffeeCard;
|
||||
|
@@ -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);
|
||||
|
@@ -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';
|
||||
|
||||
|
@@ -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();
|
||||
|
@@ -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);
|
||||
}
|
@@ -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>
|
||||
);
|
@@ -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;
|
||||
}
|
||||
}
|
||||
}
|
@@ -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>
|
||||
);
|
@@ -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>
|
||||
);
|
||||
}
|
||||
|
@@ -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;
|
||||
}
|
||||
}
|
130
03_source/mobile/src/pages/DemoProfileExample/pages/Home.tsx
Normal file
130
03_source/mobile/src/pages/DemoProfileExample/pages/Home.tsx
Normal 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;
|
@@ -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;
|
||||
}
|
||||
}
|
@@ -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>
|
||||
);
|
||||
};
|
@@ -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
|
||||
}
|
||||
];
|
@@ -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>
|
||||
|
@@ -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;
|
@@ -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;
|
@@ -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;
|
@@ -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));
|
@@ -0,0 +1 @@
|
||||
export { default as PeopleStore } from "./PeopleStore";
|
@@ -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;
|
||||
}
|
||||
}
|
@@ -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`,
|
||||
|
@@ -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">
|
||||
|
@@ -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;
|
||||
}
|
@@ -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;
|
@@ -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;
|
||||
}
|
@@ -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;
|
@@ -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>
|
||||
);
|
||||
}
|
||||
|
4
03_source/mobile/src/pages/DemoReactAddToCart/module.d.ts
vendored
Normal file
4
03_source/mobile/src/pages/DemoReactAddToCart/module.d.ts
vendored
Normal file
@@ -0,0 +1,4 @@
|
||||
declare module '*.module.css' {
|
||||
const classes: { readonly [key: string]: string };
|
||||
export default classes;
|
||||
}
|
19
03_source/mobile/src/pages/DemoReactAddToCart/pages/Home.css
Normal file
19
03_source/mobile/src/pages/DemoReactAddToCart/pages/Home.css
Normal 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;
|
||||
}
|
45
03_source/mobile/src/pages/DemoReactAddToCart/pages/Home.tsx
Normal file
45
03_source/mobile/src/pages/DemoReactAddToCart/pages/Home.tsx
Normal 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;
|
@@ -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',
|
||||
],
|
||||
},
|
||||
];
|
@@ -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 {
|
||||
|
@@ -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;
|
||||
}
|
||||
}
|
@@ -0,0 +1,20 @@
|
||||
.demo-react-calculator {
|
||||
.button,
|
||||
.specialButton {
|
||||
margin: 0.2rem;
|
||||
padding: 1.5rem;
|
||||
margin: 0.2rem;
|
||||
border-radius: 15px;
|
||||
font-size: 1.5rem;
|
||||
}
|
||||
|
||||
.button {
|
||||
color: rgb(255, 255, 255);
|
||||
background-color: rgb(58, 58, 58);
|
||||
}
|
||||
|
||||
.specialButton {
|
||||
color: rgb(255, 255, 255);
|
||||
background-color: var(--blue-color);
|
||||
}
|
||||
}
|
@@ -0,0 +1,17 @@
|
||||
import { IonCol } from '@ionic/react';
|
||||
import styles from './Button.module.scss';
|
||||
|
||||
const Button = (props): React.JSX.Element => {
|
||||
const { value, special, clickEvent } = props;
|
||||
|
||||
return (
|
||||
<IonCol
|
||||
className={`${special ? styles.specialButton : styles.button} animate__animated animate__faster`}
|
||||
onClick={(e) => clickEvent(e, value)}
|
||||
>
|
||||
{value === '/' ? <>÷</> : value === '*' ? <>×</> : value}
|
||||
</IonCol>
|
||||
);
|
||||
};
|
||||
|
||||
export default Button;
|
@@ -0,0 +1,4 @@
|
||||
.demo-react-calculator {
|
||||
.buttonRow {
|
||||
}
|
||||
}
|
@@ -0,0 +1,9 @@
|
||||
import { IonRow } from '@ionic/react';
|
||||
import styles from './ButtonRow.module.scss';
|
||||
import React from 'react';
|
||||
|
||||
const ButtonRow = (props): React.JSX.Element => {
|
||||
return <IonRow className={styles.buttonRow}>{props.children}</IonRow>;
|
||||
};
|
||||
|
||||
export default ButtonRow;
|
@@ -1,38 +1,21 @@
|
||||
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 './theme/variables.scss';
|
||||
import React from 'react';
|
||||
import Home from './pages/Home';
|
||||
|
||||
import './style.scss';
|
||||
|
||||
function DemoReactCalculator() {
|
||||
function DemoReactCalculator(): React.JSX.Element {
|
||||
return (
|
||||
<IonTabs>
|
||||
<IonTabs className="demo-react-calculator">
|
||||
<IonRouterOutlet>
|
||||
<Route exact path="/demo-react-calculator/tab1">
|
||||
<Tab1 />
|
||||
</Route>
|
||||
<Route exact path="/demo-react-calculator/tab2">
|
||||
<Tab2 />
|
||||
<Route exact path="/demo-react-calculator/home">
|
||||
<Home />
|
||||
</Route>
|
||||
|
||||
<Redirect exact path="/demo-react-calculator" to="/demo-react-calculator/tab1" />
|
||||
<Redirect exact path="/demo-react-calculator" to="/demo-react-calculator/home" />
|
||||
</IonRouterOutlet>
|
||||
|
||||
{/* */}
|
||||
<IonTabBar slot="bottom">
|
||||
<IonTabButton tab="tab1" href="/demo-react-calculator/tab1">
|
||||
<IonIcon icon={cloudOutline} />
|
||||
<IonLabel>Dashboard</IonLabel>
|
||||
</IonTabButton>
|
||||
<IonTabButton tab="tab2" href="/demo-react-calculator/tab2">
|
||||
<IonIcon icon={searchOutline} />
|
||||
<IonLabel>Search</IonLabel>
|
||||
</IonTabButton>
|
||||
</IonTabBar>
|
||||
</IonTabs>
|
||||
);
|
||||
}
|
||||
|
8
03_source/mobile/src/pages/DemoReactCalculator/module.d.ts
vendored
Normal file
8
03_source/mobile/src/pages/DemoReactCalculator/module.d.ts
vendored
Normal file
@@ -0,0 +1,8 @@
|
||||
declare module '*.module.css' {
|
||||
const classes: { readonly [key: string]: string };
|
||||
export default classes;
|
||||
}
|
||||
declare module '*.module.scss' {
|
||||
const classes: { readonly [key: string]: string };
|
||||
export default classes;
|
||||
}
|
@@ -0,0 +1,40 @@
|
||||
.calculatorContainer {
|
||||
padding-bottom: 2.5rem;
|
||||
background-color: white;
|
||||
padding-left: 1rem;
|
||||
padding-right: 1rem;
|
||||
}
|
||||
|
||||
.sumContainer {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-content: center;
|
||||
align-items: flex-end;
|
||||
padding-right: 2rem;
|
||||
margin-top: 2rem;
|
||||
|
||||
background-color: rgba(99, 158, 226, 0.1);
|
||||
padding: 2rem;
|
||||
padding-top: 4rem;
|
||||
padding-bottom: 4rem;
|
||||
}
|
||||
|
||||
.sumContainer h1,
|
||||
.sumContainer h4,
|
||||
.sumContainer p {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.sumContainer h1 {
|
||||
font-size: 4rem;
|
||||
}
|
||||
|
||||
.sumContainer p {
|
||||
font-size: 2rem;
|
||||
color: rgb(163, 163, 163);
|
||||
}
|
||||
|
||||
.sumContainer h4 {
|
||||
color: rgb(197, 197, 197);
|
||||
}
|
127
03_source/mobile/src/pages/DemoReactCalculator/pages/Home.tsx
Normal file
127
03_source/mobile/src/pages/DemoReactCalculator/pages/Home.tsx
Normal file
@@ -0,0 +1,127 @@
|
||||
import {
|
||||
IonButton,
|
||||
IonButtons,
|
||||
IonContent,
|
||||
IonFooter,
|
||||
IonGrid,
|
||||
IonHeader,
|
||||
IonIcon,
|
||||
IonPage,
|
||||
IonToolbar,
|
||||
useIonRouter,
|
||||
} from '@ionic/react';
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import Button from '../components/Button';
|
||||
import ButtonRow from '../components/ButtonRow';
|
||||
import styles from './Home.module.scss';
|
||||
|
||||
import {
|
||||
checkmarkOutline,
|
||||
chevronBackOutline,
|
||||
chevronDownCircleOutline,
|
||||
closeOutline,
|
||||
heart,
|
||||
languageOutline,
|
||||
menuOutline,
|
||||
} from 'ionicons/icons';
|
||||
|
||||
import { buttons } from '../utils/Buttons';
|
||||
|
||||
const Home = (): React.JSX.Element => {
|
||||
const [showTitle, setShowTitle] = useState('_______');
|
||||
const [sum, setSum] = useState('0');
|
||||
const [sumHistory, setSumHistory] = useState('Ionic Calculator');
|
||||
|
||||
const handleClick = (e, operator) => {
|
||||
const tempSumHistory = sumHistory.replace('Ionic Calculator', '');
|
||||
|
||||
if (operator === '=') {
|
||||
calculate();
|
||||
} else if (operator === 'C') {
|
||||
reset();
|
||||
} else if (operator === 'Del') {
|
||||
backspace();
|
||||
} else {
|
||||
setSumHistory(tempSumHistory + operator);
|
||||
|
||||
e.target.classList.add('animate__headShake');
|
||||
|
||||
setTimeout(() => {
|
||||
e.target.classList.remove('animate__headShake');
|
||||
}, 500);
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
calculate();
|
||||
}, [sumHistory]);
|
||||
|
||||
const calculate = () => {
|
||||
try {
|
||||
// eslint-disable-next-line no-eval
|
||||
setSum(eval(sumHistory).length > 5 ? eval(sumHistory).toFixed(4) : eval(sumHistory));
|
||||
setShowTitle('Ionic Calculator');
|
||||
} catch (e) {}
|
||||
};
|
||||
|
||||
const reset = () => {
|
||||
setSumHistory('Ionic Calculator');
|
||||
setSum('0');
|
||||
setShowTitle('_______');
|
||||
};
|
||||
|
||||
const backspace = () => {
|
||||
const tempSum = sumHistory.substr(0, sumHistory.length - 1);
|
||||
setSumHistory(tempSum);
|
||||
};
|
||||
|
||||
const router = useIonRouter();
|
||||
function handleBackClick() {
|
||||
router.goBack();
|
||||
}
|
||||
return (
|
||||
<IonPage>
|
||||
<IonHeader>
|
||||
<IonToolbar>
|
||||
<IonButtons slot="start">
|
||||
<IonButton onClick={() => handleBackClick()}>
|
||||
<IonIcon icon={chevronBackOutline} color="primary" />
|
||||
</IonButton>
|
||||
</IonButtons>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
<IonContent fullscreen>
|
||||
<div className={styles.sumContainer}>
|
||||
{showTitle && <h4>{showTitle}</h4>}
|
||||
<p>{sumHistory}</p>
|
||||
<h1 className="animate__animated animate__headShake">
|
||||
{sum.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')}
|
||||
</h1>
|
||||
</div>
|
||||
</IonContent>
|
||||
|
||||
<IonFooter className={styles.calculatorContainer}>
|
||||
<IonGrid className="ion-text-center ion-justify-content-center">
|
||||
{buttons.map((buttonRow, index) => {
|
||||
return (
|
||||
<ButtonRow key={index}>
|
||||
{buttonRow.map((button) => {
|
||||
return (
|
||||
<Button
|
||||
key={button.value}
|
||||
value={button.value}
|
||||
special={button.special}
|
||||
clickEvent={handleClick}
|
||||
/>
|
||||
);
|
||||
})}
|
||||
</ButtonRow>
|
||||
);
|
||||
})}
|
||||
</IonGrid>
|
||||
</IonFooter>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default Home;
|
@@ -1,103 +0,0 @@
|
||||
#about-page {
|
||||
ion-toolbar {
|
||||
position: absolute;
|
||||
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
|
||||
--background: transparent;
|
||||
--color: white;
|
||||
}
|
||||
|
||||
ion-toolbar ion-back-button,
|
||||
ion-toolbar ion-button,
|
||||
ion-toolbar ion-menu-button {
|
||||
--color: white;
|
||||
}
|
||||
|
||||
.about-header {
|
||||
position: relative;
|
||||
|
||||
width: 100%;
|
||||
height: 30%;
|
||||
}
|
||||
|
||||
.about-header .about-image {
|
||||
position: absolute;
|
||||
|
||||
top: 0;
|
||||
left: 0;
|
||||
bottom: 0;
|
||||
right: 0;
|
||||
|
||||
background-position: center;
|
||||
background-size: cover;
|
||||
background-repeat: no-repeat;
|
||||
|
||||
opacity: 0;
|
||||
|
||||
transition: opacity 500ms ease-in-out;
|
||||
}
|
||||
|
||||
.about-header .madison {
|
||||
background-image: url('/assets/WeatherDemo/img/about/madison.jpg');
|
||||
}
|
||||
|
||||
.about-header .austin {
|
||||
background-image: url('/assets/WeatherDemo/img/about/austin.jpg');
|
||||
}
|
||||
|
||||
.about-header .chicago {
|
||||
background-image: url('/assets/WeatherDemo/img/about/chicago.jpg');
|
||||
}
|
||||
|
||||
.about-header .seattle {
|
||||
background-image: url('/assets/WeatherDemo/img/about/seattle.jpg');
|
||||
}
|
||||
|
||||
.about-info {
|
||||
position: relative;
|
||||
margin-top: -10px;
|
||||
border-radius: 10px;
|
||||
background: var(--ion-background-color, #fff);
|
||||
z-index: 2; // display rounded border above header image
|
||||
}
|
||||
|
||||
.about-info h3 {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
.about-info ion-list {
|
||||
padding-top: 0;
|
||||
}
|
||||
|
||||
.about-info p {
|
||||
line-height: 130%;
|
||||
|
||||
color: var(--ion-color-dark);
|
||||
}
|
||||
|
||||
.about-info ion-icon {
|
||||
margin-inline-end: 32px;
|
||||
}
|
||||
|
||||
/*
|
||||
* iOS Only
|
||||
*/
|
||||
|
||||
.ios .about-info {
|
||||
--ion-padding: 19px;
|
||||
}
|
||||
|
||||
.ios .about-info h3 {
|
||||
font-weight: 700;
|
||||
}
|
||||
}
|
||||
|
||||
#date-input-popover {
|
||||
--offset-y: -var(--ion-safe-area-bottom);
|
||||
|
||||
--max-width: 90%;
|
||||
--width: 336px;
|
||||
}
|
@@ -0,0 +1,83 @@
|
||||
.demo-react-calculator {
|
||||
/* 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;
|
||||
}
|
||||
|
||||
:root {
|
||||
--blue-color: rgb(99, 158, 226);
|
||||
}
|
||||
}
|
@@ -0,0 +1,32 @@
|
||||
export const buttons = [
|
||||
[
|
||||
{ value: 'C', special: true },
|
||||
{ value: '(', special: true },
|
||||
{ value: ')', special: true },
|
||||
{ value: '+', special: true },
|
||||
],
|
||||
[
|
||||
{ value: '7', special: false },
|
||||
{ value: '8', special: false },
|
||||
{ value: '9', special: false },
|
||||
{ value: '-', special: true },
|
||||
],
|
||||
[
|
||||
{ value: '4', special: false },
|
||||
{ value: '5', special: false },
|
||||
{ value: '6', special: false },
|
||||
{ value: '*', special: true },
|
||||
],
|
||||
[
|
||||
{ value: '1', special: false },
|
||||
{ value: '2', special: false },
|
||||
{ value: '3', special: false },
|
||||
{ value: '/', special: true },
|
||||
],
|
||||
[
|
||||
{ value: 'Del', special: true },
|
||||
{ value: '0', special: false },
|
||||
{ value: '.', special: false },
|
||||
{ value: '=', special: true },
|
||||
],
|
||||
];
|
@@ -0,0 +1,24 @@
|
||||
.container {
|
||||
text-align: center;
|
||||
position: absolute;
|
||||
left: 0;
|
||||
right: 0;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
}
|
||||
|
||||
.container strong {
|
||||
font-size: 20px;
|
||||
line-height: 26px;
|
||||
}
|
||||
|
||||
.container p {
|
||||
font-size: 16px;
|
||||
line-height: 22px;
|
||||
color: #8c8c8c;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.container a {
|
||||
text-decoration: none;
|
||||
}
|
@@ -0,0 +1,23 @@
|
||||
import './ExploreContainer.scss';
|
||||
|
||||
interface ContainerProps {}
|
||||
|
||||
const ExploreContainer: React.FC<ContainerProps> = () => {
|
||||
return (
|
||||
<div className="container">
|
||||
<strong>Ready to create an app?</strong>
|
||||
<p>
|
||||
Start with Ionic{' '}
|
||||
<a
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
href="https://ionicframework.com/docs/components"
|
||||
>
|
||||
UI Components
|
||||
</a>
|
||||
</p>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default ExploreContainer;
|
@@ -1,38 +1,19 @@
|
||||
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 Home from './pages/Home';
|
||||
|
||||
function DemoReactDrawingCanvas() {
|
||||
return (
|
||||
<IonTabs>
|
||||
<IonRouterOutlet>
|
||||
<Route exact path="/demo-react-drawing-canvas/tab1">
|
||||
<Tab1 />
|
||||
</Route>
|
||||
<Route exact path="/demo-react-drawing-canvas/tab2">
|
||||
<Tab2 />
|
||||
<Route exact path="/demo-react-drawing-canvas/home">
|
||||
<Home />
|
||||
</Route>
|
||||
|
||||
<Redirect exact path="/demo-react-drawing-canvas" to="/demo-react-drawing-canvas/tab1" />
|
||||
<Redirect exact path="/demo-react-drawing-canvas" to="/demo-react-drawing-canvas/home" />
|
||||
</IonRouterOutlet>
|
||||
|
||||
{/* */}
|
||||
<IonTabBar slot="bottom">
|
||||
<IonTabButton tab="tab1" href="/demo-react-drawing-canvas/tab1">
|
||||
<IonIcon icon={cloudOutline} />
|
||||
<IonLabel>Dashboard</IonLabel>
|
||||
</IonTabButton>
|
||||
<IonTabButton tab="tab2" href="/demo-react-drawing-canvas/tab2">
|
||||
<IonIcon icon={searchOutline} />
|
||||
<IonLabel>Search</IonLabel>
|
||||
</IonTabButton>
|
||||
</IonTabBar>
|
||||
</IonTabs>
|
||||
);
|
||||
}
|
||||
|
9
03_source/mobile/src/pages/DemoReactDrawingCanvas/module.d.ts
vendored
Normal file
9
03_source/mobile/src/pages/DemoReactDrawingCanvas/module.d.ts
vendored
Normal file
@@ -0,0 +1,9 @@
|
||||
declare module '*.module.css' {
|
||||
const classes: { readonly [key: string]: string };
|
||||
export default classes;
|
||||
}
|
||||
|
||||
declare module '*.module.scss' {
|
||||
const classes: { readonly [key: string]: string };
|
||||
export default classes;
|
||||
}
|
@@ -0,0 +1,17 @@
|
||||
.canvasOptions {
|
||||
position: absolute;
|
||||
z-index: 99999;
|
||||
width: 100%;
|
||||
background-color: white !important;
|
||||
border-bottom: 1px solid rgb(230, 230, 230);
|
||||
}
|
||||
|
||||
.fixed {
|
||||
position: fixed;
|
||||
background-color: white;
|
||||
border-bottom: 1px solid rgb(204, 204, 204);
|
||||
}
|
||||
|
||||
.picker {
|
||||
width: 100% !important;
|
||||
}
|
114
03_source/mobile/src/pages/DemoReactDrawingCanvas/pages/Home.tsx
Normal file
114
03_source/mobile/src/pages/DemoReactDrawingCanvas/pages/Home.tsx
Normal file
@@ -0,0 +1,114 @@
|
||||
import {
|
||||
IonIcon,
|
||||
IonItem,
|
||||
IonLabel,
|
||||
IonInput,
|
||||
IonButton,
|
||||
IonCol,
|
||||
IonContent,
|
||||
IonGrid,
|
||||
IonHeader,
|
||||
IonPage,
|
||||
IonRow,
|
||||
IonTitle,
|
||||
IonToolbar,
|
||||
Platform,
|
||||
IonButtons,
|
||||
useIonRouter,
|
||||
} from '@ionic/react';
|
||||
import { arrowUndoOutline, brushOutline, chevronBackOutline, closeOutline } from 'ionicons/icons';
|
||||
import React, { useState } from 'react';
|
||||
import styles from './Home.module.scss';
|
||||
|
||||
import CanvasDraw from 'react-canvas-draw';
|
||||
import { SwatchesPicker } from 'react-color';
|
||||
|
||||
const Home = (): React.JSX.Element => {
|
||||
var canvasRef = '';
|
||||
const [brushColor, setBrushColor] = useState('#000000');
|
||||
const [brushSize, setBrushSize] = useState(5);
|
||||
const [showColorPicker, setShowColorPicker] = useState(false);
|
||||
|
||||
const handleColorChange = (colorValue) => {
|
||||
setBrushColor(colorValue.hex);
|
||||
};
|
||||
|
||||
const router = useIonRouter();
|
||||
function handleBackClick() {
|
||||
router.goBack();
|
||||
}
|
||||
|
||||
return (
|
||||
<IonPage>
|
||||
<IonHeader>
|
||||
<IonToolbar>
|
||||
<IonTitle>Ionic Drawing Canvas</IonTitle>
|
||||
<IonButtons slot="start">
|
||||
<IonButton onClick={() => handleBackClick()}>
|
||||
<IonIcon icon={chevronBackOutline} color="primary" />
|
||||
</IonButton>
|
||||
</IonButtons>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
<IonContent fullscreen>
|
||||
<div className={styles.canvasOptions}>
|
||||
<IonGrid className={styles.fixed}>
|
||||
<IonRow>
|
||||
<IonCol size={showColorPicker ? '12' : '2'}>
|
||||
<IonButton
|
||||
style={{ backgroundColor: brushColor }}
|
||||
color={brushColor}
|
||||
expand="block"
|
||||
onClick={() => setShowColorPicker(!showColorPicker)}
|
||||
>
|
||||
<IonIcon icon={brushOutline} />
|
||||
</IonButton>
|
||||
|
||||
{showColorPicker && (
|
||||
<SwatchesPicker onChange={handleColorChange} className={styles.picker} />
|
||||
)}
|
||||
</IonCol>
|
||||
|
||||
{!showColorPicker && (
|
||||
<>
|
||||
<IonCol size="4">
|
||||
<IonItem lines="none">
|
||||
<IonLabel position="inset">Size</IonLabel>
|
||||
<IonInput
|
||||
type="number"
|
||||
value={brushSize}
|
||||
onIonChange={(e) => setBrushSize(parseInt(e.target.value))}
|
||||
/>
|
||||
</IonItem>
|
||||
</IonCol>
|
||||
|
||||
<IonCol size="3">
|
||||
<IonButton expand="full" color="primary" onClick={() => canvasRef.undo()}>
|
||||
<IonIcon icon={arrowUndoOutline} />
|
||||
</IonButton>
|
||||
</IonCol>
|
||||
|
||||
<IonCol size="3">
|
||||
<IonButton expand="full" color="primary" onClick={() => canvasRef.clear()}>
|
||||
<IonIcon icon={closeOutline} />
|
||||
</IonButton>
|
||||
</IonCol>
|
||||
</>
|
||||
)}
|
||||
</IonRow>
|
||||
</IonGrid>
|
||||
</div>
|
||||
<CanvasDraw
|
||||
brushRadius={brushSize}
|
||||
lazyRadius={0}
|
||||
canvasHeight={window.innerHeight}
|
||||
canvasWidth={window.innerWidth}
|
||||
brushColor={brushColor}
|
||||
ref={(canvasDraw) => (canvasRef = canvasDraw)}
|
||||
/>
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default Home;
|
@@ -1,103 +0,0 @@
|
||||
#about-page {
|
||||
ion-toolbar {
|
||||
position: absolute;
|
||||
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
|
||||
--background: transparent;
|
||||
--color: white;
|
||||
}
|
||||
|
||||
ion-toolbar ion-back-button,
|
||||
ion-toolbar ion-button,
|
||||
ion-toolbar ion-menu-button {
|
||||
--color: white;
|
||||
}
|
||||
|
||||
.about-header {
|
||||
position: relative;
|
||||
|
||||
width: 100%;
|
||||
height: 30%;
|
||||
}
|
||||
|
||||
.about-header .about-image {
|
||||
position: absolute;
|
||||
|
||||
top: 0;
|
||||
left: 0;
|
||||
bottom: 0;
|
||||
right: 0;
|
||||
|
||||
background-position: center;
|
||||
background-size: cover;
|
||||
background-repeat: no-repeat;
|
||||
|
||||
opacity: 0;
|
||||
|
||||
transition: opacity 500ms ease-in-out;
|
||||
}
|
||||
|
||||
.about-header .madison {
|
||||
background-image: url('/assets/WeatherDemo/img/about/madison.jpg');
|
||||
}
|
||||
|
||||
.about-header .austin {
|
||||
background-image: url('/assets/WeatherDemo/img/about/austin.jpg');
|
||||
}
|
||||
|
||||
.about-header .chicago {
|
||||
background-image: url('/assets/WeatherDemo/img/about/chicago.jpg');
|
||||
}
|
||||
|
||||
.about-header .seattle {
|
||||
background-image: url('/assets/WeatherDemo/img/about/seattle.jpg');
|
||||
}
|
||||
|
||||
.about-info {
|
||||
position: relative;
|
||||
margin-top: -10px;
|
||||
border-radius: 10px;
|
||||
background: var(--ion-background-color, #fff);
|
||||
z-index: 2; // display rounded border above header image
|
||||
}
|
||||
|
||||
.about-info h3 {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
.about-info ion-list {
|
||||
padding-top: 0;
|
||||
}
|
||||
|
||||
.about-info p {
|
||||
line-height: 130%;
|
||||
|
||||
color: var(--ion-color-dark);
|
||||
}
|
||||
|
||||
.about-info ion-icon {
|
||||
margin-inline-end: 32px;
|
||||
}
|
||||
|
||||
/*
|
||||
* iOS Only
|
||||
*/
|
||||
|
||||
.ios .about-info {
|
||||
--ion-padding: 19px;
|
||||
}
|
||||
|
||||
.ios .about-info h3 {
|
||||
font-weight: 700;
|
||||
}
|
||||
}
|
||||
|
||||
#date-input-popover {
|
||||
--offset-y: -var(--ion-safe-area-bottom);
|
||||
|
||||
--max-width: 90%;
|
||||
--width: 336px;
|
||||
}
|
@@ -0,0 +1,79 @@
|
||||
.demo-react-drawing-canvas {
|
||||
/* 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;
|
||||
}
|
||||
}
|
@@ -1,30 +1,31 @@
|
||||
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 DemoReactHookFormExample() {
|
||||
return (
|
||||
<IonTabs>
|
||||
<IonTabs className="demo-react-hook-form-example">
|
||||
<IonRouterOutlet>
|
||||
<Route exact path="/demo-react-hook-form-example/tab1">
|
||||
<Tab1 />
|
||||
</Route>
|
||||
<Route exact path="/demo-react-hook-form-example/tab2">
|
||||
<Tab2 />
|
||||
<Route exact path="/demo-react-hook-form-example/home">
|
||||
<Home />
|
||||
</Route>
|
||||
|
||||
<Redirect exact path="/demo-react-hook-form-example" to="/demo-react-hook-form-example/tab1" />
|
||||
<Redirect
|
||||
exact
|
||||
path="/demo-react-hook-form-example"
|
||||
to="/demo-react-hook-form-example/home"
|
||||
/>
|
||||
</IonRouterOutlet>
|
||||
|
||||
{/* */}
|
||||
{/*
|
||||
<IonTabBar slot="bottom">
|
||||
<IonTabButton tab="tab1" href="/demo-react-hook-form-example/tab1">
|
||||
<IonTabButton tab="tab1" href="/demo-react-hook-form-example/home">
|
||||
<IonIcon icon={cloudOutline} />
|
||||
<IonLabel>Dashboard</IonLabel>
|
||||
</IonTabButton>
|
||||
@@ -33,6 +34,7 @@ function DemoReactHookFormExample() {
|
||||
<IonLabel>Search</IonLabel>
|
||||
</IonTabButton>
|
||||
</IonTabBar>
|
||||
*/}
|
||||
</IonTabs>
|
||||
);
|
||||
}
|
||||
|
9
03_source/mobile/src/pages/DemoReactHookFormExample/module.d.ts
vendored
Normal file
9
03_source/mobile/src/pages/DemoReactHookFormExample/module.d.ts
vendored
Normal file
@@ -0,0 +1,9 @@
|
||||
declare module '*.module.css' {
|
||||
const classes: { readonly [key: string]: string };
|
||||
export default classes;
|
||||
}
|
||||
|
||||
declare module '*.module.scss' {
|
||||
const classes: { readonly [key: string]: string };
|
||||
export default classes;
|
||||
}
|
@@ -0,0 +1,126 @@
|
||||
import {
|
||||
IonButton,
|
||||
IonButtons,
|
||||
IonCardSubtitle,
|
||||
IonContent,
|
||||
IonHeader,
|
||||
IonIcon,
|
||||
IonInput,
|
||||
IonItem,
|
||||
IonLabel,
|
||||
IonPage,
|
||||
IonTitle,
|
||||
IonToolbar,
|
||||
useIonRouter,
|
||||
} from '@ionic/react';
|
||||
import './Home.scss';
|
||||
import { useForm } from 'react-hook-form';
|
||||
|
||||
import { alertCircleOutline, chevronBackOutline } from 'ionicons/icons';
|
||||
import React from 'react';
|
||||
|
||||
const Home = (): React.JSX.Element => {
|
||||
const {
|
||||
register,
|
||||
handleSubmit,
|
||||
formState: { errors },
|
||||
} = useForm({
|
||||
mode: 'onTouched',
|
||||
reValidateMode: 'onChange',
|
||||
});
|
||||
|
||||
const fields = [
|
||||
{
|
||||
label: 'Firstname',
|
||||
required: true,
|
||||
requiredOptions: {
|
||||
maxLength: 10,
|
||||
},
|
||||
props: {
|
||||
name: 'firstname',
|
||||
type: 'text',
|
||||
placeholder: 'Enter a username',
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
label: 'Age',
|
||||
required: true,
|
||||
requiredOptions: {
|
||||
min: 18,
|
||||
max: 99,
|
||||
},
|
||||
props: {
|
||||
name: 'age',
|
||||
type: 'number',
|
||||
inputmode: 'numeric',
|
||||
placeholder: 'Enter your age',
|
||||
},
|
||||
},
|
||||
];
|
||||
|
||||
console.log(errors);
|
||||
|
||||
const onSubmit = (data) => {
|
||||
console.log(data);
|
||||
};
|
||||
|
||||
const router = useIonRouter();
|
||||
function handleBackClick() {
|
||||
router.goBack();
|
||||
}
|
||||
|
||||
return (
|
||||
<IonPage>
|
||||
<IonHeader>
|
||||
<IonToolbar>
|
||||
<IonTitle>React Hook Form</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">React Hook Form</IonTitle>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
|
||||
<IonCardSubtitle className="ion-text-center ion-margin">
|
||||
An example using React Hook Form
|
||||
</IonCardSubtitle>
|
||||
|
||||
<form onSubmit={handleSubmit(onSubmit)}>
|
||||
{fields.map((field, index) => {
|
||||
const { label, required, requiredOptions, props } = field;
|
||||
|
||||
return (
|
||||
<IonItem key={`form_field_${index}`} lines="full">
|
||||
<>
|
||||
<IonLabel position="fixed">{label}</IonLabel>
|
||||
<IonInput
|
||||
{...props}
|
||||
{...register(props.name, { required, ...requiredOptions })}
|
||||
/>
|
||||
</>
|
||||
{required && errors[props.name] && (
|
||||
<IonIcon icon={alertCircleOutline} color="danger" />
|
||||
)}
|
||||
</IonItem>
|
||||
);
|
||||
})}
|
||||
|
||||
<IonButton type="submit" className="ion-margin-top" expand="full">
|
||||
Submit
|
||||
</IonButton>
|
||||
</form>
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default Home;
|
@@ -0,0 +1,79 @@
|
||||
.demo-react-hook-form-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;
|
||||
}
|
||||
}
|
@@ -0,0 +1,98 @@
|
||||
.demo-react-item-list {
|
||||
/* Ionic Variables and Theming. For more info, please see:
|
||||
http://ionicframework.com/docs/theming/ */
|
||||
|
||||
* {
|
||||
font-family: 'Poppins', sans-serif;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
text-rendering: optimizeLegibility;
|
||||
-webkit-font-feature-settings: 'calt' on;
|
||||
font-feature-settings: 'calt' on;
|
||||
-webkit-tap-highlight-color: rgba(0, 0, 0, 0) !important;
|
||||
-webkit-text-size-adjust: 100%;
|
||||
}
|
||||
|
||||
/** 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;
|
||||
}
|
||||
|
||||
input.searchbar-input {
|
||||
padding-top: 1.5rem !important;
|
||||
padding-bottom: 1.5rem !important;
|
||||
}
|
||||
|
||||
ion-searchbar ion-icon {
|
||||
margin-top: 0.4rem;
|
||||
}
|
||||
}
|
@@ -0,0 +1,24 @@
|
||||
.container {
|
||||
text-align: center;
|
||||
position: absolute;
|
||||
left: 0;
|
||||
right: 0;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
}
|
||||
|
||||
.container strong {
|
||||
font-size: 20px;
|
||||
line-height: 26px;
|
||||
}
|
||||
|
||||
.container p {
|
||||
font-size: 16px;
|
||||
line-height: 22px;
|
||||
color: #8c8c8c;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.container a {
|
||||
text-decoration: none;
|
||||
}
|
@@ -0,0 +1,16 @@
|
||||
import './ExploreContainer.css';
|
||||
|
||||
interface ContainerProps {
|
||||
name: string;
|
||||
}
|
||||
|
||||
const ExploreContainer: React.FC<ContainerProps> = ({ name }) => {
|
||||
return (
|
||||
<div className="container">
|
||||
<strong>{name}</strong>
|
||||
<p>Explore <a target="_blank" rel="noopener noreferrer" href="https://ionicframework.com/docs/components">UI Components</a></p>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default ExploreContainer;
|
@@ -0,0 +1,113 @@
|
||||
ion-menu ion-content {
|
||||
--background: var(--ion-item-background, var(--ion-background-color, #fff));
|
||||
}
|
||||
|
||||
ion-menu.md ion-content {
|
||||
--padding-start: 8px;
|
||||
--padding-end: 8px;
|
||||
--padding-top: 20px;
|
||||
--padding-bottom: 20px;
|
||||
}
|
||||
|
||||
ion-menu.md ion-list {
|
||||
padding: 20px 0;
|
||||
}
|
||||
|
||||
ion-menu.md ion-note {
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
|
||||
ion-menu.md ion-list-header, ion-menu.md ion-note {
|
||||
padding-left: 10px;
|
||||
}
|
||||
|
||||
ion-menu.md ion-list#inbox-list {
|
||||
border-bottom: 1px solid var(--ion-color-step-150, #d7d8da);
|
||||
}
|
||||
|
||||
ion-menu.md ion-list#inbox-list ion-list-header {
|
||||
font-size: 22px;
|
||||
font-weight: 600;
|
||||
min-height: 20px;
|
||||
}
|
||||
|
||||
ion-menu.md ion-list#labels-list ion-list-header {
|
||||
font-size: 16px;
|
||||
margin-bottom: 18px;
|
||||
color: #757575;
|
||||
min-height: 26px;
|
||||
}
|
||||
|
||||
ion-menu.md ion-item {
|
||||
--padding-start: 10px;
|
||||
--padding-end: 10px;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
ion-menu.md ion-item.selected {
|
||||
--background: rgba(var(--ion-color-primary-rgb), 0.14);
|
||||
}
|
||||
|
||||
ion-menu.md ion-item.selected ion-icon {
|
||||
color: var(--ion-color-primary);
|
||||
}
|
||||
|
||||
ion-menu.md ion-item ion-icon {
|
||||
color: #616e7e;
|
||||
}
|
||||
|
||||
ion-menu.md ion-item ion-label {
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
ion-menu.ios ion-content {
|
||||
--padding-bottom: 20px;
|
||||
}
|
||||
|
||||
ion-menu.ios ion-list {
|
||||
padding: 20px 0 0 0;
|
||||
}
|
||||
|
||||
ion-menu.ios ion-note {
|
||||
line-height: 24px;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
ion-menu.ios ion-item {
|
||||
--padding-start: 16px;
|
||||
--padding-end: 16px;
|
||||
--min-height: 50px;
|
||||
}
|
||||
|
||||
ion-menu.ios ion-item ion-icon {
|
||||
font-size: 24px;
|
||||
color: #73849a;
|
||||
}
|
||||
|
||||
ion-menu.ios ion-item .selected ion-icon {
|
||||
color: var(--ion-color-primary);
|
||||
}
|
||||
|
||||
ion-menu.ios ion-list#labels-list ion-list-header {
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
ion-menu.ios ion-list-header,
|
||||
ion-menu.ios ion-note {
|
||||
padding-left: 16px;
|
||||
padding-right: 16px;
|
||||
}
|
||||
|
||||
ion-menu.ios ion-note {
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
ion-note {
|
||||
display: inline-block;
|
||||
font-size: 16px;
|
||||
color: var(--ion-color-medium-shade);
|
||||
}
|
||||
|
||||
ion-item.selected {
|
||||
--color: var(--ion-color-primary);
|
||||
}
|
@@ -0,0 +1,100 @@
|
||||
import {
|
||||
IonContent,
|
||||
IonIcon,
|
||||
IonItem,
|
||||
IonLabel,
|
||||
IonList,
|
||||
IonListHeader,
|
||||
IonMenu,
|
||||
IonMenuToggle,
|
||||
IonNote,
|
||||
} from '@ionic/react';
|
||||
|
||||
import { useLocation } from 'react-router-dom';
|
||||
import { archiveOutline, archiveSharp, bookmarkOutline, heartOutline, heartSharp, mailOutline, mailSharp, paperPlaneOutline, paperPlaneSharp, trashOutline, trashSharp, warningOutline, warningSharp } from 'ionicons/icons';
|
||||
import './Menu.css';
|
||||
|
||||
interface AppPage {
|
||||
url: string;
|
||||
iosIcon: string;
|
||||
mdIcon: string;
|
||||
title: string;
|
||||
}
|
||||
|
||||
const appPages: AppPage[] = [
|
||||
{
|
||||
title: 'Inbox',
|
||||
url: '/page/Inbox',
|
||||
iosIcon: mailOutline,
|
||||
mdIcon: mailSharp
|
||||
},
|
||||
{
|
||||
title: 'Outbox',
|
||||
url: '/page/Outbox',
|
||||
iosIcon: paperPlaneOutline,
|
||||
mdIcon: paperPlaneSharp
|
||||
},
|
||||
{
|
||||
title: 'Favorites',
|
||||
url: '/page/Favorites',
|
||||
iosIcon: heartOutline,
|
||||
mdIcon: heartSharp
|
||||
},
|
||||
{
|
||||
title: 'Archived',
|
||||
url: '/page/Archived',
|
||||
iosIcon: archiveOutline,
|
||||
mdIcon: archiveSharp
|
||||
},
|
||||
{
|
||||
title: 'Trash',
|
||||
url: '/page/Trash',
|
||||
iosIcon: trashOutline,
|
||||
mdIcon: trashSharp
|
||||
},
|
||||
{
|
||||
title: 'Spam',
|
||||
url: '/page/Spam',
|
||||
iosIcon: warningOutline,
|
||||
mdIcon: warningSharp
|
||||
}
|
||||
];
|
||||
|
||||
const labels = ['Family', 'Friends', 'Notes', 'Work', 'Travel', 'Reminders'];
|
||||
|
||||
const Menu: React.FC = () => {
|
||||
const location = useLocation();
|
||||
|
||||
return (
|
||||
<IonMenu contentId="main" type="overlay">
|
||||
<IonContent>
|
||||
<IonList id="inbox-list">
|
||||
<IonListHeader>Inbox</IonListHeader>
|
||||
<IonNote>hi@ionicframework.com</IonNote>
|
||||
{appPages.map((appPage, index) => {
|
||||
return (
|
||||
<IonMenuToggle key={index} autoHide={false}>
|
||||
<IonItem className={location.pathname === appPage.url ? 'selected' : ''} routerLink={appPage.url} routerDirection="none" lines="none" detail={false}>
|
||||
<IonIcon slot="start" ios={appPage.iosIcon} md={appPage.mdIcon} />
|
||||
<IonLabel>{appPage.title}</IonLabel>
|
||||
</IonItem>
|
||||
</IonMenuToggle>
|
||||
);
|
||||
})}
|
||||
</IonList>
|
||||
|
||||
<IonList id="labels-list">
|
||||
<IonListHeader>Labels</IonListHeader>
|
||||
{labels.map((label, index) => (
|
||||
<IonItem lines="none" key={index}>
|
||||
<IonIcon slot="start" icon={bookmarkOutline} />
|
||||
<IonLabel>{label}</IonLabel>
|
||||
</IonItem>
|
||||
))}
|
||||
</IonList>
|
||||
</IonContent>
|
||||
</IonMenu>
|
||||
);
|
||||
};
|
||||
|
||||
export default Menu;
|
@@ -7,22 +7,34 @@ import Tab1 from './AppPages/Tab1';
|
||||
import Tab2 from './AppPages/Tab2';
|
||||
|
||||
import './style.scss';
|
||||
import Page from './pages/Page';
|
||||
import Page2 from './pages/Page2';
|
||||
|
||||
function DemoReactLifecycles() {
|
||||
return (
|
||||
<IonTabs>
|
||||
<IonRouterOutlet>
|
||||
{/*
|
||||
<Route exact path="/demo-react-lifecycles/tab1">
|
||||
<Tab1 />
|
||||
</Route>
|
||||
<Route exact path="/demo-react-lifecycles/tab2">
|
||||
<Tab2 />
|
||||
</Route>
|
||||
*/}
|
||||
|
||||
<Redirect exact path="/demo-react-lifecycles" to="/demo-react-lifecycles/tab1" />
|
||||
<Route path="/demo-react-lifecycles/page/:name" exact={true}>
|
||||
<Page />
|
||||
</Route>
|
||||
|
||||
<Route path="/demo-react-lifecycles/page2" exact={true}>
|
||||
<Page2 />
|
||||
</Route>
|
||||
|
||||
<Redirect exact path="/demo-react-lifecycles" to="/demo-react-lifecycles/page/Inbox" />
|
||||
</IonRouterOutlet>
|
||||
|
||||
{/* */}
|
||||
{/*
|
||||
<IonTabBar slot="bottom">
|
||||
<IonTabButton tab="tab1" href="/demo-react-lifecycles/tab1">
|
||||
<IonIcon icon={cloudOutline} />
|
||||
@@ -33,6 +45,7 @@ function DemoReactLifecycles() {
|
||||
<IonLabel>Search</IonLabel>
|
||||
</IonTabButton>
|
||||
</IonTabBar>
|
||||
*/}
|
||||
</IonTabs>
|
||||
);
|
||||
}
|
||||
|
@@ -0,0 +1,63 @@
|
||||
import {
|
||||
IonButton,
|
||||
IonButtons,
|
||||
IonCol,
|
||||
IonContent,
|
||||
IonHeader,
|
||||
IonIcon,
|
||||
IonMenuButton,
|
||||
IonPage,
|
||||
IonRow,
|
||||
IonTitle,
|
||||
IonToolbar,
|
||||
useIonRouter,
|
||||
} from '@ionic/react';
|
||||
import { useParams } from 'react-router';
|
||||
import ExploreContainer from '../components/ExploreContainer';
|
||||
import './Page.css';
|
||||
import { chevronBackOutline } from 'ionicons/icons';
|
||||
|
||||
const Page: React.FC = () => {
|
||||
const { name } = useParams<{ name: string }>();
|
||||
|
||||
const router = useIonRouter();
|
||||
function handleBackClick() {
|
||||
router.goBack();
|
||||
}
|
||||
return (
|
||||
<IonPage>
|
||||
<IonHeader>
|
||||
<IonToolbar>
|
||||
<IonButtons slot="start">
|
||||
<IonMenuButton />
|
||||
</IonButtons>
|
||||
<IonTitle>{name}</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">{name}</IonTitle>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
|
||||
<IonRow className="ion-justify-content-center ion-text-center">
|
||||
<IonCol size="8">
|
||||
<IonButton routerLink="/demo-react-lifecycles/page2" routerDirection="forward">
|
||||
Navigate to Page 2
|
||||
</IonButton>
|
||||
</IonCol>
|
||||
</IonRow>
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default Page;
|
@@ -0,0 +1,64 @@
|
||||
import { IonBackButton, IonButtons, IonContent, IonHeader, IonMenuButton, IonPage, IonTitle, IonToolbar, useIonViewDidEnter, useIonViewDidLeave, useIonViewWillEnter, useIonViewWillLeave } from '@ionic/react';
|
||||
import { useEffect } from 'react';
|
||||
import { useParams } from 'react-router';
|
||||
import ExploreContainer from '../components/ExploreContainer';
|
||||
import './Page.css';
|
||||
|
||||
const Page2: React.FC = () => {
|
||||
|
||||
const { name } = useParams<{ name: string; }>();
|
||||
|
||||
useEffect(() => {
|
||||
|
||||
console.log("In useEffect");
|
||||
|
||||
return () => {
|
||||
|
||||
console.log("In useEffect cleanup");
|
||||
}
|
||||
}, []);
|
||||
|
||||
useIonViewWillEnter(() => {
|
||||
|
||||
console.log("In useIonViewWillEnter");
|
||||
});
|
||||
|
||||
useIonViewDidEnter(() => {
|
||||
|
||||
console.log("In useIonViewDidEnter");
|
||||
});
|
||||
|
||||
useIonViewWillLeave(() => {
|
||||
|
||||
console.log("In useIonViewWillLeave");
|
||||
});
|
||||
|
||||
useIonViewDidLeave(() => {
|
||||
|
||||
console.log("In useIonViewDidLeave");
|
||||
});
|
||||
|
||||
return (
|
||||
<IonPage>
|
||||
<IonHeader>
|
||||
<IonToolbar>
|
||||
<IonButtons slot="start">
|
||||
<IonBackButton />
|
||||
</IonButtons>
|
||||
<IonTitle>{name}</IonTitle>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
|
||||
<IonContent fullscreen>
|
||||
<IonHeader collapse="condense">
|
||||
<IonToolbar>
|
||||
<IonTitle size="large">{name}</IonTitle>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
<ExploreContainer name={name} />
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default Page2;
|
@@ -0,0 +1,236 @@
|
||||
/* 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;
|
||||
}
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
/*
|
||||
* Dark Colors
|
||||
* -------------------------------------------
|
||||
*/
|
||||
|
||||
body {
|
||||
--ion-color-primary: #428cff;
|
||||
--ion-color-primary-rgb: 66,140,255;
|
||||
--ion-color-primary-contrast: #ffffff;
|
||||
--ion-color-primary-contrast-rgb: 255,255,255;
|
||||
--ion-color-primary-shade: #3a7be0;
|
||||
--ion-color-primary-tint: #5598ff;
|
||||
|
||||
--ion-color-secondary: #50c8ff;
|
||||
--ion-color-secondary-rgb: 80,200,255;
|
||||
--ion-color-secondary-contrast: #ffffff;
|
||||
--ion-color-secondary-contrast-rgb: 255,255,255;
|
||||
--ion-color-secondary-shade: #46b0e0;
|
||||
--ion-color-secondary-tint: #62ceff;
|
||||
|
||||
--ion-color-tertiary: #6a64ff;
|
||||
--ion-color-tertiary-rgb: 106,100,255;
|
||||
--ion-color-tertiary-contrast: #ffffff;
|
||||
--ion-color-tertiary-contrast-rgb: 255,255,255;
|
||||
--ion-color-tertiary-shade: #5d58e0;
|
||||
--ion-color-tertiary-tint: #7974ff;
|
||||
|
||||
--ion-color-success: #2fdf75;
|
||||
--ion-color-success-rgb: 47,223,117;
|
||||
--ion-color-success-contrast: #000000;
|
||||
--ion-color-success-contrast-rgb: 0,0,0;
|
||||
--ion-color-success-shade: #29c467;
|
||||
--ion-color-success-tint: #44e283;
|
||||
|
||||
--ion-color-warning: #ffd534;
|
||||
--ion-color-warning-rgb: 255,213,52;
|
||||
--ion-color-warning-contrast: #000000;
|
||||
--ion-color-warning-contrast-rgb: 0,0,0;
|
||||
--ion-color-warning-shade: #e0bb2e;
|
||||
--ion-color-warning-tint: #ffd948;
|
||||
|
||||
--ion-color-danger: #ff4961;
|
||||
--ion-color-danger-rgb: 255,73,97;
|
||||
--ion-color-danger-contrast: #ffffff;
|
||||
--ion-color-danger-contrast-rgb: 255,255,255;
|
||||
--ion-color-danger-shade: #e04055;
|
||||
--ion-color-danger-tint: #ff5b71;
|
||||
|
||||
--ion-color-dark: #f4f5f8;
|
||||
--ion-color-dark-rgb: 244,245,248;
|
||||
--ion-color-dark-contrast: #000000;
|
||||
--ion-color-dark-contrast-rgb: 0,0,0;
|
||||
--ion-color-dark-shade: #d7d8da;
|
||||
--ion-color-dark-tint: #f5f6f9;
|
||||
|
||||
--ion-color-medium: #989aa2;
|
||||
--ion-color-medium-rgb: 152,154,162;
|
||||
--ion-color-medium-contrast: #000000;
|
||||
--ion-color-medium-contrast-rgb: 0,0,0;
|
||||
--ion-color-medium-shade: #86888f;
|
||||
--ion-color-medium-tint: #a2a4ab;
|
||||
|
||||
--ion-color-light: #222428;
|
||||
--ion-color-light-rgb: 34,36,40;
|
||||
--ion-color-light-contrast: #ffffff;
|
||||
--ion-color-light-contrast-rgb: 255,255,255;
|
||||
--ion-color-light-shade: #1e2023;
|
||||
--ion-color-light-tint: #383a3e;
|
||||
}
|
||||
|
||||
/*
|
||||
* iOS Dark Theme
|
||||
* -------------------------------------------
|
||||
*/
|
||||
|
||||
.ios body {
|
||||
--ion-background-color: #000000;
|
||||
--ion-background-color-rgb: 0,0,0;
|
||||
|
||||
--ion-text-color: #ffffff;
|
||||
--ion-text-color-rgb: 255,255,255;
|
||||
|
||||
--ion-color-step-50: #0d0d0d;
|
||||
--ion-color-step-100: #1a1a1a;
|
||||
--ion-color-step-150: #262626;
|
||||
--ion-color-step-200: #333333;
|
||||
--ion-color-step-250: #404040;
|
||||
--ion-color-step-300: #4d4d4d;
|
||||
--ion-color-step-350: #595959;
|
||||
--ion-color-step-400: #666666;
|
||||
--ion-color-step-450: #737373;
|
||||
--ion-color-step-500: #808080;
|
||||
--ion-color-step-550: #8c8c8c;
|
||||
--ion-color-step-600: #999999;
|
||||
--ion-color-step-650: #a6a6a6;
|
||||
--ion-color-step-700: #b3b3b3;
|
||||
--ion-color-step-750: #bfbfbf;
|
||||
--ion-color-step-800: #cccccc;
|
||||
--ion-color-step-850: #d9d9d9;
|
||||
--ion-color-step-900: #e6e6e6;
|
||||
--ion-color-step-950: #f2f2f2;
|
||||
|
||||
--ion-item-background: #000000;
|
||||
|
||||
--ion-card-background: #1c1c1d;
|
||||
}
|
||||
|
||||
.ios ion-modal {
|
||||
--ion-background-color: var(--ion-color-step-100);
|
||||
--ion-toolbar-background: var(--ion-color-step-150);
|
||||
--ion-toolbar-border-color: var(--ion-color-step-250);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Material Design Dark Theme
|
||||
* -------------------------------------------
|
||||
*/
|
||||
|
||||
.md body {
|
||||
--ion-background-color: #121212;
|
||||
--ion-background-color-rgb: 18,18,18;
|
||||
|
||||
--ion-text-color: #ffffff;
|
||||
--ion-text-color-rgb: 255,255,255;
|
||||
|
||||
--ion-border-color: #222222;
|
||||
|
||||
--ion-color-step-50: #1e1e1e;
|
||||
--ion-color-step-100: #2a2a2a;
|
||||
--ion-color-step-150: #363636;
|
||||
--ion-color-step-200: #414141;
|
||||
--ion-color-step-250: #4d4d4d;
|
||||
--ion-color-step-300: #595959;
|
||||
--ion-color-step-350: #656565;
|
||||
--ion-color-step-400: #717171;
|
||||
--ion-color-step-450: #7d7d7d;
|
||||
--ion-color-step-500: #898989;
|
||||
--ion-color-step-550: #949494;
|
||||
--ion-color-step-600: #a0a0a0;
|
||||
--ion-color-step-650: #acacac;
|
||||
--ion-color-step-700: #b8b8b8;
|
||||
--ion-color-step-750: #c4c4c4;
|
||||
--ion-color-step-800: #d0d0d0;
|
||||
--ion-color-step-850: #dbdbdb;
|
||||
--ion-color-step-900: #e7e7e7;
|
||||
--ion-color-step-950: #f3f3f3;
|
||||
|
||||
--ion-item-background: #1e1e1e;
|
||||
|
||||
--ion-toolbar-background: #1f1f1f;
|
||||
|
||||
--ion-tab-bar-background: #1f1f1f;
|
||||
|
||||
--ion-card-background: #1e1e1e;
|
||||
}
|
||||
}
|
@@ -0,0 +1,43 @@
|
||||
.characterContainer {
|
||||
|
||||
position: relative;
|
||||
text-align: center;
|
||||
color: white;
|
||||
}
|
||||
|
||||
ion-item {
|
||||
--padding-start: 0;
|
||||
--inner-padding-end: 0;
|
||||
}
|
||||
|
||||
ion-label {
|
||||
margin-top: 12px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
.characterNameContainer {
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
align-content: center;
|
||||
position: absolute;
|
||||
z-index: 99999;
|
||||
background-color: rgba(0, 0, 0, 0.7);
|
||||
bottom: 0;
|
||||
width: 100%;
|
||||
padding-left: 1rem;
|
||||
padding-right: 1rem;
|
||||
}
|
||||
|
||||
.characterNameContainer ion-icon {
|
||||
|
||||
margin-top: 0.1rem;
|
||||
}
|
||||
|
||||
.characterNameContainer ion-label {
|
||||
|
||||
font-size: 1rem;
|
||||
font-weight: 500;
|
||||
}
|
@@ -0,0 +1,50 @@
|
||||
import { IonCol, IonIcon, IonImg, IonItem, IonLabel, IonSkeletonText } from "@ionic/react";
|
||||
import { chevronForwardOutline } from "ionicons/icons";
|
||||
import { Character } from "../../types";
|
||||
import styles from "./CharacterItem.module.scss";
|
||||
|
||||
interface Props {
|
||||
details: Character;
|
||||
load?: boolean;
|
||||
grid?: boolean;
|
||||
}
|
||||
|
||||
const CharacterItem = (props: Props): React.JSX.Element => {
|
||||
|
||||
const { details, load = false, grid = true } = props;
|
||||
const loadAmount = 20;
|
||||
|
||||
if (!load) {
|
||||
return (
|
||||
|
||||
<IonCol size={ grid ? "6" : "12" }>
|
||||
<IonItem detail={ false } routerLink={ `/character/${ details.id }` } lines="none" className={ styles.characterContainer }>
|
||||
<IonImg src={ grid ? `${ details.thumbnail.path }/standard_fantastic.${ details.thumbnail.extension }` : `${ details.thumbnail.path }.${ details.thumbnail.extension }` } />
|
||||
<div className={ styles.characterNameContainer }>
|
||||
<IonLabel>{ details.name }</IonLabel>
|
||||
<IonIcon icon={ chevronForwardOutline } />
|
||||
</div>
|
||||
</IonItem>
|
||||
</IonCol>
|
||||
);
|
||||
} else {
|
||||
|
||||
return (
|
||||
|
||||
<>
|
||||
{ Array.from({length: loadAmount }, (item, index) => {
|
||||
|
||||
return (
|
||||
<IonCol key={ `loading_${ index }`} size="6">
|
||||
<IonItem lines="none" className={ styles.characterContainer }>
|
||||
<IonSkeletonText animated style={{ width: "100%", height: "180px" }} />
|
||||
</IonItem>
|
||||
</IonCol>
|
||||
);
|
||||
})}
|
||||
</>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export default CharacterItem;
|
@@ -1,38 +1,31 @@
|
||||
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 './theme/variables.scss';
|
||||
import Home from './pages/Home';
|
||||
import ViewCharacter from './pages/ViewCharacter';
|
||||
import Info from './pages/Info';
|
||||
|
||||
function DemoReactMarvelApp() {
|
||||
return (
|
||||
<IonTabs>
|
||||
<IonRouterOutlet>
|
||||
<Route exact path="/demo-react-marvel-app/tab1">
|
||||
<Tab1 />
|
||||
<Route exact path="/demo-react-marvel-app/home">
|
||||
<Home />
|
||||
</Route>
|
||||
<Route exact path="/demo-react-marvel-app/tab2">
|
||||
<Tab2 />
|
||||
<Route exact path="/demo-react-marvel-app/character/:id">
|
||||
<ViewCharacter />
|
||||
</Route>
|
||||
<Route exact path="/demo-react-marvel-app/info">
|
||||
<Info />
|
||||
</Route>
|
||||
|
||||
<Redirect exact path="/demo-react-marvel-app" to="/demo-react-marvel-app/tab1" />
|
||||
<Redirect exact path="/demo-react-marvel-app" to="/demo-react-marvel-app/home" />
|
||||
</IonRouterOutlet>
|
||||
|
||||
{/* */}
|
||||
<IonTabBar slot="bottom">
|
||||
<IonTabButton tab="tab1" href="/demo-react-marvel-app/tab1">
|
||||
<IonIcon icon={cloudOutline} />
|
||||
<IonLabel>Dashboard</IonLabel>
|
||||
</IonTabButton>
|
||||
<IonTabButton tab="tab2" href="/demo-react-marvel-app/tab2">
|
||||
<IonIcon icon={searchOutline} />
|
||||
<IonLabel>Search</IonLabel>
|
||||
</IonTabButton>
|
||||
</IonTabBar>
|
||||
</IonTabs>
|
||||
);
|
||||
}
|
||||
|
32
03_source/mobile/src/pages/DemoReactMarvelApp/pages/Home.css
Normal file
32
03_source/mobile/src/pages/DemoReactMarvelApp/pages/Home.css
Normal file
@@ -0,0 +1,32 @@
|
||||
.character-container {
|
||||
|
||||
position: relative;
|
||||
text-align: center;
|
||||
color: white;
|
||||
}
|
||||
.character-name-container {
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
align-content: center;
|
||||
position:absolute;
|
||||
z-index: 99999;
|
||||
background-color: rgba(0,0,0,0.7);
|
||||
bottom: 0;
|
||||
width: 100%;
|
||||
padding-left: 1rem;
|
||||
padding-right: 1rem;
|
||||
}
|
||||
|
||||
.character-name-container ion-icon {
|
||||
|
||||
margin-top: 0.5rem;
|
||||
}
|
||||
|
||||
.character-name-container ion-label {
|
||||
|
||||
font-size: 1rem;
|
||||
font-weight: 500;
|
||||
}
|
208
03_source/mobile/src/pages/DemoReactMarvelApp/pages/Home.tsx
Normal file
208
03_source/mobile/src/pages/DemoReactMarvelApp/pages/Home.tsx
Normal file
@@ -0,0 +1,208 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import {
|
||||
IonButton,
|
||||
IonButtons,
|
||||
IonContent,
|
||||
IonHeader,
|
||||
IonIcon,
|
||||
IonInfiniteScroll,
|
||||
IonInfiniteScrollContent,
|
||||
IonPage,
|
||||
IonRow,
|
||||
IonTitle,
|
||||
IonToast,
|
||||
IonToolbar,
|
||||
useIonRouter,
|
||||
} from '@ionic/react';
|
||||
|
||||
import './Home.css';
|
||||
import {
|
||||
addOutline,
|
||||
chevronBackOutline,
|
||||
expandOutline,
|
||||
gridOutline,
|
||||
informationCircleOutline,
|
||||
searchOutline,
|
||||
} from 'ionicons/icons';
|
||||
import CharacterItem from '../components/CharacterItem';
|
||||
|
||||
const Home = (): React.JSX.Element => {
|
||||
const [grid, setGrid] = useState<boolean>(true);
|
||||
const [characters, setCharacters] = useState([]);
|
||||
const [amountLoaded, setAmountLoaded] = useState<number>(20);
|
||||
const [showToast, setShowToast] = useState<{ show: boolean; message: string }>({
|
||||
show: false,
|
||||
message: '',
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
const buttInstall = document.getElementById('buttInstall');
|
||||
window.addEventListener('beforeinstallprompt', (event) => {
|
||||
console.log('👍', 'beforeinstallprompt', event);
|
||||
|
||||
// Save the event so it can be triggered later.
|
||||
window.deferredPrompt = event;
|
||||
buttInstall.classList.toggle('hidden', false);
|
||||
});
|
||||
|
||||
window.addEventListener('appinstalled', (event) => {
|
||||
console.log('👍', 'appinstalled', event);
|
||||
// Clear the deferredPrompt so it can be garbage collected
|
||||
window.deferredPrompt = null;
|
||||
});
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
const getCharacters = async () => {
|
||||
const response = await fetch(
|
||||
'https://gateway.marvel.com/v1/public/characters?ts=alan12345&apikey=e5103c9197bf5466f65433de29139bf9&hash=13b1d704e92de2a50ae29777722bdd75&limit=20&orderBy=-modified'
|
||||
);
|
||||
const data = await response.json();
|
||||
|
||||
const results = data.data.results;
|
||||
setCharacters(results);
|
||||
};
|
||||
|
||||
getCharacters();
|
||||
}, []);
|
||||
|
||||
const fetchMore = async (e) => {
|
||||
// Fetch more characters
|
||||
// How?
|
||||
// Lets limit it by 20, and offset it by the amount loaded already
|
||||
// E.g. 20, 40, 60 just like pagination :)
|
||||
// Get the response into json
|
||||
const response = await fetch(
|
||||
`https://gateway.marvel.com/v1/public/characters?ts=alan12345&apikey=e5103c9197bf5466f65433de29139bf9&hash=13b1d704e92de2a50ae29777722bdd75&limit=20&offset=${amountLoaded}&orderBy=-modified`
|
||||
);
|
||||
const data = await response.json();
|
||||
const results = data.data.results;
|
||||
|
||||
// Set the characters by adding the new results to the current
|
||||
// Increment the amount loaded by 20 for the next iteration
|
||||
// Complete the scroll action
|
||||
setCharacters((prevResults) => [...prevResults, ...results]);
|
||||
setAmountLoaded((prevAmount) => prevAmount + 20);
|
||||
e.target.complete();
|
||||
};
|
||||
|
||||
const addToHomeScreen = async () => {
|
||||
const buttInstall = document.getElementById('buttInstall');
|
||||
|
||||
console.log('👍', 'buttInstall-clicked');
|
||||
const promptEvent = window.deferredPrompt;
|
||||
|
||||
if (!promptEvent) {
|
||||
// The deferred prompt isn't available.
|
||||
return;
|
||||
}
|
||||
|
||||
// Show the install prompt.
|
||||
promptEvent.prompt();
|
||||
|
||||
// Log the result
|
||||
const result = await promptEvent.userChoice;
|
||||
console.log('👍', 'userChoice', result);
|
||||
|
||||
// Reset the deferred prompt variable, since
|
||||
// prompt() can only be called once.
|
||||
window.deferredPrompt = null;
|
||||
|
||||
// Hide the install button.
|
||||
buttInstall.classList.toggle('hidden', true);
|
||||
};
|
||||
|
||||
const router = useIonRouter();
|
||||
function handleBackClick() {
|
||||
router.goBack();
|
||||
}
|
||||
|
||||
return (
|
||||
<IonPage id="home-page">
|
||||
<IonHeader>
|
||||
<IonToolbar>
|
||||
<IonButtons slot="start">
|
||||
<IonButton onClick={() => handleBackClick()}>
|
||||
<IonIcon icon={chevronBackOutline} color="primary" />
|
||||
</IonButton>
|
||||
</IonButtons>
|
||||
|
||||
<IonTitle>Marvel Characters</IonTitle>
|
||||
|
||||
<IonButtons slot="start">
|
||||
<IonButton color="dark" routerLink="/info">
|
||||
<IonIcon icon={informationCircleOutline} />
|
||||
</IonButton>
|
||||
</IonButtons>
|
||||
<IonButtons slot="end">
|
||||
<IonButton
|
||||
color="dark"
|
||||
onClick={() =>
|
||||
setShowToast({
|
||||
show: true,
|
||||
message: 'We could easily add a search button here to search characters.',
|
||||
})
|
||||
}
|
||||
>
|
||||
<IonIcon icon={searchOutline} />
|
||||
</IonButton>
|
||||
|
||||
<IonButton
|
||||
id="buttInstall"
|
||||
color="danger"
|
||||
fill="solid"
|
||||
size="small"
|
||||
className="add-button hidden"
|
||||
onClick={() => addToHomeScreen()}
|
||||
>
|
||||
<IonIcon icon={addOutline} />
|
||||
Install App
|
||||
</IonButton>
|
||||
|
||||
<IonButton color="danger" onClick={() => setGrid((grid) => !grid)}>
|
||||
<IonIcon icon={grid ? expandOutline : gridOutline} />
|
||||
</IonButton>
|
||||
</IonButtons>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
<IonContent fullscreen>
|
||||
<IonHeader collapse="condense">
|
||||
<IonToolbar>
|
||||
<IonTitle size="large">Marvel Characters</IonTitle>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
|
||||
<IonRow>
|
||||
{characters.length > 0 ? (
|
||||
characters.map((character, index) => {
|
||||
if (!character.thumbnail.path.includes('image_not_available')) {
|
||||
return <CharacterItem key={`character_${index}`} grid={grid} details={character} />;
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
})
|
||||
) : (
|
||||
<CharacterItem load={true} />
|
||||
)}
|
||||
</IonRow>
|
||||
|
||||
<IonInfiniteScroll threshold="100px" onIonInfinite={fetchMore}>
|
||||
<IonInfiniteScrollContent
|
||||
loadingSpinner="bubbles"
|
||||
loadingText="Getting more super heroes..."
|
||||
></IonInfiniteScrollContent>
|
||||
</IonInfiniteScroll>
|
||||
</IonContent>
|
||||
|
||||
<IonToast
|
||||
isOpen={showToast.show}
|
||||
onDidDismiss={() => setShowToast({ show: false, message: '' })}
|
||||
message={showToast.message}
|
||||
duration={3500}
|
||||
color="danger"
|
||||
/>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default Home;
|
95
03_source/mobile/src/pages/DemoReactMarvelApp/pages/Info.tsx
Normal file
95
03_source/mobile/src/pages/DemoReactMarvelApp/pages/Info.tsx
Normal file
@@ -0,0 +1,95 @@
|
||||
import { IonBackButton, IonButton, IonButtons, IonCol, IonContent, IonGrid, IonHeader, IonIcon, IonImg, IonItem, IonLabel, IonPage, IonRow, IonSkeletonText, IonTitle, IonToolbar } from '@ionic/react';
|
||||
import { arrowRedoOutline, heartOutline } from 'ionicons/icons';
|
||||
import styles from "./ViewCharacter.module.scss";
|
||||
|
||||
interface Profile {
|
||||
name: string;
|
||||
bio: string;
|
||||
avatar: string;
|
||||
codeLink: string;
|
||||
links: Array<{
|
||||
name: string;
|
||||
url: string;
|
||||
}>;
|
||||
}
|
||||
|
||||
const Info = (): React.JSX.Element => {
|
||||
|
||||
const profile = {
|
||||
|
||||
name: "Alan Montgomery",
|
||||
bio: "My name is Alan. I’m a Mobile Team Lead and Senior Developer and have built numerous production, real world mobile apps for local government authorities. I have a real passion and love for sharing my knowledge and expertise with developers wanting to learn and get better at using certain technologies.",
|
||||
avatar: "/assets/alan.jpg",
|
||||
codeLink: "https://github.com/alanmontgomery/ionic-react-marvel-app",
|
||||
links: [
|
||||
{
|
||||
name: "Twitter",
|
||||
url: "https://twitter.com/93alan"
|
||||
}
|
||||
],
|
||||
}
|
||||
return (
|
||||
<IonPage id="view-message-page">
|
||||
<IonHeader translucent>
|
||||
<IonToolbar>
|
||||
<IonButtons>
|
||||
<IonBackButton text="Characters"></IonBackButton>
|
||||
</IonButtons>
|
||||
|
||||
{ navigator.platform.match(/iPhone|iPod|iPad/) && <IonTitle>{ profile.name }</IonTitle> }
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
|
||||
<IonContent fullscreen>
|
||||
{ profile ?
|
||||
(
|
||||
<>
|
||||
<IonItem lines="none">
|
||||
<IonImg src={ profile.avatar } />
|
||||
<div className={ styles.characterNameContainer }>
|
||||
<IonLabel>{ profile.name }</IonLabel>
|
||||
</div>
|
||||
</IonItem>
|
||||
|
||||
<IonGrid>
|
||||
<IonRow>
|
||||
<IonCol size="12">
|
||||
<p className="ion-text-justify">
|
||||
{ profile.bio }
|
||||
</p>
|
||||
</IonCol>
|
||||
</IonRow>
|
||||
|
||||
<IonRow>
|
||||
<IonCol size="12">
|
||||
<a href={ profile.links[0].url } target="_blank" rel="noreferrer" className="non-link">
|
||||
<IonButton color="secondary" expand="full">
|
||||
Lets connect on Twitter
|
||||
<IonIcon slot="end" icon={ arrowRedoOutline } />
|
||||
</IonButton>
|
||||
</a>
|
||||
</IonCol>
|
||||
</IonRow>
|
||||
|
||||
<IonRow>
|
||||
<IonCol size="12">
|
||||
<a href={ profile.codeLink } target="_blank" rel="noreferrer" className="non-link">
|
||||
<IonButton color="dark" expand="full">
|
||||
Source code for this app
|
||||
<IonIcon slot="end" icon={ arrowRedoOutline } />
|
||||
</IonButton>
|
||||
</a>
|
||||
</IonCol>
|
||||
</IonRow>
|
||||
</IonGrid>
|
||||
</>
|
||||
)
|
||||
:
|
||||
<IonSkeletonText animated style={{ width: "100%", height: "100vh" }} />
|
||||
}
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
}
|
||||
|
||||
export default Info;
|
@@ -0,0 +1,59 @@
|
||||
.characterContainer {
|
||||
|
||||
position: relative;
|
||||
text-align: center;
|
||||
color: white;
|
||||
}
|
||||
|
||||
ion-item {
|
||||
--padding-start: 0;
|
||||
--inner-padding-end: 0;
|
||||
}
|
||||
|
||||
ion-label {
|
||||
margin-top: 12px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
.characterNameContainer {
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: center;
|
||||
position: absolute;
|
||||
z-index: 99999;
|
||||
background-color: rgba(0, 0, 0, 0.7);
|
||||
bottom: 0;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.characterNameContainer ion-label {
|
||||
|
||||
font-size: 1rem !important;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.characterStats {
|
||||
|
||||
text-align: center;
|
||||
margin-top: 1.5rem;
|
||||
margin-bottom: 1.5rem;
|
||||
}
|
||||
|
||||
.characterStat {
|
||||
|
||||
background-color: var(--ion-color-primary);
|
||||
padding: 1rem;
|
||||
}
|
||||
|
||||
.characterStat ion-card-title {
|
||||
|
||||
font-size: 1rem;
|
||||
--color: white;
|
||||
}
|
||||
|
||||
.characterStat ion-card-subtitle {
|
||||
|
||||
font-size: 1rem;
|
||||
--color: white;
|
||||
}
|
@@ -0,0 +1,298 @@
|
||||
import { useState } from 'react';
|
||||
import {
|
||||
IonBackButton,
|
||||
IonButton,
|
||||
IonButtons,
|
||||
IonCardSubtitle,
|
||||
IonCardTitle,
|
||||
IonCol,
|
||||
IonContent,
|
||||
IonGrid,
|
||||
IonHeader,
|
||||
IonIcon,
|
||||
IonImg,
|
||||
IonItem,
|
||||
IonLabel,
|
||||
IonPage,
|
||||
IonRow,
|
||||
IonSkeletonText,
|
||||
IonTitle,
|
||||
IonToast,
|
||||
IonToolbar,
|
||||
useIonViewWillEnter,
|
||||
} from '@ionic/react';
|
||||
import { arrowRedoOutline, heartOutline } from 'ionicons/icons';
|
||||
import { useParams } from 'react-router';
|
||||
|
||||
import styles from './ViewCharacter.module.scss';
|
||||
|
||||
interface Comic {
|
||||
id: string;
|
||||
name: string;
|
||||
image: string;
|
||||
}
|
||||
|
||||
interface Character {
|
||||
id: string;
|
||||
name: string;
|
||||
description: string;
|
||||
thumbnail: {
|
||||
path: string;
|
||||
extension: string;
|
||||
};
|
||||
comics: {
|
||||
available: number;
|
||||
items: Array<{
|
||||
name: string;
|
||||
resourceURI: string;
|
||||
}>;
|
||||
};
|
||||
stories: {
|
||||
available: number;
|
||||
};
|
||||
series: {
|
||||
available: number;
|
||||
};
|
||||
urls: Array<{
|
||||
type: string;
|
||||
url: string;
|
||||
}>;
|
||||
}
|
||||
|
||||
const ViewCharacter = (): React.JSX.Element => {
|
||||
const [character, setCharacter] = useState<Character | undefined>();
|
||||
const [characterComics, setCharacterComics] = useState<Comic[]>([]);
|
||||
const [showToast, setShowToast] = useState<{ show: boolean; message: string }>({
|
||||
show: false,
|
||||
message: '',
|
||||
});
|
||||
const params = useParams();
|
||||
|
||||
const getComic = async (comicID: string): Promise<string | false> => {
|
||||
var comicImageURL = false;
|
||||
const response = await fetch(
|
||||
`https://gateway.marvel.com/v1/public/comics/${comicID}?ts=alan12345&apikey=e5103c9197bf5466f65433de29139bf9&hash=13b1d704e92de2a50ae29777722bdd75`
|
||||
);
|
||||
const data = await response.json();
|
||||
|
||||
if (data) {
|
||||
if (data.data) {
|
||||
if (data.data.results.length > 0) {
|
||||
comicImageURL =
|
||||
data.data.results[0].thumbnail.path +
|
||||
'/portrait_incredible.' +
|
||||
data.data.results[0].thumbnail.extension;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return comicImageURL;
|
||||
};
|
||||
|
||||
const parseComics = async (result: Character): Promise<void> => {
|
||||
const comics = result.comics.items;
|
||||
|
||||
await comics.forEach(async (comic) => {
|
||||
const name = comic.name;
|
||||
const link = comic.resourceURI;
|
||||
|
||||
const linkParts = link.split('/');
|
||||
const id = linkParts[linkParts.length - 1];
|
||||
const image = await getComic(id);
|
||||
|
||||
setCharacterComics((current) => [
|
||||
...current,
|
||||
{
|
||||
id,
|
||||
name,
|
||||
image,
|
||||
},
|
||||
]);
|
||||
});
|
||||
};
|
||||
|
||||
useIonViewWillEnter(async () => {
|
||||
const response = await fetch(
|
||||
`https://gateway.marvel.com/v1/public/characters/${params.id}?ts=alan12345&apikey=e5103c9197bf5466f65433de29139bf9&hash=13b1d704e92de2a50ae29777722bdd75`
|
||||
);
|
||||
const data = await response.json();
|
||||
|
||||
if (data) {
|
||||
if (data.data) {
|
||||
if (data.data.results) {
|
||||
const result = data.data.results[0];
|
||||
setCharacter(result);
|
||||
parseComics(result);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
return (
|
||||
<IonPage id="view-message-page">
|
||||
<IonHeader translucent>
|
||||
<IonToolbar>
|
||||
<IonButtons>
|
||||
<IonBackButton text="Characters"></IonBackButton>
|
||||
</IonButtons>
|
||||
|
||||
{navigator.platform.match(/iPhone|iPod|iPad/) && (
|
||||
<IonTitle>{character && character.name}</IonTitle>
|
||||
)}
|
||||
|
||||
<IonButtons slot="end">
|
||||
<IonButton
|
||||
color="dark"
|
||||
onClick={() =>
|
||||
setShowToast({
|
||||
show: true,
|
||||
message:
|
||||
"We could easily add a 'like' button here to add a character to favourites.",
|
||||
})
|
||||
}
|
||||
>
|
||||
<IonIcon icon={heartOutline} />
|
||||
</IonButton>
|
||||
</IonButtons>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
|
||||
<IonContent fullscreen>
|
||||
{character ? (
|
||||
<>
|
||||
{navigator.platform.match(/iPhone|iPod|iPad/) ? (
|
||||
<IonHeader collapse="condense">
|
||||
<IonToolbar>
|
||||
<IonItem lines="none">
|
||||
<IonImg src={`${character.thumbnail.path}.${character.thumbnail.extension}`} />
|
||||
<div className={styles.characterNameContainer}>
|
||||
<IonLabel>{character.name}</IonLabel>
|
||||
</div>
|
||||
</IonItem>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
) : (
|
||||
<IonItem lines="none">
|
||||
<IonImg src={`${character.thumbnail.path}.${character.thumbnail.extension}`} />
|
||||
<div className={styles.characterNameContainer}>
|
||||
<IonLabel>{character.name}</IonLabel>
|
||||
</div>
|
||||
</IonItem>
|
||||
)}
|
||||
|
||||
<IonGrid>
|
||||
{character.description && (
|
||||
<IonRow>
|
||||
<IonCol size="12">
|
||||
<p className="ion-text-justify">{character.description}</p>
|
||||
</IonCol>
|
||||
</IonRow>
|
||||
)}
|
||||
|
||||
<IonRow className={styles.characterStats}>
|
||||
<IonCol size="4">
|
||||
<div className={styles.characterStat}>
|
||||
<IonCardSubtitle>{character.comics.available}</IonCardSubtitle>
|
||||
<IonCardTitle>comics</IonCardTitle>
|
||||
</div>
|
||||
</IonCol>
|
||||
|
||||
<IonCol size="4">
|
||||
<div className={styles.characterStat}>
|
||||
<IonCardSubtitle>{character.stories.available}</IonCardSubtitle>
|
||||
<IonCardTitle>stories</IonCardTitle>
|
||||
</div>
|
||||
</IonCol>
|
||||
|
||||
<IonCol size="4">
|
||||
<div className={styles.characterStat}>
|
||||
<IonCardSubtitle>{character.series.available}</IonCardSubtitle>
|
||||
<IonCardTitle>series</IonCardTitle>
|
||||
</div>
|
||||
</IonCol>
|
||||
</IonRow>
|
||||
|
||||
{character.urls && (
|
||||
<>
|
||||
{character.urls[1] && (
|
||||
<IonRow>
|
||||
<IonCol size="12">
|
||||
<a
|
||||
href={character.urls[1].url}
|
||||
target="_blank"
|
||||
rel="noreferrer"
|
||||
className="non-link"
|
||||
>
|
||||
<IonButton color="danger" expand="full">
|
||||
View full profile on Marvel
|
||||
<IonIcon slot="end" icon={arrowRedoOutline} />
|
||||
</IonButton>
|
||||
</a>
|
||||
</IonCol>
|
||||
</IonRow>
|
||||
)}
|
||||
|
||||
{character.urls[2] && (
|
||||
<IonRow>
|
||||
<IonCol size="12">
|
||||
<a
|
||||
href={character.urls[2].url}
|
||||
target="_blank"
|
||||
rel="noreferrer"
|
||||
className="non-link"
|
||||
>
|
||||
<IonButton color="dark" expand="full">
|
||||
View all comics on Marvel
|
||||
<IonIcon slot="end" icon={arrowRedoOutline} />
|
||||
</IonButton>
|
||||
</a>
|
||||
</IonCol>
|
||||
</IonRow>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
|
||||
{characterComics && (
|
||||
<>
|
||||
<IonRow className="ion-text-center ion-padding">
|
||||
<IonCol size="12">
|
||||
<IonCardSubtitle color="dark">Showing 20 comics...</IonCardSubtitle>
|
||||
</IonCol>
|
||||
</IonRow>
|
||||
<IonRow>
|
||||
{characterComics.map((comic, index) => {
|
||||
if (comic.image && comic.name) {
|
||||
return (
|
||||
<IonCol key={`${character.name}_comic_${index}`} size="6">
|
||||
<IonItem lines="none">
|
||||
<IonImg src={comic.image} />
|
||||
<div className={styles.characterNameContainer}>
|
||||
<IonLabel>{comic.name}</IonLabel>
|
||||
</div>
|
||||
</IonItem>
|
||||
</IonCol>
|
||||
);
|
||||
}
|
||||
})}
|
||||
</IonRow>
|
||||
</>
|
||||
)}
|
||||
</IonGrid>
|
||||
</>
|
||||
) : (
|
||||
<IonSkeletonText animated style={{ width: '100%', height: '100vh' }} />
|
||||
)}
|
||||
</IonContent>
|
||||
|
||||
<IonToast
|
||||
isOpen={showToast.show}
|
||||
onDidDismiss={() => setShowToast({ show: false, message: '' })}
|
||||
message={showToast.message}
|
||||
duration={3500}
|
||||
color="danger"
|
||||
/>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default ViewCharacter;
|
@@ -1,103 +0,0 @@
|
||||
#about-page {
|
||||
ion-toolbar {
|
||||
position: absolute;
|
||||
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
|
||||
--background: transparent;
|
||||
--color: white;
|
||||
}
|
||||
|
||||
ion-toolbar ion-back-button,
|
||||
ion-toolbar ion-button,
|
||||
ion-toolbar ion-menu-button {
|
||||
--color: white;
|
||||
}
|
||||
|
||||
.about-header {
|
||||
position: relative;
|
||||
|
||||
width: 100%;
|
||||
height: 30%;
|
||||
}
|
||||
|
||||
.about-header .about-image {
|
||||
position: absolute;
|
||||
|
||||
top: 0;
|
||||
left: 0;
|
||||
bottom: 0;
|
||||
right: 0;
|
||||
|
||||
background-position: center;
|
||||
background-size: cover;
|
||||
background-repeat: no-repeat;
|
||||
|
||||
opacity: 0;
|
||||
|
||||
transition: opacity 500ms ease-in-out;
|
||||
}
|
||||
|
||||
.about-header .madison {
|
||||
background-image: url('/assets/WeatherDemo/img/about/madison.jpg');
|
||||
}
|
||||
|
||||
.about-header .austin {
|
||||
background-image: url('/assets/WeatherDemo/img/about/austin.jpg');
|
||||
}
|
||||
|
||||
.about-header .chicago {
|
||||
background-image: url('/assets/WeatherDemo/img/about/chicago.jpg');
|
||||
}
|
||||
|
||||
.about-header .seattle {
|
||||
background-image: url('/assets/WeatherDemo/img/about/seattle.jpg');
|
||||
}
|
||||
|
||||
.about-info {
|
||||
position: relative;
|
||||
margin-top: -10px;
|
||||
border-radius: 10px;
|
||||
background: var(--ion-background-color, #fff);
|
||||
z-index: 2; // display rounded border above header image
|
||||
}
|
||||
|
||||
.about-info h3 {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
.about-info ion-list {
|
||||
padding-top: 0;
|
||||
}
|
||||
|
||||
.about-info p {
|
||||
line-height: 130%;
|
||||
|
||||
color: var(--ion-color-dark);
|
||||
}
|
||||
|
||||
.about-info ion-icon {
|
||||
margin-inline-end: 32px;
|
||||
}
|
||||
|
||||
/*
|
||||
* iOS Only
|
||||
*/
|
||||
|
||||
.ios .about-info {
|
||||
--ion-padding: 19px;
|
||||
}
|
||||
|
||||
.ios .about-info h3 {
|
||||
font-weight: 700;
|
||||
}
|
||||
}
|
||||
|
||||
#date-input-popover {
|
||||
--offset-y: -var(--ion-safe-area-bottom);
|
||||
|
||||
--max-width: 90%;
|
||||
--width: 336px;
|
||||
}
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user