From 52fc20018a848fad62627d934c6e231e2e75d029 Mon Sep 17 00:00:00 2001 From: RailTH Date: Thu, 1 Feb 2024 19:46:44 +1100 Subject: [PATCH] Added reset all browser styles & scss --- SusMarket/urls.py | 2 + SusMarketBackend/views.py | 2 + reactapp/package-lock.json | 20 ++++++ reactapp/package.json | 1 + reactapp/src/index.js | 3 +- reactapp/src/reset.css | 88 ++++++++++++++++++++++++++ reactapp/src/{style.css => style.scss} | 0 7 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 reactapp/src/reset.css rename reactapp/src/{style.css => style.scss} (100%) diff --git a/SusMarket/urls.py b/SusMarket/urls.py index 885fef1..d6e3301 100644 --- a/SusMarket/urls.py +++ b/SusMarket/urls.py @@ -16,7 +16,9 @@ Including another URLconf """ from django.contrib import admin from django.urls import path +from SusMarketBackend import views urlpatterns = [ path('admin/', admin.site.urls), + path('', views.index, name='index') ] diff --git a/SusMarketBackend/views.py b/SusMarketBackend/views.py index 91ea44a..977839b 100644 --- a/SusMarketBackend/views.py +++ b/SusMarketBackend/views.py @@ -1,3 +1,5 @@ from django.shortcuts import render +def index(request): + return render(request, 'index.html') # Create your views here. diff --git a/reactapp/package-lock.json b/reactapp/package-lock.json index 80ec14b..6437e2e 100644 --- a/reactapp/package-lock.json +++ b/reactapp/package-lock.json @@ -14,6 +14,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-scripts": "5.0.1", + "scss": "^0.2.4", "web-vitals": "^2.1.4" } }, @@ -12908,6 +12909,14 @@ "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==" }, + "node_modules/ometa": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/ometa/-/ometa-0.2.2.tgz", + "integrity": "sha512-LZuoK/yjU3FvrxPjUXUlZ1bavCfBPqauA7fsNdwi+AVhRdyk2IzgP3JRnevvjzQ6fKHdUw8YISshf53FmpHrng==", + "engines": { + "node": ">= 0.2.0" + } + }, "node_modules/on-finished": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", @@ -15555,6 +15564,17 @@ "url": "https://opencollective.com/webpack" } }, + "node_modules/scss": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/scss/-/scss-0.2.4.tgz", + "integrity": "sha512-4u8V87F+Q/upVhUmhPnB4C1R11xojkRkWjExL2v0CX2EXTg18VrKd+9JWoeyCp2VEMdSpJsyAvVU+rVjogh51A==", + "dependencies": { + "ometa": "0.2.2" + }, + "engines": { + "node": ">= 0.2.0" + } + }, "node_modules/select-hose": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", diff --git a/reactapp/package.json b/reactapp/package.json index ed4b97f..26a3022 100644 --- a/reactapp/package.json +++ b/reactapp/package.json @@ -9,6 +9,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-scripts": "5.0.1", + "scss": "^0.2.4", "web-vitals": "^2.1.4" }, "scripts": { diff --git a/reactapp/src/index.js b/reactapp/src/index.js index 13ab9cb..b62ebd2 100644 --- a/reactapp/src/index.js +++ b/reactapp/src/index.js @@ -1,6 +1,7 @@ import React from 'react'; import ReactDOM from 'react-dom/client'; -import './style.css'; +import './style.scss'; +import './reset.css'; import App from './App'; const root = ReactDOM.createRoot(document.getElementById('root')); diff --git a/reactapp/src/reset.css b/reactapp/src/reset.css new file mode 100644 index 0000000..d130812 --- /dev/null +++ b/reactapp/src/reset.css @@ -0,0 +1,88 @@ +* { + padding: 0px; + margin: 0px; + border: none; +} + +*, +*::before, +*::after { + box-sizing: border-box; +} + +/* Links */ + +a, a:link, a:visited { + text-decoration: none; +} + +a:hover { + text-decoration: none; +} + +/* Common */ + +aside, nav, footer, header, section, main { + display: block; +} + +h1, h2, h3, h4, h5, h6, p { + font-size: inherit; + font-weight: inherit; +} + +ul, ul li { + list-style: none; +} + +img { + vertical-align: top; +} + +img, svg { + max-width: 100%; + height: auto; +} + +address { + font-style: normal; +} + +/* Form */ + +input, textarea, button, select { + font-family: inherit; + font-size: inherit; + color: inherit; + background-color: transparent; +} + +input::-ms-clear { + display: none; +} + +button, input[type="submit"] { + display: inline-block; + box-shadow: none; + background-color: transparent; + background: none; + cursor: pointer; +} + +input:focus, input:active, +button:focus, button:active { + outline: none; +} + +button::-moz-focus-inner { + padding: 0; + border: 0; +} + +label { + cursor: pointer; +} + +legend { + display: block; +} \ No newline at end of file diff --git a/reactapp/src/style.css b/reactapp/src/style.scss similarity index 100% rename from reactapp/src/style.css rename to reactapp/src/style.scss