From b275afea1ce22963dfe26db00cfb63718f7fc6a9 Mon Sep 17 00:00:00 2001
From: Luis Felipe Risch <lfr20@inf.ufpr.br>
Date: Thu, 22 Apr 2021 08:42:50 -0300
Subject: [PATCH] builfing gamefication
---
src/Components/ContactCard.js | 9 +-
src/Components/Notifications.js | 4 +-
src/Pages/ItemStore.js | 4 +-
src/Store.js | 198 ++++++++++++++++----------------
src/env.js | 2 +-
5 files changed, 109 insertions(+), 108 deletions(-)
diff --git a/src/Components/ContactCard.js b/src/Components/ContactCard.js
index 7ad33407..2e0513cc 100644
--- a/src/Components/ContactCard.js
+++ b/src/Components/ContactCard.js
@@ -27,7 +27,7 @@ import FollowButton from "./ContactButtons/FollowButton.js";
import FollowingButton from "./ContactButtons/FollowingButton.js";
import FollowersCountButton from "./ContactButtons/FollowersCountButton.js";
import { Link } from "react-router-dom";
-import Badge from "./Badge.js";
+import Badge from "./Badge.js";
export default function ImgMediaCard(props) {
@@ -61,7 +61,7 @@ export default function ImgMediaCard(props) {
<img
src={props.avatar ? props.avatar : noAvatar}
alt="user avatar"
- style={{ height: "100%", width: "100%", borderRadius: "50%" }}
+ style={{ height: "90%", width: "90%", borderRadius: "50%", backgroundColor: 'white' }}
/>
</AvatarDiv>
</div>
@@ -201,7 +201,7 @@ const UserInfo = styled.div`
/*Rounded div to be used with avatar pic*/
const AvatarDiv = styled.div`
- border-radius: 100%;
+ border-radius: 50%;
left: 50%;
position: absolute;
-webkit-transform: translateX(-50%);
@@ -213,6 +213,9 @@ const AvatarDiv = styled.div`
flex-direction: row;
justify-content: space-around;
align-items: center;
+ background-image: url("https://www.filmstories.co.uk/wp-content/uploads/2020/01/doctor-strange-850x600.jpg");
+ background-repeat: no-repeat;
+
`;
/* gamification aspects */
diff --git a/src/Components/Notifications.js b/src/Components/Notifications.js
index b452b215..eb7a5e84 100644
--- a/src/Components/Notifications.js
+++ b/src/Components/Notifications.js
@@ -204,7 +204,7 @@ export default function Notification(props) {
</div>
{
notifications.map((notification) =>
- <ActivityListItem
+ {/* <ActivityListItem
onMenuBar={true}
avatar={notification.owner.avatar ? apiDomain + notification.owner.avatar : null}
activity={notification.activity}
@@ -215,7 +215,7 @@ export default function Notification(props) {
ownerHref={'/perfil'}
recipientName={notification.recipient.name}
recipientHref={getRecipientHref(notification)}
- />
+ /> */}
)
}
<div style={{ padding: "0 15px", borderTop: "1px solid #dadada" }}>
diff --git a/src/Pages/ItemStore.js b/src/Pages/ItemStore.js
index b777408f..ac2a67a9 100644
--- a/src/Pages/ItemStore.js
+++ b/src/Pages/ItemStore.js
@@ -55,7 +55,7 @@ export default function ItemStoreContainer(props) {
const [badges, setBadges] = useState([]);
const [currUser, setCurrUser] = useState({});
- const [isLoading, setIsLoading] = useState(true);
+ const [isLoading, setIsLoading] = useState(true);
// useEffect(() => {
// axios.all(
@@ -80,7 +80,7 @@ export default function ItemStoreContainer(props) {
setIsLoading(false);
}
)
- }, [])
+ }, [state.currentUser.id])
return (
diff --git a/src/Store.js b/src/Store.js
index c27fdbae..cd077019 100644
--- a/src/Store.js
+++ b/src/Store.js
@@ -22,10 +22,10 @@ export const Store = React.createContext()
const initialState = {
searchOpen: false,
- userIsLoggedIn: false,
+ userIsLoggedIn : false,
userAgreedToPublicationTerms: false,
userAgreedToPublicationPermissions: false,
- modalColaborarPlataformaOpen: false,
+ modalColaborarPlataformaOpen : false,
search: {
query: '*',
class: 'LearningObject'
@@ -33,26 +33,24 @@ const initialState = {
windowSize: {
width: 0,
height: 0
- },
+},
currentUser: {
- askTeacherQuestion: false,
- id: '',
- name: '',
- email: '',
- avatar: '',
- cover: '',
- uid: '',
- follows_count: 0,
- collections_count: 0,
- submitter_request: 'default',
- roles: []
+ askTeacherQuestion : false,
+ id : '',
+ name : '',
+ email : '',
+ avatar : '',
+ cover : '',
+ uid : '',
+ follows_count : 0,
+ collections_count : 0,
+ submitter_request : 'default',
+ roles : []
}
}
-
-
function reducer(state, action) {
- switch (action.type) {
+ switch (action.type){
case 'SAVE_SEARCH':
return {
...state,
@@ -69,102 +67,102 @@ function reducer(state, action) {
windowSize: action.innerWindow
}
case 'USER_LOGGED_IN':
- if (action.login.avatar_file_name) {
- Object.defineProperty(action.login, 'avatar',
- Object.getOwnPropertyDescriptor(action.login, 'avatar_file_name'));
- delete action.login['avatar_file_name'];
- }
- if (action.login.cover_file_name) {
- Object.defineProperty(action.login, 'cover',
- Object.getOwnPropertyDescriptor(action.login, 'cover_file_name'));
- delete action.login['cover_file_name'];
- }
+ if (action.login.avatar_file_name) {
+ Object.defineProperty(action.login, 'avatar',
+ Object.getOwnPropertyDescriptor(action.login, 'avatar_file_name'));
+ delete action.login['avatar_file_name'];
+ }
+ if (action.login.cover_file_name) {
+ Object.defineProperty(action.login, 'cover',
+ Object.getOwnPropertyDescriptor(action.login, 'cover_file_name'));
+ delete action.login['cover_file_name'];
+ }
return {
- ...state,
- userIsLoggedIn: action.userLoggedIn,
- currentUser: action.login
- }
+ ...state,
+ userIsLoggedIn:action.userLoggedIn,
+ currentUser:action.login
+ }
case 'USER_SIGNED_UP':
return {
- ...state,
- userIsLoggedIn: action.userLoggedIn,
- currentUser: action.user
- }
+ ...state,
+ userIsLoggedIn:action.userLoggedIn,
+ currentUser:action.user
+ }
case 'USER_LOGGED_OUT':
- sessionStorage.clear()
- return {
- ...state,
- userIsLoggedIn: action.userLoggedOut,
- currentUser: {
- askTeacherQuestion: false,
- id: '',
- name: '',
- email: '',
- avatar_file_name: '',
- cover_file_name: '',
- uid: '',
- follows_count: 0,
- collections_count: 0,
- submitter_request: 'default',
- roles: []
- },
- userAgreedToPublicationTerms: false,
- userAgreedToPublicationPermissions: false
- }
+ sessionStorage.clear()
+ return {
+ ...state,
+ userIsLoggedIn:action.userLoggedOut,
+ currentUser:{
+ askTeacherQuestion : false,
+ id : '',
+ name : '',
+ email : '',
+ avatar_file_name : '',
+ cover_file_name : '',
+ uid : '',
+ follows_count : 0,
+ collections_count : 0,
+ submitter_request : 'default',
+ roles : []
+ },
+ userAgreedToPublicationTerms: false,
+ userAgreedToPublicationPermissions: false
+ }
case 'USER_AGREED_TO_PUBLICATION_TERMS':
- return {
- ...state,
- userAgreedToPublicationTerms: action.userAgreement
- }
+ return {
+ ...state,
+ userAgreedToPublicationTerms: action.userAgreement
+ }
case 'USER_AGREED_TO_PUBLICATION_PERMISSIONS':
- return {
- ...state,
- userAgreedToPublicationPermissions: action.userAgreement
- }
+ return {
+ ...state,
+ userAgreedToPublicationPermissions : action.userAgreement
+ }
case 'USER_ACCESSED_USER_PAGE':
- return {
- ...state,
- currentUser: action.set
- }
+ return {
+ ...state,
+ currentUser : action.set
+ }
case 'USER_CHANGED_COVER':
- return {
- ...state,
- currentUser: action.currUser
- }
+ return {
+ ...state,
+ currentUser : action.currUser
+ }
case 'USER_DELETED_ACCOUNT':
- localStorage.clear()
- return {
- ...state,
- userIsLoggedIn: false,
- currentUser: {
- askTeacherQuestion: false,
- id: '',
- name: '',
- email: '',
- avatar_file_name: '',
- cover_file_name: '',
- uid: '',
- follows_count: 0,
- collections_count: 0,
- submitter_request: 'default',
- roles: []
- },
- }
+ localStorage.clear()
+ return {
+ ...state,
+ userIsLoggedIn:false,
+ currentUser: {
+ askTeacherQuestion : false,
+ id : '',
+ name : '',
+ email : '',
+ avatar_file_name : '',
+ cover_file_name : '',
+ uid : '',
+ follows_count : 0,
+ collections_count : 0,
+ submitter_request : 'default',
+ roles : []
+ },
+ }
case 'TOGGLE_MODAL_COLABORAR_PLATAFORMA':
- return {
- ...state,
- modalColaborarPlataformaOpen: action.modalColaborarPlataformaOpen
- }
+ return {
+ ...state,
+ modalColaborarPlataformaOpen : action.modalColaborarPlataformaOpen
+ }
case 'GET_USER':
- return {
- ...state,
- currentUser: action.user
+ return {
+ ...state,
+ currentUser:action.user
}
case 'USER_UPDATED_EMAIL':
- return {
- ...state,
- currentUser: action.currUser
- }
+ return {
+ ...state,
+ currentUser : action.currUser
+ }
default:
return state
}
diff --git a/src/env.js b/src/env.js
index 82bf229b..0e82ab67 100644
--- a/src/env.js
+++ b/src/env.js
@@ -17,7 +17,7 @@ You should have received a copy of the GNU Affero General Public License
along with Plataforma Integrada MEC. If not, see <http://www.gnu.org/licenses/>.*/
-var apiDomain = 'https://api.portalmectest.c3sl.ufpr.br',
+var apiDomain = 'https://api.portalmechomologa.c3sl.ufpr.br',
apiVersion = 'v1',
apiUrl = apiDomain + '/' + apiVersion;
--
GitLab