Merge branch 'master' of ssh://khuhub.khu.ac.kr:12959/2020-1-capstone-design1/Triz_Project1
Showing
11 changed files
with
46 additions
and
159 deletions
front/web/react-app/public/pure.html
deleted
100644 → 0
1 | +import { createGlobalStyle } from "./node_modules/styled-components"; | ||
2 | +import reset from "./node_modules/styled-reset"; | ||
3 | + | ||
4 | +export default createGlobalStyle` | ||
5 | + ${reset} | ||
6 | + * { | ||
7 | + box-sizing: border-box; | ||
8 | + } | ||
9 | + html, body { | ||
10 | + height: 100vh; | ||
11 | + } | ||
12 | + #root { | ||
13 | + height: 100%; | ||
14 | + display:flex; | ||
15 | + flex-direction: row; | ||
16 | + } | ||
17 | + @font-face { | ||
18 | + font-family: 'Shadows Into Light', cursive; | ||
19 | + src: url('https://fonts.googleapis.com/css2?family=Shadows+Into+Light&display=swap'); | ||
20 | + } | ||
21 | + @font-face { | ||
22 | + font-family: 'Kaushan Script', cursive; | ||
23 | + src: url('https://fonts.googleapis.com/css2?family=Kaushan+Script&display=swap'); | ||
24 | + } | ||
25 | +`; |
front/web/react-app/src/Styles/Theme.js
0 → 100644
front/web/react-app/src/logo.svg
deleted
100644 → 0
1 | -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"> | ||
2 | - <g fill="#61DAFB"> | ||
3 | - <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/> | ||
4 | - <circle cx="420.9" cy="296.5" r="45.7"/> | ||
5 | - <path d="M520.5 78.1z"/> | ||
6 | - </g> | ||
7 | -</svg> |
File mode changed
File mode changed
front/web/react-app/src/mainpage/mainpage.js
0 → 100644
1 | -// This optional code is used to register a service worker. | ||
2 | -// register() is not called by default. | ||
3 | - | ||
4 | -// This lets the app load faster on subsequent visits in production, and gives | ||
5 | -// it offline capabilities. However, it also means that developers (and users) | ||
6 | -// will only see deployed updates on subsequent visits to a page, after all the | ||
7 | -// existing tabs open on the page have been closed, since previously cached | ||
8 | -// resources are updated in the background. | ||
9 | - | ||
10 | -// To learn more about the benefits of this model and instructions on how to | ||
11 | -// opt-in, read https://bit.ly/CRA-PWA | ||
12 | - | ||
13 | -const isLocalhost = Boolean( | ||
14 | - window.location.hostname === 'localhost' || | ||
15 | - // [::1] is the IPv6 localhost address. | ||
16 | - window.location.hostname === '[::1]' || | ||
17 | - // 127.0.0.0/8 are considered localhost for IPv4. | ||
18 | - window.location.hostname.match( | ||
19 | - /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/ | ||
20 | - ) | ||
21 | -); | ||
22 | - | ||
23 | -export function register(config) { | ||
24 | - if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) { | ||
25 | - // The URL constructor is available in all browsers that support SW. | ||
26 | - const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href); | ||
27 | - if (publicUrl.origin !== window.location.origin) { | ||
28 | - // Our service worker won't work if PUBLIC_URL is on a different origin | ||
29 | - // from what our page is served on. This might happen if a CDN is used to | ||
30 | - // serve assets; see https://github.com/facebook/create-react-app/issues/2374 | ||
31 | - return; | ||
32 | - } | ||
33 | - | ||
34 | - window.addEventListener('load', () => { | ||
35 | - const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`; | ||
36 | - | ||
37 | - if (isLocalhost) { | ||
38 | - // This is running on localhost. Let's check if a service worker still exists or not. | ||
39 | - checkValidServiceWorker(swUrl, config); | ||
40 | - | ||
41 | - // Add some additional logging to localhost, pointing developers to the | ||
42 | - // service worker/PWA documentation. | ||
43 | - navigator.serviceWorker.ready.then(() => { | ||
44 | - console.log( | ||
45 | - 'This web app is being served cache-first by a service ' + | ||
46 | - 'worker. To learn more, visit https://bit.ly/CRA-PWA' | ||
47 | - ); | ||
48 | - }); | ||
49 | - } else { | ||
50 | - // Is not localhost. Just register service worker | ||
51 | - registerValidSW(swUrl, config); | ||
52 | - } | ||
53 | - }); | ||
54 | - } | ||
55 | -} | ||
56 | - | ||
57 | -function registerValidSW(swUrl, config) { | ||
58 | - navigator.serviceWorker | ||
59 | - .register(swUrl) | ||
60 | - .then(registration => { | ||
61 | - registration.onupdatefound = () => { | ||
62 | - const installingWorker = registration.installing; | ||
63 | - if (installingWorker == null) { | ||
64 | - return; | ||
65 | - } | ||
66 | - installingWorker.onstatechange = () => { | ||
67 | - if (installingWorker.state === 'installed') { | ||
68 | - if (navigator.serviceWorker.controller) { | ||
69 | - // At this point, the updated precached content has been fetched, | ||
70 | - // but the previous service worker will still serve the older | ||
71 | - // content until all client tabs are closed. | ||
72 | - console.log( | ||
73 | - 'New content is available and will be used when all ' + | ||
74 | - 'tabs for this page are closed. See https://bit.ly/CRA-PWA.' | ||
75 | - ); | ||
76 | - | ||
77 | - // Execute callback | ||
78 | - if (config && config.onUpdate) { | ||
79 | - config.onUpdate(registration); | ||
80 | - } | ||
81 | - } else { | ||
82 | - // At this point, everything has been precached. | ||
83 | - // It's the perfect time to display a | ||
84 | - // "Content is cached for offline use." message. | ||
85 | - console.log('Content is cached for offline use.'); | ||
86 | - | ||
87 | - // Execute callback | ||
88 | - if (config && config.onSuccess) { | ||
89 | - config.onSuccess(registration); | ||
90 | - } | ||
91 | - } | ||
92 | - } | ||
93 | - }; | ||
94 | - }; | ||
95 | - }) | ||
96 | - .catch(error => { | ||
97 | - console.error('Error during service worker registration:', error); | ||
98 | - }); | ||
99 | -} | ||
100 | - | ||
101 | -function checkValidServiceWorker(swUrl, config) { | ||
102 | - // Check if the service worker can be found. If it can't reload the page. | ||
103 | - fetch(swUrl, { | ||
104 | - headers: { 'Service-Worker': 'script' }, | ||
105 | - }) | ||
106 | - .then(response => { | ||
107 | - // Ensure service worker exists, and that we really are getting a JS file. | ||
108 | - const contentType = response.headers.get('content-type'); | ||
109 | - if ( | ||
110 | - response.status === 404 || | ||
111 | - (contentType != null && contentType.indexOf('javascript') === -1) | ||
112 | - ) { | ||
113 | - // No service worker found. Probably a different app. Reload the page. | ||
114 | - navigator.serviceWorker.ready.then(registration => { | ||
115 | - registration.unregister().then(() => { | ||
116 | - window.location.reload(); | ||
117 | - }); | ||
118 | - }); | ||
119 | - } else { | ||
120 | - // Service worker found. Proceed as normal. | ||
121 | - registerValidSW(swUrl, config); | ||
122 | - } | ||
123 | - }) | ||
124 | - .catch(() => { | ||
125 | - console.log( | ||
126 | - 'No internet connection found. App is running in offline mode.' | ||
127 | - ); | ||
128 | - }); | ||
129 | -} | ||
130 | - | ||
131 | -export function unregister() { | ||
132 | - if ('serviceWorker' in navigator) { | ||
133 | - navigator.serviceWorker.ready | ||
134 | - .then(registration => { | ||
135 | - registration.unregister(); | ||
136 | - }) | ||
137 | - .catch(error => { | ||
138 | - console.error(error.message); | ||
139 | - }); | ||
140 | - } | ||
141 | -} |
-
Please register or login to post a comment