My Images
+
+ {imageData.map((image) =>{
+ return (
+ <>
+ 
+
+
+ )
+ }
+ )}
+
+
+ )
}
\ No newline at end of file
diff --git a/src/nav/NavBar.js b/src/nav/NavBar.js
index bf24b7e..33d5a45 100644
--- a/src/nav/NavBar.js
+++ b/src/nav/NavBar.js
@@ -8,7 +8,7 @@ export const NavBar = () => {
- - Upload Images + Upload Images
-
My Images
diff --git a/src/profile/EditProfile.js b/src/profile/EditProfile.js
index 5118bbe..47e218a 100644
--- a/src/profile/EditProfile.js
+++ b/src/profile/EditProfile.js
@@ -1,6 +1,22 @@
import React, {useState, useEffect} from "react";
import { useHistory,useParams } from "react-router-dom";
+import { getSmug_UserById, putSmug_User } from "./ProfileManager";
+
export const EditProfile = () => {
-
+ const { id } = useParams()
+ const history = useHistory()
+ const [ usertoedit, setusertoedit] = useState({})
+
+ useEffect(
+ () => {
+ getSmug_UserById().then(data => setusertoedit(data))
+ },[]
+ )
+
+ return (
+
+ )
}
\ No newline at end of file
diff --git a/src/profile/Profile.js b/src/profile/Profile.js
index 027c5ea..d4156d8 100644
--- a/src/profile/Profile.js
+++ b/src/profile/Profile.js
@@ -1,6 +1,28 @@
import React, {useState, useEffect} from "react";
import { useHistory,useParams } from "react-router-dom";
+import { getSmug_UserById } from "./ProfileManager";
export const Profile = () => {
-
+ const [currentuser, setcurrentuser] = useState(localStorage.getItem("smug_user_id"))
+ const [smug_user, setsmuguser] = useState({})
+
+ useEffect(
+ () => {
+ getSmug_UserById(currentuser).then(data => setsmuguser(data))
+ },[]
+ )
+// How to filter a user by their uid? Not quite sure
+return (
+ <>
+
My Profile
+++ +) } \ No newline at end of file diff --git a/src/tags/PhotosByTag.js b/src/tags/PhotosByTag.js index 9e5aa19..727678e 100644 --- a/src/tags/PhotosByTag.js +++ b/src/tags/PhotosByTag.js @@ -1,6 +1,33 @@ import React, {useState, useEffect} from "react"; import { useHistory,useParams } from "react-router-dom"; +import { getImageData } from "../images/MyImageManager"; +import { getTags } from "./TagManager"; export const PhotosByTag = () => { - + const [ imageData, setImageData] = useState([]) + const [ tagdata, settagdata ] = useState([]) + + useEffect( + () => { + getImageData().then(data => setImageData(data)) + },[] + ) + + return( + <> +Username: {smug_user.user.username}
+Email: {smug_user.user.email}
+Name: {smug_user.user.first_name} {smug_user.user.last_name}
+{smug_user.business_owner ? "Current user is business owner" : "Current user is a standard user"}
+User is staff? {smug_user.user.is_staff ? "Yes" : "No"}
+ ++ {imageData.map((image) =>{ + return ( + //+ + ) } \ No newline at end of file diff --git a/src/tags/SelectTags.js b/src/tags/SelectTags.js index 5f91570..c6673a0 100644 --- a/src/tags/SelectTags.js +++ b/src/tags/SelectTags.js @@ -1,9 +1,12 @@ -import react, {useState, useEffect} from "react" +import react, {useState, useEffect, useRef} from "react" import { useHistory, useParams } from "react-router-dom" -import { getTags } from "./TagManager" +import { getTags, addTagsToImages } from "./TagManager" export const SelectTags = () => { const [tags, setTags] = useState([]) + const [tag_selections, setTagSelections] = useState( new Array(tags.length).fill(0)) + let { id } = useParams(); + const tagscopy = [...tags] useEffect( () => { @@ -11,7 +14,47 @@ export const SelectTags = () => { },[] ) + const changefunction = (e) => { + const checkboxID = e.target.value + let tagselectioncopy = [...tag_selections] + if (tagselectioncopy.find((id) => id === checkboxID)) { + tagselectioncopy = tagselectioncopy.filter((id) => id !== checkboxID) + setTagSelections(tagselectioncopy) + } else {tagselectioncopy.push(checkboxID) + setTagSelections(tagselectioncopy) + } + } + return( -{tagdata.map((tag)=> tag.image_tag_name )}
+ <> + +Select Tags for Images
+ <> +Select Tags for Images
+ ++ + {tagscopy.map((tagname) => { + return( + <> + {changefunction(e) } + } /> + + + ) + } + ) + + } + < button onClick = { + () => { + const submitOBJ = {image_tags:tag_selections} + addTagsToImages( submitOBJ, id) + } + } + + + >Submit ++ + ) } \ No newline at end of file diff --git a/src/tags/TagManager.js b/src/tags/TagManager.js index afc05a0..b743760 100644 --- a/src/tags/TagManager.js +++ b/src/tags/TagManager.js @@ -1,5 +1,5 @@ export const getTags = () => { - return fetch("http://localhost:8000/tags", { + return fetch("http://localhost:8000/image_tags", { headers:{ "Authorization": `Token ${localStorage.getItem("sf_token")}` } @@ -10,7 +10,7 @@ export const getTags = () => { export const createTags = (tag) => { - return fetch(`http://localhost:8000/events`, { + return fetch(`http://localhost:8000/image_tags`, { method: "POST", headers:{ "Authorization": `Token ${localStorage.getItem("sf_token")}`, @@ -21,4 +21,16 @@ export const createTags = (tag) => { ) .then(response => response.json()) + } + + export const addTagsToImages = (tag_selections,id) => { + return fetch(`http://localhost:8000/images/${id}`, { + method: "PUT", + headers:{ + "Authorization": `Token ${localStorage.getItem("sf_token")}`, + "Content-Type": "Application/json" + }, + body:JSON.stringify(tag_selections) + } + ) } \ No newline at end of file