Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
174 commits
Select commit Hold shift + click to select a range
5675689
경로 수정
cmlim0070 Nov 8, 2022
9211f0f
페이지 링크
cmlim0070 Nov 8, 2022
57ba52b
주석 추가
cmlim0070 Nov 8, 2022
222cc8f
css 수정
YJin33 Nov 8, 2022
c6a4874
Update reviewAll.css
cmlim0070 Nov 8, 2022
48d3810
Rename reviewAll.css to ReviewAll.css
cmlim0070 Nov 8, 2022
e673796
CreateStorejs생성
zoo0YOON Nov 8, 2022
c596720
Header NavBar 추가
dlvcoth Nov 8, 2022
6ebca76
Update reviewAll.css
zoo0YOON Nov 8, 2022
26e6e70
Merge remote-tracking branch 'origin/1108ChaeMin' into 1108/jy
zoo0YOON Nov 8, 2022
5d5f34d
Merge remote-tracking branch 'origin/1108ChaeMin' into 1108/ym
dlvcoth Nov 8, 2022
19a6767
Deleted Login SignIn StoreListView reviewAll
euWna Nov 8, 2022
ff44c03
Update CreateStore.js
zoo0YOON Nov 8, 2022
e540e0b
Merge remote-tracking branch 'origin/1108/ym' into 1108/se
euWna Nov 8, 2022
657c49b
Merge remote-tracking branch 'origin/1108/jy' into 1108/se
euWna Nov 8, 2022
af9d2d3
Merge remote-tracking branch 'origin/1108/유진' into 1108/se
euWna Nov 8, 2022
5c05821
1109 Base
euWna Nov 8, 2022
64f6647
SignIn -> SignUp 변경, StoreDetail.js 생성
euWna Nov 10, 2022
3def48a
1109/jy+1110/se
euWna Nov 10, 2022
4242d57
Rename SignIn.js to SignUp.js
euWna Nov 10, 2022
3d5e284
Create StoreDetail.js
euWna Nov 10, 2022
40ba010
Rename SingIn -> SingUp
euWna Nov 10, 2022
2fc3312
페이지 연결(홈)
cmlim0070 Nov 13, 2022
4a9ffc1
css 수정+페이지 연결
cmlim0070 Nov 13, 2022
3722ece
flask-server please
euWna Nov 13, 2022
1cc5352
Update app.py
euWna Nov 13, 2022
0ba3148
css 정렬 수정
cmlim0070 Nov 13, 2022
e00986c
flask setting
euWna Nov 13, 2022
40c86d9
오전 2시 46분 css 수정..
cmlim0070 Nov 13, 2022
71b41d0
Merge branch '1114/cm' of https://github.com/euWna/osp_project into 1…
euWna Nov 13, 2022
6adae26
Update App.js
euWna Nov 13, 2022
a54639c
Delete backend directory
euWna Nov 13, 2022
8b8bb44
제출용 NavBar 추가
euWna Nov 13, 2022
13227cb
수정
zoo0YOON Nov 13, 2022
584f85b
수정
zoo0YOON Nov 13, 2022
685da71
Merge branch '1114/jy2' of https://github.com/euWna/osp_project into …
euWna Nov 13, 2022
eaa680c
flask_CreateStore_onProgress
euWna Nov 13, 2022
485f57f
app.py result > CreateStore 경로 수정
euWna Nov 14, 2022
7c3c874
Create pages 3개, app.py 수정
euWna Nov 14, 2022
c123d04
database 파일 생성
YJin33 Nov 15, 2022
0927b05
일단 수정본
zoo0YOON Nov 15, 2022
ea3ee7a
수정
zoo0YOON Nov 15, 2022
5f7a32b
1115/cm+juyoung
YJin33 Nov 18, 2022
45680bf
오후 9시 31분
cmlim0070 Nov 20, 2022
fa2b9d6
Submit_store로 수정, table명 대문자로 변경, print문 주석처리
euWna Nov 20, 2022
d3a71d5
라우팅을 위하여...
euWna Nov 21, 2022
60abb50
Update result.html
euWna Nov 21, 2022
95b76dc
result.html img src 태그 추가, DB 연결 모두 확인
euWna Nov 21, 2022
a72a008
Routing Success
euWna Nov 22, 2022
2315877
메뉴이름불러와짐
cmlim0070 Nov 22, 2022
27b0b68
뭐가뭔지
euWna Nov 27, 2022
bbe2cbd
뭐가뭦ㄴ지!!!
euWna Nov 27, 2022
6cc689f
StoreDetail css 수정 (메뉴)
euWna Nov 27, 2022
bb5a6a1
StoreDetail 얼추 완성 근데 왜 CreateMenu 로딩이 안돼죠 ㅠ
euWna Nov 27, 2022
f3c7537
환경변수 되돌려놓음
euWna Nov 27, 2022
3c28bdd
안되는중
cmlim0070 Nov 27, 2022
17dfdae
1
cmlim0070 Nov 27, 2022
06cdd09
json 데이터 넘어감
cmlim0070 Nov 29, 2022
a72249a
json data 콘솔에 넘어옴
cmlim0070 Nov 29, 2022
5ee6e7f
8시 41분
cmlim0070 Nov 29, 2022
ae4b0d2
데이터 불러와짐!!!!
cmlim0070 Nov 29, 2022
905ad64
storelistview-css 수정
cmlim0070 Dec 3, 2022
4d6a286
이미지 소스 불러오기 시도중
cmlim0070 Dec 4, 2022
996263b
Merge branch '1204/react' into 1204/cm
euWna Dec 4, 2022
d772566
이미지 불러오기 작업중
cmlim0070 Dec 4, 2022
ec1eb6f
이미지불러오기작업
cmlim0070 Dec 4, 2022
3a65d4d
이미지 불러오기 수정
cmlim0070 Dec 5, 2022
8f4bed6
d
cmlim0070 Dec 6, 2022
ed9264d
리스트 뜨는거 해결
cmlim0070 Dec 6, 2022
2d3b92c
이미지 불러오기 에러캐치
cmlim0070 Dec 6, 2022
654668f
맛집 모아보기 css 수정
cmlim0070 Dec 6, 2022
00e842e
수정
zoo0YOON Dec 6, 2022
e9582a3
?
cmlim0070 Dec 8, 2022
22c877d
송은+유진+채민
cmlim0070 Dec 8, 2022
3338c0d
store dupliacte check 수정
YJin33 Dec 8, 2022
a0463fb
컴포넌트별 라우팅
YJin33 Dec 8, 2022
a1992c9
컴포넌트 Storename 만 받아옴
YJin33 Dec 8, 2022
359476c
진전사항 없음 ㅠ
YJin33 Dec 8, 2022
44f743f
데이터 안넘어가는 중
YJin33 Dec 9, 2022
93534ea
저장용 커밋
YJin33 Dec 11, 2022
78a937c
info(image제외)data 넘어감(Linkto)
YJin33 Dec 13, 2022
ab4c683
고친거
zoo0YOON Dec 13, 2022
2502787
고침
zoo0YOON Dec 13, 2022
f7c40fa
Update CreateMenu.js
cmlim0070 Dec 13, 2022
0c12320
Update CreateStore_registered.js
euWna Dec 13, 2022
1dbdd96
Update app.py
euWna Dec 13, 2022
86b51ec
1206/jy 옮기기
YJin33 Dec 13, 2022
fe1486e
Update SignUp.js
euWna Dec 13, 2022
59f2a9a
1208/jy 기반 수정
YJin33 Dec 13, 2022
cd04303
merge 1차마감
YJin33 Dec 13, 2022
4b779fc
img경로 수정
YJin33 Dec 13, 2022
360579e
storedetail (맛집세부정보) 데이터 연결
cmlim0070 Dec 15, 2022
0d9cf8d
storedetail 메뉴불러오기 가능+메뉴추가/수정 버튼 활성화
cmlim0070 Dec 15, 2022
96c8e36
리뷰 등록 가능 + 리뷰 조회 가능
cmlim0070 Dec 15, 2022
a7b8ee1
storelistview 데이터 불러오기 완성
cmlim0070 Dec 15, 2022
fb90ff2
맛집모아보기/상세보기 완성
cmlim0070 Dec 15, 2022
75917f6
preview routing
YJin33 Dec 16, 2022
6d461f4
StoreDetail Info제외 출력
YJin33 Dec 16, 2022
f2f3eb6
filtering done, button not done
dlvcoth Dec 16, 2022
339a2dd
StoreDetail 다 나옴!!
YJin33 Dec 16, 2022
7606929
버튼 3개 라우팅 끝!
YJin33 Dec 16, 2022
52fa722
Review All
YJin33 Dec 16, 2022
57adaca
Review All 수정
YJin33 Dec 16, 2022
ebd61d8
가게 종류 분류버튼ing
dlvcoth Dec 16, 2022
3bfa960
info 버튼 2개 라우팅
YJin33 Dec 16, 2022
c17c99a
맛집 정보 수정 기능
euWna Dec 17, 2022
8280635
맛집 정보 수정 기능
euWna Dec 17, 2022
a8825fa
카테고리 버튼 완료
dlvcoth Dec 17, 2022
a4b2414
1217
cmlim0070 Dec 17, 2022
791705e
css수정
cmlim0070 Dec 17, 2022
218eb65
일단 주석처리...
YJin33 Dec 17, 2022
d97fc54
Merge 1214chaemin into 1217/se
euWna Dec 17, 2022
4c949be
ff
zoo0YOON Dec 17, 2022
61df006
Merge remote-tracking branch 'origin/1216/ym' into 1206/jy
zoo0YOON Dec 17, 2022
2caaaa1
gitignore add
euWna Dec 17, 2022
c36ee2c
gitignore 수정
zoo0YOON Dec 17, 2022
a479192
Update .gitignore
euWna Dec 17, 2022
ed1f78d
gitignore 수정!
zoo0YOON Dec 17, 2022
617c93e
Update .gitignore
euWna Dec 17, 2022
8f7c52c
gitignore 수정본 최종
zoo0YOON Dec 17, 2022
95bd758
git ignore
YJin33 Dec 17, 2022
8048863
delete pycache
euWna Dec 17, 2022
c94822e
삭제 수정
zoo0YOON Dec 17, 2022
fbdae47
gitignore
YJin33 Dec 17, 2022
405c7b7
Merge branch '1217yj' into 1217/jy
euWna Dec 17, 2022
77dd59a
Merge pull request #33 from euWna/1217/jy
euWna Dec 17, 2022
59f2e05
Merge branch '1217/se' into 1217yj
euWna Dec 17, 2022
d3b91e5
1217 작업까지 merge 완료
euWna Dec 17, 2022
7df3499
리뷰 건수 불러오기&CreateReview 이미지 불러오기& 라우팅 일부 수정
YJin33 Dec 19, 2022
eb990e6
이미지 수정 오류 수정
cmlim0070 Dec 19, 2022
e2ffdc9
state 주석처리(종속성 줄이기)
YJin33 Dec 19, 2022
42d7eeb
저장용 커밋
YJin33 Dec 19, 2022
fd4520f
homepage 수정(랜덤맛집/랜덤리뷰)
cmlim0070 Dec 19, 2022
f7b3db9
수정용
zoo0YOON Dec 19, 2022
8c1b059
수정수정
zoo0YOON Dec 19, 2022
5fa577c
홈페이지 수정
cmlim0070 Dec 19, 2022
ac4e7a6
수우정
zoo0YOON Dec 19, 2022
ae008ad
저장용 커밋(reviewAll 안되는 중)
YJin33 Dec 19, 2022
b7c7b82
주차장이 뜸
cmlim0070 Dec 19, 2022
a89e276
app.py 수정 완
zoo0YOON Dec 19, 2022
7e4f6a8
메뉴새로고침 수정
cmlim0070 Dec 19, 2022
ad431a5
timestamp&기타
YJin33 Dec 19, 2022
4366fb5
create store duplicate alert
dlvcoth Dec 19, 2022
f8aa1f8
Merge branch '1219chaemin' into 1218/ym
euWna Dec 19, 2022
17a5cb0
Merge pull request #37 from euWna/1218/ym
euWna Dec 19, 2022
dc98bf4
css 수정?
zoo0YOON Dec 19, 2022
912f383
Merge branch '1219chaemin' into 1218/yj
euWna Dec 19, 2022
4d1bc94
Merge pull request #38 from euWna/1218/yj
euWna Dec 19, 2022
df8bd89
jy까지 merge 완료
euWna Dec 19, 2022
639756a
Update paths.js
euWna Dec 19, 2022
f3f7e03
환경변수 되돌림. database.py timstamp 관련 코드 무효화
euWna Dec 19, 2022
7679c44
Update database.py
euWna Dec 19, 2022
d2601dc
css 수동 수정 완료
cmlim0070 Dec 19, 2022
a9577b0
Menu css 수정 & 영양성분 제거, 라우팅 수정, api 수정
euWna Dec 19, 2022
1323d1a
네비게이션바 수정
cmlim0070 Dec 19, 2022
174a829
이미지 커밋
cmlim0070 Dec 19, 2022
5aff0ab
Create화면들 input css 수정, 카테고리 추가, Homepage 타이틀 변경
euWna Dec 19, 2022
0fa4b63
Merge branch '1219base' of https://github.com/euWna/osp_project into …
euWna Dec 19, 2022
640765a
image
YJin33 Dec 19, 2022
0819555
이미지 커밋
cmlim0070 Dec 19, 2022
4b08f10
Merge branch '1219base' of https://github.com/euWna/osp_project into …
cmlim0070 Dec 19, 2022
3e0e1bf
홈페이지 타이틀 수정
euWna Dec 19, 2022
960f4e0
샘플이미지 다운
euWna Dec 19, 2022
2c6ea63
최종 run build
euWna Dec 19, 2022
da61581
Store Detail의 메뉴 & 리뷰 컴포넌트 수정
euWna Dec 19, 2022
f042791
API들 재정렬. menu랑 review도 default img 추가
euWna Dec 19, 2022
4e9d74a
최종
euWna Dec 19, 2022
6d92d2d
매장명 링크
euWna Dec 19, 2022
0dbb3e1
매장명 링크
euWna Dec 19, 2022
80207bb
Create README.md
dlvcoth Dec 20, 2022
23407e1
Update README.md
dlvcoth Dec 20, 2022
4bb8754
주석 및 파일 삭제
YJin33 Dec 20, 2022
be9b9d6
주석삭제-2
YJin33 Dec 20, 2022
79cfefa
파일 삭제 -> import , routing 수정
YJin33 Dec 20, 2022
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

# production
/build
/flask-server/__pycache__/
/flask-server/static/react/

# misc
.DS_Store
Expand Down
42 changes: 42 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# 🍰 OSP- 맛집 Open Source Project
이화여자대학교 맛집 리뷰 작성 및 조회 사이트입니다.
<br>

## 📌주요 기능

#### 홈화면
- 랜덤 맛집 제시

#### 맛집 조회
- 카테고리 정렬 버튼

#### 맛집 등록
- 중복 알림
- 메뉴 추가 가능
- 맛집 수정 가능

#### 리뷰 등록



### 👩‍💻 멤버 구성
1976239 우송은
1976244 유영민
1976333 임채민
2171034 윤주영
2176279 이유진

### 🖥️ 개발 환경
- **FrontEnd** : React
- **BackEnd** : Python Flask
- **Database** : Firebase

###🚨주의사항

'''npm install react-icons --save
npm install firebase4'''

을 설치해주세요.



104 changes: 104 additions & 0 deletions config/env.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
'use strict';

const fs = require('fs');
const path = require('path');
const paths = require('./paths');

// Make sure that including paths.js after env.js will read .env variables.
delete require.cache[require.resolve('./paths')];

const NODE_ENV = process.env.NODE_ENV;
if (!NODE_ENV) {
throw new Error(
'The NODE_ENV environment variable is required but was not specified.'
);
}

// https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
const dotenvFiles = [
`${paths.dotenv}.${NODE_ENV}.local`,
// Don't include `.env.local` for `test` environment
// since normally you expect tests to produce the same
// results for everyone
NODE_ENV !== 'test' && `${paths.dotenv}.local`,
`${paths.dotenv}.${NODE_ENV}`,
paths.dotenv,
].filter(Boolean);

// Load environment variables from .env* files. Suppress warnings using silent
// if this file is missing. dotenv will never modify any environment variables
// that have already been set. Variable expansion is supported in .env files.
// https://github.com/motdotla/dotenv
// https://github.com/motdotla/dotenv-expand
dotenvFiles.forEach(dotenvFile => {
if (fs.existsSync(dotenvFile)) {
require('dotenv-expand')(
require('dotenv').config({
path: dotenvFile,
})
);
}
});

// We support resolving modules according to `NODE_PATH`.
// This lets you use absolute paths in imports inside large monorepos:
// https://github.com/facebook/create-react-app/issues/253.
// It works similar to `NODE_PATH` in Node itself:
// https://nodejs.org/api/modules.html#modules_loading_from_the_global_folders
// Note that unlike in Node, only *relative* paths from `NODE_PATH` are honored.
// Otherwise, we risk importing Node.js core modules into an app instead of webpack shims.
// https://github.com/facebook/create-react-app/issues/1023#issuecomment-265344421
// We also resolve them to make sure all tools using them work consistently.
const appDirectory = fs.realpathSync(process.cwd());
process.env.NODE_PATH = (process.env.NODE_PATH || '')
.split(path.delimiter)
.filter(folder => folder && !path.isAbsolute(folder))
.map(folder => path.resolve(appDirectory, folder))
.join(path.delimiter);

// Grab NODE_ENV and REACT_APP_* environment variables and prepare them to be
// injected into the application via DefinePlugin in webpack configuration.
const REACT_APP = /^REACT_APP_/i;

function getClientEnvironment(publicUrl) {
const raw = Object.keys(process.env)
.filter(key => REACT_APP.test(key))
.reduce(
(env, key) => {
env[key] = process.env[key];
return env;
},
{
// Useful for determining whether we’re running in production mode.
// Most importantly, it switches React into the correct mode.
NODE_ENV: process.env.NODE_ENV || 'development',
// Useful for resolving the correct path to static assets in `public`.
// For example, <img src={process.env.PUBLIC_URL + '/img/logo.png'} />.
// This should only be used as an escape hatch. Normally you would put
// images into the `src` and `import` them in code to get their paths.
PUBLIC_URL: publicUrl,
// We support configuring the sockjs pathname during development.
// These settings let a developer run multiple simultaneous projects.
// They are used as the connection `hostname`, `pathname` and `port`
// in webpackHotDevClient. They are used as the `sockHost`, `sockPath`
// and `sockPort` options in webpack-dev-server.
WDS_SOCKET_HOST: process.env.WDS_SOCKET_HOST,
WDS_SOCKET_PATH: process.env.WDS_SOCKET_PATH,
WDS_SOCKET_PORT: process.env.WDS_SOCKET_PORT,
// Whether or not react-refresh is enabled.
// It is defined here so it is available in the webpackHotDevClient.
FAST_REFRESH: process.env.FAST_REFRESH !== 'false',
}
);
// Stringify all values so we can feed into webpack DefinePlugin
const stringified = {
'process.env': Object.keys(raw).reduce((env, key) => {
env[key] = JSON.stringify(raw[key]);
return env;
}, {}),
};

return { raw, stringified };
}

module.exports = getClientEnvironment;
66 changes: 66 additions & 0 deletions config/getHttpsConfig.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
'use strict';

const fs = require('fs');
const path = require('path');
const crypto = require('crypto');
const chalk = require('react-dev-utils/chalk');
const paths = require('./paths');

// Ensure the certificate and key provided are valid and if not
// throw an easy to debug error
function validateKeyAndCerts({ cert, key, keyFile, crtFile }) {
let encrypted;
try {
// publicEncrypt will throw an error with an invalid cert
encrypted = crypto.publicEncrypt(cert, Buffer.from('test'));
} catch (err) {
throw new Error(
`The certificate "${chalk.yellow(crtFile)}" is invalid.\n${err.message}`
);
}

try {
// privateDecrypt will throw an error with an invalid key
crypto.privateDecrypt(key, encrypted);
} catch (err) {
throw new Error(
`The certificate key "${chalk.yellow(keyFile)}" is invalid.\n${
err.message
}`
);
}
}

// Read file and throw an error if it doesn't exist
function readEnvFile(file, type) {
if (!fs.existsSync(file)) {
throw new Error(
`You specified ${chalk.cyan(
type
)} in your env, but the file "${chalk.yellow(file)}" can't be found.`
);
}
return fs.readFileSync(file);
}

// Get the https config
// Return cert files if provided in env, otherwise just true or false
function getHttpsConfig() {
const { SSL_CRT_FILE, SSL_KEY_FILE, HTTPS } = process.env;
const isHttps = HTTPS === 'true';

if (isHttps && SSL_CRT_FILE && SSL_KEY_FILE) {
const crtFile = path.resolve(paths.appPath, SSL_CRT_FILE);
const keyFile = path.resolve(paths.appPath, SSL_KEY_FILE);
const config = {
cert: readEnvFile(crtFile, 'SSL_CRT_FILE'),
key: readEnvFile(keyFile, 'SSL_KEY_FILE'),
};

validateKeyAndCerts({ ...config, keyFile, crtFile });
return config;
}
return isHttps;
}

module.exports = getHttpsConfig;
29 changes: 29 additions & 0 deletions config/jest/babelTransform.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
'use strict';

const babelJest = require('babel-jest').default;

const hasJsxRuntime = (() => {
if (process.env.DISABLE_NEW_JSX_TRANSFORM === 'true') {
return false;
}

try {
require.resolve('react/jsx-runtime');
return true;
} catch (e) {
return false;
}
})();

module.exports = babelJest.createTransformer({
presets: [
[
require.resolve('babel-preset-react-app'),
{
runtime: hasJsxRuntime ? 'automatic' : 'classic',
},
],
],
babelrc: false,
configFile: false,
});
14 changes: 14 additions & 0 deletions config/jest/cssTransform.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
'use strict';

// This is a custom Jest transformer turning style imports into empty objects.
// http://facebook.github.io/jest/docs/en/webpack.html

module.exports = {
process() {
return 'module.exports = {};';
},
getCacheKey() {
// The output is always the same.
return 'cssTransform';
},
};
40 changes: 40 additions & 0 deletions config/jest/fileTransform.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
'use strict';

const path = require('path');
const camelcase = require('camelcase');

// This is a custom Jest transformer turning file imports into filenames.
// http://facebook.github.io/jest/docs/en/webpack.html

module.exports = {
process(src, filename) {
const assetFilename = JSON.stringify(path.basename(filename));

if (filename.match(/\.svg$/)) {
// Based on how SVGR generates a component name:
// https://github.com/smooth-code/svgr/blob/01b194cf967347d43d4cbe6b434404731b87cf27/packages/core/src/state.js#L6
const pascalCaseFilename = camelcase(path.parse(filename).name, {
pascalCase: true,
});
const componentName = `Svg${pascalCaseFilename}`;
return `const React = require('react');
module.exports = {
__esModule: true,
default: ${assetFilename},
ReactComponent: React.forwardRef(function ${componentName}(props, ref) {
return {
$$typeof: Symbol.for('react.element'),
type: 'svg',
ref: ref,
key: null,
props: Object.assign({}, props, {
children: ${assetFilename}
})
};
}),
};`;
}

return `module.exports = ${assetFilename};`;
},
};
Loading