changing post display on profile to a more compact display that eventually you will be able to click into for more details - I think i will do the same on the posts page and have the admins enter information about why the post was approved or denied
This commit is contained in:
@@ -97,7 +97,7 @@ export default function App() {
|
|||||||
<Text style={styles.text}>Retake</Text>
|
<Text style={styles.text}>Retake</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
<TouchableOpacity style={styles.button} onPress={sendData}>
|
<TouchableOpacity style={styles.button} onPress={sendData}>
|
||||||
<Text style={styles.text}>Continue</Text>
|
<Text style={styles.text}>Submit</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
@@ -142,8 +142,7 @@ const styles = StyleSheet.create({
|
|||||||
flex: 1,
|
flex: 1,
|
||||||
backgroundColor: '#25292e',
|
backgroundColor: '#25292e',
|
||||||
justifyContent: 'center',
|
justifyContent: 'center',
|
||||||
paddingHorizontal: 25,
|
padding: 32
|
||||||
paddingVertical: 200
|
|
||||||
},
|
},
|
||||||
centeredView: {
|
centeredView: {
|
||||||
flex: 1,
|
flex: 1,
|
||||||
@@ -198,16 +197,18 @@ const styles = StyleSheet.create({
|
|||||||
flex: 1
|
flex: 1
|
||||||
},
|
},
|
||||||
buttonContainer: {
|
buttonContainer: {
|
||||||
flex: 0.2,
|
|
||||||
flexDirection: 'row',
|
flexDirection: 'row',
|
||||||
backgroundColor: 'orange',
|
justifyContent: 'space-evenly',
|
||||||
marginTop: 15,
|
marginTop: 15,
|
||||||
borderRadius: 5
|
borderRadius: 5
|
||||||
},
|
},
|
||||||
button: {
|
button: {
|
||||||
flex: 1,
|
paddingHorizontal: 12,
|
||||||
alignSelf: 'center',
|
height: 50,
|
||||||
alignItems: 'center'
|
alignItems: 'center',
|
||||||
|
justifyContent: 'center',
|
||||||
|
backgroundColor: 'rgb(192, 196, 199)',
|
||||||
|
borderRadius: 5
|
||||||
},
|
},
|
||||||
text: {
|
text: {
|
||||||
fontSize: 24,
|
fontSize: 24,
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { useUser } from '@clerk/clerk-react'
|
|||||||
import { useFocusEffect } from 'expo-router'
|
import { useFocusEffect } from 'expo-router'
|
||||||
import React, { useState } from 'react'
|
import React, { useState } from 'react'
|
||||||
import { Image, StyleSheet, Text, View } from 'react-native'
|
import { Image, StyleSheet, Text, View } from 'react-native'
|
||||||
import { PostComponent } from '../components/PostComponent'
|
import { CompactPostComponent } from '../components/CompactPostComponent'
|
||||||
import { SignOutButton } from '../components/SignOutButton'
|
import { SignOutButton } from '../components/SignOutButton'
|
||||||
import { Post } from '../models/postModel'
|
import { Post } from '../models/postModel'
|
||||||
|
|
||||||
@@ -50,7 +50,7 @@ export default function PostsScreen() {
|
|||||||
</View>
|
</View>
|
||||||
<View style={styles.userPostsCard}>
|
<View style={styles.userPostsCard}>
|
||||||
{posts?.length ? (
|
{posts?.length ? (
|
||||||
posts.map((el) => <PostComponent key={el._id} post={el} fetchData={fetchData} />)
|
posts.map((el) => <CompactPostComponent key={el._id} {...el} />)
|
||||||
) : (
|
) : (
|
||||||
<View style={styles.noPostsContainer}>
|
<View style={styles.noPostsContainer}>
|
||||||
<Text style={styles.noPosts}>Your posts will show up here!</Text>
|
<Text style={styles.noPosts}>Your posts will show up here!</Text>
|
||||||
|
|||||||
73
app/components/CompactPostComponent.tsx
Normal file
73
app/components/CompactPostComponent.tsx
Normal file
@@ -0,0 +1,73 @@
|
|||||||
|
import { useUser } from '@clerk/clerk-react'
|
||||||
|
import React from 'react'
|
||||||
|
import { StyleSheet, Text, TouchableOpacity, View } from 'react-native'
|
||||||
|
import { Post, StatusEnum } from '../models/postModel'
|
||||||
|
|
||||||
|
export const CompactPostComponent: React.FC<Post> = (post) => {
|
||||||
|
const { user } = useUser()
|
||||||
|
console.log()
|
||||||
|
console.log()
|
||||||
|
|
||||||
|
return (
|
||||||
|
<TouchableOpacity key={post._id} style={styles.posts}>
|
||||||
|
<View style={styles.header}>
|
||||||
|
<Text style={[styles.text, styles.date]}>{post.notes}</Text>
|
||||||
|
<View style={{ flexDirection: 'row', justifyContent: 'space-between' }}>
|
||||||
|
{post.status === StatusEnum.Created && (
|
||||||
|
<Text style={[styles.created, styles.statusTag]}>Created</Text>
|
||||||
|
)}
|
||||||
|
{post.status === StatusEnum.Pending && (
|
||||||
|
<Text style={[styles.pending, styles.statusTag]}>Pending</Text>
|
||||||
|
)}
|
||||||
|
{post.status === StatusEnum.Denied && <Text style={[styles.denied, styles.statusTag]}>Denied</Text>}
|
||||||
|
{post.status === StatusEnum.Approved && (
|
||||||
|
<Text style={[styles.approved, styles.statusTag]}>Approved</Text>
|
||||||
|
)}
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
<View style={styles.footer}>
|
||||||
|
<Text style={styles.subtext}>{post.address}</Text>
|
||||||
|
<Text style={[styles.subtext]}>{new Date(post.date).toLocaleDateString()}</Text>
|
||||||
|
</View>
|
||||||
|
</TouchableOpacity>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const styles = StyleSheet.create({
|
||||||
|
text: {
|
||||||
|
color: '#fff',
|
||||||
|
justifyContent: 'center'
|
||||||
|
},
|
||||||
|
subtext: {
|
||||||
|
color: '#b9b9b9ff',
|
||||||
|
justifyContent: 'center'
|
||||||
|
},
|
||||||
|
posts: {
|
||||||
|
marginTop: 10,
|
||||||
|
backgroundColor: '#373d44ff',
|
||||||
|
borderColor: '#626e7aff',
|
||||||
|
borderStyle: 'solid',
|
||||||
|
borderWidth: 1,
|
||||||
|
borderRadius: 12,
|
||||||
|
padding: 10,
|
||||||
|
width: '100%'
|
||||||
|
},
|
||||||
|
header: {
|
||||||
|
flexDirection: 'row',
|
||||||
|
alignItems: 'center',
|
||||||
|
justifyContent: 'space-between',
|
||||||
|
marginBottom: 16
|
||||||
|
},
|
||||||
|
footer: { flexDirection: 'row', alignItems: 'center', justifyContent: 'space-between' },
|
||||||
|
date: {
|
||||||
|
paddingVertical: 3,
|
||||||
|
borderRadius: 6,
|
||||||
|
color: '#ffffff',
|
||||||
|
fontSize: 16
|
||||||
|
},
|
||||||
|
statusTag: { paddingVertical: 3, paddingHorizontal: 10, borderRadius: 6, fontSize: 16 },
|
||||||
|
created: { backgroundColor: '#0d6efd', color: '#ffffff' },
|
||||||
|
pending: { backgroundColor: '#ffc107', color: '#000000' },
|
||||||
|
denied: { backgroundColor: '#dc3545', color: '#ffffff' },
|
||||||
|
approved: { backgroundColor: '#198754', color: '#ffffff' }
|
||||||
|
})
|
||||||
@@ -10,6 +10,7 @@ type PostComponentProps = {
|
|||||||
|
|
||||||
export const PostComponent: React.FC<PostComponentProps> = ({ post, fetchData }) => {
|
export const PostComponent: React.FC<PostComponentProps> = ({ post, fetchData }) => {
|
||||||
const { user } = useUser()
|
const { user } = useUser()
|
||||||
|
const isProfileView = window.location.href.includes('/profile')
|
||||||
|
|
||||||
async function approvePost(postID: string) {
|
async function approvePost(postID: string) {
|
||||||
console.log('Approving post ' + postID)
|
console.log('Approving post ' + postID)
|
||||||
@@ -54,7 +55,7 @@ export const PostComponent: React.FC<PostComponentProps> = ({ post, fetchData })
|
|||||||
/>
|
/>
|
||||||
</View>
|
</View>
|
||||||
<Text style={{ color: '#fff' }}>{post.notes}</Text>
|
<Text style={{ color: '#fff' }}>{post.notes}</Text>
|
||||||
{user?.publicMetadata.role !== 'admin' && (
|
{isProfileView ? (
|
||||||
<View style={{ flexDirection: 'row', justifyContent: 'space-between', marginTop: 10 }}>
|
<View style={{ flexDirection: 'row', justifyContent: 'space-between', marginTop: 10 }}>
|
||||||
{post.status === StatusEnum.Created && (
|
{post.status === StatusEnum.Created && (
|
||||||
<Text style={[styles.created, styles.statusTag]}>Created</Text>
|
<Text style={[styles.created, styles.statusTag]}>Created</Text>
|
||||||
@@ -67,8 +68,8 @@ export const PostComponent: React.FC<PostComponentProps> = ({ post, fetchData })
|
|||||||
<Text style={[styles.approved, styles.statusTag]}>Approved</Text>
|
<Text style={[styles.approved, styles.statusTag]}>Approved</Text>
|
||||||
)}
|
)}
|
||||||
</View>
|
</View>
|
||||||
)}
|
) : null}
|
||||||
{user?.publicMetadata.role === 'admin' && (
|
{!isProfileView ? (
|
||||||
<View style={{ flexDirection: 'row', justifyContent: 'space-between', marginTop: 10 }}>
|
<View style={{ flexDirection: 'row', justifyContent: 'space-between', marginTop: 10 }}>
|
||||||
<TouchableOpacity style={{ flex: 1, marginRight: 5 }} onPress={() => denyPost(post._id)}>
|
<TouchableOpacity style={{ flex: 1, marginRight: 5 }} onPress={() => denyPost(post._id)}>
|
||||||
<Text
|
<Text
|
||||||
@@ -97,7 +98,7 @@ export const PostComponent: React.FC<PostComponentProps> = ({ post, fetchData })
|
|||||||
</Text>
|
</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
</View>
|
</View>
|
||||||
)}
|
) : null}
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
export interface Post {
|
export interface Post {
|
||||||
_id: string
|
_id: string
|
||||||
|
address: string
|
||||||
|
date: Date
|
||||||
notes: string
|
notes: string
|
||||||
photo: string
|
photo: string
|
||||||
status: StatusEnum
|
status: StatusEnum
|
||||||
|
|||||||
Reference in New Issue
Block a user