Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/Gosrock/DuDoong-Front into r…
Browse files Browse the repository at this point in the history
…elease/ticket
  • Loading branch information
9yujin committed Jun 29, 2023
2 parents 2e6a13b + afccd11 commit f9f7b6d
Show file tree
Hide file tree
Showing 10 changed files with 138 additions and 254 deletions.
66 changes: 36 additions & 30 deletions apps/ticket/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,48 @@
// eslint-disable-next-line no-undef
const withInterceptStdout = require('next-intercept-stdout');

const withBundleAnalyzer = require('@next/bundle-analyzer')({
enabled: process.env.ANALYZE === 'true',
});

const withTM = require('next-transpile-modules')([
'@dudoong/ui',
'@dudoong/utils',
'date-fns',
]);

module.exports = withInterceptStdout(
withTM({
// Any additional config for next goes in here
swcMinify: true,
webpack: (config, options) => {
config.module.rules.push({
test: /\.svg$/,
use: [
options.defaultLoaders.babel,
{
loader: '@svgr/webpack',
options: { babel: false },
},
],
});
return config;
},
images: {
domains: ['asset.dudoong.com'],
},
rewrites: async () => [
{
source: '/meta/term',
destination: '/term.html',
module.exports = withBundleAnalyzer(
withInterceptStdout(
withTM({
// Any additional config for next goes in here
swcMinify: true,
webpack: (config, options) => {
config.module.rules.push({
test: /\.svg$/,
use: [
options.defaultLoaders.babel,
{
loader: '@svgr/webpack',
options: { babel: false },
},
],
});
return config;
},
{
source: '/meta/privacy',
destination: '/privacy.html',
images: {
domains: ['asset.dudoong.com'],
},
],
}),
(text) => (text.includes('Duplicate atom key') ? '' : text),
rewrites: async () => [
{
source: '/meta/term',
destination: '/term.html',
},
{
source: '/meta/privacy',
destination: '/privacy.html',
},
],
}),
(text) => (text.includes('Duplicate atom key') ? '' : text),
),
);
1 change: 0 additions & 1 deletion apps/ticket/src/components/events/blocks/Remote.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { useRecoilValue } from 'recoil';
import { authState } from '@store/auth';
import { useRouter } from 'next/router';
import useOverlay from '@lib/hooks/useOverlay';
import OverlayBox from '@components/shared/overlay/OverlayBox';
import TalkOverlay from './Talk/Index';

interface RemoteProps {
Expand Down
14 changes: 10 additions & 4 deletions apps/ticket/src/components/home/Landing/index.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
import { Footer } from '@dudoong/ui';
import DDHead from '@components/shared/Layout/NextHead';
import Title from './Title';
import IntroSection from './IntroSection';
import FeatureSection from './FeatureSection';
import TicketSection from './TicketSection';
import OutroSection from './Outro';
//import IntroSection from './IntroSection';
//import FeatureSection from './FeatureSection';
//import TicketSection from './TicketSection';
//import OutroSection from './Outro';
import { css } from '@emotion/react';
import React from 'react';
const Landing = () => {
const IntroSection = React.lazy(() => import('./IntroSection'));
const FeatureSection = React.lazy(() => import('./FeatureSection'));
const TicketSection = React.lazy(() => import('./TicketSection'));
const OutroSection = React.lazy(() => import('./Outro'));

return (
<>
<DDHead
Expand Down
4 changes: 2 additions & 2 deletions apps/ticket/src/components/home/blocks/HomeHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Input, media, Search, theme } from '@dudoong/ui';
import { media } from '@dudoong/ui';
import { css } from '@emotion/react';
import styled from '@emotion/styled';
import Twinkle from '@dudoong/ui/src/assets/icons/Twinkle.svg';
import Dots from '@dudoong/ui/src/assets/image/dots.svg';
import Dots from '@dudoong/ui/src/assets/image/Dots';
const HomeHeader = () => {
return (
<Wrapper>
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"dependencies": {
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"@next/bundle-analyzer": "^13.4.7",
"@tanstack/react-query": "^4.24.9",
"@tanstack/react-query-devtools": "^4.24.9",
"react-beautiful-dnd": "^13.1.1",
Expand Down
3 changes: 2 additions & 1 deletion shared/ui/src/assets/image/Dots.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const Dots = () => {
const Dots = (props: React.SVGProps<SVGSVGElement>) => {
return (
<>
<svg
Expand All @@ -7,6 +7,7 @@ const Dots = () => {
viewBox="0 0 170 163"
fill="none"
xmlns="http://www.w3.org/2000/svg"
className={props.className}
>
<circle cx="2.92157" cy="2.34722" r="2.34722" fill="#6B36DC" />
<circle cx="35.7826" cy="2.34722" r="2.34722" fill="#6B36DC" />
Expand Down
120 changes: 0 additions & 120 deletions shared/ui/src/assets/image/doongdoongs.svg

This file was deleted.

32 changes: 0 additions & 32 deletions shared/ui/src/assets/image/dots.svg

This file was deleted.

Loading

0 comments on commit f9f7b6d

Please sign in to comment.