+ 
diff --git a/src/ClientApp/src/pages/Shop/RelatedProducts/index.tsx b/src/ClientApp/src/pages/Shop/Item/RelatedProducts.tsx
similarity index 68%
rename from src/ClientApp/src/pages/Shop/RelatedProducts/index.tsx
rename to src/ClientApp/src/pages/Shop/Item/RelatedProducts.tsx
index 80c5c3d..29d15e2 100644
--- a/src/ClientApp/src/pages/Shop/RelatedProducts/index.tsx
+++ b/src/ClientApp/src/pages/Shop/Item/RelatedProducts.tsx
@@ -4,7 +4,6 @@ import React, { FC, useEffect } from "react"
// Reduc
import { useDispatch, useSelector } from "react-redux"
import { ApplicationState } from "../../../store"
-import { actionCreators as loaderActionCreators } from '../../../store/reducers/Loader'
// Reactstrap
import { Card, CardBody, CardFooter, CardImg, Col, Container, Row } from "reactstrap"
@@ -12,37 +11,73 @@ import { Card, CardBody, CardFooter, CardImg, Col, Container, Row } from "reacts
// Components
import { FeatherRating } from "../../../components/FeatherRating"
-const RelatedProducts: FC = () => {
+
+interface IImage {
+ src: string,
+ alt: string
+}
+
+interface IAuthor {
+ id: string,
+ image?: IImage
+
+ nickName: string
+}
+
+
+interface IRelatedProduct {
+ id: string,
+ slug: string,
+ image: IImage,
+ badges: string [],
+ title: string,
+ shortText?: string,
+ text?: string,
+ author: IAuthor,
+ created: string,
+ tags: string []
+
+ images?: IImage [],
+ sku: string,
+ brandName: string,
+ rating?: number,
+ price: number,
+ newPrice?: number,
+ quantity?: number
+}
+
+export interface IRelatedProducts {
+ items?: IRelatedProduct []
+}
+
+
+export interface IRelatedProductsSection {
+ title: string,
+ addToCart: string
+}
+
+
+export interface IRelatedProductsComponent extends IRelatedProductsSection, IRelatedProducts {
+
+}
+
+
+const RelatedProducts: FC = (props) => {
const dispatch = useDispatch()
const { content, shopRelated } = useSelector((state: ApplicationState) => state)
- const {
- currencySymbol = ""
- } = content?.localization ? content.localization : {}
+ const { currencySymbol } = content.localization
- const {
- relatedProductsSection = {
- title: "",
- addToCart: ""
- }
- } = content?.shopItem ? content?.shopItem : {}
+ const { relatedProductsSection } = content.shopItem
const {
items = []
} = shopRelated ? shopRelated : {}
- useEffect(() => {
- content?.isLoading || shopRelated?.isLoading
- ? dispatch(loaderActionCreators.show())
- : setTimeout(() => {
- dispatch(loaderActionCreators.hide())
- }, 1000)
- }, [content?.isLoading, shopRelated?.isLoading])
-
return
-
{items.map((item, index) =>
+ */}
}
diff --git a/src/ClientApp/src/pages/Shop/Item/index.tsx b/src/ClientApp/src/pages/Shop/Item/index.tsx
index 5c46d8d..d751eda 100644
--- a/src/ClientApp/src/pages/Shop/Item/index.tsx
+++ b/src/ClientApp/src/pages/Shop/Item/index.tsx
@@ -5,7 +5,6 @@ import { useParams } from 'react-router-dom'
// Redux
import { useDispatch, useSelector } from 'react-redux'
import { ApplicationState } from '../../../store'
-import { actionCreators as loaderActionCreators } from '../../../store/reducers/Loader'
import { actionCreators as shopItemActionCreators } from '../../../store/reducers/ShopItem'
// Reactstrap
@@ -13,9 +12,66 @@ import { Container } from 'reactstrap'
// Components
import { FeatherIcon } from '../../../components/FeatherIcons'
-import { RelatedProducts } from '../RelatedProducts'
+import { IRelatedProductsComponent, IRelatedProductsSection, RelatedProducts } from './RelatedProducts'
-const ShopItem : FC = () => {
+
+import { IHeader } from '../../../interfaces'
+
+interface IImage {
+ src: string,
+ alt: string
+}
+
+interface IAuthor {
+ id: string,
+ image?: IImage
+
+ nickName: string
+}
+
+export interface IShopItem {
+ id: string,
+ slug: string,
+ image: IImage,
+ badges: string [],
+ title: string,
+ shortText?: string,
+ text?: string,
+ author: IAuthor,
+ created: string,
+ tags: string []
+
+ images?: IImage [],
+ sku: string,
+ brandName: string,
+ rating?: number,
+ price: number,
+ newPrice?: number,
+ quantity?: number
+}
+
+
+interface IProductSection {
+ title?: string
+ text?: string
+
+ availableQuantity: string,
+ addToCart: string
+}
+
+
+
+
+
+export interface IShopItemPage {
+ header: IHeader,
+ productSection: IProductSection
+ relatedProductsSection: IRelatedProductsSection
+}
+
+export interface IShopItemComponent extends IShopItemPage {}
+
+const ShopItem : FC = () => {
const params = useParams()
const dispatch = useDispatch()
@@ -41,17 +97,6 @@ const ShopItem : FC = () => {
}))
}, [])
- useEffect(() => {
- content?.isLoading || shopItem?.isLoading
- ? dispatch(loaderActionCreators.show())
- : setTimeout(() => {
- dispatch(loaderActionCreators.hide())
- }, 1000)
- }, [content?.isLoading, shopItem?.isLoading])
-
-
-
-
return <>
@@ -81,7 +126,9 @@ const ShopItem : FC = () => {
- = () => {
const dispatch = useDispatch()
const { content } = useSelector((state: ApplicationState) => state)
const {
- title = "",
- email = {
- title: "",
- placeHolder: ""
- },
- password = {
- title: "",
- placeHolder: ""
- },
- dontHaveAnAccount = "",
- signUpLink = {
- target: "#",
- anchorText: ""
- },
- submit = {
- title: ""
- }
- } = content?.signIn ? content.signIn : {}
-
-
- useEffect(() => {
- content?.isLoading
- ? dispatch(loaderActionCreators.show())
- : setTimeout(() => {
- dispatch(loaderActionCreators.hide())
- }, 1000)
- }, [content?.isLoading])
+ title,
+ email,
+ password,
+ dontHaveAnAccount,
+ signUpLink,
+ submit
+ } = content.signIn
const [state, hookState] = useState({
username: '',
@@ -69,6 +73,10 @@ const Signin = () => {
setState({ [name]: value })
}
+ const postSignIn = () => {
+
+ }
+
return
= () => {
const dispatch = useDispatch()
const { content } = useSelector((state: ApplicationState) => state)
const {
- title = "",
- username = {
- title: "",
- placeHolder: ""
- },
- email = {
- title: "",
- placeHolder: ""
- },
- reEmail = {
- title: "Repeat email address",
- placeHolder: "Repeat email address..."
- },
- password = {
- title: "",
- placeHolder: ""
- },
- rePassword = {
- title: "Repeat password",
- placeHolder: "Repeat password..."
- },
+ title, username,
+ email,
+ reEmail,
+ password,
+ rePassword,
acceptTermsAndConditions = "",
- submit = {
- title: ""
- }
- } = content?.signUp ? content.signUp : {}
-
- useEffect(() => {
- content?.isLoading
- ? dispatch(loaderActionCreators.show())
- : setTimeout(() => {
- dispatch(loaderActionCreators.hide())
- }, 1000)
- }, [content?.isLoading])
-
+ submit
+ } = content.signUp
const [state, hookState] = useState({
username: '',
@@ -96,7 +89,7 @@ const Signup = () => {
}
return
-
}
diff --git a/src/ClientApp/src/restClient.ts b/src/ClientApp/src/restClient.ts
index e686dd0..c69262d 100644
--- a/src/ClientApp/src/restClient.ts
+++ b/src/ClientApp/src/restClient.ts
@@ -1,18 +1,19 @@
-import { Params, RequestModel } from "./models/abstractions"
+import axios from "axios"
+import { IParams } from "./interfaces"
interface FetchData {
status: number,
- text: string
+ text: any
}
const Post = () => {
}
-const Get = async (apiUrl: string, pathParams?: Params, searchParams?: Params): Promise => {
+const Get = async (apiUrl: string, pathParams?: IParams, searchParams?: IParams): Promise => {
const url = new URL(apiUrl)
if(pathParams) {
@@ -36,21 +37,19 @@ const Get = async (apiUrl: string, pathParams?: Params, searchParams?: Params
headers: { 'accept': 'application/json', 'content-type': 'application/json' },
}
- const fetchData = await fetch(url.toString(), requestParams)
+ const fetchData = await axios(url.toString(), requestParams)
.then(async fetchData => {
- return {
- status: fetchData.status,
- text: await fetchData.text()
- }
+ // console.log(fetchData)
+
+ return fetchData.data as T
})
.catch(err => {
console.log(err)
- })
- if (fetchData?.text)
- return JSON.parse((fetchData as FetchData).text) as T
-
- return null
+ return null
+ })
+
+ return fetchData
}
const Put = () => {
@@ -67,6 +66,3 @@ export {
Put,
Delete
}
-
-
-
diff --git a/src/ClientApp/src/store/index.ts b/src/ClientApp/src/store/index.ts
index f96374c..9525a30 100644
--- a/src/ClientApp/src/store/index.ts
+++ b/src/ClientApp/src/store/index.ts
@@ -5,7 +5,6 @@ import * as BlogItem from './reducers/BlogItem'
import * as Counter from './reducers/Counter'
import * as Header from './reducers/Header'
-import * as Loader from './reducers/Loader'
import * as Content from './reducers/Content'
@@ -20,25 +19,24 @@ import * as WeatherForecasts from './reducers/WeatherForecasts'
// The top-level state object
export interface ApplicationState {
- blogCatalog: BlogCatalog.BlogCatalogState | undefined
- blogCategories: BlogCategories.BlogCategoriesState | undefined
- blogFeatured: BlogFeatured.BlogFeaturedState | undefined
- blogItem: BlogItem.BlogItemState | undefined
+ blogCatalog: BlogCatalog.BlogCatalogState
+ blogCategories: BlogCategories.BlogCategoriesState
+ blogFeatured: BlogFeatured.BlogFeaturedState
+ blogItem: BlogItem.BlogItemState
- content: Content.ContentState | undefined
+ content: Content.ContentState
- counter: Counter.CounterState | undefined
- header: Header.HeaderState | undefined
- loader: Loader.LoaderState | undefined
+ counter: Counter.CounterState
+ header: Header.HeaderState
- shopCatalog: ShopCatalog.ShopCatalogState | undefined
- shopCategories: ShopCategories.ShopCategoriesState | undefined
- shopFeatured: ShopFeatured.ShopFeaturedState | undefined
- shopItem: ShopItem.ShopItemState | undefined
- shopRelated: ShopRelated.ShopRelatedState | undefined
- shopCart: ShopCart.ShopCartState | undefined
+ shopCatalog: ShopCatalog.ShopCatalogState
+ shopCategories: ShopCategories.ShopCategoriesState
+ shopFeatured: ShopFeatured.ShopFeaturedState
+ shopItem: ShopItem.ShopItemState
+ shopRelated: ShopRelated.ShopRelatedState
+ shopCart: ShopCart.ShopCartState
- weatherForecasts: WeatherForecasts.WeatherForecastsState | undefined
+ weatherForecasts: WeatherForecasts.WeatherForecastsState
}
// Whenever an action is dispatched, Redux will update each top-level application state property using
@@ -54,7 +52,6 @@ export const reducers = {
counter: Counter.reducer,
header: Header.reducer,
- loader: Loader.reducer,
shopCatalog: ShopCatalog.reducer,
shopCategories: ShopCategories.reducer,
diff --git a/src/ClientApp/src/store/reducers/BlogCatalog.ts b/src/ClientApp/src/store/reducers/BlogCatalog.ts
index bc619ff..c1afe3d 100644
--- a/src/ClientApp/src/store/reducers/BlogCatalog.ts
+++ b/src/ClientApp/src/store/reducers/BlogCatalog.ts
@@ -1,32 +1,54 @@
import { Action, Reducer } from 'redux'
import { AppThunkAction } from '../'
-import { GetBlogCatalogRequestModel } from '../../models/requests'
-import { GetBlogCatalogResponseModel } from '../../models/responses'
+// Interfaces
+import { IPagination, IParams, IRequest, IResponse } from '../../interfaces'
+import { IBlogItem } from '../../pages/Blog/Catalog/BlogItemsComponent'
+
import { Get } from '../../restClient'
-export interface BlogCatalogState extends GetBlogCatalogResponseModel {
+
+// Request
+interface IGetBlogcatalogPathParams extends IParams {}
+
+interface IGeBlogCatalogSearchParams extends IParams {}
+
+interface IGetBlogCatalogRequestModel extends IRequest {
+ category?: string,
+ searchText?: string,
+ currentPage?: string,
+ itemsPerPage?: string
+}
+
+// Response
+interface IGetBlogCatalogResponseModel extends IPagination, IResponse { }
+
+
+export interface BlogCatalogState extends IGetBlogCatalogResponseModel {
isLoading: boolean
}
-interface RequestAction extends GetBlogCatalogRequestModel {
+interface RequestAction extends IGetBlogCatalogRequestModel {
type: 'REQUEST_BLOG_CATALOG'
}
-interface ReceiveAction extends GetBlogCatalogResponseModel {
+interface ReceiveAction extends IGetBlogCatalogResponseModel {
type: 'RECEIVE_BLOG_CATALOG'
}
type KnownAction = RequestAction | ReceiveAction
export const actionCreators = {
- requestBlogCatalog: (props?: GetBlogCatalogRequestModel): AppThunkAction => (dispatch, getState) => {
+ requestBlogCatalog: (props?: IGetBlogCatalogRequestModel): AppThunkAction => (dispatch, getState) => {
- const locale = getState().content?.localization.locale
+ const locale = process.env.REACT_APP_LOCALE
const searchParams = {...props?.searchParams, locale}
- Get>(`${process.env.REACT_APP_API}/Image/${process.env.REACT_APP_BLOGITEMS}/${process.env.REACT_APP_SITEID}`, props?.pathParams, searchParams)
+ if(process.env.REACT_APP_LOCAL_ONLY == 'Y')
+ return
+
+ Get>(`${process.env.REACT_APP_API}/${process.env.REACT_APP_BLOGITEMS}/${process.env.REACT_APP_SITEID}`, props?.pathParams, searchParams)
.then(response => response)
.then(data => {
if(data)
@@ -38,7 +60,7 @@ export const actionCreators = {
}
const unloadedState: BlogCatalogState = {
- totalPages: 1,
+ totalPages: 100,
currentPage: 1,
items: [
{
@@ -46,7 +68,7 @@ const unloadedState: BlogCatalogState = {
slug: "demo-post",
badges: [ "demo" ],
image: {
- src: `${process.env.REACT_APP_API}/Image/850x350/dee2e6/6c757d`,
+ src: `${process.env.REACT_APP_FRONTEND}/Image/850x350/dee2e6/6c757d`,
alt: "..."
},
title: "Lorem ipsum",
@@ -56,7 +78,7 @@ const unloadedState: BlogCatalogState = {
id: "",
nickName: "Admin",
image: {
- src: `${process.env.REACT_APP_API}/Image/40x40/ced4da/6c757d`,
+ src: `${process.env.REACT_APP_FRONTEND}/Image/40x40/ced4da/6c757d`,
alt: "..."
}
},
@@ -70,7 +92,7 @@ const unloadedState: BlogCatalogState = {
slug: "demo-post",
badges: [ "demo" ],
image: {
- src: `${process.env.REACT_APP_API}/Image/850x350/dee2e6/6c757d`,
+ src: `${process.env.REACT_APP_FRONTEND}/Image/850x350/dee2e6/6c757d`,
alt: "..."
},
title: "Lorem ipsum",
@@ -80,7 +102,7 @@ const unloadedState: BlogCatalogState = {
id: "",
nickName: "Admin",
image: {
- src: `${process.env.REACT_APP_API}/Image/40x40/ced4da/6c757d`,
+ src: `${process.env.REACT_APP_FRONTEND}/Image/40x40/ced4da/6c757d`,
alt: "..."
}
},
@@ -94,7 +116,7 @@ const unloadedState: BlogCatalogState = {
slug: "demo-post",
badges: [ "demo" ],
image: {
- src: `${process.env.REACT_APP_API}/Image/850x350/dee2e6/6c757d`,
+ src: `${process.env.REACT_APP_FRONTEND}/Image/850x350/dee2e6/6c757d`,
alt: "..."
},
title: "Lorem ipsum",
@@ -104,7 +126,7 @@ const unloadedState: BlogCatalogState = {
id: "",
nickName: "Admin",
image: {
- src: `${process.env.REACT_APP_API}/Image/40x40/ced4da/6c757d`,
+ src: `${process.env.REACT_APP_FRONTEND}/Image/40x40/ced4da/6c757d`,
alt: "..."
}
},
@@ -118,7 +140,7 @@ const unloadedState: BlogCatalogState = {
slug: "demo-post",
badges: [ "demo" ],
image: {
- src: `${process.env.REACT_APP_API}/Image/850x350/dee2e6/6c757d`,
+ src: `${process.env.REACT_APP_FRONTEND}/Image/850x350/dee2e6/6c757d`,
alt: "..."
},
title: "Lorem ipsum",
@@ -128,7 +150,7 @@ const unloadedState: BlogCatalogState = {
id: "",
nickName: "Admin",
image: {
- src: `${process.env.REACT_APP_API}/Image/40x40/ced4da/6c757d`,
+ src: `${process.env.REACT_APP_FRONTEND}/Image/40x40/ced4da/6c757d`,
alt: "..."
}
},
diff --git a/src/ClientApp/src/store/reducers/BlogCategories.ts b/src/ClientApp/src/store/reducers/BlogCategories.ts
index d911186..35d4b68 100644
--- a/src/ClientApp/src/store/reducers/BlogCategories.ts
+++ b/src/ClientApp/src/store/reducers/BlogCategories.ts
@@ -1,32 +1,49 @@
import { Action, Reducer } from 'redux'
import { AppThunkAction } from '../'
-import { GetBlogCategoriesRequestModel } from '../../models/requests'
-import { GetBlogCategoriesResponseModel } from '../../models/responses'
+// Interfaces
+import { IPagination, IParams, IRequest, IResponse } from '../../interfaces'
+import { ICategory } from '../../components/SideWidgets/Categories'
+
import { Get } from '../../restClient'
-export interface BlogCategoriesState extends GetBlogCategoriesResponseModel {
+
+// Request
+interface IGetBlogCategoriesPathParams extends IParams {}
+
+interface IGetBlogCategoriesSearchParams extends IParams {}
+
+interface IGetBlogCategoriesRequestModel extends IRequest { }
+
+// Response
+interface IGetBlogCategoriesResponseModel extends IPagination, IResponse { }
+
+
+export interface BlogCategoriesState extends IGetBlogCategoriesResponseModel {
isLoading: boolean
}
-interface RequestAction extends GetBlogCategoriesRequestModel {
+interface RequestAction extends IGetBlogCategoriesRequestModel {
type: 'REQUEST_BLOG_CATEGORIES'
}
-interface ReceiveAction extends GetBlogCategoriesResponseModel {
+interface ReceiveAction extends IGetBlogCategoriesResponseModel {
type: 'RECEIVE_BLOG_CATEGORIES'
}
type KnownAction = RequestAction | ReceiveAction
export const actionCreators = {
- requestBlogCategories: (props?: GetBlogCategoriesRequestModel): AppThunkAction => (dispatch, getState) => {
+ requestBlogCategories: (props?: IGetBlogCategoriesRequestModel): AppThunkAction => (dispatch, getState) => {
- const locale = getState().content?.localization.locale
+ const locale = process.env.REACT_APP_LOCALE
const searchParams = {...props?.searchParams, locale}
- Get>(`${process.env.REACT_APP_API}/Image/${process.env.REACT_APP_CATEGORYITEMS}/${process.env.REACT_APP_SITEID}`, props?.pathParams, searchParams)
+ if(process.env.REACT_APP_LOCAL_ONLY == 'Y')
+ return
+
+ Get>(`${process.env.REACT_APP_API}/${process.env.REACT_APP_CATEGORYITEMS}/${process.env.REACT_APP_SITEID}`, props?.pathParams, searchParams)
.then(response => response)
.then(data => {
if(data)
@@ -38,9 +55,12 @@ export const actionCreators = {
}
const unloadedState: BlogCategoriesState = {
+ totalPages: 1,
+ currentPage: 1,
items: [
- { id: "", text: "Software" },
- { id: "", text: "Hardware" }
+ { href: 'default', anchorText: "Default" },
+ { href: 'software', anchorText: "Software" },
+ { href: 'hardware', anchorText: "Hardware" }
],
isLoading: false
}
diff --git a/src/ClientApp/src/store/reducers/BlogFeatured.ts b/src/ClientApp/src/store/reducers/BlogFeatured.ts
index 12176df..e0b93d2 100644
--- a/src/ClientApp/src/store/reducers/BlogFeatured.ts
+++ b/src/ClientApp/src/store/reducers/BlogFeatured.ts
@@ -1,32 +1,52 @@
import { Action, Reducer } from 'redux'
import { AppThunkAction } from '../'
-import { GetBlogFeaturedRequestModel } from '../../models/requests'
-import { GetBlogFeaturedResponseModel } from '../../models/responses'
+// Interfaces
+import { IParams, IRequest, IResponse } from '../../interfaces'
+import { IFeaturedBlogItem } from '../../pages/Blog/Catalog/FeaturedBlogComponent'
+
import { Get } from '../../restClient'
-export interface BlogFeaturedState extends GetBlogFeaturedResponseModel {
+
+// Request
+interface IGetBlogFeaturedPathParams extends IParams {}
+
+interface IGetBlogFeaturedSearchParams extends IParams {}
+
+interface IGetBlogFeaturedRequestModel extends IRequest { }
+
+
+// Response
+interface IGetBlogFeaturedResponseModel extends IResponse {
+ items: IFeaturedBlogItem []
+}
+
+
+export interface BlogFeaturedState extends IGetBlogFeaturedResponseModel {
isLoading: boolean
}
-interface RequestAction extends GetBlogFeaturedRequestModel {
+interface RequestAction extends IGetBlogFeaturedRequestModel {
type: 'REQUEST_BLOG_FEATURED'
}
-interface ReceiveAction extends GetBlogFeaturedResponseModel {
+interface ReceiveAction extends IGetBlogFeaturedResponseModel {
type: 'RECEIVE_BLOG_FEATURED'
}
type KnownAction = RequestAction | ReceiveAction
export const actionCreators = {
- requestBlogFeatured: (props?: GetBlogFeaturedRequestModel): AppThunkAction => (dispatch, getState) => {
+ requestBlogFeatured: (props?: IGetBlogFeaturedRequestModel): AppThunkAction => (dispatch, getState) => {
- const locale = getState().content?.localization.locale
+ const locale = process.env.REACT_APP_LOCALE
const searchParams = {...props?.searchParams, locale}
- Get>(`${process.env.REACT_APP_API}/Image/${process.env.REACT_APP_BLOGITEMS_FEAUTERED}/${process.env.REACT_APP_SITEID}`, props?.pathParams, searchParams)
+ if(process.env.REACT_APP_LOCAL_ONLY == 'Y')
+ return
+
+ Get>(`${process.env.REACT_APP_API}/${process.env.REACT_APP_BLOGITEMS_FEAUTERED}/${process.env.REACT_APP_SITEID}`, props?.pathParams, searchParams)
.then(response => response)
.then(data => {
if(data)
@@ -44,7 +64,7 @@ const unloadedState: BlogFeaturedState = {
slug: "demo-post",
badges: [ "demo" ],
image: {
- src: `${process.env.REACT_APP_API}/Image/850x350/dee2e6/6c757d`,
+ src: `${process.env.REACT_APP_FRONTEND}/Image/850x350/dee2e6/6c757d`,
alt: "..."
},
title: "Lorem ipsum",
@@ -53,7 +73,7 @@ const unloadedState: BlogFeaturedState = {
id: "",
nickName: "Admin",
image: {
- src: `${process.env.REACT_APP_API}/Image/40x40/ced4da/6c757d`,
+ src: `${process.env.REACT_APP_FRONTEND}/Image/40x40/ced4da/6c757d`,
alt: "..."
}
},
@@ -68,7 +88,7 @@ const unloadedState: BlogFeaturedState = {
slug: "demo-post",
badges: [ "demo" ],
image: {
- src: `${process.env.REACT_APP_API}/Image/850x350/dee2e6/6c757d`,
+ src: `${process.env.REACT_APP_FRONTEND}/Image/850x350/dee2e6/6c757d`,
alt: "..."
},
title: "Lorem ipsum",
@@ -77,7 +97,7 @@ const unloadedState: BlogFeaturedState = {
id: "",
nickName: "Admin",
image: {
- src: `${process.env.REACT_APP_API}/Image/40x40/ced4da/6c757d`,
+ src: `${process.env.REACT_APP_FRONTEND}/Image/40x40/ced4da/6c757d`,
alt: "..."
}
},
@@ -92,7 +112,7 @@ const unloadedState: BlogFeaturedState = {
slug: "demo-post",
badges: [ "demo" ],
image: {
- src: `${process.env.REACT_APP_API}/Image/850x350/dee2e6/6c757d`,
+ src: `${process.env.REACT_APP_FRONTEND}/Image/850x350/dee2e6/6c757d`,
alt: "..."
},
title: "Lorem ipsum",
@@ -101,7 +121,7 @@ const unloadedState: BlogFeaturedState = {
id: "",
nickName: "Admin",
image: {
- src: `${process.env.REACT_APP_API}/Image/40x40/ced4da/6c757d`,
+ src: `${process.env.REACT_APP_FRONTEND}/Image/40x40/ced4da/6c757d`,
alt: "..."
}
},
diff --git a/src/ClientApp/src/store/reducers/BlogItem.ts b/src/ClientApp/src/store/reducers/BlogItem.ts
index 8b1fdf6..7df3025 100644
--- a/src/ClientApp/src/store/reducers/BlogItem.ts
+++ b/src/ClientApp/src/store/reducers/BlogItem.ts
@@ -1,32 +1,51 @@
import { Action, Reducer } from 'redux'
import { AppThunkAction } from '../'
-import { GetBlogItemRequestModel } from '../../models/requests'
-import { GetBlogItemResponseModel } from '../../models/responses'
+// interfaces
+import { IParams, IRequest, IResponse } from '../../interfaces'
+import { IBlogItem } from '../../pages/Blog/Item'
+
import { Get } from '../../restClient'
-export interface BlogItemState extends GetBlogItemResponseModel {
+
+// Request
+interface IGetBlogItemPathParams extends IParams { }
+
+interface IGetBlogItemSearchParams extends IParams {
+ slug: string
+}
+
+interface IGetBlogItemRequestModel extends IRequest { }
+
+// Response
+interface IGetBlogItemResponseModel extends IBlogItem, IResponse { }
+
+
+export interface BlogItemState extends IGetBlogItemResponseModel {
isLoading: boolean
}
-interface RequestAction extends GetBlogItemRequestModel {
+interface RequestAction extends IGetBlogItemRequestModel {
type: 'REQUEST_BLOG_ITEM'
}
-interface ReceiveAction extends GetBlogItemResponseModel {
+interface ReceiveAction extends IGetBlogItemResponseModel {
type: 'RECEIVE_BLOG_ITEM'
}
type KnownAction = RequestAction | ReceiveAction
export const actionCreators = {
- requestBlogItem: (props?: GetBlogItemRequestModel): AppThunkAction => (dispatch, getState) => {
+ requestBlogItem: (props?: IGetBlogItemRequestModel): AppThunkAction => (dispatch, getState) => {
- const locale = getState().content?.localization.locale
+ const locale = process.env.REACT_APP_LOCALE
const searchParams = {...props?.searchParams, locale}
- Get>(`${process.env.REACT_APP_API}/Image/${process.env.REACT_APP_BLOGITEM}/${process.env.REACT_APP_SITEID}`, props?.pathParams, searchParams)
+ if(process.env.REACT_APP_LOCAL_ONLY == 'Y')
+ return
+
+ Get>(`${process.env.REACT_APP_API}/${process.env.REACT_APP_BLOGITEM}/${process.env.REACT_APP_SITEID}`, props?.pathParams, searchParams)
.then(response => response)
.then(data => {
if(data)
@@ -41,7 +60,7 @@ const unloadedState: BlogItemState = {
id: "",
slug: "demo-post",
image: {
- src: `${process.env.REACT_APP_API}/Image/900x400/ced4da/6c757d`,
+ src: `${process.env.REACT_APP_FRONTEND}/Image/900x400/ced4da/6c757d`,
alt: "..."
},
badges: [
@@ -60,63 +79,13 @@ const unloadedState: BlogItemState = {
id: "",
nickName: "Admin",
image: {
- src: `${process.env.REACT_APP_API}/Image/40x40/ced4da/6c757d`,
+ src: `${process.env.REACT_APP_FRONTEND}/Image/40x40/ced4da/6c757d`,
alt: "..."
}
},
created: new Date().toString(),
tags: [ "react", "redux", "webapi" ],
- comments: [
- {
- author: {
- id: "",
- nickName: "Commenter Name 1",
- image: {
- src: `${process.env.REACT_APP_API}/Image/50x50/ced4da/6c757d`,
- alt: "..."
- }
- },
- comment: "If you're going to lead a space frontier, it has to be government; it'll never be private enterprise. Because the space frontier is dangerous, and it's expensive, and it has unquantified risks.",
- responses: [
- {
- author: {
- id: "",
- nickName: "Commenter Name 4",
- image: {
- src: `${process.env.REACT_APP_API}/Image/50x50/ced4da/6c757d`,
- alt: "..."
- }
- },
- comment: "And under those conditions, you cannot establish a capital-market evaluation of that enterprise. You can't get investors."
- },
- {
- author: {
- id: "",
- nickName: "Commenter Name 3",
- image: {
- src: `${process.env.REACT_APP_API}/Image/50x50/ced4da/6c757d`,
- alt: "..."
- }
- },
- comment: "When you put money directly to a problem, it makes a good headline."
- }
- ]
- },
- {
- author: {
- id: "",
- nickName: "Commenter Name 2",
- image: {
- src: `${process.env.REACT_APP_API}/Image/50x50/ced4da/6c757d`,
- alt: "..."
- }
- },
- comment: "When I look at the universe and all the ways the universe wants to kill us, I find it hard to reconcile that with statements of beneficence."
- }
-
- ],
-
isLoading: false
}
diff --git a/src/ClientApp/src/store/reducers/Comments.ts b/src/ClientApp/src/store/reducers/Comments.ts
new file mode 100644
index 0000000..526c8ea
--- /dev/null
+++ b/src/ClientApp/src/store/reducers/Comments.ts
@@ -0,0 +1,132 @@
+//Redux
+import { Action, Reducer } from 'redux'
+import { AppThunkAction } from '../'
+
+// Interfaces
+import { IPagination, IParams, IRequest, IResponse } from '../../interfaces'
+import { IComment } from '../../pages/Blog/Item/CommentsComponent'
+
+import { Get } from '../../restClient'
+
+// Request
+interface IGetCommentsPathParams extends IParams { }
+
+interface IGetCommentsSearchParams extends IParams { }
+
+interface IGetCommentsRequestModel extends IRequest { }
+
+// Response
+interface IGetCommentsResponseModel extends IPagination, IResponse { }
+
+export interface CommentsState extends IGetCommentsResponseModel {
+ isLoading: boolean
+}
+
+interface RequestAction extends IGetCommentsRequestModel {
+ type: 'REQUEST_COMMENTS'
+}
+
+interface ReceiveAction extends IGetCommentsResponseModel {
+ type: 'RECEIVE_COMMENTS'
+}
+
+type KnownAction = RequestAction | ReceiveAction
+
+export const actionCreators = {
+ requestComments: (props?: IGetCommentsRequestModel): AppThunkAction => (dispatch, getState) => {
+
+ if(process.env.REACT_APP_LOCAL_ONLY == 'Y')
+ return
+
+ /*
+ Get>(`${process.env.REACT_APP_API}/${process.env.REACT_APP_BLOGITEMS}/${process.env.REACT_APP_SITEID}`, props?.pathParams, searchParams)
+ .then(response => response)
+ .then(data => {
+ if(data)
+ dispatch({ type: 'RECEIVE_BLOG_CATALOG', ...data })
+ })
+
+ dispatch({ type: 'REQUEST_BLOG_CATALOG' })
+ */
+ }
+}
+
+const unloadedState: CommentsState = {
+ totalPages: 100,
+ currentPage: 1,
+ items: [
+ {
+ author: {
+ id: "",
+ nickName: "Commenter Name 1",
+ image: {
+ src: `${process.env.REACT_APP_FRONTEND}/Image/50x50/ced4da/6c757d`,
+ alt: "..."
+ }
+ },
+ comment: "If you're going to lead a space frontier, it has to be government; it'll never be private enterprise. Because the space frontier is dangerous, and it's expensive, and it has unquantified risks.",
+
+ responses: [
+ {
+ author: {
+ id: "",
+ nickName: "Commenter Name 4",
+ image: {
+ src: `${process.env.REACT_APP_FRONTEND}/Image/50x50/ced4da/6c757d`,
+ alt: "..."
+ }
+ },
+ comment: "And under those conditions, you cannot establish a capital-market evaluation of that enterprise. You can't get investors."
+ },
+ {
+ author: {
+ id: "",
+ nickName: "Commenter Name 3",
+ image: {
+ src: `${process.env.REACT_APP_FRONTEND}/Image/50x50/ced4da/6c757d`,
+ alt: "..."
+ }
+ },
+ comment: "When you put money directly to a problem, it makes a good headline."
+ }
+ ]
+ },
+ {
+ author: {
+ id: "",
+ nickName: "Commenter Name 2",
+ image: {
+ src: `${process.env.REACT_APP_FRONTEND}/Image/50x50/ced4da/6c757d`,
+ alt: "..."
+ }
+ },
+ comment: "When I look at the universe and all the ways the universe wants to kill us, I find it hard to reconcile that with statements of beneficence."
+ }
+
+ ],
+
+ isLoading: false
+}
+
+export const reducer: Reducer = (state: CommentsState | undefined, incomingAction: Action): CommentsState => {
+ if (state === undefined) {
+ return unloadedState
+ }
+
+ const action = incomingAction as KnownAction
+ switch (action.type) {
+ case 'REQUEST_COMMENTS':
+ return {
+ ...state,
+ isLoading: true
+ }
+
+ case 'RECEIVE_COMMENTS':
+ return {
+ ...action,
+ isLoading: false
+ }
+ }
+
+ return state
+}
diff --git a/src/ClientApp/src/store/reducers/Content.ts b/src/ClientApp/src/store/reducers/Content.ts
index 52ee8bd..9d202cd 100644
--- a/src/ClientApp/src/store/reducers/Content.ts
+++ b/src/ClientApp/src/store/reducers/Content.ts
@@ -2,28 +2,103 @@ import { Action, Reducer } from 'redux'
import { AppThunkAction } from '../'
import { ReservedWords } from '../../enumerations'
-import { GetContentRequestModel } from '../../models/requests'
-import { GetContentResponseModel } from '../../models/responses'
+
+// Interfaces
+import { IHeader, IParams, IRequest, IResponse } from '../../interfaces'
+
+import { IRoute } from '../../App'
+
+import { INavMenuItem } from '../../layouts/public/NavMenu'
+import { ISideMenuItem } from '../../layouts/admin/SideMenu'
+
+import { IHomePage } from '../../pages/Home'
+
+import { IShopCatalogPage } from '../../pages/Shop/Catalog'
+import { IShopItemPage } from '../../pages/Shop/Item'
+
+import { IBlogCatalogPage } from '../../pages/Blog/Catalog'
+import { IBlogItemPage } from '../../pages/Blog/Item'
+
+import { ISigninPage } from '../../pages/Signin'
+import { ISignupPage } from '../../pages/Signup'
+
+import { IShopCartPage } from '../../pages/Shop/Cart'
+import { IShopCheckoutPage } from '../../pages/Shop/Checkout'
+
+
import { Get } from '../../restClient'
-export interface ContentState extends GetContentResponseModel {
+
+// Request
+interface IGetContentPathParams extends IParams {}
+
+interface IGetContentSearchParams extends IParams {
+ locale?: string
+}
+
+interface IGetContentRequestModel extends IRequest { }
+
+interface ILocalization {
+ timeZone: string,
+ locale: string,
+ dateFormat: string,
+ timeFormat: string,
+ currency: string,
+ currencySymbol: string
+}
+
+// Response
+interface IGetContentResponseModel extends IResponse {
+
+ siteName: string,
+ siteUrl: string,
+
+ header: IHeader,
+
+ localization: ILocalization,
+
+ routes: IRoute [],
+ adminRoutes: IRoute [],
+ serviceRoutes: IRoute [],
+
+ topMenu: INavMenuItem [],
+ sideMenu: ISideMenuItem [],
+
+ homePage: IHomePage,
+
+ shopCatalog: IShopCatalogPage,
+ shopItem: IShopItemPage,
+ shopCart: IShopCartPage,
+ shopCheckout: IShopCheckoutPage,
+
+ blogCatalog: IBlogCatalogPage,
+ blogItem: IBlogItemPage,
+
+ signIn: ISigninPage,
+ signUp: ISignupPage
+}
+
+export interface ContentState extends IGetContentResponseModel {
isLoading: boolean
}
-interface RequestAction extends GetContentRequestModel {
+interface RequestAction extends IGetContentRequestModel {
type: 'REQUEST_CONTENT'
}
-interface ReceiveAction extends GetContentResponseModel {
+interface ReceiveAction extends IGetContentResponseModel {
type: 'RECEIVE_CONTENT'
}
type KnownAction = RequestAction | ReceiveAction;
export const actionCreators = {
- requestContent: (props?: GetContentRequestModel): AppThunkAction => (dispatch, getState) => {
+ requestContent: (props?: IGetContentRequestModel): AppThunkAction => (dispatch, getState) => {
- Get>(`${process.env.REACT_APP_API}/Image/${process.env.REACT_APP_CONTENT}/${process.env.REACT_APP_SITEID}`, props?.pathParams, props?.searchParams)
+ if(process.env.REACT_APP_LOCAL_ONLY == 'Y')
+ return
+
+ Get>(`${process.env.REACT_APP_API}/${process.env.REACT_APP_CONTENT}/${process.env.REACT_APP_SITEID}`, props?.pathParams, props?.searchParams)
.then(response => response)
.then((data) => {
if(data) {
@@ -36,8 +111,8 @@ export const actionCreators = {
}
const unloadedState: ContentState = {
- siteName: "MAKS-IT",
- siteUrl: "https://maks-it.com",
+ siteName: "Contoso",
+ siteUrl: "https://contoso.com",
header: {
title: `${ReservedWords.siteName}`,
@@ -57,29 +132,42 @@ const unloadedState: ContentState = {
currency: "EUR",
currencySymbol: "€"
},
+
routes: [
{ target: "/", component: "Home" },
{ target: "/home", component: "Home" },
{ target: "/shop", childRoutes: [
- { target: "", component: "ShopCatalog" },
- { target: ":page", component: "ShopCatalog" },
- { target: ":page" , childRoutes: [
- { target: ":slug", component: "ShopItem" }
- ]},
+ { target: ":category", childRoutes: [
+ { target: "", component: "ShopCatalog" },
+ { target: ":page", component: "ShopCatalog" }
+ ] },
+ { target: ":category", childRoutes: [
+ { target: ":page" , childRoutes: [
+ { target: ":slug", component: "ShopItem" }
+ ]}
+ ] },
+
{ target:"cart", childRoutes: [
{ target: "", component: "Cart" },
{ target: "checkout", component: "Checkout" }
]}
]},
+
{ target: "/blog", childRoutes: [
- { target: "", component: "BlogCatalog" },
- { target: ":page", component: "BlogCatalog" },
- { target: ":page" , childRoutes: [
- { target: ":slug", component: "BlogItem" }
- ]}
+ { target: ":category", childRoutes: [
+ { target: "", component: "BlogCatalog" },
+ { target: ":page", component: "BlogCatalog" }
+ ] },
+ { target: ":category", childRoutes: [
+ { target: ":page" , childRoutes: [
+ { target: ":slug", component: "BlogItem" }
+ ]}
+ ] }
]}
],
+
adminRoutes: [],
+
serviceRoutes: [
{ target: "/signin", component: "Signin" },
{ target: "/signup", component: "Signup" }
@@ -87,14 +175,15 @@ const unloadedState: ContentState = {
topMenu: [
{ target: "/", title: "Home" },
- { target: "/shop", title: "Shop" },
- { target: "/blog", title: "Blog" },
+ { target: "/shop/default", title: "Shop" },
+ { target: "/blog/default", title: "Blog" },
{ target: "/signin", title: "Sing in" },
{ target: "/signup", title: "Sign up" },
{ target: "/shop/cart", icon: "shopping-cart", title: `Cart (${ReservedWords.quantity})` }
],
+
sideMenu: [],
homePage: {
@@ -141,8 +230,7 @@ const unloadedState: ContentState = {
{
text: "The = (state: ContentState | undefined, incomingAction: Action): ContentState => {
if (state === undefined) {
- console.log(unloadedState)
return unloadedState
}
diff --git a/src/ClientApp/src/store/reducers/Header.ts b/src/ClientApp/src/store/reducers/Header.ts
index fdf05e5..a4b4cf6 100644
--- a/src/ClientApp/src/store/reducers/Header.ts
+++ b/src/ClientApp/src/store/reducers/Header.ts
@@ -2,19 +2,19 @@ import { Action, Reducer } from 'redux'
import { AppThunkAction } from '..'
import { ReservedWords } from '../../enumerations'
-import { HeaderLink, HeaderModel } from '../../models'
+import { IHeader } from '../../interfaces'
// -----------------
// STATE - This defines the type of data maintained in the Redux store.
-export interface HeaderState extends HeaderModel {}
+export interface HeaderState extends IHeader {}
// -----------------
// ACTIONS - These are serializable (hence replayable) descriptions of state transitions.
// They do not themselves have any side-effects they just describe something that is going to happen.
// Use @typeName and isActionType for type detection that works even after serialization/deserialization.
-export interface ReceiveAction extends HeaderModel { type: 'RECEIVE_UPDATE_HEADER' }
+export interface ReceiveAction extends IHeader { type: 'RECEIVE_UPDATE_HEADER' }
// Declare a 'discriminated union' type. This guarantees that all references to 'type' properties contain one of the
@@ -27,7 +27,7 @@ export type KnownAction = ReceiveAction
export const actionCreators = {
- updateHeader: (props: HeaderModel): AppThunkAction => (dispatch, getState) => {
+ updateHeader: (props: IHeader): AppThunkAction => (dispatch, getState) => {
const siteName = getState().content?.siteName
const baseHeader = getState().content?.header
diff --git a/src/ClientApp/src/store/reducers/Loader.ts b/src/ClientApp/src/store/reducers/Loader.ts
deleted file mode 100644
index 42cfbe1..0000000
--- a/src/ClientApp/src/store/reducers/Loader.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { Action, Reducer } from 'redux'
-
-// -----------------
-// STATE - This defines the type of data maintained in the Redux store.
-
-export interface LoaderState {
- visible: boolean
-}
-
-interface RequestAction {
- type: 'SHOW_LOADER'
-}
-
-interface ReceiveAction {
- type: 'HIDE_LOADER'
-}
-
-// Declare a 'discriminated union' type. This guarantees that all references to 'type' properties contain one of the
-// declared type strings (and not any other arbitrary string).
-export type KnownAction = RequestAction | ReceiveAction
-
-// ----------------
-// ACTION CREATORS - These are functions exposed to UI components that will trigger a state transition.
-// They don't directly mutate state, but they can have external side-effects (such as loading data).
-
-export const actionCreators = {
- show: () => ({ type: 'SHOW_LOADER' } as RequestAction),
- hide: () => ({ type: 'HIDE_LOADER' } as ReceiveAction)
-}
-
-// ----------------
-// REDUCER - For a given state and action, returns the new state. To support time travel, this must not mutate the old state.
-
-const unloadedState: LoaderState = {
- visible: false
-}
-
-export const reducer: Reducer = (state: LoaderState | undefined, incomingAction: Action): LoaderState => {
- if (state === undefined) {
- return unloadedState
- }
-
- const action = incomingAction as KnownAction
- switch (action.type) {
- case 'SHOW_LOADER':
- return { visible: true }
- case 'HIDE_LOADER':
- return { visible: false }
- }
-
- return state
-}
\ No newline at end of file
diff --git a/src/ClientApp/src/store/reducers/ShopCart.ts b/src/ClientApp/src/store/reducers/ShopCart.ts
index 86e6b2e..dc5a049 100644
--- a/src/ClientApp/src/store/reducers/ShopCart.ts
+++ b/src/ClientApp/src/store/reducers/ShopCart.ts
@@ -1,22 +1,35 @@
import { Action, Reducer } from 'redux'
import { AppThunkAction } from '..'
-import { GetShopCartItemsRequestModel } from '../../models/requests'
-import { GetShopCartItemResponseModel } from '../../models/responses'
+// Interfaces
+import { IPagination, IParams, IRequest, IResponse } from '../../interfaces'
+import { IShopCartItem } from '../../pages/Shop/Cart'
+
import { Get } from '../../restClient'
-export interface ShopCartState {
- items: GetShopCartItemResponseModel [],
+// Request
+interface IGetShopCartItemsPathParams extends IParams {
+ userId: string
+}
+
+interface IGetShopCartItemsSearchParams extends IParams { }
+
+interface IGetShopCartItemsRequestModel extends IRequest {}
+
+// Response
+interface IGetShopCartItemsResponseModel extends IPagination, IResponse {}
+
+
+export interface ShopCartState extends IGetShopCartItemsResponseModel {
isLoading: boolean
}
-export interface RequestAction {
+export interface RequestAction extends IGetShopCartItemsRequestModel {
type: 'REQUEST_CART_ITEMS'
}
-export interface ReceiveAction {
- items: GetShopCartItemResponseModel [],
+export interface ReceiveAction extends IGetShopCartItemsResponseModel {
type: 'RECEIVE_CART_ITEMS'
}
@@ -31,14 +44,16 @@ export interface ReceiveAction {
export type KnownAction = RequestAction | ReceiveAction //| IncrementItemQuantityAction | DecrementItmeQuantityAction
export const actionCreators = {
- requestCart: (props?: GetShopCartItemsRequestModel): AppThunkAction => (dispatch, getState) => {
+ requestCart: (props?: IGetShopCartItemsRequestModel): AppThunkAction => (dispatch, getState) => {
+ if(process.env.REACT_APP_LOCAL_ONLY == 'Y')
+ return
- Get>('https://localhost:7151/api/ShopCartItems/404c8232-9048-4519-bfba-6e78dc7005ca', props?.pathParams, props?.searchParams)
+ Get>('https://localhost:7151/api/ShopCartItems/404c8232-9048-4519-bfba-6e78dc7005ca', props?.pathParams, props?.searchParams)
.then(response => response)
.then(data => {
if(data)
- dispatch({ type: 'RECEIVE_CART_ITEMS', items: [...data] })
+ dispatch({ type: 'RECEIVE_CART_ITEMS', ...data })
})
dispatch({ type: 'REQUEST_CART_ITEMS' })
@@ -75,11 +90,13 @@ export const actionCreators = {
}
const unloadedState: ShopCartState = {
+ totalPages: 1,
+ currentPage: 1,
items: [
{
slug: "shop-catalog-item",
sku: "SKU-0",
- image: { src: `${process.env.REACT_APP_API}/Image/450x300/dee2e6/6c757d`, alt: "..." },
+ image: { src: `${process.env.REACT_APP_FRONTEND}/Image/450x300/dee2e6/6c757d`, alt: "..." },
title: "Shop item title",
brandName: "Brand & Name",
shortText: "Lorem ipsum, dolor sit amet consectetur adipisicing elit. Eaque fugit ratione dicta mollitia. Officiis ad...",
@@ -91,7 +108,7 @@ const unloadedState: ShopCartState = {
{
slug: "shop-catalog-item",
sku: "SKU-0",
- image: { src: `${process.env.REACT_APP_API}/Image/450x300/dee2e6/6c757d`, alt: "..." },
+ image: { src: `${process.env.REACT_APP_FRONTEND}/Image/450x300/dee2e6/6c757d`, alt: "..." },
title: "Shop item title",
brandName: "Brand & Name",
shortText: "Lorem ipsum, dolor sit amet consectetur adipisicing elit. Eaque fugit ratione dicta mollitia. Officiis ad...",
@@ -103,7 +120,7 @@ const unloadedState: ShopCartState = {
{
slug: "shop-catalog-item",
sku: "SKU-0",
- image: { src: `${process.env.REACT_APP_API}/Image/450x300/dee2e6/6c757d`, alt: "..." },
+ image: { src: `${process.env.REACT_APP_FRONTEND}/Image/450x300/dee2e6/6c757d`, alt: "..." },
title: "Shop item title",
brandName: "Brand & Name",
shortText: "Lorem ipsum, dolor sit amet consectetur adipisicing elit. Eaque fugit ratione dicta mollitia. Officiis ad...",
diff --git a/src/ClientApp/src/store/reducers/ShopCatalog.ts b/src/ClientApp/src/store/reducers/ShopCatalog.ts
index c1d87bd..7abbb52 100644
--- a/src/ClientApp/src/store/reducers/ShopCatalog.ts
+++ b/src/ClientApp/src/store/reducers/ShopCatalog.ts
@@ -1,10 +1,29 @@
import { Action, Reducer } from 'redux'
import { AppThunkAction } from '../'
-import { GetShopCatalogRequestModel } from '../../models/requests'
-import { GetShopCatalogResponseModel } from '../../models/responses'
+// Interfaces
+import { IPagination, IParams, IRequest, IResponse } from '../../interfaces'
+import { IShopItem } from '../../pages/Shop/Catalog/ShopItemsSection'
+
import { Get } from '../../restClient'
+
+// Request
+interface IGetShopcatalogPathParams extends IParams {}
+
+interface IGeShopCatalogSearchParams extends IParams {}
+
+interface GetShopCatalogRequestModel extends IRequest {
+ category?: string,
+ searchText?: string,
+ currentPage?: string,
+ itemsPerPage?: string
+}
+
+// Response
+interface GetShopCatalogResponseModel extends IPagination, IResponse {}
+
+
export interface ShopCatalogState extends GetShopCatalogResponseModel {
isLoading: boolean
}
@@ -22,11 +41,14 @@ type KnownAction = RequestAction | ReceiveAction
export const actionCreators = {
requestShopCatalog: (props?: GetShopCatalogRequestModel): AppThunkAction => (dispatch, getState) => {
- const locale = getState().content?.localization.locale
+ const locale = process.env.REACT_APP_LOCALE
const searchParams = { ...props?.searchParams, locale }
- Get>(`${process.env.REACT_APP_API}/Image/${process.env.REACT_APP_SHOPITEMS}/${process.env.REACT_APP_SITEID}`, props?.pathParams, searchParams)
+ if(process.env.REACT_APP_LOCAL_ONLY == 'Y')
+ return
+
+ Get>(`${process.env.REACT_APP_API}/${process.env.REACT_APP_SITEID}/${process.env.REACT_APP_SHOPITEMS}`, props?.pathParams, searchParams)
.then(response => response)
.then(data => {
if(data)
@@ -38,14 +60,14 @@ export const actionCreators = {
}
const unloadedState: ShopCatalogState = {
- totalPages: 1,
+ totalPages: 100,
currentPage: 1,
items: [
{
id: '',
slug: "shop-catalog-item",
sku: "SKU-0",
- image: { src: `${process.env.REACT_APP_API}/Image/450x300/dee2e6/6c757d`, alt: "..." },
+ image: { src: `${process.env.REACT_APP_FRONTEND}/Image/450x300/dee2e6/6c757d`, alt: "..." },
badges: [ "sale" ],
title: "Shop item title",
brandName: "Brand & Name",
@@ -54,7 +76,7 @@ const unloadedState: ShopCatalogState = {
text: "",
author: {
id: '',
- image: { src: `${process.env.REACT_APP_API}/Image/40x40/ced4da/6c757d`, alt: "..." },
+ image: { src: `${process.env.REACT_APP_FRONTEND}/Image/40x40/ced4da/6c757d`, alt: "..." },
nickName: "Admin"
},
created: (new Date).toString(),
@@ -69,7 +91,7 @@ const unloadedState: ShopCatalogState = {
id: '',
slug: "shop-catalog-item",
sku: "SKU-0",
- image: { src: `${process.env.REACT_APP_API}/Image/450x300/dee2e6/6c757d`, alt: "..." },
+ image: { src: `${process.env.REACT_APP_FRONTEND}/Image/450x300/dee2e6/6c757d`, alt: "..." },
badges: [ "sale" ],
title: "Shop item title",
brandName: "Brand & Name",
@@ -78,7 +100,7 @@ const unloadedState: ShopCatalogState = {
text: "",
author: {
id: '',
- image: { src: `${process.env.REACT_APP_API}/Image/40x40/ced4da/6c757d`, alt: "..." },
+ image: { src: `${process.env.REACT_APP_FRONTEND}/Image/40x40/ced4da/6c757d`, alt: "..." },
nickName: "Admin"
},
created: (new Date).toString(),
@@ -93,7 +115,7 @@ const unloadedState: ShopCatalogState = {
id: '',
slug: "shop-catalog-item",
sku: "SKU-0",
- image: { src: `${process.env.REACT_APP_API}/Image/450x300/dee2e6/6c757d`, alt: "..." },
+ image: { src: `${process.env.REACT_APP_FRONTEND}/Image/450x300/dee2e6/6c757d`, alt: "..." },
badges: [ "sale", "out of stock" ],
title: "Shop item title",
brandName: "Brand & Name",
@@ -102,7 +124,7 @@ const unloadedState: ShopCatalogState = {
text: "",
author: {
id: '',
- image: { src: `${process.env.REACT_APP_API}/Image/40x40/ced4da/6c757d`, alt: "..." },
+ image: { src: `${process.env.REACT_APP_FRONTEND}/Image/40x40/ced4da/6c757d`, alt: "..." },
nickName: "Admin"
},
created: (new Date).toString(),
@@ -117,7 +139,7 @@ const unloadedState: ShopCatalogState = {
id: '',
slug: "shop-catalog-item",
sku: "SKU-0",
- image: { src: `${process.env.REACT_APP_API}/Image/450x300/dee2e6/6c757d`, alt: "..." },
+ image: { src: `${process.env.REACT_APP_FRONTEND}/Image/450x300/dee2e6/6c757d`, alt: "..." },
badges: [ "sale" ],
title: "Shop item title",
brandName: "Brand & Name",
@@ -126,7 +148,7 @@ const unloadedState: ShopCatalogState = {
text: "",
author: {
id: '',
- image: { src: `${process.env.REACT_APP_API}/Image/40x40/ced4da/6c757d`, alt: "..." },
+ image: { src: `${process.env.REACT_APP_FRONTEND}/Image/40x40/ced4da/6c757d`, alt: "..." },
nickName: "Admin"
},
created: (new Date).toString(),
diff --git a/src/ClientApp/src/store/reducers/ShopCategories.ts b/src/ClientApp/src/store/reducers/ShopCategories.ts
index 325aed4..6377fc5 100644
--- a/src/ClientApp/src/store/reducers/ShopCategories.ts
+++ b/src/ClientApp/src/store/reducers/ShopCategories.ts
@@ -1,10 +1,24 @@
import { Action, Reducer } from 'redux'
import { AppThunkAction } from '../'
-import { GetShopCategoriesRequestModel } from '../../models/requests'
-import { GetShopCategoriesResponseModel } from '../../models/responses'
+// Interfaces
+import { IPagination, IParams, IRequest, IResponse } from '../../interfaces'
+import { ICategory } from '../../components/SideWidgets/Categories'
+
import { Get } from '../../restClient'
+// Request
+interface GetShopCategoriesPathParams extends IParams { }
+
+interface GetShopCategoriesSearchParams extends IParams { }
+
+interface GetShopCategoriesRequestModel extends IRequest { }
+
+
+// Response
+interface GetShopCategoriesResponseModel extends IPagination, IResponse { }
+
+
export interface ShopCategoriesState extends GetShopCategoriesResponseModel {
isLoading: boolean
}
@@ -22,7 +36,10 @@ type KnownAction = RequestAction | ReceiveAction
export const actionCreators = {
requestShopCategories: (props?: GetShopCategoriesRequestModel): AppThunkAction => (dispatch, getState) => {
- Get>('https://localhost:7151/api/ShopCategories', props?.pathParams, props?.searchParams)
+ if(process.env.REACT_APP_LOCAL_ONLY == 'Y')
+ return
+
+ Get>(`${process.env.REACT_APP_API}/${process.env.REACT_APP_CATEGORYITEMS}/${process.env.REACT_APP_SITEID}`, props?.pathParams, props?.searchParams)
.then(response => response)
.then(data => {
if(data)
@@ -34,9 +51,12 @@ export const actionCreators = {
}
const unloadedState: ShopCategoriesState = {
+ totalPages: 1,
+ currentPage: 1,
items: [
- { id: "", text: "Software" },
- { id: "", text: "Hardware" }
+ { href: 'default', anchorText: "Default" },
+ { href: 'software', anchorText: "Software" },
+ { href: 'hardware', anchorText: "Hardware" }
],
isLoading: false
}
diff --git a/src/ClientApp/src/store/reducers/ShopFeatured.ts b/src/ClientApp/src/store/reducers/ShopFeatured.ts
index 80d2ef5..0d0655f 100644
--- a/src/ClientApp/src/store/reducers/ShopFeatured.ts
+++ b/src/ClientApp/src/store/reducers/ShopFeatured.ts
@@ -1,28 +1,47 @@
import { Action, Reducer } from 'redux'
import { AppThunkAction } from '../'
-import { GetShopFeaturedRequestModel, } from '../../models/requests'
-import { GetShopFeaturedResponseModel } from '../../models/responses'
+// Interfaces
+import { IParams, IRequest, IResponse } from '../../interfaces'
+import { IRelatedProduct } from '../../pages/Shop/Item/RelatedProducts'
+
+
import { Get } from '../../restClient'
-export interface ShopFeaturedState extends GetShopFeaturedResponseModel {
+// Request
+interface IGetShopFeaturedSearchParams extends IParams { }
+
+interface IGetShopFeaturedPathParams extends IParams { }
+
+interface IGetShopFeaturedRequestModel extends IRequest { }
+
+// Response
+interface IGetShopFeaturedResponseModel extends IResponse {
+ items: IRelatedProduct []
+}
+
+
+export interface ShopFeaturedState extends IGetShopFeaturedResponseModel {
isLoading: boolean
}
-interface RequestAction extends GetShopFeaturedRequestModel {
+interface RequestAction extends IGetShopFeaturedRequestModel {
type: 'REQUEST_SHOP_FEATURED'
}
-interface ReceiveAction extends GetShopFeaturedResponseModel {
+interface ReceiveAction extends IGetShopFeaturedResponseModel {
type: 'RECEIVE_SHOP_FEATURED'
}
type KnownAction = RequestAction | ReceiveAction
export const actionCreators = {
- requestShopFeatured: (props?: GetShopFeaturedRequestModel): AppThunkAction => (dispatch, getState) => {
+ requestShopFeatured: (props?: IGetShopFeaturedRequestModel): AppThunkAction => (dispatch, getState) => {
- Get>('https://localhost:7151/api/ShopFeatured', props?.pathParams, props?.searchParams)
+ if(process.env.REACT_APP_LOCAL_ONLY == 'Y')
+ return
+
+ Get>('https://localhost:7151/api/ShopFeatured', props?.pathParams, props?.searchParams)
.then(response => response)
.then(data => {
if(data)
@@ -39,7 +58,7 @@ const unloadedState: ShopFeaturedState = {
id: '',
slug: "shop-catalog-item",
sku: "SKU-0",
- image: { src: `${process.env.REACT_APP_API}/Image/450x300/dee2e6/6c757d`, alt: "..." },
+ image: { src: `${process.env.REACT_APP_FRONTEND}/Image/450x300/dee2e6/6c757d`, alt: "..." },
badges: [ "sale" ],
title: "Shop item title",
brandName: "Brand & Name",
@@ -48,7 +67,7 @@ const unloadedState: ShopFeaturedState = {
text: "",
author: {
id: '',
- image: { src: `${process.env.REACT_APP_API}/Image/40x40/ced4da/6c757d`, alt: "..." },
+ image: { src: `${process.env.REACT_APP_FRONTEND}/Image/40x40/ced4da/6c757d`, alt: "..." },
nickName: "Admin"
},
created: (new Date).toString(),
diff --git a/src/ClientApp/src/store/reducers/ShopItem.ts b/src/ClientApp/src/store/reducers/ShopItem.ts
index 318d657..5878d72 100644
--- a/src/ClientApp/src/store/reducers/ShopItem.ts
+++ b/src/ClientApp/src/store/reducers/ShopItem.ts
@@ -1,11 +1,27 @@
import { Action, Reducer } from 'redux'
import { AppThunkAction } from '../'
-import { GetShopItemRequestModel } from '../../models/requests'
-import { GetShopItemResponseModel } from '../../models/responses'
+// Interfaces
+import { IParams, IRequest, IResponse } from '../../interfaces'
+import { IShopItem } from '../../pages/Shop/Item'
+
import { Get } from '../../restClient'
+// Reuest
+interface IGetShopItemPathParams extends IParams { }
+
+interface IGetShopItemSearchParams extends IParams {
+ slug: string
+}
+
+interface GetShopItemRequestModel extends IRequest { }
+
+
+// Response
+interface GetShopItemResponseModel extends IShopItem, IResponse { }
+
+
export interface ShopItemState extends GetShopItemResponseModel {
isLoading: boolean
}
@@ -22,7 +38,10 @@ type KnownAction = RequestAction | ReceiveAction
export const actionCreators = {
requestShopItem: (props?: GetShopItemRequestModel): AppThunkAction => (dispatch, getState) => {
-
+
+ if(process.env.REACT_APP_LOCAL_ONLY == 'Y')
+ return
+
Get>('https://localhost:7151/api/ShopItem', props?.pathParams, props?.searchParams)
.then(response => response)
.then(data => {
@@ -38,7 +57,7 @@ const unloadedState: ShopItemState = {
id: "",
slug: "demo-post",
image: {
- src: `${process.env.REACT_APP_API}/Image/600x700/dee2e6/6c757d`,
+ src: `${process.env.REACT_APP_FRONTEND}/Image/600x700/dee2e6/6c757d`,
alt: "..."
},
@@ -56,7 +75,7 @@ const unloadedState: ShopItemState = {
id: "",
nickName: "Admin",
image: {
- src: `${process.env.REACT_APP_API}/Image/40x40/ced4da/6c757d`,
+ src: `${process.env.REACT_APP_FRONTEND}/Image/40x40/ced4da/6c757d`,
alt: "..."
}
},
@@ -68,56 +87,56 @@ const unloadedState: ShopItemState = {
quantity: 10,
- comments: [
- {
- author: {
- id: "",
- nickName: "Commenter Name 1",
- image: {
- src: `${process.env.REACT_APP_API}/Image/50x50/ced4da/6c757d`,
- alt: "..."
- }
- },
- comment: "If you're going to lead a space frontier, it has to be government; it'll never be private enterprise. Because the space frontier is dangerous, and it's expensive, and it has unquantified risks.",
+ // comments: [
+ // {
+ // author: {
+ // id: "",
+ // nickName: "Commenter Name 1",
+ // image: {
+ // src: `${process.env.REACT_APP_FRONTEND}/Image/50x50/ced4da/6c757d`,
+ // alt: "..."
+ // }
+ // },
+ // comment: "If you're going to lead a space frontier, it has to be government; it'll never be private enterprise. Because the space frontier is dangerous, and it's expensive, and it has unquantified risks.",
- responses: [
- {
- author: {
- id: "",
- nickName: "Commenter Name 4",
- image: {
- src: `${process.env.REACT_APP_API}/Image/50x50/ced4da/6c757d`,
- alt: "..."
- }
- },
- comment: "And under those conditions, you cannot establish a capital-market evaluation of that enterprise. You can't get investors."
- },
- {
- author: {
- id: "",
- nickName: "Commenter Name 3",
- image: {
- src: `${process.env.REACT_APP_API}/Image/50x50/ced4da/6c757d`,
- alt: "..."
- }
- },
- comment: "When you put money directly to a problem, it makes a good headline."
- }
- ]
- },
- {
- author: {
- id: "",
- nickName: "Commenter Name 2",
- image: {
- src: `${process.env.REACT_APP_API}/Image/50x50/ced4da/6c757d`,
- alt: "..."
- }
- },
- comment: "When I look at the universe and all the ways the universe wants to kill us, I find it hard to reconcile that with statements of beneficence."
- }
+ // responses: [
+ // {
+ // author: {
+ // id: "",
+ // nickName: "Commenter Name 4",
+ // image: {
+ // src: `${process.env.REACT_APP_FRONTEND}/Image/50x50/ced4da/6c757d`,
+ // alt: "..."
+ // }
+ // },
+ // comment: "And under those conditions, you cannot establish a capital-market evaluation of that enterprise. You can't get investors."
+ // },
+ // {
+ // author: {
+ // id: "",
+ // nickName: "Commenter Name 3",
+ // image: {
+ // src: `${process.env.REACT_APP_FRONTEND}/Image/50x50/ced4da/6c757d`,
+ // alt: "..."
+ // }
+ // },
+ // comment: "When you put money directly to a problem, it makes a good headline."
+ // }
+ // ]
+ // },
+ // {
+ // author: {
+ // id: "",
+ // nickName: "Commenter Name 2",
+ // image: {
+ // src: `${process.env.REACT_APP_FRONTEND}/Image/50x50/ced4da/6c757d`,
+ // alt: "..."
+ // }
+ // },
+ // comment: "When I look at the universe and all the ways the universe wants to kill us, I find it hard to reconcile that with statements of beneficence."
+ // }
- ],
+ // ],
isLoading: false
}
diff --git a/src/ClientApp/src/store/reducers/ShopRelated.ts b/src/ClientApp/src/store/reducers/ShopRelated.ts
index 5d228d0..c1b3f3c 100644
--- a/src/ClientApp/src/store/reducers/ShopRelated.ts
+++ b/src/ClientApp/src/store/reducers/ShopRelated.ts
@@ -1,28 +1,45 @@
import { Action, Reducer } from 'redux'
import { AppThunkAction } from '../'
-import { GetShopRelatedRequestModel } from '../../models/requests'
-import { GetShopRelatedResponseModel } from '../../models/responses'
+import { IParams, IRequest, IResponse } from '../../interfaces'
+import { IRelatedProduct } from '../../pages/Shop/Item/RelatedProducts'
+
import { Get } from '../../restClient'
-export interface ShopRelatedState extends GetShopRelatedResponseModel {
+// Resquest
+interface IGetShopRelatedPathParams extends IParams {}
+
+interface IGetShopRelatedSearchParams extends IParams {}
+
+interface IGetShopRelatedRequestModel extends IRequest { }
+
+// Response
+interface IGetShopRelatedResponseModel extends IResponse {
+ items: IRelatedProduct []
+}
+
+
+export interface ShopRelatedState extends IGetShopRelatedResponseModel {
isLoading: boolean
}
-interface RequestAction extends GetShopRelatedRequestModel {
+interface RequestAction extends IGetShopRelatedRequestModel {
type: 'REQUEST_SHOP_RELATED'
}
-interface ReceiveAction extends GetShopRelatedResponseModel {
+interface ReceiveAction extends IGetShopRelatedResponseModel {
type: 'RECEIVE_SHOP_RELATED'
}
type KnownAction = RequestAction | ReceiveAction
export const actionCreators = {
- requestShopRelated: (props?: GetShopRelatedRequestModel): AppThunkAction => (dispatch, getState) => {
+ requestShopRelated: (props?: IGetShopRelatedRequestModel): AppThunkAction => (dispatch, getState) => {
- Get>('https://localhost:7151/api/ShopRelated', props?.pathParams, props?.searchParams)
+ if(process.env.REACT_APP_LOCAL_ONLY == 'Y')
+ return
+
+ Get>('https://localhost:7151/api/ShopRelated', props?.pathParams, props?.searchParams)
.then(response => response)
.then(data => {
if(data)
@@ -39,7 +56,7 @@ const unloadedState: ShopRelatedState = {
id: '',
slug: "shop-catalog-item",
sku: "SKU-0",
- image: { src: `${process.env.REACT_APP_API}/Image/450x300/dee2e6/6c757d`, alt: "..." },
+ image: { src: `${process.env.REACT_APP_FRONTEND}/Image/450x300/dee2e6/6c757d`, alt: "..." },
badges: [ "sale", "best offer" ],
title: "Shop item title",
brandName: "Brand & Name",
@@ -48,7 +65,7 @@ const unloadedState: ShopRelatedState = {
text: "",
author: {
id: '',
- image: { src: `${process.env.REACT_APP_API}/Image/40x40/ced4da/6c757d`, alt: "..." },
+ image: { src: `${process.env.REACT_APP_FRONTEND}/Image/40x40/ced4da/6c757d`, alt: "..." },
nickName: "Admin"
},
created: (new Date).toString(),
@@ -63,7 +80,7 @@ const unloadedState: ShopRelatedState = {
id: '',
slug: "shop-catalog-item",
sku: "SKU-0",
- image: { src: `${process.env.REACT_APP_API}/Image/450x300/dee2e6/6c757d`, alt: "..." },
+ image: { src: `${process.env.REACT_APP_FRONTEND}/Image/450x300/dee2e6/6c757d`, alt: "..." },
badges: [ "sale", "best offer" ],
title: "Shop item title",
brandName: "Brand & Name",
@@ -72,7 +89,7 @@ const unloadedState: ShopRelatedState = {
text: "",
author: {
id: '',
- image: { src: `${process.env.REACT_APP_API}/Image/40x40/ced4da/6c757d`, alt: "..." },
+ image: { src: `${process.env.REACT_APP_FRONTEND}/Image/40x40/ced4da/6c757d`, alt: "..." },
nickName: "Admin"
},
created: (new Date).toString(),
@@ -87,7 +104,7 @@ const unloadedState: ShopRelatedState = {
id: '',
slug: "shop-catalog-item",
sku: "SKU-0",
- image: { src: `${process.env.REACT_APP_API}/Image/450x300/dee2e6/6c757d`, alt: "..." },
+ image: { src: `${process.env.REACT_APP_FRONTEND}/Image/450x300/dee2e6/6c757d`, alt: "..." },
badges: [ "sale", "best offer" ],
title: "Shop item title",
brandName: "Brand & Name",
@@ -96,7 +113,7 @@ const unloadedState: ShopRelatedState = {
text: "",
author: {
id: '',
- image: { src: `${process.env.REACT_APP_API}/Image/40x40/ced4da/6c757d`, alt: "..." },
+ image: { src: `${process.env.REACT_APP_FRONTEND}/Image/40x40/ced4da/6c757d`, alt: "..." },
nickName: "Admin"
},
created: (new Date).toString(),
@@ -111,7 +128,7 @@ const unloadedState: ShopRelatedState = {
id: '',
slug: "shop-catalog-item",
sku: "SKU-0",
- image: { src: `${process.env.REACT_APP_API}/Image/450x300/dee2e6/6c757d`, alt: "..." },
+ image: { src: `${process.env.REACT_APP_FRONTEND}/Image/450x300/dee2e6/6c757d`, alt: "..." },
badges: [ "sale", "best offer" ],
title: "Shop item title",
brandName: "Brand & Name",
@@ -120,7 +137,7 @@ const unloadedState: ShopRelatedState = {
text: "",
author: {
id: '',
- image: { src: `${process.env.REACT_APP_API}/Image/40x40/ced4da/6c757d`, alt: "..." },
+ image: { src: `${process.env.REACT_APP_FRONTEND}/Image/40x40/ced4da/6c757d`, alt: "..." },
nickName: "Admin"
},
created: (new Date).toString(),
diff --git a/src/ClientApp/src/store/reducers/WeatherForecasts.ts b/src/ClientApp/src/store/reducers/WeatherForecasts.ts
index 4d52f83..53763fd 100644
--- a/src/ClientApp/src/store/reducers/WeatherForecasts.ts
+++ b/src/ClientApp/src/store/reducers/WeatherForecasts.ts
@@ -1,6 +1,17 @@
import { Action, Reducer } from 'redux'
import { AppThunkAction } from '../'
+
+
+// export interface GetWeatherForecastResponseModel extends ResponseModel {
+// date: string,
+// temperatireC: number,
+// temperatureF: number,
+// summary?: string
+// }
+
+
+
// -----------------
// STATE - This defines the type of data maintained in the Redux store.
diff --git a/src/DomainObjects/Abstractions/PersonBase.cs b/src/DomainObjects/Abstractions/PersonBase.cs
index 66194b9..ace6d37 100644
--- a/src/DomainObjects/Abstractions/PersonBase.cs
+++ b/src/DomainObjects/Abstractions/PersonBase.cs
@@ -2,5 +2,5 @@
public abstract class PersonBase : DomainObjectBase {
public Guid Id { get; set; }
- public Image? Image { get; set; }
+ public MediaAttachment? Image { get; set; }
}
diff --git a/src/DomainObjects/Image.cs b/src/DomainObjects/Image.cs
deleted file mode 100644
index 1f9cdc3..0000000
--- a/src/DomainObjects/Image.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using DomainObjects.Abstractions;
-
-namespace DomainObjects;
-
-public class Image : DomainObjectBase {
- public string Src { get; set; }
-
- public string Alt { get; set; }
-
- public override int GetHashCode() {
- int hash = 17;
- hash = hash * 23 + Src.GetHashCode();
- hash = hash * 23 + Alt.GetHashCode();
- return hash;
- }
-}
-
diff --git a/src/DomainObjects/PageSections/TitleSection.cs b/src/DomainObjects/PageSections/TitleSection.cs
index 685ed15..35bf433 100644
--- a/src/DomainObjects/PageSections/TitleSection.cs
+++ b/src/DomainObjects/PageSections/TitleSection.cs
@@ -3,7 +3,7 @@
namespace DomainObjects.PageSections;
public class TitleSection : PageSectionBase {
- public Image? Image { get; set; }
+ public MediaAttachment? Image { get; set; }
public Link? PrimaryLink { get; set; }
public Link? SecondaryLink { get; set; }
public string? PostedOnBy { get; set; }
diff --git a/src/ImageProvider/ImageProvider.cs b/src/ImageProvider/ImageProvider.cs
index 86e7a85..6a1a6af 100644
--- a/src/ImageProvider/ImageProvider.cs
+++ b/src/ImageProvider/ImageProvider.cs
@@ -83,8 +83,6 @@ namespace ImageProvider {
image.Mutate(ctx => {
ctx.BackgroundColor(backgroundColor);
ctx.ApplyScalingWaterMark(font, $"{width}x{height}", foregroundColor, 5, false);
- //x.Fill(, new Rectangle(0, 0, width, height));
- //x.DrawText($"{width}x{height}", font, Color.Black, new PointF(10, 10));
});
using var stream = new MemoryStream();
diff --git a/src/ReverseProxy/appsettings.json b/src/ReverseProxy/appsettings.json
index 33f6967..3d65dc6 100644
--- a/src/ReverseProxy/appsettings.json
+++ b/src/ReverseProxy/appsettings.json
@@ -18,7 +18,7 @@
"route2": {
"ClusterId": "cluster1",
"Match": {
- "Path": "image/{**catchall}"
+ "Path": "Image/{**catchall}"
},
"Transforms": [
{ "PathPattern": "/api/Image/{**catchall}" }
diff --git a/src/WeatherForecast/Models/Content/Responses/MediaAttachmentResponseModel.cs b/src/WeatherForecast/Models/Content/Responses/MediaAttachmentResponseModel.cs
index 20daf17..2802edf 100644
--- a/src/WeatherForecast/Models/Content/Responses/MediaAttachmentResponseModel.cs
+++ b/src/WeatherForecast/Models/Content/Responses/MediaAttachmentResponseModel.cs
@@ -1,23 +1,25 @@
using Core.Abstractions.Models;
using Core.Enumerations;
+using DomainObjects;
using DomainObjects.Enumerations;
+using DomainObjects.L10n;
namespace WeatherForecast.Models.Content.Responses {
///
///
///
- public class MediaAttachmentL10nRequestModel : RequestModelBase {
+ public class MediaAttachmentL10nReponsetModel : ResponseModelBase {
///
///
///
- public Locales Locale { get; set; } = Locales.Unknown;
+ public Locales Locale { get; set; }
///
///
///
- public string Alt { get; set; } = string.Empty;
+ public string Alt { get; set; }
///
///
@@ -33,6 +35,18 @@ namespace WeatherForecast.Models.Content.Responses {
///
///
public string? Description { get; set; }
+
+ ///
+ ///
+ ///
+ ///
+ public MediaAttachmentL10nReponsetModel(MediaAttachmentL10n l10n) {
+ Locale = l10n.Locale;
+ Alt = l10n.Alt;
+ Target = l10n.Target;
+ Title = l10n.Title;
+ Description = l10n.Description;
+ }
}
///
@@ -53,7 +67,18 @@ namespace WeatherForecast.Models.Content.Responses {
///
///
///
- public List L10n { get; set; } = new List();
+ public List L10n { get; set; } = new List();
+
+ ///
+ ///
+ ///
+ ///
+ public MediaAttachmentResponseModel(MediaAttachment mediaAttachment) {
+ Src= mediaAttachment.Src;
+ MediaType= mediaAttachment.MediaType;
+
+ L10n = mediaAttachment.L10n.Select(x => new MediaAttachmentL10nReponsetModel(x)).ToList();
+ }
}
}
diff --git a/src/WeatherForecast/Models/Content/Responses/PageSections/TestimonialsSectionModel.cs b/src/WeatherForecast/Models/Content/Responses/PageSections/TestimonialsSectionModel.cs
index 9612058..1c6ad30 100644
--- a/src/WeatherForecast/Models/Content/Responses/PageSections/TestimonialsSectionModel.cs
+++ b/src/WeatherForecast/Models/Content/Responses/PageSections/TestimonialsSectionModel.cs
@@ -19,8 +19,6 @@ namespace WeatherForecast.Models.Content.Responses.PageSections {
///
public MediaAttachmentResponseModel? Image { get; set; }
-
-
///
///
///
@@ -39,8 +37,8 @@ namespace WeatherForecast.Models.Content.Responses.PageSections {
FullName = reviewer.FullName;
Position = reviewer.Position;
- //if (reviewer.Image != null)
- // Image = new ImageModel(reviewer.Image);
+ if (reviewer.Image != null)
+ Image = new MediaAttachmentResponseModel(reviewer.Image);
}
}
diff --git a/src/docker-compose.override.yml b/src/docker-compose.override.yml
index 77b6eec..0227358 100644
--- a/src/docker-compose.override.yml
+++ b/src/docker-compose.override.yml
@@ -31,13 +31,6 @@ services:
networks:
- "my-network"
- #clientapp:
- # environment:
- # - ASPNETCORE_ENVIRONMENT=Development
- # ports:
- # - "3000:3000"
- # networks:
- # - "my-network"
mongo:
image: mongo
diff --git a/src/docker-compose.yml b/src/docker-compose.yml
index dc5fa0e..494ba20 100644
--- a/src/docker-compose.yml
+++ b/src/docker-compose.yml
@@ -10,10 +10,4 @@ services:
image: ${DOCKER_REGISTRY-}reverseproxy
build:
context: .
- dockerfile: ReverseProxy/Dockerfile
- #clientapp:
- # image: ${DOCKER_REGISTRY-}clientapp
- # build:
- # context: .
- # dockerfile: ClientApp/Dockerfile
-
+ dockerfile: ReverseProxy/Dockerfile
\ No newline at end of file
diff --git a/src/docker-compose/mongo/data/db/WiredTiger.turtle b/src/docker-compose/mongo/data/db/WiredTiger.turtle
index 226b4c3..f637578 100644
--- a/src/docker-compose/mongo/data/db/WiredTiger.turtle
+++ b/src/docker-compose/mongo/data/db/WiredTiger.turtle
@@ -3,4 +3,4 @@ WiredTiger 10.0.2: (December 21, 2021)
WiredTiger version
major=10,minor=0,patch=2
file:WiredTiger.wt
-access_pattern_hint=none,allocation_size=4KB,app_metadata=,assert=(commit_timestamp=none,durable_timestamp=none,read_timestamp=none,write_timestamp=off),block_allocation=best,block_compressor=,cache_resident=false,checksum=on,collator=,columns=,dictionary=0,encryption=(keyid=,name=),format=btree,huffman_key=,huffman_value=,id=0,ignore_in_memory_cache_size=false,internal_item_max=0,internal_key_max=0,internal_key_truncate=true,internal_page_max=4KB,key_format=S,key_gap=10,leaf_item_max=0,leaf_key_max=0,leaf_page_max=32KB,leaf_value_max=0,log=(enabled=true),memory_page_image_max=0,memory_page_max=5MB,os_cache_dirty_max=0,os_cache_max=0,prefix_compression=false,prefix_compression_min=4,readonly=false,split_deepen_min_child=0,split_deepen_per_child=0,split_pct=90,tiered_object=false,tiered_storage=(auth_token=,bucket=,bucket_prefix=,cache_directory=,local_retention=300,name=,object_target_size=0),value_format=S,verbose=[],version=(major=1,minor=1),write_timestamp_usage=none,checkpoint=(WiredTigerCheckpoint.124102=(addr="018381e487d81b1f8481e4bf0e4b478581e4ba5850aa808080e301ffc0e3010fc0",order=124102,time=1680030284,size=81920,newest_start_durable_ts=0,oldest_start_ts=0,newest_txn=29,newest_stop_durable_ts=0,newest_stop_ts=-1,newest_stop_txn=-11,prepare=0,write_gen=372999,run_write_gen=372970)),checkpoint_backup_info=,checkpoint_lsn=(73,16000)
+access_pattern_hint=none,allocation_size=4KB,app_metadata=,assert=(commit_timestamp=none,durable_timestamp=none,read_timestamp=none,write_timestamp=off),block_allocation=best,block_compressor=,cache_resident=false,checksum=on,collator=,columns=,dictionary=0,encryption=(keyid=,name=),format=btree,huffman_key=,huffman_value=,id=0,ignore_in_memory_cache_size=false,internal_item_max=0,internal_key_max=0,internal_key_truncate=true,internal_page_max=4KB,key_format=S,key_gap=10,leaf_item_max=0,leaf_key_max=0,leaf_page_max=32KB,leaf_value_max=0,log=(enabled=true),memory_page_image_max=0,memory_page_max=5MB,os_cache_dirty_max=0,os_cache_max=0,prefix_compression=false,prefix_compression_min=4,readonly=false,split_deepen_min_child=0,split_deepen_per_child=0,split_pct=90,tiered_object=false,tiered_storage=(auth_token=,bucket=,bucket_prefix=,cache_directory=,local_retention=300,name=,object_target_size=0),value_format=S,verbose=[],version=(major=1,minor=1),write_timestamp_usage=none,checkpoint=(WiredTigerCheckpoint.126190=(addr="018381e452c7a52b8481e4d7b9659f8581e46348db2e808080e3023fc0e3010fc0",order=126190,time=1680809094,size=81920,newest_start_durable_ts=0,oldest_start_ts=0,newest_txn=1524,newest_stop_durable_ts=0,newest_stop_ts=-1,newest_stop_txn=-11,prepare=0,write_gen=379335,run_write_gen=377166)),checkpoint_backup_info=,checkpoint_lsn=(78,597248)
diff --git a/src/docker-compose/mongo/data/db/WiredTiger.wt b/src/docker-compose/mongo/data/db/WiredTiger.wt
index d1d8f79..0ea1470 100644
Binary files a/src/docker-compose/mongo/data/db/WiredTiger.wt and b/src/docker-compose/mongo/data/db/WiredTiger.wt differ
diff --git a/src/docker-compose/mongo/data/db/collection-2--4715807334585891142.wt b/src/docker-compose/mongo/data/db/collection-2--4715807334585891142.wt
index f0aa21b..39b24c4 100644
Binary files a/src/docker-compose/mongo/data/db/collection-2--4715807334585891142.wt and b/src/docker-compose/mongo/data/db/collection-2--4715807334585891142.wt differ
diff --git a/src/docker-compose/mongo/data/db/collection-4--4715807334585891142.wt b/src/docker-compose/mongo/data/db/collection-4--4715807334585891142.wt
index ae5546c..b734e63 100644
Binary files a/src/docker-compose/mongo/data/db/collection-4--4715807334585891142.wt and b/src/docker-compose/mongo/data/db/collection-4--4715807334585891142.wt differ
diff --git a/src/docker-compose/mongo/data/db/collection-6--4748285384625290805.wt b/src/docker-compose/mongo/data/db/collection-6--4748285384625290805.wt
index 2cc4fca..6e5fa29 100644
Binary files a/src/docker-compose/mongo/data/db/collection-6--4748285384625290805.wt and b/src/docker-compose/mongo/data/db/collection-6--4748285384625290805.wt differ
diff --git a/src/docker-compose/mongo/data/db/diagnostic.data/metrics.2022-11-29T17-35-19Z-00000 b/src/docker-compose/mongo/data/db/diagnostic.data/metrics.2022-11-29T17-35-19Z-00000
deleted file mode 100644
index a98e90c..0000000
Binary files a/src/docker-compose/mongo/data/db/diagnostic.data/metrics.2022-11-29T17-35-19Z-00000 and /dev/null differ
diff --git a/src/docker-compose/mongo/data/db/diagnostic.data/metrics.2022-12-01T18-13-51Z-00000 b/src/docker-compose/mongo/data/db/diagnostic.data/metrics.2022-12-01T18-13-51Z-00000
deleted file mode 100644
index a866c22..0000000
Binary files a/src/docker-compose/mongo/data/db/diagnostic.data/metrics.2022-12-01T18-13-51Z-00000 and /dev/null differ
diff --git a/src/docker-compose/mongo/data/db/diagnostic.data/metrics.2023-03-28T18-55-45Z-00000 b/src/docker-compose/mongo/data/db/diagnostic.data/metrics.2023-03-28T18-55-45Z-00000
index 5da2a89..c2e86a8 100644
Binary files a/src/docker-compose/mongo/data/db/diagnostic.data/metrics.2023-03-28T18-55-45Z-00000 and b/src/docker-compose/mongo/data/db/diagnostic.data/metrics.2023-03-28T18-55-45Z-00000 differ
diff --git a/src/docker-compose/mongo/data/db/diagnostic.data/metrics.2023-03-29T18-08-22Z-00000 b/src/docker-compose/mongo/data/db/diagnostic.data/metrics.2023-03-29T18-08-22Z-00000
new file mode 100644
index 0000000..2d6196a
Binary files /dev/null and b/src/docker-compose/mongo/data/db/diagnostic.data/metrics.2023-03-29T18-08-22Z-00000 differ
diff --git a/src/docker-compose/mongo/data/db/diagnostic.data/metrics.2023-04-04T09-36-16Z-00000 b/src/docker-compose/mongo/data/db/diagnostic.data/metrics.2023-04-04T09-36-16Z-00000
new file mode 100644
index 0000000..33d9cb5
Binary files /dev/null and b/src/docker-compose/mongo/data/db/diagnostic.data/metrics.2023-04-04T09-36-16Z-00000 differ
diff --git a/src/docker-compose/mongo/data/db/diagnostic.data/metrics.2023-04-05T10-21-02Z-00000 b/src/docker-compose/mongo/data/db/diagnostic.data/metrics.2023-04-05T10-21-02Z-00000
new file mode 100644
index 0000000..5668e4e
Binary files /dev/null and b/src/docker-compose/mongo/data/db/diagnostic.data/metrics.2023-04-05T10-21-02Z-00000 differ
diff --git a/src/docker-compose/mongo/data/db/diagnostic.data/metrics.2023-04-06T07-31-26Z-00000 b/src/docker-compose/mongo/data/db/diagnostic.data/metrics.2023-04-06T07-31-26Z-00000
new file mode 100644
index 0000000..7294fbc
Binary files /dev/null and b/src/docker-compose/mongo/data/db/diagnostic.data/metrics.2023-04-06T07-31-26Z-00000 differ
diff --git a/src/docker-compose/mongo/data/db/diagnostic.data/metrics.interim b/src/docker-compose/mongo/data/db/diagnostic.data/metrics.interim
index cbdfe7d..c597fe9 100644
Binary files a/src/docker-compose/mongo/data/db/diagnostic.data/metrics.interim and b/src/docker-compose/mongo/data/db/diagnostic.data/metrics.interim differ
diff --git a/src/docker-compose/mongo/data/db/index-3--4715807334585891142.wt b/src/docker-compose/mongo/data/db/index-3--4715807334585891142.wt
index 6f5d1ce..9ef33ad 100644
Binary files a/src/docker-compose/mongo/data/db/index-3--4715807334585891142.wt and b/src/docker-compose/mongo/data/db/index-3--4715807334585891142.wt differ
diff --git a/src/docker-compose/mongo/data/db/index-5--4715807334585891142.wt b/src/docker-compose/mongo/data/db/index-5--4715807334585891142.wt
index e129422..cf9f647 100644
Binary files a/src/docker-compose/mongo/data/db/index-5--4715807334585891142.wt and b/src/docker-compose/mongo/data/db/index-5--4715807334585891142.wt differ
diff --git a/src/docker-compose/mongo/data/db/index-6--4715807334585891142.wt b/src/docker-compose/mongo/data/db/index-6--4715807334585891142.wt
index 0b2c9e8..16ad9eb 100644
Binary files a/src/docker-compose/mongo/data/db/index-6--4715807334585891142.wt and b/src/docker-compose/mongo/data/db/index-6--4715807334585891142.wt differ
diff --git a/src/docker-compose/mongo/data/db/journal/WiredTigerLog.0000000073 b/src/docker-compose/mongo/data/db/journal/WiredTigerLog.0000000078
similarity index 99%
rename from src/docker-compose/mongo/data/db/journal/WiredTigerLog.0000000073
rename to src/docker-compose/mongo/data/db/journal/WiredTigerLog.0000000078
index aaacc05..318f504 100644
Binary files a/src/docker-compose/mongo/data/db/journal/WiredTigerLog.0000000073 and b/src/docker-compose/mongo/data/db/journal/WiredTigerLog.0000000078 differ
diff --git a/src/docker-compose/mongo/data/db/sizeStorer.wt b/src/docker-compose/mongo/data/db/sizeStorer.wt
index b25e0e0..d00d6a5 100644
Binary files a/src/docker-compose/mongo/data/db/sizeStorer.wt and b/src/docker-compose/mongo/data/db/sizeStorer.wt differ
diff --git a/src/launchSettings.json b/src/launchSettings.json
index 81f2c0a..a679c14 100644
--- a/src/launchSettings.json
+++ b/src/launchSettings.json
@@ -7,8 +7,7 @@
"mongo": "StartWithoutDebugging",
"mongo-express": "StartWithoutDebugging",
"reverseproxy": "StartWithoutDebugging",
- "weatherforecast": "StartDebugging",
- // "clientapp": "StartDebugging"
+ "weatherforecast": "StartDebugging"
}
}
}
{relatedProductsSection.title}
+ {/*{relatedProductsSection.title}
{title}
diff --git a/src/ClientApp/src/pages/Signup/index.tsx b/src/ClientApp/src/pages/Signup/index.tsx index 43d49fd..075d7de 100644 --- a/src/ClientApp/src/pages/Signup/index.tsx +++ b/src/ClientApp/src/pages/Signup/index.tsx @@ -1,13 +1,13 @@ -import React, { useEffect, useState } from "react" +import React, { FC, useEffect, useState } from "react" // Redux import { useDispatch, useSelector } from "react-redux" -import { actionCreators as loaderActionCreators } from '../../store/reducers/Loader' import { Button, Container, Form, FormGroup, Input, Label } from "reactstrap" import { ApplicationState } from "../../store" import './scss/style.scss' +import { IHeader } from "../../interfaces" interface IStateProp { [key: string]: string | boolean; @@ -25,46 +25,39 @@ interface IState extends IStateProp { tnc: boolean } -const Signup = () => { +interface IFormControl { + title: string, + placeHolder?: string +} + +export interface ISignupPage { + header: IHeader, + + title: string, + username: IFormControl, + email: IFormControl, + reEmail: IFormControl, + password: IFormControl, + rePassword: IFormControl, + acceptTermsAndConditions: string, + submit: IFormControl +} + +export interface ISignupComponent extends ISignupPage { } + +const Signup : FC{title}
+ {/*{title}
+ */}ClientApp subdirectory is a standard React application based on the create-react-app template. If you open a command prompt in that directory, you can run yarn commands such as yarn test or yarn install.",
reviewer: {
- id: "",
- image: { src: `${process.env.REACT_APP_API}/Image/40x40/ced4da/6c757d`, alt: "..." },
+ image: { src: `${process.env.REACT_APP_FRONTEND}/Image/40x40/ced4da/6c757d`, alt: "..." },
fullName: "Admin",
position: "CEO, MAKS-IT"
}
@@ -371,6 +459,9 @@ const unloadedState: ContentState = {
title: "Welcome to Blog Home!",
text: "A Bootstrap 5 starter layout for your next blog homepage"
},
+ blogItemsSection: {
+ readMore: 'Read more →'
+ },
featuredBlogSection: {
readTime: `${ReservedWords.date} Time to read: ${ReservedWords.readTime} min`
},
@@ -387,7 +478,7 @@ const unloadedState: ContentState = {
}
},
titleSection: {
- postedOnBy: `Posted on ${ReservedWords.date} by ${ReservedWords.nickName}`
+ text: `Posted on ${ReservedWords.date} by ${ReservedWords.nickName}`
},
commentsSection: {
leaveComment: "Join the discussion and leave a comment!"
@@ -468,7 +559,6 @@ const unloadedState: ContentState = {
export const reducer: Reducer