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.

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

Release v240423.0 #355

Merged
merged 93 commits into from
Apr 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
df8aeb6
Fix gitignore
yoosion030 Dec 31, 2023
71f14c1
Update client props
frorong Dec 31, 2023
fd9283a
Update admin props
frorong Dec 31, 2023
1b05f23
Merge pull request #339 from themoment-team/fix/gitignore
yoosion030 Dec 31, 2023
3c6297b
Update calculate props
frorong Dec 31, 2023
46e78bd
Resolve bulid error
frorong Dec 31, 2023
b48322a
Update Assets folder name to assets
yoosion030 Dec 31, 2023
6bed322
Delete cache
yoosion030 Dec 31, 2023
e1fade3
Resolve build error
frorong Dec 31, 2023
76c19eb
Merge pull request #340 from themoment-team/feature/assets
yoosion030 Dec 31, 2023
3b87eef
Update api folder name
yoosion030 Dec 31, 2023
dbb7079
Update Api folder name to api
yoosion030 Dec 31, 2023
bbef8e8
Update packages/hello-gsm-admin/src/components/Modal/ModalSubmit/inde…
frorong Dec 31, 2023
b3f007f
Resolve build error
frorong Dec 31, 2023
211fe42
Add api/index import optimization
yoosion030 Dec 31, 2023
4622e32
Update api folder name
yoosion030 Dec 31, 2023
7b24ad9
Update PageContainer folder name to pageContainer
yoosion030 Dec 31, 2023
f4a27b3
Update import path
yoosion030 Dec 31, 2023
631caf9
Update next, react version
yoosion030 Dec 31, 2023
4cc3ed8
Merge pull request #341 from themoment-team/fix/props
frorong Dec 31, 2023
e49bab9
Merge pull request #343 from themoment-team/feature/pageContainer
yoosion030 Jan 1, 2024
0ac223b
Merge branch 'develop' of https://github.com/themoment-team/hello-gsm…
yoosion030 Jan 1, 2024
fec9fbc
Merge branch 'develop' of https://github.com/themoment-team/hello-gsm…
yoosion030 Jan 2, 2024
01f2d39
Delete calculate workspace
yoosion030 Jan 2, 2024
4073752
Merge pull request #342 from themoment-team/feature/api
yoosion030 Jan 2, 2024
321af90
Update type folder name to types
yoosion030 Jan 2, 2024
ff8a0c0
Update import path
yoosion030 Jan 2, 2024
b7db28f
Update utils folder name
yoosion030 Jan 2, 2024
99c5feb
Update Utils folder name to utils
yoosion030 Jan 2, 2024
a2b3199
Update import path
yoosion030 Jan 2, 2024
e79ee0f
Update import path
yoosion030 Jan 2, 2024
6e534ec
Update import path
yoosion030 Jan 2, 2024
4a035bb
Merge pull request #346 from themoment-team/feature/plural
yoosion030 Jan 2, 2024
006ee50
Merge pull request #344 from themoment-team/feature/calculate
yoosion030 Jan 2, 2024
0e35ddd
Merge branch 'develop' of https://github.com/themoment-team/hello-gsm…
yoosion030 Jan 2, 2024
624f799
Delete dependency root workspace
yoosion030 Jan 2, 2024
7273794
Delete dependency admin workspace
yoosion030 Jan 2, 2024
6bb0a2d
Merge pull request #347 from themoment-team/feature/dependency
yoosion030 Jan 2, 2024
c8284e4
Update folder name api -> apis
yoosion030 Jan 4, 2024
31281c5
Update stores folder name
yoosion030 Jan 4, 2024
1bc06a6
Update Stores -> stores folder name
yoosion030 Jan 4, 2024
dc873f2
Merge pull request #348 from themoment-team/feature/plural
yoosion030 Jan 4, 2024
9783be0
Add lint rules
yoosion030 Jan 7, 2024
1e2cace
Add lint 적용
yoosion030 Jan 7, 2024
65512d9
Add admin lint 적용
yoosion030 Jan 7, 2024
c5afc3c
Merge pull request #349 from themoment-team/feature/lint
yoosion030 Jan 7, 2024
b675c3b
Add projectCard
frorong Jan 31, 2024
8feb717
Update card style
frorong Jan 31, 2024
900acd9
Add section
frorong Jan 31, 2024
d5a7c19
Update import
frorong Jan 31, 2024
a83c2fd
Add action on save
frorong Jan 31, 2024
1424170
Add scroll event
frorong Jan 31, 2024
2f2cc38
Add animation
frorong Jan 31, 2024
d243dda
Update animation
frorong Jan 31, 2024
36e83ee
Update unit
frorong Jan 31, 2024
c035027
Add images
frorong Feb 1, 2024
950eb4b
Update a to link
frorong Feb 6, 2024
b1a882f
Update NavLink
frorong Feb 6, 2024
212118f
Update members
frorong Feb 8, 2024
25f5828
Update mobile
frorong Feb 8, 2024
d63d170
Update filter
frorong Feb 8, 2024
6ae9c4e
Add profile
frorong Feb 8, 2024
ac62ce5
Add returnList
frorong Feb 8, 2024
e0d8b68
Delete useless code
frorong Feb 8, 2024
bfa16b6
Update jueun
frorong Feb 8, 2024
3dd4c6c
Merge pull request #351 from themoment-team/fix/hydration
frorong Feb 11, 2024
a4c2726
Merge develop
frorong Mar 5, 2024
d83298e
Add project link
frorong Mar 6, 2024
77ab7f1
Add project type
frorong Mar 6, 2024
0a258e5
Update lint
frorong Mar 7, 2024
52f76a7
Update package
frorong Mar 7, 2024
ce7e499
Resolve client
frorong Mar 7, 2024
29e148f
Resolve admin
frorong Mar 7, 2024
c3670d6
Update hello gsm introduce
frorong Mar 7, 2024
5bc5219
Update index.tsx
frorong Mar 7, 2024
8eefe53
Merge pull request #353 from themoment-team/fix/eslint
frorong Mar 7, 2024
82c86f7
Merge develop
frorong Mar 7, 2024
0eec206
Merge branch 'develop' into feature/members
frorong Mar 7, 2024
c77402f
Resolve build error
frorong Mar 7, 2024
b4cbc19
Update style
frorong Mar 7, 2024
0f547c0
Update style
frorong Mar 7, 2024
d8df28a
Delete className
frorong Mar 7, 2024
fe09cea
Resolve build error
frorong Mar 7, 2024
33b2c66
Add useHandleWindowSize
frorong Mar 7, 2024
1b09ac5
Update responsive aboutPage
frorong Mar 7, 2024
dbdbbfc
Update index.tsx
frorong Mar 11, 2024
9b14c02
Merge pull request #352 from themoment-team/feature/members
frorong Mar 12, 2024
478fa12
Merge develop
frorong Mar 14, 2024
c4fd475
Resolve build error
frorong Mar 14, 2024
a70a07b
Merge pull request #350 from themoment-team/feature/teamIntroduce
frorong Mar 14, 2024
0e8287c
Update title
frorong Apr 18, 2024
3bfa18b
Resolve build error
frorong Apr 18, 2024
8ae0203
Merge pull request #354 from themoment-team/feature/title
frorong Apr 19, 2024
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
153 changes: 127 additions & 26 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
const path = require('path');

module.exports = {
env: {
browser: true,
Expand All @@ -21,32 +19,135 @@ module.exports = {
ecmaVersion: 'latest',
sourceType: 'module',
},
plugins: ['react', '@typescript-eslint'],
rules: {},
overrides: [
{
files: ['packages/hello-gsm/**/*.ts?(x)'],
settings: {
'import/resolver': {
typescript: {
project: path.resolve(
`${__dirname}/packages/hello-gsm/tsconfig.json`,
),
},
},
plugins: ['react', '@typescript-eslint', 'import', 'unused-imports'],
rules: {
'@typescript-eslint/no-var-requires': 'off',
'no-unused-vars': 'off',
'@typescript-eslint/no-unused-vars': ['error'],
'unused-imports/no-unused-imports-ts': ['error'],
'sort-imports': [
'error',
{
ignoreCase: true,
ignoreDeclarationSort: true,
ignoreMemberSort: false,
allowSeparatedGroups: true,
},
},
{
files: ['packages/hello-gsm-admin/**/*.ts?(x)'],
settings: {
'import/resolver': {
typescript: {
project: path.resolve(
`${__dirname}/packages/hello-gsm-admin/tsconfig.json`,
),
],
'import/order': [
'error',
{
'newlines-between': 'always',
groups: ['builtin', ['external', 'type'], 'internal'],

pathGroups: [
{
pattern: 'next',
group: 'external',
position: 'before',
},
{
pattern: 'next/**',
group: 'external',
position: 'before',
},
{
pattern: 'react',
group: 'external',
position: 'before',
},
{
pattern: 'react-daum-postcode',
group: 'external',
position: 'before',
},
{
pattern: 'axios',
group: 'external',
position: 'before',
},
{
pattern: '@emotion/**',
group: 'external',
position: 'before',
},
{
pattern: 'react-toastify',
group: 'external',
position: 'before',
},
{
pattern: 'react-hook-form',
group: 'external',
position: 'before',
},
{
pattern: 'dayjs',
group: 'external',
position: 'before',
},
{
pattern: 'components',
group: 'internal',
position: 'after',
},
{
pattern: 'pageContainer',
group: 'internal',
position: 'after',
},
{
pattern: 'shared/**',
group: 'internal',
position: 'after',
},
{
pattern: 'utils/**',
group: 'internal',
position: 'after',
},
{
pattern: 'types/**',
group: 'internal',
position: 'after',
},
{
pattern: 'styles/**',
group: 'internal',
position: 'after',
},
{
pattern: 'stores/**',
group: 'internal',
position: 'after',
},
{
pattern: 'hooks/**',
group: 'internal',
position: 'after',
},
{
pattern: 'apis/**',
group: 'internal',
position: 'after',
},
{
pattern: 'assets/**',
group: 'internal',
position: 'after',
},
{
pattern: '@/**',
group: 'internal',
position: 'after',
},
],
pathGroupsExcludedImportTypes: ['extanal'],

alphabetize: {
order: 'asc',
},
},
},
],
],
},
};
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/node_modules
/.pnp
.pnp.js
/packages/**/node_modules/

# yarn berry
.yarn/*
Expand Down
5 changes: 4 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,8 @@
"eslint.nodePath": ".yarn/sdks",
"prettier.prettierPath": ".yarn/sdks/prettier/index.js",
"typescript.tsdk": ".yarn/sdks/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true
"typescript.enablePromptUseWorkspaceTsdk": true,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
}
}
8 changes: 2 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,16 @@
"@emotion/styled": "^11.8.1",
"axios": "^0.26.1",
"emotion-reset": "^3.0.1",
"next": "12.1.0",
"react": "17.0.2",
"react-daum-postcode": "^3.0.1",
"react-dom": "17.0.2",
"react-hook-form": "^7.29.0",
"victory": "^36.3.2",
"victory-bar": "^36.3.2",
"zustand": "^3.7.2"
},
"devDependencies": {
"@babel/core": "^7.17.7",
"@babel/preset-react": "^7.16.7",
"@emotion/babel-plugin": "^11.7.2",
"@emotion/babel-preset-css-prop": "^11.2.0",
"@types/node": "17.0.21",
"@types/node": "^20.11.24",
"@types/react": "17.0.40",
"@typescript-eslint/eslint-plugin": "^5.15.0",
"@typescript-eslint/parser": "^5.15.0",
Expand All @@ -39,6 +34,7 @@
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.29.4",
"eslint-plugin-unused-imports": "^3.1.0",
"prettier": "^2.6.0",
"typescript": "4.6.2"
},
Expand Down
9 changes: 5 additions & 4 deletions packages/hello-gsm-admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
"axios": "^0.26.1",
"dayjs": "^1.11.5",
"emotion-reset": "^3.0.1",
"next": "latest",
"react": "17.0.2",
"next": "13",
"react": "^18.2.0",
"react-daum-postcode": "^3.1.3",
"react-dom": "17.0.2",
"react-dom": "^18.2.0",
"react-hook-form": "^7.31.1",
"react-toastify": "^9.0.8",
"zustand": "^3.7.2"
Expand All @@ -27,7 +27,7 @@
"@babel/preset-react": "^7.16.7",
"@emotion/babel-plugin": "^11.7.2",
"@emotion/babel-preset-css-prop": "^11.2.0",
"@types/node": "17.0.21",
"@types/node": "^20.11.24",
"@types/react": "17.0.40",
"@typescript-eslint/eslint-plugin": "^5.15.0",
"@typescript-eslint/parser": "^5.15.0",
Expand All @@ -36,6 +36,7 @@
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.29.4",
"eslint-plugin-unused-imports": "^3.1.0",
"prettier": "^2.6.0",
"typescript": "4.6.2"
},
Expand Down
3 changes: 2 additions & 1 deletion packages/hello-gsm-admin/src/Api/application.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { ApplicationFormType } from 'type/application';
import RequestApi from 'Utils/Libs/requestApi';
import { ApplicationController } from 'Utils/Libs/requestUrls';
import { ApplicationFormType } from 'type/application';

import BASE_URL from 'shared/baseURL';
class Application {
/**
Expand Down
3 changes: 2 additions & 1 deletion packages/hello-gsm-admin/src/Api/auth.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import BASE_URL from 'shared/baseURL';
import { AuthController } from 'Utils/Libs/requestUrls';

import BASE_URL from 'shared/baseURL';

class Auth {
/**
* @returns 각 oauth 로그인 URL을 반환합니다.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
import type { NextPage } from 'next';
import * as S from './style';

import { useEffect, useState } from 'react';

import { css, Global } from '@emotion/react';

import dayjs from 'dayjs';
import { ApplicantsStatus } from 'components';

import * as I from 'Assets/svg';
import { LocalScoreType } from 'type/score';
import toStringArray from 'Utils/Array/toStringArray';
import { formatGender } from 'Utils/Format';
import { ApplicationResponseType } from 'type/application';
import { isGED } from 'type/ged';
import { css, Global } from '@emotion/react';
import { LocalScoreType } from 'type/score';

import { ApplicantsStatus } from 'components';

import * as S from './style';

const ApplicationPage: NextPage<{
data: ApplicationResponseType | undefined;
Expand All @@ -28,8 +34,7 @@ const ApplicationPage: NextPage<{
const [newSubjects, setNewSubjects] = useState<string[]>([]);
const [nonSubjects, setNonSubjects] = useState<string[]>([]);

const { admissionGrade, middleSchoolGrade, admissionInfo, admissionStatus } =
data || {};
const { admissionGrade, middleSchoolGrade, admissionInfo } = data || {};

useEffect(() => {
const scoreData: LocalScoreType | null = middleSchoolGrade
Expand Down
29 changes: 18 additions & 11 deletions packages/hello-gsm-admin/src/PageContainer/ApplyPage/index.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,28 @@
import React, { useEffect, useRef, useState } from 'react';
import type { NextPage } from 'next';
import * as S from './style';
import * as I from 'Assets/svg';

import React, { useEffect, useRef, useState } from 'react';

import { css } from '@emotion/react';

import { toast } from 'react-toastify';

import { useForm } from 'react-hook-form';

import * as I from 'Assets/svg';
import useApplyStore from 'Stores/ApplyStoreContainer';
import formatMajor from 'Utils/Format/formatMajor';
import { ApplyFormType } from 'type/application';
import { ApplicationIdentityType } from 'type/data';

import {
ApplyBarBox,
ApplyPostModal,
DepartmentModal,
FindAddressModal,
FindSchoolModal,
ApplyBarBox,
ApplyPostModal,
} from 'components';
import { useForm } from 'react-hook-form';
import { ApplyFormType } from 'type/application';
import { toast } from 'react-toastify';
import formatMajor from 'Utils/Format/formatMajor';
import { ApplicationIdentityType } from 'type/data';
import useApplyStore from 'Stores/ApplyStoreContainer';

import * as S from './style';

const ApplyPage: NextPage<
ApplicationIdentityType & {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import type { NextPage } from 'next';
import * as S from './style';

import * as I from 'Assets/svg';

import * as S from './style';

const BrowserPage: NextPage = () => {
return (
<>
Expand Down
27 changes: 17 additions & 10 deletions packages/hello-gsm-admin/src/PageContainer/CalculatorPage/index.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,28 @@
import type { NextPage } from 'next';
import { ScoreSelect, ScoreResultModal, FreeSemesterBtn } from 'components';
import * as S from 'styles/Calculate';
import * as I from 'Assets/svg';
import { FieldErrors, useForm } from 'react-hook-form';

import { useEffect, useState } from 'react';

import { toast } from 'react-toastify';

import { FieldErrors, useForm } from 'react-hook-form';

import application from 'Api/application';
import * as I from 'Assets/svg';
import useApplyStore from 'Stores/ApplyStoreContainer';
import {
ArtSport,
Attendance,
Calculate,
Volunteer,
Rounds,
Attendance,
ArtSport,
Volunteer,
} from 'Utils/Calculate';
import { LocalScoreType } from 'type/score';
import { toast } from 'react-toastify';

import { FreeSemesterBtn, ScoreResultModal, ScoreSelect } from 'components';

import * as S from 'styles/Calculate';

import useScrollToTop from 'hooks/useScrollToTop';
import useApplyStore from 'Stores/ApplyStoreContainer';
import application from 'Api/application';

interface ScoreForm {
// 과목/점수 배열
Expand Down
Loading