Skip to content

Commit

Permalink
Merge branch 'unstructuredstudio:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
coderatomy authored Nov 6, 2023
2 parents 4a6db84 + e202e45 commit 628f67c
Show file tree
Hide file tree
Showing 19 changed files with 590 additions and 336 deletions.
4 changes: 2 additions & 2 deletions zubhub_backend/zubhub/creators/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -840,8 +840,8 @@ def post(self, request, groupname):
description = request.data.get('description')

# Validate the data
if not groupname or not description:
raise ValidationError("Both 'groupname' and 'description' fields are required.")
if not groupname:
raise ValidationError("'groupname' is required.")

# Update the fields and save the changes
if groupname is not None:
Expand Down
3 changes: 3 additions & 0 deletions zubhub_backend/zubhub/projects/pagination.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@

class ProjectNumberPagination(PageNumberPagination):
page_size = 18
# page_size_query_param = 'page_size' #Uncommenting these can customise the page size
# page_query_param = 'page' #i.e no of projects displayed per page
# max_page_size = 50
35 changes: 27 additions & 8 deletions zubhub_frontend/zubhub/public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@
"review": "“ZubHub contributes immensely to people from not so well socio-econimic backgrounds, I would high recommend it.”",
"name": "Yaya Mamoudou",
"designation": "ZubHub Ambassador"}

},
"global":{
"title":"Join a growing community of thousands of creators!",
Expand Down Expand Up @@ -599,6 +599,7 @@

"profile": {
"edit": "Edit",
"editTeam": "Edit Team",
"teams": "Teams",
"allTeams": "All Teams",
"delete": {
Expand Down Expand Up @@ -871,17 +872,35 @@
}
},
"editTeam": {
"info": "Edit Team Info",
"name": "Team Name",
"about": "About Team",
"requestName": "Enter your Team Name",
"label": "Edit Team",
"inputs": {
"name": {
"label": "Team Name",
"request": "Please enter team name",
"errors": {
"required": "Team name is required"
}
},
"bio": {
"label": "About Team",
"description": "Tell us about your team!"
}
},
"actions": {
"submit": "Save Changes"
},
"delete": {
"label": "Delete Team",
"question": "Delete Team Profile?",
"information": "Deleting your Team will remove all members and admins from this Team. Deleting a Team is Permanent and data associated with the Team cannot be recovered.",
"information1": "Deleting your team will remove all members and admins from this team. Deleting a team is permanent and data associated with the team cannot be recovered.",
"information2": "Deleting your team will also delete any job or talent search associated with this team.",
"confirmation": "I want to delete this team’s profile",
"buttons": {
"confirm": "Delete",
"cancel": "Cancel"
},
"ariaLabels": {
"deleteTeam": "delete team"
}
}
},
Expand Down Expand Up @@ -1044,7 +1063,7 @@
"image": "Image added",
"images": "Images added",
"videoFile": "Video file added",
"videoURL": "Video URL added"
"videoURL": "Video URL added"
},
"buttons": {
"Next": "Next",
Expand Down Expand Up @@ -1088,7 +1107,7 @@
"category": "Category",
"tags": "Tags",
"none": "None",

"build": "Let's Make This Project",
"pdf": "Download Pdf",
"create": {
Expand Down
29 changes: 24 additions & 5 deletions zubhub_frontend/zubhub/public/locales/hi/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,7 @@

"profile": {
"edit": "संपादित करें",
"editTeam": "टीम संपादित करें",
"teams": "टीमें",
"allTeams": "सभी टीमें",
"delete": {
Expand Down Expand Up @@ -808,17 +809,35 @@
},

"editTeam": {
"info": "टीम जानकारी संपादित करें",
"name": "टीम का नाम",
"about": "टीम के बारे में",
"requestName": "अपनी टीम का नाम दर्ज करें",
"label": "टीम संपादित करें",
"inputs": {
"name": {
"label": "टीम का नाम",
"request": "कृपया टीम का नाम दर्ज करें",
"errors": {
"required": "टीम का नाम आवश्यक है"
}
},
"bio": {
"label": "जैव",
"description": "हमें अपनी टीम के बारे में बताएं!"
}
},
"actions": {
"submit": "परिवर्तनों को सुरक्षित करें",
},
"delete": {
"label": "टीम हटाएं",
"question": "टीम प्रोफ़ाइल हटाएं?",
"information": "आपकी टीम को हटाने से इस टीम के सभी सदस्य और व्यवस्थापक हटा दिए जाएंगे। किसी टीम को हटाना स्थायी है और टीम से जुड़ा डेटा पुनर्प्राप्त नहीं किया जा सकता है।",
"information1": "आपकी टीम को हटाने से इस टीम के सभी सदस्य और व्यवस्थापक हटा दिए जाएंगे। किसी टीम को हटाना स्थायी है और टीम से जुड़ा डेटा पुनर्प्राप्त नहीं किया जा सकता है।",
"information2": "आपकी टीम को हटाने से इस टीम से जुड़ी कोई भी नौकरी या प्रतिभा खोज भी हट जाएगी।",
"confirmation": "मैं इस टीम की प्रोफ़ाइल को हटाना चाहता हूं",
"buttons": {
"confirm": "मिटाना",
"cancel": "रद्द करना"
},
"ariaLabels": {
"deleteTeam": "टीम हटाएं"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion zubhub_frontend/zubhub/src/api/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,7 @@ class API {
* @todo - describe method's signature
*/
getProjects = ({ token, page }) => {
const url = page ? `projects/?${page}` : `projects/`;
const url = page ? `projects/?page=${page}` : `projects/`;
return this.request({ token, url }).then(res => res.json());
};

Expand Down
4 changes: 3 additions & 1 deletion zubhub_frontend/zubhub/src/assets/js/styles/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ const styles = theme => ({
borderRadius: 20,
display: 'flex',
justifyContent: 'center',
alignItems: 'center'
alignItems: 'center',
cursor: 'pointer',
backgroundColor: 'white',
},
flexColumn: {
flexDirection: 'column'
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
import { Translate } from "@material-ui/icons";
import { colors } from "../../../colors";

const styles = theme => ({
root: {
paddingTop: '2em',
paddingBottom: '2em',
flex: '1 0 auto',
background: 'linear-gradient(to bottom, var(--primary-color2) 0%, var(--primary-color2) 25%, rgba(255,255,255,1) 61%, rgba(255,255,255,1) 100%)',
},
containerStyle: {
maxWidth: '600px',
[theme.breakpoints.up('1600')]: {
maxWidth: '950px',
},
},
cardStyle: {
border: 0,
borderRadius: 15,
boxShadow: '0 3px 5px 2px rgba(0, 0, 0, .12)',
color: 'white',
padding: '24px 30px',
},
titleStyle: {
fontWeight: 'bold',
fontSize: '1.7rem',
[theme.breakpoints.up('1600')]: {
fontSize: '2.5rem',
},
},
descStyle: {
fontSize: '18px',
fontWeight: 600,
[theme.breakpoints.up('1600')]: {
fontSize: '1.7rem',
},
},
bodyStyle: {
fontWeight: 500,
[theme.breakpoints.up('1600')]: {
fontSize: '1.3rem',
},
},
customButtonStyle: {
borderRadius: 8,
},
customInputStyle: {
borderRadius: 8,
'&.MuiOutlinedInput-notchedOutline': {
border: '2px solid var(--primary-color3)',
boxShadow: `rgba(var(--primary-color3), 0.2rem) 0 0 0 0.2rem`,
},
'&.MuiOutlinedInput-root': {
'&:hover fieldset': {
border: '2px solid var(--primary-color3)',
boxShadow: `rgba(var(--primary-color3), 0.2rem) 0 0 0 0.2rem`,
},
'&.Mui-focused fieldset': {
border: '2px solid var(--primary-color3)',
boxShadow: `rgba(var(--primary-color3), 0.2rem) 0 0 0 0.2rem`,
},
[theme.breakpoints.up('1600')]: {
fontSize: '1.7rem',
},
},
},
textDecorationNone: {
textDecoration: 'none',
},
linkStyle: {
color: colors.primary,
'&:hover': {
color: 'var(--secondary-color6)',
},
},
errorBox: {
width: '100%',
padding: '1em',
borderRadius: 6,
borderWidth: '1px',
borderColor: 'var(--primary-color2)',
backgroundColor: 'var(--secondary-color1)',
[theme.breakpoints.up('1600')]: {
fontSize: '1.5rem',
},
},
error: {
color: 'var(--primary-color2)',
},
fieldHelperTextStyle: {
[theme.breakpoints.up('1600')]: {
fontSize: '1.2rem',
},
},
marginTop: {
marginTop: 22,
},
});

export default styles;
Original file line number Diff line number Diff line change
Expand Up @@ -329,11 +329,62 @@ const styles = theme => ({
maxWidth: '2000px',
width: '100%',
},
buttonGroupStyleThree: {
paddingLeft: '2em',
paddingRight: '2em',
display: 'flex',
justifyContent: 'space-between',
marginTop: '2em',
[theme.breakpoints.down('500')]: {
padding: '0',
display: 'flex',
},
},
paginationComp:{
width: '5rem',
height: '2rem',
display: 'flex',
flexWrap: 'nowrap',
'& .MuiPaginationItem-root': {
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
width: '0.5rem'
},
'& .MuiPaginationItem-ul':{
display: 'flex',
},
},
paginationRoot: {
'& .MuiPaginationItem-root': {
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
margin: 'auto',
'&:hover': {
backgroundColor: 'var(--primary-color3)',
color: 'white',
display: 'flex',
},
},
'& .MuiPaginationItem-ul':{
display: 'flex',
}
},
buttonGroupStyleAlternative: {
padding: '7px 21px',
[theme.breakpoints.down('600')]: {
padding: '3px 3px 3px 6px',
fontSize: '15px',
paddingTop: '0'
},
},
floatRight: {
float: 'right',

},
visibilityNone:{
visibility: 'hidden'
},
floatLeft: {
float: 'left',
Expand Down
Loading

0 comments on commit 628f67c

Please sign in to comment.