최원석3 [goesnow]

resolve conflicts

1 node_modules 1 node_modules
2 .env 2 .env
3 .vscode 3 .vscode
4 -chromedriver 4 +crawler/chromedriver
5 +crawler/chromedriver.exe
5 .idea 6 .idea
7 +**/*.exe
8 +package-lock.json
9 +
10 +app/build/*.map
11 +app/build/*.js
12 +build
13 +public
6 14
7 key.py 15 key.py
8 admin.py 16 admin.py
......
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<module type="JAVA_MODULE" version="4">
3 + <component name="FacetManager">
4 + <facet type="Python" name="Python">
5 + <configuration sdkName="" />
6 + </facet>
7 + </component>
8 + <component name="NewModuleRootManager" inherit-compiler-output="true">
9 + <exclude-output />
10 + <content url="file://$MODULE_DIR$">
11 + <excludeFolder url="file://$MODULE_DIR$/venv" />
12 + <excludeFolder url="file://$MODULE_DIR$/venv3" />
13 + </content>
14 + <orderEntry type="jdk" jdkName="Python 3.7 (check-your-instagram)" jdkType="Python SDK" />
15 + <orderEntry type="sourceFolder" forTests="false" />
16 + </component>
17 +</module>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<project version="4">
3 + <component name="PublishConfigData" remoteFilesAllowedToDisappearOnAutoupload="false">
4 + <serverData>
5 + <paths name="ubuntu@52.197.199.6:22">
6 + <serverdata>
7 + <mappings>
8 + <mapping local="$PROJECT_DIR$" web="/" />
9 + </mappings>
10 + </serverdata>
11 + </paths>
12 + <paths name="ubuntu@54.199.111.206:22">
13 + <serverdata>
14 + <mappings>
15 + <mapping local="$PROJECT_DIR$" web="/" />
16 + </mappings>
17 + </serverdata>
18 + </paths>
19 + <paths name="ubuntu@54.248.71.175:22">
20 + <serverdata>
21 + <mappings>
22 + <mapping local="$PROJECT_DIR$" web="/" />
23 + </mappings>
24 + </serverdata>
25 + </paths>
26 + </serverData>
27 + </component>
28 +</project>
...\ No newline at end of file ...\ No newline at end of file
1 +<component name="InspectionProjectProfileManager">
2 + <profile version="1.0">
3 + <option name="myName" value="Project Default" />
4 + <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
5 + <inspection_tool class="TsLint" enabled="true" level="WARNING" enabled_by_default="true" />
6 + </profile>
7 +</component>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<project version="4">
3 + <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (check-your-instagram)" project-jdk-type="Python SDK" />
4 +</project>
...\ No newline at end of file ...\ No newline at end of file
1 +build/
2 +gulpfile.js
3 +gulp.js
4 +webpack.config.js
1 +{
2 + "extends": "./node_modules/gts/"
3 +}
1 +module.exports = {
2 + ...require('gts/.prettierrc.json')
3 +}
1 # Front end 1 # Front end
2 +
3 +typescript만으로 작성
4 +
5 +### 프로젝트 생성
6 +```shell
7 +npx gts init
8 +```
9 +
10 +# 개발
11 +
12 +### 프론트 서버 띄우기
13 +```shell
14 +npm run build
15 +npm run start
16 +```
17 +
18 +`npm run start`만 진행할 시 수정사항이 적용되지 않음
...\ No newline at end of file ...\ No newline at end of file
......
1 +export declare const Bye: () => void;
......
1 +import './assets/style/App.css';
......
1 +
2 +const gulp = require('gulp');
3 +const browserify = require('browserify');
4 +const watchify = require('watchify');
5 +const errorify = require('errorify');
6 +const del = require('del');
7 +const tsify = require('tsify');
8 +const source = require('vinyl-source-stream');
9 +const buffer = require('vinyl-buffer');
10 +const runSequence = require('run-sequence');
11 +const uglify = require('gulp-uglify');
12 +
13 +gulp.task('clean', () => {
14 + return del('./built/**/*')
15 +});
16 +
17 +gulp.task('prod', () => {
18 + browserify({
19 + basedir: '.',
20 + debug: true,
21 + entries: ['src'],
22 + cache: {},
23 + packageCache: {}
24 + })
25 + .plugin(tsify)
26 + .bundle()
27 + .pipe(source('bundle.js'))
28 + .pipe(buffer())
29 + .pipe(uglify())
30 + .pipe(gulp.dest('built'));
31 +});
32 +
33 +gulp.task('dev', () => {
34 + browserify({
35 + basedir: '.',
36 + debug: true,
37 + entries: ['src'],
38 + cache: {},
39 + packageCache: {}
40 + })
41 + .plugin(tsify)
42 + .plugin(watchify)
43 + .plugin(errorify)
44 + .bundle()
45 + .pipe(source('bundle.js'))
46 + .pipe(gulp.dest('built'));
47 +});
48 +
49 +gulp.task('default', (done) => {
50 + runSequence('clean', 'dev', () => {
51 + console.log('Watching...')
52 + gulp.watch(['src/**/*.ts'],
53 + ['dev']);
54 + });
55 +});
56 +
57 +gulp.task('package', (done) => {
58 + runSequence('clean', 'prod', () => {
59 + console.log('Watching...')
60 + gulp.watch(['src/**/*.ts'],
61 + ['prod']);
62 + });
63 +});
1 +<!DOCTYPE html>
2 +<html lang="en">
3 +<head>
4 + <meta charset="UTF-8">
5 + <title>home</title>
6 +</head>
7 +<body>
8 + <div id="App"></div>
9 + <script type="module" src="public/main.js" ></script>
10 +</body>
11 +</html>
...\ No newline at end of file ...\ No newline at end of file
1 +{
2 + "name": "",
3 + "version": "0.0.0",
4 + "description": "",
5 + "main": "build/src/index.js",
6 + "types": "build/src/index.d.ts",
7 + "files": [
8 + "build/src"
9 + ],
10 + "license": "Apache-2.0",
11 + "keywords": [],
12 + "scripts": {
13 + "test": "echo \"Error: no test specified\" && exit 1",
14 + "lint": "gts lint",
15 + "clean": "gts clean",
16 + "fix": "gts fix",
17 + "prepare": "npm.cmd run compile",
18 + "pretest": "npm.cmd run compile",
19 + "posttest": "npm.cmd run lint",
20 + "compile": "tsc -w",
21 + "build": "webpack --watch",
22 + "start": "webpack serve --open"
23 + },
24 + "devDependencies": {
25 + "@types/node": "^14.11.2",
26 + "css-loader": "^5.1.1",
27 + "file-loader": "^6.2.0",
28 + "gts": "^3.1.0",
29 + "style-loader": "^2.0.0",
30 + "ts-loader": "^8.0.17",
31 + "typescript": "^4.0.3",
32 + "webpack": "^5.24.3",
33 + "webpack-cli": "^4.5.0",
34 + "webpack-dev-server": "^3.11.2"
35 + }
36 +}
This diff is collapsed. Click to expand it.
1 +export const Bye = () => console.log('Bye!');
1 +body{
2 + background-color: beige;
3 +}
...\ No newline at end of file ...\ No newline at end of file
1 +declare module '*.png';
1 +import {Bye} from './Bye';
2 +import './assets/style/App.css';
3 +import v4 from './assets/image/v4Logo.png';
4 +
5 +const hi = 'hchoi won';
6 +
7 +const hi1 = () => {
8 + console.log(hi);
9 + Bye();
10 +
11 + const tag = window.document.querySelector('#App');
12 +
13 + if(tag) {
14 + tag.innerHTML = `<img src=${v4} alt="image" />`;
15 + }
16 +};
17 +
18 +hi1();
...\ No newline at end of file ...\ No newline at end of file
1 +{
2 + "extends": "./node_modules/gts/tsconfig-google.json",
3 + "compilerOptions": {
4 + "lib": ["es5", "es6", "dom"],
5 + "rootDir": ".",
6 + "outDir": "build",
7 + "target": "es6",
8 + "module": "commonjs",
9 + "strict": true,
10 + "removeComments": true,
11 + "esModuleInterop": true
12 + },
13 + "include": [
14 + "src/**/*.ts"
15 + ],
16 +}
1 +const path = require('path')
2 +
3 +module.exports = {
4 + mode : 'development',
5 + entry : {
6 + // main : './build/src/index.js'
7 + main : './src/index.ts'
8 + },
9 + module : {
10 + rules : [
11 + {
12 + test: /\.tsx?$/,
13 + use: "ts-loader",
14 + exclude: /node_modules/,
15 + },
16 + {
17 + test : /\.css$/,
18 + use: ['style-loader', 'css-loader'],
19 + },
20 + {
21 + test: /\.(png|jpe?g|gif|jp2|webp)$/,
22 + loader: 'file-loader',
23 + options: {
24 + name: 'images/[name].[ext]'
25 + },
26 + }
27 + ]
28 + },
29 + resolve : {
30 + extensions: [".tsx", ".ts", ".js"],
31 + },
32 + output : {
33 + publicPath: '/app',
34 + path: path.resolve('./public'),
35 + filename: '[name].js',
36 + },
37 + devServer : {
38 + port : 3000,
39 + hot: true,
40 + contentBase: __dirname,
41 + inline: true,
42 + watchOptions: {
43 + poll: true
44 + }
45 + }
46 +}
...\ No newline at end of file ...\ No newline at end of file
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
1 import os 1 import os
2 -from flask import Flask, render_template, request, jsonify 2 +from flask import Flask, render_template, request, jsonify, send_from_directory
3 3
4 from crawler.crawler_instagram import crawler_instagram 4 from crawler.crawler_instagram import crawler_instagram
5 5
...@@ -13,7 +13,8 @@ def page_not_found(): ...@@ -13,7 +13,8 @@ def page_not_found():
13 13
14 @app.route("/") 14 @app.route("/")
15 def home(): 15 def home():
16 - return render_template('index.html') 16 + # return render_template('index.html')
17 + return send_from_directory('./app','index.html')
17 18
18 19
19 @app.route("/update", methods=["GET"]) 20 @app.route("/update", methods=["GET"])
......