Skip to content

Commit

Permalink
[RELEASE] release 3.0.0 관리자 기능 추가
Browse files Browse the repository at this point in the history
3.0 업데이트를 실시합니다

### 주요 변경 사항
관리하는 프로그램을 주간발표에 조금 더 초점을 맞추도록 하였습니다.  

아래의 기능이 추가되었습니다. 
- 관리자 로그인 및 플로우가 추가되었습니다.
- 출석 체크 시작/종료하기 기능이 추가되었습니다. 
- 질문 게시판이 추가되었습니다. 
- 팀 관리 및 멤버 관리 기능이 추가되었습니다. 

아래의 기능이 수정되었습니다.
- 회원은 개인의 활동 상태를 변경할 수 없습니다.
- 출석체크시 출석하기 버튼만 클릭하는 방식으로 수정되었습니다. 
- 출석체크가 진행중인 프로그램을 홈 화면에서 확인할 수 있습니다. 

기타 수정사항은 아래와 같습니다. 
- google analytics 를 추가하였습니다. 
- 기존 서버 요청에 캐싱을 추가하여 최적화하였습니다.
  • Loading branch information
geongyu09 authored Oct 2, 2024
2 parents d935652 + 8394be5 commit 542fe7b
Show file tree
Hide file tree
Showing 218 changed files with 10,280 additions and 1,647 deletions.
19 changes: 19 additions & 0 deletions .github/hooks/prepare-commit-msg.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/sh

# 커밋 메시지 파일 경로
commit_msg_file=$1

# 현재 브랜치 이름 가져오기
branch_name=$(git symbolic-ref --short HEAD)

# 브랜치 이름에서 이슈 번호 추출하기
issue_number=$(echo $branch_name | grep -oE '[0-9]+')

# 이슈 번호가 추출되었는지 확인
if [ -n "$issue_number" ]; then
# 주석을 제외한 기존 커밋 메시지 가져오기
message_body=$(sed '/^#/d' "$commit_msg_file")

# 새로운 메시지 작성
echo "$message_body\n\n#$issue_number" > "$commit_msg_file"
fi
Empty file removed FE/.Rhistory
Empty file.
2 changes: 2 additions & 0 deletions FE/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,7 @@ bower_components
psd
thumb
sketch
todo.md
.prettierignore

# End of https://www.toptal.com/developers/gitignore/api/nextjs,react,macos
207 changes: 207 additions & 0 deletions FE/jest.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,207 @@
/**
* For a detailed explanation regarding each configuration property, visit:
* https://jestjs.io/docs/configuration
*/

import type { Config } from "jest";
import nextJest from "next/jest.js";

const createJestConfig = nextJest({
// Provide the path to your Next.js app to load next.config.js and .env files in your test environment
dir: "./",
});

const config: Config = {
// All imported modules in your tests should be mocked automatically
// automock: false,

// Stop running tests after `n` failures
// bail: 0,

// The directory where Jest should store its cached dependency information
// cacheDirectory: "/private/var/folders/_l/kg6_wrp51z92kpypfzt3jf580000gn/T/jest_dx",

// Automatically clear mock calls, instances, contexts and results before every test
clearMocks: true,

// Indicates whether the coverage information should be collected while executing the test
collectCoverage: true,

// An array of glob patterns indicating a set of files for which coverage information should be collected
// collectCoverageFrom: undefined,

// The directory where Jest should output its coverage files
coverageDirectory: "coverage",

// An array of regexp pattern strings used to skip coverage collection
// coveragePathIgnorePatterns: [
// "/node_modules/"
// ],

// Indicates which provider should be used to instrument code for coverage
coverageProvider: "v8",

// A list of reporter names that Jest uses when writing coverage reports
// coverageReporters: [
// "json",
// "text",
// "lcov",
// "clover"
// ],

// An object that configures minimum threshold enforcement for coverage results
// coverageThreshold: undefined,

// A path to a custom dependency extractor
// dependencyExtractor: undefined,

// Make calling deprecated APIs throw helpful error messages
// errorOnDeprecated: false,

// The default configuration for fake timers
// fakeTimers: {
// "enableGlobally": false
// },

// Force coverage collection from ignored files using an array of glob patterns
// forceCoverageMatch: [],

// A path to a module which exports an async function that is triggered once before all test suites
// globalSetup: undefined,

// A path to a module which exports an async function that is triggered once after all test suites
// globalTeardown: undefined,

// A set of global variables that need to be available in all test environments
// globals: {},

// The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
// maxWorkers: "50%",

// An array of directory names to be searched recursively up from the requiring module's location
// moduleDirectories: [
// "node_modules"
// ],

// An array of file extensions your modules use
// moduleFileExtensions: [
// "js",
// "mjs",
// "cjs",
// "jsx",
// "ts",
// "tsx",
// "json",
// "node"
// ],

// A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
moduleNameMapper: {
"^@/(.*)$": "<rootDir>/src/$1",
},

// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
// modulePathIgnorePatterns: [],

// Activates notifications for test results
// notify: false,

// An enum that specifies notification mode. Requires { notify: true }
// notifyMode: "failure-change",

// A preset that is used as a base for Jest's configuration
// preset: undefined,

// Run tests from one or more projects
// projects: undefined,

// Use this configuration option to add custom reporters to Jest
// reporters: undefined,

// Automatically reset mock state before every test
// resetMocks: false,

// Reset the module registry before running each individual test
// resetModules: false,

// A path to a custom resolver
// resolver: undefined,

// Automatically restore mock state and implementation before every test
// restoreMocks: false,

// The root directory that Jest should scan for tests and modules within
// rootDir: undefined,

// A list of paths to directories that Jest should use to search for files in
// roots: [
// "<rootDir>"
// ],

// Allows you to use a custom runner instead of Jest's default test runner
// runner: "jest-runner",

// The paths to modules that run some code to configure or set up the testing environment before each test
// setupFiles: [],

// A list of paths to modules that run some code to configure or set up the testing framework before each test
// setupFilesAfterEnv: [],

// The number of seconds after which a test is considered as slow and reported as such in the results.
// slowTestThreshold: 5,

// A list of paths to snapshot serializer modules Jest should use for snapshot testing
// snapshotSerializers: [],

// The test environment that will be used for testing
// testEnvironment: "jest-environment-node",

// Options that will be passed to the testEnvironment
// testEnvironmentOptions: {},

// Adds a location field to test results
// testLocationInResults: false,

// The glob patterns Jest uses to detect test files
// testMatch: [
// "**/__tests__/**/*.[jt]s?(x)",
// "**/?(*.)+(spec|test).[tj]s?(x)"
// ],

// An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
// testPathIgnorePatterns: [
// "/node_modules/"
// ],

// The regexp pattern or array of patterns that Jest uses to detect test files
// testRegex: [],

// This option allows the use of a custom results processor
// testResultsProcessor: undefined,

// This option allows use of a custom test runner
// testRunner: "jest-circus/runner",

// A map from regular expressions to paths to transformers
// transform: undefined,

// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
// transformIgnorePatterns: [
// "/node_modules/",
// "\\.pnp\\.[^\\/]+$"
// ],

// An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
// unmockedModulePathPatterns: undefined,

// Indicates whether each individual test should be reported during the run
verbose: true,

// An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
// watchPathIgnorePatterns: [],

// Whether to use watchman for file crawling
// watchman: true,
};

export default createJestConfig(config);
1 change: 1 addition & 0 deletions FE/jest.setup.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
setNextMock();
20 changes: 17 additions & 3 deletions FE/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@
"dev": "next dev",
"build": "next build",
"start": "next build && next start",
"lint": "next lint --fix"
"lint": "next lint --fix",
"test": "jest --watch"
},
"dependencies": {
"@next/third-parties": "^14.2.8",
"@tanstack/react-query": "^4.35.7",
"@tanstack/react-query-devtools": "^5.28.14",
"@toss/react": "^1.7.0",
"@types/qs": "^6.9.10",
"@types/react-syntax-highlighter": "^15.5.11",
"@vercel/analytics": "^1.2.2",
Expand All @@ -25,16 +28,23 @@
"react-day-picker": "^8.9.1",
"react-dom": "^18.2.0",
"react-error-boundary": "^4.0.12",
"react-hook-form": "^7.52.2",
"react-markdown": "^9.0.1",
"react-syntax-highlighter": "^15.5.0",
"react-toastify": "^9.1.3",
"remark-gfm": "^4.0.0",
"tailwind-scrollbar-hide": "^1.1.7"
},
"devDependencies": {
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^6.4.8",
"@testing-library/react": "^16.0.0",
"@testing-library/user-event": "^14.5.2",
"@types/jest": "^29.5.12",
"@types/node": "latest",
"@types/react": "latest",
"@types/react-dom": "latest",
"@types/react": "^18.2.58",
"@types/react-dom": "^18.2.18",
"@types/react-test-renderer": "^18.3.0",
"@typescript-eslint/eslint-plugin": "^6.7.5",
"@typescript-eslint/parser": "^6.7.5",
"autoprefixer": "latest",
Expand All @@ -45,10 +55,14 @@
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-react": "^7.33.2",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"postcss": "latest",
"prettier": "^3.0.3",
"prettier-plugin-tailwindcss": "^0.5.6",
"react-test-renderer": "^18.3.1",
"tailwindcss": "latest",
"ts-node": "^10.9.2",
"typescript": "latest"
}
}
Loading

0 comments on commit 542fe7b

Please sign in to comment.