Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

add avatar border and update metadatascript #251

Merged
merged 1 commit into from
Dec 4, 2023
Merged

add avatar border and update metadatascript #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .yarn/install-state.gz
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions apps/frontend/src/components/SigninMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ export const SigninMenu = ({ user }: { user: UserMe }) => {
<Avatar
sx={{
background: user.color,
borderWidth: 2,
borderColor: user.color,
borderStyle: "solid",
}}
src={user.avatar?.publicUrl}
>
Expand Down
3 changes: 3 additions & 0 deletions apps/frontend/src/components/annotation/AnnotationHints.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ const AnnotationHintsItem: React.FC<AnnotationHintsItemProps> = ({
background: annotation.user.color,
width: 24,
height: 24,
borderWidth: 2,
borderColor: annotation.user.color,
borderStyle: "solid",
}}
src={annotation.user.avatar?.publicUrl}
>
Expand Down
8 changes: 7 additions & 1 deletion apps/frontend/src/components/annotation/AnnotationItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,13 @@ export const AnnotationItem: React.FC<AnnotationItemProps> = ({
>
<ListItemAvatar>
<Avatar
sx={{ background: annotation.user.color, marginTop: 1 }}
sx={{
background: annotation.user.color,
marginTop: 1,
borderWidth: 2,
borderColor: annotation.user.color,
borderStyle: "solid",
}}
src={annotation.user.avatar?.publicUrl}
>
{annotation.user.initial}
Expand Down
9 changes: 8 additions & 1 deletion apps/frontend/src/components/annotation/CommentForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,14 @@ export const CommentForm: React.FC<CommentFormProps> = ({
<ListItem sx={{ pl: 4, py: 0 }}>
<ListItemAvatar sx={{ minWidth: 35 }}>
<Avatar
sx={{ background: user?.color, width: 24, height: 24 }}
sx={{
background: user?.color,
width: 24,
height: 24,
borderWidth: 2,
borderColor: user?.color,
borderStyle: "solid",
}}
src={user?.avatar?.publicUrl}
>
{user?.initial}
Expand Down
9 changes: 8 additions & 1 deletion apps/frontend/src/components/annotation/CommentItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,14 @@ export const CommentItem: React.FC<CommentItemProps> = ({
>
<ListItemAvatar sx={{ minWidth: 35, marginTop: 2 }}>
<Avatar
sx={{ background: comment.user.color, width: 24, height: 24 }}
sx={{
background: comment.user.color,
width: 24,
height: 24,
borderWidth: 2,
borderColor: comment.user.color,
borderStyle: "solid",
}}
src={comment.user.avatar?.publicUrl}
>
{comment.user.initial}
Expand Down
3 changes: 3 additions & 0 deletions apps/frontend/src/components/home/ProjectThumbnail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@ const ProjectThumbnail: React.FC<Props> = ({ project }) => {
<Avatar
sx={{
backgroundColor: project.user.color,
borderWidth: 2,
borderColor: project.user.color,
borderStyle: "solid",
}}
src={project.user.avatar?.publicUrl}
>
Expand Down
12 changes: 10 additions & 2 deletions apps/frontend/src/components/project/MemberListPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ export const MemberListPanel: React.FC<SideBarProps> = ({ project, user }) => {
src={project.user.avatar?.publicUrl}
sx={{
background: project.user.color,
borderWidth: 2,
borderColor: project.user.color,
borderStyle: "solid",
}}
>
{project.user.initial}
Expand All @@ -72,8 +75,13 @@ export const MemberListPanel: React.FC<SideBarProps> = ({ project, user }) => {
<ListItem key={member.id}>
<ListItemAvatar>
<Avatar
sx={{ background: member.user?.color }}
src={member.user.avatar?.publicUrl}
sx={{
background: member.user?.color,
borderWidth: 2,
borderColor: member.user?.color,
borderStyle: "solid",
}}
src={member.user?.avatar?.publicUrl}
>
{member.user?.initial}
</Avatar>
Expand Down
7 changes: 6 additions & 1 deletion apps/frontend/src/components/project/ProjectSummary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,12 @@ const ProjectSummary: React.FC<Props> = ({ project }: Props) => {

<Box display="flex" alignItems={"center"}>
<Avatar
sx={{ background: project.user.color }}
sx={{
background: project.user.color,
borderWidth: 2,
borderColor: project.user.color,
borderStyle: "solid",
}}
src={project.user.avatar?.publicUrl}
>
{project.user.initial}
Expand Down
9 changes: 8 additions & 1 deletion apps/frontend/src/components/settings/UploadAvatar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,14 @@ export default function UploadAvatar({
<Stack direction="row" alignItems="center" spacing={2}>
<Avatar
alt="User Avatar"
sx={{ background: color, width: 100, height: 100 }}
sx={{
background: color,
width: 100,
height: 100,
borderWidth: 2,
borderColor: color,
borderStyle: "solid",
}}
src={avatar}
>
{initial}
Expand Down
3 changes: 3 additions & 0 deletions apps/frontend/src/pages/profile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ const UserProfile: React.FC = () => {
background: data.color,
width: 100,
height: 100,
borderWidth: 2,
borderColor: data.color,
borderStyle: "solid",
}}
src={data.avatar?.publicUrl}
>
Expand Down
7 changes: 7 additions & 0 deletions ecosystem.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
module.exports = {
apps: [
{
name: "PrismaMigrate",
script: "yarn",
args: "prisma migrate:deploy",
autorestart: false,
watch: false,
},
{
name: "frontend",
script: "yarn",
Expand Down
2 changes: 1 addition & 1 deletion packages/prisma/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"predev": "yarn run generate",
"studio": "yarn prisma studio",
"prisma": "npx prisma",
"migrate-metadata": "tsx ./src/migrate-metadata.ts",
"update-metadata": "tsx ./src/update-metadata.ts",
"migrate-sharecode": "tsx ./src/migrate-sharecode.ts",
"tsx": "tsx"
},
Expand Down
4 changes: 1 addition & 3 deletions packages/prisma/src/migrate-metadata.ts → packages/prisma/src/update-metadata.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ const getProjectMetadata = async (project: Project) => {

async function main() {
// Retrieve all published posts
const allProjects = await prisma.project.findMany({
where: { duration: undefined },
});
const allProjects = await prisma.project.findMany();

const totalProjects = allProjects.length;
let currentProject = 0;
Expand Down
Loading