Skip to content

Commit

Permalink
remove: remove previous components, containers, pages
Browse files Browse the repository at this point in the history
  • Loading branch information
koremp committed Jan 6, 2025
1 parent 157b015 commit 370ad77
Show file tree
Hide file tree
Showing 31 changed files with 147 additions and 418 deletions.
66 changes: 39 additions & 27 deletions src/component/About.jsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
import React from 'react';

import styled from '@emotion/styled';

import Header from './about/Header';
import Genre from './about/Genre';
import Debut from './about/Debut';
import Wiki from './about/Wiki';
import Social from './about/Social';

import { entImages, GidleGroupImage } from '../assets/images';
import MemberList from './MemberList';
import about from '/public/about.json';
import GidleGroupImage from '/public/images/member-banner.png';

const Container = styled.div({
display: 'flex',
Expand All @@ -21,34 +14,53 @@ const Container = styled.div({
justifyContent: 'space-around',
});

const GroupImage = styled.img({
display: 'block',
width: '100%',
margin: '1em',
border: 0,
});
const GroupImage = styled.img(
{
display: 'block',
width: '100%',
margin: '1em',
border: 0,
},
props => ({
src: props.src,
alt: props.alt,
})
);

export default function About({ about, members, handleClick }) {
export default function About({ handleClick }) {
const {
name,
debutDate,
genres,
wiki,
social,
group: {
name: {
kor: groupKorName,
eng: groupEngNAme,
},
members: members
},
debutDate: debutDate,
officialColor: officialColor,
company: company,
Distributions: Distributions,
links: links
} = about;

const memberList = members.map((member) => {
return {
name: {
kor: member.name.kor,
eng: member.name.eng
},
birthday: member.birthday,
imgPath: member.imgPath,
sns: member.sns,
}
})

return (
<Container>
<GroupImage
src={GidleGroupImage}
alt={`${name.kor} 사진`}
/>
<Header name={name} />
<Genre genres={genres} />
<Debut debutDate={debutDate} />
<MemberList members={members} handleClick={handleClick} />
<Wiki wiki={wiki} />
<Social social={social} />
</Container>
);
}
22 changes: 5 additions & 17 deletions src/component/AlbumList.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,21 @@ import React from 'react';

import styled from '@emotion/styled';

import KorAlbumList from './albumList/KorAlbumList';
import EtcAlbumList from './albumList/EtcAlbumList';

const Container = styled.div({
display: 'flex',
flexDirection: 'column',
});

export default function AlbumList({
korMiniAlbums,
korSingles,
korDigitalSingles,
etcAlbums,
albums,
handleClick,
}) {

return (
<Container>
<KorAlbumList
korMiniAlbums={korMiniAlbums}
korSingles={korSingles}
korDigitalSingles={korDigitalSingles}
handleClick={handleClick}
/>
<EtcAlbumList
etcAlbums={etcAlbums}
handleClick={handleClick}
/>
{albums.map((album) => (
<Album album={album}/>
))}
</Container>
);
}
6 changes: 2 additions & 4 deletions src/component/Home.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,13 @@ const Container = styled.div({
display: 'flex',
flexDirection: 'column',
width: '100%',
// height: '100vh',
height: '100%',
padding: '2em',
alignItems: 'center',
justifyContent: 'space-around',
backgroundImage: `linear-gradient(
60deg,
#E11900,
#7E00BF
#e11900,
#7e00bf
)`,
backgroundAttachment: 'fixed',
});
Expand Down
1 change: 0 additions & 1 deletion src/component/MemberDetail.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import styled from '@emotion/styled';
import Name from './memberDetail/Name';
import Roles from './memberDetail/Roles';

import { membersImages } from '../assets/images';
import Birthday from './memberDetail/Birthday';

const Container = styled.div({
Expand Down
16 changes: 16 additions & 0 deletions src/component/about/GroupImage.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import React from "react";
import styled from '@emotion/styled';

export default GroupImage = styled.img(
{
display: 'block',
width: '100%',
margin: '1em',
border: 0,
},
props => ({
src: props.src,
alt: props.alt,
})
)

22 changes: 14 additions & 8 deletions src/component/about/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import styled from '@emotion/styled';

import GroupName from './GroupName';

import { GidleLogoImage } from '../../assets/images';
// import { GidleLogoImage } from '../../assets/images';

const HeaderLayout = styled.div({
display: 'flex',
Expand All @@ -19,14 +19,20 @@ const GroupIcon = styled.img({
});

export default function Header({ name }) {
// return (
// <HeaderLayout>
// <GroupIcon
// src={GidleLogoImage}
// alt={`${name.kor} 로고`}
// />
// <hr height="3em" width="0em" />
// <GroupName name={name} />
// </HeaderLayout>
// );

return (
<HeaderLayout>
<GroupIcon
src={GidleLogoImage}
alt={`${name.kor} 로고`}
/>
<hr height="3em" width="0em" />
<GroupName name={name} />
asdf
</HeaderLayout>
);
)
}
2 changes: 1 addition & 1 deletion src/component/about/Social.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';

import styled from '@emotion/styled';

import { socialImages } from '../../assets/images';
// import { socialImages } from '../../assets/images';

const Container = styled.div({
display: 'flex',
Expand Down
8 changes: 4 additions & 4 deletions src/component/about/Wiki.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import React from 'react';

import styled from '@emotion/styled';

import {
NamuwikiLogoImage,
WikipediaLogoImage,
} from '../../assets/images';
// import {
// NamuwikiLogoImage,
// WikipediaLogoImage,
// } from '../../assets/images';

const WikiLayout = styled.div({
display: 'flex',
Expand Down
17 changes: 17 additions & 0 deletions src/component/albumList/Album.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React from 'react';
import styled from '@emotion/styled';
import path from 'path';

const Container = styled.div({
display: 'flex',
flexDirection: 'column',
});

export default function Album({ album }) {
const src = path.join(process.cwd(), 'public/images/albums', album.filename);
return (
<Container>
<img src={album.fileName} alt={album.title} />
</Container>
);
}
11 changes: 0 additions & 11 deletions src/component/albumList/AlbumLayout.jsx

This file was deleted.

14 changes: 0 additions & 14 deletions src/component/albumList/AlbumListContainer.jsx

This file was deleted.

7 changes: 0 additions & 7 deletions src/component/albumList/AlbumListName.jsx

This file was deleted.

58 changes: 0 additions & 58 deletions src/component/albumList/DefaultAlbum.jsx

This file was deleted.

29 changes: 0 additions & 29 deletions src/component/albumList/DefaultAlbumList.jsx

This file was deleted.

Loading

0 comments on commit 370ad77

Please sign in to comment.