From 5f6c3c459ec627c38f2cd15c1632e6ceddd13dc7 Mon Sep 17 00:00:00 2001
From: realaravinth <realaravinth@batsense.net>
Date: Thu, 7 Jul 2022 13:58:53 +0530
Subject: [PATCH] chore: mv common static files to common-static

---
 Makefile                                      |   1 +
 .../templates/common/components/base.html     |   2 +-
 .../templates/common/components/meta.html     |  34 +++++++++---------
 .../templates/common/components/nav/pub.html  |   2 +-
 .../dash => common-static}/css/main.css       |   0
 common-static/css/mobile.css                  |   0
 .../img/android-icon-144x144.png              | Bin
 .../img/android-icon-192x192.png              | Bin
 .../img/android-icon-36x36.png                | Bin
 .../img/android-icon-48x48.png                | Bin
 .../img/android-icon-72x72.png                | Bin
 .../img/android-icon-96x96.png                | Bin
 .../img/apple-icon-114x114.png                | Bin
 .../img/apple-icon-120x120.png                | Bin
 .../img/apple-icon-144x144.png                | Bin
 .../img/apple-icon-152x152.png                | Bin
 .../img/apple-icon-180x180.png                | Bin
 .../img/apple-icon-57x57.png                  | Bin
 .../img/apple-icon-60x60.png                  | Bin
 .../img/apple-icon-72x72.png                  | Bin
 .../img/apple-icon-76x76.png                  | Bin
 .../img/apple-icon-precomposed.png            | Bin
 .../dash => common-static}/img/apple-icon.png | Bin
 .../img/browserconfig.xml                     |   0
 .../img/favicon-16x16.png                     | Bin
 .../img/favicon-32x32.png                     | Bin
 .../img/favicon-96x96.png                     | Bin
 .../dash => common-static}/img/favicon.ico    | Bin
 .../dash => common-static}/img/manifest.json  |   0
 .../img/ms-icon-144x144.png                   | Bin
 .../img/ms-icon-150x150.png                   | Bin
 .../img/ms-icon-310x310.png                   | Bin
 .../img/ms-icon-70x70.png                     | Bin
 .../dash => common-static}/img/tmp-logo.png   | Bin
 dash/templates/dash/common/base.html          |   2 +-
 .../dash/common/components/primary-nav.html   |   2 +-
 36 files changed, 22 insertions(+), 21 deletions(-)
 rename {dash/static/dash => common-static}/css/main.css (100%)
 create mode 100644 common-static/css/mobile.css
 rename {dash/static/dash => common-static}/img/android-icon-144x144.png (100%)
 rename {dash/static/dash => common-static}/img/android-icon-192x192.png (100%)
 rename {dash/static/dash => common-static}/img/android-icon-36x36.png (100%)
 rename {dash/static/dash => common-static}/img/android-icon-48x48.png (100%)
 rename {dash/static/dash => common-static}/img/android-icon-72x72.png (100%)
 rename {dash/static/dash => common-static}/img/android-icon-96x96.png (100%)
 rename {dash/static/dash => common-static}/img/apple-icon-114x114.png (100%)
 rename {dash/static/dash => common-static}/img/apple-icon-120x120.png (100%)
 rename {dash/static/dash => common-static}/img/apple-icon-144x144.png (100%)
 rename {dash/static/dash => common-static}/img/apple-icon-152x152.png (100%)
 rename {dash/static/dash => common-static}/img/apple-icon-180x180.png (100%)
 rename {dash/static/dash => common-static}/img/apple-icon-57x57.png (100%)
 rename {dash/static/dash => common-static}/img/apple-icon-60x60.png (100%)
 rename {dash/static/dash => common-static}/img/apple-icon-72x72.png (100%)
 rename {dash/static/dash => common-static}/img/apple-icon-76x76.png (100%)
 rename {dash/static/dash => common-static}/img/apple-icon-precomposed.png (100%)
 rename {dash/static/dash => common-static}/img/apple-icon.png (100%)
 rename {dash/static/dash => common-static}/img/browserconfig.xml (100%)
 rename {dash/static/dash => common-static}/img/favicon-16x16.png (100%)
 rename {dash/static/dash => common-static}/img/favicon-32x32.png (100%)
 rename {dash/static/dash => common-static}/img/favicon-96x96.png (100%)
 rename {dash/static/dash => common-static}/img/favicon.ico (100%)
 rename {dash/static/dash => common-static}/img/manifest.json (100%)
 rename {dash/static/dash => common-static}/img/ms-icon-144x144.png (100%)
 rename {dash/static/dash => common-static}/img/ms-icon-150x150.png (100%)
 rename {dash/static/dash => common-static}/img/ms-icon-310x310.png (100%)
 rename {dash/static/dash => common-static}/img/ms-icon-70x70.png (100%)
 rename {dash/static/dash => common-static}/img/tmp-logo.png (100%)

diff --git a/Makefile b/Makefile
index aca3588..ad56d80 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,7 @@ env: ## Install all dependencies
 	@-virtualenv venv
 	. ./venv/bin/activate && pip install -r requirements.txt
 	. ./venv/bin/activate && ./integration/ci.sh init
+	. ./venv/bin/activate && yes yes | python manage.py collectstatic
 
 freeze: ## Freeze python dependencies
 	@. ./venv/bin/activate && pip freeze > requirements.txt
diff --git a/accounts/templates/common/components/base.html b/accounts/templates/common/components/base.html
index 5622d68..caa4c39 100644
--- a/accounts/templates/common/components/base.html
+++ b/accounts/templates/common/components/base.html
@@ -3,7 +3,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-	<link rel="stylesheet" href="{% static 'dash/css/main.css' %}" />
+	<link rel="stylesheet" href="{% static 'css/main.css' %}" />
     <title>{% block title %} {% endblock %}</title>
     {% include "common/components/meta.html" %}
   </head>
diff --git a/accounts/templates/common/components/meta.html b/accounts/templates/common/components/meta.html
index 8585cf2..dca8d2d 100644
--- a/accounts/templates/common/components/meta.html
+++ b/accounts/templates/common/components/meta.html
@@ -1,10 +1,10 @@
 {% load static %}
 <meta charset="UTF-8" />
-<link rel="stylesheet" href="{% static 'dash/css/main.css' %}" />
+<link rel="stylesheet" href="{% static 'css/main.css' %}" />
 <link
 	rel="stylesheet"
 	media="screen and (max-width: 1300px)"
-	href="{% static 'dash/css/mobile.css' %}"
+	href="{% static 'css/mobile.css' %}"
 />
 
 <meta name="referrer" content="no-referrer-when-downgrade" />
@@ -23,76 +23,76 @@
 <link
 	rel="apple-touch-icon"
 	sizes="57x57"
-	href="{% static 'dash/img/apple-icon-57x57.png' %}"
+	href="{% static 'img/apple-icon-57x57.png' %}"
 />
 <link
 	rel="apple-touch-icon"
 	sizes="60x60"
-	href="{% static 'dash/img/apple-icon-60x60.png' %}"
+	href="{% static 'img/apple-icon-60x60.png' %}"
 />
 <link
 	rel="apple-touch-icon"
 	sizes="72x72"
-	href="{% static 'dash/img/apple-icon-72x72.png' %}"
+	href="{% static 'img/apple-icon-72x72.png' %}"
 />
 <link
 	rel="apple-touch-icon"
 	sizes="76x76"
-	href="{% static 'dash/img/apple-icon-76x76.png' %}"
+	href="{% static 'img/apple-icon-76x76.png' %}"
 />
 <link
 	rel="apple-touch-icon"
 	sizes="114x114"
-	href="{% static 'dash/img/apple-icon-114x114.png' %}"
+	href="{% static 'img/apple-icon-114x114.png' %}"
 />
 <link
 	rel="apple-touch-icon"
 	sizes="120x120"
-	href="{% static 'dash/img/apple-icon-120x120.png' %}"
+	href="{% static 'img/apple-icon-120x120.png' %}"
 />
 <link
 	rel="apple-touch-icon"
 	sizes="144x144"
-	href="{% static 'dash/img/apple-icon-144x144.png' %}"
+	href="{% static 'img/apple-icon-144x144.png' %}"
 />
 <link
 	rel="apple-touch-icon"
 	sizes="152x152"
-	href="{% static 'dash/img/apple-icon-152x152.png' %}"
+	href="{% static 'img/apple-icon-152x152.png' %}"
 />
 <link
 	rel="apple-touch-icon"
 	sizes="180x180"
-	href="{% static 'dash/img/apple-icon-180x180.png' %}"
+	href="{% static 'img/apple-icon-180x180.png' %}"
 />
 <link
 	rel="icon"
 	type="image/png"
 	sizes="192x192"
-	href="{% static 'dash/img/android-icon-192x192.png' %}"
+	href="{% static 'img/android-icon-192x192.png' %}"
 />
 <link
 	rel="icon"
 	type="image/png"
 	sizes="32x32"
-	href="{% static 'dash/img/favicon-32x32.png' %}"
+	href="{% static 'img/favicon-32x32.png' %}"
 />
 <link
 	rel="icon"
 	type="image/png"
 	sizes="96x96"
-	href="{% static 'dash/img/favicon-96x96.png' %}"
+	href="{% static 'img/favicon-96x96.png' %}"
 />
 <link
 	rel="icon"
 	type="image/png"
 	sizes="16x16"
-	href="{% static 'dash/img/favicon-16x16.png' %}"
+	href="{% static 'img/favicon-16x16.png' %}"
 />
-<link rel="manifest" href="{% static 'dash/img/manifest.json' %}" />
+<link rel="manifest" href="{% static 'img/manifest.json' %}" />
 <meta name="msapplication-TileColor" content="#ffffff" />
 <meta
 	name="msapplication-TileImage"
-	content="{% static 'dash/img/ms-icon-144x144.png' %}"
+	content="{% static 'img/ms-icon-144x144.png' %}"
 />
 <meta name="theme-color" content="#ffffff" />
diff --git a/accounts/templates/common/components/nav/pub.html b/accounts/templates/common/components/nav/pub.html
index fe1b3fa..fae4009 100644
--- a/accounts/templates/common/components/nav/pub.html
+++ b/accounts/templates/common/components/nav/pub.html
@@ -3,7 +3,7 @@
   <input type="checkbox" class="nav__toggle" id="nav__toggle" />
   <div class="nav__header">
     <a class="nav__logo-container" href="/">
-      <img src="{% static 'dash/img/android-icon-48x48.png' %}" 
+      <img src="{% static 'img/android-icon-48x48.png' %}" 
       alt="Hostea temporary logo"/>
       <p class="nav__home-btn">
       ostea
diff --git a/dash/static/dash/css/main.css b/common-static/css/main.css
similarity index 100%
rename from dash/static/dash/css/main.css
rename to common-static/css/main.css
diff --git a/common-static/css/mobile.css b/common-static/css/mobile.css
new file mode 100644
index 0000000..e69de29
diff --git a/dash/static/dash/img/android-icon-144x144.png b/common-static/img/android-icon-144x144.png
similarity index 100%
rename from dash/static/dash/img/android-icon-144x144.png
rename to common-static/img/android-icon-144x144.png
diff --git a/dash/static/dash/img/android-icon-192x192.png b/common-static/img/android-icon-192x192.png
similarity index 100%
rename from dash/static/dash/img/android-icon-192x192.png
rename to common-static/img/android-icon-192x192.png
diff --git a/dash/static/dash/img/android-icon-36x36.png b/common-static/img/android-icon-36x36.png
similarity index 100%
rename from dash/static/dash/img/android-icon-36x36.png
rename to common-static/img/android-icon-36x36.png
diff --git a/dash/static/dash/img/android-icon-48x48.png b/common-static/img/android-icon-48x48.png
similarity index 100%
rename from dash/static/dash/img/android-icon-48x48.png
rename to common-static/img/android-icon-48x48.png
diff --git a/dash/static/dash/img/android-icon-72x72.png b/common-static/img/android-icon-72x72.png
similarity index 100%
rename from dash/static/dash/img/android-icon-72x72.png
rename to common-static/img/android-icon-72x72.png
diff --git a/dash/static/dash/img/android-icon-96x96.png b/common-static/img/android-icon-96x96.png
similarity index 100%
rename from dash/static/dash/img/android-icon-96x96.png
rename to common-static/img/android-icon-96x96.png
diff --git a/dash/static/dash/img/apple-icon-114x114.png b/common-static/img/apple-icon-114x114.png
similarity index 100%
rename from dash/static/dash/img/apple-icon-114x114.png
rename to common-static/img/apple-icon-114x114.png
diff --git a/dash/static/dash/img/apple-icon-120x120.png b/common-static/img/apple-icon-120x120.png
similarity index 100%
rename from dash/static/dash/img/apple-icon-120x120.png
rename to common-static/img/apple-icon-120x120.png
diff --git a/dash/static/dash/img/apple-icon-144x144.png b/common-static/img/apple-icon-144x144.png
similarity index 100%
rename from dash/static/dash/img/apple-icon-144x144.png
rename to common-static/img/apple-icon-144x144.png
diff --git a/dash/static/dash/img/apple-icon-152x152.png b/common-static/img/apple-icon-152x152.png
similarity index 100%
rename from dash/static/dash/img/apple-icon-152x152.png
rename to common-static/img/apple-icon-152x152.png
diff --git a/dash/static/dash/img/apple-icon-180x180.png b/common-static/img/apple-icon-180x180.png
similarity index 100%
rename from dash/static/dash/img/apple-icon-180x180.png
rename to common-static/img/apple-icon-180x180.png
diff --git a/dash/static/dash/img/apple-icon-57x57.png b/common-static/img/apple-icon-57x57.png
similarity index 100%
rename from dash/static/dash/img/apple-icon-57x57.png
rename to common-static/img/apple-icon-57x57.png
diff --git a/dash/static/dash/img/apple-icon-60x60.png b/common-static/img/apple-icon-60x60.png
similarity index 100%
rename from dash/static/dash/img/apple-icon-60x60.png
rename to common-static/img/apple-icon-60x60.png
diff --git a/dash/static/dash/img/apple-icon-72x72.png b/common-static/img/apple-icon-72x72.png
similarity index 100%
rename from dash/static/dash/img/apple-icon-72x72.png
rename to common-static/img/apple-icon-72x72.png
diff --git a/dash/static/dash/img/apple-icon-76x76.png b/common-static/img/apple-icon-76x76.png
similarity index 100%
rename from dash/static/dash/img/apple-icon-76x76.png
rename to common-static/img/apple-icon-76x76.png
diff --git a/dash/static/dash/img/apple-icon-precomposed.png b/common-static/img/apple-icon-precomposed.png
similarity index 100%
rename from dash/static/dash/img/apple-icon-precomposed.png
rename to common-static/img/apple-icon-precomposed.png
diff --git a/dash/static/dash/img/apple-icon.png b/common-static/img/apple-icon.png
similarity index 100%
rename from dash/static/dash/img/apple-icon.png
rename to common-static/img/apple-icon.png
diff --git a/dash/static/dash/img/browserconfig.xml b/common-static/img/browserconfig.xml
similarity index 100%
rename from dash/static/dash/img/browserconfig.xml
rename to common-static/img/browserconfig.xml
diff --git a/dash/static/dash/img/favicon-16x16.png b/common-static/img/favicon-16x16.png
similarity index 100%
rename from dash/static/dash/img/favicon-16x16.png
rename to common-static/img/favicon-16x16.png
diff --git a/dash/static/dash/img/favicon-32x32.png b/common-static/img/favicon-32x32.png
similarity index 100%
rename from dash/static/dash/img/favicon-32x32.png
rename to common-static/img/favicon-32x32.png
diff --git a/dash/static/dash/img/favicon-96x96.png b/common-static/img/favicon-96x96.png
similarity index 100%
rename from dash/static/dash/img/favicon-96x96.png
rename to common-static/img/favicon-96x96.png
diff --git a/dash/static/dash/img/favicon.ico b/common-static/img/favicon.ico
similarity index 100%
rename from dash/static/dash/img/favicon.ico
rename to common-static/img/favicon.ico
diff --git a/dash/static/dash/img/manifest.json b/common-static/img/manifest.json
similarity index 100%
rename from dash/static/dash/img/manifest.json
rename to common-static/img/manifest.json
diff --git a/dash/static/dash/img/ms-icon-144x144.png b/common-static/img/ms-icon-144x144.png
similarity index 100%
rename from dash/static/dash/img/ms-icon-144x144.png
rename to common-static/img/ms-icon-144x144.png
diff --git a/dash/static/dash/img/ms-icon-150x150.png b/common-static/img/ms-icon-150x150.png
similarity index 100%
rename from dash/static/dash/img/ms-icon-150x150.png
rename to common-static/img/ms-icon-150x150.png
diff --git a/dash/static/dash/img/ms-icon-310x310.png b/common-static/img/ms-icon-310x310.png
similarity index 100%
rename from dash/static/dash/img/ms-icon-310x310.png
rename to common-static/img/ms-icon-310x310.png
diff --git a/dash/static/dash/img/ms-icon-70x70.png b/common-static/img/ms-icon-70x70.png
similarity index 100%
rename from dash/static/dash/img/ms-icon-70x70.png
rename to common-static/img/ms-icon-70x70.png
diff --git a/dash/static/dash/img/tmp-logo.png b/common-static/img/tmp-logo.png
similarity index 100%
rename from dash/static/dash/img/tmp-logo.png
rename to common-static/img/tmp-logo.png
diff --git a/dash/templates/dash/common/base.html b/dash/templates/dash/common/base.html
index 5ca8196..4e13853 100644
--- a/dash/templates/dash/common/base.html
+++ b/dash/templates/dash/common/base.html
@@ -3,7 +3,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-	<link rel="stylesheet" href="{% static 'dash/css/main.css' %}" />
+	<link rel="stylesheet" href="{% static 'css/main.css' %}" />
     <title>{{ title }}| Hostea Dashbaord</title>
     {% include "common/components/meta.html" %}
   </head>
diff --git a/dash/templates/dash/common/components/primary-nav.html b/dash/templates/dash/common/components/primary-nav.html
index ba945fa..f502c0d 100644
--- a/dash/templates/dash/common/components/primary-nav.html
+++ b/dash/templates/dash/common/components/primary-nav.html
@@ -4,7 +4,7 @@
   <div class="nav__header">
     <a class="nav__logo-container" href="/">
       <img
-        src="{% static 'dash/img/android-icon-48x48.png' %}"
+        src="{% static 'img/android-icon-48x48.png' %}"
         alt="Hostea temporary logo"
       />
       <p class="nav__home-btn">ostea</p>