Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: map location frontend #1266

Merged
merged 82 commits into from
Oct 8, 2024
Merged
Show file tree
Hide file tree
Changes from 67 commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
2dfa90d
chore: handle Post filter HasLocation, add Location in Post Metadata
WaDadidou May 21, 2024
3b6b60a
make generate
WaDadidou May 21, 2024
a14d72c
fix: small fix mapfeed
WaDadidou Jun 4, 2024
1880ab0
Add map post geoloc
Villaquiranm Jul 22, 2024
8a9f3d0
Add gno social feed indexer
Villaquiranm Jul 28, 2024
2ba9902
Add more functionnality to backend
Villaquiranm Aug 5, 2024
d535a02
Add heatmap aggregation for large number of posts
Villaquiranm Aug 7, 2024
a2115ef
fix: test4
omarsy Aug 11, 2024
0c37476
Clean pr
Villaquiranm Aug 20, 2024
9e86927
fix: map feed front errors, yarn lint-fix
WaDadidou Aug 24, 2024
01e056e
feat add heatmap
omarsy Aug 22, 2024
f718b27
Include aggregate posts query in code
Villaquiranm Aug 25, 2024
72e1daa
fix: map icons per post category
WaDadidou Aug 28, 2024
c000499
wip: social feed map: posts previews on map
WaDadidou Aug 28, 2024
97da933
Solve comments from PR review
Villaquiranm Aug 28, 2024
c8219fc
weshnet and protobuf generate
Villaquiranm Aug 28, 2024
2678238
fix: properly define txIndexerURL config field
n0izn0iz Aug 31, 2024
cb0d63f
chore: run lint-fix
n0izn0iz Aug 31, 2024
4090b17
feat: add test4 indexer url
n0izn0iz Aug 31, 2024
69224d1
fix: remove out-of-scope work on feed map, yarn lint-fix
WaDadidou Sep 1, 2024
fb7f0b2
wip: MapPosts
WaDadidou Sep 1, 2024
b5ac698
fix: Add/Remove/Update location when creating a post, optionally
WaDadidou Sep 5, 2024
8cd99c9
fix: show marker when updating location at post creation, disable loc…
WaDadidou Sep 5, 2024
345d5ff
feat: handling Map location at Article creation
WaDadidou Sep 6, 2024
cba6f26
fix: better location button at post/article creation, responsive
WaDadidou Sep 6, 2024
d55bf11
fix: prevent infinite PostsWithLocation fetching
WaDadidou Sep 7, 2024
0a04dc3
fix: show existing map posts at post's creation, factorize Map compon…
WaDadidou Sep 7, 2024
e609df6
feat: add post-to-map and map-to-post redirection (UI), rollback a lo…
WaDadidou Sep 7, 2024
0c9fbbd
fix: center map to selected address at post's creation
WaDadidou Sep 7, 2024
1a4c814
fix: map cluster icon style
WaDadidou Sep 7, 2024
cdae319
fix: yarn install
WaDadidou Sep 7, 2024
8e491c8
fix: remove unused component
WaDadidou Sep 7, 2024
61d4a54
fix: map feed small fixes
WaDadidou Sep 8, 2024
5f782f4
fix: add location on publishing track or video, small fixes
WaDadidou Sep 8, 2024
ac11a15
fix: location button
WaDadidou Sep 8, 2024
efbba55
fix: video.svg
WaDadidou Sep 11, 2024
5ccc371
fix: remove limit on fetch feed location
WaDadidou Sep 11, 2024
5c37433
fix: remove hasLocation
WaDadidou Sep 11, 2024
f9fcbe1
make generate
WaDadidou Sep 11, 2024
bfedbf8
fix: PostsWithLocationRequest
WaDadidou Sep 11, 2024
bc347e2
make generate
WaDadidou Sep 11, 2024
2f6f1db
Merge remote-tracking branch 'origin/main' into feat-map-posts
WaDadidou Sep 13, 2024
7187c78
fix: yarn lint-fix
WaDadidou Sep 13, 2024
b5dff62
fix: check-codegen diffs
WaDadidou Sep 13, 2024
c46729a
fix: Map fetch posts with location using network, handle Audio and Vi…
WaDadidou Sep 16, 2024
6001362
fix: map layer url as exported constant
WaDadidou Sep 16, 2024
3ea8b8c
fix: map video and audio render, fix map location in url, better typi…
WaDadidou Sep 17, 2024
8adc320
fix: avoid shared player bar on map posts
WaDadidou Sep 17, 2024
ebaa1d7
fix: feed map media player
WaDadidou Sep 17, 2024
21953c5
fix: feed map show posts when map appears
WaDadidou Sep 17, 2024
53690cb
fix: handle multiple pictures on map posts
WaDadidou Sep 17, 2024
efe9c5f
Merge remote-tracking branch 'origin/main' into feat-map-posts
WaDadidou Sep 18, 2024
0f42e69
make generate
WaDadidou Sep 18, 2024
e1307f0
Merge remote-tracking branch 'origin/main' into feat-map-posts
WaDadidou Sep 19, 2024
a9ded9e
Merge remote-tracking branch 'origin/feat-map-posts' into feat-map-posts
WaDadidou Sep 19, 2024
87cdf74
fix: gifs picture map posts
WaDadidou Sep 19, 2024
f4cf257
fix: remove unused authorId, remove unused height
WaDadidou Sep 23, 2024
8765f66
fix: small fixes map
WaDadidou Sep 23, 2024
0ffd5bf
fix: add TODO and remove wrong icon url from Map.tsx
WaDadidou Sep 23, 2024
e54b598
fix: externalize constants
WaDadidou Sep 23, 2024
f500345
remove unecessary package
WaDadidou Sep 23, 2024
9bb51af
fix: MarkerCluster type
WaDadidou Sep 23, 2024
dac460d
fix: MarkerCluster is any, no solution
WaDadidou Sep 23, 2024
e563b50
yarn lint-fix
WaDadidou Sep 23, 2024
d36ed11
Merge branch 'main' into feat-map-posts
WaDadidou Sep 24, 2024
6f6b2aa
fix: map feed: remove developerMode
WaDadidou Sep 24, 2024
72afc0d
fix: show map feed tab by default
WaDadidou Sep 24, 2024
2d4af42
fix remove useMemo usage
WaDadidou Sep 26, 2024
fd6a8bb
fix: remove unused undefined
WaDadidou Sep 26, 2024
d6cfa0f
Merge remote-tracking branch 'origin/main' into feat-map-posts
WaDadidou Sep 26, 2024
a3ead11
fix: add consulted post id on feed map, todo added
WaDadidou Sep 26, 2024
542d678
Merge branch 'main' into feat-map-posts
n0izn0iz Sep 30, 2024
6eb6dce
fix: highlight consulted post icon on the map
WaDadidou Sep 30, 2024
67cf9b1
Merge branch 'feat-map-posts' of github.com:TERITORI/teritori-dapp in…
WaDadidou Oct 2, 2024
b06919f
fix: simplify Map
WaDadidou Oct 2, 2024
f3d59af
fix: MapModal: close adresses list after selection instead of waiting…
WaDadidou Oct 2, 2024
b4edfa5
fix: MapModal: Remove Suspense because no fallback
WaDadidou Oct 2, 2024
0ecbc50
wip: Map: open consulted post marker, not working with clusters
WaDadidou Oct 2, 2024
e78a838
chore: remove unused comments
WaDadidou Oct 2, 2024
1514c36
fix: Map: rollback to highlight markers on consultation instead of op…
WaDadidou Oct 3, 2024
2af6c27
Merge remote-tracking branch 'origin/main' into feat-map-posts
WaDadidou Oct 3, 2024
4136b10
Merge branch 'main' into feat-map-posts
n0izn0iz Oct 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions assets/icons/location-refined.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/icons/media-player/play_round.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions assets/icons/video.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"@reduxjs/toolkit": "^1.8.3",
"@solana/web3.js": "^1.87.6",
"@tanstack/react-query": "^4.12.0",
"@types/leaflet": "^1.9.8",
"@types/leaflet": "^1.9.12",
"@types/papaparse": "^5.3.14",
"assert": "^2.1.0",
"axios": "^1.6.2",
Expand Down
4 changes: 1 addition & 3 deletions packages/components/FilePreview/AudioView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,19 @@ export const AudioView: React.FC<{
imageURI?: string;
duration: number;
waveform: number[];
authorId: string;
postId: string;
fallbackImageURI?: string;
}> = ({
fileUrl,
imageURI,
duration,
waveform,
authorId,
postId,
fallbackImageURI: fallbackImageSource,
}) => {
const { media, handlePlayPause, loadAndPlaySoundsQueue, playbackStatus } =
useMediaPlayer();
const isInMediaPlayer = media?.postId === postId;
const isInMediaPlayer = !!media && postId === media.postId;

const onPressPlayPause = async () => {
if (isInMediaPlayer) {
Expand Down
8 changes: 0 additions & 8 deletions packages/components/FilePreview/FilesPreviewsContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ import { v4 as uuidv4 } from "uuid";
import { EditableAudioPreview } from "./EditableAudioPreview";
import { ImagesViews } from "./ImagesViews";
import { VideoView } from "./VideoView";
import { useSelectedNetworkId } from "../../hooks/useSelectedNetwork";
import useSelectedWallet from "../../hooks/useSelectedWallet";
import { getUserId } from "../../networks";
import { GIF_MIME_TYPE } from "../../utils/mime";
import { convertGIFToLocalFileType } from "../../utils/social-feed";
import { layout } from "../../utils/style/layout";
Expand All @@ -30,10 +27,6 @@ export const FilesPreviewsContainer: React.FC<FilePreviewContainerProps> = ({
onAudioUpdate,
showSmallPreview = false,
}) => {
const selectedWallet = useSelectedWallet();
const selectedNetworkId = useSelectedNetworkId();
const userId = getUserId(selectedNetworkId, selectedWallet?.address);

const audioFiles = useMemo(
() => files?.filter((file) => file.fileType === "audio"),
[files],
Expand Down Expand Up @@ -82,7 +75,6 @@ export const FilesPreviewsContainer: React.FC<FilePreviewContainerProps> = ({
file={file}
onDelete={onDelete}
isEditable
authorId={userId}
showSmallPreview={showSmallPreview}
/>
))}
Expand Down
6 changes: 2 additions & 4 deletions packages/components/FilePreview/VideoView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,17 @@ import { LocalFileData, RemoteFileData } from "../../utils/types/files";
import { BrandText } from "../BrandText";
import { MediaPlayerVideo } from "../mediaPlayer/MediaPlayerVideo";

interface VideoPreviewProps {
interface Props {
file: LocalFileData | RemoteFileData;
onDelete?: (file: LocalFileData | RemoteFileData) => void;
isEditable?: boolean;
postId?: string;
authorId: string;
showSmallPreview?: boolean;
}

export const VideoView: React.FC<VideoPreviewProps> = ({
export const VideoView: React.FC<Props> = ({
file,
onDelete,
authorId,
postId,
isEditable = false,
showSmallPreview = false,
Expand Down
4 changes: 2 additions & 2 deletions packages/components/IconBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ interface IconBoxProps {
style?: StyleProp<ViewStyle>;
disabled?: boolean;
iconProps?: {
height: number;
width: number;
height?: number;
width?: number;
color?: string;
};
}
Expand Down
2 changes: 1 addition & 1 deletion packages/components/TopMenu/TopMenuLiveMint.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
COLLECTION_VIEW_SM_HEIGHT,
COLLECTION_VIEW_SM_WIDTH,
} from "../CollectionView";
import { SmallCarousel } from "../carousels/SmallCarousel";
import { SmallCarousel } from "../carousels/SmallCarousel/SmallCarousel";

export const TopMenuLiveMint: React.FC = () => {
const selectedNetworkId = useSelectedNetworkId();
Expand Down
2 changes: 1 addition & 1 deletion packages/components/TopMenu/TopMenuMyTeritories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import FlexCol from "../FlexCol";
import FlexRow from "../FlexRow";
import { OmniLink } from "../OmniLink";
import { LegacyTertiaryBox } from "../boxes/LegacyTertiaryBox";
import { SmallCarousel } from "../carousels/SmallCarousel";
import { SmallCarousel } from "../carousels/SmallCarousel/SmallCarousel";
import { UserAvatarWithFrame } from "../images/AvatarWithFrame";

const ORG_CARD_WIDTH = 164;
Expand Down
165 changes: 0 additions & 165 deletions packages/components/carousels/SmallCarousel.tsx

This file was deleted.

Loading
Loading