E-COPS · rosieposiess · Feb 19, 2023 · Feb 19, 2023 · Feb 20, 2023 · Feb 20, 2023
diff --git a/.config/nginx/mysite.conf b/.config/nginx/mysite.conf
@@ -4,22 +4,37 @@ server {
     server_name *.compute.amazonaws.com *.ecops.site;
     charset utf-8;
     client_max_body_size 128M;
- 
+
     location / {
         uwsgi_pass  unix:///tmp/mysite.sock;
         include     uwsgi_params;
     }
-    location /static/ {
-        alias /home/ubuntu/ecops/back_src/web_back/static/;
+
+    location /manifest.json {
+
+         alias /home/ubuntu/ecops/back_src/web_back/static/manifest.json;
+
     }
-    if ($http_x_forwarded_proto = 'http'){
-    return 301 https://$host$request_uri;
+
+    location /recruitment/fonts/ {
+
+    	alias /home/ubuntu/ecops/back_src/web_back/static/fonts/;    
+
     }
 
+    location /fonts/ {
+        alias /home/ubuntu/ecops/back_src/web_back/static/fonts/;
 }
-    
+
     location /static/ {
         alias /home/ubuntu/ecops/back_src/web_back/static/;
     }
+
+    location /static/media/ {
+
+       alias /home/ubuntu/ecops/back_src/web_back/static/media/;
+    }
+
+   # return 301 https://$host$request_uri;
 
-}
+}
diff --git a/.config/uwsgi/mysite.ini b/.config/uwsgi/mysite.ini
@@ -5,7 +5,7 @@ home = /home/ubuntu/venv/
 
 uid = ubuntu
 gid = ubuntu
- 
+
 socket = /tmp/mysite.sock
 chmod-socket = 666
 chown-socket = ubuntu:ubuntu
@@ -16,4 +16,3 @@ vacuum = true
 pidfile = /tmp/mysite.pid
 logto = /var/log/uwsgi/mysite/@(exec://date +%%Y-%%m-%%d).log
 log-reopen = true
-
diff --git a/.config/uwsgi/mysite.ini.save b/.config/uwsgi/mysite.ini.save
@@ -9,4 +9,4 @@
 
 
 
- uwsgi --http :8000 --home /home/ubuntu/venv --chdir /home/ubuntu/ecops/back_src/web_back -w mysite.wsgi
+ uwsgi --http :8000 --home /home/ubuntu/venv --chdir /home/ubuntu/ecops/back_src/web_back -w mysite.wsgi
diff --git a/.config/uwsgi/nano.save b/.config/uwsgi/nano.save
@@ -1 +1 @@
-tu/venv --chdir /home/ubuntu/ecops/back_src/web_back -w mysite.wsgi
+tu/venv --chdir /home/ubuntu/ecops/back_src/web_back -w mysite.wsgi
diff --git a/.config/uwsgi/uwsgi.service b/.config/uwsgi/uwsgi.service
@@ -1,15 +1,15 @@
 [Unit]
 Description=uWSGI service
 After=syslog.target
- 
+
 [Service]
 ExecStart=/home/ubuntu/venv/bin/uwsgi -i /home/ubuntu/ecops/back_src/web_back/.config/uwsgi/mysite.ini
- 
+
 Restart=always
 KillSignal=SIGQUIT
 Type=notify
 StandardError=syslog
 NotifyAccess=all
- 
+
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/__pycache__/__init__.cpython-311.pyc b/app/__pycache__/__init__.cpython-311.pyc
diff --git a/app/__pycache__/admin.cpython-311.pyc b/app/__pycache__/admin.cpython-311.pyc
diff --git a/app/__pycache__/apps.cpython-311.pyc b/app/__pycache__/apps.cpython-311.pyc
diff --git a/app/__pycache__/models.cpython-311.pyc b/app/__pycache__/models.cpython-311.pyc
diff --git a/app/__pycache__/urls.cpython-311.pyc b/app/__pycache__/urls.cpython-311.pyc
diff --git a/app/__pycache__/views.cpython-311.pyc b/app/__pycache__/views.cpython-311.pyc
diff --git a/app/urls.py b/app/urls.py
@@ -1,10 +1,12 @@
 from django.views.generic import TemplateView
 from django.urls import path
 
+import app.views
 
 urlpatterns = [
     #main page
     path('', TemplateView.as_view(template_name='index.html'), name='index'),
+    #path('',app.views.notion, name='notion'),
 
     #Program
     path('program/', TemplateView.as_view(template_name='index.html'), name='program'),

diff --git a/app/views.py b/app/views.py
@@ -6,5 +6,7 @@
 from django.views import generic
 
 import os
+def notion(request):
+    return render(request, "https://www.notion.so/ewhaecops/E-COPS-12th-Recruiting-81f6ece018cd49b68eaa1997996213a8")
 
 import mysite.settings
diff --git a/mysite/__pycache__/__init__.cpython-311.pyc b/mysite/__pycache__/__init__.cpython-311.pyc
diff --git a/mysite/__pycache__/settings.cpython-311.pyc b/mysite/__pycache__/settings.cpython-311.pyc
diff --git a/mysite/__pycache__/urls.cpython-311.pyc b/mysite/__pycache__/urls.cpython-311.pyc
diff --git a/mysite/settings.py b/mysite/settings.py
@@ -152,11 +152,10 @@
 # https://docs.djangoproject.com/en/4.0/howto/static-files/
 
 
-STATIC_ROOT = os.path.join('static')
-STATIC_URL = 'static/'
+STATIC_ROOT = os.path.join('staticfiles')
+STATIC_URL = '/static/'
 
 STATICFILES_DIRS = [
-    #os.path.join(APPS_DIR,'static'),
     os.path.join(BASE_DIR, 'static'),
 ]
 
@@ -165,7 +164,6 @@
    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 ]
 
-
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field
 

diff --git a/path.txt b/path.txt
@@ -0,0 +1,3 @@
+STATIC_ROOT staticfiles
+STATICFILES_DIR ['/home/ubuntu/ecops/back_src/web_back/static']
+MEDIA_ROOT /home/ubuntu/ecops/back_src/web_back/media
diff --git a/static/asset-manifest.json b/static/asset-manifest.json
@@ -1,23 +1,23 @@
 {
   "files": {
-    "main.css": "/static/css/main.37b9a8ed.css",
-    "main.js": "/static/js/main.ae28d0e5.js",
-    "static/media/logo-img.png": "/static/media/logo-img.3c1baf3df247a0212975.png",
+    "main.css": "/static/css/main.a4ea29ae.css",
+    "main.js": "/static/js/main.3b04e5fb.js",
+    "static/media/ewha_symbol.png": "/static/media/ewha_symbol.8a35bde01c62d01eaa4b.png",
+    "static/media/12th_recruit_poster.jpg": "/static/media/12th_recruit_poster.d0213b5d09c414954df4.jpg",
     "static/media/backend-icon.png": "/static/media/backend-icon.85c4c8e53c619509fb76.png",
     "static/media/frontend-icon.png": "/static/media/frontend-icon.22141774a29a8be0f7ef.png",
     "static/media/blog-icon.png": "/static/media/blog-icon.145572b7ca8d314d1baa.png",
     "static/media/mail-icon.png": "/static/media/mail-icon.6e5c4aed6731f113a18c.png",
-    "static/media/ewha_logo.png": "/static/media/ewha_logo.c756159dd9ed34344432.png",
     "static/media/design-icon.png": "/static/media/design-icon.cdda9c291367a2a801cc.png",
     "static/media/insta-icon.png": "/static/media/insta-icon.16b8b3de5e04a8aa4149.png",
     "static/media/feedback-icon.png": "/static/media/feedback-icon.0076bd43a08afce7d37a.png",
     "static/media/github-icon.png": "/static/media/github-icon.417dee75ff01906da4f5.png",
     "index.html": "/index.html",
-    "main.37b9a8ed.css.map": "/static/css/main.37b9a8ed.css.map",
-    "main.ae28d0e5.js.map": "/static/js/main.ae28d0e5.js.map"
+    "main.a4ea29ae.css.map": "/static/css/main.a4ea29ae.css.map",
+    "main.3b04e5fb.js.map": "/static/js/main.3b04e5fb.js.map"
   },
   "entrypoints": [
-    "static/css/main.37b9a8ed.css",
-    "static/js/main.ae28d0e5.js"
+    "static/css/main.a4ea29ae.css",
+    "static/js/main.3b04e5fb.js"
   ]
 }
diff --git a/static/backend-icon.85c4c8e53c619509fb76.png b/static/backend-icon.85c4c8e53c619509fb76.png
diff --git a/static/css/main.37b9a8ed.css.map b/static/css/main.37b9a8ed.css.map
diff --git a/static/css/main.37b9a8ed.css → static/css/main.a4ea29ae.css b/static/css/main.37b9a8ed.css → static/css/main.a4ea29ae.css
diff --git a/static/css/main.a4ea29ae.css.map b/static/css/main.a4ea29ae.css.map
diff --git a/static/design-icon.cdda9c291367a2a801cc.png b/static/design-icon.cdda9c291367a2a801cc.png
diff --git a/static/favicon.ico b/static/favicon.ico
diff --git a/static/fonts/Inter-VariableFont_slnt,wght.ttf b/static/fonts/Inter-VariableFont_slnt,wght.ttf
diff --git a/static/frontend-icon.22141774a29a8be0f7ef.png b/static/frontend-icon.22141774a29a8be0f7ef.png
diff --git a/static/index.html b/static/index.html
@@ -1,18 +1 @@
-<!doctype html>
-<html lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <link rel="icon" href="/favicon.ico"/>
-    <meta name="viewport" content="width=device-width,initial-scale=1"/>
-    <meta name="theme-color" content="#000000"/>
-    <meta name="description" content="Web site created using create-react-app"/>
-    <link rel="apple-touch-icon" href="static/logo192.png"/>
-    <link rel="manifest" href="static/manifest.json"/>
-    <title>React App</title>
-    <script defer="defer" src="/static/js/main.ae28d0e5.js"></script>
-    <link href="/static/css/main.37b9a8ed.css" rel="stylesheet"></head>
-<body>
-<noscript>You need to enable JavaScript to run this app.</noscript>
-<div id="root"></div>
-</body>
-</html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>E-COPS</title><script defer="defer" src="/static/js/main.3b04e5fb.js"></script><link href="/static/css/main.a4ea29ae.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/static/js/main.3b04e5fb.js b/static/js/main.3b04e5fb.js
diff --git a/static/js/main.ae28d0e5.js.LICENSE.txt → static/js/main.3b04e5fb.js.LICENSE.txt b/static/js/main.ae28d0e5.js.LICENSE.txt → static/js/main.3b04e5fb.js.LICENSE.txt
@@ -132,6 +132,16 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+/**
+ * @license React
+ * react-is.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 /**
  * @license React
  * react-jsx-runtime.production.min.js
@@ -163,7 +173,7 @@
  */
 
 /**
- * @remix-run/router v1.2.1
+ * @remix-run/router v1.3.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -174,7 +184,7 @@
  */
 
 /**
- * React Router DOM v6.6.2
+ * React Router DOM v6.8.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -185,7 +195,7 @@
  */
 
 /**
- * React Router v6.6.2
+ * React Router v6.8.1
  *
  * Copyright (c) Remix Software Inc.
  *

diff --git a/static/js/main.3b04e5fb.js.map b/static/js/main.3b04e5fb.js.map
diff --git a/static/js/main.ae28d0e5.js b/static/js/main.ae28d0e5.js
diff --git a/static/js/main.ae28d0e5.js.map b/static/js/main.ae28d0e5.js.map
diff --git a/static/logo192.png b/static/logo192.png
diff --git a/static/logo512.png b/static/logo512.png
diff --git a/static/media/12th_recruit_poster.d0213b5d09c414954df4.jpg b/static/media/12th_recruit_poster.d0213b5d09c414954df4.jpg
diff --git a/static/media/ewha_logo.c756159dd9ed34344432.png b/static/media/ewha_logo.c756159dd9ed34344432.png
diff --git a/static/media/ewha_symbol.8a35bde01c62d01eaa4b.png b/static/media/ewha_symbol.8a35bde01c62d01eaa4b.png
diff --git a/static/media/favicon.ico b/static/media/favicon.ico
diff --git a/static/media/logo-img.3c1baf3df247a0212975.png b/static/media/logo-img.3c1baf3df247a0212975.png
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,4 +9,4 @@



		uwsgi --http :8000 --home /home/ubuntu/venv --chdir /home/ubuntu/ecops/back_src/web_back -w mysite.wsgi
		uwsgi --http :8000 --home /home/ubuntu/venv --chdir /home/ubuntu/ecops/back_src/web_back -w mysite.wsgi
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		tu/venv --chdir /home/ubuntu/ecops/back_src/web_back -w mysite.wsgi
		tu/venv --chdir /home/ubuntu/ecops/back_src/web_back -w mysite.wsgi