From 04c5ec74f3b827a4614ea3cb3d9c4a3c38d29b06 Mon Sep 17 00:00:00 2001
From: Schuyler deVos <schuylerdevos@gmail.com>
Date: Fri, 26 Jun 2020 02:36:45 -0400
Subject: [PATCH 01/14] initial commit, api route testing and group org
 component

---
 .python-version                     |   1 +
 components/global/ArticleCard.tsx   |  11 ++-
 components/global/ArticleList.tsx   |  10 ++-
 components/profile/GroupSetting.tsx |  71 +++++++++++++++
 lib/api/tag.ts                      |  24 +++++
 pages/dashboard/[pid].tsx           | 134 +++++++++++++++++++++++-----
 6 files changed, 222 insertions(+), 29 deletions(-)
 create mode 100644 .python-version
 create mode 100644 components/profile/GroupSetting.tsx

diff --git a/.python-version b/.python-version
new file mode 100644
index 0000000..75422e2
--- /dev/null
+++ b/.python-version
@@ -0,0 +1 @@
+3.7.2-amd64
diff --git a/components/global/ArticleCard.tsx b/components/global/ArticleCard.tsx
index eba1b20..bb104ce 100644
--- a/components/global/ArticleCard.tsx
+++ b/components/global/ArticleCard.tsx
@@ -68,7 +68,8 @@ const StyledEmoji = styled.span`
 `
 
 /* article state: draft, review, pubished, complete*/
-const ArticleCard = ({ article, showAuth = false, onLeftButtonClick = null, onRightButtonClick = null }) => {
+const ArticleCard = ({ article, currentTag = null, modReview=false, showAuth = false, onLeftButtonClick = null, onRightButtonClick = null }) => {
+
   const tags = article.tagList.map((tag, i) =>
     (<StyledSpan>
       <CustomLink
@@ -139,7 +140,7 @@ const ArticleCard = ({ article, showAuth = false, onLeftButtonClick = null, onRi
             {/* rigt bottom: show two buttons */}
             <Col>
               <Button
-                disabled={article.isPublished}
+                disabled={article.isPublished && !modReview}
                 onClick={onLeftButtonClick}
                 style={{
                   border: "none",
@@ -150,6 +151,10 @@ const ArticleCard = ({ article, showAuth = false, onLeftButtonClick = null, onRi
                     article.isPublished ? (article.readtime && article.readtime + ' min read') :
                     article.needsReview ? 'Reject' : 'Delete'
                 }
+                {
+                  modReview ? 'Reject' : null
+                }
+
               </Button>
               <Button
                 type={"primary"}
@@ -162,7 +167,7 @@ const ArticleCard = ({ article, showAuth = false, onLeftButtonClick = null, onRi
                 }}
               >
                 {
-                    article.isPublished ? 'BookMark' :
+                    modReview ? 'Published' : article.isPublished ? 'BookMark' :
                     article.needsReview ? 'Published' : 'Edit'
                 }
               </Button>
diff --git a/components/global/ArticleList.tsx b/components/global/ArticleList.tsx
index 6da6ce2..bdae4bc 100644
--- a/components/global/ArticleList.tsx
+++ b/components/global/ArticleList.tsx
@@ -1,6 +1,7 @@
 import React from 'react'
 import ArticleCard from './ArticleCard'
 import {List} from 'antd'
+import TagAPI from "../../lib/api/tag";
 
 const ArticleList = props =>(
     <List
@@ -8,11 +9,16 @@ const ArticleList = props =>(
       dataSource={props.articles}
       renderItem={article => (
         <List.Item>
-           <ArticleCard
+          {props.modReview ? <ArticleCard
+             article = {article}
+             modReview = {props.modReview}
+             onLeftButtonClick = {() => TagAPI.rejectTag(article,props.currentTag)}
+             onRightButtonClick = {props.onRightButtonClick}
+           /> : <ArticleCard
               article = {article}
               onLeftButtonClick = {props.onLeftButtonClick}
               onRightButtonClick = {props.onRightButtonClick}
-            />
+            />}
         </List.Item>
       )}
     />
diff --git a/components/profile/GroupSetting.tsx b/components/profile/GroupSetting.tsx
new file mode 100644
index 0000000..3dfb480
--- /dev/null
+++ b/components/profile/GroupSetting.tsx
@@ -0,0 +1,71 @@
+import React from 'react';
+import styled from 'styled-components'
+import { Row, Col, Card, Avatar, Button, Space, Layout, Typography, Form, Input } from 'antd';
+import { UserOutlined } from '@ant-design/icons';
+
+const { Header, Footer, Sider, Content } = Layout;
+const { Title, Paragraph, Text } = Typography;
+const { TextArea } = Input;
+
+const { Search } = Input;
+
+const GroupSetting = props => {
+
+  return(
+    <Layout>
+      <Content>
+        <Row gutter={40}>
+            <Col>
+              <Row>
+                <Title level={4}>Org Profile Pic</Title>
+              </Row>
+              <Row>
+                <Avatar />
+              </Row>
+              <Row>
+                <Button type="primary">reupload dat pic nowish</Button>
+              </Row>
+              <Row>
+                <Title level={4}>Tag Slug</Title>
+              </Row>
+              <Row>
+              <Search
+                placeholder="change dat slug"
+                enterButton="edit"
+                onSearch={value => console.log(value)}
+              />
+              </Row>
+            </Col>
+
+            <Col>
+              <Title level={4}>Org Description</Title>
+              <Form>
+                <Form.Item>
+                  <TextArea placeholder="Org Description here" autoSize={{ minRows: 4, maxRows: 7 }}/>
+                  <Button type="primary">Edit dat description</Button>
+                </Form.Item>
+              </Form>
+            </Col>
+
+        </Row>
+
+        <Row>
+          <Title level={4}>Mod Settings</Title>
+        </Row>
+        <Row>
+          <Button type="primary">
+            Public
+          </Button>
+          <Button type="primary">
+            Moderated
+          </Button>
+          <Button type="primary">
+            Private
+          </Button>
+        </Row>
+      </Content>
+    </Layout>
+  )
+}
+
+export default GroupSetting
diff --git a/lib/api/tag.ts b/lib/api/tag.ts
index b83097c..c451867 100644
--- a/lib/api/tag.ts
+++ b/lib/api/tag.ts
@@ -23,6 +23,30 @@ const TagAPI = {
       return error.response;
     }
   },
+
+  rejectTag: async (article, currentTag) => {
+    console.log(article)
+    const user: any = JSON.parse(window.localStorage.getItem("user"));
+    const token = user?.token;
+    console.log(`${SERVER_BASE_URL}/tags/${currentTag}/articles/${article.slug}`)
+    try {
+      const response = await axios.put(
+        `${SERVER_BASE_URL}/tags/${currentTag}/articles/${article.slug}`,
+        { article },
+        {
+          headers: {
+            Authorization: `Token ${encodeURIComponent(token)}`,
+          },
+        }
+      );
+      console.log(response);
+      return response;
+    } catch (error) {
+      console.log(error);
+      return error.response;
+    }
+  },
+
   unfollow: async (slug) => {
     const user: any = JSON.parse(window.localStorage.getItem("user"));
     const token = user?.token;
diff --git a/pages/dashboard/[pid].tsx b/pages/dashboard/[pid].tsx
index 7c95581..ee359bb 100644
--- a/pages/dashboard/[pid].tsx
+++ b/pages/dashboard/[pid].tsx
@@ -5,10 +5,12 @@ import fetcher from "../../lib/utils/fetcher";
 import storage from "../../lib/utils/storage";
 import { SERVER_BASE_URL } from "../../lib/utils/constant";
 import UserAPI from "../../lib/api/user";
-import ArticleAPI from "../../lib/api/article";
 import checkLogin from "../../lib/utils/checkLogin";
 
-import ArticleList from "../../components/article/ArticleList";
+import GroupSetting from "../../components/profile/GroupSetting";
+
+//DIFFERENT ONE
+import ArticleList from "../../components/global/ArticleList";
 import ErrorMessage from "../../components/common/ErrorMessage";
 import User from "../../components/global/User";
 import FollowList from "../../components/global/FollowList";
@@ -41,9 +43,15 @@ const Profile = ({ initialProfile }) => {
 		{ initialData: initialProfile }
 	);
 
-
 	if (profileError) return <ErrorMessage message="Can't load profile" />;
 
+	const {
+		data: modTags,
+		error: tagError,
+	} = useSWR(`${SERVER_BASE_URL}/profiles/${encodeURIComponent(String(pid))}/tags`, fetcher)
+
+	let tagsList = [];
+
 	const { profile } = fetchedProfile || initialProfile;
 	const { username, bio, image, following } = profile;
 	let tabsList =[]
@@ -52,6 +60,7 @@ const Profile = ({ initialProfile }) => {
 	}else{
 		tabsList = ["Posts", "Followers", "Following", "Account Settings"]
 	}
+	//here's where we're getting the list from
 	const [list, setList] = React.useState(tabsList)
 	const [tab_select_list, setTabList] = React.useState(["All Posts", "Published", "Drafts"])
 	const [isPosts, setPostsPage] = React.useState(true)
@@ -62,11 +71,21 @@ const Profile = ({ initialProfile }) => {
 	const [isAllArticles, setAllArticles] = React.useState(true);
 	const [isPublished, setPublished] = React.useState(false);
 	const [isDrafts, setDrafts] = React.useState(false);
-	const [isAdmin, setIsAdmin] = React.useState(false)
+	const [isAdmin, setIsAdmin] = React.useState(false);
+
+	const [subTags, setSubTags] = React.useState(false);
+	const [pubTags, setPubTags] = React.useState(false);
+	const [tagSettings, setTagSettings] = React.useState(false);
+	const [tagsType, setTagsType] = React.useState("Submitted");
+	const [currentTag, setTag] = React.useState(null);
+
+	const [currentOrg, setOrg] = React.useState(null);
+	const [isMembers, setMembers] = React.useState(null);
 
 	const { data: currentUser } = useSWR("user", storage);
 	const { data: fetchedArticles } = useSWR(`${SERVER_BASE_URL}/articles?author=${initialProfile.profile.username}`, fetcher);
 	const { data: dropDownTags } = useSWR(`${SERVER_BASE_URL}/tags?quantity=all`, fetcher);
+
 	const isLoggedIn = checkLogin(currentUser);
 	const isUser = currentUser && username === currentUser?.username;
 
@@ -75,7 +94,6 @@ const Profile = ({ initialProfile }) => {
 	const { TabPane } = Tabs;
 
 	const TabChange = (key) => {
-		
 		if (key == "Posts") {
 			setTabList(["All Posts", "Published", "Drafts"])
 			setPostsPage(true)
@@ -90,7 +108,6 @@ const Profile = ({ initialProfile }) => {
 
 			setArticleType("all")
 			setIsAdmin(false)
-
 		}
 		else if (key == "Followers") {
 			setTabList(["Old -> New"])
@@ -118,7 +135,7 @@ const Profile = ({ initialProfile }) => {
 			setTagPage(false)
 			setSettingsPage(true)
 			setIsAdmin(false)
-		}else if (key== "Admin"){
+		} else if (key == "Admin"){
 			setIsAdmin(true)
 			setTabList(["Admin"])
 			setPostsPage(false)
@@ -127,15 +144,27 @@ const Profile = ({ initialProfile }) => {
 			setTagPage(false)
 			setSettingsPage(false)
 		}
-		else {
-			setTabList(["Most Viewed", "Most Liked", "Most Recent"])
-			setPostsPage(false)
-			setFollowersPage(false)
-			setFollowingsPage(false)
-			setTagPage(true)
-			setSettingsPage(false)
-			setIsAdmin(false)
-		}
+	}
+
+	{/*for tag menu items*/}
+	const TagChange = (key) => {
+		setPostsPage(false)
+		setFollowersPage(false)
+		setFollowingsPage(false)
+		setSettingsPage(false)
+		setIsAdmin(false)
+
+		setTabList(["Submitted", "Published", "Settings"])
+		setTagPage(true)
+		setTag(key);
+		setSubTags(true);
+		setPubTags(false);
+		setTagSettings(false);
+	}
+
+	{/*for org menu items*/}
+	const OrgChange = (key) => {
+
 	}
 
 	const TabView = (key) => {
@@ -147,11 +176,17 @@ const Profile = ({ initialProfile }) => {
 			setArticleType("all");
 		}
 		else if (key == "Published") {
-			setAllArticles(false);
-			setDrafts(false);
-			setPublished(true);
+			if (isPosts) {
+				setAllArticles(false);
+				setDrafts(false);
+				setPublished(true);
 
-			setArticleType("published");
+				setArticleType("published");
+			} else {
+				setSubTags(false);
+				setPubTags(true);
+				setTagSettings(false);
+			}
 		}
 		else if (key == "Drafts") {
 			setAllArticles(false);
@@ -160,6 +195,16 @@ const Profile = ({ initialProfile }) => {
 
 			setArticleType("drafts");
 		}
+		else if (key == "Submitted") {
+			setSubTags(true);
+			setPubTags(false);
+			setTagSettings(false);
+		}
+		else if (key == "Settings") {
+			setSubTags(false);
+			setPubTags(false);
+			setTagSettings(true);
+		}
 		else {
 			setAllArticles(false);
 			setDrafts(false);
@@ -175,7 +220,41 @@ const Profile = ({ initialProfile }) => {
 		fetcher
 	);
 
-	if (isUser) {
+	const {
+		data: tagReviews,
+		error: reviewsError,
+	} = useSWR(
+		`${SERVER_BASE_URL}/articles?tag=${encodeURIComponent(String(currentTag))}`,
+		fetcher
+	);
+
+	console.log(tagReviews);
+
+	let needsReview = [];
+	let publishedTags = [];
+
+	if (isUser && modTags && tagReviews) {
+
+		{/*for displaying tags in the menu*/}
+		(() => {
+				for (let i=0; i<modTags.tags.length; i++) {
+					if (modTags.tags[i].moderator) {
+						tagsList.push(modTags.tags[i]);
+					}
+				}
+		})();
+
+		{/*for displaying tags in the top tabs*/}
+		(() => {
+				for (let i=0; i<tagReviews.articles.length; i++) {
+					if (tagReviews.articles[i].needsReview) {
+						needsReview.push(tagReviews.articles[i]);
+					} else if (tagReviews.articles[i].isPublished) {
+						publishedTags.push(tagReviews.articles[i]);
+					}
+				}
+		})();
+
 		return (
 			<Row gutter={16} style={{ marginTop: "8em", marginLeft: "0", marginRight: "0" }}>
 				<Col span={2}></Col>
@@ -187,6 +266,8 @@ const Profile = ({ initialProfile }) => {
 						<Col span={24}>
 							<StyledMenu>
 								{list.map(item => <Menu.Item key={item} onClick={item => TabChange(item.key)}>{item}</Menu.Item>)}
+								//lets add some sort of indicator that its tags in here, like key is item.slug+"tag" or something
+								{tagsList.map(item => <Menu.Item key={item.slug} onClick={item => TagChange(item.key)}>{item.tagname}</Menu.Item>)}
 							</StyledMenu>
 						</Col>
 					</Row>
@@ -194,15 +275,20 @@ const Profile = ({ initialProfile }) => {
 				<Col span={12}>
 					<Row gutter={[16, 40]}>
 						<Col span={24}>
-							<Tab_list tabs={tab_select_list} onClick={key => TabView(key)} position={"top"} />
+							<Tab_list tabs={tab_select_list} defaultActiveKey={tab_select_list[0]} onClick={key => TabView(key)} position={"top"} />
 						</Col>
 						<Col span={24} style={{ paddingTop: "0" }}>
 							{isPosts && articleData ? <ArticleList articles={articleData.articles} /> : null}
 							{isFollowers ? <FollowList followings={false} /> : null}
 							{isFollowings ? <FollowList followings={true} /> : null}
-							{isTag ? <ArticleList /> : null}
+							{isTag && subTags ? <ArticleList articles={needsReview} /> : null}
+							{isTag && pubTags ? <ArticleList
+								modReview={true}
+								currentTag={currentTag}
+								articles={publishedTags} /> : null}
+							{isTag && tagSettings ? <GroupSetting /> : null}
 							{isSettings ? <AccountSettings /> : null}
-							{isAdmin ?<AdminPanel tags = {dropDownTags}/>:null}
+							{isAdmin ?<AdminPanel tags = {dropDownTags}/> : null}
 						</Col>
 					</Row>
 				</Col>

From 5805defbdd8170e2464f3768fd830e855bde2f49 Mon Sep 17 00:00:00 2001
From: Schuyler deVos <schuylerdevos@gmail.com>
Date: Sun, 28 Jun 2020 19:53:41 -0400
Subject: [PATCH 02/14] finishing group setting

---
 components/profile/GroupSetting.tsx | 136 +++++--
 lib/api/user.ts                     |  42 +-
 pages/dashboard/[pid].tsx           | 604 ++++++++++++++++------------
 3 files changed, 473 insertions(+), 309 deletions(-)

diff --git a/components/profile/GroupSetting.tsx b/components/profile/GroupSetting.tsx
index 3dfb480..8b390a9 100644
--- a/components/profile/GroupSetting.tsx
+++ b/components/profile/GroupSetting.tsx
@@ -2,6 +2,12 @@ import React from 'react';
 import styled from 'styled-components'
 import { Row, Col, Card, Avatar, Button, Space, Layout, Typography, Form, Input } from 'antd';
 import { UserOutlined } from '@ant-design/icons';
+import UserAPI from "../../lib/api/user";
+
+import useSWR from "swr";
+import fetcher from "../../lib/utils/fetcher";
+import storage from "../../lib/utils/storage";
+import { SERVER_BASE_URL } from "../../lib/utils/constant";
 
 const { Header, Footer, Sider, Content } = Layout;
 const { Title, Paragraph, Text } = Typography;
@@ -9,63 +15,107 @@ const { TextArea } = Input;
 
 const { Search } = Input;
 
-const GroupSetting = props => {
+const StyledButton = styled(Button)`
+  margin: 0px 20px
+`
+
+const SettingButton = styled(Button)`
+  height: 75px;
+`
+
+const GroupSetting = ({ currentOrg = null, currentTag = null, page }) => {
+
+  const {
+    data: tagOrg,
+    error: tagOrgError,
+  } = currentOrg ? useSWR(`${SERVER_BASE_URL}/organizations/${currentOrg}`, fetcher) :
+      useSWR(`${SERVER_BASE_URL}/tags/${currentTag}`, fetcher)
+
+  //if (tagOrg) { console.log(tagOrg.organization.description); }
 
-  return(
-    <Layout>
-      <Content>
+  const editDescription = values => {
+    console.log("The values are", values);
+  }
+
+  const uploadPic = () => {
+    console.log("new pic please");
+  }
+
+  const editModSettings = (setting) => {
+    if (currentOrg) {
+      UserAPI.changeModSettingOrg(currentOrg, setting)
+    } else {
+      UserAPI.changeModSettingTag(currentTag, setting)
+    }
+  }
+
+  if (tagOrg) {
+    return (
+      <>
         <Row gutter={40}>
-            <Col>
-              <Row>
-                <Title level={4}>Org Profile Pic</Title>
-              </Row>
-              <Row>
-                <Avatar />
-              </Row>
-              <Row>
-                <Button type="primary">reupload dat pic nowish</Button>
-              </Row>
-              <Row>
-                <Title level={4}>Tag Slug</Title>
-              </Row>
-              <Row>
+          <Col>
+            <Row>
+              <Title level={4}>{currentOrg ? "Org Profile Pic" : "Tag Profile Pic"}</Title>
+            </Row>
+            <Row>
+              <Avatar style={{ margin: "0px 0px 8px" }} />
+            </Row>
+            <Row style={{ margin: "0px 0px 15px" }}>
+              <Button type="primary" onClick={() => uploadPic()}>Reupload Icon</Button>
+            </Row>
+            <Row>
+              <Title level={4}>{currentOrg ? "Org Slug" : "Tag Slug"}</Title>
+            </Row>
+            <Row style={{ margin: "0px 0px 15px" }}>
               <Search
-                placeholder="change dat slug"
+                placeholder={currentOrg ? currentOrg : currentTag}
+                defaultValue={currentOrg ? currentOrg : currentTag}
+                addonBefore="bitproject.org/"
                 enterButton="edit"
                 onSearch={value => console.log(value)}
               />
-              </Row>
-            </Col>
-
-            <Col>
-              <Title level={4}>Org Description</Title>
-              <Form>
-                <Form.Item>
-                  <TextArea placeholder="Org Description here" autoSize={{ minRows: 4, maxRows: 7 }}/>
-                  <Button type="primary">Edit dat description</Button>
-                </Form.Item>
-              </Form>
-            </Col>
+            </Row>
+          </Col>
 
+          <Col>
+            <Title level={4}>{currentOrg ? "Org Description" : "Tag Description"}</Title>
+            <Form onFinish={editDescription}
+              initialValues={{
+                description: currentOrg ? tagOrg.organization.description : tagOrg.tag.description
+              }}>
+              <Form.Item name="description">
+                <TextArea
+                  placeholder="Org Description here"
+                  autoSize={{ minRows: 4, maxRows: 6 }} />
+              </Form.Item>
+              <Form.Item>
+                <Button type="primary" htmlType="submit" block>{currentOrg ? "Edit Org Description" : "Edit Tag Description"}</Button>
+              </Form.Item>
+            </Form>
+          </Col>
         </Row>
 
         <Row>
           <Title level={4}>Mod Settings</Title>
         </Row>
         <Row>
-          <Button type="primary">
-            Public
-          </Button>
-          <Button type="primary">
-            Moderated
-          </Button>
-          <Button type="primary">
-            Private
-          </Button>
+          <Space>
+            <SettingButton onClick={() => editModSettings(1)} type="primary">
+              Public: <br /> Writers can directly post on tag
+            </SettingButton>
+            <SettingButton onClick={() => editModSettings(2)} type="primary">
+              Moderated: <br /> Moderators allow posts on the tag
+            </SettingButton>
+            <SettingButton onClick={() => editModSettings(3)} type="primary">
+              Private: <br /> Only moderators can post on the tag. <br /> Fit for internal tags
+          </SettingButton>
+          </Space>
         </Row>
-      </Content>
-    </Layout>
-  )
+      </>
+    )
+  } else {
+    return(<div></div>)
+  }
 }
 
 export default GroupSetting
diff --git a/lib/api/user.ts b/lib/api/user.ts
index c1e7017..1547e71 100644
--- a/lib/api/user.ts
+++ b/lib/api/user.ts
@@ -65,6 +65,46 @@ const UserAPI = {
       return error.response;
     }
   },
+  changeModSettingTag: async (tag,setting) => {
+    const user: any = window.localStorage.getItem("user");
+    const token = user?.token;
+    try {
+      const response = await axios.post(
+        `${SERVER_BASE_URL}/organizations/${tag}`,
+        JSON.stringify({ setting }),
+        {
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: `Token ${encodeURIComponent(token)}`,
+          },
+        }
+      );
+      return response;
+      console.log(response);
+    } catch (error) {
+      return error.response;
+    }
+  },
+  changeModSettingOrg: async (org,setting) => {
+    const user: any = window.localStorage.getItem("user");
+    const token = user?.token;
+    try {
+      const response = await axios.put(
+        `${SERVER_BASE_URL}/organizations/${org}`,
+        JSON.stringify({ setting }),
+        {
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: `Token ${encodeURIComponent(token)}`,
+          },
+        }
+      );
+      return response;
+      console.log(response);
+    } catch (error) {
+      return error.response;
+    }
+  },
   follow: async (username, email) => {
     const user: any = JSON.parse(window.localStorage.getItem("user"));
     const token = user?.token;
@@ -137,4 +177,4 @@ const UserAPI = {
   get: async (username) => axios.get(`${SERVER_BASE_URL}/profiles/${username}`),
 };
 
-export default UserAPI;
\ No newline at end of file
+export default UserAPI;
diff --git a/pages/dashboard/[pid].tsx b/pages/dashboard/[pid].tsx
index ee359bb..3003205 100644
--- a/pages/dashboard/[pid].tsx
+++ b/pages/dashboard/[pid].tsx
@@ -11,13 +11,14 @@ import GroupSetting from "../../components/profile/GroupSetting";
 
 //DIFFERENT ONE
 import ArticleList from "../../components/global/ArticleList";
+import UserList from "../../components/global/UserList";
 import ErrorMessage from "../../components/common/ErrorMessage";
 import User from "../../components/global/User";
 import FollowList from "../../components/global/FollowList";
 import Tab_list from "../../components/profile/Tab_list";
 import Menu_list from "../../components/profile/Menu_list";
 import AccountSettings from "../../components/profile/AccountSettings";
-import { Row, Col, Tabs, Menu } from 'antd';
+import { Row, Col, Tabs, Menu, Divider } from 'antd';
 
 import styled from "styled-components";
 import AdminPanel from "../../components/profile/AdminPanel";
@@ -29,283 +30,356 @@ const StyledMenu = styled(Menu)`
 `
 
 const Profile = ({ initialProfile }) => {
-	const router = useRouter();
-	const {
-		query: { pid },
-	} = router;
+  const router = useRouter();
+  const {
+    query: { pid },
+  } = router;
+
+  const {
+    data: fetchedProfile,
+    error: profileError,
+  } = useSWR(
+    `${SERVER_BASE_URL}/profiles/${encodeURIComponent(String(pid))}`,
+    fetcher,
+    { initialData: initialProfile }
+  );
+
+  if (profileError) return <ErrorMessage message="Can't load profile" />;
+
+  const {
+    data: modTags,
+    error: tagError,
+  } = useSWR(`${SERVER_BASE_URL}/profiles/${encodeURIComponent(String(pid))}/tags`, fetcher)
+
+  let tagsList = [];
+
+  const { profile } = fetchedProfile || initialProfile;
+  const { username, bio, image, following } = profile;
+  let tabsList = []
+  if (initialProfile.profile.isAdmin) {
+    tabsList = ["Posts", "Followers", "Following", "Account Settings", "Admin"]
+  } else {
+    tabsList = ["Posts", "Followers", "Following", "Account Settings"]
+  }
+  //here's where we're getting the list from
+  const [list, setList] = React.useState(tabsList)
+  const [tab_select_list, setTabList] = React.useState(["All Posts", "Published", "Drafts"])
+  const [isPosts, setPostsPage] = React.useState(true)
+  const [isFollowers, setFollowersPage] = React.useState(false)
+  const [isFollowings, setFollowingsPage] = React.useState(false)
+  const [isTag, setTagPage] = React.useState(false)
+  const [isSettings, setSettingsPage] = React.useState(false)
+  const [isAllArticles, setAllArticles] = React.useState(true);
+  const [isPublished, setPublished] = React.useState(false);
+  const [isDrafts, setDrafts] = React.useState(false);
+  const [isAdmin, setIsAdmin] = React.useState(false);
+
+  const [subTags, setSubTags] = React.useState(false);
+  const [pubTags, setPubTags] = React.useState(false);
+  const [tagSettings, setTagSettings] = React.useState(false);
+  const [tagsType, setTagsType] = React.useState("Submitted");
+  const [currentTag, setTag] = React.useState(null);
+
+  const [currentOrg, setOrg] = React.useState(null);
+  const [isOrg, setOrgPage] = React.useState(false);
+  const [isMembers, setMembers] = React.useState(false);
+  const [isSubOrgs, setSubOrgs] = React.useState(false);
+  const [isOrgSettings, setOrgSettings] = React.useState(false);
+
+  const { data: currentUser } = useSWR("user", storage);
+  const { data: fetchedArticles } = useSWR(`${SERVER_BASE_URL}/articles?author=${initialProfile.profile.username}`, fetcher);
+  const { data: dropDownTags } = useSWR(`${SERVER_BASE_URL}/tags?quantity=all`, fetcher);
+
+  const isLoggedIn = checkLogin(currentUser);
+  const isUser = currentUser && username === currentUser ?.username;
+
+  const [articleType, setArticleType] = React.useState("all");
+
+  const [orgTagSettings, setOrgTagSettings] = React.useState(false);
+
+  {/*for article items*/ }
+  const TabChange = (key) => {
+    setTagPage(false)
+    setOrgPage(false)
+    if (key == "Posts") {
+      setTabList(["All Posts", "Published", "Drafts"])
+      setPostsPage(true)
+      setFollowersPage(false)
+      setFollowingsPage(false)
+      setSettingsPage(false)
+      setIsAdmin(false)
+    }
+    else if (key == "Followers") {
+      setTabList(["Old -> New"])
+      setPostsPage(false)
+      setFollowersPage(true)
+      setFollowingsPage(false)
+      setSettingsPage(false)
+      setIsAdmin(false)
+    }
+    else if (key == "Following") {
+      setTabList(["Old -> New"])
+      setPostsPage(false)
+      setFollowersPage(false)
+      setFollowingsPage(true)
+      setSettingsPage(false)
+      setIsAdmin(false)
+    }
+    else if (key == "Account Settings") {
+      setTabList(["Settings", "Organization", "API Keys"])
+      setPostsPage(false)
+      setFollowersPage(false)
+      setFollowingsPage(false)
+      setSettingsPage(true)
+      setIsAdmin(false)
+    }
+    else if (key == "Admin") {
+      setIsAdmin(true)
+      setTabList(["Admin"])
+      setPostsPage(false)
+      setFollowersPage(false)
+      setFollowingsPage(false)
+      setSettingsPage(false)
+    }
+  }
+
+  {/*for tag menu items*/ }
+  const TagChange = (key) => {
+    setPostsPage(false)
+    setFollowersPage(false)
+    setFollowingsPage(false)
+    setSettingsPage(false)
+    setIsAdmin(false)
+    setOrgPage(false)
+
+    setTabList(["Submitted", "Published", "Settings"])
+    setTagPage(true)
+    setTag(key);
+  }
+
+  {/*for org menu items*/ }
+  const OrgChange = (key) => {
+    console.log(key);
+    setPostsPage(false)
+    setFollowersPage(false)
+    setFollowingsPage(false)
+    setSettingsPage(false)
+    setIsAdmin(false)
+    setTagPage(false);
+
+    setTabList(["Submitted", "Members", "Settings"])
+    setOrgPage(true);
+    setOrg(key);
+  }
+
+  const TabView = (key) => {
+    if (key == "All Posts") {
+      setAllArticles(true);
+      setDrafts(false);
+      setPublished(false);
+
+      setArticleType("all");
+    }
+    else if (key == "Published") {
+      if (isPosts) {
+        setAllArticles(false);
+        setDrafts(false);
+        setPublished(true);
+
+        setArticleType("published");
+      } else {
+        setSubTags(false);
+        setPubTags(true);
+        setTagSettings(false);
+      }
+    }
+    else if (key == "Drafts") {
+      setAllArticles(false);
+      setDrafts(true);
+      setPublished(false);
+
+      setArticleType("drafts");
+    }
+    else if (key == "Submitted") {
+      if (isOrg) {
+        setSubOrgs(true);
+        setMembers(false);
+        setOrgSettings(false);
+      } else {
+        setSubTags(true);
+        setPubTags(false);
+        setTagSettings(false);
+      }
+    }
+    else if (key == "Settings") {
+      if (isOrg) {
+        setSubOrgs(false);
+        setMembers(false);
+        setOrgSettings(true);
+      } else {
+        setSubTags(false);
+        setPubTags(false);
+        setTagSettings(true);
+      }
+    }
+    else if (key == "Members") {
+      setSubOrgs(false);
+      setMembers(true);
+      setOrgSettings(false);
+    }
+    else {
+      setAllArticles(false);
+      setDrafts(false);
+      setPublished(false);
+    }
+  }
+
+  const {
+    data: orgData,
+    error: orgError,
+  } = useSWR(
+    `${SERVER_BASE_URL}/profile/organizations`,
+    fetcher
+  );
+
+  let orgsMod = [];
+
+  if (orgData) {
+    for (let i = 0; i < orgData.organizations.length; i++) {
+      for (let j = 0; j < orgData.organizations[i].moderators.length; j++) {
+        if (orgData.organizations[i].moderators[j].profile.username == username) {
+          orgsMod.push(orgData.organizations[i]);
+        }
+      }
+    }
+  }
 
 	const {
-		data: fetchedProfile,
-		error: profileError,
+		data: orgMembers,
+		error: membersError,
 	} = useSWR(
-		`${SERVER_BASE_URL}/profiles/${encodeURIComponent(String(pid))}`,
-		fetcher,
-		{ initialData: initialProfile }
-	);
-
-	if (profileError) return <ErrorMessage message="Can't load profile" />;
-
-	const {
-		data: modTags,
-		error: tagError,
-	} = useSWR(`${SERVER_BASE_URL}/profiles/${encodeURIComponent(String(pid))}/tags`, fetcher)
-
-	let tagsList = [];
-
-	const { profile } = fetchedProfile || initialProfile;
-	const { username, bio, image, following } = profile;
-	let tabsList =[]
-	if(initialProfile.profile.isAdmin){
-		tabsList = ["Posts", "Followers", "Following", "Account Settings","Admin"]
-	}else{
-		tabsList = ["Posts", "Followers", "Following", "Account Settings"]
-	}
-	//here's where we're getting the list from
-	const [list, setList] = React.useState(tabsList)
-	const [tab_select_list, setTabList] = React.useState(["All Posts", "Published", "Drafts"])
-	const [isPosts, setPostsPage] = React.useState(true)
-	const [isFollowers, setFollowersPage] = React.useState(false)
-	const [isFollowings, setFollowingsPage] = React.useState(false)
-	const [isTag, setTagPage] = React.useState(false)
-	const [isSettings, setSettingsPage] = React.useState(false)
-	const [isAllArticles, setAllArticles] = React.useState(true);
-	const [isPublished, setPublished] = React.useState(false);
-	const [isDrafts, setDrafts] = React.useState(false);
-	const [isAdmin, setIsAdmin] = React.useState(false);
-
-	const [subTags, setSubTags] = React.useState(false);
-	const [pubTags, setPubTags] = React.useState(false);
-	const [tagSettings, setTagSettings] = React.useState(false);
-	const [tagsType, setTagsType] = React.useState("Submitted");
-	const [currentTag, setTag] = React.useState(null);
-
-	const [currentOrg, setOrg] = React.useState(null);
-	const [isMembers, setMembers] = React.useState(null);
-
-	const { data: currentUser } = useSWR("user", storage);
-	const { data: fetchedArticles } = useSWR(`${SERVER_BASE_URL}/articles?author=${initialProfile.profile.username}`, fetcher);
-	const { data: dropDownTags } = useSWR(`${SERVER_BASE_URL}/tags?quantity=all`, fetcher);
-
-	const isLoggedIn = checkLogin(currentUser);
-	const isUser = currentUser && username === currentUser?.username;
-
-	const [articleType, setArticleType] = React.useState("all");
-
-	const { TabPane } = Tabs;
-
-	const TabChange = (key) => {
-		if (key == "Posts") {
-			setTabList(["All Posts", "Published", "Drafts"])
-			setPostsPage(true)
-			setFollowersPage(false)
-			setFollowingsPage(false)
-			setTagPage(false)
-			setSettingsPage(false)
-
-			setAllArticles(true);
-			setDrafts(false);
-			setPublished(false);
-
-			setArticleType("all")
-			setIsAdmin(false)
-		}
-		else if (key == "Followers") {
-			setTabList(["Old -> New"])
-			setPostsPage(false)
-			setFollowersPage(true)
-			setFollowingsPage(false)
-			setTagPage(false)
-			setSettingsPage(false)
-			setIsAdmin(false)
-		}
-		else if (key == "Following") {
-			setTabList(["Old -> New"])
-			setPostsPage(false)
-			setFollowersPage(false)
-			setFollowingsPage(true)
-			setTagPage(false)
-			setSettingsPage(false)
-			setIsAdmin(false)
-		}
-		else if (key == "Account Settings") {
-			setTabList(["Settings", "Organization", "API Keys"])
-			setPostsPage(false)
-			setFollowersPage(false)
-			setFollowingsPage(false)
-			setTagPage(false)
-			setSettingsPage(true)
-			setIsAdmin(false)
-		} else if (key == "Admin"){
-			setIsAdmin(true)
-			setTabList(["Admin"])
-			setPostsPage(false)
-			setFollowersPage(false)
-			setFollowingsPage(false)
-			setTagPage(false)
-			setSettingsPage(false)
-		}
-	}
-
-	{/*for tag menu items*/}
-	const TagChange = (key) => {
-		setPostsPage(false)
-		setFollowersPage(false)
-		setFollowingsPage(false)
-		setSettingsPage(false)
-		setIsAdmin(false)
-
-		setTabList(["Submitted", "Published", "Settings"])
-		setTagPage(true)
-		setTag(key);
-		setSubTags(true);
-		setPubTags(false);
-		setTagSettings(false);
-	}
-
-	{/*for org menu items*/}
-	const OrgChange = (key) => {
-
-	}
-
-	const TabView = (key) => {
-	 	if (key == "All Posts") {
-			setAllArticles(true);
-			setDrafts(false);
-			setPublished(false);
-
-			setArticleType("all");
-		}
-		else if (key == "Published") {
-			if (isPosts) {
-				setAllArticles(false);
-				setDrafts(false);
-				setPublished(true);
-
-				setArticleType("published");
-			} else {
-				setSubTags(false);
-				setPubTags(true);
-				setTagSettings(false);
-			}
-		}
-		else if (key == "Drafts") {
-			setAllArticles(false);
-			setDrafts(true);
-			setPublished(false);
-
-			setArticleType("drafts");
-		}
-		else if (key == "Submitted") {
-			setSubTags(true);
-			setPubTags(false);
-			setTagSettings(false);
-		}
-		else if (key == "Settings") {
-			setSubTags(false);
-			setPubTags(false);
-			setTagSettings(true);
-		}
-		else {
-			setAllArticles(false);
-			setDrafts(false);
-			setPublished(false);
-		}
-	}
+    `${SERVER_BASE_URL}/organizations/${currentOrg}/members`,
+    fetcher
+  );
 
-	const {
-		data: articleData,
-		error: articleError,
-	} = useSWR(
-		`${SERVER_BASE_URL}/profile/articles?type=${encodeURIComponent(String(articleType))}`,
-		fetcher
-	);
+	if (orgMembers) {console.log(orgMembers.organization.followers)}
 
 	const {
-		data: tagReviews,
-		error: reviewsError,
+		data: orgArticles,
+		error: orgArticleError,
 	} = useSWR(
-		`${SERVER_BASE_URL}/articles?tag=${encodeURIComponent(String(currentTag))}`,
+		`${SERVER_BASE_URL}/organizations/${currentOrg}/articles`,
 		fetcher
 	);
 
-	console.log(tagReviews);
-
-	let needsReview = [];
-	let publishedTags = [];
-
-	if (isUser && modTags && tagReviews) {
-
-		{/*for displaying tags in the menu*/}
-		(() => {
-				for (let i=0; i<modTags.tags.length; i++) {
-					if (modTags.tags[i].moderator) {
-						tagsList.push(modTags.tags[i]);
-					}
-				}
-		})();
-
-		{/*for displaying tags in the top tabs*/}
-		(() => {
-				for (let i=0; i<tagReviews.articles.length; i++) {
-					if (tagReviews.articles[i].needsReview) {
-						needsReview.push(tagReviews.articles[i]);
-					} else if (tagReviews.articles[i].isPublished) {
-						publishedTags.push(tagReviews.articles[i]);
-					}
-				}
-		})();
-
-		return (
-			<Row gutter={16} style={{ marginTop: "8em", marginLeft: "0", marginRight: "0" }}>
-				<Col span={2}></Col>
-				<Col className="gutter-row" span={4}>
-					<Row gutter={[16, 40]}>
-						<Col span={24}>
-							<User name={username} image={image} username={username} />
-						</Col>
-						<Col span={24}>
-							<StyledMenu>
-								{list.map(item => <Menu.Item key={item} onClick={item => TabChange(item.key)}>{item}</Menu.Item>)}
-								//lets add some sort of indicator that its tags in here, like key is item.slug+"tag" or something
-								{tagsList.map(item => <Menu.Item key={item.slug} onClick={item => TagChange(item.key)}>{item.tagname}</Menu.Item>)}
-							</StyledMenu>
-						</Col>
-					</Row>
-				</Col>
-				<Col span={12}>
-					<Row gutter={[16, 40]}>
-						<Col span={24}>
-							<Tab_list tabs={tab_select_list} defaultActiveKey={tab_select_list[0]} onClick={key => TabView(key)} position={"top"} />
-						</Col>
-						<Col span={24} style={{ paddingTop: "0" }}>
-							{isPosts && articleData ? <ArticleList articles={articleData.articles} /> : null}
-							{isFollowers ? <FollowList followings={false} /> : null}
-							{isFollowings ? <FollowList followings={true} /> : null}
-							{isTag && subTags ? <ArticleList articles={needsReview} /> : null}
-							{isTag && pubTags ? <ArticleList
-								modReview={true}
-								currentTag={currentTag}
-								articles={publishedTags} /> : null}
-							{isTag && tagSettings ? <GroupSetting /> : null}
-							{isSettings ? <AccountSettings /> : null}
-							{isAdmin ?<AdminPanel tags = {dropDownTags}/> : null}
-						</Col>
-					</Row>
-				</Col>
-				<Col span={3}>
-					{isSettings ? <p style={{ opacity: "0.7", marginTop: "16px", fontSize: "18px" }}>Live Website</p> : null}
-				</Col>
-			</Row>
-		);
-	}
-	else {
-		return (<div></div>)
-	}
+  const {
+    data: articleData,
+    error: articleError,
+  } = useSWR(
+    `${SERVER_BASE_URL}/profile/articles?type=${encodeURIComponent(String(articleType))}`,
+    fetcher
+  );
+
+  const {
+    data: tagReviews,
+    error: reviewsError,
+  } = useSWR(
+    `${SERVER_BASE_URL}/articles?tag=${encodeURIComponent(String(currentTag))}`,
+    fetcher
+  );
+
+  let needsReview = [];
+  let publishedTags = [];
+
+  if (modTags) {
+    for (let i = 0; i < modTags.tags.length; i++) {
+      if (modTags.tags[i].moderator) {
+        tagsList.push(modTags.tags[i]);
+      }
+    }
+  }
+
+  if (tagReviews) {
+    for (let i = 0; i < tagReviews.articles.length; i++) {
+      if (tagReviews.articles[i].needsReview) {
+        needsReview.push(tagReviews.articles[i]);
+      } else if (tagReviews.articles[i].isPublished) {
+        publishedTags.push(tagReviews.articles[i]);
+      }
+    }
+  }
+
+  if (isUser) {
+
+    return (
+      <Row gutter={16} style={{ marginTop: "8em", marginLeft: "0", marginRight: "0" }}>
+        <Col span={2}></Col>
+        <Col className="gutter-row" span={4}>
+          <Row gutter={[16, 40]}>
+            <Col span={24}>
+              <User name={username} image={image} username={username} />
+            </Col>
+            <Col span={24}>
+              <StyledMenu>
+                {list.map(item => <Menu.Item key={item} onClick={item => TabChange(item.key)}>{item}</Menu.Item>)}
+                <Menu.Divider />
+                {orgsMod.map(item => <Menu.Item key={item.slug} onClick={item => OrgChange(item.key)}>{item.name}</Menu.Item>)}
+                <Menu.Divider />
+                {tagsList.map(item => <Menu.Item key={item.slug} onClick={item => TagChange(item.key)}>{item.tagname}</Menu.Item>)}
+              </StyledMenu>
+            </Col>
+          </Row>
+        </Col>
+        <Col span={12}>
+          <Row gutter={[16, 40]}>
+            <Col span={24}>
+              <Tab_list tabs={tab_select_list} defaultActiveKey={tab_select_list[0]} onClick={key => TabView(key)} position={"top"} />
+            </Col>
+            <Col span={24} style={{ paddingTop: "0" }}>
+              {isPosts && articleData ? <ArticleList articles={articleData.articles} /> : null}
+
+              {isFollowers ? <FollowList followings={false} /> : null}
+              {isFollowings ? <FollowList followings={true} /> : null}
+
+              {isTag ? tagSettings ?
+                <GroupSetting page={"tag"} currentTag={currentTag} /> :
+                pubTags ?
+                  <ArticleList
+                    modReview={true}
+                    currentTag={currentTag}
+                    articles={publishedTags} /> :
+									<ArticleList
+                    articles={needsReview}
+                    currentTag={currentTag} />
+                	: null}
+
+              {isOrg ? orgArticles ?
+								isOrgSettings ? <GroupSetting page={"org"} currentOrg={currentOrg} /> :
+                isMembers ? <UserList users={orgMembers.organization.followers} /> :
+								<ArticleList
+									articles={orgArticles.articles}
+									currentOrg={currentOrg} /> : null : null}
+
+              {isSettings ? <AccountSettings /> : null}
+
+              {isAdmin ? <AdminPanel tags={dropDownTags} /> : null}
+            </Col>
+          </Row>
+        </Col>
+        <Col span={3}>
+          {isSettings ? <p style={{ opacity: "0.7", marginTop: "16px", fontSize: "18px" }}>Live Website</p> : null}
+        </Col>
+      </Row>
+    );
+  }
+  else {
+    return (<div></div>)
+  }
 };
 
 Profile.getInitialProps = async ({ query: { pid } }) => {
-	const { data: initialProfile } = await UserAPI.get(pid);
-	return { initialProfile };
+  const { data: initialProfile } = await UserAPI.get(pid);
+  return { initialProfile };
 };
 
 export default Profile;

From c75436b92581b0c245969d45720f7950189ce3ab Mon Sep 17 00:00:00 2001
From: Schuyler deVos <schuylerdevos@gmail.com>
Date: Mon, 29 Jun 2020 01:52:09 -0400
Subject: [PATCH 03/14] updating api calls

---
 components/global/User.tsx          |  12 +--
 components/global/UserList.tsx      |  74 ++++++++-----
 components/profile/GroupSetting.tsx | 160 +++++++++++++++++-----------
 lib/api/org.ts                      |  49 +++++++++
 lib/api/tag.ts                      |  24 ++++-
 lib/api/user.ts                     |  20 ----
 pages/dashboard/[pid].tsx           |  12 +--
 7 files changed, 229 insertions(+), 122 deletions(-)
 create mode 100644 lib/api/org.ts

diff --git a/components/global/User.tsx b/components/global/User.tsx
index b983ea3..6ec8706 100644
--- a/components/global/User.tsx
+++ b/components/global/User.tsx
@@ -8,7 +8,7 @@ const StyledListItemMeta = styled(List.Item.Meta)`
     align-items: center;
     font-size : 1em;
     flex: none;
-    
+
     .ant-list-item-meta-avatar {
       margin-right: 1.2em;
     }
@@ -23,7 +23,7 @@ const StyledListItemMeta = styled(List.Item.Meta)`
       color: #000000
       word-wrap: break-word;
     }
-    
+
     .ant-list-item-meta-description {
       font-family: Open Sans, sans-serif;
       font-style: normal;
@@ -41,11 +41,11 @@ const User = (props) =>(
     title={props.username}
     description={props.username ||
       (props.hasButton &&
-        <Button 
-          type ={'primary'} 
+        <Button
+          type ={'primary'}
           size={'small'}
           onClick = {props.onClick}
-          style={{ 
+          style={{
             background: props.following ? '#4EC700':'#007BED' ,
             borderColor :  props.following ? '#4EC700':'#007BED' ,
             borderRadius: '0.5em',
@@ -55,7 +55,7 @@ const User = (props) =>(
           }}>
             {props.following ? 'Following' : '+ Follow'}
         </Button>
-      ) 
+      )
     }
   />
 )
diff --git a/components/global/UserList.tsx b/components/global/UserList.tsx
index 82aec73..c0e8e9e 100644
--- a/components/global/UserList.tsx
+++ b/components/global/UserList.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 import User from './User'
 import styled from 'styled-components'
-import {List, Skeleton} from 'antd';
+import { List, Skeleton, Button } from 'antd';
+import OrgAPI from "../../lib/api/org";
 
 const StyledHeader = styled.div`
   font-family: Open Sans, sans-serif;
@@ -12,28 +13,51 @@ const StyledHeader = styled.div`
   color: rgba(0, 0, 0, 0.8);
   margin-bottom: 1em;
 `
-const UserList = (props) => (
-  <>
-    <StyledHeader>{props.header}</StyledHeader>
-    <List
-      className="user-list"
-      itemLayout="horizontal"
-      dataSource={props.users}
-      renderItem={ user => (
-        <List.Item style={{border: 'none'}}>
-          <Skeleton avatar title={false} loading={props.loading} active>
-            <User 
-              name = {user['name']}
-              image = {user['image']}
-              userName = {user['username']}
-              following = {user['following']}
-              onClick = {props['onClick']}
-            />
-          </Skeleton>
-        </List.Item>
-      )}
-    />
-  </>
-)
 
-export default UserList
\ No newline at end of file
+const UserList = (props) => {
+
+  const handleClick = () => {
+    OrgAPI.removeFromOrg(props.currentOrg);
+  }
+
+  return (
+    <>
+      <StyledHeader>{props.header}</StyledHeader>
+      <List
+        className="user-list"
+        itemLayout="horizontal"
+        dataSource={props.users}
+        renderItem={user => (
+          <List.Item style={{ border: 'none' }}>
+            <Skeleton avatar title={false} loading={props.loading} active>
+              <User
+                name={user['profile']['username']}
+                image={user['profile']['image']}
+                username={user['profile']['username']}
+                following={user['following']}
+                onClick={props['onClick']}
+              />
+              <Button
+                type={'primary'}
+                size={'middle'}
+                onClick={handleClick}
+                style={{
+                  background: '#DD2E44',
+                  borderColor: '#DD2E44',
+                  borderRadius: '0.5em',
+                  padding: '0em 1em',
+                  fontSize: '1em',
+                  fontWeight: 'bold',
+                }}
+              >
+                Delete
+              </Button>
+            </Skeleton>
+          </List.Item>
+        )}
+      />
+    </>
+  )
+}
+
+export default UserList
diff --git a/components/profile/GroupSetting.tsx b/components/profile/GroupSetting.tsx
index 8b390a9..5018fb7 100644
--- a/components/profile/GroupSetting.tsx
+++ b/components/profile/GroupSetting.tsx
@@ -3,6 +3,8 @@ import styled from 'styled-components'
 import { Row, Col, Card, Avatar, Button, Space, Layout, Typography, Form, Input } from 'antd';
 import { UserOutlined } from '@ant-design/icons';
 import UserAPI from "../../lib/api/user";
+import OrgAPI from "../../lib/api/org";
+import TagAPI from "../../lib/api/tag";
 
 import useSWR from "swr";
 import fetcher from "../../lib/utils/fetcher";
@@ -20,7 +22,11 @@ const StyledButton = styled(Button)`
 `
 
 const SettingButton = styled(Button)`
-  height: 75px;
+  padding: 0px 50px
+`
+
+const StyledCard = styled(Card)`
+  margin-right: 20px
 `
 
 const GroupSetting = ({ currentOrg = null, currentTag = null, page }) => {
@@ -31,90 +37,120 @@ const GroupSetting = ({ currentOrg = null, currentTag = null, page }) => {
   } = currentOrg ? useSWR(`${SERVER_BASE_URL}/organizations/${currentOrg}`, fetcher) :
       useSWR(`${SERVER_BASE_URL}/tags/${currentTag}`, fetcher)
 
-  //if (tagOrg) { console.log(tagOrg.organization.description); }
+  console.log(tagOrg);
+
+  {/*returns description: etc*/}
+  const editDescription = description => {
+    if (currentOrg) {
+      OrgAPI.changeModSettingOrg(currentOrg, description)
+    } else {
+      TagAPI.changeModSettingTag(currentTag, description)
+    }
+  }
 
-  const editDescription = values => {
-    console.log("The values are", values);
+  const uploadPic = pic => {
+    if (currentOrg) {
+      OrgAPI.changeModSettingOrg(currentOrg, pic)
+    } else {
+      TagAPI.changeModSettingTag(currentTag, pic)
+    }
   }
 
-  const uploadPic = () => {
-    console.log("new pic please");
+  {/*returns string*/}
+  const changeSlug = slug => {
+    if (currentOrg) {
+      OrgAPI.changeModSettingOrg(currentOrg, slug)
+    } else {
+      TagAPI.changeModSettingTag(currentTag, slug)
+    }
   }
 
-  const editModSettings = (setting) => {
+  {/*returns number*/}
+  const editModSettings = setting => {
     if (currentOrg) {
-      UserAPI.changeModSettingOrg(currentOrg, setting)
+      OrgAPI.changeModSettingOrg(currentOrg, setting)
     } else {
-      UserAPI.changeModSettingTag(currentTag, setting)
+      TagAPI.changeModSettingTag(currentTag, setting)
     }
   }
 
   if (tagOrg) {
     return (
       <>
-        <Row gutter={40}>
+        <Row>
           <Col>
-            <Row>
-              <Title level={4}>{currentOrg ? "Org Profile Pic" : "Tag Profile Pic"}</Title>
-            </Row>
-            <Row>
-              <Avatar style={{ margin: "0px 0px 8px" }} />
-            </Row>
-            <Row style={{ margin: "0px 0px 15px" }}>
-              <Button type="primary" onClick={() => uploadPic()}>Reupload Icon</Button>
+            <Row gutter={40}>
+              <Col>
+                <Row>
+                  <Title level={4}>{currentOrg ? "Org Profile Pic" : "Tag Profile Pic"}</Title>
+                </Row>
+                <Row>
+                  <Avatar src={currentOrg ? tagOrg.organization.image : tagOrg.tag.icon} style={{ margin: "0px 0px 8px" }} />
+                </Row>
+                <Row style={{ margin: "0px 0px 15px" }}>
+                  <Button type="primary" onClick={() => uploadPic("placeholder")}>Reupload Icon</Button>
+                </Row>
+                <Row>
+                  <Title level={4}>{currentOrg ? "Org Slug" : "Tag Slug"}</Title>
+                </Row>
+                <Row style={{ margin: "0px 0px 15px" }}>
+                  <Search
+                    placeholder={currentOrg ? currentOrg : currentTag}
+                    defaultValue={currentOrg ? currentOrg : currentTag}
+                    addonBefore="bitproject.org/"
+                    enterButton="edit"
+                    onSearch={value => changeSlug(value)}
+                  />
+                </Row>
+              </Col>
+
+              <Col>
+                <Title level={4}>{currentOrg ? "Org Description" : "Tag Description"}</Title>
+                <Form onFinish={editDescription}
+                  initialValues={{
+                    description: currentOrg ? tagOrg.organization.description : tagOrg.tag.description
+                  }}>
+                  <Form.Item name="description">
+                    <TextArea
+                      placeholder="Org Description here"
+                      autoSize={{ minRows: 4, maxRows: 6 }} />
+                  </Form.Item>
+                  <Form.Item>
+                    <Button type="primary" htmlType="submit" block>{currentOrg ? "Edit Org Description" : "Edit Tag Description"}</Button>
+                  </Form.Item>
+                </Form>
+              </Col>
             </Row>
+
             <Row>
-              <Title level={4}>{currentOrg ? "Org Slug" : "Tag Slug"}</Title>
+              <Title level={4}>Mod Settings</Title>
             </Row>
-            <Row style={{ margin: "0px 0px 15px" }}>
-              <Search
-                placeholder={currentOrg ? currentOrg : currentTag}
-                defaultValue={currentOrg ? currentOrg : currentTag}
-                addonBefore="bitproject.org/"
-                enterButton="edit"
-                onSearch={value => console.log(value)}
-              />
+            <Row style={{ justifyContent: 'space-between' }}>
+              <Col span={8}>
+                <Button size="large" onClick={() => editModSettings(1)} type="primary">
+                  Public
+                </Button>
+                <StyledCard>Writers can directly post on tag.</StyledCard>
+              </Col>
+              <Col span={8}>
+                <Button size="large" onClick={() => editModSettings(2)} type="primary">
+                  Moderated
+                </Button>
+                <StyledCard>Moderators allow posts on the tag.</StyledCard>
+              </Col>
+              <Col span={8}>
+                <Button size="large" onClick={() => editModSettings(3)} type="primary">
+                  Private
+                </Button>
+                <StyledCard>Only moderators can post on the tag. Fit for internal tags.</StyledCard>
+              </Col>
             </Row>
           </Col>
-
-          <Col>
-            <Title level={4}>{currentOrg ? "Org Description" : "Tag Description"}</Title>
-            <Form onFinish={editDescription}
-              initialValues={{
-                description: currentOrg ? tagOrg.organization.description : tagOrg.tag.description
-              }}>
-              <Form.Item name="description">
-                <TextArea
-                  placeholder="Org Description here"
-                  autoSize={{ minRows: 4, maxRows: 6 }} />
-              </Form.Item>
-              <Form.Item>
-                <Button type="primary" htmlType="submit" block>{currentOrg ? "Edit Org Description" : "Edit Tag Description"}</Button>
-              </Form.Item>
-            </Form>
-          </Col>
-        </Row>
-
-        <Row>
-          <Title level={4}>Mod Settings</Title>
-        </Row>
-        <Row>
-          <Space>
-            <SettingButton onClick={() => editModSettings(1)} type="primary">
-              Public: <br /> Writers can directly post on tag
-            </SettingButton>
-            <SettingButton onClick={() => editModSettings(2)} type="primary">
-              Moderated: <br /> Moderators allow posts on the tag
-            </SettingButton>
-            <SettingButton onClick={() => editModSettings(3)} type="primary">
-              Private: <br /> Only moderators can post on the tag. <br /> Fit for internal tags
-          </SettingButton>
-          </Space>
         </Row>
       </>
     )
   } else {
-    return(<div></div>)
+    return (<div></div>)
   }
 }
 
diff --git a/lib/api/org.ts b/lib/api/org.ts
new file mode 100644
index 0000000..a447d78
--- /dev/null
+++ b/lib/api/org.ts
@@ -0,0 +1,49 @@
+import axios from "axios";
+
+import { SERVER_BASE_URL } from "../utils/constant";
+
+const OrgAPI = {
+
+  changeModSettingOrg: async (org,setting) => {
+    const user: any = window.localStorage.getItem("user");
+    const token = user?.token;
+    try {
+      const response = await axios.put(
+        `${SERVER_BASE_URL}/organizations/${org}`,
+        JSON.stringify({ setting }),
+        {
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: `Token ${encodeURIComponent(token)}`,
+          },
+        }
+      );
+      return response;
+      console.log(response);
+    } catch (error) {
+      return error.response;
+    }
+  },
+
+  removeFromOrg: async (org) => {
+    const user: any = window.localStorage.getItem("user");
+    const token = user?.token;
+    try {
+      const response = await axios.delete(
+        `${SERVER_BASE_URL}/organizations/${org}/members`,
+        {
+          headers: {
+            Authorization: `Token ${encodeURIComponent(token)}`,
+          },
+        }
+      );
+      return response;
+      console.log(response);
+    } catch (error) {
+      return error.response;
+    }
+  },
+
+}
+
+export default OrgAPI;
diff --git a/lib/api/tag.ts b/lib/api/tag.ts
index c451867..fe1d469 100644
--- a/lib/api/tag.ts
+++ b/lib/api/tag.ts
@@ -63,8 +63,28 @@ const TagAPI = {
     } catch (error) {
       return error.response;
     }
-  }
-, moderators: async (slug,member) => {
+  },
+  changeModSettingTag: async (tag,setting) => {
+    const user: any = window.localStorage.getItem("user");
+    const token = user?.token;
+    try {
+      const response = await axios.post(
+        `${SERVER_BASE_URL}/organizations/${tag}`,
+        JSON.stringify({ setting }),
+        {
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: `Token ${encodeURIComponent(token)}`,
+          },
+        }
+      );
+      return response;
+      console.log(response);
+    } catch (error) {
+      return error.response;
+    }
+  },
+  moderators: async (slug,member) => {
   const user: any = JSON.parse(window.localStorage.getItem("user"));
   const token = user?.token;
   try {
diff --git a/lib/api/user.ts b/lib/api/user.ts
index 1547e71..3b757e8 100644
--- a/lib/api/user.ts
+++ b/lib/api/user.ts
@@ -85,26 +85,6 @@ const UserAPI = {
       return error.response;
     }
   },
-  changeModSettingOrg: async (org,setting) => {
-    const user: any = window.localStorage.getItem("user");
-    const token = user?.token;
-    try {
-      const response = await axios.put(
-        `${SERVER_BASE_URL}/organizations/${org}`,
-        JSON.stringify({ setting }),
-        {
-          headers: {
-            "Content-Type": "application/json",
-            Authorization: `Token ${encodeURIComponent(token)}`,
-          },
-        }
-      );
-      return response;
-      console.log(response);
-    } catch (error) {
-      return error.response;
-    }
-  },
   follow: async (username, email) => {
     const user: any = JSON.parse(window.localStorage.getItem("user"));
     const token = user?.token;
diff --git a/pages/dashboard/[pid].tsx b/pages/dashboard/[pid].tsx
index 3003205..55a4873 100644
--- a/pages/dashboard/[pid].tsx
+++ b/pages/dashboard/[pid].tsx
@@ -159,7 +159,6 @@ const Profile = ({ initialProfile }) => {
 
   {/*for org menu items*/ }
   const OrgChange = (key) => {
-    console.log(key);
     setPostsPage(false)
     setFollowersPage(false)
     setFollowingsPage(false)
@@ -262,8 +261,6 @@ const Profile = ({ initialProfile }) => {
     fetcher
   );
 
-	if (orgMembers) {console.log(orgMembers.organization.followers)}
-
 	const {
 		data: orgArticles,
 		error: orgArticleError,
@@ -353,12 +350,13 @@ const Profile = ({ initialProfile }) => {
                     currentTag={currentTag} />
                 	: null}
 
-              {isOrg ? orgArticles ?
-								isOrgSettings ? <GroupSetting page={"org"} currentOrg={currentOrg} /> :
-                isMembers ? <UserList users={orgMembers.organization.followers} /> :
+              {isOrg ? orgMembers ? orgArticles ?
+								isOrgSettings ? <GroupSetting page={"org"}
+								currentOrg={currentOrg} /> :
+                isMembers ? <UserList currentOrg={currentOrg} users={orgMembers.organization.followers.concat(orgMembers.organization.moderators)} /> :
 								<ArticleList
 									articles={orgArticles.articles}
-									currentOrg={currentOrg} /> : null : null}
+									currentOrg={currentOrg} /> : null : null : null}
 
               {isSettings ? <AccountSettings /> : null}
 

From 538adcc038dbdfb3950cb46ae260f9de1771a6d9 Mon Sep 17 00:00:00 2001
From: Schuyler deVos <schuylerdevos@gmail.com>
Date: Mon, 29 Jun 2020 13:25:37 -0400
Subject: [PATCH 04/14] cleanup

---
 components/profile/GroupSetting.tsx | 10 ----------
 pages/dashboard/[pid].tsx           |  8 ++++----
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/components/profile/GroupSetting.tsx b/components/profile/GroupSetting.tsx
index 5018fb7..aa036ec 100644
--- a/components/profile/GroupSetting.tsx
+++ b/components/profile/GroupSetting.tsx
@@ -17,14 +17,6 @@ const { TextArea } = Input;
 
 const { Search } = Input;
 
-const StyledButton = styled(Button)`
-  margin: 0px 20px
-`
-
-const SettingButton = styled(Button)`
-  padding: 0px 50px
-`
-
 const StyledCard = styled(Card)`
   margin-right: 20px
 `
@@ -37,8 +29,6 @@ const GroupSetting = ({ currentOrg = null, currentTag = null, page }) => {
   } = currentOrg ? useSWR(`${SERVER_BASE_URL}/organizations/${currentOrg}`, fetcher) :
       useSWR(`${SERVER_BASE_URL}/tags/${currentTag}`, fetcher)
 
-  console.log(tagOrg);
-
   {/*returns description: etc*/}
   const editDescription = description => {
     if (currentOrg) {
diff --git a/pages/dashboard/[pid].tsx b/pages/dashboard/[pid].tsx
index 55a4873..bdc921d 100644
--- a/pages/dashboard/[pid].tsx
+++ b/pages/dashboard/[pid].tsx
@@ -8,8 +8,6 @@ import UserAPI from "../../lib/api/user";
 import checkLogin from "../../lib/utils/checkLogin";
 
 import GroupSetting from "../../components/profile/GroupSetting";
-
-//DIFFERENT ONE
 import ArticleList from "../../components/global/ArticleList";
 import UserList from "../../components/global/UserList";
 import ErrorMessage from "../../components/common/ErrorMessage";
@@ -61,7 +59,6 @@ const Profile = ({ initialProfile }) => {
   } else {
     tabsList = ["Posts", "Followers", "Following", "Account Settings"]
   }
-  //here's where we're getting the list from
   const [list, setList] = React.useState(tabsList)
   const [tab_select_list, setTabList] = React.useState(["All Posts", "Published", "Drafts"])
   const [isPosts, setPostsPage] = React.useState(true)
@@ -171,6 +168,7 @@ const Profile = ({ initialProfile }) => {
     setOrg(key);
   }
 
+	{/*switching between top tabs*/}
   const TabView = (key) => {
     if (key == "All Posts") {
       setAllArticles(true);
@@ -353,7 +351,9 @@ const Profile = ({ initialProfile }) => {
               {isOrg ? orgMembers ? orgArticles ?
 								isOrgSettings ? <GroupSetting page={"org"}
 								currentOrg={currentOrg} /> :
-                isMembers ? <UserList currentOrg={currentOrg} users={orgMembers.organization.followers.concat(orgMembers.organization.moderators)} /> :
+                isMembers ? <UserList
+									currentOrg={currentOrg}
+									users={orgMembers.organization.followers.concat(orgMembers.organization.moderators)} /> :
 								<ArticleList
 									articles={orgArticles.articles}
 									currentOrg={currentOrg} /> : null : null : null}

From 7b04612b68d03255d52c64dd33b13434bd961ffe Mon Sep 17 00:00:00 2001
From: Schuyler deVos <schuylerdevos@gmail.com>
Date: Mon, 29 Jun 2020 17:45:25 -0400
Subject: [PATCH 05/14] fixing up active tab stuff

---
 components/profile/GroupSetting.tsx |  2 +-
 components/profile/Tab_list.tsx     |  4 ++--
 pages/dashboard/[pid].tsx           | 25 +++++++++++++++++++------
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/components/profile/GroupSetting.tsx b/components/profile/GroupSetting.tsx
index aa036ec..be10b54 100644
--- a/components/profile/GroupSetting.tsx
+++ b/components/profile/GroupSetting.tsx
@@ -75,7 +75,7 @@ const GroupSetting = ({ currentOrg = null, currentTag = null, page }) => {
                   <Title level={4}>{currentOrg ? "Org Profile Pic" : "Tag Profile Pic"}</Title>
                 </Row>
                 <Row>
-                  <Avatar src={currentOrg ? tagOrg.organization.image : tagOrg.tag.icon} style={{ margin: "0px 0px 8px" }} />
+                  <Avatar src={currentOrg ? tagOrg.organization.image : tagOrg.tag.icon} style={{ margin: "0px 42px 10px" }} />
                 </Row>
                 <Row style={{ margin: "0px 0px 15px" }}>
                   <Button type="primary" onClick={() => uploadPic("placeholder")}>Reupload Icon</Button>
diff --git a/components/profile/Tab_list.tsx b/components/profile/Tab_list.tsx
index 5bf96c5..aac7665 100644
--- a/components/profile/Tab_list.tsx
+++ b/components/profile/Tab_list.tsx
@@ -15,7 +15,7 @@ const Tab_list=(props)=>{
 	  } = router;
 	  return(
 	  	<>
-		<Tabs tabPosition={props.position} size={'large'} animated={false} onTabClick={key=>props.onClick(key)}>
+		<Tabs tabPosition={props.position} activeKey={props.activeKey} size={'large'} animated={false} onTabClick={key=>props.onClick(key)}>
 			{[...props.tabs].map(i=>(
 				<TabPane tab={i} key={i}>
             	</TabPane>
@@ -24,4 +24,4 @@ const Tab_list=(props)=>{
 		</>
 	);
 };
-export default Tab_list;
\ No newline at end of file
+export default Tab_list;
diff --git a/pages/dashboard/[pid].tsx b/pages/dashboard/[pid].tsx
index bdc921d..e08c1a9 100644
--- a/pages/dashboard/[pid].tsx
+++ b/pages/dashboard/[pid].tsx
@@ -94,8 +94,10 @@ const Profile = ({ initialProfile }) => {
 
   const [orgTagSettings, setOrgTagSettings] = React.useState(false);
 
-  {/*for article items*/ }
-  const TabChange = (key) => {
+	const [tabKey, setTabKey] = React.useState(null);
+
+  {/*for article items/admin/everything not orgs and tags in menu*/ }
+  const MenuChange = (key) => {
     setTagPage(false)
     setOrgPage(false)
     if (key == "Posts") {
@@ -105,6 +107,9 @@ const Profile = ({ initialProfile }) => {
       setFollowingsPage(false)
       setSettingsPage(false)
       setIsAdmin(false)
+
+			TabView("All Posts");
+			setTabKey("All Posts");
     }
     else if (key == "Followers") {
       setTabList(["Old -> New"])
@@ -138,6 +143,7 @@ const Profile = ({ initialProfile }) => {
       setFollowingsPage(false)
       setSettingsPage(false)
     }
+		setTabKey(tab_select_list[0]);
   }
 
   {/*for tag menu items*/ }
@@ -149,9 +155,12 @@ const Profile = ({ initialProfile }) => {
     setIsAdmin(false)
     setOrgPage(false)
 
-    setTabList(["Submitted", "Published", "Settings"])
-    setTagPage(true)
+		setTabList(["Submitted", "Published", "Settings"])
+		setTagPage(true);
     setTag(key);
+
+		TabView("Submitted");
+		setTabKey(tab_select_list[0]);
   }
 
   {/*for org menu items*/ }
@@ -166,10 +175,14 @@ const Profile = ({ initialProfile }) => {
     setTabList(["Submitted", "Members", "Settings"])
     setOrgPage(true);
     setOrg(key);
+
+		TabView("Submitted");
+		setTabKey(tab_select_list[0]);
   }
 
 	{/*switching between top tabs*/}
   const TabView = (key) => {
+		setTabKey(key);
     if (key == "All Posts") {
       setAllArticles(true);
       setDrafts(false);
@@ -316,7 +329,7 @@ const Profile = ({ initialProfile }) => {
             </Col>
             <Col span={24}>
               <StyledMenu>
-                {list.map(item => <Menu.Item key={item} onClick={item => TabChange(item.key)}>{item}</Menu.Item>)}
+                {list.map(item => <Menu.Item key={item} onClick={item => MenuChange(item.key)}>{item}</Menu.Item>)}
                 <Menu.Divider />
                 {orgsMod.map(item => <Menu.Item key={item.slug} onClick={item => OrgChange(item.key)}>{item.name}</Menu.Item>)}
                 <Menu.Divider />
@@ -328,7 +341,7 @@ const Profile = ({ initialProfile }) => {
         <Col span={12}>
           <Row gutter={[16, 40]}>
             <Col span={24}>
-              <Tab_list tabs={tab_select_list} defaultActiveKey={tab_select_list[0]} onClick={key => TabView(key)} position={"top"} />
+              <Tab_list tabs={tab_select_list} activeKey={tabKey ? tabKey : tab_select_list[0]} defaultActiveKey={tab_select_list[0]} onClick={key => TabView(key)} position={"top"} />
             </Col>
             <Col span={24} style={{ paddingTop: "0" }}>
               {isPosts && articleData ? <ArticleList articles={articleData.articles} /> : null}

From b3a2b8a310da325d6ea27bae560b3864af046010 Mon Sep 17 00:00:00 2001
From: Schuyler deVos <schuylerdevos@gmail.com>
Date: Mon, 29 Jun 2020 18:24:00 -0400
Subject: [PATCH 06/14] syncing w/github

---
 components/global/ArticleCard.tsx |  6 ++--
 components/global/User.tsx        |  6 ++--
 components/global/UserList.tsx    | 52 ++++++++++++++++---------------
 3 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/components/global/ArticleCard.tsx b/components/global/ArticleCard.tsx
index bb104ce..23d439f 100644
--- a/components/global/ArticleCard.tsx
+++ b/components/global/ArticleCard.tsx
@@ -68,7 +68,9 @@ const StyledEmoji = styled.span`
 `
 
 /* article state: draft, review, pubished, complete*/
-const ArticleCard = ({ article, currentTag = null, modReview=false, showAuth = false, onLeftButtonClick = null, onRightButtonClick = null }) => {
+const ArticleCard = ({ article, currentTag = null, currentOrg = null,
+   modReview=false, showAuth = false, onLeftButtonClick = null, onRightButtonClick = null,
+    favoriteClick = null}) => {
 
   const tags = article.tagList.map((tag, i) =>
     (<StyledSpan>
@@ -167,7 +169,7 @@ const ArticleCard = ({ article, currentTag = null, modReview=false, showAuth = f
                 }}
               >
                 {
-                    modReview ? 'Published' : article.isPublished ? 'BookMark' :
+                    modReview ? 'Published' : article.isPublished ? article.bookmarked ? "Bookmarked" : 'BookMark' :
                     article.needsReview ? 'Published' : 'Edit'
                 }
               </Button>
diff --git a/components/global/User.tsx b/components/global/User.tsx
index 6ec8706..39a5f50 100644
--- a/components/global/User.tsx
+++ b/components/global/User.tsx
@@ -39,8 +39,8 @@ const User = (props) =>(
   <StyledListItemMeta
     avatar={ <Avatar src= {props.image} size = { props.avatarSize || 50}/>}
     title={props.username}
-    description={props.username ||
-      (props.hasButton &&
+    description={
+      (props.hasButton && !props.currentOrg &&
         <Button
           type ={'primary'}
           size={'small'}
@@ -55,7 +55,7 @@ const User = (props) =>(
           }}>
             {props.following ? 'Following' : '+ Follow'}
         </Button>
-      )
+      ) || props.username
     }
   />
 )
diff --git a/components/global/UserList.tsx b/components/global/UserList.tsx
index c0e8e9e..da10f58 100644
--- a/components/global/UserList.tsx
+++ b/components/global/UserList.tsx
@@ -21,42 +21,44 @@ const UserList = (props) => {
   }
 
   return (
-    <>
-      <StyledHeader>{props.header}</StyledHeader>
-      <List
-        className="user-list"
-        itemLayout="horizontal"
-        dataSource={props.users}
-        renderItem={user => (
-          <List.Item style={{ border: 'none' }}>
-            <Skeleton avatar title={false} loading={props.loading} active>
-              <User
-                name={user['profile']['username']}
-                image={user['profile']['image']}
-                username={user['profile']['username']}
-                following={user['following']}
-                onClick={props['onClick']}
-              />
-              <Button
+  <>
+    <StyledHeader>{props.header}</StyledHeader>
+    <List
+      className="user-list"
+      itemLayout="horizontal"
+      dataSource={props.users}
+      renderItem={ user => (
+        <List.Item style={{border: 'none'}}>
+          <Skeleton avatar title={false} loading={props.loading} active>
+            <User
+              currentOrg = {props.currentOrg ? props.currentOrg : null}
+              name = {user['profile']['username']}
+              image = {user['profile']['image']}
+              username = {user['profile']['username']}
+              following = {user['profile']['following']}
+              hasButton = {true}
+            />
+            {props.currentOrg ? <Button
                 type={'primary'}
                 size={'middle'}
                 onClick={handleClick}
                 style={{
+                  fontSize: '1em',
+                  fontWeight: 'bold',
                   background: '#DD2E44',
                   borderColor: '#DD2E44',
                   borderRadius: '0.5em',
                   padding: '0em 1em',
-                  fontSize: '1em',
-                  fontWeight: 'bold',
                 }}
               >
                 Delete
-              </Button>
-            </Skeleton>
-          </List.Item>
-        )}
-      />
-    </>
+              </Button> : null
+            }
+          </Skeleton>
+        </List.Item>
+      )}
+    />
+  </>
   )
 }
 

From da7d366588daf6ca169af93c14124e3867bf137c Mon Sep 17 00:00:00 2001
From: Schuyler deVos <schuylerdevos@gmail.com>
Date: Tue, 30 Jun 2020 03:11:38 -0400
Subject: [PATCH 07/14] updating api methods for tags

---
 components/profile/GroupSetting.tsx |  6 +--
 lib/api/tag.ts                      | 79 +++++++++++++++++++++--------
 pages/dashboard/[pid].tsx           |  4 +-
 3 files changed, 63 insertions(+), 26 deletions(-)

diff --git a/components/profile/GroupSetting.tsx b/components/profile/GroupSetting.tsx
index be10b54..4308683 100644
--- a/components/profile/GroupSetting.tsx
+++ b/components/profile/GroupSetting.tsx
@@ -34,7 +34,7 @@ const GroupSetting = ({ currentOrg = null, currentTag = null, page }) => {
     if (currentOrg) {
       OrgAPI.changeModSettingOrg(currentOrg, description)
     } else {
-      TagAPI.changeModSettingTag(currentTag, description)
+      TagAPI.changeTagDescription(currentTag, description)
     }
   }
 
@@ -42,7 +42,7 @@ const GroupSetting = ({ currentOrg = null, currentTag = null, page }) => {
     if (currentOrg) {
       OrgAPI.changeModSettingOrg(currentOrg, pic)
     } else {
-      TagAPI.changeModSettingTag(currentTag, pic)
+      TagAPI.changeTagPic(currentTag, pic)
     }
   }
 
@@ -51,7 +51,7 @@ const GroupSetting = ({ currentOrg = null, currentTag = null, page }) => {
     if (currentOrg) {
       OrgAPI.changeModSettingOrg(currentOrg, slug)
     } else {
-      TagAPI.changeModSettingTag(currentTag, slug)
+      TagAPI.changeTagSlug(currentTag, slug)
     }
   }
 
diff --git a/lib/api/tag.ts b/lib/api/tag.ts
index 3c3df30..2453a55 100644
--- a/lib/api/tag.ts
+++ b/lib/api/tag.ts
@@ -4,22 +4,7 @@ import { SERVER_BASE_URL } from "../utils/constant";
 
 const TagAPI = {
   getAll: () => axios.get(`${SERVER_BASE_URL}/tags`),
-  get: async(slug,user) => {
-    const token = user?.token;
-
-    try {
-      const response = await axios.get(
-        `${SERVER_BASE_URL}/tags/${slug}`,
-        {
-          headers: {
-            Authorization: `Token ${encodeURIComponent(token)}`,
-          },
-        }
-      );
-      return response;
-    } catch (error) {
-      return error.response;
-    }},
+  get: (slug) => axios.get(`${SERVER_BASE_URL}/tags/${slug}`),
   follow: async (slug) => {
     const user: any = JSON.parse(window.localStorage.getItem("user"));
     const token = user?.token;
@@ -40,7 +25,6 @@ const TagAPI = {
   },
 
   rejectTag: async (article, currentTag) => {
-    console.log(article)
     const user: any = JSON.parse(window.localStorage.getItem("user"));
     const token = user?.token;
     console.log(`${SERVER_BASE_URL}/tags/${currentTag}/articles/${article.slug}`)
@@ -80,12 +64,38 @@ const TagAPI = {
     }
   },
   changeModSettingTag: async (tag,setting) => {
+    const body = JSON.stringify({tag: {modSetting: setting }});
     const user: any = window.localStorage.getItem("user");
-    const token = user?.token;
+    const user2: any = JSON.parse(user);
+    const token = user2?.token;
     try {
-      const response = await axios.post(
-        `${SERVER_BASE_URL}/organizations/${tag}`,
-        JSON.stringify({ setting }),
+      const response = await axios.put(
+        `${SERVER_BASE_URL}/tags/${tag}`,
+        body,
+        {
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: `Token ${encodeURIComponent(token)}`,
+          },
+        }
+      );
+      console.log(response);
+      return response;
+    } catch (error) {
+      return error.response;
+    }
+  },
+  changeTagDescription: async (tag,description) => {
+    const body = JSON.stringify({tag: description });
+    const user: any = window.localStorage.getItem("user");
+    const user2: any = JSON.parse(user);
+    const token = user2?.token;
+    console.log(body);
+    console.log(token);
+    try {
+      const response = await axios.put(
+        `${SERVER_BASE_URL}/tags/${tag}`,
+        body,
         {
           headers: {
             "Content-Type": "application/json",
@@ -93,17 +103,42 @@ const TagAPI = {
           },
         }
       );
+      console.log(response);
       return response;
+    } catch (error) {
+      return error.response;
+    }
+  },
+  changeTagSlug: async (tag,slug) => {
+    console.log("current tag",tag,"new slug",slug);
+    const body = JSON.stringify({tag: {slug: slug }});
+    const user: any = window.localStorage.getItem("user");
+    const user2: any = JSON.parse(user);
+    const token = user2?.token;
+    try {
+      const response = await axios.put(
+        `${SERVER_BASE_URL}/tags/${tag}`,
+        body,
+        {
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: `Token ${encodeURIComponent(token)}`,
+          },
+        }
+      );
       console.log(response);
+      return response;
     } catch (error) {
+      console.log(error);
       return error.response;
     }
   },
+  changeTagPic: () => console.log("put this in later"),
   moderators: async (slug,member) => {
   const user: any = JSON.parse(window.localStorage.getItem("user"));
   const token = user?.token;
   try {
-    const response = await axios.post(
+    const response = await axios.put(
       `${SERVER_BASE_URL}/tags/${slug}/moderator/${member}`,{},
       {
         headers: {
diff --git a/pages/dashboard/[pid].tsx b/pages/dashboard/[pid].tsx
index e08c1a9..12c7ed9 100644
--- a/pages/dashboard/[pid].tsx
+++ b/pages/dashboard/[pid].tsx
@@ -270,7 +270,9 @@ const Profile = ({ initialProfile }) => {
 	} = useSWR(
     `${SERVER_BASE_URL}/organizations/${currentOrg}/members`,
     fetcher
-  );
+  )
+
+	if (membersError) {null}
 
 	const {
 		data: orgArticles,

From 021f3f6f4ceb4f5445ef6f6a904469eec5ae2e8b Mon Sep 17 00:00:00 2001
From: Schuyler deVos <schuylerdevos@gmail.com>
Date: Tue, 30 Jun 2020 13:13:07 -0400
Subject: [PATCH 08/14] tab&menu switching fixed

---
 pages/dashboard/[pid].tsx | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pages/dashboard/[pid].tsx b/pages/dashboard/[pid].tsx
index 12c7ed9..a26fde0 100644
--- a/pages/dashboard/[pid].tsx
+++ b/pages/dashboard/[pid].tsx
@@ -91,15 +91,15 @@ const Profile = ({ initialProfile }) => {
   const isUser = currentUser && username === currentUser ?.username;
 
   const [articleType, setArticleType] = React.useState("all");
-
   const [orgTagSettings, setOrgTagSettings] = React.useState(false);
-
 	const [tabKey, setTabKey] = React.useState(null);
+	const [internalTab, setInternalTab] = React.useState(false);
 
   {/*for article items/admin/everything not orgs and tags in menu*/ }
   const MenuChange = (key) => {
     setTagPage(false)
     setOrgPage(false)
+		setInternalTab(false);
     if (key == "Posts") {
       setTabList(["All Posts", "Published", "Drafts"])
       setPostsPage(true)
@@ -148,6 +148,7 @@ const Profile = ({ initialProfile }) => {
 
   {/*for tag menu items*/ }
   const TagChange = (key) => {
+		setInternalTab(false);
     setPostsPage(false)
     setFollowersPage(false)
     setFollowingsPage(false)
@@ -165,6 +166,7 @@ const Profile = ({ initialProfile }) => {
 
   {/*for org menu items*/ }
   const OrgChange = (key) => {
+		setInternalTab(false)
     setPostsPage(false)
     setFollowersPage(false)
     setFollowingsPage(false)
@@ -343,7 +345,14 @@ const Profile = ({ initialProfile }) => {
         <Col span={12}>
           <Row gutter={[16, 40]}>
             <Col span={24}>
-              <Tab_list tabs={tab_select_list} activeKey={tabKey ? tabKey : tab_select_list[0]} defaultActiveKey={tab_select_list[0]} onClick={key => TabView(key)} position={"top"} />
+						{(() => {
+					    console.log(internalTab,tabKey,tab_select_list[0])
+						})()}
+              <Tab_list tabs={tab_select_list}
+							activeKey={internalTab ? tabKey : tab_select_list[0]}
+							defaultActiveKey={tab_select_list[0]}
+							onClick={key => {TabView(key); setInternalTab(true);}}
+							position={"top"} />
             </Col>
             <Col span={24} style={{ paddingTop: "0" }}>
               {isPosts && articleData ? <ArticleList articles={articleData.articles} /> : null}

From cef0ad20862f9a3790fd56a4ad961ef4c969a7cb Mon Sep 17 00:00:00 2001
From: Schuyler deVos <schuylerdevos@gmail.com>
Date: Tue, 30 Jun 2020 15:55:36 -0400
Subject: [PATCH 09/14] updating org put request api methods

---
 components/profile/GroupSetting.tsx | 27 +++++++----
 lib/api/organizations.ts            | 72 ++++++++++++++++++++++++++++-
 pages/dashboard/[pid].tsx           |  3 --
 3 files changed, 87 insertions(+), 15 deletions(-)

diff --git a/components/profile/GroupSetting.tsx b/components/profile/GroupSetting.tsx
index 4308683..24cdbe6 100644
--- a/components/profile/GroupSetting.tsx
+++ b/components/profile/GroupSetting.tsx
@@ -1,9 +1,11 @@
 import React from 'react';
 import styled from 'styled-components'
-import { Row, Col, Card, Avatar, Button, Space, Layout, Typography, Form, Input } from 'antd';
+import { Row, Col, Card, Avatar, Button,
+   Space, Layout, Typography, Form,
+   Input, Upload, Message } from 'antd';
 import { UserOutlined } from '@ant-design/icons';
 import UserAPI from "../../lib/api/user";
-import OrgAPI from "../../lib/api/org";
+import OrganizationsAPI from "../../lib/api/organizations";
 import TagAPI from "../../lib/api/tag";
 
 import useSWR from "swr";
@@ -32,24 +34,25 @@ const GroupSetting = ({ currentOrg = null, currentTag = null, page }) => {
   {/*returns description: etc*/}
   const editDescription = description => {
     if (currentOrg) {
-      OrgAPI.changeModSettingOrg(currentOrg, description)
+      OrganizationsAPI.changeOrgDescription(currentOrg, description)
     } else {
       TagAPI.changeTagDescription(currentTag, description)
     }
   }
 
   const uploadPic = pic => {
-    if (currentOrg) {
-      OrgAPI.changeModSettingOrg(currentOrg, pic)
+    console.log(pic);
+    {/*if (currentOrg) {
+      OrganizationsAPI.changeModSettingOrg(currentOrg, pic)
     } else {
       TagAPI.changeTagPic(currentTag, pic)
-    }
+    }*/}
   }
 
   {/*returns string*/}
   const changeSlug = slug => {
     if (currentOrg) {
-      OrgAPI.changeModSettingOrg(currentOrg, slug)
+      OrganizationsAPI.changeOrgSlug(currentOrg, slug)
     } else {
       TagAPI.changeTagSlug(currentTag, slug)
     }
@@ -58,7 +61,7 @@ const GroupSetting = ({ currentOrg = null, currentTag = null, page }) => {
   {/*returns number*/}
   const editModSettings = setting => {
     if (currentOrg) {
-      OrgAPI.changeModSettingOrg(currentOrg, setting)
+      OrganizationsAPI.changeModSettingOrg(currentOrg, setting)
     } else {
       TagAPI.changeModSettingTag(currentTag, setting)
     }
@@ -78,7 +81,9 @@ const GroupSetting = ({ currentOrg = null, currentTag = null, page }) => {
                   <Avatar src={currentOrg ? tagOrg.organization.image : tagOrg.tag.icon} style={{ margin: "0px 42px 10px" }} />
                 </Row>
                 <Row style={{ margin: "0px 0px 15px" }}>
-                  <Button type="primary" onClick={() => uploadPic("placeholder")}>Reupload Icon</Button>
+                  <Upload onChange={uploadPic}>
+                    <Button type="primary" onClick={() => uploadPic("placeholder")}>Reupload Icon</Button>
+                  </Upload>
                 </Row>
                 <Row>
                   <Title level={4}>{currentOrg ? "Org Slug" : "Tag Slug"}</Title>
@@ -98,7 +103,9 @@ const GroupSetting = ({ currentOrg = null, currentTag = null, page }) => {
                 <Title level={4}>{currentOrg ? "Org Description" : "Tag Description"}</Title>
                 <Form onFinish={editDescription}
                   initialValues={{
-                    description: currentOrg ? tagOrg.organization.description : tagOrg.tag.description
+                    description: currentOrg ? tagOrg.organization.description : tagOrg.tag.description,
+                    old_slug: currentOrg,
+                    slug: currentOrg
                   }}>
                   <Form.Item name="description">
                     <TextArea
diff --git a/lib/api/organizations.ts b/lib/api/organizations.ts
index cf20367..1069d81 100644
--- a/lib/api/organizations.ts
+++ b/lib/api/organizations.ts
@@ -20,12 +20,80 @@ const OrganizationsAPI = {
       return error.response;
     }
   },
+  changeModSettingOrg: async (org,setting) => {
+    const body = JSON.stringify({organization: {modSetting: setting, old_slug: org,
+                                        slug: org}});
+    console.log()
+    const user: any = window.localStorage.getItem("user");
+    const user2: any = JSON.parse(user);
+    const token = user2?.token;
+    try {
+      const response = await axios.put(
+        `${SERVER_BASE_URL}/organizations/${org}`,
+        body,
+        {
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: `Token ${encodeURIComponent(token)}`,
+          },
+        }
+      );
+      console.log(response);
+      return response;
+    } catch (error) {
+      return error.response;
+    }
+  },
+  changeOrgSlug: async (org,slug) => {
+    const body = JSON.stringify({organization: {old_slug: org, slug: slug}});
+    const user: any = window.localStorage.getItem("user");
+    const user2: any = JSON.parse(user);
+    const token = user2?.token;
+    try {
+      const response = await axios.put(
+        `${SERVER_BASE_URL}/organizations/${org}`,
+        body,
+        {
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: `Token ${encodeURIComponent(token)}`,
+          },
+        }
+      );
+      return response;
+    } catch (error) {
+      return error.response;
+    }
+  },
+  changeOrgDescription: async (org,description) => {
+    const body = JSON.stringify({organization: {description: description.description,
+                                  old_slug: org, slug: org}});
+    const user: any = window.localStorage.getItem("user");
+    const user2: any = JSON.parse(user);
+    const token = user2?.token;
+    try {
+      const response = await axios.put(
+        `${SERVER_BASE_URL}/organizations/${org}`,
+        body,
+        {
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: `Token ${encodeURIComponent(token)}`,
+          },
+        }
+      );
+      console.log(response);
+      return response;
+    } catch (error) {
+      return error.response;
+    }
+  },
   unfollow: async (slug) => {
     const user: any = JSON.parse(window.localStorage.getItem("user"));
     const token = user?.token;
     try {
       const response = await axios.delete(
-        `${SERVER_BASE_URL}/organizations/${slug}/follow`, 
+        `${SERVER_BASE_URL}/organizations/${slug}/follow`,
         {
           headers: {
             Authorization: `Token ${encodeURIComponent(token)}`,
@@ -57,4 +125,4 @@ const OrganizationsAPI = {
   get: async (slug) => axios.get(`${SERVER_BASE_URL}/organizations/${slug}`),
 };
 
-export default OrganizationsAPI;
\ No newline at end of file
+export default OrganizationsAPI;
diff --git a/pages/dashboard/[pid].tsx b/pages/dashboard/[pid].tsx
index a26fde0..9dd3189 100644
--- a/pages/dashboard/[pid].tsx
+++ b/pages/dashboard/[pid].tsx
@@ -345,9 +345,6 @@ const Profile = ({ initialProfile }) => {
         <Col span={12}>
           <Row gutter={[16, 40]}>
             <Col span={24}>
-						{(() => {
-					    console.log(internalTab,tabKey,tab_select_list[0])
-						})()}
               <Tab_list tabs={tab_select_list}
 							activeKey={internalTab ? tabKey : tab_select_list[0]}
 							defaultActiveKey={tab_select_list[0]}

From c74baf83e105b87d4b25ce7ba4915db6e8bc3013 Mon Sep 17 00:00:00 2001
From: Schuyler deVos <schuylerdevos@gmail.com>
Date: Wed, 1 Jul 2020 02:50:33 -0400
Subject: [PATCH 10/14] updating calls in groupsettings and moving org api

---
 components/global/UserList.tsx      |  7 +--
 components/profile/GroupSetting.tsx | 17 +++---
 lib/api/org.ts                      | 49 ---------------
 lib/api/organizations.ts            | 42 ++++++++++++-
 pages/dashboard/[pid].tsx           | 95 ++++++++++++++++-------------
 5 files changed, 104 insertions(+), 106 deletions(-)
 delete mode 100644 lib/api/org.ts

diff --git a/components/global/UserList.tsx b/components/global/UserList.tsx
index d19436d..070dc25 100644
--- a/components/global/UserList.tsx
+++ b/components/global/UserList.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import User from './User'
 import styled from 'styled-components'
 import { List, Skeleton, Button } from 'antd';
-import OrgAPI from "../../lib/api/org";
+import OrganizationsAPI from "../../lib/api/organizations";
 
 const StyledHeader = styled.div`
   font-family: Open Sans, sans-serif;
@@ -17,7 +17,7 @@ const StyledHeader = styled.div`
 const UserList = (props) => {
 
   const handleClick = () => {
-    OrgAPI.removeFromOrg(props.currentOrg);
+    OrganizationsAPI.removeFromOrg(props.currentOrg);
   }
 
   return (
@@ -50,8 +50,7 @@ const UserList = (props) => {
                   borderColor: '#DD2E44',
                   borderRadius: '0.5em',
                   padding: '0em 1em',
-                }}
-              >
+              }}>
                 Delete
               </Button> : null
             }
diff --git a/components/profile/GroupSetting.tsx b/components/profile/GroupSetting.tsx
index 24cdbe6..cfa14e8 100644
--- a/components/profile/GroupSetting.tsx
+++ b/components/profile/GroupSetting.tsx
@@ -34,6 +34,7 @@ const GroupSetting = ({ currentOrg = null, currentTag = null, page }) => {
   {/*returns description: etc*/}
   const editDescription = description => {
     if (currentOrg) {
+      const description = description.description;
       OrganizationsAPI.changeOrgDescription(currentOrg, description)
     } else {
       TagAPI.changeTagDescription(currentTag, description)
@@ -41,9 +42,9 @@ const GroupSetting = ({ currentOrg = null, currentTag = null, page }) => {
   }
 
   const uploadPic = pic => {
-    console.log(pic);
+    console.log(pic.file);
     {/*if (currentOrg) {
-      OrganizationsAPI.changeModSettingOrg(currentOrg, pic)
+      OrganizationsAPI.changeOrgPic(currentOrg, pic)
     } else {
       TagAPI.changeTagPic(currentTag, pic)
     }*/}
@@ -81,8 +82,8 @@ const GroupSetting = ({ currentOrg = null, currentTag = null, page }) => {
                   <Avatar src={currentOrg ? tagOrg.organization.image : tagOrg.tag.icon} style={{ margin: "0px 42px 10px" }} />
                 </Row>
                 <Row style={{ margin: "0px 0px 15px" }}>
-                  <Upload onChange={uploadPic}>
-                    <Button type="primary" onClick={() => uploadPic("placeholder")}>Reupload Icon</Button>
+                  <Upload customRequest={uploadPic} showUploadList={false}>
+                    <Button type="primary" >Reupload Icon</Button>
                   </Upload>
                 </Row>
                 <Row>
@@ -103,9 +104,7 @@ const GroupSetting = ({ currentOrg = null, currentTag = null, page }) => {
                 <Title level={4}>{currentOrg ? "Org Description" : "Tag Description"}</Title>
                 <Form onFinish={editDescription}
                   initialValues={{
-                    description: currentOrg ? tagOrg.organization.description : tagOrg.tag.description,
-                    old_slug: currentOrg,
-                    slug: currentOrg
+                    description: currentOrg ? tagOrg.organization.description : tagOrg.tag.description
                   }}>
                   <Form.Item name="description">
                     <TextArea
@@ -119,6 +118,8 @@ const GroupSetting = ({ currentOrg = null, currentTag = null, page }) => {
               </Col>
             </Row>
 
+            {currentTag ?
+            <>
             <Row>
               <Title level={4}>Mod Settings</Title>
             </Row>
@@ -142,6 +143,8 @@ const GroupSetting = ({ currentOrg = null, currentTag = null, page }) => {
                 <StyledCard>Only moderators can post on the tag. Fit for internal tags.</StyledCard>
               </Col>
             </Row>
+            </>
+            : null}
           </Col>
         </Row>
       </>
diff --git a/lib/api/org.ts b/lib/api/org.ts
deleted file mode 100644
index a447d78..0000000
--- a/lib/api/org.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import axios from "axios";
-
-import { SERVER_BASE_URL } from "../utils/constant";
-
-const OrgAPI = {
-
-  changeModSettingOrg: async (org,setting) => {
-    const user: any = window.localStorage.getItem("user");
-    const token = user?.token;
-    try {
-      const response = await axios.put(
-        `${SERVER_BASE_URL}/organizations/${org}`,
-        JSON.stringify({ setting }),
-        {
-          headers: {
-            "Content-Type": "application/json",
-            Authorization: `Token ${encodeURIComponent(token)}`,
-          },
-        }
-      );
-      return response;
-      console.log(response);
-    } catch (error) {
-      return error.response;
-    }
-  },
-
-  removeFromOrg: async (org) => {
-    const user: any = window.localStorage.getItem("user");
-    const token = user?.token;
-    try {
-      const response = await axios.delete(
-        `${SERVER_BASE_URL}/organizations/${org}/members`,
-        {
-          headers: {
-            Authorization: `Token ${encodeURIComponent(token)}`,
-          },
-        }
-      );
-      return response;
-      console.log(response);
-    } catch (error) {
-      return error.response;
-    }
-  },
-
-}
-
-export default OrgAPI;
diff --git a/lib/api/organizations.ts b/lib/api/organizations.ts
index 1069d81..5d3655e 100644
--- a/lib/api/organizations.ts
+++ b/lib/api/organizations.ts
@@ -23,7 +23,6 @@ const OrganizationsAPI = {
   changeModSettingOrg: async (org,setting) => {
     const body = JSON.stringify({organization: {modSetting: setting, old_slug: org,
                                         slug: org}});
-    console.log()
     const user: any = window.localStorage.getItem("user");
     const user2: any = JSON.parse(user);
     const token = user2?.token;
@@ -38,7 +37,6 @@ const OrganizationsAPI = {
           },
         }
       );
-      console.log(response);
       return response;
     } catch (error) {
       return error.response;
@@ -82,9 +80,49 @@ const OrganizationsAPI = {
           },
         }
       );
+      return response;
+    } catch (error) {
+      return error.response;
+    }
+  },
+  changeOrgPic: async (org,pic) => {
+    const body = JSON.stringify({organization: {image: pic,
+                                  old_slug: org, slug: org}});
+    const user: any = window.localStorage.getItem("user");
+    const user2: any = JSON.parse(user);
+    const token = user2?.token;
+    try {
+      const response = await axios.put(
+        `${SERVER_BASE_URL}/organizations/${org}`,
+        body,
+        {
+          headers: {
+            Authorization: `Token ${encodeURIComponent(token)}`,
+          },
+        }
+      );
+      return response;
+    } catch (error) {
+      return error.response;
+    }
+  },
+  removeFromOrg: async (org) => {
+    const user: any = window.localStorage.getItem("user");
+    const user2: any = JSON.parse(user);
+    const token = user2?.token;
+    try {
+      const response = await axios.delete(
+        `${SERVER_BASE_URL}/organizations/${org}/members`,
+        {
+          headers: {
+            Authorization: `Token ${encodeURIComponent(token)}`,
+          },
+        }
+      );
       console.log(response);
       return response;
     } catch (error) {
+      console.log(error);
       return error.response;
     }
   },
diff --git a/pages/dashboard/[pid].tsx b/pages/dashboard/[pid].tsx
index 9dd3189..f329cd2 100644
--- a/pages/dashboard/[pid].tsx
+++ b/pages/dashboard/[pid].tsx
@@ -92,14 +92,14 @@ const Profile = ({ initialProfile }) => {
 
   const [articleType, setArticleType] = React.useState("all");
   const [orgTagSettings, setOrgTagSettings] = React.useState(false);
-	const [tabKey, setTabKey] = React.useState(null);
-	const [internalTab, setInternalTab] = React.useState(false);
+  const [tabKey, setTabKey] = React.useState(null);
+  const [internalTab, setInternalTab] = React.useState(false);
 
   {/*for article items/admin/everything not orgs and tags in menu*/ }
   const MenuChange = (key) => {
     setTagPage(false)
     setOrgPage(false)
-		setInternalTab(false);
+    setInternalTab(false);
     if (key == "Posts") {
       setTabList(["All Posts", "Published", "Drafts"])
       setPostsPage(true)
@@ -108,8 +108,8 @@ const Profile = ({ initialProfile }) => {
       setSettingsPage(false)
       setIsAdmin(false)
 
-			TabView("All Posts");
-			setTabKey("All Posts");
+      TabView("All Posts");
+      setTabKey("All Posts");
     }
     else if (key == "Followers") {
       setTabList(["Old -> New"])
@@ -143,12 +143,12 @@ const Profile = ({ initialProfile }) => {
       setFollowingsPage(false)
       setSettingsPage(false)
     }
-		setTabKey(tab_select_list[0]);
+    setTabKey(tab_select_list[0]);
   }
 
   {/*for tag menu items*/ }
   const TagChange = (key) => {
-		setInternalTab(false);
+    setInternalTab(false);
     setPostsPage(false)
     setFollowersPage(false)
     setFollowingsPage(false)
@@ -156,17 +156,17 @@ const Profile = ({ initialProfile }) => {
     setIsAdmin(false)
     setOrgPage(false)
 
-		setTabList(["Submitted", "Published", "Settings"])
-		setTagPage(true);
+    setTabList(["Submitted", "Published", "Settings"])
+    setTagPage(true);
     setTag(key);
 
-		TabView("Submitted");
-		setTabKey(tab_select_list[0]);
+    TabView("Submitted");
+    setTabKey(tab_select_list[0]);
   }
 
   {/*for org menu items*/ }
   const OrgChange = (key) => {
-		setInternalTab(false)
+    setInternalTab(false)
     setPostsPage(false)
     setFollowersPage(false)
     setFollowingsPage(false)
@@ -178,13 +178,13 @@ const Profile = ({ initialProfile }) => {
     setOrgPage(true);
     setOrg(key);
 
-		TabView("Submitted");
-		setTabKey(tab_select_list[0]);
+    TabView("Submitted");
+    setTabKey(tab_select_list[0]);
   }
 
-	{/*switching between top tabs*/}
+  {/*switching between top tabs*/ }
   const TabView = (key) => {
-		setTabKey(key);
+    setTabKey(key);
     if (key == "All Posts") {
       setAllArticles(true);
       setDrafts(false);
@@ -266,23 +266,23 @@ const Profile = ({ initialProfile }) => {
     }
   }
 
-	const {
-		data: orgMembers,
-		error: membersError,
-	} = useSWR(
+  const {
+    data: orgMembers,
+    error: membersError,
+  } = useSWR(
     `${SERVER_BASE_URL}/organizations/${currentOrg}/members`,
     fetcher
   )
 
-	if (membersError) {null}
+  if (membersError) { null }
 
-	const {
-		data: orgArticles,
-		error: orgArticleError,
-	} = useSWR(
-		`${SERVER_BASE_URL}/organizations/${currentOrg}/articles`,
-		fetcher
-	);
+  const {
+    data: orgArticles,
+    error: orgArticleError,
+  } = useSWR(
+    `${SERVER_BASE_URL}/organizations/${currentOrg}/articles`,
+    fetcher
+  );
 
   const {
     data: articleData,
@@ -346,10 +346,10 @@ const Profile = ({ initialProfile }) => {
           <Row gutter={[16, 40]}>
             <Col span={24}>
               <Tab_list tabs={tab_select_list}
-							activeKey={internalTab ? tabKey : tab_select_list[0]}
-							defaultActiveKey={tab_select_list[0]}
-							onClick={key => {TabView(key); setInternalTab(true);}}
-							position={"top"} />
+                activeKey={internalTab ? tabKey : tab_select_list[0]}
+                defaultActiveKey={tab_select_list[0]}
+                onClick={key => { TabView(key); setInternalTab(true); }}
+                position={"top"} />
             </Col>
             <Col span={24} style={{ paddingTop: "0" }}>
               {isPosts && articleData ? <ArticleList articles={articleData.articles} /> : null}
@@ -364,20 +364,27 @@ const Profile = ({ initialProfile }) => {
                     modReview={true}
                     currentTag={currentTag}
                     articles={publishedTags} /> :
-									<ArticleList
+                  <ArticleList
                     articles={needsReview}
                     currentTag={currentTag} />
-                	: null}
-
-              {isOrg ? orgMembers ? orgArticles ?
-								isOrgSettings ? <GroupSetting page={"org"}
-								currentOrg={currentOrg} /> :
-                isMembers ? <UserList
-									currentOrg={currentOrg}
-									users={orgMembers.organization.followers.concat(orgMembers.organization.moderators)} /> :
-								<ArticleList
-									articles={orgArticles.articles}
-									currentOrg={currentOrg} /> : null : null : null}
+                : null}
+
+              {isOrg ?
+                orgMembers ?
+                  orgArticles ?
+                    isOrgSettings ?
+                      <GroupSetting page={"org"}
+                        currentOrg={currentOrg} /> :
+                      isMembers ?
+                        <UserList
+                          currentOrg={currentOrg}
+                          users={orgMembers.organization.followers.concat(orgMembers.organization.moderators)} /> :
+                        <ArticleList
+                          articles={orgArticles.articles}
+                          currentOrg={currentOrg} /> :
+                    null :
+                  null :
+                null}
 
               {isSettings ? <AccountSettings /> : null}
 

From 6377c43074113b4118d5d262a42fe13d9a191f60 Mon Sep 17 00:00:00 2001
From: Schuyler deVos <schuylerdevos@gmail.com>
Date: Wed, 1 Jul 2020 17:41:19 -0400
Subject: [PATCH 11/14] simplify code, update tag slugs, change button color

---
 components/global/ArticleCard.tsx |  6 +++--
 lib/api/tag.ts                    |  3 +--
 pages/dashboard/[pid].tsx         | 43 ++++++++++++-------------------
 3 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/components/global/ArticleCard.tsx b/components/global/ArticleCard.tsx
index 63a76f3..d3e4cf1 100644
--- a/components/global/ArticleCard.tsx
+++ b/components/global/ArticleCard.tsx
@@ -77,8 +77,8 @@ const StyledEmoji2 = styled.span`
 const StyleButton = styled(Button)`
   font-weight: bold;
   border-radius: 0.5em;
-  background:  ${props => props.isPublished ? !props.bookmarked ? '#4EC700 !important' : '#007BED !important' : '#007BED !important'};
-  border-color:  ${props => props.isPublished ? !props.bookmarked ? '#4EC700 !important' : '#007BED !important' : '#007BED !important'};
+  background:  ${props => props.modReview ? '#007BED !important' : props.isPublished ? !props.bookmarked ? '#4EC700 !important' : '#007BED !important' : '#007BED !important'};
+  border-color:  ${props => props.modReview ? '#007BED !important' : props.isPublished ? !props.bookmarked ? '#4EC700 !important' : '#007BED !important' : '#007BED !important'};
 `
 
 
@@ -87,6 +87,7 @@ const StyleButton = styled(Button)`
 const ArticleCard = ({ article, currentTag = null, currentOrg = null,
    modReview=false, showAuth = false, onLeftButtonClick = null, onRightButtonClick = null,
     favoriteClick = null}) => {
+
   const tags = article.tagList.map((tag, i) =>
     (<StyledSpan>
       <CustomLink
@@ -181,6 +182,7 @@ const ArticleCard = ({ article, currentTag = null, currentOrg = null,
                 onClick={onRightButtonClick}
                 isPublished={article.isPublished}
                 bookmarked={article.bookmarked}
+                modReview={modReview}
               >
                 {
                     modReview ? 'Published' : article.isPublished ? article.bookmarked ? "Bookmarked" : 'BookMark' :
diff --git a/lib/api/tag.ts b/lib/api/tag.ts
index 2453a55..2d41420 100644
--- a/lib/api/tag.ts
+++ b/lib/api/tag.ts
@@ -110,8 +110,7 @@ const TagAPI = {
     }
   },
   changeTagSlug: async (tag,slug) => {
-    console.log("current tag",tag,"new slug",slug);
-    const body = JSON.stringify({tag: {slug: slug }});
+    const body = JSON.stringify({tag: {slug: slug, old_slug: tag}});
     const user: any = window.localStorage.getItem("user");
     const user2: any = JSON.parse(user);
     const token = user2?.token;
diff --git a/pages/dashboard/[pid].tsx b/pages/dashboard/[pid].tsx
index f329cd2..fb45dbb 100644
--- a/pages/dashboard/[pid].tsx
+++ b/pages/dashboard/[pid].tsx
@@ -33,6 +33,7 @@ const Profile = ({ initialProfile }) => {
     query: { pid },
   } = router;
 
+	{/*fetches profile of user*/}
   const {
     data: fetchedProfile,
     error: profileError,
@@ -44,12 +45,15 @@ const Profile = ({ initialProfile }) => {
 
   if (profileError) return <ErrorMessage message="Can't load profile" />;
 
+	{/*fetches all tags a user is part of*/}
   const {
     data: modTags,
     error: tagError,
   } = useSWR(`${SERVER_BASE_URL}/profiles/${encodeURIComponent(String(pid))}/tags`, fetcher)
 
-  let tagsList = [];
+	let tagsList = [];
+
+ 	if (modTags) {tagsList = modTags.tags.filter(modTag => modTag.moderator);}
 
   const { profile } = fetchedProfile || initialProfile;
   const { username, bio, image, following } = profile;
@@ -246,6 +250,7 @@ const Profile = ({ initialProfile }) => {
     }
   }
 
+	{/*fetches organizations user is part of*/}
   const {
     data: orgData,
     error: orgError,
@@ -256,16 +261,10 @@ const Profile = ({ initialProfile }) => {
 
   let orgsMod = [];
 
-  if (orgData) {
-    for (let i = 0; i < orgData.organizations.length; i++) {
-      for (let j = 0; j < orgData.organizations[i].moderators.length; j++) {
-        if (orgData.organizations[i].moderators[j].profile.username == username) {
-          orgsMod.push(orgData.organizations[i]);
-        }
-      }
-    }
-  }
+	if (orgData) {orgsMod = orgData.organizations.filter(({ moderators }) => (
+		moderators.some(profile => profile.profile.username == username)))}
 
+	{/*fetches members of an organization*/}
   const {
     data: orgMembers,
     error: membersError,
@@ -276,6 +275,7 @@ const Profile = ({ initialProfile }) => {
 
   if (membersError) { null }
 
+	{/*fetches all articles from an organization*/}
   const {
     data: orgArticles,
     error: orgArticleError,
@@ -284,6 +284,7 @@ const Profile = ({ initialProfile }) => {
     fetcher
   );
 
+	{/*fetches all articles, drafts or published articles from the user*/}
   const {
     data: articleData,
     error: articleError,
@@ -292,6 +293,7 @@ const Profile = ({ initialProfile }) => {
     fetcher
   );
 
+	{/*articles from the current tag*/}
   const {
     data: tagReviews,
     error: reviewsError,
@@ -303,23 +305,10 @@ const Profile = ({ initialProfile }) => {
   let needsReview = [];
   let publishedTags = [];
 
-  if (modTags) {
-    for (let i = 0; i < modTags.tags.length; i++) {
-      if (modTags.tags[i].moderator) {
-        tagsList.push(modTags.tags[i]);
-      }
-    }
-  }
-
-  if (tagReviews) {
-    for (let i = 0; i < tagReviews.articles.length; i++) {
-      if (tagReviews.articles[i].needsReview) {
-        needsReview.push(tagReviews.articles[i]);
-      } else if (tagReviews.articles[i].isPublished) {
-        publishedTags.push(tagReviews.articles[i]);
-      }
-    }
-  }
+	if (tagReviews) {
+		needsReview = tagReviews.articles.filter(tagData => tagData.needsReview);
+		publishedTags = tagReviews.articles.filter(tagData => tagData.isPublished);
+	}
 
   if (isUser) {
 

From 05f0211874237ef3f47e353a8c8bc8af8e45c4cc Mon Sep 17 00:00:00 2001
From: Schuyler deVos <schuylerdevos@gmail.com>
Date: Wed, 1 Jul 2020 18:01:35 -0400
Subject: [PATCH 12/14] update settings page

---
 components/profile/GroupSetting.tsx |  9 ++++-----
 lib/api/organizations.ts            | 26 ++------------------------
 lib/api/tag.ts                      | 11 +----------
 3 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/components/profile/GroupSetting.tsx b/components/profile/GroupSetting.tsx
index cfa14e8..eb17752 100644
--- a/components/profile/GroupSetting.tsx
+++ b/components/profile/GroupSetting.tsx
@@ -42,12 +42,11 @@ const GroupSetting = ({ currentOrg = null, currentTag = null, page }) => {
   }
 
   const uploadPic = pic => {
-    console.log(pic.file);
-    {/*if (currentOrg) {
-      OrganizationsAPI.changeOrgPic(currentOrg, pic)
+    if (currentOrg) {
+      OrganizationsAPI.changeOrgPic(pic)
     } else {
-      TagAPI.changeTagPic(currentTag, pic)
-    }*/}
+      TagAPI.changeTagPic(pic)
+    }
   }
 
   {/*returns string*/}
diff --git a/lib/api/organizations.ts b/lib/api/organizations.ts
index 5d3655e..3f58ce0 100644
--- a/lib/api/organizations.ts
+++ b/lib/api/organizations.ts
@@ -64,7 +64,7 @@ const OrganizationsAPI = {
     }
   },
   changeOrgDescription: async (org,description) => {
-    const body = JSON.stringify({organization: {description: description.description,
+    const body = JSON.stringify({organization: {description: description,
                                   old_slug: org, slug: org}});
     const user: any = window.localStorage.getItem("user");
     const user2: any = JSON.parse(user);
@@ -85,27 +85,7 @@ const OrganizationsAPI = {
       return error.response;
     }
   },
-  changeOrgPic: async (org,pic) => {
-    const body = JSON.stringify({organization: {image: pic,
-                                  old_slug: org, slug: org}});
-    const user: any = window.localStorage.getItem("user");
-    const user2: any = JSON.parse(user);
-    const token = user2?.token;
-    try {
-      const response = await axios.put(
-        `${SERVER_BASE_URL}/organizations/${org}`,
-        body,
-        {
-          headers: {
-            Authorization: `Token ${encodeURIComponent(token)}`,
-          },
-        }
-      );
-      return response;
-    } catch (error) {
-      return error.response;
-    }
-  },
+  changeOrgPic: async (pic) => console.log("this will change the pic of the org",pic),
   removeFromOrg: async (org) => {
     const user: any = window.localStorage.getItem("user");
     const user2: any = JSON.parse(user);
@@ -119,10 +99,8 @@ const OrganizationsAPI = {
           },
         }
       );
-      console.log(response);
       return response;
     } catch (error) {
-      console.log(error);
       return error.response;
     }
   },
diff --git a/lib/api/tag.ts b/lib/api/tag.ts
index 2d41420..3a0005c 100644
--- a/lib/api/tag.ts
+++ b/lib/api/tag.ts
@@ -27,7 +27,6 @@ const TagAPI = {
   rejectTag: async (article, currentTag) => {
     const user: any = JSON.parse(window.localStorage.getItem("user"));
     const token = user?.token;
-    console.log(`${SERVER_BASE_URL}/tags/${currentTag}/articles/${article.slug}`)
     try {
       const response = await axios.put(
         `${SERVER_BASE_URL}/tags/${currentTag}/articles/${article.slug}`,
@@ -38,10 +37,8 @@ const TagAPI = {
           },
         }
       );
-      console.log(response);
       return response;
     } catch (error) {
-      console.log(error);
       return error.response;
     }
   },
@@ -79,7 +76,6 @@ const TagAPI = {
           },
         }
       );
-      console.log(response);
       return response;
     } catch (error) {
       return error.response;
@@ -90,8 +86,6 @@ const TagAPI = {
     const user: any = window.localStorage.getItem("user");
     const user2: any = JSON.parse(user);
     const token = user2?.token;
-    console.log(body);
-    console.log(token);
     try {
       const response = await axios.put(
         `${SERVER_BASE_URL}/tags/${tag}`,
@@ -103,7 +97,6 @@ const TagAPI = {
           },
         }
       );
-      console.log(response);
       return response;
     } catch (error) {
       return error.response;
@@ -125,14 +118,12 @@ const TagAPI = {
           },
         }
       );
-      console.log(response);
       return response;
     } catch (error) {
-      console.log(error);
       return error.response;
     }
   },
-  changeTagPic: () => console.log("put this in later"),
+  changeTagPic: async (pic) => console.log("this will change the pic of the tag",pic),
   moderators: async (slug,member) => {
   const user: any = JSON.parse(window.localStorage.getItem("user"));
   const token = user?.token;

From 3d545464e1563b30fc44e819225cf664e42aec32 Mon Sep 17 00:00:00 2001
From: Schuyler deVos <schuylerdevos@gmail.com>
Date: Thu, 2 Jul 2020 16:27:28 -0400
Subject: [PATCH 13/14] removing members from org works now

---
 components/global/UserList.tsx | 6 +++---
 lib/api/organizations.ts       | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/components/global/UserList.tsx b/components/global/UserList.tsx
index 070dc25..31746f0 100644
--- a/components/global/UserList.tsx
+++ b/components/global/UserList.tsx
@@ -16,8 +16,8 @@ const StyledHeader = styled.div`
 
 const UserList = (props) => {
 
-  const handleClick = () => {
-    OrganizationsAPI.removeFromOrg(props.currentOrg);
+  const handleClick = (org,user) => {
+    OrganizationsAPI.removeFromOrg(org,user);
   }
 
   return (
@@ -42,7 +42,7 @@ const UserList = (props) => {
             {props.currentOrg ? <Button
                 type={'primary'}
                 size={'middle'}
-                onClick={handleClick}
+                onClick={() => handleClick(props.currentOrg,user['profile']['username'])}
                 style={{
                   fontSize: '1em',
                   fontWeight: 'bold',
diff --git a/lib/api/organizations.ts b/lib/api/organizations.ts
index 3f58ce0..0512785 100644
--- a/lib/api/organizations.ts
+++ b/lib/api/organizations.ts
@@ -86,15 +86,19 @@ const OrganizationsAPI = {
     }
   },
   changeOrgPic: async (pic) => console.log("this will change the pic of the org",pic),
-  removeFromOrg: async (org) => {
+  removeFromOrg: async (org,member) => {
+    const body = JSON.stringify({profile: {
+        username: member}})
     const user: any = window.localStorage.getItem("user");
     const user2: any = JSON.parse(user);
     const token = user2?.token;
     try {
       const response = await axios.delete(
         `${SERVER_BASE_URL}/organizations/${org}/members`,
+        body,
         {
           headers: {
+            "Content-Type": "application/json",
             Authorization: `Token ${encodeURIComponent(token)}`,
           },
         }

From bc8b40200cdab8ca38795d1873836b3566d9d7a8 Mon Sep 17 00:00:00 2001
From: Schuyler deVos <schuylerdevos@gmail.com>
Date: Sat, 4 Jul 2020 18:32:30 -0400
Subject: [PATCH 14/14] fixing api stuff

---
 components/profile/GroupSetting.tsx | 10 +++++-----
 lib/api/organizations.ts            |  5 ++---
 pages/tag/[pid].tsx                 |  6 +++---
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/components/profile/GroupSetting.tsx b/components/profile/GroupSetting.tsx
index eb17752..aba1941 100644
--- a/components/profile/GroupSetting.tsx
+++ b/components/profile/GroupSetting.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import styled from 'styled-components'
 import { Row, Col, Card, Avatar, Button,
    Space, Layout, Typography, Form,
-   Input, Upload, Message } from 'antd';
+   Input, Upload } from 'antd';
 import { UserOutlined } from '@ant-design/icons';
 import UserAPI from "../../lib/api/user";
 import OrganizationsAPI from "../../lib/api/organizations";
@@ -32,12 +32,12 @@ const GroupSetting = ({ currentOrg = null, currentTag = null, page }) => {
       useSWR(`${SERVER_BASE_URL}/tags/${currentTag}`, fetcher)
 
   {/*returns description: etc*/}
-  const editDescription = description => {
+  const editDescription = desc => {
     if (currentOrg) {
-      const description = description.description;
-      OrganizationsAPI.changeOrgDescription(currentOrg, description)
+      const description = desc.description;
+      OrganizationsAPI.changeOrgDescription(currentOrg, desc)
     } else {
-      TagAPI.changeTagDescription(currentTag, description)
+      TagAPI.changeTagDescription(currentTag, desc)
     }
   }
 
diff --git a/lib/api/organizations.ts b/lib/api/organizations.ts
index 0512785..d5df21d 100644
--- a/lib/api/organizations.ts
+++ b/lib/api/organizations.ts
@@ -94,13 +94,12 @@ const OrganizationsAPI = {
     const token = user2?.token;
     try {
       const response = await axios.delete(
-        `${SERVER_BASE_URL}/organizations/${org}/members`,
-        body,
-        {
+        `${SERVER_BASE_URL}/organizations/${org}/members`, {
           headers: {
             "Content-Type": "application/json",
             Authorization: `Token ${encodeURIComponent(token)}`,
           },
+          data: body
         }
       );
       return response;
diff --git a/pages/tag/[pid].tsx b/pages/tag/[pid].tsx
index 3d1ba87..c1a0310 100644
--- a/pages/tag/[pid].tsx
+++ b/pages/tag/[pid].tsx
@@ -30,7 +30,7 @@ const StyledTagTitle = styled.div`
   padding-bottom: 1.5em;
 `;
 
-const StickyLeft = styled(Affix)`  
+const StickyLeft = styled(Affix)`
   display: none;
   @media screen and (min-width: 850px) {
       display:block;
@@ -61,11 +61,11 @@ const TagPage = (id) => {
 	const [tags, setTags] = React.useState(JSON.parse("[{}]"))
 	const getTags = async (currentUser) => {
 		if (id != null) {
-			const { data: initialTag } = await TagAPI.get(id.id, currentUser);
+			const { data: initialTag } = await TagAPI.get(id.id);
 			setTags(initialTag)
 		}
 	}
-	
+
 	React.useEffect(() => {
 		let user = JSON.parse(localStorage.getItem("user"))
 		getTags(user)